@metamask-previews/assets-controller 14.0.2-preview-36bc195a7 → 14.0.3-preview-a38f058

package/CHANGELOG.md

@@ -9,11 +9,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **BREAKING:** `AssetsControllerMessenger` now requires `AccountTreeController:isInitialized`, `ClientController:getState`, and `KeyringController:isUnlocked` so lifecycle checks read controller state on demand instead of mirroring it from events ([#10059](https://github.com/MetaMask/core/pull/10059))
+  - Hosts that restrict which actions flow through the `AssetsController` messenger must delegate these three actions
+  - `AccountTreeController:stateChange` is no longer subscribed to; remove it from allowed events if your messenger wiring lists events explicitly
+- Revert to `selectedAccountGroupChange` for account-group switches; snap accounts added mid-session are picked up on restart ([#10059](https://github.com/MetaMask/core/pull/10059))
+- Bump `@metamask/transaction-controller` from `^69.6.1` to `^69.7.0` ([#10046](https://github.com/MetaMask/core/pull/10046))
+
+## [14.0.3]
+
+### Changed
+
 - Bump `@metamask/remote-feature-flag-controller` from `^6.0.0` to `^6.1.0` ([#9980](https://github.com/MetaMask/core/pull/9980))
 
 ### Fixed
 
 - Clean up spam assets on keyring unlock, gated behind the `assetsUnifyState` remote feature flag's `useUnlockCleanup` property (disabled unless the flag explicitly enables it) ([#9973](https://github.com/MetaMask/core/pull/9973))
+- Skip transaction-driven force `getAssets` refreshes on chains where AccountActivity already provides live WebSocket balance updates, avoiding a race with the Accounts API that could overwrite correct balances ([#10030](https://github.com/MetaMask/core/pull/10030))
 
 ## [14.0.2]
 
@@ -960,7 +971,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactor `RpcDataSource` to delegate polling to `BalanceFetcher` and `TokenDetector` services ([#7709](https://github.com/MetaMask/core/pull/7709))
 - Refactor `BalanceFetcher` and `TokenDetector` to extend `StaticIntervalPollingControllerOnly` for independent polling management ([#7709](https://github.com/MetaMask/core/pull/7709))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@14.0.2...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@14.0.3...HEAD
+[14.0.3]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@14.0.2...@metamask/assets-controller@14.0.3
 [14.0.2]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@14.0.1...@metamask/assets-controller@14.0.2
 [14.0.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@14.0.0...@metamask/assets-controller@14.0.1
 [14.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@13.1.4...@metamask/assets-controller@14.0.0

package/dist/AssetsController.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_accountTreeInitialized, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_getSelectedAccounts, _AssetsController_accountActivityDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_customAssetGraduationMiddleware, _AssetsController_rpcFallbackMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_queryApiClient, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeNativeAssetsMap, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_onUnapprovedTransactionAdded, _AssetsController_onTransactionConfirmed, _AssetsController_runSpamCleanup, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_runAccountTreeRefresh, _AssetsController_runStartupRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_assertNonEmptyAccountId, _AssetsController_normalizeAssetIdOrThrow, _AssetsController_fetchMissingPricesWithoutCache, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_getSlowPipelineChainIds, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_getAssetFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeRpcCustomAssetsSupplement, _AssetsController_unsubscribeBySubscriptionKey, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged, _AssetsController_handleNetworkAdded, _AssetsController_refreshActiveChainsOnNetworkSwitch, _AssetsController_getSelectedEvmChainIdFromNetworkState, _AssetsController_handleNetworkDidChange, _AssetsController_refreshAssetsAfterNetworkChange, _AssetsController_refreshAssetsAfterNetworkAdded;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitStateSizeTrace, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_getSelectedAccounts, _AssetsController_isAccountTreeInitialized, _AssetsController_isUiOpen, _AssetsController_isKeyringUnlocked, _AssetsController_accountActivityDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_customAssetGraduationMiddleware, _AssetsController_rpcFallbackMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_queryApiClient, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeNativeAssetsMap, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_refreshAssetsForTransaction, _AssetsController_runSpamCleanup, _AssetsController_updateActive, _AssetsController_runStartupRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_assertNonEmptyAccountId, _AssetsController_normalizeAssetIdOrThrow, _AssetsController_fetchMissingPricesWithoutCache, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_getSlowPipelineChainIds, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_getAssetFromState, _AssetsController_shouldHideNativeToken, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeRpcCustomAssetsSupplement, _AssetsController_unsubscribeBySubscriptionKey, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged, _AssetsController_handleNetworkAdded, _AssetsController_refreshActiveChainsOnNetworkSwitch, _AssetsController_getSelectedEvmChainIdFromNetworkState, _AssetsController_handleNetworkDidChange, _AssetsController_refreshAssetsAfterNetworkChange, _AssetsController_refreshAssetsAfterNetworkAdded;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -305,15 +305,6 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_firstInitFetchReported.set(this, false);
         /** Whether we have already reported state size for this session (reset on #stop). */
         _AssetsController_stateSizeReported.set(this, false);
-        /** Whether the client (UI) is open. Combined with #keyringUnlocked for #updateActive. */
-        _AssetsController_uiOpen.set(this, false);
-        /** Whether the keyring is unlocked. Combined with #uiOpen for #updateActive. */
-        _AssetsController_keyringUnlocked.set(this, false);
-        /**
-         * Whether `AccountTreeController` has finished `init()`. Unlock / UI-open
-         * alone must not start fetches — the tree can still be mid-build.
-         */
-        _AssetsController_accountTreeInitialized.set(this, false);
         _AssetsController_controllerMutex.set(this, new async_mutex_1.Mutex());
         /** Serializes account-switch fetch + subscribe to prevent overlapping races. */
         _AssetsController_accountRefreshMutex.set(this, new async_mutex_1.Mutex());
@@ -326,12 +317,6 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_activeSubscriptions.set(this, new Map());
         /** Currently enabled chains from NetworkEnablementController */
         _AssetsController_enabledChains.set(this, new Set());
-        /**
-         * Snapshot of account IDs that were active when the last subscription/fetch
-         * cycle ran. Used by #handleAccountTreeStateChange to skip redundant
-         * re-subscriptions when the account set hasn't actually changed.
-         */
-        _AssetsController_lastKnownAccountIds.set(this, new Set());
         _AssetsController_accountActivityDataSource.set(this, void 0);
         _AssetsController_accountsApiDataSource.set(this, void 0);
         _AssetsController_snapDataSource.set(this, void 0);
@@ -1185,7 +1170,7 @@ class AssetsController extends base_controller_1.BaseController {
     }
 }
 exports.AssetsController = AssetsController;
-_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trace = new WeakMap(), _AssetsController_captureException = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_stateSizeReported = new WeakMap(), _AssetsController_uiOpen = new WeakMap(), _AssetsController_keyringUnlocked = new WeakMap(), _AssetsController_accountTreeInitialized = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_accountRefreshMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_lastKnownAccountIds = new WeakMap(), _AssetsController_accountActivityDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_stakedBalanceDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_customAssetGraduationMiddleware = new WeakMap(), _AssetsController_rpcFallbackMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_queryApiClient = new WeakMap(), _AssetsController_onActiveChainsUpdated = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_emitStateSizeTrace = function _AssetsController_emitStateSizeTrace() {
+_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trace = new WeakMap(), _AssetsController_captureException = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_stateSizeReported = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_accountRefreshMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_accountActivityDataSource = new WeakMap(), _AssetsController_accountsApiDataSource = new WeakMap(), _AssetsController_snapDataSource = new WeakMap(), _AssetsController_rpcDataSource = new WeakMap(), _AssetsController_stakedBalanceDataSource = new WeakMap(), _AssetsController_priceDataSource = new WeakMap(), _AssetsController_detectionMiddleware = new WeakMap(), _AssetsController_customAssetGraduationMiddleware = new WeakMap(), _AssetsController_rpcFallbackMiddleware = new WeakMap(), _AssetsController_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_queryApiClient = new WeakMap(), _AssetsController_onActiveChainsUpdated = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_emitStateSizeTrace = function _AssetsController_emitStateSizeTrace() {
     if (!__classPrivateFieldGet(this, _AssetsController_trace, "f") || __classPrivateFieldGet(this, _AssetsController_stateSizeReported, "f")) {
         return;
     }
@@ -1238,6 +1223,12 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         return [selectedAccount];
     }
     return [];
+}, _AssetsController_isAccountTreeInitialized = function _AssetsController_isAccountTreeInitialized() {
+    return this.messenger.call('AccountTreeController:isInitialized');
+}, _AssetsController_isUiOpen = function _AssetsController_isUiOpen() {
+    return client_controller_1.clientControllerSelectors.selectIsUiOpen(this.messenger.call('ClientController:getState'));
+}, _AssetsController_isKeyringUnlocked = function _AssetsController_isKeyringUnlocked() {
+    return this.messenger.call('KeyringController:isUnlocked');
 }, _AssetsController_allBalanceDataSources_get = function _AssetsController_allBalanceDataSources_get() {
     return [
         __classPrivateFieldGet(this, _AssetsController_accountActivityDataSource, "f"),
@@ -1297,16 +1288,14 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     }
     return reference;
 }, _AssetsController_subscribeToEvents = function _AssetsController_subscribeToEvents() {
-    // Subscribe to account group changes (when user switches between account groups like Account 1 -> Account 2)
     this.messenger.subscribe('AccountTreeController:selectedAccountGroupChange', (groupId, previousGroupId) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleAccountGroupChanged).call(this, groupId, previousGroupId).catch(console.error);
     });
-    // Catch post-init tree mutations that change the selected account set
-    // (e.g. a snap account added to the current group) without changing
-    // the selected group id. Intermediate `:stateChange` events during
-    // `AccountTreeController.init()` are ignored until `:initialized`.
-    this.messenger.subscribe('AccountTreeController:stateChange', () => {
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleAccountTreeStateChange).call(this);
+    this.messenger.subscribe('AccountTreeController:initialized', () => {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
+    });
+    this.messenger.subscribe('AccountTreeController:uninitialized', () => {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     });
     // Subscribe to network enablement changes (only enabledNetworkMap)
     this.messenger.subscribe('NetworkEnablementController:stateChange', ({ enabledNetworkMap }) => {
@@ -1333,72 +1322,45 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleNetworkDidChange).call(this, networkState).catch(console.error);
     });
     // Client + Keyring lifecycle: only run when UI is open AND keyring is unlocked
-    this.messenger.subscribe('ClientController:stateChange', (isUiOpen) => {
-        __classPrivateFieldSet(this, _AssetsController_uiOpen, isUiOpen, "f");
+    this.messenger.subscribe('ClientController:stateChange', () => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     }, client_controller_1.clientControllerSelectors.selectIsUiOpen);
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     this.messenger.subscribe('KeyringController:unlock', async () => {
-        __classPrivateFieldSet(this, _AssetsController_keyringUnlocked, true, "f");
         await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runSpamCleanup).call(this).catch(() => {
             /* Do nothing */
         });
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     });
     this.messenger.subscribe('KeyringController:lock', () => {
-        __classPrivateFieldSet(this, _AssetsController_keyringUnlocked, false, "f");
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     });
-    // Subscribe to unapproved transactions - TXs that need confirmation
-    // Ensures that balances for the account making transaction are updated (e.g. for gas estimations)
+    // Subscribe to unapproved transactions - TXs that need confirmation.
+    // Ensures balances for the account making the transaction are updated
+    // (e.g. for gas estimations), except on AccountActivity-active chains.
     this.messenger.subscribe('TransactionController:unapprovedTransactionAdded', (transactionMeta) => {
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_onUnapprovedTransactionAdded).call(this, transactionMeta);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshAssetsForTransaction).call(this, transactionMeta);
     });
     // Post-tx refresh via the full fetch pipeline (Accounts API + RPC fallback).
+    // Skipped for chains covered by AccountActivity (real-time WS updates).
     // RpcDataSource also listens for transactionConfirmed, but only refreshes
     // chains it owns via an active subscription.
     this.messenger.subscribe('TransactionController:transactionConfirmed', (transactionMeta) => {
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_onTransactionConfirmed).call(this, transactionMeta);
-    });
-    // Start tracking only after the account tree is fully built. Unlock can
-    // happen before `AccountTreeController.init()`, and `:stateChange` fires
-    // for intermediate mutations during that build.
-    this.messenger.subscribe('AccountTreeController:initialized', () => {
-        __classPrivateFieldSet(this, _AssetsController_accountTreeInitialized, true, "f");
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshAssetsForTransaction).call(this, transactionMeta);
     });
-    this.messenger.subscribe('AccountTreeController:uninitialized', () => {
-        __classPrivateFieldSet(this, _AssetsController_accountTreeInitialized, false, "f");
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
-    });
-}, _AssetsController_onUnapprovedTransactionAdded = function _AssetsController_onUnapprovedTransactionAdded(transactionMeta) {
+}, _AssetsController_refreshAssetsForTransaction = function _AssetsController_refreshAssetsForTransaction(transactionMeta) {
     const hexChainId = transactionMeta.chainId;
     if (!hexChainId) {
         return;
     }
     const caipChainId = `eip155:${parseInt(hexChainId, 16)}`;
-    const fromAddress = transactionMeta.txParams.from?.toLowerCase();
-    if (!fromAddress) {
-        return;
-    }
-    const matchedAccount = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this).find((account) => account.address.toLowerCase() === fromAddress);
-    if (!matchedAccount) {
-        return;
-    }
-    this.getAssets([matchedAccount], {
-        chainIds: [caipChainId],
-        forceUpdate: true,
-    }).catch((error) => {
-        log('Failed to refresh assets after unapproved transaction added', {
-            error,
-        });
-    });
-}, _AssetsController_onTransactionConfirmed = function _AssetsController_onTransactionConfirmed(transactionMeta) {
-    const hexChainId = transactionMeta.chainId;
-    if (!hexChainId) {
+    // AccountActivity pushes live balance updates for its active chains; a
+    // force getAssets would be redundant and can race the WebSocket path.
+    if (__classPrivateFieldGet(this, _AssetsController_accountActivityDataSource, "f")
+        .getActiveChainsSync()
+        .includes(caipChainId)) {
         return;
     }
-    const caipChainId = `eip155:${parseInt(hexChainId, 16)}`;
     const fromAddress = transactionMeta.txParams.from?.toLowerCase();
     if (!fromAddress) {
         return;
@@ -1411,11 +1373,11 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         chainIds: [caipChainId],
         forceUpdate: true,
     }).catch((error) => {
-        log('Failed to refresh assets after transaction confirmed', { error });
+        log('Failed to refresh assets after transaction event', { error });
     });
 }, _AssetsController_runSpamCleanup = async function _AssetsController_runSpamCleanup() {
     try {
-        const shouldRun = __classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f") &&
+        const shouldRun = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isKeyringUnlocked).call(this) &&
             __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this) &&
             (0, healAssetsInfoMetadata_js_1.isUnlockCleanupEnabled)(this.messenger.call('RemoteFeatureFlagController:getState')
                 ?.remoteFeatureFlags);
@@ -1447,67 +1409,15 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         log('Failed to run spam cleanup', { error });
     }
 }, _AssetsController_updateActive = function _AssetsController_updateActive() {
-    const shouldRun = __classPrivateFieldGet(this, _AssetsController_uiOpen, "f") && __classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f") && __classPrivateFieldGet(this, _AssetsController_accountTreeInitialized, "f");
+    const shouldRun = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isUiOpen).call(this) &&
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isKeyringUnlocked).call(this) &&
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isAccountTreeInitialized).call(this);
     if (shouldRun) {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_start).call(this);
     }
     else {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this);
     }
-}, _AssetsController_handleAccountTreeStateChange = function _AssetsController_handleAccountTreeStateChange() {
-    const shouldRun = __classPrivateFieldGet(this, _AssetsController_uiOpen, "f") &&
-        __classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f") &&
-        __classPrivateFieldGet(this, _AssetsController_accountTreeInitialized, "f") &&
-        __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").size > 0;
-    if (!shouldRun) {
-        return;
-    }
-    const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
-    const currentIds = new Set(accounts.map((a) => a.id));
-    const accountsChanged = currentIds.size !== __classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").size ||
-        [...currentIds].some((id) => !__classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").has(id));
-    if (!accountsChanged) {
-        return;
-    }
-    const hasOverlap = [...currentIds].some((id) => __classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").has(id));
-    if (!hasOverlap && __classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").size > 0) {
-        return;
-    }
-    log('Account tree changed with new accounts, re-subscribing', {
-        previousCount: __classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").size,
-        currentCount: currentIds.size,
-    });
-    const newAccounts = accounts.filter((account) => !__classPrivateFieldGet(this, _AssetsController_lastKnownAccountIds, "f").has(account.id));
-    __classPrivateFieldSet(this, _AssetsController_lastKnownAccountIds, currentIds, "f");
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this);
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runAccountTreeRefresh).call(this, accounts, newAccounts).catch((error) => {
-        log('Failed to refresh assets after tree change', error);
-    });
-}, _AssetsController_runAccountTreeRefresh = async function _AssetsController_runAccountTreeRefresh(accounts, newAccounts = []) {
-    const releaseLock = await __classPrivateFieldGet(this, _AssetsController_accountRefreshMutex, "f").acquire();
-    try {
-        await this.getAssets(accounts, {
-            chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
-            forceUpdate: true,
-        });
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this, { skipInitialFetch: true });
-        if (newAccounts.length > 0) {
-            await this.getAssets(newAccounts, {
-                chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
-                forceUpdate: true,
-            });
-        }
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_fetchMissingPricesWithoutCache).call(this, accounts, [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")]);
-    }
-    catch (error) {
-        log('Failed to fetch assets after tree change', error);
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this, { skipInitialFetch: true });
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_fetchMissingPricesWithoutCache).call(this, accounts, [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")]);
-    }
-    finally {
-        releaseLock();
-    }
 }, _AssetsController_runStartupRefresh = 
 /**
  * Force-fetch balances then subscribe. Used on unlock / first startup.
@@ -1542,7 +1452,7 @@ async function _AssetsController_runStartupRefresh(accounts) {
 }, _AssetsController_registerActionHandlers = function _AssetsController_registerActionHandlers() {
     this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
 }, _AssetsController_handleActiveChainsUpdate = function _AssetsController_handleActiveChainsUpdate(dataSourceId, activeChains, previousChains) {
-    if (!__classPrivateFieldGet(this, _AssetsController_uiOpen, "f") || !__classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f") || !__classPrivateFieldGet(this, _AssetsController_isEnabled, "f").call(this)) {
+    if (!__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isUiOpen).call(this) || !__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isKeyringUnlocked).call(this) || !__classPrivateFieldGet(this, _AssetsController_isEnabled, "f").call(this)) {
         return;
     }
     log('Data source active chains changed', {
@@ -2115,7 +2025,6 @@ async function _AssetsController_executeMiddlewares(params) {
         selectedAccountCount: accounts.length,
         enabledChainCount: chainIds.length,
     });
-    __classPrivateFieldSet(this, _AssetsController_lastKnownAccountIds, new Set(accounts.map((a) => a.id)), "f");
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runStartupRefresh).call(this, accounts).catch((error) => {
         log('Failed to start asset tracking', error);
     });
@@ -2126,7 +2035,6 @@ async function _AssetsController_executeMiddlewares(params) {
     });
     __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, false, "f");
     __classPrivateFieldSet(this, _AssetsController_stateSizeReported, false, "f");
-    __classPrivateFieldSet(this, _AssetsController_lastKnownAccountIds, new Set(), "f");
     // Stop price subscription first (uses direct messenger call)
     this.unsubscribeAssetsPrice();
     // Stop balance subscriptions by properly notifying data sources via messenger
@@ -2395,7 +2303,6 @@ async function _AssetsController_executeMiddlewares(params) {
 // EVENT HANDLERS
 // ============================================================================
 async function _AssetsController_handleAccountGroupChanged(groupId, previousGroupId = '') {
-    // The selected account group can be empty during onboarding or wallet reset.
     if (!groupId) {
         return;
     }
@@ -2416,7 +2323,6 @@ async function _AssetsController_handleAccountGroupChanged(groupId, previousGrou
         groupId,
         previousGroupId,
     });
-    __classPrivateFieldSet(this, _AssetsController_lastKnownAccountIds, new Set(accounts.map((a) => a.id)), "f");
     const releaseLock = await __classPrivateFieldGet(this, _AssetsController_accountRefreshMutex, "f").acquire();
     try {
         if (accounts.length > 0) {
@@ -2427,8 +2333,6 @@ async function _AssetsController_handleAccountGroupChanged(groupId, previousGrou
         }
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this);
-        // Subscribe after seed so the price poll sees natives / defaults.
-        // Balances were just force-fetched — skip AccountsApi's subscribe-time poll.
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this, { skipInitialFetch: true });
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_fetchMissingPricesWithoutCache).call(this, accounts, [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")]);
     }
@@ -2526,7 +2430,7 @@ async function _AssetsController_refreshActiveChainsOnNetworkSwitch() {
  * @param networkState - NetworkController state after the switch.
  */
 async function _AssetsController_handleNetworkDidChange(networkState) {
-    if (!__classPrivateFieldGet(this, _AssetsController_uiOpen, "f") || !__classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f") || !__classPrivateFieldGet(this, _AssetsController_isEnabled, "f").call(this)) {
+    if (!__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isUiOpen).call(this) || !__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_isKeyringUnlocked).call(this) || !__classPrivateFieldGet(this, _AssetsController_isEnabled, "f").call(this)) {
         return;
     }
     const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);