hide wallet amounts by pressing on logo #226 (#227)

cashubtc · Sep 18, 2023 · 2fc9864 · 2fc9864
1 parent b93bacf
commit 2fc9864
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 25 deletions.
diff --git a/src/components/Balance.tsx b/src/components/Balance.tsx
@@ -31,7 +31,7 @@ export default function Balance({ balance, nav }: IBalanceProps) {
 	const { pref, color, highlight } = useThemeContext()
 	// State to indicate token claim from clipboard after app comes to the foreground, to re-render total balance
 	const { claimed } = useFocusClaimContext()
-	const { hidden } = usePrivacyContext()
+	const { hidden, handleLogoPress } = usePrivacyContext()
 	const [formatSats, setFormatSats] = useState(pref?.formatBalance)
 	const [history, setHistory] = useState<IHistoryEntry[]>([])
 
@@ -75,7 +75,11 @@ export default function Balance({ balance, nav }: IBalanceProps) {
 			styles.board,
 			{ borderColor: color.BORDER, backgroundColor: hi[highlight] }
 		]}>
-			<Logo size={hidden.balance ? 100 : 40} style={{ marginTop: hidden.balance ? 40 : 0, marginBottom: hidden.balance ? 40 : 10 }} />
+			<TouchableOpacity
+				onPress={() => void handleLogoPress()}
+			>
+				<Logo size={hidden.balance ? 100 : 40} style={{ marginTop: hidden.balance ? 40 : 0, marginBottom: hidden.balance ? 40 : 10 }} />
+			</TouchableOpacity>
 			{/* balance */}
 			{!hidden.balance &&
 				<TouchableOpacity

diff --git a/src/context/Privacy.tsx b/src/context/Privacy.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable no-return-await */
+/* eslint-disable @typescript-eslint/await-thenable */
 import { l } from '@log'
 import { store } from '@store'
 import { STORE_KEYS } from '@store/consts'
@@ -8,6 +10,42 @@ const usePrivacy = () => {
 		balance: false,
 		txs: false
 	})
+
+	const handleHiddenBalance = async () => {
+		setHidden({ balance: !hidden.balance, txs: hidden.txs })
+		if (hidden.balance) {
+			await store.delete(STORE_KEYS.hiddenBal)
+			return
+		}
+		await store.set(STORE_KEYS.hiddenBal, '1')
+	}
+
+	const handleHiddenTxs = async () => {
+		setHidden({ balance: hidden.balance, txs: !hidden.txs })
+		if (hidden.txs) {
+			await store.delete(STORE_KEYS.hiddenTxs)
+			return
+		}
+		await store.set(STORE_KEYS.hiddenTxs, '1')
+	}
+
+	const handleLogoPress = async () => {
+		// both hidden, show both
+		if (hidden.balance && hidden.txs) {
+			setHidden({ balance: false, txs: false })
+			await Promise.all([
+				store.delete(STORE_KEYS.hiddenTxs),
+				store.delete(STORE_KEYS.hiddenBal)
+			])
+			return
+		}
+		setHidden({ balance: true, txs: true })
+		await Promise.all([
+			store.set(STORE_KEYS.hiddenTxs, '1'),
+			store.set(STORE_KEYS.hiddenBal, '1')
+		])
+	}
+
 	useEffect(() => {
 		void (async () => {
 			// init privacy preferences
@@ -21,15 +59,22 @@ const usePrivacy = () => {
 			})
 		})()
 	}, [])
+
 	return {
 		hidden,
-		setHidden
+		setHidden,
+		handleHiddenBalance,
+		handleHiddenTxs,
+		handleLogoPress
 	}
 }
 type usePrivacyType = ReturnType<typeof usePrivacy>
 const PrivacyContext = createContext<usePrivacyType>({
 	hidden: { balance: false, txs: false },
-	setHidden: () => l('')
+	setHidden: () => l(''),
+	handleHiddenBalance: async () => await l(''),
+	handleHiddenTxs: async () => await l(''),
+	handleLogoPress: async () => await l('')
 })
 
 export const usePrivacyContext = () => useContext(PrivacyContext)

diff --git a/src/screens/Settings/Privacy.tsx b/src/screens/Settings/Privacy.tsx
@@ -7,34 +7,14 @@ import BottomNav from '@nav/BottomNav'
 import { usePrivacyContext } from '@src/context/Privacy'
 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 } from '@styles'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Switch, Text, View } from 'react-native'
 
 export default function PrivacySettings({ navigation, route }: TPrivacySettingsPageProps) {
 	const { t } = useTranslation([NS.topNav])
 	const { color, highlight } = useThemeContext()
-	const { hidden, setHidden } = usePrivacyContext()
-
-	const handleHiddenBalance = async () => {
-		setHidden({ balance: !hidden.balance, txs: hidden.txs })
-		if (hidden.balance) {
-			await store.delete(STORE_KEYS.hiddenBal)
-			return
-		}
-		await store.set(STORE_KEYS.hiddenBal, '1')
-	}
-
-	const handleHiddenTxs = async () => {
-		setHidden({ balance: hidden.balance, txs: !hidden.txs })
-		if (hidden.txs) {
-			await store.delete(STORE_KEYS.hiddenTxs)
-			return
-		}
-		await store.set(STORE_KEYS.hiddenTxs, '1')
-	}
+	const { hidden, handleHiddenBalance, handleHiddenTxs } = usePrivacyContext()
 
 	return (
 		<Screen