@metamask-previews/assets-controller 9.1.0-preview-e12e4a38f → 9.1.0-preview-4f9d41d

package/dist/AssetsController.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitTrace, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_wsBalanceFreshUntil, _AssetsController_getSelectedAccounts, _AssetsController_backendWebsocketDataSource, _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_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_runAccountTreeRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_getNativeAssetMap, _AssetsController_isNativeAsset, _AssetsController_getAssetType, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_ensureDefaultTrackedAssetsSeeded, _AssetsController_filterBalancesRespectingWsFreshness, _AssetsController_markWsBalancesFresh, _AssetsController_clearWsBalanceFreshness, _AssetsController_updateState, _AssetsController_getAssetsFromState, _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_refreshAssetsAfterNetworkChange;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trace, _AssetsController_captureException, _AssetsController_firstInitFetchReported, _AssetsController_stateSizeReported, _AssetsController_emitTrace, _AssetsController_emitStateSizeTrace, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_accountRefreshMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_lastKnownAccountIds, _AssetsController_getSelectedAccounts, _AssetsController_backendWebsocketDataSource, _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_onAccountActivityBalanceUpdated, _AssetsController_updateActive, _AssetsController_handleAccountTreeStateChange, _AssetsController_runAccountTreeRefresh, _AssetsController_runStartupRefresh, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _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_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;
 import { BaseController } from "@metamask/base-controller";
 import { clientControllerSelectors } from "@metamask/client-controller";
 import { isCaipChainId, isStrictHexString, KnownCaipNamespace, parseCaipAssetType, parseCaipChainId } from "@metamask/utils";
@@ -35,6 +35,7 @@ import { RpcFallbackMiddleware } from "./middlewares/RpcFallbackMiddleware.mjs";
 import { normalizeAmountString, normalizeAssetId, formatExchangeRatesForBridge, formatStateForTransactionPay, buildNativeAssetsFromConstant, buildNativeAssetsFromApi } from "./utils/index.mjs";
 import { ZERO_ADDRESS } from "./utils/constants.mjs";
 import { pickRpcCustomAssetsSupplement } from "./utils/customAssetsRpcSupplement.mjs";
+import { processAccountActivityBalanceUpdates } from "./utils/processAccountActivityBalanceUpdates.mjs";
 const NATIVE_ASSETS_QUERY_KEY = ['nativeAssets'];
 // ============================================================================
 // CONTROLLER CONSTANTS
@@ -57,15 +58,6 @@ const MESSENGER_EXPOSED_METHODS = [
 ];
 /** Default polling interval hint for data sources (30 seconds) */
 const DEFAULT_POLLING_INTERVAL_MS = 30000;
-/** Sources whose passive polling must not overwrite recent websocket balances. */
-const POLLING_BALANCE_SOURCES = new Set([
-    'AccountsApiDataSource',
-    'RpcDataSource',
-    'SnapDataSource',
-    'StakedBalanceDataSource',
-]);
-/** How long websocket balance updates block stale polling overwrites. */
-const WS_BALANCE_FRESHNESS_MS = 120000;
 // ============================================================================
 // TRACE NAMES — used in Sentry spans (search these strings in Discover)
 // ============================================================================
