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

show trip name for trip room report preview action #46266

Merged
merged 3 commits into from
Jul 26, 2024
Merged

show trip name for trip room report preview action #46266

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0e43c1
show trip name for trip room report preview action
tienifr Jul 26, 2024
13965f4
Merge branch 'main' of https://github.com/tienifr/App into fix/45344
tienifr Jul 26, 2024
9084ee1
remove useMemo
tienifr Jul 26, 2024
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
6 changes: 5 additions & 1 deletion src/pages/home/report/ReportActionItemSingle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ function ReportActionItemSingle({
const {avatar, login, pendingFields, status, fallbackIcon} = personalDetails[actorAccountID ?? -1] ?? {};
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
let actorHint = (login || (displayName ?? '')).replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
const displayAllActors = useMemo(() => action?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW, [action?.actionName]);
const isTripRoom = ReportUtils.isTripRoom(report);
const isReportPreviewAction = action?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW;
const displayAllActors = isReportPreviewAction && !isTripRoom;
const isInvoiceReport = ReportUtils.isInvoiceReport(iouReport ?? null);
const isWorkspaceActor = isInvoiceReport || (ReportUtils.isPolicyExpenseChat(report) && (!actorAccountID || displayAllActors));
const ownerAccountID = iouReport?.ownerAccountID ?? action?.childOwnerAccountID;
Expand All @@ -106,6 +108,8 @@ function ReportActionItemSingle({
displayName = actorHint;
avatarSource = delegateDetails?.avatar;
avatarId = action.delegateAccountID;
} else if (isReportPreviewAction && isTripRoom) {
displayName = report?.reportName ?? '';
}

// If this is a report preview, display names and avatars of both people involved
Expand Down
Loading