aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2017-10-05 05:48:42 +0800
committerGitHub <noreply@github.com>2017-10-05 05:48:42 +0800
commita142f8913d6807966737572ad43fdcbbdbb5d79e (patch)
tree59be91a3d772f3e2f665366ae19a2424aff2e871
parent852c27bad4998fde7ef17135317ea0b10e81b682 (diff)
parent27c72ee565f02e319af2a4e2c03a885ae633ae71 (diff)
downloadtangerine-wallet-browser-a142f8913d6807966737572ad43fdcbbdbb5d79e.tar
tangerine-wallet-browser-a142f8913d6807966737572ad43fdcbbdbb5d79e.tar.gz
tangerine-wallet-browser-a142f8913d6807966737572ad43fdcbbdbb5d79e.tar.bz2
tangerine-wallet-browser-a142f8913d6807966737572ad43fdcbbdbb5d79e.tar.lz
tangerine-wallet-browser-a142f8913d6807966737572ad43fdcbbdbb5d79e.tar.xz
tangerine-wallet-browser-a142f8913d6807966737572ad43fdcbbdbb5d79e.tar.zst
tangerine-wallet-browser-a142f8913d6807966737572ad43fdcbbdbb5d79e.zip
Merge pull request #2276 from MetaMask/revert-compute
Revert to normal balances.
-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)