From e66a6c493b752917807f25af34fba5a662de0913 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 17 Mar 2022 15:18:06 -0700
Subject: [PATCH 1/2] Merge pull request #8216 from
Expensify/version-BUILD-7cd7cc0b015aa1d6ad58a1930c3c0b0fe8c63541
Update version to 1.1.44-2 on main
(cherry picked from commit 4b013b1b72532a8c1fbc7b569615f0aab4315157)
---
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 f2303ca9097..951b126d931 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001014401
- versionName "1.1.44-1"
+ versionCode 1001014402
+ versionName "1.1.44-2"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 37a88cc7199..cdc87653761 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.44.1
+ 1.1.44.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index be556d9dfc0..942c1d83184 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.44.1
+ 1.1.44.2
diff --git a/package-lock.json b/package-lock.json
index 253175e575f..e0dc00762ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.44-1",
+ "version": "1.1.44-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 1ff69dcdf42..2d52a069851 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.44-1",
+ "version": "1.1.44-2",
"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 8d12157b6535df1b73914b8ebd147bf8ba659e0a Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Thu, 17 Mar 2022 12:07:45 -1000
Subject: [PATCH 2/2] Merge pull request #8204 from
Expensify/neil-workspace-transition
Exit to the proper page when transitioning
(cherry picked from commit 7cd7cc0b015aa1d6ad58a1930c3c0b0fe8c63541)
---
src/pages/LogInWithShortLivedTokenPage.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/pages/LogInWithShortLivedTokenPage.js b/src/pages/LogInWithShortLivedTokenPage.js
index 61cb4778bf2..acd8c659104 100644
--- a/src/pages/LogInWithShortLivedTokenPage.js
+++ b/src/pages/LogInWithShortLivedTokenPage.js
@@ -121,4 +121,10 @@ export default withOnyx({
session: {
key: ONYXKEYS.SESSION,
},
+
+ // We need to subscribe to the betas so that componentDidUpdate will run,
+ // causing us to exit to the proper page.
+ betas: {
+ key: ONYXKEYS.BETAS,
+ },
})(LogInWithShortLivedTokenPage);