fix: add resync mechanism to sync Snap accounts states with client accounts cp-13.11.0

app/scripts/metamask-controller.js

@@ -5207,12 +5207,20 @@ export default class MetamaskController extends EventEmitter {
     }
 
     await this.accountsController.updateAccounts();
+
     ///: BEGIN:ONLY_INCLUDE_IF(multichain)
     // Init multichain accounts after creating internal accounts.
     await this.multichainAccountService.init();
+    // READ THIS CAREFULLY:
+    // There is is/was a bug with Snap accounts that can be desynchronized (Solana). To
+    // automatically "fix" this corrupted state, we run this method which will re-sync
+    // MetaMask accounts and Snap accounts upon login.
+    await this.multichainAccountService.resyncAccounts();
     ///: END:ONLY_INCLUDE_IF
+
     // Force account-tree refresh after all accounts have been updated.
     this.accountTreeController.init();
+
     // TODO: Move this logic to the SnapKeyring directly.
     // Forward selected accounts to the Snap keyring, so each Snaps can fetch those accounts.
     await this.forwardSelectedAccountGroupToSnapKeyring(

app/scripts/metamask-controller.test.js

@@ -728,6 +728,24 @@ describe('MetaMaskController', () => {
       });
     });
 
+    describe('#submitPasswordOrEncryptionKey', () => {
+      const password = 'a-fake-password';
+
+      it('should call multichainAccountService.resyncAccounts when submitPasswordOrEncryptionKey is called', async () => {
+        const mockResyncAccounts = jest.fn();
+
+        metamaskController.multichainAccountService = {
+          init: jest.fn(),
+          resyncAccounts: mockResyncAccounts,
+        };
+
+        await metamaskController.createNewVaultAndRestore(password, TEST_SEED);
+        await metamaskController.submitPasswordOrEncryptionKey({ password });
+
+        expect(mockResyncAccounts).toHaveBeenCalled();
+      });
+    });
+
     describe('setLocked', () => {
       it('should lock KeyringController', async () => {
         await metamaskController.createNewVaultAndKeychain('password');