@metamask/assets-controller 2.0.1 → 2.1.0

package/dist/AssetsController.cjs

@@ -13,10 +13,11 @@ 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_trackMetaMetricsEvent, _AssetsController_firstInitFetchReported, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_selectedAccounts_get, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_registerActionHandlers, _AssetsController_executeMiddlewares, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
+var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_trackMetaMetricsEvent, _AssetsController_firstInitFetchReported, _AssetsController_uiOpen, _AssetsController_keyringUnlocked, _AssetsController_controllerMutex, _AssetsController_activeSubscriptions, _AssetsController_enabledChains, _AssetsController_selectedAccounts_get, _AssetsController_backendWebsocketDataSource, _AssetsController_accountsApiDataSource, _AssetsController_snapDataSource, _AssetsController_rpcDataSource, _AssetsController_stakedBalanceDataSource, _AssetsController_allBalanceDataSources_get, _AssetsController_priceDataSource, _AssetsController_detectionMiddleware, _AssetsController_tokenDataSource, _AssetsController_unsubscribeBasicFunctionality, _AssetsController_onActiveChainsUpdated, _AssetsController_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_updateActive, _AssetsController_registerActionHandlers, _AssetsController_handleActiveChainsUpdate, _AssetsController_executeMiddlewares, _AssetsController_resolveNativeAssetIds, _AssetsController_getNativeAssetIdsForEnabledChains, _AssetsController_getNativeAssetIdsForAccount, _AssetsController_ensureNativeBalancesDefaultZero, _AssetsController_updateState, _AssetsController_getAssetsFromState, _AssetsController_tokenStandardToAssetType, _AssetsController_start, _AssetsController_stop, _AssetsController_subscribeAssets, _AssetsController_subscribeAssetsBalance, _AssetsController_subscribeStakedBalance, _AssetsController_buildChainToAccountsMap, _AssetsController_subscribeDataSource, _AssetsController_unsubscribeDataSource, _AssetsController_buildDataRequest, _AssetsController_getEnabledChainsForAccount, _AssetsController_handleAccountGroupChanged, _AssetsController_handleEnabledNetworksChanged;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsController = exports.getDefaultAssetsControllerState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
+const client_controller_1 = require("@metamask/client-controller");
 const utils_1 = require("@metamask/utils");
 const async_mutex_1 = require("async-mutex");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
@@ -30,6 +31,7 @@ const StakedBalanceDataSource_1 = require("./data-sources/StakedBalanceDataSourc
 const TokenDataSource_1 = require("./data-sources/TokenDataSource.cjs");
 const logger_1 = require("./logger.cjs");
 const DetectionMiddleware_1 = require("./middlewares/DetectionMiddleware.cjs");
+const ParallelMiddleware_1 = require("./middlewares/ParallelMiddleware.cjs");
 const utils_2 = require("./utils.cjs");
 // ============================================================================
 // CONTROLLER CONSTANTS
@@ -62,6 +64,7 @@ function getDefaultAssetsControllerState() {
         assetsPrice: {},
         customAssets: {},
         assetPreferences: {},
+        selectedCurrency: 'usd',
     };
 }
 exports.getDefaultAssetsControllerState = getDefaultAssetsControllerState;
@@ -99,6 +102,12 @@ const stateMetadata = {
         includeInDebugSnapshot: false,
         usedInUi: true,
     },
+    selectedCurrency: {
+        persist: true,
+        includeInStateLogs: false,
+        includeInDebugSnapshot: false,
+        usedInUi: true,
+    },
 };
 // ============================================================================
 // HELPER FUNCTIONS
@@ -152,6 +161,9 @@ function normalizeResponse(response) {
     if (response.errors) {
         normalized.errors = { ...response.errors };
     }
+    if (response.updateMode) {
+        normalized.updateMode = response.updateMode;
+    }
     return normalized;
 }
 // ============================================================================
