diff options
| author | Dan <danjm.com@gmail.com> | 2018-03-13 13:01:35 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-03-13 13:39:38 +0800 |
| commit | f805a2eb735ea2ae93e91df0d35c6856987fa734 (patch) | |
| tree | d65280662186a2e73bbe5473b24de75107c4de53 /ui/app/components/tx-list-item.js | |
| parent | c1ff927fa0e129a828d3345b21723300d5e73ef1 (diff) | |
| download | tangerine-wallet-browser-f805a2eb735ea2ae93e91df0d35c6856987fa734.tar.gz tangerine-wallet-browser-f805a2eb735ea2ae93e91df0d35c6856987fa734.tar.zst tangerine-wallet-browser-f805a2eb735ea2ae93e91df0d35c6856987fa734.zip | |
Fix gas calculation and nonce / forceGasMin state setting errors; retry button shows on correct tx.
Diffstat (limited to 'ui/app/components/tx-list-item.js')
| -rw-r--r-- | ui/app/components/tx-list-item.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js index 123f723be..f7d53709f 100644 --- a/ui/app/components/tx-list-item.js +++ b/ui/app/components/tx-list-item.js @@ -185,9 +185,11 @@ TxListItem.prototype.showRetryButton = function () { } = this.props const currentNonce = txParams.nonce const currentNonceTxs = selectedAddressTxList.filter(tx => tx.txParams.nonce === currentNonce) - const isLastWithNonce = currentNonceTxs[currentNonceTxs.length - 1].id === transactionId + const currentStatusNonceTx = currentNonceTxs.filter(tx => + tx.status !== 'rejected' && tx.status !== 'failed') + const isLastPassingWithNonce = currentStatusNonceTx[currentStatusNonceTx.length - 1].id === transactionId - return transactionStatus === 'submitted' && isLastWithNonce && Date.now() - transactionTime > 5000 + return transactionStatus === 'submitted' && isLastPassingWithNonce && Date.now() - transactionTime > 30000 } TxListItem.prototype.resubmit = function () { |