Skip to content

Commit 2bed8d7

Browse files
authored
Merge pull request #50339 from cretadn22/adjust-condition-to-hide-delete-button
Adjust condition to display delete button for tasks
2 parents de23127 + 96e8869 commit 2bed8d7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/pages/ReportDetailsPage.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,15 @@ function ReportDetailsPage({policies, report, route}: ReportDetailsPageProps) {
191191
const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
192192

193193
const canModifyTask = Task.canModifyTask(report, session?.accountID ?? -1);
194+
const canActionTask = Task.canActionTask(report, session?.accountID ?? -1);
194195
const shouldShowTaskDeleteButton =
195196
isTaskReport &&
196197
!isCanceledTaskReport &&
197198
ReportUtils.canWriteInReport(report) &&
198199
report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED &&
199200
!ReportUtils.isClosedReport(report) &&
200-
canModifyTask;
201+
canModifyTask &&
202+
canActionTask;
201203
const canDeleteRequest = isActionOwner && (ReportUtils.canDeleteTransaction(moneyRequestReport) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
202204
const shouldShowDeleteButton = shouldShowTaskDeleteButton || canDeleteRequest;
203205

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

366368
// Show actions related to Task Reports
367369
if (isTaskReport && !isCanceledTaskReport) {
368-
if (ReportUtils.isCompletedTaskReport(report) && canModifyTask) {
370+
if (ReportUtils.isCompletedTaskReport(report) && canModifyTask && canActionTask) {
369371
items.push({
370372
key: CONST.REPORT_DETAILS_MENU_ITEM.MARK_AS_INCOMPLETE,
371373
icon: Expensicons.Checkmark,
@@ -474,6 +476,7 @@ function ReportDetailsPage({policies, report, route}: ReportDetailsPageProps) {
474476
unapproveExpenseReportOrShowModal,
475477
isExpenseReport,
476478
backTo,
479+
canActionTask,
477480
]);
478481

479482
const displayNamesWithTooltips = useMemo(() => {

0 commit comments

Comments
 (0)