feat: Use AccountGroup metadata for sorting in core permission helpers

app/core/BackgroundBridge/BackgroundBridge.js

@@ -1246,24 +1246,7 @@ export class BackgroundBridge extends EventEmitter {
         Caip25CaveatType,
       );
       if (caip25Caveat) {
-        // TODO: Remove this setTimeout once the core issue in https://github.com/MetaMask/core/pull/8261 is resolved.
-        // Two issues still exist. One is that the AccountGroup metadata is not available when the wallet is locked.
-        // The other is that the EVM metadata is not updated by by the time the selectedAccountGroupChange event is fired.
-        // The former issue mainly affects Extension, not Mobile, but to keep both in sync, we'll keep the setTimeout for now.
-        // The latter issue is what requires the setTimeout below.
-        setTimeout(() => {
-          // We refetch the caip25Caveat to get the latest value in case it
-          // has changed since we first fetched it.
-          const caip25CaveatRefetched =
-            Engine.context.PermissionController.getCaveat(
-              this.channelIdOrOrigin,
-              Caip25EndowmentPermissionName,
-              Caip25CaveatType,
-            );
-          if (caip25CaveatRefetched) {
-            this.notifyCaipAuthorizationChange(caip25CaveatRefetched.value);
-          }
-        }, 1000);
+        this.notifyCaipAuthorizationChange(caip25Caveat.value);
       }
     } catch (err) {
       if (err instanceof PermissionDoesNotExistError) {

app/core/BackgroundBridge/BackgroundBridge.test.js

@@ -1725,12 +1725,10 @@ describe('BackgroundBridge', () => {
 
   describe('handleSessionChangedFromSelectedAccountGroupChanges', () => {
     beforeEach(() => {
-      jest.useFakeTimers();
       jest.clearAllMocks();
     });
 
     afterEach(() => {
-      jest.useRealTimers();
       PermissionController.getCaveat.mockReset();
     });
 
@@ -1744,7 +1742,6 @@ describe('BackgroundBridge', () => {
       });
 
       bridge.handleSessionChangedFromSelectedAccountGroupChanges();
-      jest.advanceTimersByTime(1000);
 
       expect(bridge.multichainEngine.emit).not.toHaveBeenCalled();
     });
@@ -1757,17 +1754,16 @@ describe('BackgroundBridge', () => {
       PermissionController.getCaveat.mockReturnValue(undefined);
 
       bridge.handleSessionChangedFromSelectedAccountGroupChanges();
-      jest.advanceTimersByTime(1000);
 
       expect(bridge.multichainEngine.emit).not.toHaveBeenCalled();
     });
 
-    it('calls notifyCaipAuthorizationChange with the refetched caveat value', () => {
+    it('calls notifyCaipAuthorizationChange with the caveat value', () => {
       const url = 'https://www.mock.io';
       const bridge = setupBackgroundBridge(url);
       const notifySpy = jest.spyOn(bridge, 'notifyCaipAuthorizationChange');
 
-      const mockInitialCaveatValue = {
+      const mockCaveatValue = {
         requiredScopes: {},
         optionalScopes: {
           'eip155:1': {
@@ -1777,36 +1773,16 @@ describe('BackgroundBridge', () => {
         isMultichainOrigin: true,
         sessionProperties: {},
       };
-      const mockRefetchedCaveatValue = {
-        requiredScopes: {},
-        optionalScopes: {
-          'eip155:1': {
-            accounts: ['eip155:1:0xAbCdEf0123456789abcdef0123456789AbCdEf01'],
-          },
-        },
-        isMultichainOrigin: true,
-        sessionProperties: {},
-      };
       PermissionController.getCaveat.mockClear();
-      PermissionController.getCaveat
-        .mockReturnValueOnce({
-          type: Caip25CaveatType,
-          value: mockInitialCaveatValue,
-        })
-        .mockReturnValueOnce({
-          type: Caip25CaveatType,
-          value: mockRefetchedCaveatValue,
-        });
+      PermissionController.getCaveat.mockReturnValueOnce({
+        type: Caip25CaveatType,
+        value: mockCaveatValue,
+      });
 
       bridge.handleSessionChangedFromSelectedAccountGroupChanges();
 
-      jest.advanceTimersByTime(1000);
-
-      // The caveat is fetched once synchronously and once again inside the
-      // setTimeout so that the latest value is used when notifying.
-      expect(PermissionController.getCaveat).toHaveBeenCalledTimes(2);
-      expect(notifySpy).toHaveBeenCalledWith(mockRefetchedCaveatValue);
-      expect(notifySpy).not.toHaveBeenCalledWith(mockInitialCaveatValue);
+      expect(PermissionController.getCaveat).toHaveBeenCalledTimes(1);
+      expect(notifySpy).toHaveBeenCalledWith(mockCaveatValue);
     });
 
     it('does not call notifyCaipAuthorizationChange if the caveat is revoked before the setTimeout fires', () => {
@@ -1825,18 +1801,30 @@ describe('BackgroundBridge', () => {
         sessionProperties: {},
       };
       PermissionController.getCaveat.mockClear();
-      PermissionController.getCaveat
-        .mockReturnValueOnce({
-          type: Caip25CaveatType,
-          value: mockCaveatValue,
-        })
-        .mockReturnValueOnce(undefined);
+      PermissionController.getCaveat.mockReturnValueOnce({
+        type: Caip25CaveatType,
+        value: mockCaveatValue,
+      });
 
       bridge.handleSessionChangedFromSelectedAccountGroupChanges();
 
-      jest.advanceTimersByTime(1000);
+      expect(PermissionController.getCaveat).toHaveBeenCalledTimes(1);
+      expect(notifySpy).toHaveBeenCalledWith(mockCaveatValue);
+    });
+
+    it('rethrows unexpected errors from getCaveat', () => {
+      const url = 'https:www.mock.io';
+      const bridge = setupBackgroundBridge(url);
+      const notifySpy = jest.spyOn(bridge, 'notifyCaipAuthorizationChange');
+
+      const unexpectedError = new Error('unexpected');
+      PermissionController.getCaveat.mockImplementation(() => {
+        throw unexpectedError;
+      });
 
-      expect(PermissionController.getCaveat).toHaveBeenCalledTimes(2);
+      expect(() =>
+        bridge.handleSessionChangedFromSelectedAccountGroupChanges(),
+      ).toThrow(unexpectedError);
       expect(notifySpy).not.toHaveBeenCalled();
     });
   });