diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-04 02:21:17 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-04 02:21:17 +0800 |
| commit | 595447ccac0c6d178d63850d45f0ad5456964e4f (patch) | |
| tree | 61b83e1ba63615351da8e4c2dc7b446353411c9d /old-ui/app/components/transaction-list-item.js | |
| parent | 11736e6318182ab5b43430410a46059e5f46ad52 (diff) | |
| parent | 2e9bd7e9d101287b4466475561df9131f0ef56a6 (diff) | |
| download | tangerine-wallet-browser-595447ccac0c6d178d63850d45f0ad5456964e4f.tar.gz tangerine-wallet-browser-595447ccac0c6d178d63850d45f0ad5456964e4f.tar.zst tangerine-wallet-browser-595447ccac0c6d178d63850d45f0ad5456964e4f.zip | |
Merge remote-tracking branch 'upstream/develop' into HEAD
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 } |