Remove nonce early

Author: matthewwalsh0

packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts

@@ -190,12 +190,12 @@ describe('Relay Submit Utils', () => {
         expect.any(Function),
       );
 
-      const updateFn = updateTransactionMock.mock.calls[1][1];
       const txDraft = { txParams: { nonce: '0x1' } } as TransactionMeta;
-      updateFn(txDraft);
+      updateTransactionMock.mock.calls.map((call) => call[1](txDraft));
 
       expect(txDraft).toStrictEqual({
         isIntentComplete: true,
+        requiredTransactionIds: [TRANSACTION_META_MOCK.id],
         txParams: {
           nonce: undefined,
         },

packages/transaction-pay-controller/src/strategy/relay/relay-submit.ts

@@ -91,6 +91,19 @@ async function executeSingleQuote(
     networkClientId,
   });
 
+  if (quote.skipTransaction) {
+    updateTransaction(
+      {
+        transactionId: transaction.id,
+        messenger,
+        note: 'Remove nonce from skipped transaction',
+      },
+      (tx) => {
+        tx.txParams.nonce = undefined;
+      },
+    );
+  }
+
   const result = await messenger.call(
     'TransactionController:addTransaction',
     normalizedParams,
@@ -143,7 +156,6 @@ async function executeSingleQuote(
       },
       (tx) => {
         tx.isIntentComplete = true;
-        tx.txParams.nonce = undefined;
       },
     );
   }