Fix a condition in the "wipeSmartTransations" function

src/SmartTransactionsController.test.ts

@@ -19,7 +19,7 @@
   DEFAULT_INTERVAL,
 } from './SmartTransactionsController';
 import { advanceTime, flushPromises } from './test-helpers';
-import type { SmartTransaction, UnsignedTransaction } from './types';
+import type { SmartTransaction, UnsignedTransaction, Hex } from './types';
 import { SmartTransactionStatuses } from './types';
 import * as utils from './utils';
 import packageJson from '../package.json';
@@ -1139,13 +1139,13 @@
 
   describe('setStatusRefreshInterval', () => {
     it('sets refresh interval if different', () => {
       smartTransactionsController.setStatusRefreshInterval(100);
       expect(smartTransactionsController.config.interval).toBe(100);
     });
 
     it('does not set refresh interval if they are the same', () => {
       const configureSpy = jest.spyOn(smartTransactionsController, 'configure');
       smartTransactionsController.setStatusRefreshInterval(DEFAULT_INTERVAL);
       expect(configureSpy).toHaveBeenCalledTimes(0);
     });
   });
@@ -1415,12 +1415,29 @@
       expect(smartTransactionsController.state).toStrictEqual(prevState);
     });
 
-    it('removes transactions from current chainId if ignoreNetwork is true', () => {
+    it('removes transactions from all chains saved in the smartTransactionsState if ignoreNetwork is true', () => {
       const address = '0x123';
       smartTransactionsController.wipeSmartTransactions({
         address,
         ignoreNetwork: true,
       });
+      const { smartTransactions } =
+        smartTransactionsController.state.smartTransactionsState;
+      Object.keys(smartTransactions).forEach((chainId) => {
+        const chainIdHex: Hex = chainId as Hex;
+        expect(
+          smartTransactionsController.state.smartTransactionsState
+            .smartTransactions[chainIdHex],
+        ).not.toContainEqual({ txParams: { from: address } });
+      });
+    });
+
+    it('removes transactions only from the current chainId if ignoreNetwork is false', () => {
+      const address = '0x123';
+      smartTransactionsController.wipeSmartTransactions({
+        address,
+        ignoreNetwork: false,
+      });
       expect(
         smartTransactionsController.state.smartTransactionsState
           .smartTransactions[smartTransactionsController.config.chainId],
@@ -1435,20 +1452,44 @@
       );
     });
 
-    it('removes transactions from all supported chainIds if ignoreNetwork is false', () => {
+    it('removes transactions from the current chainId (even if it is not in supportedChainIds) if ignoreNetwork is false', () => {
       const address = '0x123';
+      smartTransactionsController.config.supportedChainIds = [ChainId.mainnet];
+      smartTransactionsController.config.chainId = ChainId.sepolia;
       smartTransactionsController.wipeSmartTransactions({
         address,
         ignoreNetwork: false,
       });
-      smartTransactionsController.config.supportedChainIds.forEach(
-        (chainId) => {
-          expect(
-            smartTransactionsController.state.smartTransactionsState
-              .smartTransactions[chainId],
-          ).not.toContainEqual({ txParams: { from: address } });
-        },
+      expect(
+        smartTransactionsController.state.smartTransactionsState
+          .smartTransactions[smartTransactionsController.config.chainId],
+      ).not.toContainEqual({ txParams: { from: address } });
+      expect(
+        smartTransactionsController.state.smartTransactionsState
+          .smartTransactions[ChainId.mainnet],
+      ).toContainEqual(
+        expect.objectContaining({
+          txParams: expect.objectContaining({ from: address }),
+        }),
       );
     });
+
+    it('removes transactions from all chains (even if they are not in supportedChainIds) if ignoreNetwork is true', () => {
+      const address = '0x123';
+      smartTransactionsController.config.supportedChainIds = [];
+      smartTransactionsController.wipeSmartTransactions({
+        address,
+        ignoreNetwork: true,
+      });
+      const { smartTransactions } =
+        smartTransactionsController.state.smartTransactionsState;
+      Object.keys(smartTransactions).forEach((chainId) => {
+        const chainIdHex: Hex = chainId as Hex;
+        expect(
+          smartTransactionsController.state.smartTransactionsState
+            .smartTransactions[chainIdHex],
+        ).not.toContainEqual({ txParams: { from: address } });
+      });
+    });
   });
 });

src/SmartTransactionsController.ts

@@ -215,9 +215,9 @@
       isSmartTransactionPending,
     );
     if (!this.timeoutHandle && pendingTransactions?.length > 0) {
       this.poll();
     } else if (this.timeoutHandle && pendingTransactions?.length === 0) {
       this.stop();
     }
   }
 
@@ -247,7 +247,7 @@
     }
     await safelyExecute(async () => this.updateSmartTransactions());
     this.timeoutHandle = setInterval(() => {
       safelyExecute(async () => this.updateSmartTransactions());
     }, this.config.interval);
   }
 
@@ -329,7 +329,7 @@
       ethQuery = new EthQuery(networkClient.provider);
     }
 
     this.#updateSmartTransaction(smartTransaction, {
       chainId,
       ethQuery,
     });
@@ -447,7 +447,7 @@
       .map((smartTransaction) => smartTransaction.uuid);
 
     if (transactionsToUpdate.length > 0) {
       this.fetchSmartTransactionsStatus(transactionsToUpdate, {
         networkClientId,
       });
     }
@@ -550,7 +550,7 @@
           category: MetaMetricsEventCategory.Transactions,
         });
 
         this.#updateSmartTransaction(
           {
             ...smartTransaction,
             confirmed: true,
@@ -594,7 +594,7 @@
         cancellable: isSmartTransactionCancellable(stxStatus),
         uuid,
       };
       this.#updateSmartTransaction(smartTransaction, { chainId, ethQuery });
     });
 
     return data;
@@ -608,7 +608,7 @@
     nonceLock.releaseLock();
     return {
       ...transaction,
       nonce: `0x${nonce.toString(16)}`,
     };
   }
 
@@ -898,11 +898,6 @@
     }
     const addressLowerCase = address.toLowerCase();
     if (ignoreNetwork) {
-      this.#wipeSmartTransactionsPerChainId({
-        chainId: this.config.chainId,
-        addressLowerCase,
-      });
-    } else {
       const { smartTransactions } = this.state.smartTransactionsState;
       Object.keys(smartTransactions).forEach((chainId) => {
         const chainIdHex: Hex = chainId as Hex;
@@ -911,6 +906,11 @@
           addressLowerCase,
         });
       });
+    } else {
+      this.#wipeSmartTransactionsPerChainId({
+        chainId: this.config.chainId,
+        addressLowerCase,
+      });
     }
   }