Fix gasPrice range

8 files changed, 37 insertions, 20 deletions

diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index ecc9bc5f7..cced32670 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -384,3 +384,15 @@ ConfigManager.prototype.createShapeShiftTx = function (depositAddress, depositTy
   }
   this.setData(data)
 }
+
+ConfigManager.prototype.getGasMultiplier = function () {
+  var data = this.getData()
+  return ('gasMultiplier' in data) && data.gasMultiplier
+}
+
+ConfigManager.prototype.setGasMultiplier = function (gasMultiplier) {
+  var data = this.getData()
+
+  data.gasMultiplier = gasMultiplier
+  this.setData(data)
+}
diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js
index 2a985265c..002f03047 100644
--- a/app/scripts/lib/id-management.js
+++ b/app/scripts/lib/id-management.js
@@ -26,10 +26,10 @@ function IdManagement (opts) {
 
   this.signTx = function (txParams) {
     //  calculate gas with custom gas multiplier
-    var gasMultiplier = txParams.gasMultiplier || 1
-    delete txParams.gasMultiplier
-    var gasPrice = parseFloat(new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16).toString()) * gasMultiplier
-    txParams.gasPrice = ethUtil.intToHex(parseInt(gasPrice))
+    var gasMultiplier = this.configManager.getGasMultiplier() || 1
+    var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16)
+    gasPrice = gasPrice.mul(new BN(gasMultiplier * 100)).div(new BN(100, 10))
+    txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
     // normalize values
 
     txParams.to = ethUtil.addHexPrefix(txParams.to)
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 6837a1e8d..aa77c3360 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -112,6 +112,8 @@ IdentityStore.prototype.getState = function () {
     currentFiat: configManager.getCurrentFiat(),
     conversionRate: configManager.getConversionRate(),
     conversionDate: configManager.getConversionDate(),
+    gasMultiplier: configManager.getGasMultiplier(),
+
   }))
 }
 
@@ -211,6 +213,7 @@ IdentityStore.prototype.exportAccount = function (address, cb) {
 // comes from dapp via zero-client hooked-wallet provider
 IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDoneCb, cb) {
   const configManager = this.configManager
+
   var self = this
   // create txData obj with parameters and meta data
   var time = (new Date()).getTime()
@@ -222,6 +225,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
     txParams: txParams,
     time: time,
     status: 'unconfirmed',
+    gasMultiplier: configManager.getGasMultiplier() || 1,
   }
 
   console.log('addUnconfirmedTransaction:', txData)
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 550531d6e..c0168903d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -55,6 +55,7 @@ module.exports = class MetamaskController {
       agreeToEthWarning: this.agreeToEthWarning.bind(this),
       setTOSHash: this.setTOSHash.bind(this),
       checkTOSChange: this.checkTOSChange.bind(this),
+      setGasMultiplier: this.setGasMultiplier.bind(this),
 
       // forward directly to idStore
       createNewVault: idStore.createNewVault.bind(idStore),
@@ -377,4 +378,8 @@ module.exports = class MetamaskController {
   createShapeShiftTx (depositAddress, depositType) {
     this.configManager.createShapeShiftTx(depositAddress, depositType)
   }
+
+  setGasMultiplier (gasMultiplier) {
+    this.configManager.setGasMultiplier(gasMultiplier)
+  }
 }
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 0cce9065e..9cacadc0d 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -277,10 +277,10 @@ function signMsg (msgData) {
 }
 
 function signTx (txData) {
+  _accountManager.setGasMultiplier(txData.gasMultiplier)
   return (dispatch) => {
     web3.eth.sendTransaction(txData, (err, data) => {
       dispatch(actions.hideLoadingIndication())
-
       if (err) return dispatch(actions.displayWarning(err.message))
       dispatch(actions.hideWarning())
       dispatch(actions.goHome())
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index 7fa3d6ddd..0f7e20613 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -29,10 +29,10 @@ PTXP.render = function () {
   var account = props.accounts[address]
   var balance = account ? account.balance : '0x0'
 
-  var gasMultiplier = txParams.gasMultiplier
+  var gasMultiplier = txData.gasMultiplier
   var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txData.estimatedGas), 16)
   var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16)
-  gasPrice = new BN(parseFloat(gasPrice.toString()) * gasMultiplier)
+  gasPrice = gasPrice.mul(new BN(gasMultiplier * 100)).div(new BN(100, 10))
   var txFee = gasCost.mul(gasPrice)
   var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16)
   var maxCost = txValue.add(txFee)
diff --git a/ui/app/components/range-slider.js b/ui/app/components/range-slider.js
index 6ca6e434e..cc1de1ce5 100644
--- a/ui/app/components/range-slider.js
+++ b/ui/app/components/range-slider.js
@@ -10,8 +10,9 @@ function RangeSlider () {
 }
 
 RangeSlider.prototype.render = function () {
+  const state = this.state || {}
   const props = this.props
-  const onChange = props.onChange || function () {}
+  const onInput = props.onInput || function () {}
   const name = props.name
   const {
     min = 0,
@@ -33,8 +34,8 @@ RangeSlider.prototype.render = function () {
         max: max,
         step: increment,
         style: range,
-        defaultValue: defaultValue,
-        onChange: mirrorInput ? this.mirrorInputs.bind(this, name) : onChange,
+        value: state.value || defaultValue,
+        onChange: mirrorInput ? this.mirrorInputs.bind(this, name) : onInput,
       }),
 
       // Mirrored input for range
@@ -43,7 +44,7 @@ RangeSlider.prototype.render = function () {
         name: `${name}Mirror`,
         min: min,
         max: max,
-        defaultValue: defaultValue,
+        value: state.value || defaultValue,
         step: increment,
         style: input,
         onChange: this.mirrorInputs.bind(this, `${name}Mirror`),
@@ -52,12 +53,6 @@ RangeSlider.prototype.render = function () {
   )
 }
 
-RangeSlider.prototype.mirrorInputs = function (active) {
-  var range = document.querySelector(`input[name="${this.props.name}"]`)
-  var inputMirror = document.querySelector(`input[name="${this.props.name}Mirror"]`)
-  if (active === this.props.name) {
-    inputMirror.value = range.value
-  } else {
-    range.value = inputMirror.value
-  }
+RangeSlider.prototype.mirrorInputs = function (active, event) {
+  this.setState({value: event.target.value})
 }
diff --git a/ui/app/send.js b/ui/app/send.js
index d10c658e3..01c9314ce 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -319,10 +319,11 @@ SendTransactionScreen.prototype.onSubmit = function (gasPrice) {
   var txParams = {
     from: this.props.address,
     value: '0x' + value.toString(16),
+    gasMultiplier: gasMultiplier * 0.01,
   }
 
   if (recipient) txParams.to = ethUtil.addHexPrefix(recipient)
   if (txData) txParams.data = txData
-  txParams.gasMultiplier = gasMultiplier * 0.01
+
   this.props.dispatch(actions.signTx(txParams))
 }