From 031e48992e250173540b84f1dff7aa3444760de2 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:35:55 -0800
Subject: [PATCH 1/2] Merge pull request #6938 from
Expensify/version-BUILD-b930390338448d5f93313785215ae9e0f546492e
(cherry picked from commit 24fbf1699645f1db44068e0d22931efec7e5dc27)
---
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 3198bc1b1c6d..d30908a30a64 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001012401
- versionName "1.1.24-1"
+ versionCode 1001012402
+ versionName "1.1.24-2"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f77a5e88a30b..2f02968c2a40 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.24.1
+ 1.1.24.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 81ae62bc484f..1473c4458497 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.24.1
+ 1.1.24.2
diff --git a/package-lock.json b/package-lock.json
index e5655d31372c..1df578370724 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.24-1",
+ "version": "1.1.24-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 74241145f967..e40f56d0469f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.24-1",
+ "version": "1.1.24-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 a2333d80352b94e38602c2a2ea84e18ba133883d Mon Sep 17 00:00:00 2001
From: Amal Nazeem
Date: Wed, 29 Dec 2021 14:33:36 -0500
Subject: [PATCH 2/2] Merge pull request #6936 from
mananjadhav/fix/android-logout
[No QA] fix: null check for app state subscription added
(cherry picked from commit b930390338448d5f93313785215ae9e0f546492e)
---
src/libs/AppStateMonitor/index.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/libs/AppStateMonitor/index.js b/src/libs/AppStateMonitor/index.js
index 2410fb293865..0856f19e5b08 100644
--- a/src/libs/AppStateMonitor/index.js
+++ b/src/libs/AppStateMonitor/index.js
@@ -26,6 +26,9 @@ function addBecameActiveListener(callback) {
}
const appStateChangeSubscription = AppState.addEventListener('change', appStateChangeCallback);
return () => {
+ if (!appStateChangeSubscription) {
+ return;
+ }
appStateChangeSubscription.remove();
};
}