feat: Add hide balance option (#2056)

haqq-network · Aug 26, 2024 · a44b4e3 · a44b4e3
1 parent 2404fe5
commit a44b4e3
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 10 deletions.
diff --git a/src/components/modals/wallets-bottom-sheet.tsx b/src/components/modals/wallets-bottom-sheet.tsx
@@ -18,6 +18,7 @@ export function WalletsBottomSheet({
   errorEventName,
   successEventName,
   onClose,
+  hideBalance,
 }: Modals[ModalType.walletsBottomSheet]) {
   const closeDistanceCalculated = useCalculatedDimensionsValue(
     () => closeDistance?.(),
@@ -64,6 +65,7 @@ export function WalletsBottomSheet({
             onPress={onPressWallet}
             type={WalletRowTypes.variant5}
             hideArrow
+            hideBalance={hideBalance}
             checked={checked}
           />
         );

diff --git a/src/components/wallet-row-variant-3.tsx b/src/components/wallet-row-variant-3.tsx
@@ -4,7 +4,7 @@ import {StyleSheet, View} from 'react-native';
 import {TouchableOpacity} from 'react-native-gesture-handler';
 
 import {Color} from '@app/colors';
-import {CardSmall, Text} from '@app/components/ui';
+import {CardSmall, Text, TextVariant} from '@app/components/ui';
 import {createTheme} from '@app/helpers';
 
 import {WalletRowProps} from './wallet-row';
@@ -44,7 +44,7 @@ export const WalletRowVariant3 = ({
         colorPattern={item.colorPattern}
       />
       <View style={styles.textContainer}>
-        <Text t18 color={Color.textBase3}>
+        <Text variant={TextVariant.t18} color={Color.textBase3}>
           {addressString}
         </Text>
       </View>

diff --git a/src/components/wallet-row-variant-4.tsx b/src/components/wallet-row-variant-4.tsx
@@ -4,7 +4,7 @@ import {StyleSheet, View} from 'react-native';
 import {TouchableOpacity} from 'react-native-gesture-handler';
 
 import {Color} from '@app/colors';
-import {CardSmall, Text} from '@app/components/ui';
+import {CardSmall, Text, TextVariant} from '@app/components/ui';
 import {createTheme} from '@app/helpers';
 import {splitAddress} from '@app/utils';
 
@@ -50,10 +50,13 @@ export const WalletRowVariant4 = ({
         colorPattern={item.colorPattern}
       />
       <View style={styles.textContainer}>
-        <Text t14 color={Color.textBase3} numberOfLines={1}>
+        <Text
+          variant={TextVariant.t14}
+          color={Color.textBase3}
+          numberOfLines={1}>
           {item.name}
         </Text>
-        <Text t18 color={Color.textBase3}>
+        <Text variant={TextVariant.t18} color={Color.textBase3}>
           {addressString}
         </Text>
       </View>

diff --git a/src/components/wallet-row-variant-5.tsx b/src/components/wallet-row-variant-5.tsx
@@ -24,6 +24,7 @@ export const WalletRowVariant5 = ({
   hideArrow = false,
   checked = false,
   style,
+  hideBalance,
 }: Omit<WalletRowProps, 'type'>) => {
   const containerStyle = useMemo(
     () => StyleSheet.flatten([item.isHidden && {opacity: 0.5}, style]),
@@ -62,11 +63,13 @@ export const WalletRowVariant5 = ({
           {addressString}
         </Text>
       </CardSmall>
-      <DataContent
-        style={styles.info}
-        title={item.name}
-        subtitle={balance.toBalanceString()}
-      />
+      {!hideBalance && (
+        <DataContent
+          style={styles.info}
+          title={item.name}
+          subtitle={balance.toBalanceString()}
+        />
+      )}
     </MenuNavigationButton>
   );
 };

diff --git a/src/components/wallet-row.tsx b/src/components/wallet-row.tsx
@@ -26,6 +26,7 @@ export type WalletRowProps = {
   checked?: boolean;
   disabled?: boolean;
   type?: WalletRowTypes;
+  hideBalance?: boolean;
 };
 
 export const WalletRow = ({

diff --git a/src/helpers/await-for-wallet.ts b/src/helpers/await-for-wallet.ts
@@ -20,6 +20,7 @@ export interface AwaitForWalletParams {
   autoSelectWallet?: boolean;
   suggestedAddress?: string;
   eventSuffix?: string | number;
+  hideBalance?: boolean;
 }
 
 export class AwaitForWalletError {

diff --git a/src/screens/HomeStack/BrowserStack/web3-browser.tsx b/src/screens/HomeStack/BrowserStack/web3-browser.tsx
@@ -69,6 +69,7 @@ export const Web3BrowserScreen = memo(() => {
         title: I18N.selectAccount,
         autoSelectWallet: false,
         initialAddress: accountId,
+        hideBalance: true,
       });
       helper.current?.changeAccount?.(selectedAccount);
     },

diff --git a/src/services/json-rpc-middleware/json-rpc-methods-handlers.ts b/src/services/json-rpc-middleware/json-rpc-methods-handlers.ts
@@ -102,6 +102,7 @@ const requestAccount = async ({helper}: JsonRpcMethodHandlerParams) => {
     title: I18N.selectAccount,
     autoSelectWallet: false,
     initialAddress,
+    hideBalance: true,
   });
   return selectedAccount;
 };

diff --git a/src/types.ts b/src/types.ts
@@ -1076,6 +1076,7 @@ export type Modals = {
     title: I18N;
     autoSelectWallet?: boolean;
     initialAddress?: string;
+    hideBalance?: boolean;
   };
   transactionError: {
     onClose?: () => void;