From 8ad1eaaea6aaafb4060423a30b7dc09d797df25e Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Thu, 15 Jan 2026 13:46:12 +0100 Subject: [PATCH] Revert "fix: Submit button is not displayed in second report to Approver" --- src/libs/ReportPreviewActionUtils.ts | 5 +++-- src/libs/ReportSecondaryActionUtils.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts index 462e056562f3..75bd7dd8e16f 100644 --- a/src/libs/ReportPreviewActionUtils.ts +++ b/src/libs/ReportPreviewActionUtils.ts @@ -37,8 +37,7 @@ function canSubmit( const isExpense = isExpenseReport(report); const isSubmitter = isCurrentUserSubmitter(report); const isOpen = isOpenReport(report); - const submitToAccountID = getSubmitToAccountID(policy, report); - const isManager = submitToAccountID === currentUserAccountID || report.managerID === currentUserAccountID; + const isManager = report.managerID === currentUserAccountID; const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN; if (!!transactions && transactions?.length > 0 && transactions.every((transaction) => isPending(transaction))) { @@ -51,6 +50,8 @@ function canSubmit( return false; } + const submitToAccountID = getSubmitToAccountID(policy, report); + if (submitToAccountID === report.ownerAccountID && policy?.preventSelfApproval) { return false; } diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts index 60953a31901c..b35082415cd6 100644 --- a/src/libs/ReportSecondaryActionUtils.ts +++ b/src/libs/ReportSecondaryActionUtils.ts @@ -216,7 +216,7 @@ function isSubmitAction({ const isReportSubmitter = isCurrentUserSubmitter(report); const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN; - const isManager = getSubmitToAccountID(policy, report) === currentUserAccountID || report.managerID === currentUserAccountID; + const isManager = report.managerID === getCurrentUserAccountID(); if (!isReportSubmitter && !isAdmin && !isManager) { return false; }