aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui/app/components/transaction-list-item.js
diff options
context:
space:
mode:
authorАнна <anna@MacBook-Air-Anna.local>2018-07-05 11:15:28 +0800
committerАнна <anna@MacBook-Air-Anna.local>2018-07-05 11:15:28 +0800
commit90934bca46cf990554cbf9be9e302ab5e2fc8041 (patch)
treeee68fa3d98e8c0e072980fd07397b3a9bd40d640 /old-ui/app/components/transaction-list-item.js
parent1f6bf0a80d43252d7b84e8e0247a524b77569810 (diff)
parentfd218142acb6dab0b2f921b9729f17ff90cffc2d (diff)
downloadtangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.gz
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.bz2
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.lz
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.xz
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.tar.zst
tangerine-wallet-browser-90934bca46cf990554cbf9be9e302ab5e2fc8041.zip
Merge branch 'develop' into to-autocomplete
Diffstat (limited to 'old-ui/app/components/transaction-list-item.js')
-rw-r--r--old-ui/app/components/transaction-list-item.js4
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
}