diff options
author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
---|---|---|
committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
commit | 90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4 (patch) | |
tree | 3739c65edfe8a7c4e7eca455d2f1a522176e3af7 /ui/app/accounts/account-list-item.js | |
parent | 44f25cd93c18c57acf993ace3387a4d569d8dcca (diff) | |
parent | 43ea223c9fe8ee593a572b153defc5ddefd72e95 (diff) | |
download | tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.gz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.zst tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.zip |
Fix merge conflicts.
Diffstat (limited to 'ui/app/accounts/account-list-item.js')
-rw-r--r-- | ui/app/accounts/account-list-item.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js index 2a3c13d05..10a0b6cc7 100644 --- a/ui/app/accounts/account-list-item.js +++ b/ui/app/accounts/account-list-item.js @@ -15,7 +15,8 @@ function AccountListItem () { } AccountListItem.prototype.render = function () { - const { identity, selectedAddress, accounts, onShowDetail } = this.props + const { identity, selectedAddress, accounts, onShowDetail, + conversionRate, currentCurrency } = this.props const checksumAddress = identity && identity.address && ethUtil.toChecksumAddress(identity.address) const isSelected = selectedAddress === identity.address @@ -52,6 +53,8 @@ AccountListItem.prototype.render = function () { }, checksumAddress), h(EthBalance, { value: account && account.balance, + currentCurrency, + conversionRate, style: { lineHeight: '7px', marginTop: '10px', |