Add fiat balances to tx conf view

feature/default_network_editable
Dan Finlay 8 years ago
parent 16fe97676c
commit 1537e3f5da
  1. 11
      ui/app/components/pending-tx-details.js
  2. 5
      ui/app/send.js

@ -4,9 +4,8 @@ const inherits = require('util').inherits
const carratInline = require('fs').readFileSync('./images/forward-carrat.svg', 'utf8') const carratInline = require('fs').readFileSync('./images/forward-carrat.svg', 'utf8')
const MiniAccountPanel = require('./mini-account-panel') const MiniAccountPanel = require('./mini-account-panel')
const EtherBalance = require('./eth-balance') const EthBalance = require('./eth-balance')
const addressSummary = require('../util').addressSummary const addressSummary = require('../util').addressSummary
const formatBalance = require('../util').formatBalance
const nameForAddress = require('../../lib/contract-namer') const nameForAddress = require('../../lib/contract-namer')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
const BN = ethUtil.BN const BN = ethUtil.BN
@ -70,7 +69,7 @@ PTXP.render = function () {
fontFamily: 'Montserrat Light, Montserrat, sans-serif', fontFamily: 'Montserrat Light, Montserrat, sans-serif',
}, },
}, [ }, [
h(EtherBalance, { h(EthBalance, {
value: balance, value: balance,
inline: true, inline: true,
labelColor: '#F7861C', labelColor: '#F7861C',
@ -107,12 +106,12 @@ PTXP.render = function () {
h('.row', [ h('.row', [
h('.cell.label', 'Amount'), h('.cell.label', 'Amount'),
h('.cell.value', formatBalance(txParams.value)), h(EthBalance, { value: txParams.value }),
]), ]),
h('.cell.row', [ h('.cell.row', [
h('.cell.label', 'Max Transaction Fee'), h('.cell.label', 'Max Transaction Fee'),
h('.cell.value', formatBalance(txFee.toString(16))), h(EthBalance, { value: txFee.toString(16) }),
]), ]),
h('.cell.row', { h('.cell.row', {
@ -129,7 +128,7 @@ PTXP.render = function () {
alignItems: 'center', alignItems: 'center',
}, },
}, [ }, [
h(EtherBalance, { h(EthBalance, {
value: maxCost.toString(16), value: maxCost.toString(16),
inline: true, inline: true,
labelColor: 'black', labelColor: 'black',

@ -7,7 +7,7 @@ const actions = require('./actions')
const util = require('./util') const util = require('./util')
const numericBalance = require('./util').numericBalance const numericBalance = require('./util').numericBalance
const addressSummary = require('./util').addressSummary const addressSummary = require('./util').addressSummary
const EtherBalance = require('./components/eth-balance') const EthBalance = require('./components/eth-balance')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
module.exports = connect(mapStateToProps)(SendTransactionScreen) module.exports = connect(mapStateToProps)(SendTransactionScreen)
@ -107,8 +107,7 @@ SendTransactionScreen.prototype.render = function () {
// balance // balance
h('.flex-row.flex-center', [ h('.flex-row.flex-center', [
// h('div', formatBalance(account && account.balance)), h(EthBalance, {
h(EtherBalance, {
value: account && account.balance, value: account && account.balance,
}), }),

Loading…
Cancel
Save