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

Clean up some of the code

Browse Source
This commit is contained in:
Frankie 2016-09-15 14:31:45 -07:00
parent 7293c67f68
commit cf484d735f
2 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/app/components/pending-tx.js
View File

@ -3,9 +3,6 @@ const h = require('react-hyperscript')
const inherits = require('util').inherits const inherits = require('util').inherits
const PendingTxDetails = require('./pending-tx-details') const PendingTxDetails = require('./pending-tx-details')
const ethUtil = require('ethereumjs-util')
const BN = ethUtil.BN
module.exports = PendingTx module.exports = PendingTx
inherits(PendingTx, Component) inherits(PendingTx, Component)
@ -16,20 +13,6 @@ function PendingTx () {
PendingTx.prototype.render = function () { PendingTx.prototype.render = function () {
var state = this.props var state = this.props
var txData = state.txData 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 ( return (
@ -47,7 +30,7 @@ PendingTx.prototype.render = function () {
} }
`), `),
insufficientBalance ? state.insufficientBalance ?
h('span.error', { h('span.error', {
style: { style: {
marginLeft: 50, marginLeft: 50,
@ -65,14 +48,14 @@ PendingTx.prototype.render = function () {
}, },
}, [ }, [
insufficientBalance ? state.insufficientBalance ?
h('button.btn-green', { h('button.btn-green', {
onClick: state.sendTransaction, onClick: state.buyEth,
}, 'Buy Ether') }, 'Buy Ether')
: null, : null,
h('button.confirm', { h('button.confirm', {
disabled: insufficientBalance, disabled: state.insufficientBalance,
onClick: state.sendTransaction, onClick: state.sendTransaction,
}, 'Accept'), }, 'Accept'),

21
ui/app/conf-tx.js
View File

@ -41,6 +41,7 @@ ConfirmTxScreen.prototype.render = function () {
var unconfTxList = txHelper(unconfTxs, unconfMsgs, network) var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
var index = state.index !== undefined ? state.index : 0 var index = state.index !== undefined ? state.index : 0
var txData = unconfTxList[index] || unconfTxList[0] || {} var txData = unconfTxList[index] || unconfTxList[0] || {}
var txParams = txData.txParams || {}
var isNotification = isPopupOrNotification() === 'notification' var isNotification = isPopupOrNotification() === 'notification'
return ( return (
@ -92,7 +93,9 @@ ConfirmTxScreen.prototype.render = function () {
selectedAddress: state.selectedAddress, selectedAddress: state.selectedAddress,
accounts: state.accounts, accounts: state.accounts,
identities: state.identities, identities: state.identities,
insufficientBalance: this.checkBalnceAgainstTx(txData),
// Actions // Actions
buyEth: this.buyEth.bind(this, txParams.from || state.selectedAddress),
sendTransaction: this.sendTransaction.bind(this, txData), sendTransaction: this.sendTransaction.bind(this, txData),
cancelTransaction: this.cancelTransaction.bind(this, txData), cancelTransaction: this.cancelTransaction.bind(this, txData),
signMessage: this.signMessage.bind(this, txData), signMessage: this.signMessage.bind(this, txData),
@ -113,8 +116,7 @@ function currentTxView (opts) {
return h(PendingMsg, opts) return h(PendingMsg, opts)
} }
} }
ConfirmTxScreen.prototype.checkBalnceAgainstTx = function (txData) {
ConfirmTxScreen.prototype.sendTransaction = function (txData, event) {
var state = this.props var state = this.props
var txParams = txData.txParams || {} var txParams = txData.txParams || {}
@ -129,12 +131,17 @@ ConfirmTxScreen.prototype.sendTransaction = function (txData, event) {
var maxCost = txValue.add(txFee) var maxCost = txValue.add(txFee)
var balanceBn = new BN(ethUtil.stripHexPrefix(balance), 16) var balanceBn = new BN(ethUtil.stripHexPrefix(balance), 16)
return maxCost.gt(balanceBn)
}
ConfirmTxScreen.prototype.buyEth = function (address, event) {
event.stopPropagation() event.stopPropagation()
if (maxCost.gt(balanceBn)) { this.props.dispatch(actions.buyEthView(address))
this.props.dispatch(actions.buyEthView(address)) }
} else {
this.props.dispatch(actions.sendTx(txData)) ConfirmTxScreen.prototype.sendTransaction = function (txData, event) {
} event.stopPropagation()
this.props.dispatch(actions.sendTx(txData))
} }
ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) { ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) {