Skip to content

chore(runway): cherry-pick fix: MUSD-771 updated selectAccountTokensAcrossChainsUnified to select tokens across chains for evm-scope specifically#29762

Merged
Matt561 merged 1 commit into
release/7.76.0from
cherry-pick-7-76-0-0a39d7f
May 6, 2026
Merged

chore(runway): cherry-pick fix: MUSD-771 updated selectAccountTokensAcrossChainsUnified to select tokens across chains for evm-scope specifically#29762
Matt561 merged 1 commit into
release/7.76.0from
cherry-pick-7-76-0-0a39d7f

Conversation

@runway-github

@runway-github runway-github Bot commented May 5, 2026

Copy link
Copy Markdown
Contributor

Description

This PR fixes an app crash that occurs when the user clicks the
"unstake" button (ETH pooled-staking) when non-evm network is selected.

Changelog

CHANGELOG entry: fixed app crash occurring when user clicked
pooled-staking unstake button when non-evm network is selected.

Related issues

Fixes: MUSD-771: App Crash when user clicks pooled-staking "unstake"
button

Manual testing steps

Feature: Fix app crash when clicking "unstake" button (pooled-staking)

  Scenario: App crash fixed
    Given user has Staked ETH to unstake

    When user clicks "Tokens" section header on home screen
    And user selects non-EVM network (e.g. Tron) in network selector
    And user returns to home screen
    And user clicks Ethereum asset row
    And user clicks "unstake" button on Ethereum asset details screen
    
    Then user is redirected to unstake screen with keypad
    And the app does not crash

Screenshots/Recordings

Before

musd-771-unstake-button-crash-demo-before.mov

After

musd-771-unstake-button-crash-demo-after.mov

Pre-merge author checklist

Performance checks (if applicable)

  • I've tested on Android
    • Ideally on a mid-range device; emulator is acceptable
  • I've tested with a power user scenario
  • Use these power-user
    SRPs

    to import wallets with many accounts and tokens
  • I've instrumented key operations with Sentry traces for production
    performance metrics
  • See trace() for usage and
    addToken
    for an example

For performance guidelines and tooling, see the Performance
Guide
.

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
Medium risk because it changes how the unified multichain token
selector chooses the EVM address, which can affect token lists and Earn
flows across networks; however the change is localized and covered by
updated unit tests/mocks.

Overview
Fixes a crash/empty-balance issue when a non-EVM network is active by
making selectAccountTokensAcrossChainsUnified always derive EVM tokens
from the EVM-scoped account in the selected account group, rather than
whatever account is currently selected.

Adds selectAccountTokensAcrossChainsForEvmScope (using
selectSelectedInternalAccountByScope(EVM_SCOPE) +
selectAccountTokensAcrossChainsForAddress) and updates
multichain/Earn-related tests to mock
selectSelectedInternalAccountByScope and the new EVM-token selector
signature.

Reviewed by Cursor Bugbot for commit
d5602d9. Bugbot is set up for automated
code reviews on this repo. Configure
here.

[0a39d7f](https://github.com/MetaMask/metamask-mobile/commit/0a39d7fa1843e1f38992f6c86b9185ae029506be)

…t tokens across chains for evm-scope specifically cp-7.76.0 (#29675)

<!--
Please submit this PR as a draft initially.

Do not mark it as "Ready for review" until this PR meets the canonical
Definition of Ready For Review in `docs/readme/ready-for-review.md`.

In short: the template must be materially complete (not just section
titles
present), all status checks must be currently passing, and the only
expected
follow-up commits must be reviewer-driven.
-->

This PR fixes an app crash that occurs when the user clicks the
"unstake" button (ETH pooled-staking) when non-evm network is selected.

<!--
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 app crash occurring when user clicked
pooled-staking unstake button when non-evm network is selected.

Fixes: [MUSD-771: App Crash when user clicks pooled-staking "unstake"
button](https://consensyssoftware.atlassian.net/browse/MUSD-771)

```gherkin
Feature: Fix app crash when clicking "unstake" button (pooled-staking)

  Scenario: App crash fixed
    Given user has Staked ETH to unstake

    When user clicks "Tokens" section header on home screen
    And user selects non-EVM network (e.g. Tron) in network selector
    And user returns to home screen
    And user clicks Ethereum asset row
    And user clicks "unstake" button on Ethereum asset details screen

    Then user is redirected to unstake screen with keypad
    And the app does not crash
```

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

<!-- [screenshots/recordings] -->

https://github.com/user-attachments/assets/a5ec5ab5-f4e2-47a3-b780-f6b289364ab7

<!-- [screenshots/recordings] -->

https://github.com/user-attachments/assets/3661139d-ab90-4437-9127-ac94830eda88

<!--
Every checklist item must be consciously assessed before marking this PR
as
"Ready for review". A checked box means you deliberately considered that
responsibility, not that you literally performed every action listed.

Unchecked boxes are ambiguous: they are not an implicit "N/A" and they
are not
a silent "skip". See `docs/readme/ready-for-review.md` for the full
checklist
semantics.
-->

- [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 tested on Android
  - Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example

For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).

<!--
Reviewer checklist items follow the same semantics as the author
checklist: an
unchecked box is ambiguous, a checked box means the reviewer consciously
assessed that responsibility. See `docs/readme/ready-for-review.md`.
-->

- [ ] 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 how the unified multichain token
selector chooses the EVM address, which can affect token lists and Earn
flows across networks; however the change is localized and covered by
updated unit tests/mocks.
>
> **Overview**
> Fixes a crash/empty-balance issue when a non-EVM network is active by
making `selectAccountTokensAcrossChainsUnified` always derive EVM tokens
from the *EVM-scoped* account in the selected account group, rather than
whatever account is currently selected.
>
> Adds `selectAccountTokensAcrossChainsForEvmScope` (using
`selectSelectedInternalAccountByScope(EVM_SCOPE)` +
`selectAccountTokensAcrossChainsForAddress`) and updates
multichain/Earn-related tests to mock
`selectSelectedInternalAccountByScope` and the new EVM-token selector
signature.
>
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
d5602d9. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
@runway-github runway-github Bot requested a review from a team as a code owner May 5, 2026 21:10
@github-actions

github-actions Bot commented May 5, 2026

Copy link
Copy Markdown
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.

@metamaskbotv2 metamaskbotv2 Bot added the team-bots Bot team (for MetaMask Bot, Runway Bot, etc.) label May 5, 2026
@github-actions

github-actions Bot commented May 5, 2026

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

⏭️ Smart E2E selection skipped - PR targets a release branch (release/*)

All E2E tests pre-selected.

View GitHub Actions results

@github-actions github-actions Bot added the size-S label May 5, 2026
@sonarqubecloud

sonarqubecloud Bot commented May 5, 2026

Copy link
Copy Markdown

@Matt561 Matt561 merged commit edbdd5d into release/7.76.0 May 6, 2026
205 of 208 checks passed
@Matt561 Matt561 deleted the cherry-pick-7-76-0-0a39d7f branch May 6, 2026 01:54
@github-actions github-actions Bot locked and limited conversation to collaborators May 6, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

size-S team-bots Bot team (for MetaMask Bot, Runway Bot, etc.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant