Skip to content

Commit

Permalink
adjust-condition-to-hide-delete-button
Browse files Browse the repository at this point in the history
  • Loading branch information
cretadn22 committed Oct 7, 2024
1 parent b9d9686 commit 883d63e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/pages/ReportDetailsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,15 @@ function ReportDetailsPage({policies, report, route}: ReportDetailsPageProps) {
const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;

const canModifyTask = Task.canModifyTask(report, session?.accountID ?? -1);
const canActionTask = Task.canActionTask(report, session?.accountID ?? -1);
const shouldShowTaskDeleteButton =
isTaskReport &&
!isCanceledTaskReport &&
ReportUtils.canWriteInReport(report) &&
report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED &&
!ReportUtils.isClosedReport(report) &&
canModifyTask;
canModifyTask &&

Check failure on line 201 in src/pages/ReportDetailsPage.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Delete `·`
canActionTask;
const canDeleteRequest = isActionOwner && (ReportUtils.canDeleteTransaction(moneyRequestReport) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
const shouldShowDeleteButton = shouldShowTaskDeleteButton || canDeleteRequest;

Expand Down Expand Up @@ -365,7 +367,7 @@ function ReportDetailsPage({policies, report, route}: ReportDetailsPageProps) {

// Show actions related to Task Reports
if (isTaskReport && !isCanceledTaskReport) {
if (ReportUtils.isCompletedTaskReport(report) && canModifyTask) {
if (ReportUtils.isCompletedTaskReport(report) && canModifyTask && canActionTask) {
items.push({
key: CONST.REPORT_DETAILS_MENU_ITEM.MARK_AS_INCOMPLETE,
icon: Expensicons.Checkmark,
Expand Down

0 comments on commit 883d63e

Please sign in to comment.