feat(account-tree-controller): re-introduce lastSelected metadata#8261
Merged
feat(account-tree-controller): re-introduce lastSelected metadata#8261
lastSelected metadata#8261Conversation
ccharly
force-pushed
the
cc/fix/group-last-selected-metadata
branch
3 times, most recently
from
ba6d99f to
cc3d9fe
Compare
Contributor
Author
|
@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. |
![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 2 potential issues.
Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
ccharly
force-pushed
the
cc/fix/group-last-selected-metadata
branch
from
cc3d9fe to
f34c64d
Compare
Contributor
Author
|
@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. |
ccharly
commented
Mar 23, 2026
| 'AccountsController:setSelectedAccount', | ||
| accountToSelect, | ||
| ); | ||
| if (forwardSelectedAccount) { |
Contributor
Author
There was a problem hiding this comment.
I think we shouldn't really need that flag given that this method is idempotent. Added it for more fine-grained control still + to be explicit
ccharly
commented
Mar 23, 2026
| // track of the most recently selected groups. | ||
| const now = Date.now(); | ||
|
|
||
| /* istanbul ignore next */ |
Contributor
Author
There was a problem hiding this comment.
We usually ignore those as there's just here to auto-inject the default state when needed
ccharly
commented
Mar 23, 2026
| * @param groupId - The account group ID to select. | ||
| */ | ||
| setSelectedAccountGroup(groupId: AccountGroupId): void { | ||
| this.#setSelectedAccountGroup(groupId); |
Contributor
Author
There was a problem hiding this comment.
Created this new private method so we can re-use it with the event handling from the AccountsController
ccharly
commented
Mar 23, 2026
Comment on lines
+732
to
+743
| // Apply persisted lastSelected (plain number, not synced). | ||
| if ( | ||
| persistedGroupMetadata?.lastSelected !== undefined && | ||
| persistedGroupMetadata.lastSelected >= 0 | ||
| ) { | ||
| group.metadata.lastSelected = persistedGroupMetadata.lastSelected; | ||
| } else { | ||
| // Automatiacally inject default value. | ||
| state.accountGroupsMetadata[groupId].lastSelected = 0; | ||
|
|
||
| group.metadata.lastSelected = 0; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
The usual logic for the tree metadata, use the persistent data if any, otherwise we auto-inject the default values.
ccharly
commented
Mar 23, 2026
Comment on lines
+366
to
+368
| state.selectedAccountGroup = this.#getDefaultSelectedAccountGroup( | ||
| state.accountTree.wallets, // Re-use updated wallets with metadata here. | ||
| ); |
Contributor
Author
There was a problem hiding this comment.
This got flagged by Cursor initially, we need to state.accountTree.wallets now, since #getDefaultSelectedAccountGroup uses group.metadata.lastSelected for its logic and they get populated on the state directly during that state update call.
wallets is not getting updated, thus, we would miss them and not use them.
gantunesr
reviewed
Mar 23, 2026
gantunesr
approved these changes
Mar 23, 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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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
Some logic still relies on this metadata on accounts. Since we want to deprecate the
AccountsControllerat some point, we need to reintroduce this concept, but at the group level this time.References
N/A
Checklist
Note
Medium Risk
Changes selected-group state transitions and fallback selection logic, which could affect which account group becomes active after removals or restarts. Adds new persisted metadata fields and update paths that must stay consistent across init/reinit and event-driven selection updates.
Overview
Re-introduces a local-only
lastSelectedtimestamp on account group metadata, persisted inaccountGroupsMetadataand restored during tree rebuilds (init/reinit). The controller now updateslastSelectedwhenever a group becomes selected (viasetSelectedAccountGrouporAccountsController:selectedAccountChange).Updates default-group fallback logic to prefer the most recently selected non-empty group, with an EVM-group tiebreaker when timestamps match, and refactors selection syncing to avoid infinite loops. Tests and rule-generated default metadata are updated accordingly.
Written by Cursor Bugbot for commit d00ac94. This will update automatically on new commits. Configure here.