Merge pull request #5874 from Expensify/OSBotify-cherry-pick-staging-…

…5868

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010722
-        versionName "1.1.7-22"
+        versionCode 1001010724
+        versionName "1.1.7-24"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.7.22</string>
+	<string>1.1.7.24</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.7.22</string>
+	<string>1.1.7.24</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.7-22",
+  "version": "1.1.7-24",
   "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.",

src/libs/Navigation/AppNavigator/AuthScreens.js

@@ -170,10 +170,15 @@ class AuthScreens extends React.Component {
         // Load policies, maybe creating a new policy first.
         Linking.getInitialURL()
             .then((url) => {
-                const path = new URL(url).pathname;
-                const exitTo = new URLSearchParams(url).get('exitTo');
-                const shouldCreateFreePolicy = Str.startsWith(path, Str.normalizeUrl(ROUTES.LOGIN_WITH_SHORT_LIVED_TOKEN)) && exitTo === ROUTES.WORKSPACE_NEW;
-                getPolicyList(shouldCreateFreePolicy);
+                // url is null on mobile unless the app was opened via a deeplink
+                if (url) {
+                    const path = new URL(url).pathname;
+                    const exitTo = new URLSearchParams(url).get('exitTo');
+                    const shouldCreateFreePolicy = Str.startsWith(path, Str.normalizeUrl(ROUTES.LOGIN_WITH_SHORT_LIVED_TOKEN)) && exitTo === ROUTES.WORKSPACE_NEW;
+                    getPolicyList(shouldCreateFreePolicy);
+                } else {
+                    getPolicyList(false);
+                }
             });
 
         // Refresh the personal details, timezone and betas every 30 minutes