@metamask-previews/account-tree-controller 5.0.1-preview-a0caca0c0 → 5.0.1-preview-17c76be24

package/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `lastSelected` (timestamp) to account group tree node metadata ([#8261](https://github.com/MetaMask/core/pull/8261))
+  - `group.metadata.lastSelected` is set to `Date.now()` whenever a group becomes the selected group, either via `setSelectedAccountGroup` or `AccountsController:selectedAccountChange`.
+  - The value is persisted in `accountGroupsMetadata` and restored on `init`/`reinit`.
+  - The value is not synchronize through backup and sync.
+  - Now consider `lastSelected` too when the controller needs to use the "default account group ID".
+
 ### Changed
 
 - **BREAKING**: Move `selectedAccountGroup` to top-level persisted state to prevent selected account group from reverting after app restart ([#8245](https://github.com/MetaMask/core/pull/8245))

package/dist/AccountTreeController-method-action-types.cjs

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * This file is auto generated.
  * Do not edit manually.
  */
 Object.defineProperty(exports, "__esModule", { value: true });

package/dist/AccountTreeController-method-action-types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"AccountTreeController-method-action-types.cjs","sourceRoot":"","sources":["../src/AccountTreeController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated by `scripts/generate-method-action-types.ts`.\n * Do not edit manually.\n */\n\nimport type { AccountTreeController } from './AccountTreeController';\n\n/**\n * Gets the account wallet object from its ID.\n *\n * @param walletId - Account wallet ID.\n * @returns The account wallet object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountWalletObjectAction = {\n  type: `AccountTreeController:getAccountWalletObject`;\n  handler: AccountTreeController['getAccountWalletObject'];\n};\n\n/**\n * Gets all account wallet objects.\n *\n * @returns All account wallet objects.\n */\nexport type AccountTreeControllerGetAccountWalletObjectsAction = {\n  type: `AccountTreeController:getAccountWalletObjects`;\n  handler: AccountTreeController['getAccountWalletObjects'];\n};\n\n/**\n * Gets all underlying accounts from the currently selected account\n * group.\n *\n * It also support account selector, which allows to filter specific\n * accounts given some criterias (account type, address, scopes, etc...).\n *\n * @param selector - Optional account selector.\n * @returns Underlying accounts for the currently selected account (filtered\n * by the selector if provided).\n */\nexport type AccountTreeControllerGetAccountsFromSelectedAccountGroupAction = {\n  type: `AccountTreeController:getAccountsFromSelectedAccountGroup`;\n  handler: AccountTreeController['getAccountsFromSelectedAccountGroup'];\n};\n\n/**\n * Gets the account group object from its ID.\n *\n * @param groupId - Account group ID.\n * @returns The account group object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountGroupObjectAction = {\n  type: `AccountTreeController:getAccountGroupObject`;\n  handler: AccountTreeController['getAccountGroupObject'];\n};\n\n/**\n * Gets the account's context which contains its wallet ID, group ID, and sort order.\n *\n * @param accountId - Account ID.\n * @returns The account context if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountContextAction = {\n  type: `AccountTreeController:getAccountContext`;\n  handler: AccountTreeController['getAccountContext'];\n};\n\n/**\n * Gets the currently selected account group ID.\n *\n * @returns The selected account group ID or empty string if none selected.\n */\nexport type AccountTreeControllerGetSelectedAccountGroupAction = {\n  type: `AccountTreeController:getSelectedAccountGroup`;\n  handler: AccountTreeController['getSelectedAccountGroup'];\n};\n\n/**\n * Sets the selected account group and updates the AccountsController selectedAccount accordingly.\n *\n * @param groupId - The account group ID to select.\n */\nexport type AccountTreeControllerSetSelectedAccountGroupAction = {\n  type: `AccountTreeController:setSelectedAccountGroup`;\n  handler: AccountTreeController['setSelectedAccountGroup'];\n};\n\n/**\n * Sets a custom name for an account group.\n *\n * @param groupId - The account group ID.\n * @param name - The custom name to set.\n * @param autoHandleConflict - If true, automatically resolves name conflicts by adding a suffix. If false, throws on conflicts.\n * @throws If the account group ID is not found in the current tree.\n * @throws If the account group name already exists and autoHandleConflict is false.\n */\nexport type AccountTreeControllerSetAccountGroupNameAction = {\n  type: `AccountTreeController:setAccountGroupName`;\n  handler: AccountTreeController['setAccountGroupName'];\n};\n\n/**\n * Sets a custom name for an account wallet.\n *\n * @param walletId - The account wallet ID.\n * @param name - The custom name to set.\n * @throws If the account wallet ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountWalletNameAction = {\n  type: `AccountTreeController:setAccountWalletName`;\n  handler: AccountTreeController['setAccountWalletName'];\n};\n\n/**\n * Toggles the pinned state of an account group.\n *\n * @param groupId - The account group ID.\n * @param pinned - Whether the group should be pinned.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupPinnedAction = {\n  type: `AccountTreeController:setAccountGroupPinned`;\n  handler: AccountTreeController['setAccountGroupPinned'];\n};\n\n/**\n * Toggles the hidden state of an account group.\n *\n * @param groupId - The account group ID.\n * @param hidden - Whether the group should be hidden.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupHiddenAction = {\n  type: `AccountTreeController:setAccountGroupHidden`;\n  handler: AccountTreeController['setAccountGroupHidden'];\n};\n\n/**\n * Clears the controller state and resets to default values.\n * Also clears the backup and sync service state.\n */\nexport type AccountTreeControllerClearStateAction = {\n  type: `AccountTreeController:clearState`;\n  handler: AccountTreeController['clearState'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will perform a full sync, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If a full sync is already in progress, it will return the ongoing promise.\n *\n * @returns A promise that resolves when the sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAction = {\n  type: `AccountTreeController:syncWithUserStorage`;\n  handler: AccountTreeController['syncWithUserStorage'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will ensure at least one full sync is ran, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If the first ever full sync is already in progress, it will return the ongoing promise.\n * If the first ever full sync was previously completed, it will NOT start a new sync, and will resolve immediately.\n *\n * @returns A promise that resolves when the first ever full sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAtLeastOnceAction = {\n  type: `AccountTreeController:syncWithUserStorageAtLeastOnce`;\n  handler: AccountTreeController['syncWithUserStorageAtLeastOnce'];\n};\n\n/**\n * Union of all AccountTreeController action types.\n */\nexport type AccountTreeControllerMethodActions =\n  | AccountTreeControllerGetAccountWalletObjectAction\n  | AccountTreeControllerGetAccountWalletObjectsAction\n  | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetAccountContextAction\n  | AccountTreeControllerGetSelectedAccountGroupAction\n  | AccountTreeControllerSetSelectedAccountGroupAction\n  | AccountTreeControllerSetAccountGroupNameAction\n  | AccountTreeControllerSetAccountWalletNameAction\n  | AccountTreeControllerSetAccountGroupPinnedAction\n  | AccountTreeControllerSetAccountGroupHiddenAction\n  | AccountTreeControllerClearStateAction\n  | AccountTreeControllerSyncWithUserStorageAction\n  | AccountTreeControllerSyncWithUserStorageAtLeastOnceAction;\n"]}
+{"version":3,"file":"AccountTreeController-method-action-types.cjs","sourceRoot":"","sources":["../src/AccountTreeController-method-action-types.ts"],"names":[],"mappings":";AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { AccountTreeController } from './AccountTreeController';\n\n/**\n * Gets the account wallet object from its ID.\n *\n * @param walletId - Account wallet ID.\n * @returns The account wallet object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountWalletObjectAction = {\n  type: `AccountTreeController:getAccountWalletObject`;\n  handler: AccountTreeController['getAccountWalletObject'];\n};\n\n/**\n * Gets all account wallet objects.\n *\n * @returns All account wallet objects.\n */\nexport type AccountTreeControllerGetAccountWalletObjectsAction = {\n  type: `AccountTreeController:getAccountWalletObjects`;\n  handler: AccountTreeController['getAccountWalletObjects'];\n};\n\n/**\n * Gets all underlying accounts from the currently selected account\n * group.\n *\n * It also support account selector, which allows to filter specific\n * accounts given some criterias (account type, address, scopes, etc...).\n *\n * @param selector - Optional account selector.\n * @returns Underlying accounts for the currently selected account (filtered\n * by the selector if provided).\n */\nexport type AccountTreeControllerGetAccountsFromSelectedAccountGroupAction = {\n  type: `AccountTreeController:getAccountsFromSelectedAccountGroup`;\n  handler: AccountTreeController['getAccountsFromSelectedAccountGroup'];\n};\n\n/**\n * Gets the account group object from its ID.\n *\n * @param groupId - Account group ID.\n * @returns The account group object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountGroupObjectAction = {\n  type: `AccountTreeController:getAccountGroupObject`;\n  handler: AccountTreeController['getAccountGroupObject'];\n};\n\n/**\n * Gets the account's context which contains its wallet ID, group ID, and sort order.\n *\n * @param accountId - Account ID.\n * @returns The account context if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountContextAction = {\n  type: `AccountTreeController:getAccountContext`;\n  handler: AccountTreeController['getAccountContext'];\n};\n\n/**\n * Gets the currently selected account group ID.\n *\n * @returns The selected account group ID or empty string if none selected.\n */\nexport type AccountTreeControllerGetSelectedAccountGroupAction = {\n  type: `AccountTreeController:getSelectedAccountGroup`;\n  handler: AccountTreeController['getSelectedAccountGroup'];\n};\n\n/**\n * Sets the selected account group and updates the AccountsController selectedAccount accordingly.\n *\n * @param groupId - The account group ID to select.\n */\nexport type AccountTreeControllerSetSelectedAccountGroupAction = {\n  type: `AccountTreeController:setSelectedAccountGroup`;\n  handler: AccountTreeController['setSelectedAccountGroup'];\n};\n\n/**\n * Sets a custom name for an account group.\n *\n * @param groupId - The account group ID.\n * @param name - The custom name to set.\n * @param autoHandleConflict - If true, automatically resolves name conflicts by adding a suffix. If false, throws on conflicts.\n * @throws If the account group ID is not found in the current tree.\n * @throws If the account group name already exists and autoHandleConflict is false.\n */\nexport type AccountTreeControllerSetAccountGroupNameAction = {\n  type: `AccountTreeController:setAccountGroupName`;\n  handler: AccountTreeController['setAccountGroupName'];\n};\n\n/**\n * Sets a custom name for an account wallet.\n *\n * @param walletId - The account wallet ID.\n * @param name - The custom name to set.\n * @throws If the account wallet ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountWalletNameAction = {\n  type: `AccountTreeController:setAccountWalletName`;\n  handler: AccountTreeController['setAccountWalletName'];\n};\n\n/**\n * Toggles the pinned state of an account group.\n *\n * @param groupId - The account group ID.\n * @param pinned - Whether the group should be pinned.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupPinnedAction = {\n  type: `AccountTreeController:setAccountGroupPinned`;\n  handler: AccountTreeController['setAccountGroupPinned'];\n};\n\n/**\n * Toggles the hidden state of an account group.\n *\n * @param groupId - The account group ID.\n * @param hidden - Whether the group should be hidden.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupHiddenAction = {\n  type: `AccountTreeController:setAccountGroupHidden`;\n  handler: AccountTreeController['setAccountGroupHidden'];\n};\n\n/**\n * Clears the controller state and resets to default values.\n * Also clears the backup and sync service state.\n */\nexport type AccountTreeControllerClearStateAction = {\n  type: `AccountTreeController:clearState`;\n  handler: AccountTreeController['clearState'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will perform a full sync, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If a full sync is already in progress, it will return the ongoing promise.\n *\n * @returns A promise that resolves when the sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAction = {\n  type: `AccountTreeController:syncWithUserStorage`;\n  handler: AccountTreeController['syncWithUserStorage'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will ensure at least one full sync is ran, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If the first ever full sync is already in progress, it will return the ongoing promise.\n * If the first ever full sync was previously completed, it will NOT start a new sync, and will resolve immediately.\n *\n * @returns A promise that resolves when the first ever full sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAtLeastOnceAction = {\n  type: `AccountTreeController:syncWithUserStorageAtLeastOnce`;\n  handler: AccountTreeController['syncWithUserStorageAtLeastOnce'];\n};\n\n/**\n * Union of all AccountTreeController action types.\n */\nexport type AccountTreeControllerMethodActions =\n  | AccountTreeControllerGetAccountWalletObjectAction\n  | AccountTreeControllerGetAccountWalletObjectsAction\n  | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetAccountContextAction\n  | AccountTreeControllerGetSelectedAccountGroupAction\n  | AccountTreeControllerSetSelectedAccountGroupAction\n  | AccountTreeControllerSetAccountGroupNameAction\n  | AccountTreeControllerSetAccountWalletNameAction\n  | AccountTreeControllerSetAccountGroupPinnedAction\n  | AccountTreeControllerSetAccountGroupHiddenAction\n  | AccountTreeControllerClearStateAction\n  | AccountTreeControllerSyncWithUserStorageAction\n  | AccountTreeControllerSyncWithUserStorageAtLeastOnceAction;\n"]}

package/dist/AccountTreeController-method-action-types.d.cts

@@ -1,5 +1,5 @@
 /**
- * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * This file is auto generated.
  * Do not edit manually.
  */
 import type { AccountTreeController } from "./AccountTreeController.cjs";

package/dist/AccountTreeController-method-action-types.d.mts

@@ -1,5 +1,5 @@
 /**
- * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * This file is auto generated.
  * Do not edit manually.
  */
 import type { AccountTreeController } from "./AccountTreeController.mjs";

package/dist/AccountTreeController-method-action-types.mjs

@@ -1,5 +1,5 @@
 /**
- * This file is auto generated by `scripts/generate-method-action-types.ts`.
+ * This file is auto generated.
  * Do not edit manually.
  */
 export {};

package/dist/AccountTreeController-method-action-types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"AccountTreeController-method-action-types.mjs","sourceRoot":"","sources":["../src/AccountTreeController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated by `scripts/generate-method-action-types.ts`.\n * Do not edit manually.\n */\n\nimport type { AccountTreeController } from './AccountTreeController';\n\n/**\n * Gets the account wallet object from its ID.\n *\n * @param walletId - Account wallet ID.\n * @returns The account wallet object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountWalletObjectAction = {\n  type: `AccountTreeController:getAccountWalletObject`;\n  handler: AccountTreeController['getAccountWalletObject'];\n};\n\n/**\n * Gets all account wallet objects.\n *\n * @returns All account wallet objects.\n */\nexport type AccountTreeControllerGetAccountWalletObjectsAction = {\n  type: `AccountTreeController:getAccountWalletObjects`;\n  handler: AccountTreeController['getAccountWalletObjects'];\n};\n\n/**\n * Gets all underlying accounts from the currently selected account\n * group.\n *\n * It also support account selector, which allows to filter specific\n * accounts given some criterias (account type, address, scopes, etc...).\n *\n * @param selector - Optional account selector.\n * @returns Underlying accounts for the currently selected account (filtered\n * by the selector if provided).\n */\nexport type AccountTreeControllerGetAccountsFromSelectedAccountGroupAction = {\n  type: `AccountTreeController:getAccountsFromSelectedAccountGroup`;\n  handler: AccountTreeController['getAccountsFromSelectedAccountGroup'];\n};\n\n/**\n * Gets the account group object from its ID.\n *\n * @param groupId - Account group ID.\n * @returns The account group object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountGroupObjectAction = {\n  type: `AccountTreeController:getAccountGroupObject`;\n  handler: AccountTreeController['getAccountGroupObject'];\n};\n\n/**\n * Gets the account's context which contains its wallet ID, group ID, and sort order.\n *\n * @param accountId - Account ID.\n * @returns The account context if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountContextAction = {\n  type: `AccountTreeController:getAccountContext`;\n  handler: AccountTreeController['getAccountContext'];\n};\n\n/**\n * Gets the currently selected account group ID.\n *\n * @returns The selected account group ID or empty string if none selected.\n */\nexport type AccountTreeControllerGetSelectedAccountGroupAction = {\n  type: `AccountTreeController:getSelectedAccountGroup`;\n  handler: AccountTreeController['getSelectedAccountGroup'];\n};\n\n/**\n * Sets the selected account group and updates the AccountsController selectedAccount accordingly.\n *\n * @param groupId - The account group ID to select.\n */\nexport type AccountTreeControllerSetSelectedAccountGroupAction = {\n  type: `AccountTreeController:setSelectedAccountGroup`;\n  handler: AccountTreeController['setSelectedAccountGroup'];\n};\n\n/**\n * Sets a custom name for an account group.\n *\n * @param groupId - The account group ID.\n * @param name - The custom name to set.\n * @param autoHandleConflict - If true, automatically resolves name conflicts by adding a suffix. If false, throws on conflicts.\n * @throws If the account group ID is not found in the current tree.\n * @throws If the account group name already exists and autoHandleConflict is false.\n */\nexport type AccountTreeControllerSetAccountGroupNameAction = {\n  type: `AccountTreeController:setAccountGroupName`;\n  handler: AccountTreeController['setAccountGroupName'];\n};\n\n/**\n * Sets a custom name for an account wallet.\n *\n * @param walletId - The account wallet ID.\n * @param name - The custom name to set.\n * @throws If the account wallet ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountWalletNameAction = {\n  type: `AccountTreeController:setAccountWalletName`;\n  handler: AccountTreeController['setAccountWalletName'];\n};\n\n/**\n * Toggles the pinned state of an account group.\n *\n * @param groupId - The account group ID.\n * @param pinned - Whether the group should be pinned.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupPinnedAction = {\n  type: `AccountTreeController:setAccountGroupPinned`;\n  handler: AccountTreeController['setAccountGroupPinned'];\n};\n\n/**\n * Toggles the hidden state of an account group.\n *\n * @param groupId - The account group ID.\n * @param hidden - Whether the group should be hidden.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupHiddenAction = {\n  type: `AccountTreeController:setAccountGroupHidden`;\n  handler: AccountTreeController['setAccountGroupHidden'];\n};\n\n/**\n * Clears the controller state and resets to default values.\n * Also clears the backup and sync service state.\n */\nexport type AccountTreeControllerClearStateAction = {\n  type: `AccountTreeController:clearState`;\n  handler: AccountTreeController['clearState'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will perform a full sync, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If a full sync is already in progress, it will return the ongoing promise.\n *\n * @returns A promise that resolves when the sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAction = {\n  type: `AccountTreeController:syncWithUserStorage`;\n  handler: AccountTreeController['syncWithUserStorage'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will ensure at least one full sync is ran, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If the first ever full sync is already in progress, it will return the ongoing promise.\n * If the first ever full sync was previously completed, it will NOT start a new sync, and will resolve immediately.\n *\n * @returns A promise that resolves when the first ever full sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAtLeastOnceAction = {\n  type: `AccountTreeController:syncWithUserStorageAtLeastOnce`;\n  handler: AccountTreeController['syncWithUserStorageAtLeastOnce'];\n};\n\n/**\n * Union of all AccountTreeController action types.\n */\nexport type AccountTreeControllerMethodActions =\n  | AccountTreeControllerGetAccountWalletObjectAction\n  | AccountTreeControllerGetAccountWalletObjectsAction\n  | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetAccountContextAction\n  | AccountTreeControllerGetSelectedAccountGroupAction\n  | AccountTreeControllerSetSelectedAccountGroupAction\n  | AccountTreeControllerSetAccountGroupNameAction\n  | AccountTreeControllerSetAccountWalletNameAction\n  | AccountTreeControllerSetAccountGroupPinnedAction\n  | AccountTreeControllerSetAccountGroupHiddenAction\n  | AccountTreeControllerClearStateAction\n  | AccountTreeControllerSyncWithUserStorageAction\n  | AccountTreeControllerSyncWithUserStorageAtLeastOnceAction;\n"]}
+{"version":3,"file":"AccountTreeController-method-action-types.mjs","sourceRoot":"","sources":["../src/AccountTreeController-method-action-types.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/**\n * This file is auto generated.\n * Do not edit manually.\n */\n\nimport type { AccountTreeController } from './AccountTreeController';\n\n/**\n * Gets the account wallet object from its ID.\n *\n * @param walletId - Account wallet ID.\n * @returns The account wallet object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountWalletObjectAction = {\n  type: `AccountTreeController:getAccountWalletObject`;\n  handler: AccountTreeController['getAccountWalletObject'];\n};\n\n/**\n * Gets all account wallet objects.\n *\n * @returns All account wallet objects.\n */\nexport type AccountTreeControllerGetAccountWalletObjectsAction = {\n  type: `AccountTreeController:getAccountWalletObjects`;\n  handler: AccountTreeController['getAccountWalletObjects'];\n};\n\n/**\n * Gets all underlying accounts from the currently selected account\n * group.\n *\n * It also support account selector, which allows to filter specific\n * accounts given some criterias (account type, address, scopes, etc...).\n *\n * @param selector - Optional account selector.\n * @returns Underlying accounts for the currently selected account (filtered\n * by the selector if provided).\n */\nexport type AccountTreeControllerGetAccountsFromSelectedAccountGroupAction = {\n  type: `AccountTreeController:getAccountsFromSelectedAccountGroup`;\n  handler: AccountTreeController['getAccountsFromSelectedAccountGroup'];\n};\n\n/**\n * Gets the account group object from its ID.\n *\n * @param groupId - Account group ID.\n * @returns The account group object if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountGroupObjectAction = {\n  type: `AccountTreeController:getAccountGroupObject`;\n  handler: AccountTreeController['getAccountGroupObject'];\n};\n\n/**\n * Gets the account's context which contains its wallet ID, group ID, and sort order.\n *\n * @param accountId - Account ID.\n * @returns The account context if found, undefined otherwise.\n */\nexport type AccountTreeControllerGetAccountContextAction = {\n  type: `AccountTreeController:getAccountContext`;\n  handler: AccountTreeController['getAccountContext'];\n};\n\n/**\n * Gets the currently selected account group ID.\n *\n * @returns The selected account group ID or empty string if none selected.\n */\nexport type AccountTreeControllerGetSelectedAccountGroupAction = {\n  type: `AccountTreeController:getSelectedAccountGroup`;\n  handler: AccountTreeController['getSelectedAccountGroup'];\n};\n\n/**\n * Sets the selected account group and updates the AccountsController selectedAccount accordingly.\n *\n * @param groupId - The account group ID to select.\n */\nexport type AccountTreeControllerSetSelectedAccountGroupAction = {\n  type: `AccountTreeController:setSelectedAccountGroup`;\n  handler: AccountTreeController['setSelectedAccountGroup'];\n};\n\n/**\n * Sets a custom name for an account group.\n *\n * @param groupId - The account group ID.\n * @param name - The custom name to set.\n * @param autoHandleConflict - If true, automatically resolves name conflicts by adding a suffix. If false, throws on conflicts.\n * @throws If the account group ID is not found in the current tree.\n * @throws If the account group name already exists and autoHandleConflict is false.\n */\nexport type AccountTreeControllerSetAccountGroupNameAction = {\n  type: `AccountTreeController:setAccountGroupName`;\n  handler: AccountTreeController['setAccountGroupName'];\n};\n\n/**\n * Sets a custom name for an account wallet.\n *\n * @param walletId - The account wallet ID.\n * @param name - The custom name to set.\n * @throws If the account wallet ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountWalletNameAction = {\n  type: `AccountTreeController:setAccountWalletName`;\n  handler: AccountTreeController['setAccountWalletName'];\n};\n\n/**\n * Toggles the pinned state of an account group.\n *\n * @param groupId - The account group ID.\n * @param pinned - Whether the group should be pinned.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupPinnedAction = {\n  type: `AccountTreeController:setAccountGroupPinned`;\n  handler: AccountTreeController['setAccountGroupPinned'];\n};\n\n/**\n * Toggles the hidden state of an account group.\n *\n * @param groupId - The account group ID.\n * @param hidden - Whether the group should be hidden.\n * @throws If the account group ID is not found in the current tree.\n */\nexport type AccountTreeControllerSetAccountGroupHiddenAction = {\n  type: `AccountTreeController:setAccountGroupHidden`;\n  handler: AccountTreeController['setAccountGroupHidden'];\n};\n\n/**\n * Clears the controller state and resets to default values.\n * Also clears the backup and sync service state.\n */\nexport type AccountTreeControllerClearStateAction = {\n  type: `AccountTreeController:clearState`;\n  handler: AccountTreeController['clearState'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will perform a full sync, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If a full sync is already in progress, it will return the ongoing promise.\n *\n * @returns A promise that resolves when the sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAction = {\n  type: `AccountTreeController:syncWithUserStorage`;\n  handler: AccountTreeController['syncWithUserStorage'];\n};\n\n/**\n * Bi-directionally syncs the account tree with user storage.\n * This will ensure at least one full sync is ran, including both pulling updates\n * from user storage and pushing local changes to user storage.\n * This also performs legacy account syncing if needed.\n *\n * IMPORTANT:\n * If the first ever full sync is already in progress, it will return the ongoing promise.\n * If the first ever full sync was previously completed, it will NOT start a new sync, and will resolve immediately.\n *\n * @returns A promise that resolves when the first ever full sync is complete.\n */\nexport type AccountTreeControllerSyncWithUserStorageAtLeastOnceAction = {\n  type: `AccountTreeController:syncWithUserStorageAtLeastOnce`;\n  handler: AccountTreeController['syncWithUserStorageAtLeastOnce'];\n};\n\n/**\n * Union of all AccountTreeController action types.\n */\nexport type AccountTreeControllerMethodActions =\n  | AccountTreeControllerGetAccountWalletObjectAction\n  | AccountTreeControllerGetAccountWalletObjectsAction\n  | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction\n  | AccountTreeControllerGetAccountGroupObjectAction\n  | AccountTreeControllerGetAccountContextAction\n  | AccountTreeControllerGetSelectedAccountGroupAction\n  | AccountTreeControllerSetSelectedAccountGroupAction\n  | AccountTreeControllerSetAccountGroupNameAction\n  | AccountTreeControllerSetAccountWalletNameAction\n  | AccountTreeControllerSetAccountGroupPinnedAction\n  | AccountTreeControllerSetAccountGroupHiddenAction\n  | AccountTreeControllerClearStateAction\n  | AccountTreeControllerSyncWithUserStorageAction\n  | AccountTreeControllerSyncWithUserStorageAtLeastOnceAction;\n"]}

package/dist/AccountTreeController.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_groupIdToWalletId, _AccountTreeController_backupAndSyncService, _AccountTreeController_rules, _AccountTreeController_trace, _AccountTreeController_backupAndSyncConfig, _AccountTreeController_accountOrderCallbacks, _AccountTreeController_initialized, _AccountTreeController_getEntropyRule, _AccountTreeController_getSnapRule, _AccountTreeController_getKeyringRule, _AccountTreeController_applyAccountWalletMetadata, _AccountTreeController_getRuleForWallet, _AccountTreeController_getComputedAccountGroupName, _AccountTreeController_getDefaultAccountGroupName, _AccountTreeController_applyAccountGroupMetadata, _AccountTreeController_handleAccountsAdded, _AccountTreeController_handleAccountsRemoved, _AccountTreeController_pruneEmptyGroupAndWallet, _AccountTreeController_insert, _AccountTreeController_listAccounts, _AccountTreeController_assertAccountGroupExists, _AccountTreeController_assertAccountWalletExists, _AccountTreeController_assertAccountGroupNameIsUnique, _AccountTreeController_getDefaultSelectedAccountGroup, _AccountTreeController_handleSelectedAccountChange, _AccountTreeController_handleMultichainAccountWalletStatusChange, _AccountTreeController_getAccountGroup, _AccountTreeController_getDefaultAccountFromAccountGroupId, _AccountTreeController_getDefaultAccountGroupId, _AccountTreeController_resolveNameConflict, _AccountTreeController_createBackupAndSyncContext;
+var _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_groupIdToWalletId, _AccountTreeController_backupAndSyncService, _AccountTreeController_rules, _AccountTreeController_trace, _AccountTreeController_backupAndSyncConfig, _AccountTreeController_accountOrderCallbacks, _AccountTreeController_initialized, _AccountTreeController_getEntropyRule, _AccountTreeController_getSnapRule, _AccountTreeController_getKeyringRule, _AccountTreeController_applyAccountWalletMetadata, _AccountTreeController_getRuleForWallet, _AccountTreeController_getComputedAccountGroupName, _AccountTreeController_getDefaultAccountGroupName, _AccountTreeController_applyAccountGroupMetadata, _AccountTreeController_handleAccountsAdded, _AccountTreeController_handleAccountsRemoved, _AccountTreeController_pruneEmptyGroupAndWallet, _AccountTreeController_insert, _AccountTreeController_listAccounts, _AccountTreeController_assertAccountGroupExists, _AccountTreeController_assertAccountWalletExists, _AccountTreeController_assertAccountGroupNameIsUnique, _AccountTreeController_setSelectedAccountGroup, _AccountTreeController_getDefaultSelectedAccountGroup, _AccountTreeController_handleSelectedAccountChange, _AccountTreeController_handleMultichainAccountWalletStatusChange, _AccountTreeController_getAccountGroup, _AccountTreeController_getDefaultAccountFromAccountGroupId, _AccountTreeController_getDefaultAccountGroupId, _AccountTreeController_hasEvmAccount, _AccountTreeController_resolveNameConflict, _AccountTreeController_createBackupAndSyncContext;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountTreeController = exports.getDefaultAccountTreeControllerState = exports.controllerName = void 0;
 const account_api_1 = require("@metamask/account-api");
@@ -248,8 +248,7 @@ class AccountTreeController extends base_controller_1.BaseController {
                 previousSelectedAccountGroup === '') {
                 // No group is selected yet OR group no longer exists, re-sync with the
                 // AccountsController.
-                state.selectedAccountGroup =
-                    __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getDefaultSelectedAccountGroup).call(this, wallets);
+                state.selectedAccountGroup = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getDefaultSelectedAccountGroup).call(this, state.accountTree.wallets);
             }
         });
         // We still compare the previous and new value, the previous one could have been
