@metamask-previews/assets-controllers 58.0.0-preview-530f9e5 → 58.0.0-preview-f2d81961

package/dist/TokensController.d.cts

@@ -63,7 +63,7 @@ export declare class TokensController extends BaseController<typeof controllerNa
      * @param options.state - Initial state to set on this controller.
      * @param options.messenger - The messenger.
      */
-    constructor({ provider, state, messenger, }: {
+    constructor({ chainId: initialChainId, provider, state, messenger, }: {
         chainId: Hex;
         provider: Provider;
         state?: Partial<TokensControllerState>;
@@ -89,7 +89,7 @@ export declare class TokensController extends BaseController<typeof controllerNa
         name?: string;
         image?: string;
         interactingAddress?: string;
-        networkClientId: NetworkClientId;
+        networkClientId?: NetworkClientId;
     }): Promise<Token[]>;
     /**
      * Add a batch of tokens.
@@ -97,14 +97,14 @@ export declare class TokensController extends BaseController<typeof controllerNa
      * @param tokensToImport - Array of tokens to import.
      * @param networkClientId - Optional network client ID used to determine interacting chain ID.
      */
-    addTokens(tokensToImport: Token[], networkClientId: NetworkClientId): Promise<void>;
+    addTokens(tokensToImport: Token[], networkClientId?: NetworkClientId): Promise<void>;
     /**
      * Ignore a batch of tokens.
      *
      * @param tokenAddressesToIgnore - Array of token addresses to ignore.
      * @param networkClientId - Optional network client ID used to determine interacting chain ID.
      */
-    ignoreTokens(tokenAddressesToIgnore: string[], networkClientId: NetworkClientId): void;
+    ignoreTokens(tokenAddressesToIgnore: string[], networkClientId?: NetworkClientId): void;
     /**
      * Adds a batch of detected tokens to the stored token list.
      *
@@ -113,8 +113,8 @@ export declare class TokensController extends BaseController<typeof controllerNa
      * @param detectionDetails.selectedAddress - the account address on which the incomingDetectedTokens were detected.
      * @param detectionDetails.chainId - the chainId on which the incomingDetectedTokens were detected.
      */
-    addDetectedTokens(incomingDetectedTokens: Token[], detectionDetails: {
-        selectedAddress?: string;
+    addDetectedTokens(incomingDetectedTokens: Token[], detectionDetails?: {
+        selectedAddress: string;
         chainId: Hex;
     }): Promise<void>;
     /**
@@ -122,10 +122,9 @@ export declare class TokensController extends BaseController<typeof controllerNa
      * were previously added which do not yet had isERC721 field.
      *
      * @param tokenAddress - The contract address of the token requiring the isERC721 field added.
-     * @param networkClientId - The network client ID of the network on which the token is detected.
      * @returns The new token object with the added isERC721 field.
      */
-    updateTokenType(tokenAddress: string, networkClientId: NetworkClientId): Promise<{
+    updateTokenType(tokenAddress: string): Promise<{
         isERC721: any;
         address: string;
         decimals: number;
@@ -150,7 +149,7 @@ export declare class TokensController extends BaseController<typeof controllerNa
         asset: Token;
         type: string;
         interactingAddress?: string;
-        networkClientId: NetworkClientId;
+        networkClientId?: NetworkClientId;
     }): Promise<void>;
     /**
      * Removes all tokens from the ignored list.

package/dist/TokensController.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"TokensController.d.cts","sourceRoot":"","sources":["../src/TokensController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TokensController.d.cts","sourceRoot":"","sources":["../src/TokensController.ts"],"names":[],"mappings":"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"}

package/dist/TokensController.d.mts

@@ -63,7 +63,7 @@ export declare class TokensController extends BaseController<typeof controllerNa
      * @param options.state - Initial state to set on this controller.
      * @param options.messenger - The messenger.
      */
-    constructor({ provider, state, messenger, }: {
+    constructor({ chainId: initialChainId, provider, state, messenger, }: {
         chainId: Hex;
         provider: Provider;
         state?: Partial<TokensControllerState>;
@@ -89,7 +89,7 @@ export declare class TokensController extends BaseController<typeof controllerNa
         name?: string;
         image?: string;
         interactingAddress?: string;
-        networkClientId: NetworkClientId;
+        networkClientId?: NetworkClientId;
     }): Promise<Token[]>;
     /**
      * Add a batch of tokens.
@@ -97,14 +97,14 @@ export declare class TokensController extends BaseController<typeof controllerNa
      * @param tokensToImport - Array of tokens to import.
      * @param networkClientId - Optional network client ID used to determine interacting chain ID.
      */
-    addTokens(tokensToImport: Token[], networkClientId: NetworkClientId): Promise<void>;
+    addTokens(tokensToImport: Token[], networkClientId?: NetworkClientId): Promise<void>;
     /**
      * Ignore a batch of tokens.
      *
      * @param tokenAddressesToIgnore - Array of token addresses to ignore.
      * @param networkClientId - Optional network client ID used to determine interacting chain ID.
      */
-    ignoreTokens(tokenAddressesToIgnore: string[], networkClientId: NetworkClientId): void;
+    ignoreTokens(tokenAddressesToIgnore: string[], networkClientId?: NetworkClientId): void;
     /**
      * Adds a batch of detected tokens to the stored token list.
      *
@@ -113,8 +113,8 @@ export declare class TokensController extends BaseController<typeof controllerNa
      * @param detectionDetails.selectedAddress - the account address on which the incomingDetectedTokens were detected.
      * @param detectionDetails.chainId - the chainId on which the incomingDetectedTokens were detected.
      */
-    addDetectedTokens(incomingDetectedTokens: Token[], detectionDetails: {
-        selectedAddress?: string;
+    addDetectedTokens(incomingDetectedTokens: Token[], detectionDetails?: {
+        selectedAddress: string;
         chainId: Hex;
     }): Promise<void>;
     /**
@@ -122,10 +122,9 @@ export declare class TokensController extends BaseController<typeof controllerNa
      * were previously added which do not yet had isERC721 field.
      *
      * @param tokenAddress - The contract address of the token requiring the isERC721 field added.
-     * @param networkClientId - The network client ID of the network on which the token is detected.
      * @returns The new token object with the added isERC721 field.
      */
-    updateTokenType(tokenAddress: string, networkClientId: NetworkClientId): Promise<{
+    updateTokenType(tokenAddress: string): Promise<{
         isERC721: any;
         address: string;
         decimals: number;
@@ -150,7 +149,7 @@ export declare class TokensController extends BaseController<typeof controllerNa
         asset: Token;
         type: string;
         interactingAddress?: string;
-        networkClientId: NetworkClientId;
+        networkClientId?: NetworkClientId;
     }): Promise<void>;
     /**
      * Removes all tokens from the ignored list.

package/dist/TokensController.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"TokensController.d.mts","sourceRoot":"","sources":["../src/TokensController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TokensController.d.mts","sourceRoot":"","sources":["../src/TokensController.ts"],"names":[],"mappings":"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"}

package/dist/TokensController.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TokensController_instances, _TokensController_mutex, _TokensController_selectedAccountId, _TokensController_provider, _TokensController_abortController, _TokensController_onNetworkStateChange, _TokensController_onSelectedAccountChange, _TokensController_fetchTokenMetadata, _TokensController_detectIsERC721, _TokensController_getProvider, _TokensController_createEthersContract, _TokensController_generateRandomId, _TokensController_getNewAllTokensState, _TokensController_getAddressOrSelectedAddress, _TokensController_requestApproval, _TokensController_getSelectedAccount, _TokensController_getSelectedAddress;
+var _TokensController_instances, _TokensController_mutex, _TokensController_chainId, _TokensController_selectedAccountId, _TokensController_provider, _TokensController_abortController, _TokensController_onNetworkDidChange, _TokensController_onNetworkStateChange, _TokensController_onSelectedAccountChange, _TokensController_fetchTokenMetadata, _TokensController_detectIsERC721, _TokensController_getProvider, _TokensController_createEthersContract, _TokensController_generateRandomId, _TokensController_getNewAllTokensState, _TokensController_getAddressOrSelectedAddress, _TokensController_requestApproval, _TokensController_getSelectedAccount, _TokensController_getSelectedAddress;
 function $importDefault(module) {
     if (module?.__esModule) {
         return module.default;
@@ -66,7 +66,7 @@ export class TokensController extends BaseController {
      * @param options.state - Initial state to set on this controller.
      * @param options.messenger - The messenger.
      */
-    constructor({ provider, state, messenger, }) {
+    constructor({ chainId: initialChainId, provider, state, messenger, }) {
         super({
             name: controllerName,
             metadata,
@@ -78,14 +78,17 @@ export class TokensController extends BaseController {
         });
         _TokensController_instances.add(this);
         _TokensController_mutex.set(this, new Mutex());
+        _TokensController_chainId.set(this, void 0);
         _TokensController_selectedAccountId.set(this, void 0);
         _TokensController_provider.set(this, void 0);
         _TokensController_abortController.set(this, void 0);
+        __classPrivateFieldSet(this, _TokensController_chainId, initialChainId, "f");
         __classPrivateFieldSet(this, _TokensController_provider, provider, "f");
         __classPrivateFieldSet(this, _TokensController_selectedAccountId, __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAccount).call(this).id, "f");
         __classPrivateFieldSet(this, _TokensController_abortController, new AbortController(), "f");
         this.messagingSystem.registerActionHandler(`${controllerName}:addDetectedTokens`, this.addDetectedTokens.bind(this));
         this.messagingSystem.subscribe('AccountsController:selectedEvmAccountChange', __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_onSelectedAccountChange).bind(this));
+        this.messagingSystem.subscribe('NetworkController:networkDidChange', __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_onNetworkDidChange).bind(this));
         this.messagingSystem.subscribe('NetworkController:stateChange', __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_onNetworkStateChange).bind(this));
         this.messagingSystem.subscribe('TokenListController:stateChange', ({ tokensChainsCache }) => {
             const { allTokens } = this.state;
@@ -129,28 +132,37 @@ export class TokensController extends BaseController {
      * @returns Current token list.
      */
     async addToken({ address, symbol, decimals, name, image, interactingAddress, networkClientId, }) {
+        // TODO: remove this once this method is fully parameterized by chainId
+        const chainId = __classPrivateFieldGet(this, _TokensController_chainId, "f");
         const releaseLock = await __classPrivateFieldGet(this, _TokensController_mutex, "f").acquire();
         const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
-        const chainIdToUse = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
+        let currentChainId = chainId;
+        if (networkClientId) {
+            currentChainId = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
+        }
         const accountAddress = __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getAddressOrSelectedAddress).call(this, interactingAddress);
         try {
             address = toChecksumHexAddress(address);
-            const tokens = allTokens[chainIdToUse]?.[accountAddress] || [];
-            const ignoredTokens = allIgnoredTokens[chainIdToUse]?.[accountAddress] || [];
-            const detectedTokens = allDetectedTokens[chainIdToUse]?.[accountAddress] || [];
+            const tokens = allTokens[currentChainId]?.[accountAddress] || [];
+            const ignoredTokens = allIgnoredTokens[currentChainId]?.[accountAddress] || [];
+            const detectedTokens = allDetectedTokens[currentChainId]?.[accountAddress] || [];
             const newTokens = [...tokens];
             const [isERC721, tokenMetadata] = await Promise.all([
                 __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_detectIsERC721).call(this, address, networkClientId),
                 // TODO parameterize the token metadata fetch by networkClientId
-                __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_fetchTokenMetadata).call(this, address, chainIdToUse),
+                __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_fetchTokenMetadata).call(this, address),
             ]);
+            // TODO remove this once this method is fully parameterized by networkClientId
+            if (!networkClientId && currentChainId !== __classPrivateFieldGet(this, _TokensController_chainId, "f")) {
+                throw new Error('TokensController Error: Switched networks while adding token');
+            }
             const newEntry = {
                 address,
                 symbol,
                 decimals,
                 image: image ||
                     formatIconUrlWithProxy({
-                        chainId: chainIdToUse,
+                        chainId: currentChainId,
                         tokenAddress: address,
                     }),
                 isERC721,
@@ -171,7 +183,7 @@ export class TokensController extends BaseController {
                 newIgnoredTokens,
                 newDetectedTokens,
                 interactingAddress: accountAddress,
-                interactingChainId: chainIdToUse,
+                interactingChainId: currentChainId,
             });
             const newState = {
                 allTokens: newAllTokens,
@@ -197,7 +209,10 @@ export class TokensController extends BaseController {
         const releaseLock = await __classPrivateFieldGet(this, _TokensController_mutex, "f").acquire();
         const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
         const importedTokensMap = {};
-        const interactingChainId = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
+        let interactingChainId = __classPrivateFieldGet(this, _TokensController_chainId, "f");
+        if (networkClientId) {
+            interactingChainId = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
+        }
         // Used later to dedupe imported tokens
         const newTokensMap = [
             ...(allTokens[interactingChainId]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAccount).call(this).address] ||
@@ -224,7 +239,7 @@ export class TokensController extends BaseController {
                 return formattedToken;
             });
             const newTokens = Object.values(newTokensMap);
-            const newIgnoredTokens = allIgnoredTokens[interactingChainId]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)]?.filter((tokenAddress) => !newTokensMap[tokenAddress.toLowerCase()]);
+            const newIgnoredTokens = allIgnoredTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)]?.filter((tokenAddress) => !newTokensMap[tokenAddress.toLowerCase()]);
             const detectedTokensForGivenChain = interactingChainId
                 ? allDetectedTokens?.[interactingChainId]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)]
                 : [];
@@ -252,13 +267,16 @@ export class TokensController extends BaseController {
      * @param networkClientId - Optional network client ID used to determine interacting chain ID.
      */
     ignoreTokens(tokenAddressesToIgnore, networkClientId) {
-        const interactingChainId = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
+        let interactingChainId = __classPrivateFieldGet(this, _TokensController_chainId, "f");
+        if (networkClientId) {
+            interactingChainId = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
+        }
         const { allTokens, allDetectedTokens, allIgnoredTokens } = this.state;
         const ignoredTokensMap = {};
-        const ignoredTokens = allIgnoredTokens[interactingChainId]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
+        const ignoredTokens = allIgnoredTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
         let newIgnoredTokens = [...ignoredTokens];
-        const tokens = allTokens[interactingChainId]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
-        const detectedTokens = allDetectedTokens[interactingChainId]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
+        const tokens = allTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
+        const detectedTokens = allDetectedTokens[interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[__classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this)] || [];
         const checksummedTokenAddresses = tokenAddressesToIgnore.map((address) => {
             const checksumAddress = toChecksumHexAddress(address);
             ignoredTokensMap[address.toLowerCase()] = true;
@@ -289,7 +307,7 @@ export class TokensController extends BaseController {
      */
     async addDetectedTokens(incomingDetectedTokens, detectionDetails) {
         const releaseLock = await __classPrivateFieldGet(this, _TokensController_mutex, "f").acquire();
-        const { chainId } = detectionDetails;
+        const chainId = detectionDetails?.chainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f");
         // Previously selectedAddress could be an empty string. This is to preserve the behaviour
         const accountAddress = detectionDetails?.selectedAddress ?? __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this);
         const { allTokens, allDetectedTokens, allIgnoredTokens } = this.state;
@@ -339,9 +357,9 @@ export class TokensController extends BaseController {
             // We may be detecting tokens on a different chain/account pair than are currently configured.
             // Re-point `tokens` and `detectedTokens` to keep them referencing the current chain/account.
             const selectedAddress = __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this);
-            newTokens = newAllTokens?.[chainId]?.[selectedAddress] || [];
+            newTokens = newAllTokens?.[__classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[selectedAddress] || [];
             newDetectedTokens =
-                newAllDetectedTokens?.[chainId]?.[selectedAddress] || [];
+                newAllDetectedTokens?.[__classPrivateFieldGet(this, _TokensController_chainId, "f")]?.[selectedAddress] || [];
             this.update((state) => {
                 state.allTokens = newAllTokens;
                 state.allDetectedTokens = newAllDetectedTokens;
@@ -356,21 +374,20 @@ export class TokensController extends BaseController {
      * were previously added which do not yet had isERC721 field.
      *
      * @param tokenAddress - The contract address of the token requiring the isERC721 field added.
-     * @param networkClientId - The network client ID of the network on which the token is detected.
      * @returns The new token object with the added isERC721 field.
      */
-    async updateTokenType(tokenAddress, networkClientId) {
-        const chainIdToUse = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
-        const isERC721 = await __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_detectIsERC721).call(this, tokenAddress, networkClientId);
+    async updateTokenType(tokenAddress) {
+        const isERC721 = await __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_detectIsERC721).call(this, tokenAddress);
+        const chainId = __classPrivateFieldGet(this, _TokensController_chainId, "f");
         const accountAddress = __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getSelectedAddress).call(this);
-        const tokens = [...this.state.allTokens[chainIdToUse][accountAddress]];
+        const tokens = [...this.state.allTokens[chainId][accountAddress]];
         const tokenIndex = tokens.findIndex((token) => {
             return token.address.toLowerCase() === tokenAddress.toLowerCase();
         });
         const updatedToken = { ...tokens[tokenIndex], isERC721 };
         tokens[tokenIndex] = updatedToken;
         this.update((state) => {
-            state.allTokens[chainIdToUse][accountAddress] = tokens;
+            state.allTokens[chainId][accountAddress] = tokens;
         });
         return updatedToken;
     }
@@ -494,7 +511,13 @@ export class TokensController extends BaseController {
         });
     }
 }
-_TokensController_mutex = new WeakMap(), _TokensController_selectedAccountId = new WeakMap(), _TokensController_provider = new WeakMap(), _TokensController_abortController = new WeakMap(), _TokensController_instances = new WeakSet(), _TokensController_onNetworkStateChange = function _TokensController_onNetworkStateChange(_, patches) {
+_TokensController_mutex = new WeakMap(), _TokensController_chainId = new WeakMap(), _TokensController_selectedAccountId = new WeakMap(), _TokensController_provider = new WeakMap(), _TokensController_abortController = new WeakMap(), _TokensController_instances = new WeakSet(), _TokensController_onNetworkDidChange = function _TokensController_onNetworkDidChange({ selectedNetworkClientId }) {
+    const selectedNetworkClient = this.messagingSystem.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
+    const { chainId } = selectedNetworkClient.configuration;
+    __classPrivateFieldGet(this, _TokensController_abortController, "f").abort();
+    __classPrivateFieldSet(this, _TokensController_abortController, new AbortController(), "f");
+    __classPrivateFieldSet(this, _TokensController_chainId, chainId, "f");
+}, _TokensController_onNetworkStateChange = function _TokensController_onNetworkStateChange(_, patches) {
     // Remove state for deleted networks
     for (const patch of patches) {
         if (patch.op === 'remove' &&
@@ -514,12 +537,11 @@ _TokensController_mutex = new WeakMap(), _TokensController_selectedAccountId = n
  * Fetch metadata for a token.
  *
  * @param tokenAddress - The address of the token.
- * @param chainId - The chain ID of the network on which the token is detected.
  * @returns The token metadata.
  */
-async function _TokensController_fetchTokenMetadata(tokenAddress, chainId) {
+async function _TokensController_fetchTokenMetadata(tokenAddress) {
     try {
-        const token = await fetchTokenMetadata(chainId, tokenAddress, __classPrivateFieldGet(this, _TokensController_abortController, "f").signal);
+        const token = await fetchTokenMetadata(__classPrivateFieldGet(this, _TokensController_chainId, "f"), tokenAddress, __classPrivateFieldGet(this, _TokensController_abortController, "f").signal);
         return token;
     }
     catch (error) {
@@ -573,52 +595,53 @@ async function _TokensController_detectIsERC721(tokenAddress, networkClientId) {
     const { newTokens, newIgnoredTokens, newDetectedTokens, interactingAddress, interactingChainId, } = params;
     const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
     const userAddressToAddTokens = __classPrivateFieldGet(this, _TokensController_instances, "m", _TokensController_getAddressOrSelectedAddress).call(this, interactingAddress);
+    const chainIdToAddTokens = interactingChainId ?? __classPrivateFieldGet(this, _TokensController_chainId, "f");
     let newAllTokens = allTokens;
     if (newTokens?.length ||
         (newTokens &&
             allTokens &&
-            allTokens[interactingChainId] &&
-            allTokens[interactingChainId][userAddressToAddTokens])) {
-        const networkTokens = allTokens[interactingChainId];
+            allTokens[chainIdToAddTokens] &&
+            allTokens[chainIdToAddTokens][userAddressToAddTokens])) {
+        const networkTokens = allTokens[chainIdToAddTokens];
         const newNetworkTokens = {
             ...networkTokens,
             ...{ [userAddressToAddTokens]: newTokens },
         };
         newAllTokens = {
             ...allTokens,
-            ...{ [interactingChainId]: newNetworkTokens },
+            ...{ [chainIdToAddTokens]: newNetworkTokens },
         };
     }
     let newAllIgnoredTokens = allIgnoredTokens;
     if (newIgnoredTokens?.length ||
         (newIgnoredTokens &&
             allIgnoredTokens &&
-            allIgnoredTokens[interactingChainId] &&
-            allIgnoredTokens[interactingChainId][userAddressToAddTokens])) {
-        const networkIgnoredTokens = allIgnoredTokens[interactingChainId];
+            allIgnoredTokens[chainIdToAddTokens] &&
+            allIgnoredTokens[chainIdToAddTokens][userAddressToAddTokens])) {
+        const networkIgnoredTokens = allIgnoredTokens[chainIdToAddTokens];
         const newIgnoredNetworkTokens = {
             ...networkIgnoredTokens,
             ...{ [userAddressToAddTokens]: newIgnoredTokens },
         };
         newAllIgnoredTokens = {
             ...allIgnoredTokens,
-            ...{ [interactingChainId]: newIgnoredNetworkTokens },
+            ...{ [chainIdToAddTokens]: newIgnoredNetworkTokens },
         };
     }
     let newAllDetectedTokens = allDetectedTokens;
     if (newDetectedTokens?.length ||
         (newDetectedTokens &&
             allDetectedTokens &&
-            allDetectedTokens[interactingChainId] &&
-            allDetectedTokens[interactingChainId][userAddressToAddTokens])) {
-        const networkDetectedTokens = allDetectedTokens[interactingChainId];
+            allDetectedTokens[chainIdToAddTokens] &&
+            allDetectedTokens[chainIdToAddTokens][userAddressToAddTokens])) {
+        const networkDetectedTokens = allDetectedTokens[chainIdToAddTokens];
         const newDetectedNetworkTokens = {
             ...networkDetectedTokens,
             ...{ [userAddressToAddTokens]: newDetectedTokens },
         };
         newAllDetectedTokens = {
             ...allDetectedTokens,
-            ...{ [interactingChainId]: newDetectedNetworkTokens },
+            ...{ [chainIdToAddTokens]: newDetectedNetworkTokens },
         };
     }
     return { newAllTokens, newAllIgnoredTokens, newAllDetectedTokens };