From ab84327659aa4fd215f81a5612ae6ae0974dbb4e Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Mon, 18 Nov 2019 07:22:22 +0100
Subject: [PATCH 1/2] display sign in instructions for emails that exist

---
 package-lock.json                              |  4 ++--
 package.json                                   |  2 +-
 src/page/firstRun/index.js                     |  2 ++
 .../firstRun/internal/email-verify-page.js     | 18 ++++++++++--------
 src/page/firstRun/view.js                      |  2 ++
 src/page/verification/index.js                 |  2 ++
 .../verification/internal/email-verify-page.js | 13 ++++++++-----
 src/page/verification/view.js                  |  2 ++
 8 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b3eae37..4463935 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5649,8 +5649,8 @@
             }
         },
         "lbryinc": {
-            "version": "github:lbryio/lbryinc#27b6fcb8391b54cc9ea4d0a52a6ee536e39aa166",
-            "from": "github:lbryio/lbryinc#27b6fcb8391b54cc9ea4d0a52a6ee536e39aa166",
+            "version": "github:lbryio/lbryinc#2aedf5a188f028f61c45bc7ed0c747a2d4ae453a",
+            "from": "github:lbryio/lbryinc#2aedf5a188f028f61c45bc7ed0c747a2d4ae453a",
             "requires": {
                 "reselect": "^3.0.0"
             }
diff --git a/package.json b/package.json
index 5bc262a..2be8d81 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
         "@expo/vector-icons": "^8.1.0",
         "gfycat-style-urls": "^1.0.3",
         "lbry-redux": "lbryio/lbry-redux#8ac92e3abfa0a9aacdb2fa4a144c3fadc4da6b11",
-        "lbryinc": "lbryio/lbryinc#27b6fcb8391b54cc9ea4d0a52a6ee536e39aa166",
+        "lbryinc": "lbryio/lbryinc#2aedf5a188f028f61c45bc7ed0c747a2d4ae453a",
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
         "moment": "^2.22.1",
diff --git a/src/page/firstRun/index.js b/src/page/firstRun/index.js
index e3ff6ac..5ace72e 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,
@@ -27,6 +28,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-verify-page.js b/src/page/firstRun/internal/email-verify-page.js
index 64f24ca..775760b 100644
--- a/src/page/firstRun/internal/email-verify-page.js
+++ b/src/page/firstRun/internal/email-verify-page.js
@@ -4,7 +4,7 @@ import { ActivityIndicator, Linking, NativeModules, Platform, Switch, Text, Text
 import AsyncStorage from '@react-native-community/async-storage';
 import Button from 'component/button';
 import Colors from 'styles/colors';
-import Constants from 'constants';
+import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import Icon from 'react-native-vector-icons/FontAwesome5';
 import firstRunStyle from 'styles/firstRun';
 
@@ -17,17 +17,19 @@ class EmailVerifyPage extends React.PureComponent {
   };
 
   render() {
-    const { onEmailViewLayout, email } = this.props;
+    const { onEmailViewLayout, email, emailAlreadyExists } = this.props;
 
     const content = (
       <View onLayout={() => onEmailViewLayout('verify')}>
-        <Text style={firstRunStyle.title}>Verify Email</Text>
+        <Text style={firstRunStyle.title}>{emailAlreadyExists ? 'Sign In' : 'Verify Email'}</Text>
+
         <Text style={firstRunStyle.paragraph}>
-          An email has been sent to{' '}
-          <Text style={firstRunStyle.nowrap} numberOfLines={1}>
-            {email}
-          </Text>
-          . Please follow the instructions in the message to verify your email address.
+          An email has been sent to
+          {'\n\n'}
+          {email}
+          {'\n\n'}
+          Please follow the instructions in the message to{' '}
+          {emailAlreadyExists ? 'complete signing in' : 'verify your email address'}.
         </Text>
 
         <View style={firstRunStyle.buttonContainer}>
diff --git a/src/page/firstRun/view.js b/src/page/firstRun/view.js
index a136287..ad511d5 100644
--- a/src/page/firstRun/view.js
+++ b/src/page/firstRun/view.js
@@ -318,6 +318,7 @@ class FirstRunScreen extends React.PureComponent {
       authenticating,
       authToken,
       checkSync,
+      emailAlreadyExists,
       emailNewErrorMessage,
       emailNewPending,
       emailToVerify,
@@ -358,6 +359,7 @@ class FirstRunScreen extends React.PureComponent {
           <EmailVerifyPage
             onEmailViewLayout={this.onEmailViewLayout}
             email={this.state.email}
+            emailAlreadyExists={emailAlreadyExists}
             notify={notify}
             resendVerificationEmail={resendVerificationEmail}
           />
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 97d2b87..400dc67 100644
--- a/src/page/verification/internal/email-verify-page.js
+++ b/src/page/verification/internal/email-verify-page.js
@@ -105,12 +105,12 @@ class EmailVerifyPage extends React.PureComponent {
   };
 
   render() {
-    const { emailNewPending } = this.props;
+    const { emailAlreadyExists, emailNewPending } = this.props;
 
     return (
       <View style={firstRunStyle.container}>
         <Text style={rewardStyle.verificationTitle}>
-          {Constants.PHASE_COLLECTION === this.state.phase ? 'Email' : 'Verify Email'}
+          {Constants.PHASE_COLLECTION === this.state.phase ? 'Email' : emailAlreadyExists ? 'Sign In' : 'Verify Email'}
         </Text>
         {Constants.PHASE_COLLECTION === this.state.phase && (
           <View>
@@ -138,7 +138,7 @@ class EmailVerifyPage extends React.PureComponent {
                 <Button
                   style={rewardStyle.verificationButton}
                   theme={'light'}
-                  text={'Send verification email'}
+                  text={'Continue'}
                   onPress={this.onSendVerificationPressed}
                 />
               )}
@@ -154,8 +154,11 @@ class EmailVerifyPage extends React.PureComponent {
         {Constants.PHASE_VERIFICATION === this.state.phase && (
           <View>
             <Text style={firstRunStyle.paragraph}>
-              An email has been sent to <Text style={firstRunStyle.nowrap}>{this.state.email}</Text>. 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'}
+              Please follow the instructions in the message to{' '}
+              {emailAlreadyExists ? 'finish signing in' : 'verify your email address'}.
             </Text>
 
             <View style={rewardStyle.buttonContainer}>
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 = (
           <EmailVerifyPage
             addUserEmail={addUserEmail}
+            emailAlreadyExists={emailAlreadyExists}
             emailNewErrorMessage={emailNewErrorMessage}
             emailNewPending={emailNewPending}
             emailToVerify={emailToVerify}
-- 
2.45.2


From e137e8f76c6d8b0e9727766674c42867a19418b9 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 28 Nov 2019 05:13:49 +0100
Subject: [PATCH 2/2] lbry.tv account

---
 src/page/firstRun/internal/email-collect-page.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/page/firstRun/internal/email-collect-page.js b/src/page/firstRun/internal/email-collect-page.js
index 04bb651..357a744 100644
--- a/src/page/firstRun/internal/email-collect-page.js
+++ b/src/page/firstRun/internal/email-collect-page.js
@@ -3,7 +3,7 @@ import { Lbry } from 'lbry-redux';
 import { NativeModules, Platform, Text, TextInput, View } from 'react-native';
 import AsyncStorage from '@react-native-community/async-storage';
 import Colors from 'styles/colors';
-import Constants from 'constants';
+import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import firstRunStyle from 'styles/firstRun';
 
 class EmailCollectPage extends React.PureComponent {
@@ -64,7 +64,7 @@ class EmailCollectPage extends React.PureComponent {
           }}
         />
         <Text style={firstRunStyle.paragraph}>
-          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 synced.
         </Text>
         <Text style={firstRunStyle.infoParagraph}>
           This information is disclosed only to LBRY, Inc. and not to the LBRY network.
-- 
2.45.2