fix: codefencing and feedback

Author: sahar-fehri

app/component-library/components-temp/Price/AggregatedPercentage/NonEvmAggregatedPercentage.test.tsx

@@ -13,7 +13,7 @@ import * as multichain from '../../../../selectors/multichain/multichain';
 import { selectMultichainAssetsRates } from '../../../../selectors/multichain/multichain';
 
 const mockGetMultichainNetworkAggregatedBalance = {
-  balances: {
+  tokenBalances: {
     'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
       amount: '1',
       unit: 'SOL',

app/components/UI/Tokens/TokenList/TokenListItem/index.tsx

@@ -1,6 +1,10 @@
 import React, { useCallback, useMemo } from 'react';
 import { View } from 'react-native';
-import { CaipAssetType, Hex, isCaipChainId } from '@metamask/utils';
+import {
+  ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+  CaipAssetType,
+  ///: END:ONLY_INCLUDE_IF(keyring-snaps)
+  Hex, isCaipChainId } from '@metamask/utils';
 import { useSelector } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 import useTokenBalancesController from '../../../../hooks/useTokenBalancesController/useTokenBalancesController';
@@ -58,7 +62,7 @@ import { CustomNetworkNativeImgMapping } from './CustomNetworkNativeImgMapping';
 import { TraceName, trace } from '../../../../../util/trace';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { selectMultichainAssetsRates } from '../../../../../selectors/multichain/multichain';
-///: END:ONLY_INCLUDE_IF
+///: END:ONLY_INCLUDE_IF(keyring-snaps)
 import useEarnTokens from '../../../Earn/hooks/useEarnTokens';
 import {
   selectPooledStakingEnabledFlag,
@@ -116,11 +120,9 @@ export const TokenListItem = React.memo(
     );
 
     const styles = createStyles(colors);
-
     ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
     const allMultichainAssetsRates = useSelector(selectMultichainAssetsRates);
-    ///: END:ONLY_INCLUDE_IF
-
+    ///: END:ONLY_INCLUDE_IF(keyring-snaps)
     const itemAddress = isEvmNetworkSelected
       ? safeToChecksumAddress(asset.address)
       : asset.address;
@@ -179,24 +181,25 @@ export const TokenListItem = React.memo(
       ],
     );
 
-    let pricePercentChange1d;
-
-    if (isEvmNetworkSelected) {
+    const getPricePercentChange1d = () => {
       const tokenPercentageChange = asset.address
-        ? multiChainMarketData?.[chainId as Hex]?.[asset.address as Hex]
-            ?.pricePercentChange1d
-        : undefined;
-
-      pricePercentChange1d = asset.isNative
-        ? multiChainMarketData?.[chainId as Hex]?.[
-            getNativeTokenAddress(chainId as Hex) as Hex
-          ]?.pricePercentChange1d
-        : tokenPercentageChange;
-    } else {
-      pricePercentChange1d =
-        allMultichainAssetsRates[asset?.address as CaipAssetType]?.marketData
+      ? multiChainMarketData?.[chainId as Hex]?.[asset.address as Hex]
+          ?.pricePercentChange1d
+      : undefined;
+      const evmPricePercentChange1d = asset.isNative
+      ? multiChainMarketData?.[chainId as Hex]?.[
+          getNativeTokenAddress(chainId as Hex) as Hex
+        ]?.pricePercentChange1d
+      : tokenPercentageChange;
+      if(isEvmNetworkSelected){
+        return evmPricePercentChange1d;
+      }
+      ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+      return allMultichainAssetsRates[asset?.address as CaipAssetType]?.marketData
           ?.pricePercentChange?.P1D;
-    }
+      ///: END:ONLY_INCLUDE_IF(keyring-snaps)
+    };
+
     // render balances according to primary currency
     let mainBalance;
     let secondaryBalance;
@@ -407,7 +410,7 @@ export const TokenListItem = React.memo(
             {renderEarnCta()}
           </View>
           {!isTestNet(chainId) && showPercentageChange ? (
-            <PercentageChange value={pricePercentChange1d} />
+            <PercentageChange value={getPricePercentChange1d()} />
           ) : null}
         </View>
         <ScamWarningIcon

app/selectors/multichain/multichain.test.ts

@@ -785,7 +785,7 @@ describe('MultichainNonEvm Selectors', () => {
       // Should return undefined values since there are no Solana assets
       expect(result.totalNativeTokenBalance).toBeUndefined();
       expect(result.totalBalanceFiat).toBeUndefined();
-      expect(result.balances).toEqual({
+      expect(result.tokenBalances).toEqual({
         [btcNativeAssetId]: { amount: '0.5', unit: 'BTC' },
       });
     });

app/selectors/multichain/multichain.ts

@@ -31,7 +31,6 @@ import {
   MultichainBalancesControllerState,
 } from '@metamask/assets-controllers';
 import { SupportedCaipChainId } from '@metamask/multichain-network-controller';
-import { createSelector } from 'reselect';
 
 /**
  * @deprecated TEMPORARY SOURCE OF TRUTH TBD
@@ -209,16 +208,11 @@ export function selectMultichainAssetsRatesState(state: RootState) {
     .conversionRates;
 }
 
-export const selectMultichainAssetsRatesDeepSelector = createDeepEqualSelector(
+export const selectMultichainAssetsRates = createDeepEqualSelector(
   selectMultichainAssetsRatesState,
   (conversionRates) => conversionRates,
 );
 
-export const selectMultichainAssetsRates = createSelector(
-  selectMultichainAssetsRatesDeepSelector,
-  (conversionRates) => conversionRates,
-);
-
 export function selectMultichainHistoricalPrices(state: RootState) {
   return state.engine.backgroundState.MultichainAssetsRatesController
     .historicalPrices;
@@ -307,7 +301,7 @@ export const selectMultichainTokenList = createDeepEqualSelector(
 export interface MultichainNetworkAggregatedBalance {
   totalNativeTokenBalance: Balance | undefined;
   totalBalanceFiat: number | undefined;
-  balances: Record<string, Balance> | undefined;
+  tokenBalances: Record<string, Balance> | undefined;
   fiatBalances: Record<CaipAssetType, string> | undefined;
 }
 
@@ -364,7 +358,7 @@ export const getMultichainNetworkAggregatedBalance = (
     totalBalanceFiat: totalBalanceFiat
       ? totalBalanceFiat.toNumber()
       : undefined,
-    balances,
+    tokenBalances: balances,
     fiatBalances,
   };
 };
@@ -387,7 +381,7 @@ export const selectSelectedAccountMultichainNetworkAggregatedBalance =
         return {
           totalNativeTokenBalance: undefined,
           totalBalanceFiat: undefined,
-          balances: {},
+          tokenBalances: {},
           fiatBalances: {},
         };
       }