@@ -365,25 +364,7 @@ class AccountTreeController extends base_controller_1.BaseController {
      * @param groupId - The account group ID to select.
      */
     setSelectedAccountGroup(groupId) {
-        const previousSelectedAccountGroup = this.state.selectedAccountGroup;
-        // Idempotent check - if the same group is already selected, do nothing
-        if (previousSelectedAccountGroup === groupId) {
-            return;
-        }
-        // Find the first account in this group to select
-        const accountToSelect = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getDefaultAccountFromAccountGroupId).call(this, groupId);
-        if (!accountToSelect) {
-            throw new Error(`No accounts found in group: ${groupId}`);
-        }
-        // Update our state first
-        this.update((state) => {
-            state.selectedAccountGroup = groupId;
-        });
-        (0, logger_1.projectLogger)(`Selected group is now: [${this.state.selectedAccountGroup}]`);
-        this.messenger.publish(`${exports.controllerName}:selectedAccountGroupChange`, groupId, previousSelectedAccountGroup);
-        // Update AccountsController - this will trigger selectedAccountChange event,
-        // but our handler is idempotent so it won't cause infinite loop
-        this.messenger.call('AccountsController:setSelectedAccount', accountToSelect);
+        __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_setSelectedAccountGroup).call(this, groupId);
     }
     /**
      * Sets a custom name for an account group.
@@ -755,6 +736,16 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
         // If any accounts was previously hidden, then we consider the group to be hidden as well.
         group.metadata.hidden = isHidden;
     }
+    // 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;
+    }
 }, _AccountTreeController_handleAccountsAdded = function _AccountTreeController_handleAccountsAdded(accounts) {
     // We wait for the first `init` to be called to actually build up the tree and
     // mutate it. We expect the caller to first update the `AccountsController` state
@@ -878,7 +869,7 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
             accounts: [id],
             metadata: {
                 name: '',
-                ...{ pinned: false, hidden: false }, // Default UI states
+                ...{ pinned: false, hidden: false, lastSelected: 0 }, // Default UI states
                 ...result.group.metadata, // Allow rules to override defaults
             },
             // We do need to type-cast since we're not narrowing `result` with
@@ -933,6 +924,41 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
     if (!(0, group_1.isAccountGroupNameUnique)(this.state, groupId, name)) {
         throw new Error('Account group name already exists');
     }
+}, _AccountTreeController_setSelectedAccountGroup = function _AccountTreeController_setSelectedAccountGroup(groupId, forwardSelectedAccount = true) {
+    const previousSelectedAccountGroup = this.state.selectedAccountGroup;
+    // Idempotent check - if the same group is already selected, do nothing
+    if (previousSelectedAccountGroup === groupId) {
+        return;
+    }
+    // Find the first account in this group to select
+    const accountToSelect = __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getDefaultAccountFromAccountGroupId).call(this, groupId);
+    if (!accountToSelect) {
+        throw new Error(`No accounts found in group: ${groupId}`);
+    }
+    this.update((state) => {
+        // Update our selected account group first.
+        state.selectedAccountGroup = groupId;
+        // Then update its associated metadata (lastSelected timestamp) to keep
+        // track of the most recently selected groups.
+        const now = Date.now();
+        /* istanbul ignore next */
+        if (!state.accountGroupsMetadata[groupId]) {
+            state.accountGroupsMetadata[groupId] = {};
+        }
+        state.accountGroupsMetadata[groupId].lastSelected = now;
+        const walletId = __classPrivateFieldGet(this, _AccountTreeController_groupIdToWalletId, "f").get(groupId);
+        if (walletId) {
+            state.accountTree.wallets[walletId].groups[groupId].metadata.lastSelected = now;
+        }
+    });
+    (0, logger_1.projectLogger)(`Selected group is now: [${this.state.selectedAccountGroup}]`);
+    this.messenger.publish(`${exports.controllerName}:selectedAccountGroupChange`, groupId, previousSelectedAccountGroup);
+    if (forwardSelectedAccount) {
+        // Update AccountsController - this will trigger selectedAccountChange event,
+        // but our handler is idempotent so it won't cause infinite loop
+        this.messenger.call('AccountsController:setSelectedAccount', accountToSelect);
+        (0, logger_1.projectLogger)(`Selected account is now: ${accountToSelect}`);
+    }
 }, _AccountTreeController_getDefaultSelectedAccountGroup = function _AccountTreeController_getDefaultSelectedAccountGroup(wallets) {
     const selectedAccount = this.messenger.call('AccountsController:getSelectedMultichainAccount');
     if (selectedAccount?.id) {
@@ -951,16 +977,9 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
         return;
     }
     const { groupId } = accountMapping;
-    const previousSelectedAccountGroup = this.state.selectedAccountGroup;
-    // Idempotent check - if the same group is already selected, do nothing
-    if (previousSelectedAccountGroup === groupId) {
-        return;
-    }
-    // Update selectedAccountGroup to match the selected account
-    this.update((state) => {
-        state.selectedAccountGroup = groupId;
-    });
-    this.messenger.publish(`${exports.controllerName}:selectedAccountGroupChange`, groupId, previousSelectedAccountGroup);
+    // Avoid infinite loop since this method is triggered by selected account change.
+    const forwardSelectedAccount = false;
+    __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_setSelectedAccountGroup).call(this, groupId, forwardSelectedAccount);
 }, _AccountTreeController_handleMultichainAccountWalletStatusChange = function _AccountTreeController_handleMultichainAccountWalletStatusChange(walletId, walletStatus) {
     this.update((state) => {
         const wallet = state.accountTree.wallets[walletId];
@@ -990,26 +1009,35 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
     }
     return undefined;
 }, _AccountTreeController_getDefaultAccountGroupId = function _AccountTreeController_getDefaultAccountGroupId(wallets) {
-    let candidate = '';
+    let candidate;
     for (const wallet of Object.values(wallets)) {
         for (const group of Object.values(wallet.groups)) {
-            // We only update the candidate with the first non-empty group, but still
-            // try to find a group that contains an EVM account (the `candidate` is
-            // our fallback).
-            if (candidate === '' && group.accounts.length > 0) {
-                candidate = group.id;
+            if (group.accounts.length === 0) {
+                continue;
             }
-            for (const id of group.accounts) {
-                const account = this.messenger.call('AccountsController:getAccount', id);
-                if (account && (0, keyring_api_1.isEvmAccountType)(account.type)) {
-                    // EVM accounts have a higher priority, so if we find any, we just
-                    // use that group!
-                    return group.id;
-                }
+            if (!candidate) {
+                candidate = group;
+                continue;
+            }
+            if (group.metadata.lastSelected > candidate.metadata.lastSelected) {
+                candidate = group;
             }
+            else if (group.metadata.lastSelected === candidate.metadata.lastSelected &&
+                __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_hasEvmAccount).call(this, group) &&
+                !__classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_hasEvmAccount).call(this, candidate)) {
+                candidate = group;
+            }
+        }
+    }
+    return candidate?.id ?? '';
+}, _AccountTreeController_hasEvmAccount = function _AccountTreeController_hasEvmAccount(group) {
+    for (const id of group.accounts) {
+        const account = this.messenger.call('AccountsController:getAccount', id);
+        if (account && (0, keyring_api_1.isEvmAccountType)(account.type)) {
+            return true;
         }
     }
-    return candidate;
+    return false;
 }, _AccountTreeController_resolveNameConflict = function _AccountTreeController_resolveNameConflict(wallet, groupId, name) {
     let suffix = 2;
     let candidateName = `${name} (${suffix})`;