@@ -173,8 +185,10 @@ function normalizeResponse(response) {
  *    based on which chains they support. When active chains change, the controller
  *    dynamically adjusts subscriptions.
  *
- * 4. **Keyring Lifecycle**: Listens to KeyringController unlock/lock events to
- *    start/stop subscriptions when the wallet is unlocked or locked.
+ * 4. **Client + Keyring Lifecycle**: Starts subscriptions only when both the UI is
+ *    open (ClientController) and the wallet is unlocked (KeyringController).
+ *    Stops when either the UI closes or the keyring locks. See client-controller
+ *    README for the combined pattern.
  *
  * ## Architecture
  *
@@ -204,6 +218,10 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_trackMetaMetricsEvent.set(this, void 0);
         /** Whether we have already reported first init fetch for this session (reset on #stop). */
         _AssetsController_firstInitFetchReported.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);
         _AssetsController_controllerMutex.set(this, new async_mutex_1.Mutex());
         /**
          * Active balance subscriptions keyed by account ID.
@@ -223,36 +241,37 @@ class AssetsController extends base_controller_1.BaseController {
         _AssetsController_detectionMiddleware.set(this, void 0);
         _AssetsController_tokenDataSource.set(this, void 0);
         _AssetsController_unsubscribeBasicFunctionality.set(this, null);
+        _AssetsController_onActiveChainsUpdated.set(this, void 0);
         __classPrivateFieldSet(this, _AssetsController_isEnabled, isEnabled(), "f");
         __classPrivateFieldSet(this, _AssetsController_isBasicFunctionality, isBasicFunctionality ?? (() => true), "f");
         __classPrivateFieldSet(this, _AssetsController_defaultUpdateInterval, defaultUpdateInterval, "f");
         __classPrivateFieldSet(this, _AssetsController_trackMetaMetricsEvent, trackMetaMetricsEvent, "f");
         const rpcConfig = rpcDataSourceConfig ?? {};
-        const onActiveChainsUpdated = (dataSourceName, chains, previousChains) => {
-            this.handleActiveChainsUpdate(dataSourceName, chains, previousChains);
-        };
+        __classPrivateFieldSet(this, _AssetsController_onActiveChainsUpdated, (dataSourceName, chains, previousChains) => {
+            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleActiveChainsUpdate).call(this, dataSourceName, chains, previousChains);
+        }, "f");
         __classPrivateFieldSet(this, _AssetsController_backendWebsocketDataSource, new BackendWebsocketDataSource_1.BackendWebsocketDataSource({
             messenger: this.messenger,
             queryApiClient,
-            onActiveChainsUpdated,
+            onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_accountsApiDataSource, new AccountsApiDataSource_1.AccountsApiDataSource({
             queryApiClient,
-            onActiveChainsUpdated,
+            onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
             ...accountsApiDataSourceConfig,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_snapDataSource, new SnapDataSource_1.SnapDataSource({
             messenger: this.messenger,
-            onActiveChainsUpdated,
+            onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_rpcDataSource, new RpcDataSource_1.RpcDataSource({
             messenger: this.messenger,
-            onActiveChainsUpdated,
+            onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
             ...rpcConfig,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_stakedBalanceDataSource, new StakedBalanceDataSource_1.StakedBalanceDataSource({
             messenger: this.messenger,
-            onActiveChainsUpdated,
+            onActiveChainsUpdated: __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f"),
             ...stakedBalanceDataSourceConfig,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_tokenDataSource, new TokenDataSource_1.TokenDataSource({
@@ -260,6 +279,7 @@ class AssetsController extends base_controller_1.BaseController {
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_priceDataSource, new PriceDataSource_1.PriceDataSource({
             queryApiClient,
+            getSelectedCurrency: () => this.state.selectedCurrency,
             ...priceDataSourceConfig,
         }), "f");
         __classPrivateFieldSet(this, _AssetsController_detectionMiddleware, new DetectionMiddleware_1.DetectionMiddleware(), "f");
@@ -273,7 +293,7 @@ class AssetsController extends base_controller_1.BaseController {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_initializeState).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeToEvents).call(this);
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_registerActionHandlers).call(this);
-        // Subscriptions start only on KeyringController:unlock -> #start(), not here.
+        // Subscriptions start only when both UI is open and keyring unlocked -> #updateActive().
         // Subscribe to basic-functionality changes after construction so a synchronous
         // onChange during subscribe cannot run before data sources are initialized.
         if (subscribeToBasicFunctionalityChange) {
@@ -283,52 +303,14 @@ class AssetsController extends base_controller_1.BaseController {
             }
         }
     }
-    // ============================================================================
-    // DATA SOURCE CHAIN MANAGEMENT
-    // ============================================================================
     /**
-     * Handle when a data source's supported chains change.
-     * Used to refresh balance subscriptions and run a one-time fetch when a new chain is supported.
+     * Returns the callback passed to data sources for reporting active chain updates.
+     * Used by tests to simulate a data source reporting chain changes.
      *
-     * - On any add/remove: re-subscribes to data sources so chain assignment stays correct.
-     * - When chains are added: fetches balances for the new chains (for selected accounts on enabled networks).
-     *
-     * Controller does not store chains; sources report via this callback. previousChains is required for diff.
-     *
-     * @param dataSourceId - The identifier of the data source reporting the change.
-     * @param activeChains - Currently active (supported and available) chain IDs for this source.
-     * @param previousChains - Previous chains; used to compute added/removed.
+     * @returns The onActiveChainsUpdated callback.
      */
