diff options
author | Esteban MIno <efmino@uc.cl> | 2018-07-26 08:02:12 +0800 |
---|---|---|
committer | Esteban MIno <efmino@uc.cl> | 2018-07-26 08:02:12 +0800 |
commit | c8d45cb4a8a671bad20cd5a5aa1bcbbd88463bdb (patch) | |
tree | 7d1e3d0fd7cbcc0b69ad50d3084ab7ebe7d68202 /ui | |
parent | 3667f3cb8556d55ad893ec8c1a0f84447273906f (diff) | |
download | tangerine-wallet-browser-c8d45cb4a8a671bad20cd5a5aa1bcbbd88463bdb.tar.gz tangerine-wallet-browser-c8d45cb4a8a671bad20cd5a5aa1bcbbd88463bdb.tar.zst tangerine-wallet-browser-c8d45cb4a8a671bad20cd5a5aa1bcbbd88463bdb.zip |
only show retry button on earliest pending tx
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/components/tx-list-item.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js index 0d693b805..92466568c 100644 --- a/ui/app/components/tx-list-item.js +++ b/ui/app/components/tx-list-item.js @@ -216,11 +216,17 @@ TxListItem.prototype.showRetryButton = function () { const currentNonce = txParams.nonce const currentNonceTxs = selectedAddressTxList.filter(tx => tx.txParams.nonce === currentNonce) const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted') + const currentSubmittedTxs = selectedAddressTxList.filter(tx => tx.status === 'submitted') const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[currentNonceSubmittedTxs.length - 1] const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce && lastSubmittedTxWithCurrentNonce.id === transactionId + const lastTx = currentSubmittedTxs.reduce((tx1, tx2) => { + if (tx1.id < tx2.id) return tx1 + return tx2 + }) + const currentTxIsLatest = lastTx.id === transactionId - return currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000 + return currentTxIsLatestWithNonce && Date.now() - transactionSubmittedTime > 30000 && currentTxIsLatest } TxListItem.prototype.setSelectedToken = function (tokenAddress) { |