Skip to content

[CP Staging] Fix "prevent self approval" showing too often #58129

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
robertjchen merged 5 commits into from
Mar 11, 2025
Merged

[CP Staging] Fix "prevent self approval" showing too often #58129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8a1f9c
Only show prevent self approval if next approver is submitter who is …
Beamanator Mar 10, 2025
d1a6ef7
Add new condition to change
Beamanator Mar 10, 2025
27768d1
prettify
Beamanator Mar 10, 2025
1807c6f
fix styling for prevent self approval
lakchote Mar 11, 2025
a485521
Merge branch 'main' of github.com:Expensify/App into beaman-fixPreven…
Beamanator Mar 11, 2025
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
10 changes: 7 additions & 3 deletions src/components/MoneyReportHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
isArchivedReportWithID,
isInvoiceReport,
isReportApproved,
isReportOwner,
navigateBackOnDeleteTransaction,
reportTransactionsSelector,
} from '@libs/ReportUtils';
Expand All @@ -53,6 +54,7 @@ import {
canSubmitReport,
deleteMoneyRequest,
deleteTrackExpense,
getNextApproverAccountID,
payInvoice,
payMoneyRequest,
submitReport,
Expand Down Expand Up @@ -208,10 +210,12 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
const shouldShowStatusBar =
hasAllPendingRTERViolations || shouldShowBrokenConnectionViolation || hasOnlyHeldExpenses || hasScanningReceipt || isPayAtEndExpense || hasOnlyPendingTransactions;

// When prevent self-approval is enabled, we need to show the optimistic next step
// When prevent self-approval is enabled & the current user is submitter AND they're submitting to theirself, 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 optimisticNextStep = policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;
const nextApproverAccountID = getNextApproverAccountID(moneyRequestReport);
const isSubmitterSameAsNextApprover = isReportOwner(moneyRequestReport) && nextApproverAccountID === moneyRequestReport?.ownerAccountID;
const optimisticNextStep = isSubmitterSameAsNextApprover && policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;

const shouldShowNextStep = transactions?.length !== 0 && isFromPaidPolicy && !!optimisticNextStep?.message?.length && !shouldShowStatusBar;
const shouldShowAnyButton =
Expand Down Expand Up @@ -344,7 +348,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
(isDuplicate || shouldShowSettlementButton || !!shouldShowExportIntegrationButton || shouldShowSubmitButton || shouldShowMarkAsCashButton) &&
(!!statusBarProps || shouldShowNextStep);

// The submit button should be success green colour only if the user is submitter and the policy does not have Scheduled Submit turned on
// The submit button should be success green colour only if the user is the submitter and the policy does not have Scheduled Submit turned on
const isWaitingForSubmissionFromCurrentUser = useMemo(
() => chatReport?.isOwnPolicyExpenseChat && !policy?.harvesting?.enabled,
[chatReport?.isOwnPolicyExpenseChat, policy?.harvesting?.enabled],
Expand Down
4 changes: 2 additions & 2 deletions src/libs/NextStepUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ function buildOptimisticNextStepForPreventSelfApprovalsEnabled() {
},
{
text: 'yourself',
type: 'strong',
type: 'next-step-email',
},
{
text: '. Approving your own reports is ',
},
{
text: 'forbidden',
type: 'strong',
type: 'next-step-email',
},
{
text: ' by your policy. Please submit this report to someone else or contact your admin to change the person you submit to.',
Expand Down