-    handleActiveChainsUpdate(dataSourceId, activeChains, previousChains) {
-        if (!__classPrivateFieldGet(this, _AssetsController_isEnabled, "f")) {
-            return;
-        }
-        log('Data source active chains changed', {
-            dataSourceId,
-            chainCount: activeChains.length,
-            chains: activeChains,
-        });
-        const previous = previousChains;
-        const previousSet = new Set(previous);
-        const addedChains = activeChains.filter((ch) => !previousSet.has(ch));
-        const removedChains = previous.filter((ch) => !activeChains.includes(ch));
-        if (addedChains.length > 0 || removedChains.length > 0) {
-            // Refresh subscriptions to use updated data source availability
-            __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
-        }
-        // If chains were added and we have selected accounts, do one-time fetch
-        if (addedChains.length > 0 && __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length > 0) {
-            const addedEnabledChains = addedChains.filter((chain) => __classPrivateFieldGet(this, _AssetsController_enabledChains, "f").has(chain));
-            if (addedEnabledChains.length > 0) {
-                log('Fetching balances for newly added chains', { addedEnabledChains });
-                this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
-                    chainIds: addedEnabledChains,
-                    forceUpdate: true,
-                }).catch((error) => {
-                    log('Failed to fetch balance for added chains', { error });
-                });
-            }
-        }
+    getOnActiveChainsUpdated() {
+        return __classPrivateFieldGet(this, _AssetsController_onActiveChainsUpdated, "f");
     }
     // ============================================================================
     // PUBLIC API: QUERY METHODS
@@ -337,6 +319,9 @@ class AssetsController extends base_controller_1.BaseController {
         const chainIds = options?.chainIds ?? [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")];
         const assetTypes = options?.assetTypes ?? ['fungible'];
         const dataTypes = options?.dataTypes ?? ['balance', 'metadata', 'price'];
+        if (accounts.length === 0 || chainIds.length === 0) {
+            return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
+        }
         // Collect custom assets for all requested accounts
         const customAssets = [];
         for (const account of accounts) {
@@ -350,16 +335,21 @@ class AssetsController extends base_controller_1.BaseController {
                 dataTypes,
                 customAssets: customAssets.length > 0 ? customAssets : undefined,
                 forceUpdate: true,
+                assetsForPriceUpdate: options?.assetsForPriceUpdate,
             });
             const sources = __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)
                 ? [
-                    __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+                    (0, ParallelMiddleware_1.createParallelBalanceMiddleware)([
+                        __classPrivateFieldGet(this, _AssetsController_accountsApiDataSource, "f"),
+                        __classPrivateFieldGet(this, _AssetsController_snapDataSource, "f"),
+                        __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
+                        __classPrivateFieldGet(this, _AssetsController_stakedBalanceDataSource, "f"),
+                    ]),
                     __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
-                    __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                    (0, ParallelMiddleware_1.createParallelMiddleware)([
+                        __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                        __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+                    ]),
                 ]
                 : [
                     __classPrivateFieldGet(this, _AssetsController_rpcDataSource, "f"),
@@ -367,7 +357,12 @@ class AssetsController extends base_controller_1.BaseController {
                     __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
                 ];
             const { response, durationByDataSource } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, sources, request);
-            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, response);
+            // Default to 'merge' when fetching a subset of chains so we don't wipe
+            // balances from chains that weren't included in this fetch.
+            const isPartialChainFetch = options?.chainIds !== undefined &&
+                options.chainIds.length < __classPrivateFieldGet(this, _AssetsController_enabledChains, "f").size;
+            const updateMode = options?.updateMode ?? (isPartialChainFetch ? 'merge' : 'full');
+            await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateState).call(this, { ...response, updateMode });
             if (__classPrivateFieldGet(this, _AssetsController_trackMetaMetricsEvent, "f") && !__classPrivateFieldGet(this, _AssetsController_firstInitFetchReported, "f")) {
                 __classPrivateFieldSet(this, _AssetsController_firstInitFetchReported, true, "f");
                 const durationMs = Date.now() - startTime;
@@ -378,7 +373,8 @@ class AssetsController extends base_controller_1.BaseController {
                 });
             }
         }
