From c84a96eb5a18b93d7dd4f8cff8c26fa91dd03112 Mon Sep 17 00:00:00 2001 From: Nicolas Arqueros Date: Wed, 13 Nov 2019 17:51:01 -0500 Subject: [PATCH] update message source gen --- app/components/profile/language-selection/IntroBanner.js | 4 ++-- app/components/topbar/banners/TestnetWarningBanner.js | 2 +- app/components/transfer/TransferInstructionsPage.js | 2 +- app/components/transfer/TransferSummaryPage.js | 2 +- app/components/transfer/YoroiTransferStartPage.js | 2 +- app/containers/transfer/DaedalusTransferFormPage.js | 4 ++-- app/containers/transfer/YoroiPaperWalletFormPage.js | 2 +- app/containers/transfer/YoroiTransferErrorPage.js | 2 +- app/containers/transfer/YoroiTransferFormPage.js | 2 +- app/i18n/global-messages.js | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/components/profile/language-selection/IntroBanner.js b/app/components/profile/language-selection/IntroBanner.js index 9508c9b045..93357f36a8 100644 --- a/app/components/profile/language-selection/IntroBanner.js +++ b/app/components/profile/language-selection/IntroBanner.js @@ -14,11 +14,11 @@ const messages = defineMessages({ }, detail1: { id: 'profile.languageSelect.detail1', - defaultMessage: '!!!Currently, this version allows you to verify that', + defaultMessage: '!!!This installation of Yoroi allows you to verify that', }, detail2: { id: 'profile.languageSelect.detail2', - defaultMessage: '!!!your balance was correctly taken into consideration during the first snapshot.', + defaultMessage: '!!!your balance was correctly copied over during the first snapshot.', }, }); diff --git a/app/components/topbar/banners/TestnetWarningBanner.js b/app/components/topbar/banners/TestnetWarningBanner.js index 5111203694..20227d029c 100644 --- a/app/components/topbar/banners/TestnetWarningBanner.js +++ b/app/components/topbar/banners/TestnetWarningBanner.js @@ -16,7 +16,7 @@ const messages = defineMessages({ }, shelleyTestnetLabel: { id: 'testnet.shelley.label.message', - defaultMessage: 'YOU ARE ON TESTNET NETWORK ({network}).', + defaultMessage: 'YOU ARE CURRENTLY ON THE BALANCE CHECK TESTNET.', }, }); diff --git a/app/components/transfer/TransferInstructionsPage.js b/app/components/transfer/TransferInstructionsPage.js index 1754f9eff7..be610d11d7 100644 --- a/app/components/transfer/TransferInstructionsPage.js +++ b/app/components/transfer/TransferInstructionsPage.js @@ -14,7 +14,7 @@ import styles from './TransferInstructionsPage.scss'; const messages = defineMessages({ attentionText: { id: 'daedalusTransfer.instructions.attention.text', - defaultMessage: '!!!Yoroi and Daedalus wallets use different key derivation scheme and they each have a separate format for addresses. For this reason, Daedalus wallets cannot be restored and continued to be used in Yoroi and vice versa. This will change in the future. For now, to use funds from your Daedalus wallet, you need to transfer them to your Yoroi wallet. Daedalus and Yoroi wallets are fully compatible for transferring of funds. If you don’t have a working copy of Daedalus, you can use your 12-word recovery phrase (or 27-words for a paper wallet) used to restore and transfer the balance from Daedalus into Yoroi.', + defaultMessage: '!!!You can check the balance of your Daedalus wallet after the first snapshot here.
The primary purpose of first Testnet is to help users assure that their balance got copied correctly.
As a result, you will be able to validate the balance that got copied from Mainnet to the Testnet is correct. This balance should match the holdings you held on November 12th.', }, transferText: { id: 'daedalusTransfer.instructions.attention.button.label', diff --git a/app/components/transfer/TransferSummaryPage.js b/app/components/transfer/TransferSummaryPage.js index ee1428f0e9..0ec2256705 100644 --- a/app/components/transfer/TransferSummaryPage.js +++ b/app/components/transfer/TransferSummaryPage.js @@ -53,7 +53,7 @@ const messages = defineMessages({ }, attentionDescription: { id: 'transfer.summary.attentionDescription.label', - defaultMessage: '!!!The balance check executed successfully, and we were able to match your wallet with the balance displayed below. Remember that the balance displayed should only match the one that you had on November 12th.', + defaultMessage: '!!!The balance result is shown below. Please make sure that is equivalent to the balance that you had in your Mainnet Yoroi Wallet on November 12th.', }, }); diff --git a/app/components/transfer/YoroiTransferStartPage.js b/app/components/transfer/YoroiTransferStartPage.js index 6d902165f2..1c6f5c459d 100644 --- a/app/components/transfer/YoroiTransferStartPage.js +++ b/app/components/transfer/YoroiTransferStartPage.js @@ -14,7 +14,7 @@ import globalMessages from '../../i18n/global-messages'; const messages = defineMessages({ text: { id: 'yoroiTransfer.start.instructions.text', - defaultMessage: '!!!Transfer funds from a non-Daedalus wallet (Yoroi, AdaLite, etc.).
More specifically, this will work for any wallet whose addresses start with Ae2', + defaultMessage: '!!!You can check the balance of your Yoroi wallet after the first snapshot here.
The primary purpose of first Testnet is to help users assure that their balance got copied correctly.
As a result, you will be able to validate the balance that got copied from Mainnet to the Testnet is correct. This balance should match the holdings you held on November 12th.', }, mnemonicLabel15: { id: 'yoroiTransfer.start.instructions.mnemonic-15', diff --git a/app/containers/transfer/DaedalusTransferFormPage.js b/app/containers/transfer/DaedalusTransferFormPage.js index e45ca5625e..848de9b58e 100644 --- a/app/containers/transfer/DaedalusTransferFormPage.js +++ b/app/containers/transfer/DaedalusTransferFormPage.js @@ -12,11 +12,11 @@ import BaseTransferPage from '../../components/transfer/BaseTransferPage'; const messages = defineMessages({ step0: { id: 'daedalusTransfer.form.instructions.step0.text', - defaultMessage: '!!!Enter the 12-word recovery phrase used to back up your Daedalus wallet to restore the balance and transfer all the funds from Daedalus to Yoroi.', + defaultMessage: '!!!Enter the 12-word recovery phrase used to back up your wallet to validate the balance.', }, step0Paper: { id: 'daedalusTransfer.form.instructions.step0Paper.text', - defaultMessage: '!!!Enter the 27-word recovery phrase used to back up your Daedalus Paper wallet to restore the balance and transfer all the funds from Daedalus to Yoroi.', + defaultMessage: '!!!Enter the 27-word recovery phrase used to back up your wallet to validate the balance.', }, }); diff --git a/app/containers/transfer/YoroiPaperWalletFormPage.js b/app/containers/transfer/YoroiPaperWalletFormPage.js index 67b409acbd..6dc3ec29c1 100644 --- a/app/containers/transfer/YoroiPaperWalletFormPage.js +++ b/app/containers/transfer/YoroiPaperWalletFormPage.js @@ -12,7 +12,7 @@ import BaseTransferPage from '../../components/transfer/BaseTransferPage'; const messages = defineMessages({ step0: { id: 'yoroiTransfer.form.instructions.step0Paper.text', - defaultMessage: '!!!Enter the 21-word recovery phrase used to back up your Yoroi Paper wallet and your paper password to restore the balance and transfer all the funds.', + defaultMessage: '!!!Enter the 21-word recovery phrase used to back up your Yoroi Paper wallet and your paper password to validate the balance.', }, }); diff --git a/app/containers/transfer/YoroiTransferErrorPage.js b/app/containers/transfer/YoroiTransferErrorPage.js index 2ee631abe6..4540dab7f6 100644 --- a/app/containers/transfer/YoroiTransferErrorPage.js +++ b/app/containers/transfer/YoroiTransferErrorPage.js @@ -9,7 +9,7 @@ import globalMessages from '../../i18n/global-messages'; const messages = defineMessages({ title: { id: 'yoroiTransfer.errorPage.title.label', - defaultMessage: '!!!Unable to transfer from another wallet', + defaultMessage: '!!!Unable to verify your balance", }, }); diff --git a/app/containers/transfer/YoroiTransferFormPage.js b/app/containers/transfer/YoroiTransferFormPage.js index 575e7c3ce0..a7ef3256d0 100644 --- a/app/containers/transfer/YoroiTransferFormPage.js +++ b/app/containers/transfer/YoroiTransferFormPage.js @@ -11,7 +11,7 @@ import BaseTransferPage from '../../components/transfer/BaseTransferPage'; const messages = defineMessages({ step0: { id: 'yoroiTransfer.form.instructions.step0.text', - defaultMessage: '!!!Enter the 15-word recovery phrase used to back up your other wallet to restore the balance and transfer all the funds to current wallet.', + defaultMessage: '!!!Enter the 15-word recovery phrase used to back up your wallet to validate the balance.', }, }); diff --git a/app/i18n/global-messages.js b/app/i18n/global-messages.js index c9d4574327..dfd28eb1fd 100644 --- a/app/i18n/global-messages.js +++ b/app/i18n/global-messages.js @@ -234,7 +234,7 @@ const globalMessages = defineMessages({ }, step1: { id: 'transfer.form.instructions.step1.text', - defaultMessage: '!!!It will take about 1 minute to restore your balance. In the next step, you will be presented with a transaction that will move all of your funds. Please review the details of the transaction carefully. You will need to pay a standard transaction fee on the Cardano network to make the transaction.', + defaultMessage: '!!!It will take about 1 minute to verify your balance.', }, languageSelectLabel: { id: 'profile.languageSelect.form.languageSelectLabel',