diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-08-08 14:32:35 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-08-08 14:32:35 +0800 |
commit | 2e0916d8ff17c89147005d22e8c100113aaf3360 (patch) | |
tree | c65e20274296658c753e40619eb5cfe0062dc12d /old-ui/app/components/transaction-list-item.js | |
parent | ef9435e3d0036af1358bb2a5faec5ce69ef159e7 (diff) | |
parent | aab6e366c5162a85ae7853f5da29321f3d767cf4 (diff) | |
download | tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.gz tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.tar.zst tangerine-wallet-browser-2e0916d8ff17c89147005d22e8c100113aaf3360.zip |
fix merge conflicts
Diffstat (limited to 'old-ui/app/components/transaction-list-item.js')
-rw-r--r-- | old-ui/app/components/transaction-list-item.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index b493d0f0d..6ecf7d193 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -36,7 +36,7 @@ TransactionListItem.prototype.showRetryButton = function () { return false } - let currentTxIsLatest = false + let currentTxSharesEarliestNonce = false const currentNonce = txParams.nonce const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce) const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted') @@ -45,14 +45,14 @@ TransactionListItem.prototype.showRetryButton = function () { const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce && lastSubmittedTxWithCurrentNonce.id === transaction.id 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 === transaction.id + currentTxSharesEarliestNonce = currentNonce === earliestSubmitted.txParams.nonce } - return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000 && currentTxIsLatest + return currentTxSharesEarliestNonce && currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000 } TransactionListItem.prototype.render = function () { |