Merge pull request #2379 from AmbireTech/fix/dapp-return-correct-tx-id

Return the correct txnId to the dapp in the case of a 4337 txnId replacement

Author: Oxbobby

src/controllers/activity/activity.ts

@@ -1416,7 +1416,7 @@ export class ActivityController extends EventEmitter implements IActivityControl
       if (counter >= 30) return activityAccountOp.txnId
 
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      await wait(1000)
+      await wait(2000)
       return this.getConfirmedTxId(submittedAccountOp, counter + 1)
     }
 

src/controllers/main/main.ts

@@ -1021,9 +1021,12 @@ export class MainController extends EventEmitter implements IMainController {
     const txnId = await this.activity.getConfirmedTxId(submittedAccountOp)
     dappHandlers.forEach((handler) => {
       if (txnId) {
-        // If the call has a txnId, resolve the promise with it.
-        // This could happen when an EOA account is broadcasting multiple transactions.
-        handler.promise.resolve({ hash: handler.txnId || txnId })
+        // for MultipleTxns, the correct txnId is passed to the handler;
+        // otherwise, use the confirmed txnId
+        const finalTxnId =
+          submittedAccountOp.identifiedBy.type === 'MultipleTxns' ? handler.txnId || txnId : txnId
+
+        handler.promise.resolve({ hash: finalTxnId })
       } else {
         handler.promise.reject(
           ethErrors.rpc.transactionRejected({
@@ -1750,7 +1753,13 @@ export class MainController extends EventEmitter implements IMainController {
       if (dappPromise.meta.isWalletSendCalls) {
         dappPromise.resolve({ hash: getDappIdentifier(submittedAccountOp) })
       } else {
-        dappHandlers.push({ promise: dappPromise, txnId: submittedAccountOp.txnId })
+        // if the submittedAccountOp identifier is MultipleTxns,
+        // the txnId for the dappPromise will be in the call itself
+        const submittedCall = submittedAccountOp.calls.find(
+          (call) => call.dappPromiseId === dappPromise.id
+        )
+
+        dappHandlers.push({ promise: dappPromise, txnId: submittedCall?.txnId })
       }
     })