diff options
author | Frankie <frankie.pangilinan@consensys.net> | 2016-09-09 03:56:48 +0800 |
---|---|---|
committer | Frankie <frankie.pangilinan@consensys.net> | 2016-09-09 03:56:48 +0800 |
commit | 69580480bc7f73c367a741b3ca69d0ccaffd6b33 (patch) | |
tree | 5b1b8e799e26a464c53b85f8937ee3da0843ac2b /ui/app/account-detail.js | |
parent | 6f86c5f8ee6779eddfde1fbc32e356bbc80708f3 (diff) | |
parent | 80847739b2d79cc440aec512c84af2769bb06805 (diff) | |
download | tangerine-wallet-browser-69580480bc7f73c367a741b3ca69d0ccaffd6b33.tar tangerine-wallet-browser-69580480bc7f73c367a741b3ca69d0ccaffd6b33.tar.gz tangerine-wallet-browser-69580480bc7f73c367a741b3ca69d0ccaffd6b33.tar.bz2 tangerine-wallet-browser-69580480bc7f73c367a741b3ca69d0ccaffd6b33.tar.lz tangerine-wallet-browser-69580480bc7f73c367a741b3ca69d0ccaffd6b33.tar.xz tangerine-wallet-browser-69580480bc7f73c367a741b3ca69d0ccaffd6b33.tar.zst tangerine-wallet-browser-69580480bc7f73c367a741b3ca69d0ccaffd6b33.zip |
Merge branch 'master' into i#589pendingTxsIssue
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r-- | ui/app/account-detail.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 5ce6b6703..ebb15cd05 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -10,7 +10,7 @@ const ReactCSSTransitionGroup = require('react-addons-css-transition-group') const valuesFor = require('./util').valuesFor const Identicon = require('./components/identicon') -const AccountEtherBalance = require('./components/account-eth-balance') +const EthBalance = require('./components/eth-balance') const TransactionList = require('./components/transaction-list') const ExportAccountView = require('./components/account-export') const ethUtil = require('ethereumjs-util') @@ -168,7 +168,7 @@ AccountDetailScreen.prototype.render = function () { }, }, [ - h(AccountEtherBalance, { + h(EthBalance, { value: account && account.balance, style: { lineHeight: '7px', |