Add the ability to hide amounts on overview screen

Long-press on the balance to activate. There is also a setting for it.
hsjoberg · Feb 16, 2024 · a57c3dd · a57c3dd
1 parent 6b41fd4
commit a57c3dd
Show file tree

Hide file tree

Showing 7 changed files with 281 additions and 155 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -639,6 +639,9 @@
       },
       "mapTheme": {
         "title": "Set Map theme"
+      },
+      "hideAmountsEnabled": {
+        "title": "Hide amounts"
       }
     },
     "wallet": {

diff --git a/src/components/TransactionCard.tsx b/src/components/TransactionCard.tsx
@@ -8,10 +8,16 @@ import { ITransaction } from "../storage/database/transaction";
 import { blixtTheme } from ".././native-base-theme/variables/commonColor";
 import { capitalize, formatISO, isLong } from "../utils";
 import { extractDescription } from "../utils/NameDesc";
-import { IBitcoinUnits, formatBitcoin, convertBitcoinToFiat } from "../utils/bitcoin-units";
+import {
+  IBitcoinUnits,
+  formatBitcoin,
+  convertBitcoinToFiat,
+  getUnitNice,
+} from "../utils/bitcoin-units";
 import { useStoreState } from "../state/store";
 import { getLightningService } from "../utils/lightning-services";
 import { fontFactor, fontFactorSubtle, zoomed } from "../utils/scale";
+import BigNumber from "bignumber.js";
 
 interface IProps {
   onPress: (id: string) => void;
@@ -26,6 +32,8 @@ export default function TransactionCard({ onPress, transaction, unit }: IProps)
   const fiatUnit = useStoreState((store) => store.settings.fiatUnit);
   const currentRate = useStoreState((store) => store.fiat.currentRate);
   const preferFiat = useStoreState((store) => store.settings.preferFiat);
+  const hideAmountsEnabled = useStoreState((store) => store.settings.hideAmountsEnabled);
+  const bitcoinUnit = useStoreState((store) => store.settings.bitcoinUnit);
 
   let transactionValue: Long;
   if (isLong(amtPaidSat) && amtPaidSat.greaterThan(0)) {
@@ -108,8 +116,28 @@ export default function TransactionCard({ onPress, transaction, unit }: IProps)
                   {transactionValue.notEquals(0) && (
                     <>
                       {positive ? "+" : ""}
-                      {!preferFiat && formatBitcoin(transactionValue, unit)}
-                      {preferFiat && convertBitcoinToFiat(transactionValue, currentRate, fiatUnit)}
+
+                      {!hideAmountsEnabled && (
+                        <>
+                          {!preferFiat && formatBitcoin(transactionValue, unit)}
+                          {preferFiat &&
+                            convertBitcoinToFiat(transactionValue, currentRate, fiatUnit)}
+                        </>
+                      )}
+                      {hideAmountsEnabled && (
+                        <>
+                          {!preferFiat && (
+                            <>
+                              {!positive ? "-" : ""}●●● {getUnitNice(new BigNumber(2), bitcoinUnit)}
+                            </>
+                          )}
+                          {preferFiat && (
+                            <>
+                              {!positive ? "-" : ""}●●● {fiatUnit}
+                            </>
+                          )}
+                        </>
+                      )}
                     </>
                   )}
                 </Text>

diff --git a/src/state/Settings.ts b/src/state/Settings.ts
@@ -93,6 +93,7 @@ export interface ISettingsModel {
   changeLightningBoxServer: Thunk<ISettingsModel, string>;
   changeLightningBoxAddress: Thunk<ISettingsModel, string>;
   changeLightningBoxLnurlPayDesc: Thunk<ISettingsModel, string>;
+  changeHideAmountsEnabled: Thunk<ISettingsModel, boolean>;
 
   setBitcoinUnit: Action<ISettingsModel, keyof IBitcoinUnits>;
   setFiatUnit: Action<ISettingsModel, keyof IFiatRates>;
@@ -141,6 +142,7 @@ export interface ISettingsModel {
   setLightningBoxServer: Action<ISettingsModel, string>;
   setLightningBoxAddress: Action<ISettingsModel, string>;
   SetLightningBoxLnurlPayDesc: Action<ISettingsModel, string>;
+  setHideAmountsEnabled: Action<ISettingsModel, boolean>;
 
   bitcoinUnit: keyof IBitcoinUnits;
   fiatUnit: keyof IFiatRates;
@@ -189,6 +191,7 @@ export interface ISettingsModel {
   lightningBoxServer: string;
   lightningBoxAddress: string;
   lightningBoxLnurlPayDesc: string;
+  hideAmountsEnabled: boolean;
 }
 
 export const settings: ISettingsModel = {
@@ -283,6 +286,7 @@ export const settings: ISettingsModel = {
     actions.SetLightningBoxLnurlPayDesc(
       (await getItem(StorageItem.lightningBoxLnurlPayDesc)) ?? DEFAULT_LIGHTNINGBOX_LNURLPDESC,
     );
+    actions.setHideAmountsEnabled((await getItemObject(StorageItem.hideAmountsEnabled)) ?? false);
 
     log.d("Done");
   }),
@@ -526,6 +530,11 @@ export const settings: ISettingsModel = {
     actions.SetLightningBoxLnurlPayDesc(payload);
   }),
 
+  changeHideAmountsEnabled: thunk(async (actions, payload) => {
+    await setItemObject(StorageItem.hideAmountsEnabled, payload);
+    actions.setHideAmountsEnabled(payload);
+  }),
+
   setBitcoinUnit: action((state, payload) => {
     state.bitcoinUnit = payload;
   }),
@@ -667,6 +676,9 @@ export const settings: ISettingsModel = {
   SetLightningBoxLnurlPayDesc: action((state, payload) => {
     state.lightningBoxLnurlPayDesc = payload;
   }),
+  setHideAmountsEnabled: action((state, payload) => {
+    state.hideAmountsEnabled = payload;
+  }),
 
   bitcoinUnit: "bitcoin",
   fiatUnit: "USD",
@@ -715,4 +727,5 @@ export const settings: ISettingsModel = {
   lightningBoxServer: DEFAULT_LIGHTNINGBOX_SERVER,
   lightningBoxAddress: "",
   lightningBoxLnurlPayDesc: DEFAULT_LIGHTNINGBOX_LNURLPDESC,
+  hideAmountsEnabled: false,
 };
diff --git a/src/storage/app.ts b/src/storage/app.ts
@@ -89,6 +89,7 @@ export enum StorageItem { // const enums not supported in Babel 7...
   lightningBoxServer = "lightningBoxServer",
   lightningBoxAddress = "lightningBoxAddress",
   lightningBoxLnurlPayDesc = "lightningBoxLnurlPayDesc",
+  hideAmountsEnabled = "hideAmountsEnabled",
 }
 
 export const setItem = async (key: StorageItem, value: string) =>
@@ -192,6 +193,7 @@ export const clearApp = async () => {
     removeItem(StorageItem.lightningBoxServer),
     removeItem(StorageItem.lightningBoxAddress),
     removeItem(StorageItem.lightningBoxLnurlPayDesc),
+    removeItem(StorageItem.hideAmountsEnabled),
   ]);
 };
 
@@ -283,5 +285,6 @@ export const setupApp = async () => {
     setItem(StorageItem.lightningBoxServer, DEFAULT_LIGHTNINGBOX_SERVER),
     // setItem(StorageItem.lightningBoxAddress, ""),
     setItem(StorageItem.lightningBoxLnurlPayDesc, DEFAULT_LIGHTNINGBOX_LNURLPDESC),
+    setItemObject<boolean>(StorageItem.hideAmountsEnabled, false),
   ]);
 };