remove sending <mention-report> from room/workspace descriptions

Expensify · Apr 30, 2024 · 9114d95 · 9114d95
1 parent 09ef176
commit 9114d95
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -477,7 +477,6 @@ type OutstandingChildRequest = {
 type ParsingDetails = {
     shouldEscapeText?: boolean;
     reportID?: string;
-    policyID?: string;
 };
 
 let currentUserEmail: string | undefined;
@@ -3307,10 +3306,6 @@ function getParsedComment(text: string, parsingDetails?: ParsingDetails): string
         const currentReport = getReport(parsingDetails?.reportID);
         isGroupPolicyReport = isReportInGroupPolicy(currentReport);
     }
-    if (parsingDetails?.policyID) {
-        const policyType = getPolicy(parsingDetails?.policyID).type;
-        isGroupPolicyReport = isGroupPolicy(policyType);
-    }
 
     const parser = new ExpensiMark();
     const textWithMention = text.replace(CONST.REGEX.SHORT_MENTION, (match) => {
@@ -3380,7 +3375,14 @@ function buildOptimisticInviteReportAction(invitedUserDisplayName: string, invit
     };
 }
 
-function buildOptimisticAddCommentReportAction(text?: string, file?: FileObject, actorAccountID?: number, createdOffset = 0, shouldEscapeText?: boolean, reportID?: string): OptimisticReportAction {
+function buildOptimisticAddCommentReportAction(
+    text?: string,
+    file?: FileObject,
+    actorAccountID?: number,
+    createdOffset = 0,
+    shouldEscapeText?: boolean,
+    reportID?: string,
+): OptimisticReportAction {
     const parser = new ExpensiMark();
     const commentText = getParsedComment(text ?? '', {shouldEscapeText, reportID});
     const isAttachmentOnly = file && !text;

diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
@@ -1736,7 +1736,7 @@ function updateWorkspaceDescription(policyID: string, description: string, curre
     if (description === currentDescription) {
         return;
     }
-    const parsedDescription = ReportUtils.getParsedComment(description, {policyID});
+    const parsedDescription = ReportUtils.getParsedComment(description);
 
     const optimisticData: OnyxUpdate[] = [
         {

diff --git a/src/pages/iou/HoldReasonPage.tsx b/src/pages/iou/HoldReasonPage.tsx
@@ -49,7 +49,7 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
 
     // We first check if the report is part of a policy - if not, then it's a personal request (1:1 request)
     // For personal requests, we need to allow both users to put the request on hold
-    const isWorkspaceRequest = ReportUtils.isGroupPolicy(report);
+    const isWorkspaceRequest = ReportUtils.isReportInGroupPolicy(report);
     const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
 
     const navigateBack = () => {

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.tsx b/src/pages/workspace/WorkspaceNewRoomPage.tsx
@@ -105,7 +105,7 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
      */
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_ROOM_FORM>) => {
         const participants = [session?.accountID ?? 0];
-        const parsedDescription = ReportUtils.getParsedComment(values.reportDescription ?? '', {policyID});
+        const parsedDescription = ReportUtils.getParsedComment(values.reportDescription ?? '');
         const policyReport = ReportUtils.buildOptimisticChatReport(
             participants,
             values.roomName,
@@ -183,7 +183,7 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
                 ErrorUtils.addErrorMessage(errors, 'roomName', ['common.error.characterLimitExceedCounter', {length: values.roomName.length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
             }
 
-            const descriptionLength = ReportUtils.getCommentLength(values.reportDescription, {policyID});
+            const descriptionLength = ReportUtils.getCommentLength(values.reportDescription);
             if (descriptionLength > CONST.REPORT_DESCRIPTION.MAX_LENGTH) {
                 ErrorUtils.addErrorMessage(errors, 'reportDescription', [
                     'common.error.characterLimitExceedCounter',
@@ -197,7 +197,7 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
 
             return errors;
         },
-        [reports, policyID],
+        [reports],
     );
 
     const writeCapabilityOptions = useMemo(