Merge pull request Expensify#48222 from FitseTLT/fix-admin-label-adde…

…d-optimistically-in-policy-rooms Fix - Remove Optimistically added admin role on policy chat reports
jp928 · Aug 30, 2024 · d71e95b · d71e95b
2 parents a37a613 + 66ab027
commit d71e95b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -4975,6 +4975,10 @@ function buildOptimisticTaskReportAction(
     };
 }
 
+function isWorkspaceChat(chatType: string) {
+    return chatType === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS || chatType === CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE || chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT;
+}
+
 /**
  * Builds an optimistic chat report with a randomly generated reportID and as much information as we currently have
  */
@@ -4996,10 +5000,11 @@ function buildOptimisticChatReport(
     optimisticReportID = '',
     shouldShowParticipants = true,
 ): OptimisticChatReport {
+    const isWorkspaceChatType = chatType && isWorkspaceChat(chatType);
     const participants = participantList.reduce((reportParticipants: Participants, accountID: number) => {
         const participant: ReportParticipant = {
             hidden: !shouldShowParticipants,
-            role: accountID === currentUserAccountID ? CONST.REPORT.ROLE.ADMIN : CONST.REPORT.ROLE.MEMBER,
+            ...(!isWorkspaceChatType && {role: accountID === currentUserAccountID ? CONST.REPORT.ROLE.ADMIN : CONST.REPORT.ROLE.MEMBER}),
         };
         // eslint-disable-next-line no-param-reassign
         reportParticipants[accountID] = participant;

diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
@@ -12,7 +12,7 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 const ESH_EMAIL = '[email protected]';
 const ESH_ACCOUNT_ID = 1;
-const ESH_PARTICIPANT: Participant = {hidden: false, role: 'admin'};
+const ESH_PARTICIPANT: Participant = {hidden: false};
 const WORKSPACE_NAME = "Esh's Workspace";
 
 OnyxUpdateManager();