Merge branch 'main' into feat/move-multichain-account-impl

Author: ccharly

packages/accounts-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Stop updating `selectedAccount` unnecesarily ([#6218](https://github.com/MetaMask/core/pull/6218))
+
 ## [32.0.1]
 
 ### Fixed

packages/accounts-controller/src/AccountsController.test.ts

@@ -1804,6 +1804,35 @@ describe('AccountsController', () => {
         mockOlderEvmAccount.id,
       );
     });
+
+    it('should not emit an update if the selected account does not change', () => {
+      const messenger = buildMessenger();
+      const spy = jest.spyOn(messenger, 'publish');
+      const { accountsController, triggerMultichainNetworkChange } =
+        setupAccountsController({
+          initialState: {
+            internalAccounts: {
+              accounts: {
+                [mockOlderEvmAccount.id]: mockOlderEvmAccount,
+              },
+              selectedAccount: mockOlderEvmAccount.id,
+            },
+          },
+          messenger,
+        });
+
+      triggerMultichainNetworkChange(InfuraNetworkType.mainnet);
+
+      expect(spy).not.toHaveBeenCalledWith(
+        'AccountsController:stateChange',
+        expect.any(Object),
+        expect.any(Array),
+      );
+
+      expect(accountsController.state.internalAccounts.selectedAccount).toBe(
+        mockOlderEvmAccount.id,
+      );
+    });
   });
 
   describe('updateAccounts', () => {

packages/accounts-controller/src/AccountsController.ts

@@ -428,6 +428,10 @@ export class AccountsController extends BaseController<
   setSelectedAccount(accountId: string): void {
     const account = this.getAccountExpect(accountId);
 
+    if (this.state.internalAccounts.selectedAccount === account.id) {
+      return;
+    }
+
     this.#update((state) => {
       const { internalAccounts } = state;
 
@@ -1171,6 +1175,10 @@ export class AccountsController extends BaseController<
       accountId = lastSelectedEvmAccount.id;
     }
 
+    if (this.state.internalAccounts.selectedAccount === accountId) {
+      return;
+    }
+
     this.update((currentState) => {
       currentState.internalAccounts.accounts[accountId].metadata.lastSelected =
         Date.now();