Merge branch 'master' into i18n-helper

3 files changed, 9 insertions, 4 deletions

diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index c79ac633a..e9ab185f3 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -171,7 +171,7 @@ App.prototype.renderAppBar = function () {
           h('img', {
             height: 24,
             width: 24,
-            src: '/images/icon-128.png',
+            src: './images/icon-128.png',
           }),
 
           h(NetworkIndicator, {
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,
         ]),
 
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')