Merge branch 'master' into SignTypedData

1 files changed, 2 insertions, 2 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: {