chore(runway): cherry-pick fix: cp-7.64.0 when switching the network filter from a non-EVM network to "Popular networks" EVM tokens aren't displayed#25653
Merged
joaoloureirop merged 1 commit intoFeb 4, 2026
Conversation
…filter from a non-EVM network to "Popular networks" EVM tokens aren't displayed (#25630) <!-- 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. --> ## **Description** Bug: When I switch the network filter from a non-EVM network to "Popular networks" my EVM tokens aren't displayed. Solution: I have idnetified that this bug was introduced by [this](#25468) PR and needs to be backported cause the bug was also backported [here](#25580) The issue is that the wrong selector `selectSelectedInternalAccountId` was being used instead of `selectSelectedInternalAccountByScope` <!-- 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? --> ## **Changelog** <!-- 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: fix when switching the network filter from a non-EVM network to "Popular networks" EVM tokens aren't displayed ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/ASSETS-2597 & #25632 ## **Manual testing steps** ```gherkin Feature: my feature name Scenario: user [verb for user action] Given [describe expected initial app state] When user [verb for user action] Then [describe expected outcome] ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** https://github.com/user-attachments/assets/bcffcb65-3227-467d-9255-55d2177f2416 <!-- [screenshots/recordings] --> ### **After** https://github.com/user-attachments/assets/b0e5a877-b7ae-4078-a0fa-d4000a9525f6 <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] 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). - [ ] I've completed the PR template to the best of my ability - [ ] I've included tests if applicable - [ ] I've documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] 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. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Changes core asset-selection logic used to render token/native/staked balances across networks; a mistake could hide or mis-associate assets when switching networks/account groups. > > **Overview** > Fixes an asset lookup bug where switching from a non-EVM network filter back to EVM (“Popular networks”) could return the wrong/missing EVM token entries. > > `selectAsset` now scopes native/staked and token lookups to the *selected account group’s* account for the requested chain via `selectSelectedInternalAccountByScope`, normalizing chain IDs to CAIP with `isCaipChainId`/`toEvmCaipChainId` instead of relying on `selectSelectedInternalAccountId`. > > Updates `assets-list.test.ts` to validate scoping by account group (adding a second group/account and asserting balances switch correctly). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 6c68b7c. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
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 4, 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
Bug: When I switch the network filter from a non-EVM network to "Popular
networks" my EVM tokens aren't displayed.
Solution: I have idnetified that this bug was introduced by
this PR and
needs to be backported cause the bug was also backported
here
The issue is that the wrong selector
selectSelectedInternalAccountIdwas being used instead of
selectSelectedInternalAccountByScopeChangelog
CHANGELOG entry: fix when switching the network filter from a non-EVM
network to "Popular networks" EVM tokens aren't displayed
Related issues
Fixes: https://consensyssoftware.atlassian.net/browse/ASSETS-2597 &
#25632
Manual testing steps
Screenshots/Recordings
Before
Screen.Recording.2026-02-04.at.15.50.21.mov
After
Screen.Recording.2026-02-04.at.15.48.34.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 the
selectAssetselector’s account-scoping logic to use scope-based account resolution, which can affect which balances/tokens render across networks and account groups.Overview
Fixes an asset lookup/scoping bug where switching network filters could cause EVM tokens (and native/staked assets) to resolve against the wrong account.
selectAssetnow derives the correct account from the selected account group viaselectSelectedInternalAccountByScope, normalizingchainIdto CAIP (usingtoEvmCaipChainId/isCaipChainId) before filtering assets/staked assets byaccountId. Tests were updated to validate native/staked lookups across two different account groups.Written by Cursor Bugbot for commit 8cf8415. This will update automatically on new commits. Configure here.
8c7645f