Skip to content

chore(runway): cherry-pick fix: remove old erc-20 balances that fully get swapped#25899

Merged
joaoloureirop merged 1 commit intorelease/7.65.0from
cherry-pick-7-65-0-3cd7132
Feb 10, 2026
Merged

chore(runway): cherry-pick fix: remove old erc-20 balances that fully get swapped#25899
joaoloureirop merged 1 commit intorelease/7.65.0from
cherry-pick-7-65-0-3cd7132

Conversation

@runway-github
Copy link
Contributor

@runway-github runway-github bot commented Feb 10, 2026

Description

Patch of this fix: MetaMask/core#7861

Changelog

CHANGELOG entry: fix: remove old erc-20 balances that fully get swapped

Related issues

Fixes:
#incident-metamask-1453

Manual testing steps

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

Before

After

https://www.loom.com/share/243ad5b96abc4591bd3b51cc28d2e2d8

Pre-merge author checklist

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
Touches token balance fetching/normalization logic via a vendored patch, which could affect displayed balances if token tracking data or API responses differ from expectations.

Overview
Fixes stale ERC-20 balances after full swaps by patching @metamask/assets-controllers so the Accounts API balance fetcher can derive the user’s tracked token list and emit explicit zero balance entries for tracked ERC-20s missing from the API response.

Wires TokenBalancesController to pass current state.tokenBalances into the AccountsApiBalanceFetcher, and updates app dependencies to use the patched @metamask/assets-controllers@99.2.0 (with corresponding lockfile/resolution updates).

Written by Cursor Bugbot for commit b6e90d7. This will update automatically on new commits. Configure here.

3cd7132

)

<!--
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.
-->

Patch of this fix: MetaMask/core#7861

<!--
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: fix: remove old erc-20 balances that fully get swapped

Fixes:
[#incident-metamask-1453](https://consensys.slack.com/archives/C0AD7TXHKQS)

```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]
```

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

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

https://www.loom.com/share/243ad5b96abc4591bd3b51cc28d2e2d8

- [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**
> Changes token balance fetching/normalization logic via a Yarn patch,
which can affect displayed balances and token cleanup after swaps; risk
is moderate due to impact on core wallet state but scoped to balance
results shaping.
>
> **Overview**
> Applies a Yarn patch to `@metamask/assets-controllers` to prevent
stale ERC-20 balances from lingering when the Accounts API omits a token
(e.g., after fully swapping out).
>
> `TokenBalancesController` now passes a `getUserTokens` callback into
`AccountsApiBalanceFetcher`, which tracks non-native token balances
returned by the API and **emits explicit zero-balance results** for any
user-tracked ERC-20 token missing from the API response so downstream
state can clear it. The PR also pins the app’s
`@metamask/assets-controllers` dependency to the patched `99.2.0` and
updates lockfile/resolutions accordingly.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
223dbfd. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
@runway-github runway-github bot requested a review from a team as a code owner February 10, 2026 12:56
@github-actions
Copy link
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.

@metamaskbot metamaskbot added the team-bots Bot team (for MetaMask Bot, Runway Bot, etc.) label Feb 10, 2026
@github-actions
Copy link
Contributor

🔍 Smart E2E Test Selection

⏭️ Smart E2E selection skipped - base branch is not main (base: release/7.65.0)

All E2E tests pre-selected.

View GitHub Actions results

@sonarqubecloud
Copy link

@joaoloureirop joaoloureirop merged commit 2eba3aa into release/7.65.0 Feb 10, 2026
100 of 108 checks passed
@joaoloureirop joaoloureirop deleted the cherry-pick-7-65-0-3cd7132 branch February 10, 2026 15:34
@github-actions github-actions bot locked and limited conversation to collaborators Feb 10, 2026
@metamaskbot metamaskbot added the release-7.65.0 Issue or pull request that will be included in release 7.65.0 label Feb 11, 2026
@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-7.65.0 on PR, as PR was cherry-picked in branch 7.65.0.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-7.65.0 Issue or pull request that will be included in release 7.65.0 size-M team-bots Bot team (for MetaMask Bot, Runway Bot, etc.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants