From 3a0d686b5aac834706c68aa60e4ecd7e6c03659e Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Tue, 15 Oct 2024 09:58:42 +0530
Subject: [PATCH] Fix nonce value when there are multiple transactions in
 parallal

---
 .../confirm-transaction-base.component.js                  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
index 31149997a39c..fc0b5933c2ff 100644
--- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js
@@ -216,6 +216,8 @@ export default class ConfirmTransactionBase extends Component {
       useMaxValue,
       hasPriorityApprovalRequest,
       mostRecentOverviewPage,
+      txData,
+      getNextNonce,
     } = this.props;
 
     const {
@@ -226,6 +228,7 @@ export default class ConfirmTransactionBase extends Component {
       isEthGasPriceFetched: prevIsEthGasPriceFetched,
       hexMaximumTransactionFee: prevHexMaximumTransactionFee,
       hasPriorityApprovalRequest: prevHasPriorityApprovalRequest,
+      txData: prevTxData,
     } = prevProps;
 
     const statusUpdated = transactionStatus !== prevTxStatus;
@@ -233,6 +236,10 @@ export default class ConfirmTransactionBase extends Component {
       transactionStatus === TransactionStatus.dropped ||
       transactionStatus === TransactionStatus.confirmed;
 
+    if (txData.id !== prevTxData.id) {
+      getNextNonce();
+    }
+
     if (
       nextNonce !== prevNextNonce ||
       customNonceValue !== prevCustomNonceValue