pr comment

Author: ruijialin-avalabs

packages/core-mobile/app/services/balance/BalanceService.ts

@@ -1,6 +1,6 @@
 import { Network } from '@avalabs/core-chains-sdk'
 import { Account } from 'store/account/types'
-import { getAddressByNetwork, getAddressesForXP } from 'store/account/utils'
+import { getAddressByNetwork } from 'store/account/utils'
 import {
   type NetworkContractToken,
   type TokenWithBalance,
@@ -12,7 +12,7 @@ import { mapToVmNetwork } from 'vmModule/utils/mapToVmNetwork'
 import { coingeckoInMemoryCache } from 'utils/coingeckoInMemoryCache'
 import { NetworkVMType } from '@avalabs/core-chains-sdk'
 import { chunk, uniqWith } from 'lodash'
-import { RootState } from 'store/types'
+import { NetworkAddresses } from 'services/wallet/types';
 
 export type BalancesForAccount = {
   accountId: string
@@ -77,13 +77,12 @@ export class BalanceService {
   async getBalancesForAccountsXP({
     currency,
     network,
-    state
+    activeAddresses
   }: {
     currency: string
     network: Network
-    state: RootState
+    activeAddresses: NetworkAddresses
   }): Promise<BalancesForAccount> {
-    const activeAddresses = await getAddressesForXP(state)
     const externalAddresses = activeAddresses.externalAddresses.map(
       address => address.address
     )

packages/core-mobile/app/store/account/utils.ts

@@ -7,19 +7,15 @@ import SeedlessWallet from 'seedless/services/wallet/SeedlessWallet'
 import { transactionSnackbar } from 'common/utils/toast'
 import Logger from 'utils/Logger'
 import AccountsService from 'services/account/AccountsService'
-import { AppListenerEffectAPI, RootState } from 'store/types'
+import { AppListenerEffectAPI } from 'store/types'
 import { recentAccountsStore } from 'features/accountSettings/store'
 import { uuid } from 'utils/uuid'
 import { Wallet } from 'store/wallet/types'
 import { commonStorage } from 'utils/mmkv'
 import { StorageKey } from 'resources/Constants'
 import { appendToStoredArray, loadArrayFromStorage } from 'utils/mmkv/storages'
-import {
-  selectActiveWalletId,
-  setIsMigratingActiveAccounts
-} from 'store/wallet/slice'
+import { setIsMigratingActiveAccounts } from 'store/wallet/slice'
 import WalletService from 'services/wallet/WalletService'
-import { selectIsDeveloperMode } from 'store/settings/advanced'
 import { setNonActiveAccounts } from './slice'
 
 export function getAddressByVM(
@@ -208,10 +204,9 @@ const markWalletAsMigrated = (walletId: string): void => {
   )
 }
 export async function getAddressesForXP(
-  state: RootState
+  isDeveloperMode: boolean,
+  walletId: string | null
 ): Promise<NetworkAddresses> {
-  const walletId = selectActiveWalletId(state)
-  const isDeveloperMode = selectIsDeveloperMode(state)
   if (!walletId) {
     throw new Error('Wallet ID is required')
   }

packages/core-mobile/app/store/balance/listeners.ts

@@ -43,6 +43,8 @@ import { ReactQueryKeys } from 'consts/reactQueryKeys'
 import { queryClient } from 'contexts/ReactQueryProvider'
 import { selectIsSolanaSupportBlocked } from 'store/posthog'
 import { runAfterInteractions } from 'utils/runAfterInteractions'
+import { getAddressesForXP } from 'store/account/utils'
+import { selectActiveWalletId } from 'store/wallet/slice'
 import {
   Balances,
   LocalTokenWithBalance,
@@ -204,6 +206,8 @@ const onXpBalanceUpdateCore = async ({
   const state = getState()
   const currentStatus = selectXpBalanceStatus(state)
   const enabledNetworks = selectEnabledNetworks(state)
+  const isDeveloperMode = selectIsDeveloperMode(state)
+  const walletId = selectActiveWalletId(state)
 
   const networks = enabledNetworks.filter(
     n => isPChain(n.chainId) || isXChain(n.chainId)
@@ -234,13 +238,15 @@ const onXpBalanceUpdateCore = async ({
         promise: Promise<BalancesForAccount>
       }[] = []
 
+      const activeAddresses = await getAddressesForXP(isDeveloperMode, walletId)
+
       for (const n of networks) {
         networkPromises.push({
           key: getKey(n.chainId, n.vmName),
           promise: BalanceService.getBalancesForAccountsXP({
             network: n,
             currency,
-            state
+            activeAddresses
           })
         })
       }