Merge pull request #623 from poanetwork/gasPrice-custom-preventInvali…

…d-#573 (Fix) Gas price custom prevent invalid
poanetwork · Feb 26, 2018 · 4198f36 · 4198f36
2 parents 25ac38e + 2d53de2
commit 4198f36
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/src/components/Common/InputField.js b/src/components/Common/InputField.js
@@ -23,6 +23,7 @@ export const InputField = props => {
         className="input"
         onBlur={props.onBlur}
         value={props.value}
+        style={props.style}
         onChange={props.onChange}
         onKeyPress={props.onKeyPress}
         onPaste={props.onPaste}

diff --git a/src/components/Common/NumericInput.js b/src/components/Common/NumericInput.js
@@ -79,6 +79,7 @@ export class NumericInput extends Component {
         pristine={this.state.pristine}
         value={this.state.value}
         title={this.props.title}
+        style={this.props.style}
         onKeyPress={e => this.onKeyPress(e)}
         onChange={e => this.onChange(e)}
         onPaste={e => this.onPaste(e)}

diff --git a/src/components/Common/__snapshots__/NumericInput.spec.js.snap b/src/components/Common/__snapshots__/NumericInput.spec.js.snap
@@ -16,6 +16,7 @@ exports[`NumericInput Should render the component 1`] = `
     onChange={[Function]}
     onKeyPress={[Function]}
     onPaste={[Function]}
+    style={undefined}
     type="number"
     value=""
   />

diff --git a/src/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap b/src/components/Common/__snapshots__/ReservedTokensInputBlock.spec.js.snap
@@ -25,6 +25,7 @@ exports[`ReservedTokensInputBlock Should render the component 1`] = `
           onChange={[Function]}
           onKeyPress={undefined}
           onPaste={undefined}
+          style={undefined}
           type="text"
           value=""
         />
@@ -97,6 +98,7 @@ exports[`ReservedTokensInputBlock Should render the component 1`] = `
           onChange={[Function]}
           onKeyPress={undefined}
           onPaste={undefined}
+          style={undefined}
           type="number"
           value=""
         />

diff --git a/src/components/stepThree/index.js b/src/components/stepThree/index.js
@@ -217,6 +217,10 @@ export class stepThree extends React.Component {
     }
   }
 
+  updateGasPrice = value => {
+    this.props.generalStore.setGasPrice(gweiToWei(value))
+  }
+
   renderGasPriceInput() {
     const { generalStore, gasPriceStore } = this.props
 
@@ -274,12 +278,14 @@ export class stepThree extends React.Component {
 
         {
           this.state.gasPriceSelected === gasPriceStore.custom.id ?
-            <input
-              className="input"
+            <NumericInput
               style={{ display: 'inline-block' }}
-              type="number"
+              min={0.1}
+              maxDecimals={9}
+              acceptFloat={true}
               value={weiToGwei(generalStore.gasPrice)}
-              onChange={(e) => generalStore.setGasPrice(gweiToWei(e.target.value))}
+              errorMessage="Gas Price must be greater than 0.1 with up to 9 decimals"
+              onValueUpdate={this.updateGasPrice}
             /> :
             null
         }