diff --git a/src/components/modals/confirm/NoBackup/index.js b/src/components/modals/confirm/NoBackup/index.js index 999ee710..2bd46830 100644 --- a/src/components/modals/confirm/NoBackup/index.js +++ b/src/components/modals/confirm/NoBackup/index.js @@ -3,10 +3,11 @@ import React from 'react'; import PropTypes from 'prop-types'; import styled from 'styled-components'; - +import { FormattedMessage } from 'react-intl'; import { getOldWalletUrl } from 'utils/url'; import { H5, P, Icon, Button, Link, colors, icons } from 'trezor-ui-components'; +import l10nCommonMessages from 'views/common.messages'; import type { TrezorDevice } from 'flowtype'; import type { Props as BaseProps } from '../../Container'; @@ -66,20 +67,21 @@ const Confirmation = (props: Props) => ( props.onReceiveConfirmation(false)}> -
Your Trezor is not backed up
+
+ +
- If your device is ever lost or damaged, your funds will be lost. Backup your device - first, to protect your coins against such events. + props.onReceiveConfirmation(false)}> - Create a backup in 3 minutes + props.onReceiveConfirmation(true)}> - Show address, I will take the risk + diff --git a/src/components/modals/confirm/UnverifiedAddress/index.js b/src/components/modals/confirm/UnverifiedAddress/index.js index f5de2d62..fb7789f7 100644 --- a/src/components/modals/confirm/UnverifiedAddress/index.js +++ b/src/components/modals/confirm/UnverifiedAddress/index.js @@ -7,6 +7,7 @@ import { FormattedMessage } from 'react-intl'; import { Link, Button, Icon, P, H5, colors, icons } from 'trezor-ui-components'; import type { TrezorDevice } from 'flowtype'; +import l10nCommonMessages from 'views/common.messages'; import l10nMessages from './index.messages'; import type { Props as BaseProps } from '../../Container'; @@ -169,16 +170,26 @@ class ConfirmUnverifiedAddress extends PureComponent { {needsBackup && ( <> -
Device {device.label} is not backed up
+
+ +
- If your device is ever lost or damaged, your funds will be lost. - Backup your device first, to protect your coins against such events. +
- Create a backup in 3 minutes + + + diff --git a/src/components/modals/confirm/UnverifiedAddress/index.messages.js b/src/components/modals/confirm/UnverifiedAddress/index.messages.js index c89c8e59..2d178924 100644 --- a/src/components/modals/confirm/UnverifiedAddress/index.messages.js +++ b/src/components/modals/confirm/UnverifiedAddress/index.messages.js @@ -7,6 +7,10 @@ const definedMessages: Messages = defineMessages({ id: 'TR_DEVICE_LABEL_IS_NOT_CONNECTED', defaultMessage: 'Device {deviceLabel} is not connected', }, + TR_DEVICE_LABEL_IS_NOT_BACKED_UP: { + id: 'TR_DEVICE_LABEL_IS_NOT_BACKED_UP', + defaultMessage: 'Device {deviceLabel} is not backed up', + }, TR_DEVICE_LABEL_IS_UNAVAILABLE: { id: 'TR_DEVICE_LABEL_IS_UNAVAILABLE', defaultMessage: 'Device {deviceLabel} is unavailable', diff --git a/src/components/modals/external/Tezos/index.js b/src/components/modals/external/Tezos/index.js index 44c69ad3..1816edba 100644 --- a/src/components/modals/external/Tezos/index.js +++ b/src/components/modals/external/Tezos/index.js @@ -6,8 +6,11 @@ import styled from 'styled-components'; import { Button, H5, Link, P, Icon, icons, colors } from 'trezor-ui-components'; import coins from 'constants/coins'; +import { FormattedMessage } from 'react-intl'; import TezosImage from './images/xtz.png'; import type { Props as BaseProps } from '../../Container'; +import l10nCommonMessages from '../common.messages'; +import l10nMessages from './index.messages'; type Props = { onCancel: $ElementType<$ElementType, 'onCancel'>, @@ -44,11 +47,17 @@ const TezosWallet = (props: Props) => ( -
Tezos wallet
-

You will be redirected to external wallet

+
+ +
+

+ +

i.id === 'xtz').url}> - Go to external wallet + + + ); diff --git a/src/components/modals/external/Tezos/index.messages.js b/src/components/modals/external/Tezos/index.messages.js new file mode 100644 index 00000000..9e45f267 --- /dev/null +++ b/src/components/modals/external/Tezos/index.messages.js @@ -0,0 +1,12 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_TEZOS_WALLET: { + id: 'TR_TEZOS_WALLET', + defaultMessage: 'Tezos wallet', + }, +}); + +export default definedMessages; diff --git a/src/components/notifications/App/components/NoBackup/index.js b/src/components/notifications/App/components/NoBackup/index.js index cff81753..bbe7ffb1 100644 --- a/src/components/notifications/App/components/NoBackup/index.js +++ b/src/components/notifications/App/components/NoBackup/index.js @@ -1,7 +1,8 @@ /* @flow */ import * as React from 'react'; import { Notification } from 'trezor-ui-components'; - +import { FormattedMessage } from 'react-intl'; +import l10nCommonMessages from 'views/common.messages'; import type { Props } from '../../index'; export default (props: Props) => { @@ -13,11 +14,13 @@ export default (props: Props) => { } + message={} actions={[ { - label: 'Create a backup', + label: ( + + ), callback: props.routerActions.gotoBackup, }, ]} diff --git a/src/views/Landing/components/ConnectDevice/index.js b/src/views/Landing/components/ConnectDevice/index.js index 3deef03c..53cd696b 100644 --- a/src/views/Landing/components/ConnectDevice/index.js +++ b/src/views/Landing/components/ConnectDevice/index.js @@ -150,7 +150,12 @@ class ConnectDevice extends PureComponent { - {this.props.showDisconnect && `Unplug "${this.props.deviceLabel}" device`} + {this.props.showDisconnect && ( + + )} {!this.props.showDisconnect && ( {this.getTrezorDeviceImage()} diff --git a/src/views/Landing/components/ConnectDevice/index.messages.js b/src/views/Landing/components/ConnectDevice/index.messages.js index 0939aed1..262ea5c8 100644 --- a/src/views/Landing/components/ConnectDevice/index.messages.js +++ b/src/views/Landing/components/ConnectDevice/index.messages.js @@ -33,6 +33,10 @@ const definedMessages: Messages = defineMessages({ description: 'Part of the sentence: Dont have a Trezor? Get one', defaultMessage: 'Get one', }, + TR_UNPLUG_DEVICE_LABEL: { + id: 'TR_UNPLUG_DEVICE_LABEL', + defaultMessage: 'Unplug "{deviceLabel}" device', + }, }); export default definedMessages; 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 e500b599..d8e4eb5e 100644 --- a/src/views/Wallet/views/Account/Summary/components/Balance/index.js +++ b/src/views/Wallet/views/Account/Summary/components/Balance/index.js @@ -141,7 +141,7 @@ class AccountBalance extends PureComponent { } > diff --git a/src/views/Wallet/views/Account/Summary/components/Balance/index.messages.js b/src/views/Wallet/views/Account/Summary/components/Balance/index.messages.js index 9fba67f5..1799efec 100644 --- a/src/views/Wallet/views/Account/Summary/components/Balance/index.messages.js +++ b/src/views/Wallet/views/Account/Summary/components/Balance/index.messages.js @@ -16,6 +16,10 @@ const definedMessages: Messages = defineMessages({ defaultMessage: 'Reserve', description: 'Label for minimal XRP account reserve', }, + TR_FIAT_RATES_ARE_NOT_CURRENTLY: { + id: 'TR_FIAT_RATES_ARE_NOT_CURRENTLY', + defaultMessage: 'Fiat rates are not currently available.', + }, }); export default definedMessages; diff --git a/src/views/Wallet/views/NoBackup/index.js b/src/views/Wallet/views/NoBackup/index.js index e06329f2..bd725894 100644 --- a/src/views/Wallet/views/NoBackup/index.js +++ b/src/views/Wallet/views/NoBackup/index.js @@ -3,8 +3,10 @@ import React from 'react'; import styled from 'styled-components'; import { Button, Icon, Link, P, H4, colors, icons } from 'trezor-ui-components'; import { getOldWalletUrl } from 'utils/url'; - +import { FormattedMessage } from 'react-intl'; +import l10nCommonMessages from 'views/common.messages'; import type { TrezorDevice } from 'flowtype'; +import l10nMessages from './index.messages'; type Props = { device: ?TrezorDevice, @@ -40,24 +42,29 @@ const StyledIcon = styled(Icon)` margin-bottom: 15px; `; -const FirmwareUpdate = (props: Props) => ( +const NoBackup = (props: Props) => ( - Your Trezor is not backed up! + + + - If your device is ever lost or damaged, your funds will be lost. Backup your device - first, to protect your coins against such events. + -

Please use Bitcoin wallet interface to create a backup.

+

+ +

- + - I’ll do that later. +
); -export default FirmwareUpdate; +export default NoBackup; diff --git a/src/views/Wallet/views/NoBackup/index.messages.js b/src/views/Wallet/views/NoBackup/index.messages.js new file mode 100644 index 00000000..717ab097 --- /dev/null +++ b/src/views/Wallet/views/NoBackup/index.messages.js @@ -0,0 +1,12 @@ +/* @flow */ +import { defineMessages } from 'react-intl'; +import type { Messages } from 'flowtype/npm/react-intl'; + +const definedMessages: Messages = defineMessages({ + TR_PLEASE_USE_TO_CREATE_BACKUP: { + id: 'TR_PLEASE_USE_TO_CREATE_BACKUP', + defaultMessage: 'Please use Bitcoin wallet interface to create a backup.', + }, +}); + +export default definedMessages; diff --git a/src/views/common.messages.js b/src/views/common.messages.js index 94c4acbd..0d0c9f5b 100644 --- a/src/views/common.messages.js +++ b/src/views/common.messages.js @@ -78,6 +78,23 @@ const definedMessages: Messages = defineMessages({ id: 'TR_THE_ACCOUNT_BALANCE_IS_HIDDEN', defaultMessage: 'The account balance is hidden.', }, + TR_IF_YOUR_DEVICE_IS_EVER_LOST: { + id: 'TR_IF_YOUR_DEVICE_IS_EVER_LOST', + defaultMessage: + 'If your device is ever lost or damaged, your funds will be lost. Backup your device first, to protect your coins against such events.', + }, + TR_CREATE_BACKUP_IN_3_MINUTES: { + id: 'TR_CREATE_BACKUP_IN_3_MINUTES', + defaultMessage: 'Create a backup in 3 minutes', + }, + TR_YOUR_TREZOR_IS_NOT_BACKED_UP: { + id: 'TR_YOUR_TREZOR_IS_NOT_BACKED_UP', + defaultMessage: 'Your Trezor is not backed up', + }, + TR_SHOW_ADDRESS_I_WILL_TAKE_THE_RISK: { + id: 'TR_SHOW_ADDRESS_I_WILL_TAKE_THE_RISK', + defaultMessage: 'Show address, I will take the risk', + }, }); export default definedMessages;