Force gas min has correct precision and is set when editing gas if max.

3 files changed, 8 insertions, 7 deletions

diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js
index 291447bb4..d8384c19d 100644
--- a/ui/app/components/customize-gas-modal/index.js
+++ b/ui/app/components/customize-gas-modal/index.js
@@ -233,6 +233,7 @@ CustomizeGasModal.prototype.render = function () {
 
   convertedGasPrice += convertedGasPrice.match(/[.]/) ? priceSigZeros : `${priceSigDec}${priceSigZeros}`
 
+  let newGasPrice = gasPrice
   if (forceGasMin) {
     const convertedMinPrice = conversionUtil(forceGasMin, {
       fromNumericBase: 'hex',
@@ -242,6 +243,10 @@ CustomizeGasModal.prototype.render = function () {
       { value: convertedMinPrice, fromNumericBase: 'dec' },
       { value: convertedGasPrice, fromNumericBase: 'dec' }
     )
+    newGasPrice = conversionMax(
+      { value: gasPrice, fromNumericBase: 'hex' },
+      { value: forceGasMin, fromNumericBase: 'hex' }
+    )
   }
 
   const convertedGasLimit = conversionUtil(gasLimit, {
@@ -302,7 +307,7 @@ CustomizeGasModal.prototype.render = function () {
           }, [t('cancel')]),
 
           h(`div.send-v2__customize-gas__save${error ? '__error' : ''}.allcaps`, {
-            onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal),
+            onClick: () => !error && this.save(newGasPrice, gasLimit, gasTotal),
           }, [t('save')]),
         ]),
 
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index 928149ccd..dca39f0a5 100644
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@@ -68,13 +68,11 @@ function mapDispatchToProps (dispatch) {
 
       let forceGasMin
       if (lastGasPrice) {
-        const stripped = ethUtil.stripHexPrefix(lastGasPrice)
-        forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(stripped, 1.1, {
+        forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
           multiplicandBase: 16,
           multiplierBase: 10,
           toNumericBase: 'hex',
           fromDenomination: 'WEI',
-          toDenomination: 'GWEI',
         }))
       }
 
diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js
index fe323ffd3..6035dd801 100644
--- a/ui/app/components/pending-tx/confirm-send-token.js
+++ b/ui/app/components/pending-tx/confirm-send-token.js
@@ -104,13 +104,11 @@ function mapDispatchToProps (dispatch, ownProps) {
     
       let forceGasMin
       if (lastGasPrice) {
-        const stripped = ethUtil.stripHexPrefix(lastGasPrice)
-        forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(stripped, 1.1, {
+        forceGasMin = ethUtil.addHexPrefix(multiplyCurrencies(lastGasPrice, 1.1, {
           multiplicandBase: 16,
           multiplierBase: 10,
           toNumericBase: 'hex',
           fromDenomination: 'WEI',
-          toDenomination: 'GWEI',
         }))
       }