aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Miller <danjm.com@gmail.com>2018-08-01 02:32:29 +0800
committerDan Miller <danjm.com@gmail.com>2018-08-01 03:07:14 +0800
commit0ff0a9c1976d726cb18379e3ac06a8677c928659 (patch)
treed95ce311b00658e8db1a8982b8b0545d2696aa0c /ui
parent4f02726fd9a2b7509dfd00eb4b23d9fc81eb5dcd (diff)
downloadtangerine-wallet-browser-0ff0a9c1976d726cb18379e3ac06a8677c928659.tar
tangerine-wallet-browser-0ff0a9c1976d726cb18379e3ac06a8677c928659.tar.gz
tangerine-wallet-browser-0ff0a9c1976d726cb18379e3ac06a8677c928659.tar.bz2
tangerine-wallet-browser-0ff0a9c1976d726cb18379e3ac06a8677c928659.tar.lz
tangerine-wallet-browser-0ff0a9c1976d726cb18379e3ac06a8677c928659.tar.xz
tangerine-wallet-browser-0ff0a9c1976d726cb18379e3ac06a8677c928659.tar.zst
tangerine-wallet-browser-0ff0a9c1976d726cb18379e3ac06a8677c928659.zip
Show the retry button on latest tx of earliest nonce.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/tx-list-item.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js
index 1a639d0b9..7513ba267 100644
--- a/ui/app/components/tx-list-item.js
+++ b/ui/app/components/tx-list-item.js
@@ -213,7 +213,7 @@ TxListItem.prototype.showRetryButton = function () {
if (!txParams) {
return false
}
- let currentTxIsLatest = false
+ let currentTxSharesEarliestNonce = false
const currentNonce = txParams.nonce
const currentNonceTxs = selectedAddressTxList.filter(tx => tx.txParams.nonce === currentNonce)
const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
@@ -222,14 +222,14 @@ TxListItem.prototype.showRetryButton = function () {
const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
lastSubmittedTxWithCurrentNonce.id === transactionId
if (currentSubmittedTxs.length > 0) {
- const lastTx = currentSubmittedTxs.reduce((tx1, tx2) => {
+ const earliestSubmitted = currentSubmittedTxs.reduce((tx1, tx2) => {
if (tx1.submittedTime < tx2.submittedTime) return tx1
return tx2
})
- currentTxIsLatest = lastTx.id === transactionId
+ currentTxSharesEarliestNonce = currentNonce === earliestSubmitted.txParams.nonce
}
- return currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000 && currentTxIsLatest
+ return currentTxSharesEarliestNonce && currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000
}
TxListItem.prototype.setSelectedToken = function (tokenAddress) {