Avoid foreground prompts for self-created token (#201)

* add a share function helper * Fixes #170
cashubtc · Sep 13, 2023 · 8ea155b · 8ea155b
1 parent 87f06ee
commit 8ea155b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 82 deletions.
diff --git a/src/components/Backup.tsx b/src/components/Backup.tsx
@@ -1,10 +1,9 @@
-import { l } from '@log'
 import { useThemeContext } from '@src/context/Theme'
 import { NS } from '@src/i18n'
 import { globals } from '@styles'
-import { formatMintUrl } from '@util'
+import { formatMintUrl, share } from '@util'
 import { useTranslation } from 'react-i18next'
-import { Share, StyleSheet, Text } from 'react-native'
+import { StyleSheet, Text } from 'react-native'
 
 import ActionButtons from './ActionButtons'
 import useCopy from './hooks/Copy'
@@ -19,28 +18,6 @@ export default function BackupSuccess({ token, mint }: IBackupSuccessProps) {
 	const { color } = useThemeContext()
 	const { copied, copy } = useCopy()
 
-	const handleShare = async () => {
-		try {
-			const res = await Share.share({
-				message: token, // `cashu://${route.params.token}`
-				url: `cashu://${token}`
-			})
-			if (res.action === Share.sharedAction) {
-				if (res.activityType) {
-					// shared with activity type of result.activityType
-					l('shared with activity type of result.activityType')
-				} else {
-					// shared
-					l('shared')
-				}
-			} else if (res.action === Share.dismissedAction) {
-				// dismissed
-				l('sharing dismissed')
-			}
-		} catch (e) {
-			l(e)
-		}
-	}
 	return (
 		<>
 			<Text style={[globals(color).navTxt, styles.subTxt]}>
@@ -57,7 +34,7 @@ export default function BackupSuccess({ token, mint }: IBackupSuccessProps) {
 			<ActionButtons
 				absolutePos
 				topBtnTxt={t('share')}
-				topBtnAction={() => void handleShare()}
+				topBtnAction={() => void share(token, `cashu://${token}`)}
 				bottomBtnTxt={copied ? t('copied') : t('copyToken')}
 				bottomBtnAction={() => void copy(token)}
 			/>

diff --git a/src/context/FocusClaim.tsx b/src/context/FocusClaim.tsx
@@ -3,6 +3,8 @@ import { getMintsUrls } from '@db'
 import { l } from '@log'
 import type { ITokenInfo } from '@model'
 import { NS } from '@src/i18n'
+import { store } from '@store'
+import { STORE_KEYS } from '@store/consts'
 import { addToHistory } from '@store/latestHistoryEntries'
 import { formatInt, formatMintUrl, getStrFromClipboard, hasTrustedMint, isCashuToken, isErr, sleep } from '@util'
 import { claimToken, isTokenSpendable } from '@wallet'
@@ -29,8 +31,10 @@ const useFocusClaim = () => {
 		// in an empty string returned. Find a better way than the following function to handle it.
 		let isSpent = false
 		const fn = async () => {
+			const selfCreated = await store.get(STORE_KEYS.createdToken)
 			const clipboard = await getStrFromClipboard()
 			if (!clipboard?.length || !isCashuToken(clipboard)) { return false }
+			if (selfCreated === clipboard) { return false }
 			const info = getTokenInfo(clipboard)
 			if (!info) { return false }
 			// check if mint is a trusted one

diff --git a/src/screens/Payment/Receive/Invoice.tsx b/src/screens/Payment/Receive/Invoice.tsx
@@ -11,11 +11,11 @@ import { NS } from '@src/i18n'
 import { getBalance } from '@src/storage/db'
 import { addToHistory } from '@store/latestHistoryEntries'
 import { globals, highlight as hi, mainColors } from '@styles'
-import { formatMintUrl, formatSeconds, isErr, openUrl } from '@util'
+import { formatMintUrl, formatSeconds, isErr, openUrl, share } from '@util'
 import { requestToken } from '@wallet'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Share, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
+import { StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
 export default function InvoiceScreen({ navigation, route }: TMintInvoicePageProps) {
@@ -62,28 +62,6 @@ export default function InvoiceScreen({ navigation, route }: TMintInvoicePagePro
 		}
 	}
 
-	const handleShare = async () => {
-		try {
-			const res = await Share.share({
-				message: paymentRequest,
-			})
-			if (res.action === Share.sharedAction) {
-				if (res.activityType) {
-					// shared with activity type of result.activityType
-					l('shared with activity type of result.activityType')
-				} else {
-					// shared
-					l('shared')
-				}
-			} else if (res.action === Share.dismissedAction) {
-				// dismissed
-				l('sharing dismissed')
-			}
-		} catch (e) {
-			l(e)
-		}
-	}
-
 	// countdown
 	useEffect(() => {
 		const timeLeft = Math.ceil((expiryTime - Date.now()) / 1000)
@@ -157,7 +135,7 @@ export default function InvoiceScreen({ navigation, route }: TMintInvoicePagePro
 					<TxtButton
 						txt={t('shareInvoice')}
 						icon={<ShareIcon width={24} height={24} color={hi[highlight]} />}
-						onPress={() => void handleShare()}
+						onPress={() => void share(paymentRequest)}
 					/>
 				</View>
 				:

diff --git a/src/screens/Payment/Send/EncodedToken.tsx b/src/screens/Payment/Send/EncodedToken.tsx
@@ -3,17 +3,18 @@ import useCopy from '@comps/hooks/Copy'
 import { CopyIcon, ShareIcon } from '@comps/Icons'
 import QR from '@comps/QR'
 import Txt from '@comps/Txt'
-import { l } from '@log'
 import type { TEncodedTokenPageProps } from '@model/nav'
 import TopNav from '@nav/TopNav'
 import { isIOS } from '@src/consts'
 import { useThemeContext } from '@src/context/Theme'
 import { NS } from '@src/i18n'
+import { store } from '@store'
+import { STORE_KEYS } from '@store/consts'
 import { globals, highlight as hi, mainColors } from '@styles'
-import { vib } from '@util'
+import { share, vib } from '@util'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Share, StyleSheet, View } from 'react-native'
+import { StyleSheet, View } from 'react-native'
 
 /**
  * The page that shows the created Cashu token that can be scanned, copied or shared
@@ -24,31 +25,11 @@ export default function EncodedTokenPage({ navigation, route }: TEncodedTokenPag
 	const { copied, copy } = useCopy()
 	const [error, setError] = useState({ msg: '', open: false })
 
-	useEffect(() => vib(400), [])
-
-	// share token
-	const handleShare = async () => {
-		try {
-			const res = await Share.share({
-				message: route.params.token, // `cashu://${route.params.token}`
-				url: `cashu://${route.params.token}`
-			})
-			if (res.action === Share.sharedAction) {
-				if (res.activityType) {
-					// shared with activity type of result.activityType
-					l('shared with activity type of result.activityType')
-				} else {
-					// shared
-					l('shared')
-				}
-			} else if (res.action === Share.dismissedAction) {
-				// dismissed
-				l('sharing dismissed')
-			}
-		} catch (e) {
-			l(e)
-		}
-	}
+	useEffect(() => {
+		// we can save the created token here to avoid foreground prompts of self-created tokens
+		void store.set(STORE_KEYS.createdToken, route.params.token)
+		vib(400)
+	}, [route.params.token])
 
 	return (
 		<View style={[globals(color).container, styles.container, { paddingBottom: isIOS ? 50 : 20 }]}>
@@ -79,7 +60,7 @@ export default function EncodedTokenPage({ navigation, route }: TEncodedTokenPag
 			<ActionButtons
 				topBtnTxt={t('share')}
 				topIcon={<ShareIcon width={20} height={20} color={mainColors.WHITE} />}
-				topBtnAction={() => void handleShare()}
+				topBtnAction={() => void share(route.params.token, `cashu://${route.params.token}`)}
 				bottomBtnTxt={copied ? t('copied') + '!' : t('copyToken')}
 				bottomIcon={<CopyIcon color={hi[highlight]} />}
 				bottomBtnAction={() => void copy(route.params.token)}

diff --git a/src/storage/store/consts.ts b/src/storage/store/consts.ts
@@ -18,7 +18,8 @@ export const STORE_KEYS = {
 	defaultMint: 'MINT_STORE=|:|=default_mint',
 	hiddenBal: 'privacy_balance',
 	hiddenTxs: 'privacy_txs',
-	latestHistory: 'history_latest'
+	latestHistory: 'history_latest',
+	createdToken: 'createdToken',
 }
 
 export const SECURESTORE_KEY = 'auth_pin'

diff --git a/src/util/index.ts b/src/util/index.ts
@@ -5,7 +5,7 @@ import type { ILnUrl, IProofSelection } from '@model'
 import axios from 'axios'
 import type { Buffer } from 'buffer/'
 import * as Clipboard from 'expo-clipboard'
-import { Linking, Vibration } from 'react-native'
+import { Linking, Share, Vibration } from 'react-native'
 
 import { getLanguageCode } from './localization'
 import { isArr, isBuf, isNum, isStr } from './typeguards'
@@ -276,4 +276,24 @@ export async function copyStrToClipboard(str: string) {
 export async function getStrFromClipboard() {
 	const s = await Clipboard.getStringAsync()
 	return !s || s === 'null' ? null : s
+}
+
+export async function share(message: string, url?: string) {
+	try {
+		const res = await Share.share({ message, url })
+		if (res.action === Share.sharedAction) {
+			if (res.activityType) {
+				// shared with activity type of result.activityType
+				l('shared with activity type of result.activityType')
+			} else {
+				// shared
+				l('shared')
+			}
+		} else if (res.action === Share.dismissedAction) {
+			// dismissed
+			l('sharing dismissed')
+		}
+	} catch (e) {
+		l('[quick-share error] ', e)
+	}
 }