Skip to content

Fix condition for approval button #52421

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

Closed
luacmartins wants to merge 2 commits into from
Closed

Fix condition for approval button #52421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56012ec
fix condition for approval button
luacmartins Nov 12, 2024
bb0a115
fix lint
luacmartins Nov 12, 2024
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
4 changes: 2 additions & 2 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7983,8 +7983,8 @@ function isReportOwner(report: OnyxInputOrEntry<Report>): boolean {
return report?.ownerAccountID === currentUserPersonalDetails?.accountID;
}

function isAllowedToApproveExpenseReport(report: OnyxEntry<Report>, approverAccountID?: number): boolean {
const policy = getPolicy(report?.policyID);
function isAllowedToApproveExpenseReport(report: OnyxEntry<Report>, approverAccountID?: number, reportPolicy?: OnyxEntry<Policy> | SearchPolicy): boolean {
const policy = reportPolicy ?? getPolicy(report?.policyID);
const isOwner = (approverAccountID ?? currentUserAccountID) === report?.ownerAccountID;
return !(policy?.preventSelfApproval && isOwner);
}
Expand Down
2 changes: 1 addition & 1 deletion src/libs/SearchUIUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
return CONST.SEARCH.ACTION_TYPES.PAY;
}

if (IOU.canApproveIOU(report, policy)) {
if (IOU.canApproveIOU(report, policy) && ReportUtils.isAllowedToApproveExpenseReport(report, undefined, policy)) {
return CONST.SEARCH.ACTION_TYPES.APPROVE;
}

Expand Down
3 changes: 3 additions & 0 deletions src/types/onyx/SearchResults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@ type SearchPolicy = {
/** The auto reimbursement limit */
limit: number;
};

/** Whether the self approval or submitting is enabled */
preventSelfApproval?: boolean;
};

/** Model of transaction search result */
Expand Down