From 875d1afb0dace256e54641b2e20de5eea7f3e9a5 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 14 Oct 2021 20:52:12 -0700
Subject: [PATCH 1/2] Merge pull request #5872 from
Expensify/version-BUILD-3aeb62f9a7f0e06a417f004360ac34e54354e738
(cherry picked from commit cfcaf9367fe9f0d485b69d7c8eda781787923b21)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 2 +-
package.json | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 448c3d947c2e..923492edac1b 100644
--- a/android/app/build.gradle
+++ b/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 {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2889cb1114d3..8410c1fc1b1d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.7.22
+ 1.1.7.24
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1ceef5f1d0c5..744177fb7c0e 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.7.22
+ 1.1.7.24
diff --git a/package-lock.json b/package-lock.json
index 26f677888bc2..e30c8484b93a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-22",
+ "version": "1.1.7-24",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 6cfcc1b5326e..a18d0c924c4e 100644
--- a/package.json
+++ b/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.",
From 2ba66cd531200ae16aab317964b934318a73eec7 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Thu, 14 Oct 2021 20:49:19 -0700
Subject: [PATCH 2/2] Merge pull request #5868 from
Expensify/aldo_fix-missing-workspace-mobile
(cherry picked from commit 3aeb62f9a7f0e06a417f004360ac34e54354e738)
---
src/libs/Navigation/AppNavigator/AuthScreens.js | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
index 10f22a0ca3cd..809d6d1bffb8 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.js
+++ b/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