diff --git a/src/page/firstRun/index.js b/src/page/firstRun/index.js
index 819b68e..70d95b8 100644
--- a/src/page/firstRun/index.js
+++ b/src/page/firstRun/index.js
@@ -8,6 +8,7 @@ import {
doUserEmailNew,
doUserResendVerificationEmail,
selectAuthToken,
+ selectEmailAlreadyExists,
selectEmailNewErrorMessage,
selectEmailNewIsPending,
selectEmailToVerify,
@@ -28,6 +29,7 @@ const select = state => ({
authenticating: selectAuthenticationIsPending(state),
authToken: selectAuthToken(state),
emailToVerify: selectEmailToVerify(state),
+ emailAlreadyExists: selectEmailAlreadyExists(state),
emailNewErrorMessage: selectEmailNewErrorMessage(state),
emailNewPending: selectEmailNewIsPending(state),
hasSyncedWallet: selectHasSyncedWallet(state),
diff --git a/src/page/firstRun/internal/email-collect-page.js b/src/page/firstRun/internal/email-collect-page.js
index 1c870ba..04c9b43 100644
--- a/src/page/firstRun/internal/email-collect-page.js
+++ b/src/page/firstRun/internal/email-collect-page.js
@@ -64,7 +64,7 @@ class EmailCollectPage extends React.PureComponent {
}}
/>
- {__('An account will allow you to earn rewards and keep your account and settings synced.')}
+ {__('A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.')}
{__('This information is disclosed only to LBRY, Inc. and not to the LBRY network.')}
diff --git a/src/page/firstRun/internal/email-verify-page.js b/src/page/firstRun/internal/email-verify-page.js
index c4f2575..835849d 100644
--- a/src/page/firstRun/internal/email-verify-page.js
+++ b/src/page/firstRun/internal/email-verify-page.js
@@ -17,24 +17,26 @@ class EmailVerifyPage extends React.PureComponent {
};
render() {
- const { onEmailViewLayout, email } = this.props;
+ const { onEmailViewLayout, email, emailAlreadyExists } = this.props;
const content = (
onEmailViewLayout('verify')}>
- Verify Email
+ {emailAlreadyExists ? __('Sign In') : __('Verify Email')}
+
- An email has been sent to{' '}
-
- {email}
-
- . Please follow the instructions in the message to verify your email address.
+ {__('An email has been sent to')}
+ {'\n\n'}
+ {email}
+ {'\n\n'}
+ {emailAlreadyExists && __('Please click the link in the message to complete signing in')}
+ {!emailAlreadyExists && __('Please click the link in the message to verify your email address')}.
diff --git a/src/page/firstRun/view.js b/src/page/firstRun/view.js
index d747fba..d29f05e 100644
--- a/src/page/firstRun/view.js
+++ b/src/page/firstRun/view.js
@@ -379,6 +379,7 @@ class FirstRunScreen extends React.PureComponent {
authenticating,
authToken,
checkSync,
+ emailAlreadyExists,
emailNewErrorMessage,
emailNewPending,
emailToVerify,
@@ -420,6 +421,7 @@ class FirstRunScreen extends React.PureComponent {
diff --git a/src/page/verification/index.js b/src/page/verification/index.js
index 4a645ba..0202d6d 100644
--- a/src/page/verification/index.js
+++ b/src/page/verification/index.js
@@ -14,6 +14,7 @@ import {
selectPhoneToVerify,
selectPhoneVerifyIsPending,
selectPhoneVerifyErrorMessage,
+ selectEmailAlreadyExists,
selectEmailNewErrorMessage,
selectEmailNewIsPending,
selectEmailToVerify,
@@ -32,6 +33,7 @@ import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
import Verification from './view';
const select = state => ({
+ emailAlreadyExists: selectEmailAlreadyExists(state),
emailToVerify: selectEmailToVerify(state),
emailNewErrorMessage: selectEmailNewErrorMessage(state),
emailNewPending: selectEmailNewIsPending(state),
diff --git a/src/page/verification/internal/email-verify-page.js b/src/page/verification/internal/email-verify-page.js
index ea71841..6e3635c 100644
--- a/src/page/verification/internal/email-verify-page.js
+++ b/src/page/verification/internal/email-verify-page.js
@@ -105,16 +105,20 @@ class EmailVerifyPage extends React.PureComponent {
};
render() {
- const { emailNewPending } = this.props;
+ const { emailAlreadyExists, emailNewPending } = this.props;
return (
- {Constants.PHASE_COLLECTION === this.state.phase ? __('Email') : __('Verify Email')}
+ {Constants.PHASE_COLLECTION === this.state.phase
+ ? __('Email')
+ : emailAlreadyExists
+ ? __('Sign In')
+ : __('Verify Email')}
{Constants.PHASE_COLLECTION === this.state.phase && (
- Please provide an email address.
+ {__('Please provide an email address.')}
)}
@@ -154,8 +158,12 @@ class EmailVerifyPage extends React.PureComponent {
{Constants.PHASE_VERIFICATION === this.state.phase && (
- An email has been sent to {this.state.email}. Please follow the
- instructions in the message to verify your email address.
+ {__('An email has been sent to')}
+ {'\n\n'}
+ {this.state.email}
+ {'\n\n'}
+ {emailAlreadyExists && __('Please click the link in the message to complete signing in.')}
+ {!emailAlreadyExists && __('Please click the link in the message to verify your email address')}
diff --git a/src/page/verification/internal/manual-verify-page.js b/src/page/verification/internal/manual-verify-page.js
index 7db8034..32f1e44 100644
--- a/src/page/verification/internal/manual-verify-page.js
+++ b/src/page/verification/internal/manual-verify-page.js
@@ -20,22 +20,22 @@ class ManualVerifyPage extends React.PureComponent {
render() {
return (
- Manual Reward Verification
+ {__('Manual Reward Verification')}
{__(
'This account must undergo review before you can participate in the rewards program. This can take anywhere from several minutes to several days.'
)}
- If you continue to see this message, please request to be verified on the{' '}
+ {__('If you continue to see this message, please request to be verified on the')}{' '}
.
- Please enjoy free content in the meantime!
+ {__('Please enjoy free content in the meantime!')}
);
}
diff --git a/src/page/verification/internal/phone-verify-page.js b/src/page/verification/internal/phone-verify-page.js
index 13c4ce4..34f34dc 100644
--- a/src/page/verification/internal/phone-verify-page.js
+++ b/src/page/verification/internal/phone-verify-page.js
@@ -75,7 +75,7 @@ class PhoneVerifyPage extends React.PureComponent {
notify({ message: String(phoneVerifyErrorMessage) });
this.setState({ codeVerifyStarted: false, phoneVerifyFailed: true });
} else {
- notify({ message: 'Your phone number was successfully verified.' });
+ notify({ message: __('Your phone number was successfully verified.') });
this.setState({ codeVerifySuccessful: true, phoneVerifyFailed: false });
if (onPhoneVerifySuccessful) {
onPhoneVerifySuccessful();
@@ -103,7 +103,7 @@ class PhoneVerifyPage extends React.PureComponent {
if (!this.phoneInput.isValidNumber()) {
return notify({
- message: 'Please provide a valid telephone number.',
+ message: __('Please provide a valid telephone number.'),
});
}
@@ -145,7 +145,7 @@ class PhoneVerifyPage extends React.PureComponent {
return (
- {this.state.phase === Constants.PHASE_VERIFICATION ? 'Verify ' : ''}Phone Number
+ {this.state.phase === Constants.PHASE_VERIFICATION ? __('Verify Phone Number') : __('Phone Number')}
@@ -169,7 +169,7 @@ class PhoneVerifyPage extends React.PureComponent {
)}
@@ -187,7 +187,7 @@ class PhoneVerifyPage extends React.PureComponent {
{!phoneVerifyIsPending && !this.codeVerifyStarted && (
- Please enter the verification code sent to {phone}.
+ {__('Please enter the verification code sent to %phone%', { phone })}.
-
+
)}
{phoneVerifyIsPending && (
- Verifying your phone number...
+ {__('Verifying your phone number...')}
{
if (!this.state.password || this.state.password.length === 0) {
- this.setState({ placeholder: 'password' });
+ this.setState({ placeholder: __('password') });
}
}}
/>
diff --git a/src/page/verification/view.js b/src/page/verification/view.js
index 630d055..551fb55 100644
--- a/src/page/verification/view.js
+++ b/src/page/verification/view.js
@@ -118,6 +118,7 @@ class VerificationScreen extends React.PureComponent {
addUserEmail,
checkSync,
emailNewErrorMessage,
+ emailAlreadyExists,
emailNewPending,
emailToVerify,
getSync,
@@ -148,6 +149,7 @@ class VerificationScreen extends React.PureComponent {
page = (