From 7aea6d253eaafa17737576ad057baff85cd7b3d6 Mon Sep 17 00:00:00 2001
From: Rory Abraham <rory@expensify.com>
Date: Thu, 7 Jul 2022 09:37:36 -0700
Subject: [PATCH 1/2] Standardize on auth providing # prefix in chat rooms

---
 src/libs/ReportUtils.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 3a2224d86b21..2552d0a783d5 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -464,11 +464,7 @@ function getDisplayNamesWithTooltips(participants, isMultipleParticipantReport)
  */
 function getReportName(report, personalDetailsForParticipants = {}, policies = {}) {
     let formattedName;
-    if (isDefaultRoom(report)) {
-        formattedName = `#${report.reportName}`;
-    }
-
-    if (isUserCreatedPolicyRoom(report)) {
+    if (isChatRoom(report)) {
         formattedName = report.reportName;
     }
 

From af84405d59f4020e096421dab6b76e1cd01f8617 Mon Sep 17 00:00:00 2001
From: Rory Abraham <rory@expensify.com>
Date: Tue, 12 Jul 2022 11:09:38 -0700
Subject: [PATCH 2/2] Fix unit tests

---
 tests/unit/OptionsListUtilsTest.js | 4 ++--
 tests/unit/ReportUtilsTest.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/OptionsListUtilsTest.js b/tests/unit/OptionsListUtilsTest.js
index 3a174a50cf1f..dd2cc07922e2 100644
--- a/tests/unit/OptionsListUtilsTest.js
+++ b/tests/unit/OptionsListUtilsTest.js
@@ -807,7 +807,7 @@ describe('OptionsListUtils', () => {
                 participants: ['test3@instantworkspace.com'],
                 policyID: 'ABC123',
                 reportID: 12,
-                reportName: 'admins',
+                reportName: '#admins',
                 unreadActionCount: 0,
                 visibility: undefined,
             },
@@ -822,7 +822,7 @@ describe('OptionsListUtils', () => {
                 participants: ['test3@instantworkspace.com'],
                 policyID: 'ABC123',
                 reportID: 13,
-                reportName: 'admins',
+                reportName: '#admins',
                 unreadActionCount: 0,
                 visibility: undefined,
                 stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index 7f872a012b6a..d77eb6a3c5ab 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -121,7 +121,7 @@ describe('ReportUtils', () => {
         describe('Default Policy Room', () => {
             const baseAdminsRoom = {
                 chatType: CONST.REPORT.CHAT_TYPE.POLICY_ADMINS,
-                reportName: 'admins',
+                reportName: '#admins',
             };
 
             test('Active', () => {