Update the "doesTransactionNeedConfirmation" fn, add additional tests (#307)

Author: dan437

src/SmartTransactionsController.test.ts

@@ -925,6 +925,106 @@ describe('SmartTransactionsController', () => {
       ]);
     });
 
+    it('confirms a smart transaction that was not found in the list of regular transactions', async () => {
+      const { smartTransactionsState } = smartTransactionsController.state;
+      const pendingStx = {
+        ...createStateAfterPending()[0],
+        history: testHistory,
+      };
+
+      jest
+        .spyOn(smartTransactionsController, 'getRegularTransactions')
+        .mockImplementation(() => {
+          return [];
+        });
+      smartTransactionsController.update({
+        smartTransactionsState: {
+          ...smartTransactionsState,
+          smartTransactions: {
+            [CHAIN_IDS.ETHEREUM]: [pendingStx] as SmartTransaction[],
+          },
+        },
+      });
+      const updateTransaction = {
+        ...pendingStx,
+        statusMetadata: {
+          ...pendingStx.statusMetadata,
+          minedHash: txHash,
+        },
+        status: SmartTransactionStatuses.SUCCESS,
+      };
+
+      smartTransactionsController.updateSmartTransaction(
+        updateTransaction as SmartTransaction,
+        {
+          networkClientId: 'mainnet',
+        },
+      );
+      await flushPromises();
+      expect(
+        smartTransactionsController.confirmExternalTransaction,
+      ).toHaveBeenCalledTimes(1);
+      expect(
+        smartTransactionsController.state.smartTransactionsState
+          .smartTransactions[CHAIN_IDS.ETHEREUM],
+      ).toStrictEqual([
+        {
+          ...updateTransaction,
+          confirmed: true,
+        },
+      ]);
+    });
+
+    it('confirms a smart transaction that does not have a minedHash', async () => {
+      const { smartTransactionsState } = smartTransactionsController.state;
+      const pendingStx = {
+        ...createStateAfterPending()[0],
+        history: testHistory,
+      };
+
+      jest
+        .spyOn(smartTransactionsController, 'getRegularTransactions')
+        .mockImplementation(() => {
+          return [createTransactionMeta(TransactionStatus.confirmed)];
+        });
+      smartTransactionsController.update({
+        smartTransactionsState: {
+          ...smartTransactionsState,
+          smartTransactions: {
+            [CHAIN_IDS.ETHEREUM]: [pendingStx] as SmartTransaction[],
+          },
+        },
+      });
+      const updateTransaction = {
+        ...pendingStx,
+        statusMetadata: {
+          ...pendingStx.statusMetadata,
+          minedHash: '',
+        },
+        status: SmartTransactionStatuses.SUCCESS,
+      };
+
+      smartTransactionsController.updateSmartTransaction(
+        updateTransaction as SmartTransaction,
+        {
+          networkClientId: 'mainnet',
+        },
+      );
+      await flushPromises();
+      expect(
+        smartTransactionsController.confirmExternalTransaction,
+      ).toHaveBeenCalledTimes(1);
+      expect(
+        smartTransactionsController.state.smartTransactionsState
+          .smartTransactions[CHAIN_IDS.ETHEREUM],
+      ).toStrictEqual([
+        {
+          ...updateTransaction,
+          confirmed: true,
+        },
+      ]);
+    });
+
     it('does not call the "confirmExternalTransaction" fn if a tx is already confirmed', async () => {
       const { smartTransactionsState } = smartTransactionsController.state;
       const pendingStx = {

src/SmartTransactionsController.ts

@@ -457,22 +457,16 @@ export default class SmartTransactionsController extends StaticIntervalPollingCo
     }
   }
 
-  #doesTransactionNeedConfirmation(
-    smartTransaction: SmartTransaction,
-  ): boolean {
-    const smartTransactionMinedTxHash =
-      smartTransaction.statusMetadata?.minedHash;
-    if (!smartTransactionMinedTxHash) {
-      return false;
+  #doesTransactionNeedConfirmation(txHash: string | undefined): boolean {
+    if (!txHash) {
+      return true;
     }
     const transactions = this.getRegularTransactions();
     const foundTransaction = transactions?.find((tx) => {
-      return (
-        tx.hash?.toLowerCase() === smartTransactionMinedTxHash.toLowerCase()
-      );
+      return tx.hash?.toLowerCase() === txHash.toLowerCase();
     });
     if (!foundTransaction) {
-      return false;
+      return true;
     }
     // If a found transaction is either confirmed or submitted, it doesn't need confirmation from the STX controller.
     // When it's in the submitted state, the TransactionController checks its status and confirms it,
@@ -547,7 +541,7 @@ export default class SmartTransactionsController extends StaticIntervalPollingCo
               }
             : originalTxMeta;
 
-        if (this.#doesTransactionNeedConfirmation(smartTransaction)) {
+        if (this.#doesTransactionNeedConfirmation(txHash)) {
           this.confirmExternalTransaction(
             txMeta,
             transactionReceipt,