Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx

Only show retry button on the earliest pending tx

1 files changed, 10 insertions, 1 deletions

diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js
index e9280419a..f479ce666 100644
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@@ -36,14 +36,23 @@ TransactionListItem.prototype.showRetryButton = function () {
     return false
   }
 
+  let currentTxIsLatest = false
   const currentNonce = txParams.nonce
   const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce)
   const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
+  const currentSubmittedTxs = transactions.filter(tx => tx.status === 'submitted')  
   const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0]
   const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
     lastSubmittedTxWithCurrentNonce.id === transaction.id
+  if (currentSubmittedTxs.length > 0) {
+    const lastTx = currentSubmittedTxs.reduce((tx1, tx2) => {
+      if (tx1.submittedTime < tx2.submittedTime) return tx1
+      return tx2
+    })
+    currentTxIsLatest = lastTx.id === transaction.id
+  }
 
-  return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000
+  return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000 && currentTxIsLatest
 }
 
 TransactionListItem.prototype.render = function () {