arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-01-23 22:41:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #453 from trezor/fix/xrp-currency-format

Browse Source 
Fix/add missing formatter for xrp
This commit is contained in:
Vladimir Volek 2019-03-15 11:27:23 +01:00 committed by GitHub
commit 5fb9656f2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/Wallet/views/Account/Summary/components/Balance/index.messages.js
View File

@ -11,6 +11,11 @@ const definedMessages: Messages = defineMessages({
id: 'TR_RATE', id: 'TR_RATE',
defaultMessage: 'Rate', defaultMessage: 'Rate',
}, },
TR_RESERVE: {
id: 'TR_RESERVE',
defaultMessage: 'Reserve',
description: 'Label for minimal XRP account reserve',
},
}); });
export default definedMessages; export default definedMessages;

34
src/views/Wallet/views/Account/Summary/ripple/components/Balance/index.js
View File

@ -5,9 +5,11 @@ import styled from 'styled-components';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import colors from 'config/colors'; import colors from 'config/colors';
import ICONS from 'config/icons'; import ICONS from 'config/icons';
import { FormattedMessage, FormattedNumber } from 'react-intl';
import { FONT_SIZE, FONT_WEIGHT } from 'config/variables'; import { FONT_SIZE, FONT_WEIGHT } from 'config/variables';
import Tooltip from 'components/Tooltip'; import Tooltip from 'components/Tooltip';
import type { Network, State as ReducersState } from 'flowtype'; import type { Network, State as ReducersState } from 'flowtype';
import l10nMessages from '../../../components/Balance/index.messages';
type Props = { type Props = {
network: Network, network: Network,
@ -154,7 +156,17 @@ class AccountBalance extends PureComponent<Props, State> {
<Label>Balance</Label> <Label>Balance</Label>
<TooltipWrapper> <TooltipWrapper>
<FiatValue> <FiatValue>
{fiatRates ? `${fiat} ${localCurrency}` : 'N/A'} {fiatRates ? (
<FormattedNumber
currency={localCurrency}
value={fiat}
minimumFractionDigits={2}
// eslint-disable-next-line react/style-prop-object
style="currency"
/>
) : (
'N/A'
)}
</FiatValue> </FiatValue>
{!fiatRates && NoRatesTooltip} {!fiatRates && NoRatesTooltip}
</TooltipWrapper> </TooltipWrapper>
@ -164,7 +176,9 @@ class AccountBalance extends PureComponent<Props, State> {
</BalanceWrapper> </BalanceWrapper>
{this.props.reserve !== '0' && ( {this.props.reserve !== '0' && (
<BalanceWrapper> <BalanceWrapper>
<Label>Reserve</Label> <Label>
<FormattedMessage {...l10nMessages.TR_RESERVE} />
</Label>
<FiatValueRate> <FiatValueRate>
{this.props.reserve} {network.symbol} {this.props.reserve} {network.symbol}
</FiatValueRate> </FiatValueRate>
@ -172,10 +186,22 @@ class AccountBalance extends PureComponent<Props, State> {
)} )}
<BalanceRateWrapper> <BalanceRateWrapper>
<Label>Rate</Label> <Label>
<FormattedMessage {...l10nMessages.TR_RATE} />
</Label>
<TooltipWrapper> <TooltipWrapper>
<FiatValueRate> <FiatValueRate>
{fiatRates ? `${fiatRateValue} ${localCurrency}` : 'N/A'} {fiatRates ? (
<FormattedNumber
currency={localCurrency}
value={fiatRateValue}
minimumFractionDigits={2}
// eslint-disable-next-line react/style-prop-object
style="currency"
/>
) : (
'N/A'
)}
</FiatValueRate> </FiatValueRate>
{!fiatRates && NoRatesTooltip} {!fiatRates && NoRatesTooltip}
</TooltipWrapper> </TooltipWrapper>