From 57ead4914f6f9fd1fe47b865559e4908a36f6a8a Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Fri, 8 Feb 2019 10:20:25 -0330
Subject: Fix inline advanced gas editing

---
 .../advanced-gas-inputs.container.js               | 28 +++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'ui/app/components/gas-customization/advanced-gas-inputs')

diff --git a/ui/app/components/gas-customization/advanced-gas-inputs/advanced-gas-inputs.container.js b/ui/app/components/gas-customization/advanced-gas-inputs/advanced-gas-inputs.container.js
index 883d11c6d..a71d37b43 100644
--- a/ui/app/components/gas-customization/advanced-gas-inputs/advanced-gas-inputs.container.js
+++ b/ui/app/components/gas-customization/advanced-gas-inputs/advanced-gas-inputs.container.js
@@ -1,7 +1,20 @@
 import { connect } from 'react-redux'
 import { showModal } from '../../../actions'
+import {
+  decGWEIToHexWEI,
+  decimalToHex,
+  hexWEIToDecGWEI,
+} from '../../../helpers/conversions.util'
 import AdvancedGasInputs from './advanced-gas-inputs.component'
 
+function convertGasPriceForInputs (gasPriceInHexWEI) {
+  return Number(hexWEIToDecGWEI(gasPriceInHexWEI))
+}
+
+function convertGasLimitForInputs (gasLimitInHexWEI) {
+  return parseInt(gasLimitInHexWEI, 16)
+}
+
 const mapDispatchToProps = dispatch => {
   return {
     showGasPriceInfoModal: modalName => dispatch(showModal({ name: 'GAS_PRICE_INFO_MODAL' })),
@@ -9,4 +22,17 @@ const mapDispatchToProps = dispatch => {
   }
 }
 
-export default connect(null, mapDispatchToProps)(AdvancedGasInputs)
+const mergeProps = (stateProps, dispatchProps, ownProps) => {
+  const {customGasPrice, customGasLimit, updateCustomGasPrice, updateCustomGasLimit} = ownProps
+  return {
+    ...stateProps,
+    ...dispatchProps,
+    ...ownProps,
+    customGasPrice: convertGasPriceForInputs(customGasPrice),
+    customGasLimit: convertGasLimitForInputs(customGasLimit),
+    updateCustomGasPrice: (price) => updateCustomGasPrice(decGWEIToHexWEI(price)),
+    updateCustomGasLimit: (limit) => updateCustomGasLimit(decimalToHex(limit)),
+  }
+}
+
+export default connect(null, mapDispatchToProps, mergeProps)(AdvancedGasInputs)
-- 
cgit