@@ -195,11 +187,41 @@ function normalizeResponse(response) {
     if (response.updateMode) {
         normalized.updateMode = response.updateMode;
     }
-    if (response.sourceId) {
-        normalized.sourceId = response.sourceId;
+    if (response.replaceCoveredChainBalances) {
+        normalized.replaceCoveredChainBalances = true;
     }
     return normalized;
 }
+/**
+ * Merge account balances from a data-source response into prior state.
+ *
+ * @param previousBalances - Balances already in state for this account.
+ * @param accountBalances - Balances from the incoming response.
+ * @param customAssetIds - Custom assets to preserve when replacing covered chains.
+ * @param replaceCoveredChains - When true, drop prior balances on chains present
+ *   in the response before applying it (authoritative chain slice).
+ * @returns The merged balance map for the account.
+ */
+function mergeAccountBalances(previousBalances, accountBalances, customAssetIds, replaceCoveredChains) {
+    if (!replaceCoveredChains) {
+        return { ...previousBalances, ...accountBalances };
+    }
+    const coveredChains = new Set(Object.keys(accountBalances).map((assetId) => assetId.split('/')[0]));
+    const next = {};
+    for (const [assetId, balance] of Object.entries(previousBalances)) {
+        if (!coveredChains.has(assetId.split('/')[0])) {
+            next[assetId] = balance;
+        }
+    }
+    Object.assign(next, accountBalances);
+    for (const customId of customAssetIds) {
+        if (!Object.prototype.hasOwnProperty.call(next, customId)) {
+            const prev = previousBalances[customId];
+            next[customId] = prev ?? { amount: '0' };
+        }
+    }
+    return next;
+}
 // ============================================================================
 // CONTROLLER IMPLEMENTATION
 // ============================================================================
@@ -278,11 +300,6 @@ export class AssetsController extends BaseController {
          * re-subscriptions when the account set hasn't actually changed.
          */
         _AssetsController_lastKnownAccountIds.set(this, new Set());
-        /**
-         * Per `accountId:assetId`, timestamp until which websocket balance updates
-         * should not be overwritten by polling/API fetches.
-         */
-        _AssetsController_wsBalanceFreshUntil.set(this, new Map());
         _AssetsController_backendWebsocketDataSource.set(this, void 0);
         _AssetsController_accountsApiDataSource.set(this, void 0);
         _AssetsController_snapDataSource.set(this, void 0);
@@ -431,9 +448,9 @@ export class AssetsController extends BaseController {
             // creation, RPC is slow on many chains). Results are committed to state
             // immediately so the UI can display balances without waiting for them.
             //
-            // Both the fast and background pipelines use 'merge' mode because neither
-            // alone represents the full set of data sources. Using 'full' in either
-            // would wipe balances from the sources handled by the other pipeline.
+            // Fast/slow pipelines use merge so partial API snapshots cannot wipe
+            // tokens missing from the response (e.g. USDC when only native balance
+            // is returned). Balances present in the response are still refreshed.
             const fastSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
                 ? [
                     createParallelBalanceMiddleware([
@@ -453,39 +470,36 @@ export class AssetsController extends BaseController {
                 ]
                 : [__classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f")];
             const { response, durationByDataSource } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, fastSources, request);
-            // The fast pipeline only contains a subset of data sources (AccountsApi +
-            // StakedBalance), so it must always merge to avoid wiping Snap/RPC
-            // balances that the background pipeline hasn't yet replaced.
             await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
                 ...response,
                 updateMode: 'merge',
-                sourceId: 'getAssets:forceUpdate',
+                replaceCoveredChainBalances: true,
             });
             // Background pipeline: snap and RPC run in parallel after the fast path
             // commits to state. Their balances are merged together before detection.
             // Token + price enrichment matches the pre-split behavior: only when basic
             // functionality is on (RPC-only mode must not call token/price APIs).
-            const slowSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                ? [__classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")]
-                : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
-                createParallelBalanceMiddleware(slowSources),
-                __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-                ...(__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
-                    ? [
-                        createParallelMiddleware([
-                            __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                            __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
-                        ]),
-                    ]
-                    : []),
-            ], request)
-                .then(({ response: slowResponse }) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
-                ...slowResponse,
-                updateMode: 'merge',
-                sourceId: 'getAssets:forceUpdate',
-            }))
-                .catch((error) => log('Background pipeline failed', { error }));
+            const slowPipelineChainIds = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSlowPipelineChainIds).call(this, chainIds, response);
+            if (slowPipelineChainIds.length > 0) {
+                const slowSources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                    ? [__classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")]
+                    : [__classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f")];
+                const slowRequest = { ...request, chainIds: slowPipelineChainIds };
+                __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
+                    createParallelBalanceMiddleware(slowSources),
+                    __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+                    ...(__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
+                        ? [
+                            createParallelMiddleware([
+                                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                            ]),
+                        ]
+                        : []),
+                ], slowRequest)
+                    .then(({ response: slowResponse }) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...slowResponse, updateMode: 'merge' }))
+                    .catch((error) => log('Background pipeline failed', { error }));
+            }
             const durationMs = performance.now() - startTime;
             // Emit trace for every full fetch (Assets Health dashboard)
             __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_FULL_FETCH, {
@@ -877,7 +891,8 @@ export class AssetsController extends BaseController {
         // RPC already fetches custom assets on purpose, and Snap handles non-EVM
         // chains the rule does not apply to, so skip the middleware for those.
         const shouldGraduateCustomAssets = sourceId === 'AccountsApiDataSource' ||
-            sourceId === 'BackendWebsocketDataSource';
+            sourceId === 'BackendWebsocketDataSource' ||
+            sourceId === 'AccountActivityService';
         const enrichmentSources = [
             ...(shouldGraduateCustomAssets
                 ? [__classPrivateFieldGet(this, _AssetsController_customAssetGraduationMiddleware, "f")]
@@ -891,11 +906,10 @@ export class AssetsController extends BaseController {
             ]));
         }
         const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, enrichmentSources, pipelineRequest, response);
