fix(suite-native): unmemoized selectors

trezor · Nov 27, 2024 · 61b7899 · 61b7899
1 parent 6d4dba8
commit 61b7899
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 45 deletions.
diff --git a/suite-native/assets/src/assetsSelectors.ts b/suite-native/assets/src/assetsSelectors.ts
@@ -57,21 +57,22 @@ export const selectVisibleDeviceAccountsKeysByNetworkSymbol = (
     return accounts.map(account => account.key);
 };
 
-export const selectDeviceNetworksWithAssets = (state: AssetsRootState) => {
-    const accounts = selectVisibleDeviceAccounts(state);
-
-    return pipe(
-        accounts,
-        A.map(account => account.symbol),
-        A.uniq,
-        A.sort((a, b) => {
-            const aOrder = orderedNetworkSymbols.indexOf(a) ?? Number.MAX_SAFE_INTEGER;
-            const bOrder = orderedNetworkSymbols.indexOf(b) ?? Number.MAX_SAFE_INTEGER;
-
-            return aOrder - bOrder;
-        }),
-    );
-};
+export const selectDeviceNetworksWithAssets = createMemoizedSelector(
+    [selectVisibleDeviceAccounts],
+    accounts => {
+        return pipe(
+            accounts,
+            A.map(account => account.symbol),
+            A.uniq,
+            A.sort((a, b) => {
+                const aOrder = orderedNetworkSymbols.indexOf(a) ?? Number.MAX_SAFE_INTEGER;
+                const bOrder = orderedNetworkSymbols.indexOf(b) ?? Number.MAX_SAFE_INTEGER;
+
+                return aOrder - bOrder;
+            }),
+        );
+    },
+);
 
 export const selectBottomSheetDeviceNetworkItems = createMemoizedSelector(
     [
@@ -154,29 +155,34 @@ export const selectAssetCryptoValue = (state: AssetsRootState, symbol: NetworkSy
     return asset?.assetBalance ?? '0';
 };
 
-export const selectAssetFiatValue = (state: AssetsRootState, symbol: NetworkSymbol) => {
-    const assets = selectDeviceAssetsWithBalances(state);
-    const asset = assets.assets.find(a => a.symbol === symbol);
-
-    return asset?.fiatBalance ?? null;
-};
+export const selectAssetFiatValue = createMemoizedSelector(
+    [selectDeviceAssetsWithBalances, (_state, networkSymbol: NetworkSymbol) => networkSymbol],
+    (assets, networkSymbol) => {
+        const asset = assets.assets.find(a => a.symbol === networkSymbol);
 
-const selectAssetsFiatValuePercentage = (state: AssetsRootState) => {
-    const assets = selectDeviceAssetsWithBalances(state);
-    const percentages = calculateAssetsPercentage(assets.assets);
+        return asset?.fiatBalance ?? null;
+    },
+);
 
-    return percentages;
-};
+const selectAssetsFiatValuePercentage = createMemoizedSelector(
+    [selectDeviceAssetsWithBalances],
+    assets => {
+        const percentages = calculateAssetsPercentage(assets.assets);
 
-export const selectAssetFiatValuePercentage = (state: AssetsRootState, symbol: NetworkSymbol) => {
-    const assetsPercentages = selectAssetsFiatValuePercentage(state);
+        return percentages;
+    },
+);
 
-    const asset = assetsPercentages.find(a => a.symbol === symbol);
+export const selectAssetFiatValuePercentage = createMemoizedSelector(
+    [selectAssetsFiatValuePercentage, (_state, networkSymbol: NetworkSymbol) => networkSymbol],
+    (assetsPercentages, networkSymbol) => {
+        const asset = assetsPercentages.find(a => a.symbol === networkSymbol);
 
-    const assetPercentage = {
-        fiatPercentage: Math.ceil(asset?.fiatPercentage ?? 0),
-        fiatPercentageOffset: Math.floor(asset?.fiatPercentageOffset ?? 0),
-    };
+        const assetPercentage = {
+            fiatPercentage: Math.ceil(asset?.fiatPercentage ?? 0),
+            fiatPercentageOffset: Math.floor(asset?.fiatPercentageOffset ?? 0),
+        };
 
-    return assetPercentage;
-};
+        return assetPercentage;
+    },
+);
diff --git a/suite-native/tokens/src/tokensSelectors.ts b/suite-native/tokens/src/tokensSelectors.ts
@@ -288,13 +288,16 @@ export const selectAccountHasAnyKnownToken = (state: TokensRootState, accountKey
     return anyOfTokensIsKnown;
 };
 
-export const selectNetworkSymbolsOfAccountsWithTokensAllowed = (state: TokensRootState) =>
-    selectAccounts(state)
-        .filter(a => isCoinWithTokens(a.symbol))
-        .reduce((acc, account) => {
-            if (!acc.includes(account.symbol)) {
-                acc.push(account.symbol);
-            }
-
-            return acc;
-        }, new Array<NetworkSymbol>());
+export const selectNetworkSymbolsOfAccountsWithTokensAllowed = createMemoizedSelector(
+    [selectAccounts],
+    accounts =>
+        accounts
+            .filter(a => isCoinWithTokens(a.symbol))
+            .reduce((acc, account) => {
+                if (!acc.includes(account.symbol)) {
+                    acc.push(account.symbol);
+                }
+
+                return acc;
+            }, new Array<NetworkSymbol>()),
+);