diff options
| author | kumavis <aaron@kumavis.me> | 2018-07-04 03:42:14 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-07-04 03:42:14 +0800 |
| commit | 77daed5c74aa3c1fdbf1d9c71f544928f47f3993 (patch) | |
| tree | 4a614dbdfce84b452562dcabccffa53b8393e2b0 /old-ui/app/components/transaction-list-item.js | |
| parent | 2b2cd87e2d6e93dadb3ddd20ebf854ab6f2d2382 (diff) | |
| parent | e467eda4f720fa89141ded2e709566102402479b (diff) | |
| download | dexon-wallet-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.gz dexon-wallet-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.zst dexon-wallet-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.zip | |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
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 b9f82c66..e9280419 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 } |