-        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...enrichedResponse, sourceId });
-        if (sourceId === 'BackendWebsocketDataSource' &&
-            enrichedResponse.assetsBalance) {
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_markWsBalancesFresh).call(this, enrichedResponse.assetsBalance);
-        }
+        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, {
+            ...enrichedResponse,
+            replaceCoveredChainBalances: response.replaceCoveredChainBalances,
+        });
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_emitTrace).call(this, TRACE_UPDATE_PIPELINE, {
             source: sourceId,
             duration_ms: performance.now() - updateStart,
@@ -942,7 +956,7 @@ export class AssetsController extends BaseController {
         this.messenger.unregisterActionHandler('AssetsController:setSelectedCurrency');
     }
 }
-_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_controllerMutex = new WeakMap(), _AssetsController_accountRefreshMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_lastKnownAccountIds = new WeakMap(), _AssetsController_wsBalanceFreshUntil = new WeakMap(), _AssetsController_backendWebsocketDataSource = 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_emitTrace = function _AssetsController_emitTrace(name, data, tags = {
+_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_controllerMutex = new WeakMap(), _AssetsController_accountRefreshMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = new WeakMap(), _AssetsController_lastKnownAccountIds = new WeakMap(), _AssetsController_backendWebsocketDataSource = 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_emitTrace = function _AssetsController_emitTrace(name, data, tags = {
     controller: 'AssetsController',
 }) {
     if (!__classPrivateFieldGet(this, _AssetsController_trace, "f")) {
@@ -1068,11 +1082,11 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     // The base-controller `:stateChange` event is guaranteed to fire
     // when init() calls this.update(). #start() is idempotent so
     // repeated fires are safe.
-    this.messenger.subscribe('AccountTreeController:stateChange', () => {
+    this.messenger.subscribe('AccountTreeController:stateChanged', () => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleAccountTreeStateChange).call(this);
     });
     // Subscribe to network enablement changes (only enabledNetworkMap)
-    this.messenger.subscribe('NetworkEnablementController:stateChange', ({ enabledNetworkMap }) => {
+    this.messenger.subscribe('NetworkEnablementController:stateChanged', ({ enabledNetworkMap }) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleEnabledNetworksChanged).call(this, enabledNetworkMap).catch(console.error);
     });
     // When a network is added or removed from NetworkController, refresh
@@ -1083,13 +1097,20 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     // enabled in NetworkEnablementController.
     this.messenger.subscribe('NetworkController:networkAdded', (networkConfiguration) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleNetworkAdded).call(this, networkConfiguration.chainId);
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshAssetsAfterNetworkChange).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshAssetsAfterNetworkAdded).call(this, networkConfiguration.chainId).catch((error) => {
+            log('Failed to refresh assets after network added', { error });
+        });
     });
     this.messenger.subscribe('NetworkController:networkRemoved', () => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshAssetsAfterNetworkChange).call(this);
     });
+    // Selected EVM network switch (network picker). Enablement changes are
+    // handled separately via NetworkEnablementController:stateChanged.
+    this.messenger.subscribe('NetworkController:networkDidChange', (networkState) => {
+        __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) => {
+    this.messenger.subscribe('ClientController:stateChanged', (isUiOpen) => {
         __classPrivateFieldSet(this, _AssetsController_uiOpen, isUiOpen, "f");
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     }, clientControllerSelectors.selectIsUiOpen);
@@ -1106,6 +1127,18 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     this.messenger.subscribe('TransactionController:unapprovedTransactionAdded', (transactionMeta) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_onUnapprovedTransactionAdded).call(this, transactionMeta);
     });
