From 21b6a3442d8cae8c95a3d7e0b9e216d91bc8bd19 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 28 Mar 2018 10:51:16 -0230 Subject: Fix display of unapprovedMessages in txList (old and new ui); includes fix of undefined txParams. --- old-ui/app/components/transaction-list-item.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'old-ui/app/components') diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index 7ab3414e5..f7d59005a 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') -- cgit v1.2.3 From 4d2d3d443076e4b399c5e9266c62e3f09218d069 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 29 Mar 2018 12:28:50 -0700 Subject: Increase permitted safe gas limit Block gas limits have been incredibly stable lately: https://etherscan.io/chart/gaslimit And this validation has prevented Aragon's new beta from working: https://twitter.com/izqui9/status/979373309312815104 Fixes #3790 --- old-ui/app/components/pending-tx.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'old-ui/app/components') diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js index 720df2243..7f63d9fdf 100644 --- a/old-ui/app/components/pending-tx.js +++ b/old-ui/app/components/pending-tx.js @@ -62,8 +62,8 @@ PendingTx.prototype.render = function () { const gasBn = hexToBn(gas) // default to 8MM gas limit const gasLimit = new BN(parseInt(blockGasLimit) || '8000000') - const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20) - const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20) + const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 99, 100) + const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 98, 100) const safeGasLimit = safeGasLimitBN.toString(10) // Gas Price @@ -311,7 +311,7 @@ PendingTx.prototype.render = function () { style: { fontSize: '0.9em', }, - }, 'Gas limit set dangerously high. Approving this transaction is likely to fail.') + }, 'Gas limit set dangerously high. Approving this transaction is liable to fail.') : null, ]), -- cgit v1.2.3