aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-05-17 02:34:53 +0800
committerDan Finlay <dan@danfinlay.com>2017-05-17 02:36:21 +0800
commitb4e6ea9db787cbf7839d9caad6e1ea0385cc588e (patch)
treea476d521bc8d17f9598b8e1fdc98e51dded88cbf /ui/app/accounts
parentd165f3a2b6f55cd1f4d4809c61ab3a4af5f8b070 (diff)
downloadtangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.tar.gz
tangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.tar.zst
tangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.zip
Fix fiat rendering
Fixes #1439. When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter. This now passes it in wherever it's used.
Diffstat (limited to 'ui/app/accounts')
-rw-r--r--ui/app/accounts/account-list-item.js4
-rw-r--r--ui/app/accounts/index.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js
index 0e87af612..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, conversionRate } = 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,7 @@ AccountListItem.prototype.render = function () {
}, checksumAddress),
h(EthBalance, {
value: account && account.balance,
+ currentCurrency,
conversionRate,
style: {
lineHeight: '7px',
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index 5105c214b..ac2615cd7 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -24,6 +24,7 @@ function mapStateToProps (state) {
pending,
keyrings: state.metamask.keyrings,
conversionRate: state.metamask.conversionRate,
+ currentCurrency: state.metamask.currentCurrency,
}
}
@@ -34,7 +35,7 @@ function AccountsScreen () {
AccountsScreen.prototype.render = function () {
const props = this.props
- const { keyrings, conversionRate } = props
+ const { keyrings, conversionRate, currentCurrency } = props
const identityList = valuesFor(props.identities)
const unapprovedTxList = valuesFor(props.unapprovedTxs)
@@ -83,6 +84,7 @@ AccountsScreen.prototype.render = function () {
identity,
selectedAddress: this.props.selectedAddress,
conversionRate,
+ currentCurrency,
accounts: this.props.accounts,
onShowDetail: this.onShowDetail.bind(this),
pending,