src/component/walletSyncDriver/index.js

@@ -3,7 +3,7 @@ import { doSetClientSetting } from 'redux/actions/settings';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import { doToast } from 'lbry-redux';
 import { selectUserEmail } from 'lbryinc';
-import Constants from 'constants';
+import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api
 import WalletSyncDriver from './view';
 
 const select = state => ({

src/component/walletSyncDriver/view.js

@@ -59,7 +59,7 @@ class WalletSyncDriver extends React.PureComponent<Props> {
               <Text style={walletStyle.labelText}>{__('Connected email')}</Text>
             </View>
             <View style={walletStyle.tableCol}>
-              <Text selectable style={walletStyle.valueText}>
+              <Text selectable style={walletStyle.valueText} numberOfLines={1}>
                 {userEmail || __('No connected email')}
               </Text>
             </View>

src/page/firstRun/internal/wallet-page.js

@@ -28,12 +28,32 @@ class WalletPage extends React.PureComponent {
     walletReady: false,
     hasCheckedSync: false,
     revealPassword: false,
+    autoPassword: false,
+    autoLoginAttempted: false,
   };
 
   componentDidMount() {
     this.checkWalletReady();
   }
 
+  componentDidUpdate() {
+    const { hasSyncedWallet, getSyncIsPending, onPasswordChanged, autoLogin } = this.props;
+    if (this.state.walletReady && this.state.hasCheckedSync && !getSyncIsPending) {
+      if (!hasSyncedWallet && !this.state.autoPassword) {
+        // new account, in which case, don't ask for a password, and act as the final first run step
+        this.setState({ password: '', autoPassword: true });
+        if (onPasswordChanged) {
+          onPasswordChanged('', true);
+        }
+      }
+
+      if (hasSyncedWallet && !this.state.autoLoginAttempted && autoLogin) {
+        autoLogin();
+        this.setState({ autoLoginAttempted: true });
+      }
+    }
+  }
+
   checkWalletReady = () => {
     // make sure the sdk wallet component is ready
     Lbry.status()
@@ -69,6 +89,7 @@ class WalletPage extends React.PureComponent {
       hasSyncedWallet,
       syncApplyIsPending,
       syncApplyStarted,
+      syncApplyCompleted,
     } = this.props;
 
     let content;
@@ -79,7 +100,7 @@ class WalletPage extends React.PureComponent {
           <Text style={firstRunStyle.paragraph}>{__('Retrieving your account information...')}</Text>
         </View>
       );
-    } else if (syncApplyStarted || syncApplyIsPending) {
+    } else if (syncApplyStarted || syncApplyIsPending || syncApplyCompleted) {
       content = (
         <View style={firstRunStyle.centered}>
           <ActivityIndicator size="large" color={Colors.White} style={firstRunStyle.waiting} />
@@ -88,7 +109,8 @@ class WalletPage extends React.PureComponent {
           </Text>
         </View>
       );
-    } else {
+    } else if (hasSyncedWallet && this.state.autoLoginAttempted) {
+      // only display this view if it's not a new user (or auto-login has been attempted once)
       content = (
         <View onLayout={onWalletViewLayout}>
           <Text style={firstRunStyle.title}>Password</Text>

src/page/firstRun/view.js

@@ -30,13 +30,14 @@ class FirstRunScreen extends React.PureComponent {
     enterPasswordTracked: false,
     isFirstRun: false,
     launchUrl: null,
+    languageLoaded: false,
     showSkip: false,
     isEmailVerified: false,
     skipAccountConfirmed: false,
     showBottomContainer: false,
     walletPassword: '',
     syncApplyStarted: false,
-    languageLoaded: false,
+    syncApplyCompleted: false,
   };
 
   componentDidMount() {
@@ -103,8 +104,9 @@ class FirstRunScreen extends React.PureComponent {
     if (this.state.syncApplyStarted && !syncApplyIsPending) {
       if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
         notify({ message: syncApplyErrorMessage, isError: true });
-        this.setState({ showBottomContainer: true, syncApplyStarted: false });
+        this.setState({ showBottomContainer: true, syncApplyStarted: false, syncApplyCompleted: false });
       } else {
+        this.setState({ syncApplyCompleted: true });
         // password successfully verified
         NativeModules.UtilityModule.setSecureValue(
           Constants.KEY_WALLET_PASSWORD,
@@ -185,6 +187,13 @@ class FirstRunScreen extends React.PureComponent {
     });
   };
 
+  autoLogin = () => {
+    const { hasSyncedWallet } = this.props;
+    if (hasSyncedWallet && !this.state.syncApplyStarted) {
+      this.checkWalletPassword();
+    }
+  };
+
   handleContinuePressed = () => {
     const { notify, user, hasSyncedWallet } = this.props;
     const pageIndex = FirstRunScreen.pages.indexOf(this.state.currentPage);
@@ -290,8 +299,12 @@ class FirstRunScreen extends React.PureComponent {
     this.setState({ showBottomContainer: true, showSkip: true });
   };
 
-  onWalletPasswordChanged = password => {
+  onWalletPasswordChanged = (password, finalStep) => {
     this.setState({ walletPassword: password !== null ? password : '' });
+    if (finalStep) {
+      // final step for a new user
+      this.setFreshPassword();
+    }
   };
 
   onWalletViewLayout = () => {
@@ -398,8 +411,10 @@ class FirstRunScreen extends React.PureComponent {
             getSyncIsPending={getSyncIsPending}
             syncApplyIsPending={syncApplyIsPending}
             syncApplyStarted={this.state.syncApplyStarted}
+            syncApplyCompleted={this.state.syncApplyCompleted}
             onWalletViewLayout={this.onWalletViewLayout}
             onPasswordChanged={this.onWalletPasswordChanged}
+            autoLogin={this.autoLogin}
           />
         );
         break;

src/page/verification/internal/sync-verify-page.js

@@ -16,8 +16,12 @@ class SyncVerifyPage extends React.PureComponent {
     password: null,
     placeholder: 'password',
     syncApplyStarted: false,
+    syncApplyCompleted: false,
     syncChecked: false,
     revealPassword: false,
+    autoPassword: false,
+    autoLoginAttempted: false,
+    autoLoginFlow: true,
   };
 
   componentDidMount() {
@@ -64,9 +68,11 @@ class SyncVerifyPage extends React.PureComponent {
     if (this.state.syncApplyStarted && !syncApplyIsPending) {
       if (syncApplyErrorMessage && syncApplyErrorMessage.trim().length > 0) {
         notify({ message: syncApplyErrorMessage, isError: true });
-        this.setState({ syncApplyStarted: false });
+        this.setState({ syncApplyStarted: false, autoLoginFlow: false });
       } else {
         // password successfully verified
+        this.setState({ syncApplyCompleted: true });
+
         if (NativeModules.UtilityModule) {
           NativeModules.UtilityModule.setSecureValue(
             Constants.KEY_WALLET_PASSWORD,
@@ -79,6 +85,19 @@ class SyncVerifyPage extends React.PureComponent {
     }
   }
 
+  componentDidUpdate() {
+    const { hasSyncedWallet } = this.props;
+    if (this.state.syncChecked && !this.state.autoPassword && !hasSyncedWallet) {
+      // new user sync, don't prompt for a password
+      this.setState({ password: '', autoPassword: true });
+      this.onEnableSyncPressed();
+    }
+
+    if (this.state.syncChecked && hasSyncedWallet && !this.state.autoLoginAttempted) {
+      this.setState({ autoLoginAttempted: true, password: '' }, () => this.onEnableSyncPressed());
+    }
+  }
+
   finishSync = (notifyUnlockFailed = false) => {
     const { navigation, notify, setClientSetting } = this.props;
 
@@ -133,7 +152,16 @@ class SyncVerifyPage extends React.PureComponent {
           <Text style={firstRunStyle.paragraph}>{__('Retrieving your account information...')}</Text>
         </View>
       );
-    } else {
+    } else if (this.state.autoLoginFlow && (syncApplyIsPending || this.state.syncApplyCompleted)) {
+      // first attempt at auto-login, only display activity indicator
+      content = (
+        <View>
+          <View style={firstRunStyle.centerInside}>
+            <ActivityIndicator size={'small'} color={Colors.White} />
+          </View>
+        </View>
+      );
+    } else if (hasSyncedWallet && this.state.autoLoginAttempted) {
       content = (
         <View>
           <Text style={rewardStyle.verificationTitle}>{__('Wallet Sync')}</Text>
@@ -198,7 +226,7 @@ class SyncVerifyPage extends React.PureComponent {
                 onPress={this.onEnableSyncPressed}
               />
             )}
-            {syncApplyIsPending && (
+            {(syncApplyIsPending || this.state.syncApplyCompleted) && (
               <View style={firstRunStyle.centerInside}>
                 <ActivityIndicator size={'small'} color={Colors.White} />
               </View>