start fetching balance

MetaMask · Dec 13, 2024 · 6de9d8b · 6de9d8b
1 parent 373bf9e
commit 6de9d8b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 17 deletions.
diff --git a/app/components/UI/Tokens/TokenList/PortfolioBalance/index.tsx b/app/components/UI/Tokens/TokenList/PortfolioBalance/index.tsx
@@ -54,6 +54,7 @@ import {
 import { InternalAccount } from '@metamask/keyring-api';
 import { getChainIdsToPoll } from '../../../../../selectors/tokensController';
 import AggregatedPercentageCrossChains from '../../../../../component-library/components-temp/Price/AggregatedPercentage/AggregatedPercentageCrossChains';
+import { selectMultichainSelectedAccountCachedBalance } from '../../../../../selectors/multichain';
 
 export const PortfolioBalance = () => {
   const { PreferencesController } = Engine.context;
@@ -102,6 +103,15 @@ export const PortfolioBalance = () => {
   const browserTabs = useSelector((state: RootState) => state.browser.tabs);
   const privacyMode = useSelector(selectPrivacyMode);
 
+  const multichainSelectedAccountCachedBalance = useSelector(
+    selectMultichainSelectedAccountCachedBalance,
+  );
+
+  console.log(
+    'multichainSelectedAccountCachedBalance',
+    multichainSelectedAccountCachedBalance,
+  );
+
   const isOriginalNativeTokenSymbol = useIsOriginalNativeTokenSymbol(
     chainId,
     ticker,

diff --git a/app/components/Views/Wallet/index.tsx b/app/components/Views/Wallet/index.tsx
@@ -571,7 +571,7 @@ const Wallet = ({
           </View>
         ) : null}
         <>
-          {accountBalanceByChainId && <PortfolioBalance />}
+          <PortfolioBalance />
           <ScrollableTabView
             renderTabBar={renderTabBar}
             // eslint-disable-next-line react/jsx-no-bind

diff --git a/app/core/Engine/Engine.ts b/app/core/Engine/Engine.ts
@@ -1212,7 +1212,7 @@ export class Engine {
 
           return Boolean(
             hasProperty(showIncomingTransactions, currentChainId) &&
-            showIncomingTransactions?.[currentHexChainId],
+              showIncomingTransactions?.[currentHexChainId],
           );
         },
         updateTransactions: true,
@@ -1827,7 +1827,7 @@ export class Engine {
 
         const tokenBalances =
           allTokenBalances?.[selectedInternalAccount.address as Hex]?.[
-          chainId
+            chainId
           ] ?? {};
         tokens.forEach(
           (item: { address: string; balance?: string; decimals: number }) => {
@@ -1838,9 +1838,9 @@ export class Engine {
               item.balance ||
               (item.address in tokenBalances
                 ? renderFromTokenMinimalUnit(
-                  tokenBalances[item.address as Hex],
-                  item.decimals,
-                )
+                    tokenBalances[item.address as Hex],
+                    item.decimals,
+                  )
                 : undefined);
             const tokenBalanceFiat = balanceToFiatNumber(
               // TODO: Fix this by handling or eliminating the undefined case
@@ -2143,6 +2143,10 @@ export default {
       ApprovalController,
       LoggingController,
       AccountsController,
+      ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+      MultichainBalancesController,
+      RatesController,
+      ///: END:ONLY_INCLUDE_IF
     } = instance.datamodel.state;
 
     return {
@@ -2177,6 +2181,10 @@ export default {
       ApprovalController,
       LoggingController,
       AccountsController,
+      ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+      MultichainBalancesController,
+      RatesController,
+      ///: END:ONLY_INCLUDE_IF
     };
   },
 

diff --git a/app/selectors/multichain.ts b/app/selectors/multichain.ts
@@ -33,6 +33,7 @@ import { selectTokenMarketData } from './tokenRatesController';
 import { isMainNet } from '../util/networks';
 import { isEvmAccountType } from '@metamask/keyring-api';
 import { createDeepEqualSelector } from './util';
+import Engine from '../core/Engine/Engine';
 
 interface NativeTokenBalance {
   balance: string;
@@ -300,8 +301,13 @@ export const selectMultichainIsMainnet = createSelector(
  * @param state - Root redux state
  * @returns - MultichainBalancesController state
  */
-const selectMultichainBalancesControllerState = (state: RootState) =>
-  state.engine.backgroundState.MultichainBalancesController;
+const selectMultichainBalancesControllerState = (state: RootState) => {
+  console.log(
+    'selectMultichainBalancesControllerState',
+    JSON.stringify(state.engine.backgroundState.MultichainBalancesController),
+  );
+  return state.engine.backgroundState.MultichainBalancesController;
+};
 
 export const selectMultichainBalances = createDeepEqualSelector(
   selectMultichainBalancesControllerState,
@@ -322,16 +328,17 @@ const selectBtcCachedBalance = createDeepEqualSelector(
   },
 );
 
-export const selectMultichainSelectedAccountCachedBalance = createSelector(
-  selectMultichainIsEvm,
-  selectAccountBalanceByChainId,
-  selectBtcCachedBalance,
-  (isEvm, accountBalanceByChainId, btcCachedBalance) =>
-    isEvm ? accountBalanceByChainId?.balance ?? '0x0' : btcCachedBalance,
-);
+export const selectMultichainSelectedAccountCachedBalance =
+  createDeepEqualSelector(
+    selectMultichainIsEvm,
+    selectAccountBalanceByChainId,
+    selectBtcCachedBalance,
+    (isEvm, accountBalanceByChainId, btcCachedBalance) =>
+      isEvm ? accountBalanceByChainId?.balance ?? '0x0' : btcCachedBalance,
+  );
 
 export const selectMultichainSelectedAccountCachedBalanceIsZero =
-  createSelector(
+  createDeepEqualSelector(
     selectMultichainSelectedAccountCachedBalance,
     selectMultichainIsEvm,
     (balance, isEvm) => {
@@ -341,7 +348,7 @@ export const selectMultichainSelectedAccountCachedBalanceIsZero =
     },
   );
 
-export const selectMultichainConversionRate = createSelector(
+export const selectMultichainConversionRate = createDeepEqualSelector(
   selectMultichainIsEvm,
   selectConversionRate,
   selectCurrencyRates,