feature/default_network_editable
Dan Finlay 8 years ago
parent 57fec36a7d
commit c4e9354575
  1. 13
      ui/app/components/pending-tx-details.js
  2. 5
      ui/app/components/pending-tx.js

@ -26,7 +26,6 @@ PTXP.render = function () {
var props = this.props var props = this.props
var state = this.state || {} var state = this.state || {}
var txData = state.txMeta || props.txData var txData = state.txMeta || props.txData
var state = this.state || {}
var txParams = txData.txParams || {} var txParams = txData.txParams || {}
var address = txParams.from || props.selectedAddress var address = txParams.from || props.selectedAddress
@ -155,7 +154,7 @@ PTXP.render = function () {
this.setState({ gas: newHex }) this.setState({ gas: newHex })
}, },
}), }),
]) ]),
]), ]),
h('.cell.row', { h('.cell.row', {
@ -170,7 +169,7 @@ PTXP.render = function () {
this.setState({ gasPrice: newHex }) this.setState({ gasPrice: newHex })
}, },
}), }),
]) ]),
]), ]),
h('.cell.row', { h('.cell.row', {
style: { style: {
@ -275,11 +274,11 @@ PTXP.gatherParams = function () {
PTXP.calculateGas = function () { PTXP.calculateGas = function () {
const txMeta = this.gatherParams() const txMeta = this.gatherParams()
log.debug(`pending-tx-details calculating gas for ${ JSON.stringify(txMeta) }`) log.debug(`pending-tx-details calculating gas for ${JSON.stringify(txMeta)}`)
const txUtils = this.txUtils
this.txUtils.analyzeGasUsage(txMeta, (err, result) => { this.txUtils.analyzeGasUsage(txMeta, (err, result) => {
console.log('ANALYZED') if (err) {
console.dir(arguments) return this.setState({ error: err })
}
const { txFee, maxCost } = result || txMeta const { txFee, maxCost } = result || txMeta
if (txFee === txMeta.txFee && maxCost === txMeta.maxCost) { if (txFee === txMeta.txFee && maxCost === txMeta.maxCost) {
log.warn(`Recalculating gas resulted in no change.`) log.warn(`Recalculating gas resulted in no change.`)

@ -12,12 +12,7 @@ function PendingTx () {
PendingTx.prototype.render = function () { PendingTx.prototype.render = function () {
const props = this.props const props = this.props
const state = this.state || {}
const txData = props.txData const txData = props.txData
const txParams = txData.txParams
const gas = state.gas || txParams.gas
const gasPrice = state.gasPrice || txData.gasPrice
return ( return (

Loading…
Cancel
Save