Skip to content

Revert "fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887" #77433

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

Merged
madmax330 merged 1 commit into from
Dec 11, 2025
Merged

Revert "fix: Submit button is shown for second admin when "Prevent self-approval" is enabled #76887" #77433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 7 additions & 11 deletions src/components/MoneyReportHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,9 @@ function MoneyReportHeader({
return Object.values(reportTransactions);
}, [reportTransactions]);

// When prevent self-approval is enabled & the current user is submitter AND they're submitting to themselves, we need to show the optimistic next step
// We should always show this optimistic message for policies with preventSelfApproval
// to avoid any flicker during transitions between online/offline states
const nextApproverAccountID = getNextApproverAccountID(moneyRequestReport);
const isSubmitterSameAsNextApprover = isReportOwner(moneyRequestReport) && nextApproverAccountID === moneyRequestReport?.ownerAccountID;
const isBlockSubmitDueToStrictPolicyRules = useMemo(() => {
const shouldBlockSubmit = useMemo(() => {
return shouldBlockSubmitDueToStrictPolicyRules(moneyRequestReport?.reportID, violations, areStrictPolicyRulesEnabled, accountID, email ?? '', transactions);
}, [moneyRequestReport?.reportID, violations, areStrictPolicyRulesEnabled, accountID, email, transactions]);
const isBlockSubmitDueToPreventSelfApproval = isSubmitterSameAsNextApprover && policy?.preventSelfApproval;

const shouldBlockSubmit = isBlockSubmitDueToStrictPolicyRules || isBlockSubmitDueToPreventSelfApproval;

const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined;
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(iouTransactionID)}`, {
Expand Down Expand Up @@ -464,9 +456,14 @@ function MoneyReportHeader({
hasDuplicates ||
shouldShowMarkAsResolved;

// When prevent self-approval is enabled & the current user is submitter AND they're submitting to themselves, we need to show the optimistic next step
// We should always show this optimistic message for policies with preventSelfApproval
// to avoid any flicker during transitions between online/offline states
const nextApproverAccountID = getNextApproverAccountID(moneyRequestReport);
const isSubmitterSameAsNextApprover = isReportOwner(moneyRequestReport) && nextApproverAccountID === moneyRequestReport?.ownerAccountID;
let optimisticNextStep = isSubmitterSameAsNextApprover && policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;

if (isBlockSubmitDueToStrictPolicyRules && isReportOwner(moneyRequestReport) && isOpenExpenseReport(moneyRequestReport)) {
if (shouldBlockSubmit && isReportOwner(moneyRequestReport) && isOpenExpenseReport(moneyRequestReport)) {
optimisticNextStep = buildOptimisticNextStepForStrictPolicyRuleViolations();
}

Expand Down Expand Up @@ -869,7 +866,6 @@ function MoneyReportHeader({
success
onPress={confirmApproval}
text={translate('iou.approve')}
isDisabled={isBlockSubmitDueToPreventSelfApproval}
/>
),
[CONST.REPORT.PRIMARY_ACTIONS.PAY]: (
Expand Down
9 changes: 8 additions & 1 deletion src/libs/ReportPrimaryActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function isSubmitAction(report: Report, reportTransactions: Transaction[], polic

const submitToAccountID = getSubmitToAccountID(policy, report);

if (submitToAccountID === report.ownerAccountID && policy?.preventSelfApproval && !isReportSubmitter) {
if (submitToAccountID === report.ownerAccountID && policy?.preventSelfApproval) {
return false;
}

Expand Down Expand Up @@ -129,6 +129,13 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], poli
return false;
}

const isPreventSelfApprovalEnabled = policy?.preventSelfApproval;
const isReportSubmitter = isCurrentUserSubmitter(report);

if (isPreventSelfApprovalEnabled && isReportSubmitter) {
return false;
}

return isProcessingReportUtils(report);
}

Expand Down
4 changes: 1 addition & 3 deletions src/libs/SearchUIUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ import {
canSendInvoice,
getGroupPaidPoliciesWithExpenseChatEnabled,
getPolicy,
getSubmitToAccountID,
isPaidGroupPolicy,
isPolicyAdmin,
isPolicyPayer,
Expand Down Expand Up @@ -1299,8 +1298,7 @@ function getActions(

const hasOnlyPendingCardOrScanningTransactions = allReportTransactions.length > 0 && allReportTransactions.every((t) => isScanning(t) || isPending(t));

const submitToAccountID = getSubmitToAccountID(policy, report);
const isAllowedToApproveExpenseReport = isAllowedToApproveExpenseReportUtils(report, submitToAccountID, policy);
const isAllowedToApproveExpenseReport = isAllowedToApproveExpenseReportUtils(report, undefined, policy);

// We're not supporting approve partial amount on search page now
if (
Expand Down
Loading