fix(wallet-core): do not show first normal account by default in suit…

…e-native
trezor · May 31, 2024 · 3caaef4 · 3caaef4
1 parent c51bad1
commit 3caaef4
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/packages/suite/src/actions/wallet/coinjoinAccountActions.ts b/packages/suite/src/actions/wallet/coinjoinAccountActions.ts
@@ -616,6 +616,7 @@ export const createCoinjoinAccount =
                     descriptor: publicKey.payload.xpubSegwit || publicKey.payload.xpub,
                     legacyXpub: publicKey.payload.xpub,
                 },
+                visible: true,
             }),
         );
 

diff --git a/suite-common/wallet-core/src/accounts/accountsActions.ts b/suite-common/wallet-core/src/accounts/accountsActions.ts
@@ -35,6 +35,7 @@ type CreateAccountActionProps = {
     accountInfo: AccountInfo;
     imported?: boolean;
     accountLabel?: string;
+    visible: boolean;
 };
 
 type CreateIndexLabeledAccountActionProps = Omit<
@@ -48,6 +49,7 @@ const composeCreateAccountActionPayload = ({
     accountInfo,
     imported,
     accountLabel,
+    visible,
 }: CreateAccountActionProps): Account => ({
     deviceState,
     accountLabel,
@@ -69,10 +71,7 @@ const composeCreateAccountActionPayload = ({
         : {
               backendType: discoveryItem.backendType,
           }),
-    visible:
-        !accountInfo.empty ||
-        discoveryItem.accountType === 'coinjoin' ||
-        (discoveryItem.accountType === 'normal' && discoveryItem.index === 0),
+    visible,
     balance: accountInfo.balance,
     availableBalance: accountInfo.availableBalance,
     formattedBalance: formatNetworkAmount(
@@ -96,8 +95,14 @@ const createIndexLabeledAccount = createAction(
         deviceState,
         discoveryItem,
         accountInfo,
+        visible,
     }: CreateIndexLabeledAccountActionProps): { payload: Account } => ({
-        payload: composeCreateAccountActionPayload({ deviceState, discoveryItem, accountInfo }),
+        payload: composeCreateAccountActionPayload({
+            deviceState,
+            discoveryItem,
+            accountInfo,
+            visible,
+        }),
     }),
 );
 
@@ -109,13 +114,15 @@ const createAccount = createAction(
         accountInfo,
         imported,
         accountLabel,
+        visible,
     }: CreateAccountActionProps): { payload: Account } => ({
         payload: composeCreateAccountActionPayload({
             deviceState,
             discoveryItem,
             accountInfo,
             imported,
             accountLabel,
+            visible,
         }),
     }),
 );

diff --git a/suite-common/wallet-core/src/accounts/tests/accountsReducer.test.ts b/suite-common/wallet-core/src/accounts/tests/accountsReducer.test.ts
@@ -58,6 +58,7 @@ describe('Account Reducer', () => {
                         unconfirmed: 0,
                     },
                 },
+                visible: true,
             }),
         );
         expect(store.getState().wallet.accounts.length).toEqual(1);

diff --git a/suite-common/wallet-core/src/discovery/discoveryThunks.ts b/suite-common/wallet-core/src/discovery/discoveryThunks.ts
@@ -148,6 +148,8 @@ const handleProgressThunk = createThunk(
                     deviceState,
                     discoveryItem: item,
                     accountInfo: response,
+                    // first normal account is always visible on web & desktop (but not in suite-native)
+                    visible: (item.accountType === 'normal' && item.index === 0) || !response.empty,
                 }),
             );
         }

diff --git a/suite-native/assets/src/assetsSelectors.ts b/suite-native/assets/src/assetsSelectors.ts
@@ -6,7 +6,7 @@ import {
     AccountsRootState,
     DeviceRootState,
     FiatRatesRootState,
-    selectDeviceAccounts,
+    selectVisibleDeviceAccounts,
     selectFiatRatesByFiatRateKey,
 } from '@suite-common/wallet-core';
 import { getFiatRateKey, toFiatCurrency } from '@suite-common/wallet-utils';
@@ -29,7 +29,7 @@ const sumBalance = (balances: string[]): BigNumber =>
 
 export const selectDeviceBalancesPerNetwork = memoize(
     (state: AssetsRootState & DeviceRootState): FormattedAssets => {
-        const accounts = selectDeviceAccounts(state);
+        const accounts = selectVisibleDeviceAccounts(state);
 
         const assets: Assets = {};
         accounts.forEach(account => {

diff --git a/suite-native/discovery/src/discoveryThunks.ts b/suite-native/discovery/src/discoveryThunks.ts
@@ -205,6 +205,7 @@ const addAccountByDescriptorThunk = createThunk(
                     discoveryItem: bundleItem,
                     deviceState,
                     accountInfo,
+                    visible: true,
                 }),
             );
 
@@ -262,6 +263,7 @@ const discoverAccountsByDescriptorThunk = createThunk(
                         discoveryItem: bundleItem,
                         deviceState,
                         accountInfo,
+                        visible: !accountInfo.empty,
                     }),
                 );
             }

diff --git a/suite-native/module-accounts-import/src/accountsImportThunks.ts b/suite-native/module-accounts-import/src/accountsImportThunks.ts
@@ -66,6 +66,7 @@ export const importAccountThunk = createThunk(
                     accountInfo,
                     imported,
                     accountLabel,
+                    visible: true,
                 }),
             );
         }