From a600ccd4f863d7a473392fc283f4cec248225a27 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 28 Feb 2017 16:36:05 -0800 Subject: Add reset button to reset gas fields. --- ui/app/components/pending-tx-details.js | 14 +++++++++++--- ui/app/components/pending-tx.js | 10 +++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'ui/app') diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js index 61e18c706..b1ab9576b 100644 --- a/ui/app/components/pending-tx-details.js +++ b/ui/app/components/pending-tx-details.js @@ -12,7 +12,6 @@ const addressSummary = util.addressSummary const nameForAddress = require('../../lib/contract-namer') const HexInput = require('./hex-as-decimal-input') - module.exports = PendingTxDetails inherits(PendingTxDetails, Component) @@ -35,8 +34,8 @@ PTXP.render = function () { const gas = state.gas || txParams.gas const gasPrice = state.gasPrice || txData.gasPrice - const gasDefault = gas - const gasPriceDefault = gasPrice + const gasDefault = txParams.gas + const gasPriceDefault = txData.gasPrice var txFee = state.txFee || txData.txFee || '' var maxCost = state.maxCost || txData.maxCost || '' @@ -301,6 +300,15 @@ PTXP.calculateGas = function () { } } +PTXP.resetGasFields = function () { + log.debug(`pending-tx-details#resetGasFields`) + const txData = this.props.txData + this.setState({ + gas: txData.txParams.gas, + gasPrice: txData.gasPrice, + }) +} + // After a customizable state value has been updated, PTXP.gatherParams = function () { log.debug(`pending-tx-details#gatherParams`) diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 3c898edec..d39cbc0f8 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const PendingTxDetails = require('./pending-tx-details') +const extend = require('xtend') module.exports = PendingTx @@ -12,6 +13,7 @@ function PendingTx () { PendingTx.prototype.render = function () { const props = this.props + const newProps = extend(props, {ref: 'details'}) const txData = props.txData return ( @@ -21,7 +23,7 @@ PendingTx.prototype.render = function () { }, [ // tx info - h(PendingTxDetails, props), + h(PendingTxDetails, newProps), h('style', ` .conf-buttons button { @@ -71,6 +73,12 @@ PendingTx.prototype.render = function () { h('button.cancel.btn-red', { onClick: props.cancelTransaction, }, 'Reject'), + + h('button', { + onClick: () => { + this.refs.details.resetGasFields() + }, + }, 'Reset'), ]), ]) ) -- cgit v1.2.3