chore(runway): cherry-pick fix: MUSD-266 staked ethereum balance mismatch#25580
Merged
Conversation
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> Fixed bug where Staked Ethereum balances weren't updating when switching accounts. <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: fixed bug where Staked Ethereum balances weren't updating when switching accounts. Fixes: [MUSD-266: Staked Ethereum Balance Mismatch](https://consensyssoftware.atlassian.net/browse/MUSD-266) ```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 ``` <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> <!-- [screenshots/recordings] --> 1. Staked Ethereum doesn't update when switching accounts 2. Staked Ethereum AssetOverview was displaying the user's **native** ETH balance <!-- [screenshots/recordings] --> 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 - [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. - [ ] 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. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Medium risk because it changes `selectAsset` filtering logic used widely across the app, which could affect token/native asset resolution and displayed balances when switching accounts (especially on EVM chains). Changes are scoped to EVM chainIds and covered by updated/added tests. > > **Overview** > Fixes staked/native EVM asset selection so balances update correctly when switching accounts by scoping `selectAsset` lookups to the currently selected internal account (EVM chains only). > > Updates `useBalance` to prefer the staked native asset’s fiat string from `selectAsset` (matching Asset List Intl formatting) with a fallback to `weiToFiat`, and updates `useTokenBalance` to pass through `token.isStaked` so staked token details resolve the correct asset. > > Adjusts and adds tests to cover account-scoped asset lookup and the new fiat formatting/`isStaked` behavior. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit ab777b1. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
Matt561
approved these changes
Feb 3, 2026
Contributor
🔍 Smart E2E Test Selection⏭️ Smart E2E selection skipped - base branch is not main (base: release/7.64.0) All E2E tests pre-selected. |
|
joaoloureirop
approved these changes
Feb 3, 2026
metamaskbot
added
the
release-7.64.0
Collaborator
|
No release label on PR. Adding release label release-7.64.0 on PR, as PR was cherry-picked in branch 7.64.0. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
Manual testing steps
Screenshots/Recordings
Before
ETH balance
After
AssetOverview screen
musd-266-staked-balance-mismatch.mov
Pre-merge author checklist
Docs and MetaMask Mobile
Coding
Standards.
if applicable
guidelines).
Not required for external contributors.
Pre-merge reviewer checklist
app, test code being changed).
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
Note
Medium Risk
Changes core
selectAssetlookup 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
selectAssetresults (native and staked) toselectSelectedInternalAccountIdon EVM chains.Updates
useBalanceto source staked native asset fiat values fromselectAsset(matching the token list’s Intl formatting) with aweiToFiatfallback, and adjusts/extends tests accordingly (including new coverage for account-scoped lookups and updated expected fiat strings).Written by Cursor Bugbot for commit 32c383d. This will update automatically on new commits. Configure here.
aeee852