chore(runway): cherry-pick fix: MUSD-266 staked ethereum balance mismatch (#25580)

runway-github[bot] · Matt561 · joaoloureirop · web-flow · commit 212cbd08a2f1 · 2026-02-03T20:55:01.000Z
- fix: cp-7.64.0 MUSD-266 staked ethereum balance mismatch (#25468)  ## **Description** Fixed bug where Staked Ethereum balances weren't updating when switching accounts.  ## **Changelog**  CHANGELOG entry: fixed bug where Staked Ethereum balances weren't updating when switching accounts. ## **Related issues** Fixes: [MUSD-266: Staked Ethereum Balance Mismatch](https://consensyssoftware.atlassian.net/browse/MUSD-266) ## **Manual testing steps** ```gherkin Feature: Correct staked asset balances per account Scenario: user switches accounts and sees staked Ethereum balance update Given user has multiple EVM accounts with different Ethereum and Staked Ethereum balances When user switches the selected account Then the displayed Ethereum balance matches the selected account And the displayed Staked Ethereum balance matches the selected account Scenario: user views a staked token and sees the staked balance (not the native counterpart) Given user has a staked token balance When user opens the token details view for the staked token Then the displayed balance corresponds to the staked asset ``` ## **Screenshots/Recordings**  ### **Before**  1. Staked Ethereum doesn't update when switching accounts 2. Staked Ethereum AssetOverview was displaying the user's **native** ETH balance ### **After**  1. Staked Ethereum now updates when switching accounts 2. Staked Ethereum on balance in TokenListItem now matches balance on AssetOverview screen https://github.com/user-attachments/assets/8ba8ed5b-b499-4739-8b8b-895d1a09a47c ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I've included tests if applicable - [x] I've documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I've applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.  --- > [!NOTE] > **Medium Risk** > Changes core `selectAsset` lookup behavior for EVM chains and alters displayed fiat formatting/rounding for staked balances, which could impact multiple balance/asset UI surfaces when switching accounts. > > **Overview** > Fixes a bug where **Staked Ethereum** could display the wrong account’s balance after switching accounts by scoping `selectAsset` results (native and staked) to `selectSelectedInternalAccountId` on EVM chains. > > Updates `useBalance` to source staked native asset fiat values from `selectAsset` (matching the token list’s Intl formatting) with a `weiToFiat` fallback, and adjusts/extends tests accordingly (including new coverage for account-scoped lookups and updated expected fiat strings). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 32c383d. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup>  [aeee852](aeee852) Co-authored-by: Matthew Grainger <46547583+Matt561@users.noreply.github.com> Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com>
diff --git a/app/components/UI/Earn/hooks/useEarnWithdrawInput.test.ts b/app/components/UI/Earn/hooks/useEarnWithdrawInput.test.ts
@@ -19,6 +19,7 @@ jest.mock('./useInput');
 jest.mock('./useEarnGasFee');
 
 jest.mock('../../../../selectors/currencyRateController', () => ({
+  selectCurrencyRates: jest.fn(() => ({})),
   selectCurrentCurrency: jest.fn(() => 'USD'),
 }));
 
diff --git a/app/components/UI/Stake/hooks/useBalance.test.tsx b/app/components/UI/Stake/hooks/useBalance.test.tsx
@@ -97,7 +97,7 @@ describe('useBalance', () => {
     expect(result.current.stakedBalanceWei).toBe('5791332670714232000'); // No staked assets
     expect(result.current.formattedStakedBalanceETH).toBe('5.79133 ETH'); // Formatted ETH balance
     expect(result.current.stakedBalanceFiatNumber).toBe(18532.26454); // Staked balance in fiat number
-    expect(result.current.formattedStakedBalanceFiat).toBe('$18532.26'); //
+    expect(result.current.formattedStakedBalanceFiat).toBe('$18,532.26'); // Intl-formatted fiat
   });
 
   it('returns default values when no selected address and no account data', async () => {
@@ -185,10 +185,10 @@ describe('useBalance', () => {
     expect(result.current.stakedBalanceWei).toBe('99999999990000000000000'); // No staked assets
     expect(result.current.formattedStakedBalanceETH).toBe('99999.99999 ETH'); // Formatted ETH balance
     expect(result.current.stakedBalanceFiatNumber).toBe(319999999.968); // Staked balance in fiat number
-    expect(result.current.formattedStakedBalanceFiat).toBe('$319999999.96'); // should round to floor
+    expect(result.current.formattedStakedBalanceFiat).toBe('$319,999,999.97'); // Intl-formatted fiat
   });
 
-  it('returns correct stake amounts and fiat values when chainId is overriden', async () => {
+  it('returns correct stake amounts and fiat values when chainId is overridden', async () => {
     const { result } = renderHookWithProvider(() => useBalance('0x4268'), {
       state: initialState,
     });
@@ -202,6 +202,6 @@ describe('useBalance', () => {
     expect(result.current.stakedBalanceWei).toBe('5791332670714232000');
     expect(result.current.formattedStakedBalanceETH).toBe('5.79133 ETH'); // Formatted ETH balance
     expect(result.current.stakedBalanceFiatNumber).toBe(18532.26454); // Staked balance in fiat number
-    expect(result.current.formattedStakedBalanceFiat).toBe('$18532.26'); //
+    expect(result.current.formattedStakedBalanceFiat).toBe('$18532.26'); // Fallback formatting when selector has no staked asset for chain
   });
 });
diff --git a/app/components/UI/Stake/hooks/useBalance.ts b/app/components/UI/Stake/hooks/useBalance.ts
@@ -1,13 +1,15 @@
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { Hex } from '@metamask/utils';
+import { getNativeTokenAddress } from '@metamask/assets-controllers';
 import { selectSelectedInternalAccountByScope } from '../../../../selectors/multichainAccounts/accounts';
 import { selectAccountsByChainId } from '../../../../selectors/accountTrackerController';
 import {
   selectCurrencyRates,
   selectCurrentCurrency,
 } from '../../../../selectors/currencyRateController';
 import { selectEvmChainId } from '../../../../selectors/networkController';
+import { RootState } from '../../../../reducers';
 import {
   hexToBN,
   renderFromWei,
@@ -16,6 +18,7 @@ import {
 } from '../../../../util/number';
 import { getFormattedAddressFromInternalAccount } from '../../../../core/Multichain/utils';
 import { EVM_SCOPE } from '../../Earn/constants/networks';
+import { selectAsset } from '../../../../selectors/assets/assets-list';
 
 const useBalance = (chainId?: Hex) => {
   const accountsByChainId = useSelector(selectAccountsByChainId);
@@ -68,18 +71,30 @@ const useBalance = (chainId?: Hex) => {
     [stakedBalance, conversionRate],
   );
 
-  const formattedStakedBalanceFiat = useMemo(
-    () =>
-      weiToFiat(
-        // TODO: Replace "any" with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        hexToBN(stakedBalance) as any,
-        conversionRate,
-        currentCurrency,
-      ),
-    [currentCurrency, stakedBalance, conversionRate],
+  const stakedNativeAssetBalanceFiat = useSelector(
+    (state: RootState) =>
+      selectAsset(state, {
+        address: getNativeTokenAddress(balanceChainId),
+        chainId: balanceChainId,
+        isStaked: true,
+      })?.balanceFiat,
   );
 
+  const formattedStakedBalanceFiat = useMemo(() => {
+    // Match the fiat balance seen in the asset list.
+    // Fallback to the weiToFiat function if the staked native asset balance fiat is not available.
+    if (stakedNativeAssetBalanceFiat) {
+      return stakedNativeAssetBalanceFiat;
+    }
+
+    return weiToFiat(hexToBN(stakedBalance), conversionRate, currentCurrency);
+  }, [
+    conversionRate,
+    currentCurrency,
+    stakedBalance,
+    stakedNativeAssetBalanceFiat,
+  ]);
+
   return {
     balanceETH,
     balanceFiat,
diff --git a/app/selectors/assets/assets-list.test.ts b/app/selectors/assets/assets-list.test.ts
@@ -733,6 +733,130 @@ describe('selectAsset', () => {
     });
   });
 
+  it('scopes native and staked lookups to selected account', () => {
+    const stateWithSecondEvm = mockState();
+    const account1Id =
+      stateWithSecondEvm.engine.backgroundState.AccountsController
+        .internalAccounts.selectedAccount;
+
+    const account2Id = '11111111-1111-1111-1111-111111111111';
+    const account2Address = '0x1111111111111111111111111111111111111111';
+    const account2AddressLowercased = account2Address.toLowerCase();
+
+    const withSelectedAccount = (
+      state: RootState,
+      selectedAccount: string,
+    ): RootState => ({
+      ...state,
+      engine: {
+        ...state.engine,
+        backgroundState: {
+          ...state.engine.backgroundState,
+          AccountsController: {
+            ...state.engine.backgroundState.AccountsController,
+            internalAccounts: {
+              ...state.engine.backgroundState.AccountsController
+                .internalAccounts,
+              selectedAccount,
+            },
+          },
+        },
+      },
+    });
+
+    // Add second EVM internal account into the same selected account group
+    stateWithSecondEvm.engine.backgroundState.AccountsController.internalAccounts.accounts[
+      account2Id
+    ] = {
+      id: account2Id,
+      address: account2Address,
+      options: {},
+      methods: [],
+      scopes: ['eip155:0'],
+      type: 'eip155:eoa',
+      metadata: {
+        name: 'Account 2',
+        importTime: 0,
+        keyring: {
+          type: 'HD Key Tree',
+        },
+      },
+    };
+
+    const groupId = 'entropy:01K1TJY9QPSCKNBSVGZNG510GJ/0';
+    const walletId = 'entropy:01K1TJY9QPSCKNBSVGZNG510GJ';
+    stateWithSecondEvm.engine.backgroundState.AccountTreeController.accountTree.wallets[
+      walletId
+    ].groups[groupId].accounts = [
+      ...stateWithSecondEvm.engine.backgroundState.AccountTreeController
+        .accountTree.wallets[walletId].groups[groupId].accounts,
+      account2Id,
+    ];
+
+    // Provide AccountTracker balances for second address on mainnet
+    stateWithSecondEvm.engine.backgroundState.AccountTrackerController.accountsByChainId[
+      '0x1'
+    ][account2AddressLowercased] = {
+      balance: '0x0DE0B6B3A7640000', // 1 ETH
+      stakedBalance: '0x1BC16D674EC80000', // 2 ETH
+    };
+
+    // Provide empty token lists/balances for second address to keep asset building stable
+    stateWithSecondEvm.engine.backgroundState.TokensController.allTokens['0x1'][
+      account2AddressLowercased
+    ] = [];
+    stateWithSecondEvm.engine.backgroundState.TokensController.allTokens['0xa'][
+      account2AddressLowercased
+    ] = [];
+    (
+      stateWithSecondEvm.engine.backgroundState.TokenBalancesController
+        .tokenBalances as Record<string, unknown>
+    )[account2AddressLowercased] = {};
+
+    // Sanity check: original account still resolves correctly
+    const stateForAccount1 = withSelectedAccount(
+      stateWithSecondEvm,
+      account1Id,
+    );
+
+    const stakedForAccount1 = selectAsset(stateForAccount1, {
+      address: '0x0000000000000000000000000000000000000000',
+      chainId: '0x1',
+      isStaked: true,
+    });
+    expect(stakedForAccount1?.balance).toBe('100');
+
+    // Switch selected account → balances should follow
+    const stateForAccount2 = withSelectedAccount(
+      stateWithSecondEvm,
+      account2Id,
+    );
+
+    const nativeForAccount2 = selectAsset(stateForAccount2, {
+      address: '0x0000000000000000000000000000000000000000',
+      chainId: '0x1',
+      isStaked: false,
+    });
+    expect(nativeForAccount2).toMatchObject({
+      name: 'Ethereum',
+      balance: '1',
+      balanceFiat: '$2,400.00',
+      isStaked: false,
+    });
+
+    const stakedForAccount2 = selectAsset(stateForAccount2, {
+      address: '0x0000000000000000000000000000000000000000',
+      chainId: '0x1',
+      isStaked: true,
+    });
+    expect(stakedForAccount2).toMatchObject({
+      name: 'Staked Ethereum',
+      balance: '2',
+      balanceFiat: '$4,800.00',
+      isStaked: true,
+    });
+  });
+
   it('returns formatted evm token asset based on filter criteria', () => {
     const state = mockState();
     const result = selectAsset(state, {
diff --git a/app/selectors/assets/assets-list.ts b/app/selectors/assets/assets-list.ts
@@ -28,7 +28,10 @@ import {
 } from '../../core/Multichain/constants';
 import { sortAssetsWithPriority } from '../../components/UI/Tokens/util/sortAssetsWithPriority';
 import { selectAllTokens } from '../tokensController';
-import { selectSelectedInternalAccountAddress } from '../accountsController';
+import {
+  selectSelectedInternalAccountAddress,
+  selectSelectedInternalAccountId,
+} from '../accountsController';
 
 const getStateForAssetSelector = (state: RootState) => {
   const {
@@ -264,6 +267,7 @@ export const selectAsset = createSelector(
       state.engine.backgroundState.TokenListController.tokensChainsCache,
     selectAllTokens,
     selectSelectedInternalAccountAddress,
+    selectSelectedInternalAccountId,
     (
       _state: RootState,
       params: { address: string; chainId: string; isStaked?: boolean },
@@ -283,20 +287,39 @@ export const selectAsset = createSelector(
     tokensChainsCache,
     allTokens,
     selectedAddress,
+    selectedAccountId,
     address,
     chainId,
     isStaked,
   ) => {
+    /**
+     * Note: Without this, the selector would return the wrong asset for the selected account on EVM chains.
+     * This caused Staked Ethereum to not update when switching accounts.
+     * We want to apply this to EVM chains only.
+     */
+    const shouldScopeToSelectedAccount =
+      Boolean(selectedAccountId) && typeof chainId === 'string'
+        ? chainId.startsWith('0x')
+        : false;
+
     const asset = isStaked
       ? stakedAssets.find(
           (item) =>
-            item.chainId === chainId && item.stakedAsset.assetId === address,
+            item.chainId === chainId &&
+            (!shouldScopeToSelectedAccount ||
+              item.accountId === selectedAccountId) &&
+            item.stakedAsset.assetId === address,
         )?.stakedAsset
       : assets[chainId]?.find((item: Asset & { isStaked?: boolean }) => {
           // Normalize isStaked values: treat undefined as false
           const itemIsStaked = Boolean(item.isStaked);
           const targetIsStaked = Boolean(isStaked);
-          return item.assetId === address && itemIsStaked === targetIsStaked;
+          return (
+            item.assetId === address &&
+            (!shouldScopeToSelectedAccount ||
+              item.accountId === selectedAccountId) &&
+            itemIsStaked === targetIsStaked
+          );
         });
 
     // Look up rwaData from the original token in allTokens
