From cf484d735fab021a0dfe509243b957e8c6278532 Mon Sep 17 00:00:00 2001 From: Frankie Date: Thu, 15 Sep 2016 14:31:45 -0700 Subject: Clean up some of the code --- ui/app/components/pending-tx.js | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'ui/app/components/pending-tx.js') diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 57852010e..4c27a8092 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -3,9 +3,6 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const PendingTxDetails = require('./pending-tx-details') -const ethUtil = require('ethereumjs-util') -const BN = ethUtil.BN - module.exports = PendingTx inherits(PendingTx, Component) @@ -16,20 +13,6 @@ function PendingTx () { PendingTx.prototype.render = function () { var state = this.props var txData = state.txData - var txParams = txData.txParams || {} - var address = txParams.from || state.selectedAddress - - var account = state.accounts[address] - var balance = account ? account.balance : '0x0' - - var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txData.estimatedGas), 16) - var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16) - var txFee = gasCost.mul(gasPrice) - var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16) - var maxCost = txValue.add(txFee) - - var balanceBn = new BN(ethUtil.stripHexPrefix(balance), 16) - var insufficientBalance = maxCost.gt(balanceBn) return ( @@ -47,7 +30,7 @@ PendingTx.prototype.render = function () { } `), - insufficientBalance ? + state.insufficientBalance ? h('span.error', { style: { marginLeft: 50, @@ -65,14 +48,14 @@ PendingTx.prototype.render = function () { }, }, [ - insufficientBalance ? + state.insufficientBalance ? h('button.btn-green', { - onClick: state.sendTransaction, + onClick: state.buyEth, }, 'Buy Ether') : null, h('button.confirm', { - disabled: insufficientBalance, + disabled: state.insufficientBalance, onClick: state.sendTransaction, }, 'Accept'), -- cgit