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

Some progress

Browse Source
This commit is contained in:
Dan Finlay 2017-03-22 10:35:02 -07:00
parent 0c82c520fe
commit 9f1f0bff1e
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/app/components/hex-as-decimal-input.js
View File

@ -23,7 +23,7 @@ function HexAsDecimalInput () {
HexAsDecimalInput.prototype.render = function () { HexAsDecimalInput.prototype.render = function () {
const props = this.props const props = this.props
const { value, onChange } = props const { value, onChange, min } = props
const toEth = props.toEth const toEth = props.toEth
const suffix = props.suffix const suffix = props.suffix
const decimalValue = decimalize(value, toEth) const decimalValue = decimalize(value, toEth)
@ -38,8 +38,9 @@ HexAsDecimalInput.prototype.render = function () {
textRendering: 'geometricPrecision', textRendering: 'geometricPrecision',
}, },
}, [ }, [
h('input.ether-balance.ether-balance-amount', { h('input.hex-input', {
type: 'number', type: 'number',
min,
style: extend({ style: extend({
display: 'block', display: 'block',
textAlign: 'right', textAlign: 'right',

18
ui/app/components/pending-tx-details.js
View File

@ -12,6 +12,10 @@ const addressSummary = util.addressSummary
const nameForAddress = require('../../lib/contract-namer') const nameForAddress = require('../../lib/contract-namer')
const HexInput = require('./hex-as-decimal-input') const HexInput = require('./hex-as-decimal-input')
const DEFAULT_GAS_PRICE = '0x4a817c800'
const DEFAULT_GAS_PRICE_BN = new BN(DEFAULT_GAS_PRICE.substr(2), 16)
const FOUR_BN = new BN('4', 10)
module.exports = PendingTxDetails module.exports = PendingTxDetails
inherits(PendingTxDetails, Component) inherits(PendingTxDetails, Component)
@ -78,7 +82,6 @@ PTXP.render = function () {
labelColor: '#F7861C', labelColor: '#F7861C',
}), }),
]), ]),
]), ]),
forwardCarrat(), forwardCarrat(),
@ -122,6 +125,7 @@ PTXP.render = function () {
}, [ }, [
h(HexInput, { h(HexInput, {
value: gas, value: gas,
min: 21000, // The hard lower limit for gas.
suffix: 'UNITS', suffix: 'UNITS',
style: { style: {
position: 'relative', position: 'relative',
@ -143,6 +147,7 @@ PTXP.render = function () {
h(HexInput, { h(HexInput, {
value: gasPrice, value: gasPrice,
suffix: 'WEI', suffix: 'WEI',
min: DEFAULT_GAS_PRICE_BN.div(FOUR_BN).toString(10),
style: { style: {
position: 'relative', position: 'relative',
top: '5px', top: '5px',
@ -176,7 +181,8 @@ PTXP.render = function () {
}, },
}, [ }, [
h(EthBalance, { h(EthBalance, {
value: maxCost.toString(16), value: '0x' + txFee.add(new BN(txParams.value, 16)).toString(16),
maxCost.toString(16),
inline: true, inline: true,
labelColor: 'black', labelColor: 'black',
fontSize: '16px', fontSize: '16px',
@ -267,7 +273,7 @@ PTXP.calculateGas = function () {
var txParams = txMeta.txParams var txParams = txMeta.txParams
var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txMeta.estimatedGas), 16) var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txMeta.estimatedGas), 16)
var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16) var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || DEFAULT_GAS_PRICE), 16)
var txFee = gasCost.mul(gasPrice) var txFee = gasCost.mul(gasPrice)
var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16) var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16)
var maxCost = txValue.add(txFee) var maxCost = txValue.add(txFee)
@ -280,10 +286,12 @@ PTXP.calculateGas = function () {
txMeta.maxCost = maxCostHex txMeta.maxCost = maxCostHex
txMeta.txParams.gasPrice = gasPriceHex txMeta.txParams.gasPrice = gasPriceHex
this.setState({ const newState = {
txFee: '0x' + txFee.toString('hex'), txFee: '0x' + txFee.toString('hex'),
maxCost: '0x' + maxCost.toString('hex'), maxCost: '0x' + maxCost.toString('hex'),
}) }
log.info(`tx form updating local state with ${JSON.stringify(newState)}`)
this.setState(newState)
if (this.props.onTxChange) { if (this.props.onTxChange) {
this.props.onTxChange(txMeta) this.props.onTxChange(txMeta)