Skip to content

Commit

Permalink
Merge pull request Expensify#46465 from Expensify/marco-addApproveMon…
Browse files Browse the repository at this point in the history
…eyRequestV2Param

Add approve money request v2 param
  • Loading branch information
Beamanator authored Jul 30, 2024
2 parents f5a3303 + 156db3f commit add6554
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/libs/API/parameters/ApproveMoneyRequestParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ type ApproveMoneyRequestParams = {
* }>
*/
optimisticHoldReportExpenseActionIDs?: string;
/**
* Call the optimized version of ApproveMoneyRequest
*/
v2?: boolean;
};

export default ApproveMoneyRequestParams;
5 changes: 5 additions & 0 deletions src/libs/PolicyUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,10 @@ function isSubmitAndClose(policy: OnyxInputOrEntry<Policy>): boolean {
return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL;
}

function isControlOnAdvancedApprovalMode(policy: OnyxInputOrEntry<Policy>): boolean {
return policy?.type === CONST.POLICY.TYPE.CORPORATE && getApprovalWorkflow(policy) === CONST.POLICY.APPROVAL_MODE.ADVANCED;
}

function extractPolicyIDFromPath(path: string) {
return path.match(CONST.REGEX.POLICY_ID_FROM_PATH)?.[1];
}
Expand Down Expand Up @@ -902,6 +906,7 @@ export {
hasPolicyError,
hasPolicyErrorFields,
hasTaxRateError,
isControlOnAdvancedApprovalMode,
isExpensifyTeam,
isDeletedPolicyEmployee,
isFreeGroupPolicy,
Expand Down
1 change: 1 addition & 0 deletions src/libs/actions/IOU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6853,6 +6853,7 @@ function approveMoneyRequest(expenseReport: OnyxEntry<OnyxTypes.Report>, full?:
optimisticHoldReportID,
optimisticHoldActionID,
optimisticHoldReportExpenseActionIDs,
v2: PolicyUtils.isControlOnAdvancedApprovalMode(PolicyUtils.getPolicy(expenseReport?.policyID)),
};

API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
Expand Down

0 comments on commit add6554

Please sign in to comment.