fix: clean-up token autodetection

MetaMask · Nov 12, 2024 · a7231df · a7231df
1 parent 25e3182
commit a7231df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/packages/assets-controllers/src/TokenDetectionController.test.ts b/packages/assets-controllers/src/TokenDetectionController.test.ts
@@ -373,7 +373,6 @@ describe('TokenDetectionController', () => {
           },
         },
 
-        // Salim ....
         async ({ controller, mockTokenListGetState, callActionSpy }) => {
           mockMultiChainAccountsService();
           mockTokenListGetState({
@@ -2350,7 +2349,6 @@ describe('TokenDetectionController', () => {
           options: {
             disabled: false,
             getBalancesInSingleCall: mockGetBalancesInSingleCall,
-            // useAccountsAPI: true, // USING ACCOUNTS API
           },
           mocks: {
             getSelectedAccount: selectedAccount,

diff --git a/packages/assets-controllers/src/TokensController.ts b/packages/assets-controllers/src/TokensController.ts
@@ -503,15 +503,13 @@ export class TokensController extends BaseController<
         ).configuration.chainId;
       }
 
-      const newDetectedTokens =
-        interactingChainId &&
-        allDetectedTokens[interactingChainId]?.[this.#getSelectedAddress()]
-          ? allDetectedTokens[interactingChainId]?.[
-              this.#getSelectedAddress()
-            ].filter(
-              (token: Token) => !importedTokensMap[token.address.toLowerCase()],
-            )
-          : [];
+      const detectedTokensForGivenChain = interactingChainId
+        ? allDetectedTokens?.[interactingChainId]?.[this.#getSelectedAddress()]
+        : [];
+
+      const newDetectedTokens = detectedTokensForGivenChain.filter(
+        (t) => !importedTokensMap[t.address.toLowerCase()],
+      );
 
       const { newAllTokens, newAllDetectedTokens, newAllIgnoredTokens } =
         this.#getNewAllTokensState({