From 8a9ceef908044a015077a38ee8819595179c05c4 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 12 Aug 2021 12:25:21 -0700
Subject: [PATCH 1/2] Merge pull request #4620 from
Expensify/version-BUILD-3f72e03248a8e819b09d2a75a8be5c95d485c3ff
(cherry picked from commit b9b23e1e68354e51f071e261dc066338c15ef35e)
---
android/app/build.gradle | 4 ++--
ios/ExpensifyCash/Info.plist | 2 +-
ios/ExpensifyCashTests/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 07eb94525c8c..22d8ebfd7090 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 1001008501
- versionName "1.0.85-1"
+ versionCode 1001008502
+ versionName "1.0.85-2"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 66d27e0728c2..2d857dc62285 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.85.1
+ 1.0.85.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index a0b38dec5980..305910f1b687 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.85.1
+ 1.0.85.2
diff --git a/package-lock.json b/package-lock.json
index e635e5356e5e..6eb2cf4e4d12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.0.85-1",
+ "version": "1.0.85-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index f250a0aa4810..1862b13094ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.0.85-1",
+ "version": "1.0.85-2",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From 8dad7a8a8fa5715346b8ed3615b508ee8641cec3 Mon Sep 17 00:00:00 2001
From: Francois Laithier
Date: Thu, 12 Aug 2021 12:22:13 -0700
Subject: [PATCH 2/2] Merge pull request #4614 from
kidroca/kidroca/redirectToSignIn-clear-storage-fix
Clear storage immediately on sign out
(cherry picked from commit 3f72e03248a8e819b09d2a75a8be5c95d485c3ff)
---
src/libs/actions/SignInRedirect.js | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/libs/actions/SignInRedirect.js b/src/libs/actions/SignInRedirect.js
index fec0dafc581c..481fff07e3d7 100644
--- a/src/libs/actions/SignInRedirect.js
+++ b/src/libs/actions/SignInRedirect.js
@@ -45,21 +45,18 @@ function redirectToSignIn(errorMessage) {
const activeClients = currentActiveClients;
const preferredLocale = currentPreferredLocale;
- // We must set the authToken to null so we can navigate to "signin" it's not possible to navigate to the route as
- // it only exists when the authToken is null.
- Onyx.set(ONYXKEYS.SESSION, {authToken: null})
+ // Clearing storage discards the authToken. This causes a redirect to the SignIn screen
+ Onyx.clear()
.then(() => {
- Onyx.clear().then(() => {
- if (preferredLocale) {
- Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, preferredLocale);
- }
- if (errorMessage) {
- Onyx.set(ONYXKEYS.SESSION, {error: errorMessage});
- }
- if (activeClients && activeClients.length > 0) {
- Onyx.set(ONYXKEYS.ACTIVE_CLIENTS, activeClients);
- }
- });
+ if (preferredLocale) {
+ Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, preferredLocale);
+ }
+ if (errorMessage) {
+ Onyx.set(ONYXKEYS.SESSION, {error: errorMessage});
+ }
+ if (activeClients && activeClients.length > 0) {
+ Onyx.set(ONYXKEYS.ACTIVE_CLIENTS, activeClients);
+ }
});
}