@metamask-previews/assets-controller 2.0.2-preview-09603a559 → 2.1.0-preview-b0148922a

package/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.0]
+
 ### Added
 
 - Add `PendingTokenMetadata` type and optional `pendingMetadata` parameter to `addCustomAsset(accountId, assetId, pendingMetadata?)`. When provided (e.g. from the extension's pending-tokens flow), token metadata is written to `assetsInfo` immediately so the UI can render the token without waiting for the pipeline ([#8021](https://github.com/MetaMask/core/pull/8021))
@@ -24,6 +26,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Avoid unnecessary price and token API requests when data sources report balance-only updates. The controller now forwards the optional `request` from the subscribe callback into `handleAssetsUpdate`; when a data source calls `onAssetsUpdate(response, request)` with `request.dataTypes: ['balance']` (e.g. RpcDataSource balance polling, StakedBalanceDataSource), the controller skips Token and Price enrichment so the price API is not called. Previously every update triggered enrichment and could reset or overwrite existing state ([#8043](https://github.com/MetaMask/core/pull/8043))
+- Default `assetsBalance` to `0` for native tokens of each account's supported chains using `NetworkEnablementController.nativeAssetIdentifiers`, so native entries are always present in state even before data sources respond ([#8036](https://github.com/MetaMask/core/pull/8036))
+- Auto-select `'merge'` update mode in `getAssets` when `chainIds` is a subset of enabled chains, preventing partial-chain fetches (e.g. after a swap, adding a custom asset, or data-source chain changes) from wiping balances of other chains ([#8036](https://github.com/MetaMask/core/pull/8036))
+- Convert WebSocket balance updates in `BackendWebsocketDataSource` from raw smallest-units to human-readable amounts using asset decimals (same behavior as RPC/Accounts API), so `assetsBalance` remains consistent across data sources ([#8032](https://github.com/MetaMask/core/pull/8032))
 - Include all assets from balance and each account's custom assets from state in `detectedAssets`, so prices and metadata are fetched for existing assets and custom tokens (previously only assets without metadata were included, so existing assets did not get prices) ([#8021](https://github.com/MetaMask/core/pull/8021))
 - Request `includeAggregators: true` when fetching token metadata from the v3 assets API so aggregator data is returned and stored in `assetsInfo` ([#8021](https://github.com/MetaMask/core/pull/8021))
 
@@ -122,7 +128,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactor `RpcDataSource` to delegate polling to `BalanceFetcher` and `TokenDetector` services ([#7709](https://github.com/MetaMask/core/pull/7709))
 - Refactor `BalanceFetcher` and `TokenDetector` to extend `StaticIntervalPollingControllerOnly` for independent polling management ([#7709](https://github.com/MetaMask/core/pull/7709))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.0.2...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.1.0...HEAD
+[2.1.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.0.2...@metamask/assets-controller@2.1.0
 [2.0.2]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.0.1...@metamask/assets-controller@2.0.2
 [2.0.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@2.0.0...@metamask/assets-controller@2.0.1
 [2.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controller@1.0.0...@metamask/assets-controller@2.0.0

package/dist/AssetsController.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _AssetsController_instances, _AssetsController_isEnabled, _AssetsController_isBasicFunctionality, _AssetsController_defaultUpdateInterval, _AssetsController_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_initializeState, _AssetsController_extractEnabledChains, _AssetsController_normalizeChainReference, _AssetsController_subscribeToEvents, _AssetsController_updateActive, _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");
@@ -241,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({
@@ -302,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.
-     *
-     * - 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.
+     * Returns the callback passed to data sources for reporting active chain updates.
+     * Used by tests to simulate a data source reporting chain changes.
      *
-     * @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
@@ -394,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, updateMode: 'full' });
+            // 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;
@@ -508,13 +476,14 @@ class AssetsController extends base_controller_1.BaseController {
                     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',
             });
         }
     }
@@ -738,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_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_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 [
@@ -811,6 +780,37 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     }
 }, _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
@@ -861,11 +861,44 @@ async function _AssetsController_executeMiddlewares(sources, request, initialRes
         }
     }
     return { response: result.response, durationByDataSource };
-}, _AssetsController_updateState = 
-// ============================================================================
-// STATE MANAGEMENT
-// ============================================================================
-async function _AssetsController_updateState(response) {
+}, _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();
@@ -894,9 +927,12 @@ async function _AssetsController_updateState(response) {
                 for (const [accountId, accountBalances] of Object.entries(normalizedResponse.assetsBalance)) {
                     const previousBalances = previousState.assetsBalance[accountId] ?? {};
                     const customAssetIds = state.customAssets[accountId] ?? [];
-                    // Full: response is authoritative; preserve custom assets not in response. Merge: response overlays previous.
-                    const effective = mode === 'full'
-                        ? (() => {
+                    // 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,
                             };
@@ -908,13 +944,25 @@ async function _AssetsController_updateState(response) {
                                 }
                             }
                             return next;
-                        })()
-                        : { ...previousBalances, ...accountBalances };
+                        })();
+                    // 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(effective)) {
                         const previousBalance = previousBalances[assetId];
                         const newAmount = balance.amount;
                         const oldAmount = previousBalance?.amount;
-                        if (oldAmount !== newAmount) {
+                        const isNewDefaultNativeZero = oldAmount === undefined &&
+                            newAmount === '0' &&
+                            nativeAssetIdsForAccount.includes(assetId);
+                        if (oldAmount !== newAmount && !isNewDefaultNativeZero) {
                             changedBalances.push({
                                 accountId,
                                 assetId,
@@ -1067,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,
@@ -1190,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) => {
@@ -1274,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");
@@ -1302,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