diff options
author | Thomas <thomas.b.huang@gmail.com> | 2018-07-11 02:34:00 +0800 |
---|---|---|
committer | Thomas <thomas.b.huang@gmail.com> | 2018-07-11 02:34:00 +0800 |
commit | 5188b727d43e91087449818dee69942c382b6d89 (patch) | |
tree | 4a89be50f09d24bc7e6ed3daf83b660f5e87380e /old-ui/app/components/transaction-list-item.js | |
parent | dd18684a5d682f48528f278284619983f13bf82f (diff) | |
parent | f6de948e42ae633d40aef72595a01caa622a280d (diff) | |
download | tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.tar.gz tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.tar.zst tangerine-wallet-browser-5188b727d43e91087449818dee69942c382b6d89.zip |
Merge branch 'develop' into removeNonceTrackerFunction
Diffstat (limited to 'old-ui/app/components/transaction-list-item.js')
-rw-r--r-- | old-ui/app/components/transaction-list-item.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index b9f82c668..e9280419a 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -40,8 +40,8 @@ TransactionListItem.prototype.showRetryButton = function () { const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce) const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted') const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0] - const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce - && lastSubmittedTxWithCurrentNonce.id === transaction.id + const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce && + lastSubmittedTxWithCurrentNonce.id === transaction.id return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000 } |