Merge pull request #27091 from kursat/main

Fix: Web -Workspace - Inconsistency in Workspace Notification for HTML Cha…
Expensify · Sep 12, 2023 · ab6913a · ab6913a
2 parents 09a264a + bf0fbf9
commit ab6913a
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/components/ArchivedReportFooter.js b/src/components/ArchivedReportFooter.js
@@ -2,6 +2,7 @@ import lodashGet from 'lodash/get';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
+import _ from 'lodash';
 import CONST from '../CONST';
 import Banner from './Banner';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
@@ -60,15 +61,25 @@ function ArchivedReportFooter(props) {
         oldDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(props.personalDetails, [oldAccountID, 'displayName']);
     }
 
+    const shouldRenderHTML = archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+
+    let policyName = ReportUtils.getPolicyName(props.report);
+
+    if (shouldRenderHTML) {
+        oldDisplayName = _.escape(oldDisplayName);
+        displayName = _.escape(displayName);
+        policyName = _.escape(policyName);
+    }
+
     return (
         <Banner
             containerStyles={[styles.archivedReportFooter]}
             text={props.translate(`reportArchiveReasons.${archiveReason}`, {
                 displayName: `<strong>${displayName}</strong>`,
                 oldDisplayName: `<strong>${oldDisplayName}</strong>`,
-                policyName: `<strong>${ReportUtils.getPolicyName(props.report)}</strong>`,
+                policyName: `<strong>${policyName}</strong>`,
             })}
-            shouldRenderHTML={archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT}
+            shouldRenderHTML={shouldRenderHTML}
             shouldShowIcon
         />
     );