From 93e32ba920e8c1b8adcaf7c5a9e254137be82a53 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 6 Jan 2022 14:08:05 -0800
Subject: [PATCH 1/2] Merge pull request #7069 from
 Expensify/version-BUILD-f88ec35e98f9354e26fe513bcf80d19ecdced9c2

(cherry picked from commit cb80fcdeabf111ff61c53faea066ede94dd66cd0)
---
 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 1b90e8bbd0c4..e7a70dd5d197 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 1001012600
-        versionName "1.1.26-0"
+        versionCode 1001012601
+        versionName "1.1.26-1"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 617e4fc72fe6..9aeb9b796070 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.26.0</string>
+	<string>1.1.26.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ff258f9d7a85..ade7876527e5 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.1.26.0</string>
+	<string>1.1.26.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 2a8ef7b41e39..71b39494434b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.26-0",
+  "version": "1.1.26-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 94cec44c1510..3a1dd3c5be20 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.26-0",
+  "version": "1.1.26-1",
   "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 3af6d16a700352510a3ee3bd00ce58723a2f0128 Mon Sep 17 00:00:00 2001
From: Francois Laithier <francois@expensify.com>
Date: Thu, 6 Jan 2022 14:05:10 -0800
Subject: [PATCH 2/2] Merge pull request #7065 from
 Expensify/amal-fix-empty-members-ucpr

Allow us to properly see 0 members in a policy room details

(cherry picked from commit f88ec35e98f9354e26fe513bcf80d19ecdced9c2)
---
 src/components/MenuItem.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index 9f4bff17d56e..3c2a3b9dba44 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -110,7 +110,9 @@ const MenuItem = props => (
                 </View>
                 <View style={[styles.flexRow, styles.menuItemTextContainer]}>
                     {props.badgeText && <Badge text={props.badgeText} badgeStyles={[styles.alignSelfCenter]} />}
-                    {props.subtitle && (
+
+                    {/* Since subtitle can be of type number, we should allow 0 to be shown */}
+                    {(props.subtitle || props.subtitle === 0) && (
                         <View style={[styles.justifyContentCenter, styles.mr1]}>
                             <Text
                                 style={styles.textLabelSupporting}