diff --git a/src/views/Wallet/views/Account/Summary/components/Balance/index.js b/src/views/Wallet/views/Account/Summary/components/Balance/index.js index fc1e9233..4a3514bf 100644 --- a/src/views/Wallet/views/Account/Summary/components/Balance/index.js +++ b/src/views/Wallet/views/Account/Summary/components/Balance/index.js @@ -15,6 +15,7 @@ type Props = { network: Network, balance: string, fiat: $ElementType, + localCurrency: string, }; type State = { @@ -59,6 +60,7 @@ const FiatValue = styled.div` min-height: 25px; color: ${colors.TEXT_PRIMARY}; align-items: center; + text-transform: uppercase; `; const FiatValueRate = styled.div` @@ -69,6 +71,7 @@ const FiatValueRate = styled.div` display: flex; align-items: center; color: ${colors.TEXT_PRIMARY}; + text-transform: uppercase; `; const BalanceWrapper = styled.div` @@ -116,14 +119,14 @@ class AccountBalance extends PureComponent { } render() { - const { network } = this.props; + const { network, localCurrency } = this.props; const fiatRate = this.props.fiat.find(f => f.network === network.shortcut); let accountBalance = ''; let fiatRateValue = ''; let fiat = ''; if (fiatRate) { accountBalance = new BigNumber(this.props.balance); - fiatRateValue = new BigNumber(fiatRate.value).toFixed(2); + fiatRateValue = new BigNumber(fiatRate.rates[localCurrency]).toFixed(2); fiat = accountBalance.times(fiatRateValue).toFixed(2); } @@ -155,7 +158,9 @@ class AccountBalance extends PureComponent { - {fiatRate ? `$ ${fiat}` : 'N/A'} + + {fiatRate ? `${fiat} ${localCurrency}` : 'N/A'} + {!fiatRate && NoRatesTooltip} @@ -168,7 +173,7 @@ class AccountBalance extends PureComponent { - {fiatRate ? `$ ${fiatRateValue}` : 'N/A'} + {fiatRate ? `${fiatRateValue} ${localCurrency}` : 'N/A'} {!fiatRate && NoRatesTooltip} diff --git a/src/views/Wallet/views/Account/Summary/ethereum/index.js b/src/views/Wallet/views/Account/Summary/ethereum/index.js index 758c6bba..b4cbc08b 100644 --- a/src/views/Wallet/views/Account/Summary/ethereum/index.js +++ b/src/views/Wallet/views/Account/Summary/ethereum/index.js @@ -100,7 +100,12 @@ const AccountSummary = (props: Props) => { /> - +

diff --git a/src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js b/src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js index 5c1d9744..1a21ac0f 100644 --- a/src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js +++ b/src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js @@ -14,6 +14,7 @@ type Props = { balance: string, reserve: string, fiat: $ElementType, + localCurrency: string, }; type State = { @@ -58,6 +59,7 @@ const FiatValue = styled.div` min-height: 25px; color: ${colors.TEXT_PRIMARY}; align-items: center; + text-transform: uppercase; `; const FiatValueRate = styled.div` @@ -68,6 +70,7 @@ const FiatValueRate = styled.div` display: flex; color: ${colors.TEXT_PRIMARY}; align-items: center; + text-transform: uppercase; `; const BalanceWrapper = styled.div` @@ -115,14 +118,14 @@ class AccountBalance extends PureComponent { } render() { - const { network } = this.props; + const { network, localCurrency } = this.props; const fiatRate = this.props.fiat.find(f => f.network === network.shortcut); let accountBalance = ''; let fiatRateValue = ''; let fiat = ''; if (fiatRate) { accountBalance = new BigNumber(this.props.balance); - fiatRateValue = new BigNumber(fiatRate.value).toFixed(2); + fiatRateValue = new BigNumber(fiatRate.rates[localCurrency]).toFixed(2); fiat = accountBalance.times(fiatRateValue).toFixed(2); } @@ -152,7 +155,9 @@ class AccountBalance extends PureComponent { - {fiatRate ? `$ ${fiat}` : 'N/A'} + + {fiatRate ? `${fiat} ${localCurrency}` : 'N/A'} + {!fiatRate && NoRatesTooltip} @@ -172,7 +177,7 @@ class AccountBalance extends PureComponent { - {fiatRate ? `$ ${fiatRateValue}` : 'N/A'} + {fiatRate ? `${fiatRateValue} ${localCurrency}` : 'N/A'} {!fiatRate && NoRatesTooltip} diff --git a/src/views/Wallet/views/Account/Summary/ripple/index.js b/src/views/Wallet/views/Account/Summary/ripple/index.js index 4f014c97..7ff6b32b 100644 --- a/src/views/Wallet/views/Account/Summary/ripple/index.js +++ b/src/views/Wallet/views/Account/Summary/ripple/index.js @@ -85,6 +85,7 @@ const AccountSummary = (props: Props) => { balance={balance} reserve={reserve} fiat={props.fiat} + localCurrency={props.wallet.localCurrency} /> {TMP_SHOW_HISTORY && (