Merge branch 'main' into feature/add-bifrost-logo

MetaMask · Jan 18, 2025 · 52b8947 · 52b8947
2 parents 77d5542 + 2751a0d
commit 52b8947
Show file tree

Hide file tree

Showing 8 changed files with 251 additions and 211 deletions.
diff --git a/app/scripts/controllers/account-tracker-controller.test.ts b/app/scripts/controllers/account-tracker-controller.test.ts
@@ -368,6 +368,23 @@ describe('AccountTrackerController', () => {
       });
     });
 
+    it('should gracefully handle unknown polling tokens', async () => {
+      await withController(({ controller, blockTrackerFromHookStub }) => {
+        jest.spyOn(controller, 'updateAccounts').mockResolvedValue();
+
+        const pollingToken =
+          controller.startPollingByNetworkClientId('mainnet');
+
+        controller.stopPollingByPollingToken('unknown-token');
+        controller.stopPollingByPollingToken(pollingToken);
+
+        expect(blockTrackerFromHookStub.removeListener).toHaveBeenCalledWith(
+          'latest',
+          expect.any(Function),
+        );
+      });
+    });
+
     it('should not unsubscribe from the block tracker if called with one of multiple active polling tokens for a given networkClient', async () => {
       await withController(({ controller, blockTrackerFromHookStub }) => {
         jest.spyOn(controller, 'updateAccounts').mockResolvedValue();
@@ -391,14 +408,6 @@ describe('AccountTrackerController', () => {
         }).toThrow('pollingToken required');
       });
     });
-
-    it('should error if no matching pollingToken is found', async () => {
-      await withController(({ controller }) => {
-        expect(() => {
-          controller.stopPollingByPollingToken('potato');
-        }).toThrow('pollingToken not found');
-      });
-    });
   });
 
   describe('stopAll', () => {

diff --git a/app/scripts/controllers/account-tracker-controller.ts b/app/scripts/controllers/account-tracker-controller.ts
@@ -403,20 +403,15 @@ export default class AccountTrackerController extends BaseController<
     if (!pollingToken) {
       throw new Error('pollingToken required');
     }
-    let found = false;
     this.#pollingTokenSets.forEach((tokenSet, key) => {
       if (tokenSet.has(pollingToken)) {
-        found = true;
         tokenSet.delete(pollingToken);
         if (tokenSet.size === 0) {
           this.#pollingTokenSets.delete(key);
           this.#unsubscribeWithNetworkClientId(key);
         }
       }
     });
-    if (!found) {
-      throw new Error('pollingToken not found');
-    }
   }
 
   /**