-        return __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
+        const result = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getAssetsFromState).call(this, accounts, chainIds, assetTypes);
+        return result;
     }
     async getAssetsBalance(accounts, options) {
         // Reuse getAssets with dataTypes: ['balance'] only
@@ -429,10 +425,15 @@ class AssetsController extends base_controller_1.BaseController {
      * Custom assets are included in subscription and fetch operations.
      * Adding a custom asset also unhides it if it was previously hidden.
      *
+     * When `pendingMetadata` is provided (e.g. from the extension's pending-tokens
+     * flow), the token metadata is persisted immediately into `assetsInfo` so the
+     * UI can render it without waiting for the next pipeline fetch.
+     *
      * @param accountId - The account ID to add the custom asset for.
      * @param assetId - The CAIP-19 asset ID to add.
+     * @param pendingMetadata - Optional token metadata from the UI (pendingTokens format).
      */
-    async addCustomAsset(accountId, assetId) {
+    async addCustomAsset(accountId, assetId, pendingMetadata) {
         const normalizedAssetId = (0, utils_2.normalizeAssetId)(assetId);
         log('Adding custom asset', { accountId, assetId: normalizedAssetId });
         this.update((state) => {
@@ -452,14 +453,37 @@ class AssetsController extends base_controller_1.BaseController {
                     delete state.assetPreferences[normalizedAssetId];
                 }
             }
+            // Persist metadata from the UI so the token is immediately renderable
+            if (pendingMetadata) {
+                const parsed = (0, utils_1.parseCaipAssetType)(normalizedAssetId);
+                let tokenType = 'erc20';
+                if (parsed.assetNamespace === 'slip44') {
+                    tokenType = 'native';
+                }
+                else if (parsed.assetNamespace === 'spl') {
+                    tokenType = 'spl';
+                }
+                const assetMetadata = {
+                    type: tokenType,
+                    symbol: pendingMetadata.symbol,
+                    name: pendingMetadata.name,
+                    decimals: pendingMetadata.decimals,
+                    image: pendingMetadata.iconUrl,
+                    aggregators: pendingMetadata.aggregators,
+                    occurrences: pendingMetadata.occurrences,
+                };
+                state.assetsInfo[normalizedAssetId] =
+                    assetMetadata;
+            }
         });
-        // Fetch data for the newly added custom asset
+        // Fetch data for the newly added custom asset (merge to preserve other chains)
         const account = __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).find((a) => a.id === accountId);
         if (account) {
             const chainId = extractChainId(normalizedAssetId);
             await this.getAssets([account], {
                 chainIds: [chainId],
                 forceUpdate: true,
+                updateMode: 'merge',
             });
         }
     }
@@ -530,6 +554,34 @@ class AssetsController extends base_controller_1.BaseController {
         });
     }
     // ============================================================================
