fix: update start index for proposed account name for pk/hardware imports #6677
+16
−11
Conversation
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
…nd proposedNameIndex
|
@metamaskbot publish-preview |
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
montelaidev
reviewed
Sep 23, 2025
packages/account-tree-controller/src/AccountTreeController.test.ts
Outdated
Show resolved
Hide resolved
montelaidev
approved these changes
Sep 23, 2025
fabiobozzo
reviewed
Sep 23, 2025
| proposedNameIndex = Object.keys(wallet.groups).length - 1; | ||
| } | ||
|
|
||
| // Use the higher of the two: highest parsed index or computed index |
There was a problem hiding this comment.
Nit: Use the lowest of the two: highest parsed index or computed index
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Currently, PK/Hardware imports were being started at
Account 2as opposed toAccount 1. When we apply group metadata we already have that group in state, the logic in#applyGroupMetadatadoesn't account for the fact that the group we're applying metadata shouldn't be counted for in the following line: https://github.com/MetaMask/core/blob/main/packages/account-tree-controller/src/AccountTreeController.ts#L461. Due to the way we apply group metadata (after we've added the groups into state), we need to take the min betweenproposedNameIndexandhighestAccountNameIndexNOT the max. This change in logic accounts for group metadata being applied in the scenario when the controller is being rehydrated throughinitand when a new pk/hardware account is added in an active session (and handled throughaccountAdded).Before
Screen.Recording.2025-09-22.at.12.32.55.PM.mov
After
after-pk-naming-fix.mov
Checklist