From ccae2f34fea84e2c727ba0a41f9266bbe9f1cba0 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 13 Dec 2021 07:49:02 -0800
Subject: [PATCH 1/2] Merge pull request #6735 from
 Expensify/version-BUILD-ab6b887e4d05cbd67eb7406b9aaf57714e085429

(cherry picked from commit 15bb537ebf508559e81c32d664924b1dcf0be361)
---
 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 b199ec97fc5..afd741ea4b2 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 1001012000
-        versionName "1.1.20-0"
+        versionCode 1001012001
+        versionName "1.1.20-1"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 851bcf6aa1c..d697df2021d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.20.0</string>
+	<string>1.1.20.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index d91c740a14c..cc1fa225c9b 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.20.0</string>
+	<string>1.1.20.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 93c9bd82061..5cac9f01a5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.20-0",
+  "version": "1.1.20-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3d6bc487c9a..a98bbfb7814 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.20-0",
+  "version": "1.1.20-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 74f763179cc25064c88693b0b23afe76c671fffc Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Mon, 13 Dec 2021 10:46:28 -0500
Subject: [PATCH 2/2] Merge pull request #6724 from Expensify/vit-fixRoomName

[CP Staging] Fix same name policy rooms and policy room title and mobile app crashing when creating policy room

(cherry picked from commit ab6b887e4d05cbd67eb7406b9aaf57714e085429)
---
 src/libs/actions/Report.js   | 7 ++++++-
 src/pages/home/HeaderView.js | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 75341c346b9..75ffcad090c 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -125,7 +125,7 @@ function getParticipantEmailsFromReport({sharedReportList}) {
 }
 
 /**
- * Returns the title for a default room or generates one based on the participants
+ * Returns the title for a default room, a policy room or generates one based on the participants
  *
  * @param {Object} fullReport
  * @param {String} chatType
@@ -142,6 +142,11 @@ function getChatReportName(fullReport, chatType) {
             : '')}`;
     }
 
+    // For a basic policy room, return its original name
+    if (ReportUtils.isPolicyRoom({chatType})) {
+        return fullReport.reportName;
+    }
+
     const {sharedReportList} = fullReport;
     return _.chain(sharedReportList)
         .map(participant => participant.email)
diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index 245e9e6e426..a214bf3fade 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -85,8 +85,9 @@ const HeaderView = (props) => {
             };
         },
     );
+    const isPolicyRoom = ReportUtils.isPolicyRoom(props.report);
     const isDefaultChatRoom = ReportUtils.isDefaultRoom(props.report);
-    const title = isDefaultChatRoom
+    const title = isDefaultChatRoom || isPolicyRoom
         ? props.report.reportName
         : _.map(displayNamesWithTooltips, ({displayName}) => displayName).join(', ');
 
@@ -145,7 +146,7 @@ const HeaderView = (props) => {
                                     tooltipEnabled
                                     numberOfLines={1}
                                     textStyles={[styles.headerText]}
-                                    shouldUseFullTitle={isDefaultChatRoom}
+                                    shouldUseFullTitle={isDefaultChatRoom || isPolicyRoom}
                                 />
                                 {isDefaultChatRoom && (
                                     <ExpensifyText