aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-10-05 03:10:01 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-10-05 03:10:01 +0800
commit27c72ee565f02e319af2a4e2c03a885ae633ae71 (patch)
treebf72743d141ac0ef25776da078f3cbe694d7c15c /ui
parentf12504cd09f136fb5ac0d4dd2a6afab8fa6e6524 (diff)
downloadtangerine-wallet-browser-27c72ee565f02e319af2a4e2c03a885ae633ae71.tar.gz
tangerine-wallet-browser-27c72ee565f02e319af2a4e2c03a885ae633ae71.tar.zst
tangerine-wallet-browser-27c72ee565f02e319af2a4e2c03a885ae633ae71.zip
Revert to normal balances.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/account-detail.js4
-rw-r--r--ui/app/components/pending-tx.js6
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 90724dc3f..a844daf88 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -46,7 +46,7 @@ AccountDetailScreen.prototype.render = function () {
var selected = props.address || Object.keys(props.accounts)[0]
var checksumAddress = selected && ethUtil.toChecksumAddress(selected)
var identity = props.identities[selected]
- var account = props.computedBalances[selected]
+ var account = props.accounts[selected]
const { network, conversionRate, currentCurrency } = props
return (
@@ -181,7 +181,7 @@ AccountDetailScreen.prototype.render = function () {
}, [
h(EthBalance, {
- value: account && account.ethBalance,
+ value: account && account.balance,
conversionRate,
currentCurrency,
style: {
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 6f8c19a3c..c3350fcc1 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -33,7 +33,7 @@ function PendingTx () {
PendingTx.prototype.render = function () {
const props = this.props
- const { currentCurrency, blockGasLimit, computedBalances } = props
+ const { currentCurrency, blockGasLimit } = props
const conversionRate = props.conversionRate
const txMeta = this.gatherTxMeta()
@@ -42,8 +42,8 @@ PendingTx.prototype.render = function () {
// Account Details
const address = txParams.from || props.selectedAddress
const identity = props.identities[address] || { address: address }
- const account = computedBalances[address]
- const balance = account ? account.ethBalance : '0x0'
+ const account = props.accounts[address]
+ const balance = account ? account.balance : '0x0'
// recipient check
const isValidAddress = !txParams.to || util.isValidAddress(txParams.to)