m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #2587 from danjm/MM-281-currencyinput-in-gas-estimator

Browse Source 
[NewUI] Use currency input component in gas customizer
This commit is contained in:
Daniel Tsui 2017-11-15 13:30:34 -06:00 committed by GitHub
commit f8d38f44c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/components/customize-gas-modal/index.js
View File

@ -117,7 +117,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
let error = null let error = null
const balanceIsSufficient = isBalanceSufficient({ const balanceIsSufficient = isBalanceSufficient({
amount, amount: selectedToken ? '0' : amount,
gasTotal, gasTotal,
balance, balance,
selectedToken, selectedToken,

11
ui/app/components/input-number.js
View File

@ -1,6 +1,7 @@
const Component = require('react').Component const Component = require('react').Component
const h = require('react-hyperscript') const h = require('react-hyperscript')
const inherits = require('util').inherits const inherits = require('util').inherits
const CurrencyInput = require('./currency-input')
const { const {
addCurrencies, addCurrencies,
conversionGTE, conversionGTE,
@ -50,11 +51,13 @@ InputNumber.prototype.render = function () {
const { unitLabel, step = 1, placeholder, value = 0 } = this.props const { unitLabel, step = 1, placeholder, value = 0 } = this.props
return h('div.customize-gas-input-wrapper', {}, [ return h('div.customize-gas-input-wrapper', {}, [
h('input.customize-gas-input', { h(CurrencyInput, {
placeholder, className: 'customize-gas-input',
value, value,
step, placeholder,
onChange: (e) => this.setValue(e.target.value), onInputChange: newValue => {
this.setValue(newValue)
},
}), }),
h('span.gas-tooltip-input-detail', {}, [unitLabel]), h('span.gas-tooltip-input-detail', {}, [unitLabel]),
h('div.gas-tooltip-input-arrows', {}, [ h('div.gas-tooltip-input-arrows', {}, [