diff --git a/src/views/Wallet/views/Account/Receive/ethereum/Container.js b/src/views/Wallet/views/Account/Receive/ethereum/Container.js index 27212056..5aaabfbd 100644 --- a/src/views/Wallet/views/Account/Receive/ethereum/Container.js +++ b/src/views/Wallet/views/Account/Receive/ethereum/Container.js @@ -1,13 +1,16 @@ /* @flow */ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; +import { injectIntl } from 'react-intl'; import { showAddress } from 'actions/ReceiveActions'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; import type { State, Dispatch } from 'flowtype'; import Receive from './index'; -type OwnProps = { } +type OwnProps = { + intl: any, +} type StateProps = { selectedAccount: $ElementType, @@ -20,7 +23,7 @@ type DispatchProps = { showAddress: typeof showAddress }; -export type Props = StateProps & DispatchProps; +export type Props = OwnProps & StateProps & DispatchProps; const mapStateToProps: MapStateToProps = (state: State): StateProps => ({ selectedAccount: state.selectedAccount, @@ -33,4 +36,4 @@ const mapDispatchToProps: MapDispatchToProps showAddress: bindActionCreators(showAddress, dispatch), }); -export default connect(mapStateToProps, mapDispatchToProps)(Receive); \ No newline at end of file +export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Receive)); \ No newline at end of file diff --git a/src/views/Wallet/views/Account/Receive/ethereum/index.js b/src/views/Wallet/views/Account/Receive/ethereum/index.js index c727a8e5..b32049a7 100644 --- a/src/views/Wallet/views/Account/Receive/ethereum/index.js +++ b/src/views/Wallet/views/Account/Receive/ethereum/index.js @@ -16,10 +16,11 @@ import colors from 'config/colors'; import { CONTEXT_DEVICE } from 'actions/constants/modal'; import Content from 'views/Wallet/components/Content'; +import l10nCommonMessages from 'views/common.messages'; import VerifyAddressTooltip from '../components/VerifyAddressTooltip'; import l10nMessages from './index.messages'; -import l10nCommonMessages from '../common.messages'; +import l10nReceiveMessages from '../common.messages'; import type { Props } from './Container'; @@ -131,13 +132,13 @@ const AccountReceive = (props: Props) => { type="text" readOnly autoSelect - topLabel="Address" + topLabel={props.intl.formatMessage(l10nCommonMessages.TR_ADDRESS)} value={address} isPartiallyHidden={isAddressHidden} trezorAction={isAddressVerifying ? ( - + ) : null} icon={((addressVerified || addressUnverified) && !isAddressVerifying) && ( @@ -162,13 +163,13 @@ const AccountReceive = (props: Props) => { /> {!(addressVerified || addressUnverified) && ( props.showAddress(account.accountPath)} isDisabled={device.connected && !discovery.completed}> - + )} {(addressVerified || addressUnverified) && !isAddressVerifying && ( - + , @@ -20,7 +23,7 @@ type DispatchProps = { showAddress: typeof showAddress }; -export type Props = StateProps & DispatchProps; +export type Props = OwnProps & StateProps & DispatchProps; const mapStateToProps: MapStateToProps = (state: State): StateProps => ({ selectedAccount: state.selectedAccount, @@ -33,4 +36,4 @@ const mapDispatchToProps: MapDispatchToProps showAddress: bindActionCreators(showAddress, dispatch), }); -export default connect(mapStateToProps, mapDispatchToProps)(Receive); \ No newline at end of file +export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(Receive)); \ No newline at end of file diff --git a/src/views/Wallet/views/Account/Receive/ripple/index.js b/src/views/Wallet/views/Account/Receive/ripple/index.js index 1837b846..a533c9c1 100644 --- a/src/views/Wallet/views/Account/Receive/ripple/index.js +++ b/src/views/Wallet/views/Account/Receive/ripple/index.js @@ -16,10 +16,11 @@ import colors from 'config/colors'; import { CONTEXT_DEVICE } from 'actions/constants/modal'; import Content from 'views/Wallet/components/Content'; +import l10nCommonMessages from 'views/common.messages'; import VerifyAddressTooltip from '../components/VerifyAddressTooltip'; import l10nMessages from './index.messages'; -import l10nCommonMessages from '../common.messages'; +import l10nReceiveMessages from '../common.messages'; import type { Props } from './Container'; @@ -131,13 +132,13 @@ const AccountReceive = (props: Props) => { type="text" readOnly autoSelect - topLabel="Address" + topLabel={props.intl.formatMessage(l10nCommonMessages.TR_ADDRESS)} value={address} isPartiallyHidden={isAddressHidden} trezorAction={isAddressVerifying ? ( - + ) : null} icon={((addressVerified || addressUnverified) && !isAddressVerifying) && ( @@ -162,13 +163,13 @@ const AccountReceive = (props: Props) => { /> {!(addressVerified || addressUnverified) && ( props.showAddress(account.accountPath)} isDisabled={device.connected && !discovery.completed}> - + )} {(addressVerified || addressUnverified) && !isAddressVerifying && ( - +