fix(accounts): prevent crash when account tree references orphaned account IDs#41405
Merged
Merged
Conversation
…count IDs
When state corruption occurs (e.g. after a wallet reset or Snap keyring
reset), the accountTree can contain account IDs that no longer exist in
internalAccounts. Spreading `undefined` via `{ ...accountsById[id] }`
produced an empty object with no `address`, causing
`getWalletIdAndNameByAccountAddress` to throw
`TypeError: Cannot read properties of undefined (reading 'toLowerCase')`.
Fix by filtering orphaned account IDs out of each group in
`getWalletsWithAccounts` so corrupted entries never propagate, and add
optional chaining on `acc.address` in `getWalletIdAndNameByAccountAddress`
as a defensive guard. Adds three regression tests.
Fixes: #41141
Made-with: Cursor
Contributor
✨ Files requiring CODEOWNER review ✨🔑 @MetaMask/accounts-engineers (2 files, +124 -16)
|
Contributor
Builds ready [72dff8c]
⚡ Performance Benchmarks (Total: 🟢 18 pass · 🟡 0 warn · 🔴 0 fail)
🌐 Dapp Page Load BenchmarksCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚨 Warning! Bundle size has increased!]
|
hmalik88
reviewed
Apr 1, 2026
Contributor
Builds ready [a11a9ef]
⚡ Performance Benchmarks (Total: 🟢 18 pass · 🟡 0 warn · 🔴 0 fail)
🌐 Dapp Page Load BenchmarksCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs
|
The filter in getWalletsWithAccounts already guarantees every account in the consolidated wallet data has a valid address, so the ?. guard on acc.address in getWalletIdAndNameByAccountAddress is not needed. Made-with: Cursor
Contributor
Builds ready [b72ce5d]
⚡ Performance Benchmarks (Total: 🟢 18 pass · 🟡 0 warn · 🔴 0 fail)
🌐 Dapp Page Load BenchmarksCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs [🚀 Bundle size reduced!]
|
|
Contributor
Builds ready [d779609]
⚡ Performance Benchmarks (Total: 🟢 18 pass · 🟡 0 warn · 🔴 0 fail)
🌐 Dapp Page Load BenchmarksCurrent Commit: 📄 Localhost MetaMask Test DappSamples: 100 Summary
📈 Detailed Results
Bundle size diffs
|
hmalik88
approved these changes
Apr 1, 2026
montelaidev
approved these changes
Apr 1, 2026
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.
4 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
When state corruption occurs (e.g. after a wallet reset or Snap keyring reset), the
accountTreecan contain account IDs that no longer exist ininternalAccounts. IngetWalletsWithAccounts, spreadingundefinedvia{ ...accountsById[missingId] }produces an empty object with noaddressproperty. Downstream,getWalletIdAndNameByAccountAddressthen calls.toLowerCase()onundefined, crashing with:Root cause: The account tree references entropy source IDs that no longer exist in the actual keyrings — typically after a user forgets their password and uses the wallet reset flow, or after using Snaps.
Fix:
getWalletsWithAccounts— added a.filter()before.map()to skip any account ID that has no entry inaccountsById. This prevents orphaned entries from ever entering the consolidated wallet data structure.getWalletIdAndNameByAccountAddress— added optional chainingacc.address?.toLowerCase()as a defensive guard.Changelog
CHANGELOG entry: Fixed a crash that could occur for users with corrupted wallet state after a password reset or Snap keyring usage.
Related issues
Fixes: #41141
Fixes: https://consensyssoftware.atlassian.net/browse/MUL-1633
Manual testing steps
This bug is triggered by corrupted state, which is hard to reproduce manually. The fix is covered by unit tests. To verify:
yarn test:unit ui/selectors/multichain-accounts/account-tree.test.ts— all 75 tests should pass.Pre-merge author checklist
Pre-merge reviewer checklist
Made with Cursor
Note
Low Risk
Low risk defensive change in selectors: it only filters out account IDs that cannot be resolved to
internalAccounts, preventing crashes in downstream lookups. Main impact is that corrupted/stale entries will no longer appear in consolidated wallet/group account lists.Overview
Prevents crashes when
accountTreecontains stale/orphaned account IDs by filtering unresolved IDs out ofgetWalletsWithAccountsbefore building the consolidated wallets/groups structure.Adds regression tests covering: filtering orphaned IDs from groups,
getWalletIdAndNameByAccountAddressnot throwing with corrupted state, and returningnullwhen all referenced accounts are orphaned.Written by Cursor Bugbot for commit d779609. This will update automatically on new commits. Configure here.