feat: add sortAccountIdsByLastSelected to getSessionScopes, wallet_getSession, and wallet_createSession#8255
Open
feat: add sortAccountIdsByLastSelected to getSessionScopes, wallet_getSession, and wallet_createSession#8255
Conversation
Member
Author
|
@metamaskbot preview-build |
Member
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. |
7 tasks
ffmcgee725
reviewed
Mar 20, 2026
| notifications = []; | ||
| } | ||
|
|
||
| const sortedAccounts = sortAccountIdsByLastSelected |
Member
There was a problem hiding this comment.
[nit] this name can be misleading, since we are not always sorting these accounts, sortedAccounts could actually be unsorted if sortAccountIdsByLastSelected is not provided.
we could name the function param caipAccountIds, and this variable accounts for example (open to other suggestions)
![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.
|
|
||
| const sortedAccounts = sortAccountIdsByLastSelected | ||
| ? sortAccountIdsByLastSelected(accounts) | ||
| : accounts; |
There was a problem hiding this comment.
Sorting before merge loses order for overlapping scopes
Low Severity
sortAccountIdsByLastSelected is applied inside getNormalizedScopesObject (per-scope, before merge), but getSessionScopes then calls mergeNormalizedScopes which concatenates and deduplicates accounts from required and optional scopes via getUniqueArrayItems. When the same scope string appears in both requiredScopes and optionalScopes with different accounts, the merge disrupts the sorted order — the final array reflects required-first insertion order, not the result of sorting all accounts together.
Additional Locations (1)
wenfix
approved these changes
Mar 20, 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
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
@metamask/chain-agnostic-permissionsortAccountIdsByLastSelectedparameter togetSessionScopesfunction(accounts: CaipAccountId[]) => CaipAccountId[]accountsarray within each scope (both required and optional scopes)@metamask/multichain-api-middlewaresortAccountIdsByLastSelectedhook towallet_getSessionhandlergetSessionScopeswhen building session responsesortAccountIdsByLastSelectedhook towallet_createSessionhandlergetSessionScopeswhen building session scopes for approvalReferences
See: MetaMask/metamask-extension#41068
Checklist
Note
Medium Risk
Medium risk because it changes the
wallet_getSession/wallet_createSessionhandler hook contract (new required hook) and can alter returned account ordering, which may impact downstream clients relying on current ordering.Overview
Adds an optional
sortAccountIdsByLastSelectedhook togetSessionScopesin@metamask/chain-agnostic-permission, allowing callers to reorderaccountswithin each scope (applied to both required and optional scopes, otherwise preserving existing order).Updates
@metamask/multichain-api-middlewareto require and pass this hook throughwallet_getSessionandwallet_createSessionwhen buildingsessionScopes, with accompanying test updates and changelog entries.Written by Cursor Bugbot for commit 7fd6922. This will update automatically on new commits. Configure here.