deepClone state before modifying

MetaMask · Dec 7, 2023 · 083cde2 · 083cde2
1 parent 1e63820
commit 083cde2
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/assets-controllers/src/AccountTrackerController.ts b/packages/assets-controllers/src/AccountTrackerController.ts
@@ -15,6 +15,7 @@ import { PollingControllerV1 } from '@metamask/polling-controller';
 import type { PreferencesState } from '@metamask/preferences-controller';
 import { assert } from '@metamask/utils';
 import { Mutex } from 'async-mutex';
+import { cloneDeep } from 'lodash';
 
 /**
  * @type AccountInformation
@@ -73,7 +74,8 @@ export class AccountTrackerController extends PollingControllerV1<
   private handle?: ReturnType<typeof setTimeout>;
 
   private syncAccounts(newChainId: string) {
-    const { accounts, accountsByChainId } = this.state;
+    const accounts = cloneDeep(this.state.accounts)
+    const accountsByChainId = cloneDeep(this.state.accountsByChainId)
 
     const existing = Object.keys(accounts);
     if (!accountsByChainId[newChainId]) {
@@ -272,22 +274,22 @@ export class AccountTrackerController extends PollingControllerV1<
         ? Object.keys(accounts)
         : [this.getSelectedAddress()];
 
-      const accountsForChain = accountsByChainId[chainId];
+      const accountsForChain = cloneDeep(accountsByChainId[chainId]);
       for (const address of accountsToUpdate) {
         accountsForChain[address] = {
           balance: BNToHex(await this.getBalanceFromChain(address, ethQuery)),
         };
       }
 
       this.update({
+        ...(chainId === this.getCurrentChainId() && {
+          accounts: accountsForChain,
+        }),
         accountsByChainId: {
           ...this.state.accountsByChainId,
           [chainId]: accountsForChain,
         },
       });
-      if (chainId === this.getCurrentChainId()) {
-        this.update({ accounts: accountsForChain });
-      }
     } catch (err) {
       releaseLock();
       throw err;