Merge pull request #10201 from Expensify/update-staging-from-main

Update version to 1.1.87-6 on staging

Author: OSBotify

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001018705
-        versionName "1.1.87-5"
+        versionCode 1001018706
+        versionName "1.1.87-6"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.87.5</string>
+	<string>1.1.87.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.87.5</string>
+	<string>1.1.87.6</string>
 </dict>
 </plist>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.87-5",
+  "version": "1.1.87-6",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

package.json

@@ -28,9 +28,6 @@ export default {
     // Note: These are Persisted Requests - not all requests in the main queue as the key name might lead one to believe
     PERSISTED_REQUESTS: 'networkRequestQueue',
 
-    // What the active route is for our navigator. Global route that determines what views to display.
-    CURRENT_URL: 'currentURL',
-
     // Stores current date
     CURRENT_DATE: 'currentDate',
 

src/ONYXKEYS.js

@@ -3,6 +3,7 @@ import Onyx, {withOnyx} from 'react-native-onyx';
 import moment from 'moment';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
+import PropTypes from 'prop-types';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
 import CONST from '../../../CONST';
@@ -86,6 +87,9 @@ const modalScreenListeners = {
 
 const propTypes = {
     ...windowDimensionsPropTypes,
+
+    /** The current path as reported by the NavigationContainer */
+    currentPath: PropTypes.string.isRequired,
 };
 
 class AuthScreens extends React.Component {
@@ -115,7 +119,6 @@ class AuthScreens extends React.Component {
         App.openApp(this.props.allPolicies);
 
         App.fixAccountAndReloadData();
-        App.setUpPoliciesAndNavigate(this.props.session);
         Timing.end(CONST.TIMING.HOMEPAGE_INITIAL_RENDER);
 
         const searchShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SEARCH;
@@ -133,6 +136,11 @@ class AuthScreens extends React.Component {
     }
 
     shouldComponentUpdate(nextProps) {
+        // we perform this check here instead of componentDidUpdate to skip an unnecessary re-render
+        if (this.props.currentPath !== nextProps.currentPath) {
+            App.setUpPoliciesAndNavigate(nextProps.session, nextProps.currentPath);
+        }
+
         return nextProps.isSmallScreenWidth !== this.props.isSmallScreenWidth;
     }
 

src/libs/Navigation/AppNavigator/AuthScreens.js

@@ -6,14 +6,17 @@ import AuthScreens from './AuthScreens';
 const propTypes = {
     /** If we have an authToken this is true */
     authenticated: PropTypes.bool.isRequired,
+
+    /** The current path as reported by the NavigationContainer */
+    currentPath: PropTypes.string.isRequired,
 };
 
 const AppNavigator = props => (
     props.authenticated
         ? (
 
             // These are the protected screens and only accessible when an authToken is present
-            <AuthScreens />
+            <AuthScreens currentPath={props.currentPath} />
         )
         : (
             <PublicScreens />

src/libs/Navigation/AppNavigator/index.js

@@ -10,11 +10,6 @@ import ONYXKEYS from '../../ONYXKEYS';
 import linkingConfig from './linkingConfig';
 import navigationRef from './navigationRef';
 
-let resolveNavigationIsReadyPromise;
-let navigationIsReadyPromise = new Promise((resolve) => {
-    resolveNavigationIsReadyPromise = resolve;
-});
-
 let isLoggedIn = false;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
@@ -191,23 +186,6 @@ function isActiveRoute(routePath) {
     return getActiveRoute().substring(1) === routePath;
 }
 
-/**
- * @returns {Promise}
- */
-function isNavigationReady() {
-    return navigationIsReadyPromise;
-}
-
-function setIsNavigationReady() {
-    resolveNavigationIsReadyPromise();
-}
-
-function resetIsNavigationReady() {
-    navigationIsReadyPromise = new Promise((resolve) => {
-        resolveNavigationIsReadyPromise = resolve;
-    });
-}
-
 export default {
     canNavigate,
     navigate,
@@ -218,9 +196,6 @@ export default {
     closeDrawer,
     getDefaultDrawerState,
     setDidTapNotification,
-    isNavigationReady,
-    setIsNavigationReady,
-    resetIsNavigationReady,
 };
 
 export {

src/libs/Navigation/Navigation.js

@@ -4,7 +4,6 @@ import {getPathFromState, NavigationContainer, DefaultTheme} from '@react-naviga
 import * as Navigation from './Navigation';
 import linkingConfig from './linkingConfig';
 import AppNavigator from './AppNavigator';
-import * as App from '../actions/App';
 import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
 import Log from '../Log';
 import colors from '../../styles/colors';
@@ -31,6 +30,10 @@ class NavigationRoot extends Component {
     constructor(props) {
         super(props);
 
+        this.state = {
+            currentPath: '',
+        };
+
         this.parseAndStoreRoute = this.parseAndStoreRoute.bind(this);
     }
 
@@ -43,15 +46,16 @@ class NavigationRoot extends Component {
             return;
         }
 
-        const path = getPathFromState(state, linkingConfig.config);
+        const currentPath = getPathFromState(state, linkingConfig.config);
 
         // Don't log the route transitions from OldDot because they contain authTokens
-        if (path.includes('/transition')) {
+        if (currentPath.includes('/transition')) {
             Log.info('Navigating from transition link from OldDot using short lived authToken');
         } else {
-            Log.info('Navigating to route', false, {path});
+            Log.info('Navigating to route', false, {path: currentPath});
         }
-        App.setCurrentURL(path);
+
+        this.setState({currentPath});
     }
 
     render() {
@@ -72,7 +76,7 @@ class NavigationRoot extends Component {
                     enabled: false,
                 }}
             >
-                <AppNavigator authenticated={this.props.authenticated} />
+                <AppNavigator authenticated={this.props.authenticated} currentPath={this.state.currentPath} />
             </NavigationContainer>
         );
     }

src/libs/Navigation/NavigationRoot.js

@@ -1,5 +1,5 @@
 import moment from 'moment-timezone';
-import {AppState, Linking} from 'react-native';
+import {AppState} from 'react-native';
 import Onyx from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import Str from 'expensify-common/lib/str';
@@ -54,13 +54,6 @@ Onyx.connect({
     },
 });
 
-/**
- * @param {String} url
- */
-function setCurrentURL(url) {
-    Onyx.set(ONYXKEYS.CURRENT_URL, url);
-}
-
 /**
 * @param {String} locale
 */
@@ -165,13 +158,10 @@ function fixAccountAndReloadData() {
 }
 
 /**
- * This action runs every time the AuthScreens are mounted. The navigator may
- * not be ready yet, and therefore we need to wait before navigating within this
- * action and any actions this method calls.
+ * This action runs when the Navigator is ready and the current route changes
+ *
+ * currentPath should be the path as reported by the NavigationContainer
  *
- * getInitialURL allows us to access params from the transition link more easily
- * than trying to extract them from the navigation state.
-
  * The transition link contains an exitTo param that contains the route to
  * navigate to after the user is signed in. A user can transition from OldDot
  * with a different account than the one they are currently signed in with, so
@@ -186,33 +176,36 @@ function fixAccountAndReloadData() {
  * pass it in as a parameter. withOnyx guarantees that the value has been read
  * from Onyx because it will not render the AuthScreens until that point.
  * @param {Object} session
+ * @param {string} currentPath
  */
-function setUpPoliciesAndNavigate(session) {
-    Linking.getInitialURL()
-        .then((url) => {
-            if (!url) {
-                return;
-            }
-            const path = new URL(url).pathname;
-            const params = new URLSearchParams(url);
-            const exitTo = params.get('exitTo');
-            const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(url, session.email);
-            const shouldCreateFreePolicy = !isLoggingInAsNewUser
-                        && Str.startsWith(path, Str.normalizeUrl(ROUTES.TRANSITION_FROM_OLD_DOT))
+function setUpPoliciesAndNavigate(session, currentPath) {
+    if (!session || !currentPath || !currentPath.includes('exitTo')) {
+        return;
+    }
+
+    let exitTo;
+    try {
+        const url = new URL(currentPath, CONST.NEW_EXPENSIFY_URL);
+        exitTo = url.searchParams.get('exitTo');
+    } catch (error) {
+        // URLSearchParams is unsupported on iOS so we catch th error and
+        // silence it here since this is primarily a Web flow
+        return;
+    }
+
+    const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(currentPath, session.email);
+    const shouldCreateFreePolicy = !isLoggingInAsNewUser
+                        && Str.startsWith(currentPath, Str.normalizeUrl(ROUTES.TRANSITION_FROM_OLD_DOT))
                         && exitTo === ROUTES.WORKSPACE_NEW;
-            if (shouldCreateFreePolicy) {
-                Policy.createAndGetPolicyList();
-                return;
-            }
-            if (!isLoggingInAsNewUser && exitTo) {
-                Navigation.isNavigationReady()
-                    .then(() => {
-                        // We must call dismissModal() to remove the /transition route from history
-                        Navigation.dismissModal();
-                        Navigation.navigate(exitTo);
-                    });
-            }
-        });
+    if (shouldCreateFreePolicy) {
+        Policy.createAndGetPolicyList();
+        return;
+    }
+    if (!isLoggingInAsNewUser && exitTo) {
+        // We must call dismissModal() to remove the /transition route from history
+        Navigation.dismissModal();
+        Navigation.navigate(exitTo);
+    }
 }
 
 function openProfile() {
@@ -255,7 +248,6 @@ NetworkConnection.onReconnect(() => {
 });
 
 export {
-    setCurrentURL,
     setLocale,
     setSidebarLoaded,
     getAppData,

src/libs/actions/App.js

@@ -238,7 +238,6 @@ function createAndGetPolicyList() {
             newPolicyID = policyID;
             return getPolicyList();
         })
-        .then(Navigation.isNavigationReady)
         .then(() => {
             Navigation.dismissModal();
             navigateToPolicy(newPolicyID);

src/libs/actions/Policy.js

@@ -6,7 +6,6 @@ import {withOnyx} from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 import * as Session from '../libs/actions/Session';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
-import Navigation from '../libs/Navigation/Navigation';
 import * as SessionUtils from '../libs/SessionUtils';
 
 const propTypes = {
@@ -25,16 +24,7 @@ class LogOutPreviousUserPage extends Component {
                 const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(transitionURL, sessionEmail);
                 if (isLoggingInAsNewUser) {
                     Session.signOutAndRedirectToSignIn();
-                    return;
                 }
-
-                // Since we conditionally render navigators in the AppNavigator, when we
-                // sign out and sign back in there will be a moment where no navigator
-                // is rendered and the navigation state is null. We can't navigate at
-                // that time, so we use a promise to delay transition navigation until
-                // it is ready. We set the navigation ready here since we know that the
-                // navigator is now rendered.
-                Navigation.setIsNavigationReady();
             });
     }