From 1c200f433c62176eee446e9f3146309ea4fafa71 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 3 Oct 2022 12:00:52 -0400
Subject: [PATCH 1/2] Merge pull request #11540 from
 Expensify/version-BUILD-601D08EB-69A8-4D59-A844-8065085DB010

Update version to 1.2.11-2 on main

(cherry picked from commit 5bed8e7b78ac5ea51ec9d994473680f24bbea62e)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index fbc27639ab6b..cfff4ef2be5a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001021101
-        versionName "1.2.11-1"
+        versionCode 1001021102
+        versionName "1.2.11-2"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3b2c995f93e3..19a70a9bfe3a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.11.1</string>
+	<string>1.2.11.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index a9a87cc9ed50..a3bc9009ea2b 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.11.1</string>
+	<string>1.2.11.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index bab59486805a..5ba725a822d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.11-1",
+  "version": "1.2.11-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.11-1",
+      "version": "1.2.11-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index a0615bf52786..a2510e60e43b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.11-1",
+  "version": "1.2.11-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 e120a616a5d094b034fd01167e7ba576ca9f6ea0 Mon Sep 17 00:00:00 2001
From: Andre Fonseca <afonseca@expensify.com>
Date: Mon, 3 Oct 2022 16:55:20 +0100
Subject: [PATCH 2/2] Merge pull request #11539 from
 Expensify/cmartins-earlyReturnActiveClients

Add early return to ActiveClientManager

(cherry picked from commit 1ecf2b054a5b09a4975b6b1f1382c2c1a4a6fae6)
---
 src/libs/ActiveClientManager/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/ActiveClientManager/index.js b/src/libs/ActiveClientManager/index.js
index 908a500d6b72..8eca45209044 100644
--- a/src/libs/ActiveClientManager/index.js
+++ b/src/libs/ActiveClientManager/index.js
@@ -29,6 +29,10 @@ function isReady() {
 Onyx.connect({
     key: ONYXKEYS.ACTIVE_CLIENTS,
     callback: (val) => {
+        if (!val) {
+            return;
+        }
+
         activeClients = val;
 
         // Remove from the beginning of the list any clients that are past the limit, to avoid having thousands of them