Merge tag 'v4.5.5'

# Conflicts:
#	app/_locales/ja/messages.json
#	package-lock.json

messages.jsonのローカライズ

5 files changed, 11 insertions, 8 deletions

diff --git a/old-ui/app/components/buy-button-subview.js b/old-ui/app/components/buy-button-subview.js
index 843627c33..56d173839 100644
--- a/old-ui/app/components/buy-button-subview.js
+++ b/old-ui/app/components/buy-button-subview.js
@@ -247,7 +247,6 @@ BuyButtonSubview.prototype.backButtonContext = function () {
   if (this.props.context === 'confTx') {
     this.props.dispatch(actions.showConfTxPage(false))
   } else {
-    console.log(`actions.goHome`, actions.goHome);
     this.props.dispatch(actions.goHome())
   }
 }
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/qr-code.js b/old-ui/app/components/qr-code.js
index fa38dcd92..06b9aed9b 100644
--- a/old-ui/app/components/qr-code.js
+++ b/old-ui/app/components/qr-code.js
@@ -25,7 +25,6 @@ function QrCodeView () {
 QrCodeView.prototype.render = function () {
   const props = this.props
   const Qr = props.Qr
-  console.log(`QrCodeView Qr`, Qr);
   const address = `${isHexPrefixed(Qr.data) ? 'ethereum:' : ''}${Qr.data}`
   const qrImage = qrCode(4, 'M')
   qrImage.addData(address)
diff --git a/old-ui/app/components/range-slider.js b/old-ui/app/components/range-slider.js
index 823f5eb01..bae740a74 100644
--- a/old-ui/app/components/range-slider.js
+++ b/old-ui/app/components/range-slider.js
@@ -35,7 +35,7 @@ RangeSlider.prototype.render = function () {
         step: increment,
         style: range,
         value: state.value || defaultValue,
-        onChange: mirrorInput ? this.mirrorInputs.bind(this, event) : onInput,
+        onChange: mirrorInput ? this.mirrorInputs.bind(this) : onInput,
       }),
 
       // Mirrored input for range
@@ -47,7 +47,7 @@ RangeSlider.prototype.render = function () {
         value: state.value || defaultValue,
         step: increment,
         style: input,
-        onChange: this.mirrorInputs.bind(this, event),
+        onChange: this.mirrorInputs.bind(this),
       }) : null,
     ])
   )
diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js
index 7ab3414e5..b9f82c668 100644
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@@ -30,7 +30,12 @@ function TransactionListItem () {
 
 TransactionListItem.prototype.showRetryButton = function () {
   const { transaction = {}, transactions } = this.props
-  const { status, submittedTime, txParams } = transaction
+  const { 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')