fix(account-tree-controller): reset mappings and selected account in clearState - #9825
Merged
Conversation
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 659e648. Configure here.
gantunesr
approved these changes
Aug 13, 2026
Contributor
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. Learn how to use preview builds in other projects. Expand for full list of packages and versions. |
salimtb
approved these changes
Aug 13, 2026
salimtb
left a comment
salimtb
left a comment
Contributor
There was a problem hiding this comment.
tested using a local build, LGTM
pull Bot
pushed a commit
to dmrazzy/core
that referenced
this pull request
Aug 13, 2026
## Explanation ## Assets Controller [13.1.3] ### Changed - Bump `@metamask/transaction-controller` from `^69.5.1` to `^69.5.2` ([MetaMask#9823](MetaMask#9823)) ### Fixed - Fix Arc native USDC never appearing until the account receives its first deposit, by default-tracking the native asset id (`eip155:5042/slip44:5042`) instead of the `0x3600...` ERC20 identity so `assetsInfo` metadata is seeded up front ([MetaMask#9869](MetaMask#9869)) - Properly filter empty (`''`) selected account group event ([MetaMask#9825](MetaMask#9825)) <!-- Thanks for your contribution! Take a moment to answer these questions so that reviewers have the information they need to properly understand your changes: * What is the current state of things and why does it need to change? * What is the solution your changes offer and how does it work? * Are there any changes whose purpose might not obvious to those unfamiliar with the domain? * If your primary goal was to update one package but you found you had to update another one along the way, why did you do so? * If you had to upgrade a dependency, why did you do so? --> ## References <!-- Are there any issues that this pull request is tied to? Are there other links that reviewers should consult to understand these changes better? Are there client or consumer pull requests to adopt any breaking changes? For example: * Fixes #12345 * Related to #67890 --> ## Checklist - [ ] I've updated the test suite for new or updated code as appropriate - [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [ ] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/processes/updating-changelogs.md) - [ ] I've introduced [breaking changes](https://github.com/MetaMask/core/tree/main/docs/processes/breaking-changes.md) in this PR and have prepared draft pull requests for clients and consumer packages to resolve them <!-- CURSOR_SUMMARY --> --- > [!NOTE] > <sup>[Cursor Bugbot](https://cursor.com/bugbot) is generating a summary for commit 444cbe4. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Explanation
We were not completely resetting the transient state of the
AccountTreeControllerduringclearState.We now properly clear the mappings and fire an
''(empty) selected account group, since the tree will be empty.References
Checklist
Note
Medium Risk
Touches wallet-reset and account-selection event flow across controllers; behavior change is intentional but consumers must already handle empty
selectedAccountGroupChangeas documented.Overview
AccountTreeController.clearStatenow fully tears down transient state on wallet reset: it clears in-memory reverse-lookup maps (#accountIdToContext,#groupIdToWalletId) and publishesAccountTreeController:selectedAccountGroupChangewith an empty new group id (''), matching normal selection transitions.AssetsControllerlistens for that event’sgroupIdand skipsgetAssetswhen the id is empty (onboarding or reset), avoiding pointless fetches against a cleared tree. Tests cover map clearing, the empty-group event payload, and the assets no-op path.Reviewed by Cursor Bugbot for commit 9b0921f. Bugbot is set up for automated code reviews on this repo. Configure here.