Merge pull request #4205 from Expensify/chirag-beta-race-fixes

Beta race fixes

src/Expensify.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import React, {PureComponent} from 'react';
 import {View, AppState} from 'react-native';
 import Onyx, {withOnyx} from 'react-native-onyx';
+import _ from 'underscore';
 
 import BootSplash from './libs/BootSplash';
 import listenToStorageEvents from './libs/listenToStorageEvents';
@@ -21,6 +22,7 @@ import {growlRef} from './libs/Growl';
 import Navigation from './libs/Navigation/Navigation';
 import ROUTES from './ROUTES';
 import StartupTimer from './libs/StartupTimer';
+import {setRedirectToWorkspaceNewAfterSignIn} from './libs/actions/Session';
 
 // Initialize the store when the app loads for the first time
 Onyx.init({
@@ -69,6 +71,9 @@ const propTypes = {
 
     /** Whether the initial data needed to render the app is ready */
     initialReportDataLoaded: PropTypes.bool,
+
+    /** List of betas */
+    betas: PropTypes.arrayOf(PropTypes.string),
 };
 
 const defaultProps = {
@@ -79,6 +84,7 @@ const defaultProps = {
     },
     updateAvailable: false,
     initialReportDataLoaded: false,
+    betas: [],
 };
 
 class Expensify extends PureComponent {
@@ -129,9 +135,13 @@ class Expensify extends PureComponent {
         const previousAuthToken = lodashGet(prevProps, 'session.authToken', null);
         if (this.getAuthToken() && !previousAuthToken) {
             BootSplash.show({fade: true});
-            if (lodashGet(this.props, 'session.redirectToWorkspaceNewAfterSignIn', false)) {
-                Navigation.navigate(ROUTES.WORKSPACE_NEW);
-            }
+        }
+
+        if (this.getAuthToken()
+            && !_.isEmpty(this.props.betas)
+            && lodashGet(this.props, 'session.redirectToWorkspaceNewAfterSignIn', false)) {
+            setRedirectToWorkspaceNewAfterSignIn(false);
+            Navigation.navigate(ROUTES.WORKSPACE_NEW);
         }
 
         if (this.getAuthToken() && this.props.initialReportDataLoaded) {
@@ -188,6 +198,9 @@ export default withOnyx({
     session: {
         key: ONYXKEYS.SESSION,
     },
+    betas: {
+        key: ONYXKEYS.BETAS,
+    },
     updateAvailable: {
         key: ONYXKEYS.UPDATE_AVAILABLE,
         initWithStoredValues: false,

src/libs/actions/Session.js

@@ -299,6 +299,15 @@ function continueSessionFromECom(accountID, validateCode, twoFactorAuthCode) {
     });
 }
 
+/**
+ * Sets the redirectToWorkspaceNewAfterSignIn flag in the session variable
+ *
+ * @param {Boolean} shouldRedirect
+ */
+function setRedirectToWorkspaceNewAfterSignIn(shouldRedirect) {
+    Onyx.merge(ONYXKEYS.SESSION, {redirectToWorkspaceNewAfterSignIn: shouldRedirect});
+}
+
 export {
     continueSessionFromECom,
     fetchAccountDetails,
@@ -309,4 +318,5 @@ export {
     resendValidationLink,
     resetPassword,
     restartSignin,
+    setRedirectToWorkspaceNewAfterSignIn,
 };

src/pages/ValidateLogin2FANewWorkspacePage.js

@@ -3,9 +3,10 @@ import {TextInput, View} from 'react-native';
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
+import _ from 'underscore';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
 import validateLinkPropTypes from './validateLinkPropTypes';
-import {continueSessionFromECom} from '../libs/actions/Session';
+import {continueSessionFromECom, setRedirectToWorkspaceNewAfterSignIn} from '../libs/actions/Session';
 import styles from '../styles/styles';
 import ExpensifyCashLogo from '../components/ExpensifyCashLogo';
 import variables from '../styles/variables';
@@ -30,6 +31,9 @@ const propTypes = {
     /** The accountID and validateCode are passed via the URL */
     route: validateLinkPropTypes,
 
+    /** List of betas */
+    betas: PropTypes.arrayOf(PropTypes.string),
+
     ...withLocalizePropTypes,
 };
 
@@ -38,6 +42,7 @@ const defaultProps = {
         params: {},
     },
     session: {},
+    betas: [],
 };
 class ValidateLogin2FANewWorkspacePage extends Component {
     constructor(props) {
@@ -62,7 +67,12 @@ class ValidateLogin2FANewWorkspacePage extends Component {
             // by calling dismissModal(), the /v/... route is removed from history so the user will get taken to `/`
             // if they cancel out of the new workspace modal.
             Navigation.dismissModal();
-            Navigation.navigate(ROUTES.WORKSPACE_NEW);
+
+            if (_.isEmpty(this.props.betas)) {
+                setRedirectToWorkspaceNewAfterSignIn(true);
+            } else {
+                Navigation.navigate(ROUTES.WORKSPACE_NEW);
+            }
         }
     }
 
@@ -144,5 +154,8 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
     }),
 )(ValidateLogin2FANewWorkspacePage);

src/pages/ValidateLoginNewWorkspacePage.js

@@ -2,12 +2,14 @@ import {Component} from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
+import _ from 'underscore';
 import validateLinkPropTypes from './validateLinkPropTypes';
 import compose from '../libs/compose';
 import ONYXKEYS from '../ONYXKEYS';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
-import {continueSessionFromECom} from '../libs/actions/Session';
+import {continueSessionFromECom, setRedirectToWorkspaceNewAfterSignIn} from '../libs/actions/Session';
+
 
 const propTypes = {
     /* Onyx Props */
@@ -20,13 +22,17 @@ const propTypes = {
 
     /** The accountID and validateCode are passed via the URL */
     route: validateLinkPropTypes,
+
+    /** List of betas */
+    betas: PropTypes.arrayOf(PropTypes.string),
 };
 
 const defaultProps = {
     route: {
         params: {},
     },
     session: {},
+    betas: [],
 };
 class ValidateLoginNewWorkspacePage extends Component {
     componentDidMount() {
@@ -39,7 +45,11 @@ class ValidateLoginNewWorkspacePage extends Component {
             // by calling dismissModal(), the /v/... route is removed from history so the user will get taken to `/`
             // if they cancel out of the new workspace modal.
             Navigation.dismissModal();
-            Navigation.navigate(ROUTES.WORKSPACE_NEW);
+            if (_.isEmpty(this.props.betas)) {
+                setRedirectToWorkspaceNewAfterSignIn(true);
+            } else {
+                Navigation.navigate(ROUTES.WORKSPACE_NEW);
+            }
             return;
         }
 
@@ -63,5 +73,8 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
     }),
 )(ValidateLoginNewWorkspacePage);

src/pages/workspace/PublicWorkspaceNewView.js

@@ -1,8 +1,7 @@
 import React from 'react';
-import Onyx from 'react-native-onyx';
 import PropTypes from 'prop-types';
-import ONYXKEYS from '../../ONYXKEYS';
 import SCREENS from '../../SCREENS';
+import {setRedirectToWorkspaceNewAfterSignIn} from '../../libs/actions/Session';
 
 const propTypes = {
     /** react-navigation navigation object available to screen components */
@@ -14,7 +13,7 @@ const propTypes = {
 
 class PublicWorkspaceNewView extends React.PureComponent {
     componentDidMount() {
-        Onyx.merge(ONYXKEYS.SESSION, {redirectToWorkspaceNewAfterSignIn: true});
+        setRedirectToWorkspaceNewAfterSignIn(true);
         this.props.navigation.replace(SCREENS.HOME);
     }