+    // Post-tx refresh via the full fetch pipeline (Accounts API + RPC fallback).
+    // 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);
+    });
+    // Real-time post-tx balances from AccountActivityService (same WS payload as
+    // TokenBalancesController; BackendWebsocketDataSource may not receive the
+    // callback when AccountActivityService owns the server subscription).
+    this.messenger.subscribe('AccountActivityService:balanceUpdated', (event) => {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_onAccountActivityBalanceUpdated).call(this, event);
+    });
 }, _AssetsController_onUnapprovedTransactionAdded = function _AssetsController_onUnapprovedTransactionAdded(transactionMeta) {
     const hexChainId = transactionMeta.chainId;
     if (!hexChainId) {
@@ -1128,6 +1161,46 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
             error,
         });
     });
+}, _AssetsController_onTransactionConfirmed = function _AssetsController_onTransactionConfirmed(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 transaction confirmed', { error });
+    });
+}, _AssetsController_onAccountActivityBalanceUpdated = function _AssetsController_onAccountActivityBalanceUpdated({ address, chain, updates, }) {
+    const account = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this).find((a) => a.address.startsWith('0x')
+        ? a.address.toLowerCase() === address.toLowerCase()
+        : a.address === address);
+    if (!account) {
+        return;
+    }
+    const chainId = chain;
+    const response = processAccountActivityBalanceUpdates(updates, account.id, (assetId) => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetType).call(this, assetId));
+    if (!response.assetsBalance) {
+        return;
+    }
+    const request = {
+        accountsWithSupportedChains: [{ account, supportedChains: [chainId] }],
+        chainIds: [chainId],
+        dataTypes: ['balance', 'metadata'],
+    };
+    this.handleAssetsUpdate(response, 'AccountActivityService', request).catch((error) => {
+        log('Failed to apply AccountActivityService balance update', { error });
+    });
 }, _AssetsController_updateActive = function _AssetsController_updateActive() {
     const shouldRun = __classPrivateFieldGet(this, _AssetsController_uiOpen, "f") && __classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f");
     if (shouldRun) {
@@ -1183,6 +1256,32 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     finally {
         releaseLock();
     }
+}, _AssetsController_runStartupRefresh = 
+/**
+ * Force-fetch balances then subscribe. Used on unlock / first startup.
+ *
+ * @param accounts - Selected accounts to refresh.
+ */
+async function _AssetsController_runStartupRefresh(accounts) {
+    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);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this);
+    }
+    catch (error) {
+        log('Failed to fetch assets on startup', error);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this);
+    }
+    finally {
+        releaseLock();
+    }
 }, _AssetsController_registerActionHandlers = function _AssetsController_registerActionHandlers() {
     this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
 }, _AssetsController_handleActiveChainsUpdate = function _AssetsController_handleActiveChainsUpdate(dataSourceId, activeChains, previousChains) {
@@ -1296,6 +1395,41 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         });
     }
     return { response: result.response, durationByDataSource };
+}, _AssetsController_fetchMissingPricesWithoutCache = function _AssetsController_fetchMissingPricesWithoutCache(accounts, chainIds) {
+    if (!__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this) || accounts.length === 0) {
+        return;
+    }
+    const accountIds = new Set(accounts.map((account) => account.id));
+    const chainFilter = new Set(chainIds);
+    const assetsForPriceUpdate = [];
+    const prices = this.state.assetsPrice;
+    for (const [accountId, accountBalances] of Object.entries(this.state.assetsBalance)) {
+        if (!accountIds.has(accountId)) {
+            continue;
+        }
+        for (const assetId of Object.keys(accountBalances)) {
+            if (!chainFilter.has(assetId.split('/')[0])) {
+                continue;
+            }
+            const normalizedAssetId = normalizeAssetId(assetId);
+            if (prices[normalizedAssetId] ?? prices[assetId]) {
+                continue;
+            }
+            assetsForPriceUpdate.push(normalizedAssetId);
+        }
+    }
+    if (assetsForPriceUpdate.length === 0) {
+        return;
+    }
+    __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f").invalidatePriceCache();
+    this.getAssets(accounts, {
+        forceUpdate: true,
+        dataTypes: ['price'],
+        chainIds,
+        assetsForPriceUpdate,
+    }).catch((error) => {
+        log('Failed to fetch missing prices', { error });
+    });
 }, _AssetsController_getNativeAssetMap = function _AssetsController_getNativeAssetMap() {
     return (__classPrivateFieldGet(this, _AssetsController_queryApiClient, "f").getCachedData(NATIVE_ASSETS_QUERY_KEY) ?? {});
 }, _AssetsController_isNativeAsset = function _AssetsController_isNativeAsset(assetId) {
@@ -1337,6 +1471,17 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
     return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_resolveNativeAssetIds).call(this, __classPrivateFieldGet(this, _AssetsController_enabledChains, "f"));
 }, _AssetsController_getNativeAssetIdsForAccount = function _AssetsController_getNativeAssetIdsForAccount(account) {
     return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_resolveNativeAssetIds).call(this, __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getEnabledChainsForAccount).call(this, account));
