From 85d8e29b145dfc2027e8fccfbb9506d2974e4349 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 25 Jan 2022 14:06:05 -0800
Subject: [PATCH 1/2] Merge pull request #7401 from
Expensify/version-BUILD-ba15491a3fdcbe569ffbac0a3713a6d57ff51b4d
(cherry picked from commit 3b2403af3c7a8fd092c792ee7ec5cb9a528c862d)
---
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 eaadee9751c..43bd71ca0bf 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 1001013201
- versionName "1.1.32-1"
+ versionCode 1001013202
+ versionName "1.1.32-2"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index c59bd66518e..918eda82213 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.32.1
+ 1.1.32.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 492062abb53..7464670e73a 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.32.1
+ 1.1.32.2
diff --git a/package-lock.json b/package-lock.json
index 4de489ed0f3..34587378e1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.32-1",
+ "version": "1.1.32-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index dc3ecd2cb34..ea093f42531 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.32-1",
+ "version": "1.1.32-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 710e8693b707b5342a1d58ad761e13d661ec118a Mon Sep 17 00:00:00 2001
From: Daniel Doglas
Date: Tue, 25 Jan 2022 19:03:21 -0300
Subject: [PATCH 2/2] Merge pull request #7397 from
Expensify/cmartins-deleteCredentialsOnSignOut
Remove credentials and session from Onyx on sign out
(cherry picked from commit ba15491a3fdcbe569ffbac0a3713a6d57ff51b4d)
---
src/libs/actions/Session/index.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 490a7951648..f57fcd7a3c0 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -83,6 +83,8 @@ function signOut() {
})
.catch(error => Onyx.merge(ONYXKEYS.SESSION, {error: error.message}));
}
+ Onyx.set(ONYXKEYS.SESSION, null);
+ Onyx.set(ONYXKEYS.CREDENTIALS, null);
Timing.clearData();
redirectToSignIn();
Log.info('Redirecting to Sign In because signOut() was called');