Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Web -Workspace - Inconsistency in Workspace Notification for HTML Cha… #27091

Merged
merged 5 commits into from
Sep 12, 2023
Merged

Fix: Web -Workspace - Inconsistency in Workspace Notification for HTML Cha… #27091

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8517054
Web -Workspace - Inconsistency in Workspace Notification for HTML Cha…
kursat Sep 9, 2023
fb8636e
Fixed prettier diff
kursat Sep 9, 2023
4f98a86
Merge branch 'Expensify:main' into main
kursat Sep 10, 2023
40b3b29
Merge branch 'Expensify:main' into main
kursat Sep 11, 2023
bf0fbf9
Only escaped when shouldRenderHTML is true
kursat Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/components/ArchivedReportFooter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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
/>
);
Expand Down
Loading