+}, _AssetsController_getSlowPipelineChainIds = function _AssetsController_getSlowPipelineChainIds(chainIds, fastResponse) {
+    const accountsApiChains = new Set(__classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f").getActiveChainsSync());
+    return chainIds.filter((chainId) => {
+        if (fastResponse.errors?.[chainId]) {
+            return true;
+        }
+        if (!accountsApiChains.has(chainId)) {
+            return true;
+        }
+        return false;
+    });
 }, _AssetsController_ensureNativeBalancesDefaultZero = function _AssetsController_ensureNativeBalancesDefaultZero() {
     const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
     if (accounts.length === 0) {
@@ -1354,7 +1499,7 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                 balances[accountId] = {};
             }
             for (const nativeAssetId of nativeAssetIds) {
-                if (!(nativeAssetId in balances[accountId])) {
+                if (!Object.prototype.hasOwnProperty.call(balances[accountId], nativeAssetId)) {
                     balances[accountId][nativeAssetId] = { amount: '0' };
                 }
             }
@@ -1404,37 +1549,9 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
             }
         }
     });
-}, _AssetsController_filterBalancesRespectingWsFreshness = function _AssetsController_filterBalancesRespectingWsFreshness(accountId, accountBalances, sourceId) {
-    if (!sourceId || !POLLING_BALANCE_SOURCES.has(sourceId)) {
-        return accountBalances;
-    }
-    const now = Date.now();
-    const filtered = {};
-    for (const [assetId, balance] of Object.entries(accountBalances)) {
-        const freshUntil = __classPrivateFieldGet(this, _AssetsController_wsBalanceFreshUntil, "f").get(`${accountId}:${assetId}`);
-        if (freshUntil !== undefined && now < freshUntil) {
-            continue;
-        }
-        filtered[assetId] = balance;
-    }
-    return filtered;
-}, _AssetsController_markWsBalancesFresh = function _AssetsController_markWsBalancesFresh(assetsBalance) {
-    const freshUntil = Date.now() + WS_BALANCE_FRESHNESS_MS;
-    for (const [accountId, balances] of Object.entries(assetsBalance)) {
-        for (const assetId of Object.keys(balances)) {
-            __classPrivateFieldGet(this, _AssetsController_wsBalanceFreshUntil, "f").set(`${accountId}:${assetId}`, freshUntil);
-        }
-    }
-}, _AssetsController_clearWsBalanceFreshness = function _AssetsController_clearWsBalanceFreshness(assetsBalance) {
-    for (const [accountId, balances] of Object.entries(assetsBalance)) {
-        for (const assetId of Object.keys(balances)) {
-            __classPrivateFieldGet(this, _AssetsController_wsBalanceFreshUntil, "f").delete(`${accountId}:${assetId}`);
-        }
-    }
 }, _AssetsController_updateState = async function _AssetsController_updateState(response) {
     const normalizedResponse = normalizeResponse(response);
     const mode = normalizedResponse.updateMode ?? 'merge';
-    const assetsBalanceToApply = normalizedResponse.assetsBalance;
     const releaseLock = await __classPrivateFieldGet(this, _AssetsController_controllerMutex, "f").acquire();
     try {
         const previousState = this.state;
@@ -1495,48 +1612,20 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                     }
                 }
             }