+    // CURRENT CURRENCY MANAGEMENT
+    // ============================================================================
+    /**
+     * Set the current currency.
+     *
+     * @param selectedCurrency - The ISO 4217 currency code to set.
+     */
+    setSelectedCurrency(selectedCurrency) {
+        const previousCurrency = this.state.selectedCurrency;
+        if (previousCurrency === selectedCurrency) {
+            return;
+        }
+        this.update((state) => {
+            state.selectedCurrency = selectedCurrency;
+        });
+        log('Current currency changed', {
+            previousCurrency,
+            selectedCurrency,
+        });
+        this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
+            forceUpdate: true,
+            dataTypes: ['price'],
+            assetsForPriceUpdate: Object.values(this.state.assetsBalance).flatMap((balances) => Object.keys(balances)),
+        }).catch((error) => {
+            log('Failed to fetch asset prices after current currency change', error);
+        });
+    }
+    // ============================================================================
     // SUBSCRIPTIONS
     // ============================================================================
     /**
@@ -607,9 +659,15 @@ class AssetsController extends base_controller_1.BaseController {
             hasBalance: Boolean(response.assetsBalance),
             hasPrice: Boolean(response.assetsPrice),
         });
-        // Run through enrichment middlewares (Event Stack: Detection → Token → Price)
+        // Run through enrichment middlewares (Detection, then Token + Price in parallel)
         // Include 'metadata' in dataTypes so TokenDataSource runs to enrich detected assets
-        const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [__classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"), __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"), __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f")], request ?? {
+        const { response: enrichedResponse } = await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_executeMiddlewares).call(this, [
+            __classPrivateFieldGet(this, _AssetsController_detectionMiddleware, "f"),
+            (0, ParallelMiddleware_1.createParallelMiddleware)([
+                __classPrivateFieldGet(this, _AssetsController_tokenDataSource, "f"),
+                __classPrivateFieldGet(this, _AssetsController_priceDataSource, "f"),
+            ]),
+        ], request ?? {
             accountsWithSupportedChains: [],
             chainIds: [],
             dataTypes: ['balance', 'metadata', 'price'],
@@ -649,7 +707,7 @@ class AssetsController extends base_controller_1.BaseController {
     }
 }
 exports.AssetsController = AssetsController;
-_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trackMetaMetricsEvent = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = 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_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_selectedAccounts_get = function _AssetsController_selectedAccounts_get() {
+_AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctionality = new WeakMap(), _AssetsController_defaultUpdateInterval = new WeakMap(), _AssetsController_trackMetaMetricsEvent = new WeakMap(), _AssetsController_firstInitFetchReported = new WeakMap(), _AssetsController_uiOpen = new WeakMap(), _AssetsController_keyringUnlocked = new WeakMap(), _AssetsController_controllerMutex = new WeakMap(), _AssetsController_activeSubscriptions = new WeakMap(), _AssetsController_enabledChains = 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_tokenDataSource = new WeakMap(), _AssetsController_unsubscribeBasicFunctionality = new WeakMap(), _AssetsController_onActiveChainsUpdated = new WeakMap(), _AssetsController_instances = new WeakSet(), _AssetsController_selectedAccounts_get = function _AssetsController_selectedAccounts_get() {
     return this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup');
 }, _AssetsController_allBalanceDataSources_get = function _AssetsController_allBalanceDataSources_get() {
     return [
@@ -699,11 +757,60 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     this.messenger.subscribe('NetworkEnablementController:stateChange', ({ enabledNetworkMap }) => {
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_handleEnabledNetworksChanged).call(this, enabledNetworkMap).catch(console.error);
     });
-    // Keyring lifecycle: start when unlocked, stop when locked
-    this.messenger.subscribe('KeyringController:unlock', () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_start).call(this));
-    this.messenger.subscribe('KeyringController:lock', () => __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this));
+    // 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");
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
+    }, client_controller_1.clientControllerSelectors.selectIsUiOpen);
+    this.messenger.subscribe('KeyringController:unlock', () => {
+        __classPrivateFieldSet(this, _AssetsController_keyringUnlocked, true, "f");
+        __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);
+    });
+}, _AssetsController_updateActive = function _AssetsController_updateActive() {
+    const shouldRun = __classPrivateFieldGet(this, _AssetsController_uiOpen, "f") && __classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f");
+    if (shouldRun) {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_start).call(this);
+    }
+    else {
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_stop).call(this);
+    }
 }, _AssetsController_registerActionHandlers = function _AssetsController_registerActionHandlers() {
     this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
+}, _AssetsController_handleActiveChainsUpdate = function _AssetsController_handleActiveChainsUpdate(dataSourceId, activeChains, previousChains) {
+    if (!__classPrivateFieldGet(this, _AssetsController_isEnabled, "f")) {
+        return;
+    }
+    log('Data source active chains changed', {
+        dataSourceId,
+        chainCount: activeChains.length,
+        chains: activeChains,
+    });
+    const previous = previousChains;
+    const previousSet = new Set(previous);
+    const addedChains = activeChains.filter((ch) => !previousSet.has(ch));
+    const removedChains = previous.filter((ch) => !activeChains.includes(ch));
+    if (addedChains.length > 0 || removedChains.length > 0) {
+        // Refresh subscriptions to use updated data source availability
+        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+    }
+    // If chains were added and we have selected accounts, do one-time fetch
+    if (addedChains.length > 0 && __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length > 0) {
+        const addedEnabledChains = addedChains.filter((chain) => __classPrivateFieldGet(this, _AssetsController_enabledChains, "f").has(chain));
+        if (addedEnabledChains.length > 0) {
+            log('Fetching balances for newly added chains', { addedEnabledChains });
+            this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
+                chainIds: addedEnabledChains,
+                forceUpdate: true,
+                updateMode: 'merge',
+            }).catch((error) => {
+                log('Failed to fetch balance for added chains', { error });
+            });
+        }
+    }
 }, _AssetsController_executeMiddlewares = 
 // ============================================================================
 // MIDDLEWARE EXECUTION
@@ -754,13 +861,46 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         }
     }
     return { response: result.response, durationByDataSource };
-}, _AssetsController_updateState = 
-// ============================================================================
-// STATE MANAGEMENT
-// ============================================================================
-async function _AssetsController_updateState(response) {
-    // Normalize asset IDs (checksum EVM addresses) before storing in state
+}, _AssetsController_resolveNativeAssetIds = function _AssetsController_resolveNativeAssetIds(chains) {
+    const { nativeAssetIdentifiers } = this.messenger.call('NetworkEnablementController:getState');
+    const ids = [];
+    for (const chainId of chains) {
+        const nativeId = nativeAssetIdentifiers?.[chainId];
+        if (nativeId) {
+            ids.push(nativeId);
+        }
+    }
+    return ids;
+}, _AssetsController_getNativeAssetIdsForEnabledChains = function _AssetsController_getNativeAssetIdsForEnabledChains() {
+    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_ensureNativeBalancesDefaultZero = function _AssetsController_ensureNativeBalancesDefaultZero() {
+    const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get);
+    if (accounts.length === 0) {
+        return;
+    }
+    this.update((state) => {
+        const balances = state.assetsBalance;
+        for (const account of accounts) {
+            const accountId = account.id;
+            const nativeAssetIds = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getNativeAssetIdsForAccount).call(this, account);
+            if (nativeAssetIds.length === 0) {
+                continue;
+            }
+            if (!balances[accountId]) {
+                balances[accountId] = {};
+            }
+            for (const nativeAssetId of nativeAssetIds) {
+                if (!(nativeAssetId in balances[accountId])) {
+                    balances[accountId][nativeAssetId] = { amount: '0' };
+                }
+            }
+        }
+    });
+}, _AssetsController_updateState = async function _AssetsController_updateState(response) {
     const normalizedResponse = normalizeResponse(response);
+    const mode = normalizedResponse.updateMode ?? 'merge';
     const releaseLock = await __classPrivateFieldGet(this, _AssetsController_controllerMutex, "f").acquire();
     try {
         const previousState = this.state;
@@ -786,16 +926,43 @@ async function _AssetsController_updateState(response) {
             if (normalizedResponse.assetsBalance) {
                 for (const [accountId, accountBalances] of Object.entries(normalizedResponse.assetsBalance)) {
                     const previousBalances = previousState.assetsBalance[accountId] ?? {};
-                    if (!balances[accountId]) {
-                        balances[accountId] = {};
+                    const customAssetIds = state.customAssets[accountId] ?? [];
+                    // Full: response is authoritative; preserve custom assets not in response.
+                    // Merge: response overlays previous balances.
+                    // Callers that fetch partial data (e.g. newly added chains) must set updateMode: 'merge'.
+                    const effective = mode === 'merge'
+                        ? { ...previousBalances, ...accountBalances }
+                        : (() => {
+                            const next = {
+                                ...accountBalances,
+                            };
+                            for (const customId of customAssetIds) {
+                                if (!(customId in next)) {
+                                    const prev = previousBalances[customId];
+                                    next[customId] =
+                                        prev ?? { amount: '0' };
+                                }
+                            }
+                            return next;
+                        })();
+                    // Ensure native tokens have an entry (0 if missing) for chains this account supports
+                    const account = __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).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)) {
+                            effective[nativeAssetId] = { amount: '0' };
+                        }
                     }
-                    for (const [assetId, balance] of Object.entries(accountBalances)) {
+                    for (const [assetId, balance] of Object.entries(effective)) {
                         const previousBalance = previousBalances[assetId];
-                        const balanceData = balance;
-                        const newAmount = balanceData.amount;
+                        const newAmount = balance.amount;
                         const oldAmount = previousBalance?.amount;
-                        // Track if balance actually changed
-                        if (oldAmount !== newAmount) {
+                        const isNewDefaultNativeZero = oldAmount === undefined &&
+                            newAmount === '0' &&
+                            nativeAssetIdsForAccount.includes(assetId);
+                        if (oldAmount !== newAmount && !isNewDefaultNativeZero) {
                             changedBalances.push({
                                 accountId,
                                 assetId,
@@ -804,7 +971,7 @@ async function _AssetsController_updateState(response) {
                             });
                         }
                     }
-                    Object.assign(balances[accountId], accountBalances);
+                    balances[accountId] = effective;
                 }
             }
             // Update prices in state
@@ -948,6 +1115,7 @@ async function _AssetsController_updateState(response) {
         enabledChainCount: __classPrivateFieldGet(this, _AssetsController_enabledChains, "f").size,
     });
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
     this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
         chainIds: [...__classPrivateFieldGet(this, _AssetsController_enabledChains, "f")],
         forceUpdate: true,
@@ -982,7 +1150,7 @@ async function _AssetsController_updateState(response) {
     }
     __classPrivateFieldGet(this, _AssetsController_activeSubscriptions, "f").clear();
 }, _AssetsController_subscribeAssets = function _AssetsController_subscribeAssets() {
-    if (__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length === 0) {
+    if (__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length === 0 || __classPrivateFieldGet(this, _AssetsController_enabledChains, "f").size === 0) {
         return;
     }
     // Subscribe to balance updates (batched by data source)
@@ -1071,7 +1239,7 @@ async function _AssetsController_updateState(response) {
         }),
         subscriptionId: subscriptionKey,
         isUpdate,
-        onAssetsUpdate: (response) => this.handleAssetsUpdate(response, sourceId),
+        onAssetsUpdate: (response, request) => this.handleAssetsUpdate(response, sourceId, request),
         getAssetsState: () => this.state,
     };
     source.subscribe(subscribeReq).catch((error) => {
@@ -1155,6 +1323,7 @@ async function _AssetsController_handleAccountGroupChanged() {
             forceUpdate: true,
         });
     }
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
 }, _AssetsController_handleEnabledNetworksChanged = async function _AssetsController_handleEnabledNetworksChanged(enabledNetworkMap) {
     const previousChains = __classPrivateFieldGet(this, _AssetsController_enabledChains, "f");
     __classPrivateFieldSet(this, _AssetsController_enabledChains, __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_extractEnabledChains).call(this, enabledNetworkMap), "f");
@@ -1183,12 +1352,14 @@ async function _AssetsController_handleAccountGroupChanged() {
     // The data will simply not be updated until the network is re-enabled.
     // Refresh subscriptions for new chain set
     __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_subscribeAssets).call(this);
-    // Do one-time fetch for newly enabled chains
+    // Do one-time fetch for newly enabled chains; merge so we keep existing chain balances
     if (addedChains.length > 0 && __classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get).length > 0) {
         await this.getAssets(__classPrivateFieldGet(this, _AssetsController_instances, "a", _AssetsController_selectedAccounts_get), {
             chainIds: addedChains,
             forceUpdate: true,
+            updateMode: 'merge',
         });
     }
+    __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_ensureNativeBalancesDefaultZero).call(this);
 };
 //# sourceMappingURL=AssetsController.cjs.map