aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui/app/components
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-04-03 05:13:45 +0800
committerkumavis <aaron@kumavis.me>2018-04-03 05:13:45 +0800
commit98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb (patch)
tree23176562ed22c97daa13f4f8f1081b581f2ba2b1 /old-ui/app/components
parent8db097d8d9307bc7a0bbb0cd802ad30ad0fc2740 (diff)
parentfd30fabfbd7707adf2e4bc3606362c1687aeed9a (diff)
downloaddexon-wallet-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.tar.gz
dexon-wallet-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.tar.zst
dexon-wallet-98e0fc1ab95c17b9ea19eed04b1e60dc9ea9dccb.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens
Diffstat (limited to 'old-ui/app/components')
-rw-r--r--old-ui/app/components/transaction-list-item.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js
index 7ab3414e..f7d59005 100644
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@@ -31,6 +31,11 @@ function TransactionListItem () {
TransactionListItem.prototype.showRetryButton = function () {
const { transaction = {}, transactions } = this.props
const { status, submittedTime, txParams } = transaction
+
+ if (!txParams) {
+ return false
+ }
+
const currentNonce = txParams.nonce
const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce)
const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')