-            if (assetsBalanceToApply) {
-                for (const [accountId, accountBalances] of Object.entries(assetsBalanceToApply)) {
-                    const filteredAccountBalances = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_filterBalancesRespectingWsFreshness).call(this, accountId, accountBalances, normalizedResponse.sourceId);
+            if (normalizedResponse.assetsBalance) {
+                for (const [accountId, accountBalances] of Object.entries(normalizedResponse.assetsBalance)) {
                     const previousBalances = previousState.assetsBalance[accountId] ?? {};
                     const customAssetIds = state.customAssets[accountId] ?? [];
-                    // Full: response is authoritative for the chains it covered;
-                    //   balances for chains not in the response are preserved from
-                    //   previous state so unsupported chains (e.g. Ink on AccountsAPI)
-                    //   are never inadvertently reset to zero.
-                    // Merge: response overlays previous balances.
-                    const effective = mode === 'merge'
-                        ? { ...previousBalances, ...filteredAccountBalances }
-                        : (() => {
-                            // Determine which chain namespaces this response covers.
-                            const coveredChains = new Set(Object.keys(filteredAccountBalances).map((assetId) => assetId.split('/')[0]));
-                            // Start from previous balances, dropping only entries for
-                            // chains this response is authoritative over.
-                            const next = {};
-                            for (const [assetId, balance] of Object.entries(previousBalances)) {
-                                if (!coveredChains.has(assetId.split('/')[0])) {
-                                    next[assetId] = balance;
-                                }
-                            }
-                            // Apply the response (authoritative for covered chains).
-                            Object.assign(next, filteredAccountBalances);
-                            // Preserve custom assets that the response omitted.
-                            for (const customId of customAssetIds) {
-                                if (!(customId in next)) {
-                                    const prev = previousBalances[customId];
-                                    next[customId] =
-                                        prev ?? { amount: '0' };
-                                }
-                            }
-                            return next;
-                        })();
+                    const replaceCoveredChains = mode === 'full' ||
+                        normalizedResponse.replaceCoveredChainBalances === true;
+                    const effective = mergeAccountBalances(previousBalances, accountBalances, customAssetIds, replaceCoveredChains);
                     // Ensure native tokens have an entry (0 if missing) for chains this account supports
                     const account = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this).find((a) => a.id === accountId);
                     const nativeAssetIdsForAccount = account
                         ? __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetIdsForAccount).call(this, account)
                         : __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetIdsForEnabledChains).call(this);
                     for (const nativeAssetId of nativeAssetIdsForAccount) {
-                        if (!(nativeAssetId in effective)) {
+                        if (!Object.prototype.hasOwnProperty.call(effective, nativeAssetId)) {
                             effective[nativeAssetId] = { amount: '0' };
                         }
                     }
@@ -1568,7 +1657,6 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                     balances[accountId] = effective;
                 }
             }
-            // Update prices in state
             if (normalizedResponse.assetsPrice) {
                 for (const [key, value] of Object.entries(normalizedResponse.assetsPrice)) {
                     prices[key] = value;
@@ -1631,12 +1719,6 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
                 });
             }
         }
