Skip to content

Commit

Permalink
Merge pull request #44717 from bernhardoj/fix/44334-missing-delete-ex…
Browse files Browse the repository at this point in the history
…pense-in-self-dm-track-expense-details-page

Fix missing delete expense in self dm track expense details page
  • Loading branch information
stitesExpensify authored Jul 2, 2024
2 parents 8f6a2b6 + 1902101 commit b026265
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/pages/ReportDetailsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,15 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
const isInvoiceReport = useMemo(() => ReportUtils.isInvoiceReport(report), [report]);
const isInvoiceRoom = useMemo(() => ReportUtils.isInvoiceRoom(report), [report]);
const isTaskReport = useMemo(() => ReportUtils.isTaskReport(report), [report]);
const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);
const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
const isCanceledTaskReport = ReportUtils.isCanceledTaskReport(report, parentReportAction);
const canEditReportDescription = useMemo(() => ReportUtils.canEditReportDescription(report, policy), [report, policy]);
const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '');
const isExpenseReport = isMoneyRequestReport || isInvoiceReport || isMoneyRequest;
const isSingleTransactionView = isMoneyRequest || ReportUtils.isTrackExpenseReport(report);
const isSingleTransactionView = isMoneyRequest || isTrackExpenseReport;
const isSelfDMTrackExpenseReport = isTrackExpenseReport && ReportUtils.isSelfDM(parentReport);

const shouldDisableRename = useMemo(() => ReportUtils.shouldDisableRename(report), [report]);
const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(report);
Expand Down Expand Up @@ -158,8 +161,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
}, [isInvoiceReport, isMoneyRequestReport, isSingleTransactionView]);
const isPrivateNotesFetchTriggered = report?.isLoadingPrivateNotes !== undefined;

const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);

const requestParentReportAction = useMemo(() => {
// 2. MoneyReport case
if (caseID === CASES.MONEY_REPORT) {
Expand Down Expand Up @@ -190,8 +191,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED &&
!ReportUtils.isClosedReport(report) &&
canModifyTask;
const canDeleteRequest =
isActionOwner && (ReportUtils.canAddOrDeleteTransactions(moneyRequestReport) || ReportUtils.isTrackExpenseReport(transactionThreadReport)) && !isDeletedParentAction;
const canDeleteRequest = isActionOwner && (ReportUtils.canAddOrDeleteTransactions(moneyRequestReport) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
const shouldShowDeleteButton = shouldShowTaskDeleteButton || canDeleteRequest;

useEffect(() => {
Expand Down

0 comments on commit b026265

Please sign in to comment.