fix: remove nonevm check during selectedAccountChange

Author: montelaidev

packages/assets-controllers/src/TokenDetectionController.ts

@@ -232,10 +232,7 @@ export class TokenDetectionController extends StaticIntervalPollingController<
       const selectedInternalAccount = this.messagingSystem.call(
         'AccountsController:getSelectedAccount',
       );
-      if (isEVMAccount(selectedInternalAccount)) {
-        this.#selectedAccountId = selectedInternalAccount.id;
-      }
-      this.#selectedAccountId = '';
+      this.#selectedAccountId = selectedInternalAccount.id;
     }
 
     const { chainId, networkClientId } =
@@ -288,14 +285,17 @@ export class TokenDetectionController extends StaticIntervalPollingController<
     this.messagingSystem.subscribe(
       'PreferencesController:stateChange',
       async ({ useTokenDetection }) => {
+        const selectedAccount = this.messagingSystem.call(
+          'AccountsController:getSelectedAccount',
+        );
         const isDetectionChangedFromPreferences =
           this.#isDetectionEnabledFromPreferences !== useTokenDetection;
 
         this.#isDetectionEnabledFromPreferences = useTokenDetection;
 
         if (isDetectionChangedFromPreferences) {
           await this.#restartTokenDetection({
-            selectedAccountId: this.#selectedAccountId,
+            selectedAccountId: selectedAccount.id,
           });
         }
       },
@@ -304,9 +304,6 @@ export class TokenDetectionController extends StaticIntervalPollingController<
     this.messagingSystem.subscribe(
       'AccountsController:selectedAccountChange',
       async (internalAccount) => {
-        if (!isEVMAccount(internalAccount)) {
-          return;
-        }
         const didSelectedAccountIdChanged =
           this.#selectedAccountId !== internalAccount.id;
         if (didSelectedAccountIdChanged) {

packages/assets-controllers/src/TokenRatesController.ts

@@ -239,9 +239,6 @@ export class TokenRatesController extends StaticIntervalPollingControllerV1<
     }
 
     onSelectedAccountChange(async (internalAccount) => {
-      if (!isEVMAccount(internalAccount)) {
-        return;
-      }
       if (this.config.selectedAccountId !== internalAccount.id) {
         this.configure({ selectedAccountId: internalAccount.id });
         if (this.#pollState === PollState.Active) {
@@ -347,7 +344,12 @@ export class TokenRatesController extends StaticIntervalPollingControllerV1<
    * Updates exchange rates for all tokens.
    */
   async updateExchangeRates() {
-    const { chainId, nativeCurrency } = this.config;
+    const { chainId, nativeCurrency, selectedAccountId } = this.config;
+    const selectedAccount = this.getInternalAccount(selectedAccountId);
+    if (!selectedAccount || !isEVMAccount(selectedAccount)) {
+      return;
+    }
+
     await this.updateExchangeRatesByChainId({
       chainId,
       nativeCurrency,

packages/assets-controllers/src/TokensController.test.ts

@@ -1888,17 +1888,6 @@ describe('TokensController', () => {
       ]);
       stub.restore();
     });
-
-    it('should not update selectedTokenId if the selected account is not an EVM account', async () => {
-      const mockEvmAccount = createMockInternalAccount();
-      triggerSelectedAccountChange(mockEvmAccount);
-      const mockNonEvmAccount = createMockInternalAccount({
-        // @ts-expect-error testing a not evm type
-        type: 'bitcoin',
-      });
-      triggerSelectedAccountChange(mockNonEvmAccount);
-      expect(tokensController.config.selectedAccountId).toBe(mockEvmAccount.id);
-    });
   });
 
   describe('Non evm check', () => {

packages/assets-controllers/src/TokensController.ts

@@ -4,7 +4,7 @@ import type {
   AccountsControllerGetAccountAction,
   AccountsControllerSelectedAccountChangeEvent,
 } from '@metamask/accounts-controller';
-import { isEVMAccount } from '@metamask/accounts-controller/src/utils';
+import { isEVMAccount } from '@metamask/accounts-controller';
 import type { AddApprovalRequest } from '@metamask/approval-controller';
 import type {
   BaseConfig,
@@ -265,12 +265,12 @@ export class TokensController extends BaseControllerV1<
     this.messagingSystem.subscribe(
       'AccountsController:selectedAccountChange',
       (internalAccount) => {
+        this.configure({ selectedAccountId: internalAccount.id });
         if (!isEVMAccount(internalAccount)) {
           return;
         }
         const { allTokens, allIgnoredTokens, allDetectedTokens } = this.state;
         const { chainId } = this.config;
-        this.configure({ selectedAccountId: internalAccount.id });
         this.update({
           tokens: allTokens[chainId]?.[internalAccount.address] ?? [],
           ignoredTokens:
@@ -290,16 +290,17 @@ export class TokensController extends BaseControllerV1<
           'AccountsController:getAccount',
           selectedAccountId,
         );
+
+        const { chainId } = providerConfig;
+        this.abortController.abort();
+        this.abortController = new AbortController();
+        this.configure({ chainId });
         if (
           !selectedInternalAccount ||
           !isEVMAccount(selectedInternalAccount)
         ) {
           return;
         }
-        const { chainId } = providerConfig;
-        this.abortController.abort();
-        this.abortController = new AbortController();
-        this.configure({ chainId });
         this.update({
           tokens: allTokens[chainId]?.[selectedInternalAccount.address] || [],
           ignoredTokens:
@@ -367,6 +368,7 @@ export class TokensController extends BaseControllerV1<
       selectedAccountId,
     );
     if (!internalAccount || !isEVMAccount(internalAccount)) {
+      releaseLock();
       return [];
     }