-        // Authoritative fetch on account switch — drop WS freshness locks so API
-        // balances (e.g. receiver +1 USDC) replace stale values from a prior send.
-        if (normalizedResponse.sourceId === 'getAssets:forceUpdate' &&
-            assetsBalanceToApply) {
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_clearWsBalanceFreshness).call(this, assetsBalanceToApply);
-        }
     }
     finally {
         releaseLock();
@@ -1735,14 +1817,8 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         enabledChainCount: chainIds.length,
     });
     __classPrivateFieldSet(this, _AssetsController_lastKnownAccountIds, new Set(accounts.map((a) => a.id)), "f");
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
-    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this);
-    this.getAssets(accounts, {
-        chainIds,
-        forceUpdate: true,
-    }).catch((error) => {
-        log('Failed to fetch assets', error);
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runStartupRefresh).call(this, accounts).catch((error) => {
+        log('Failed to start asset tracking', error);
     });
 }, _AssetsController_stop = function _AssetsController_stop() {
     log('Stopping asset tracking', {
@@ -1820,7 +1896,13 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         const seenIds = new Set();
         const accountsForSource = assignedChains
             .flatMap((chainId) => chainToAccounts.get(chainId) ?? [])
-            .filter((account) => !seenIds.has(account.id) && (seenIds.add(account.id), true));
+            .filter((account) => {
+            if (seenIds.has(account.id)) {
+                return false;
+            }
+            seenIds.add(account.id);
+            return true;
+        });
         if (accountsForSource.length > 0) {
             __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeDataSource).call(this, source, accountsForSource, assignedChains);
         }
@@ -2082,11 +2164,102 @@ async function _AssetsController_handleAccountGroupChanged() {
         caipChainId,
     });
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureDefaultTrackedAssetsSeeded).call(this, [caipChainId]);
+}, _AssetsController_refreshActiveChainsOnNetworkSwitch = 
+/**
+ * Refresh data-source `activeChains` after an EVM network switch so API/WS/Rpc
+ * chain claiming is not stuck on an empty or stale init-time list.
+ */
+async function _AssetsController_refreshActiveChainsOnNetworkSwitch() {
+    await Promise.all([
+        __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f").refreshActiveChains(),
+        __classPrivateFieldGet(this, _AssetsController_backendWebsocketDataSource, "f").refreshActiveChains(),
+    ]);
+    __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f").refreshActiveChainsFromNetworkState();
+}, _AssetsController_getSelectedEvmChainIdFromNetworkState = function _AssetsController_getSelectedEvmChainIdFromNetworkState(networkState) {
+    try {
+        const networkClient = this.messenger.call('NetworkController:getNetworkClientById', networkState.selectedNetworkClientId);
+        const hexChainId = networkClient.configuration?.chainId;
+        if (!hexChainId) {
+            return undefined;
+        }
+        return `eip155:${parseInt(hexChainId, 16)}`;
+    }
+    catch {
+        return undefined;
+    }
+}, _AssetsController_handleNetworkDidChange = 
+/**
+ * Refresh subscriptions and fetch balances when the user switches the
+ * selected EVM network in the UI (`NetworkController:networkDidChange`).
+ *
+ * @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)) {
+        return;
+    }
+    const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
+    if (accounts.length === 0) {
+        return;
+    }
+    const selectedChainId = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedEvmChainIdFromNetworkState).call(this, networkState);
+    if (!selectedChainId) {
+        return;
+    }
+    log('Selected EVM network switched', {
+        selectedNetworkClientId: networkState.selectedNetworkClientId,
+        selectedChainId,
+    });
+    const releaseLock = await __classPrivateFieldGet(this, _AssetsController_accountRefreshMutex, "f").acquire();
+    try {
+        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_refreshActiveChainsOnNetworkSwitch).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+        await this.getAssets(accounts, {
+            chainIds: [selectedChainId],
+            forceUpdate: true,
+            dataTypes: ['balance', 'metadata', 'price'],
+        });
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_fetchMissingPricesWithoutCache).call(this, accounts, [selectedChainId]);
+    }
+    finally {
+        releaseLock();
+    }
 }, _AssetsController_refreshAssetsAfterNetworkChange = function _AssetsController_refreshAssetsAfterNetworkChange() {
-    this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this), {
+    const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
+    if (accounts.length === 0) {
+        return;
+    }
+    this.getAssets(accounts, {
         forceUpdate: true,
+        dataTypes: ['balance', 'metadata'],
     }).catch((error) => {
         log('Failed to refresh assets after network change', { error });
     });
+}, _AssetsController_refreshAssetsAfterNetworkAdded = 
+/**
+ * Refresh balances and fetch missing prices after a network is added.
+ *
+ * @param hexChainId - Hex chain id of the newly-added network.
+ */
+async function _AssetsController_refreshAssetsAfterNetworkAdded(hexChainId) {
+    const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
+    if (accounts.length === 0) {
+        return;
+    }
+    let caipChainId;
+    try {
+        caipChainId = `eip155:${parseInt(hexChainId, 16)}`;
+    }
+    catch {
+        return;
+    }
+    await this.getAssets(accounts, {
+        chainIds: [caipChainId],
+        forceUpdate: true,
+        dataTypes: ['balance', 'metadata', 'price'],
+    });
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_fetchMissingPricesWithoutCache).call(this, accounts, [caipChainId]);
 };
 //# sourceMappingURL=AssetsController.mjs.map