diff --git a/src/components/MoneyReportHeaderPrimaryAction/useConfirmApproval.ts b/src/components/MoneyReportHeaderPrimaryAction/useConfirmApproval.ts index 4de0aa2b19dd..1d5712a22845 100644 --- a/src/components/MoneyReportHeaderPrimaryAction/useConfirmApproval.ts +++ b/src/components/MoneyReportHeaderPrimaryAction/useConfirmApproval.ts @@ -49,7 +49,6 @@ function useConfirmApproval(reportID: string | undefined, startApprovedAnimation approveMoneyRequest({ expenseReport: moneyRequestReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: accountID, currentUserEmailParam: email ?? '', hasViolations, diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx index cc95da70b48c..06429974112a 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/ApproveActionButton.tsx @@ -6,7 +6,6 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails' import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import usePermissions from '@hooks/usePermissions'; -import usePolicy from '@hooks/usePolicy'; import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport'; import {hasHeldExpensesFromTransactions as hasHeldExpensesReportUtils, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils'; import {approveMoneyRequest} from '@userActions/IOU/ReportWorkflow'; @@ -30,8 +29,6 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe const {isDelegateAccessRestricted} = useDelegateNoAccessState(); const {showDelegateNoAccessModal} = useDelegateNoAccessActions(); - const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID); - const activePolicy = usePolicy(activePolicyID); const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`); const [expenseReportPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`); const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END); @@ -59,7 +56,6 @@ function ApproveActionButton({iouReportID, startApprovedAnimation, onHoldMenuOpe approveMoneyRequest({ expenseReport: iouReport, expenseReportPolicy, - policy: activePolicy, currentUserAccountIDParam: currentUserAccountID, currentUserEmailParam: currentUserEmail, hasViolations, diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx index 2a2d3d7c8397..152443a28c3e 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/PayActionButton.tsx @@ -149,7 +149,6 @@ function PayActionButton({ approveMoneyRequest({ expenseReport: iouReport, expenseReportPolicy: policy, - policy: activePolicy, currentUserAccountIDParam: currentUserAccountID, currentUserEmailParam: currentUserEmail, hasViolations, diff --git a/src/components/SettlementButton/index.tsx b/src/components/SettlementButton/index.tsx index d14530dc800e..6b818b8bfba6 100644 --- a/src/components/SettlementButton/index.tsx +++ b/src/components/SettlementButton/index.tsx @@ -508,7 +508,6 @@ function SettlementButton({ approveMoneyRequest({ expenseReport: iouReport, expenseReportPolicy, - policy, currentUserAccountIDParam: accountID, currentUserEmailParam: email ?? '', hasViolations, diff --git a/src/hooks/useHoldMenuSubmit.ts b/src/hooks/useHoldMenuSubmit.ts index e808b78e8561..b503457efe4f 100644 --- a/src/hooks/useHoldMenuSubmit.ts +++ b/src/hooks/useHoldMenuSubmit.ts @@ -71,7 +71,6 @@ function useHoldMenuSubmit({moneyRequestReport, chatReport, requestType, payment if (isApprove) { approveMoneyRequest({ expenseReport: currentMoneyRequestReport, - policy: activePolicy, currentUserAccountIDParam: currentUserDetails.accountID, currentUserEmailParam: currentUserDetails.email ?? '', hasViolations, diff --git a/src/hooks/useLifecycleActions.tsx b/src/hooks/useLifecycleActions.tsx index 4b4096470202..e3fb8191d1cc 100644 --- a/src/hooks/useLifecycleActions.tsx +++ b/src/hooks/useLifecycleActions.tsx @@ -157,7 +157,6 @@ function useLifecycleActions({reportID, startApprovedAnimation, startAnimation, approveMoneyRequest({ expenseReport: moneyRequestReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: accountID, currentUserEmailParam: email ?? '', hasViolations, diff --git a/src/hooks/useSelectionModeReportActions.ts b/src/hooks/useSelectionModeReportActions.ts index c7f2b0a738f8..1a61bc700f76 100644 --- a/src/hooks/useSelectionModeReportActions.ts +++ b/src/hooks/useSelectionModeReportActions.ts @@ -342,7 +342,6 @@ function useSelectionModeReportActions({ } else { approveMoneyRequest({ expenseReport: report, - policy, currentUserAccountIDParam: currentUserAccountID, currentUserEmailParam: currentUserEmail ?? '', hasViolations, diff --git a/src/libs/PaymentUtils.ts b/src/libs/PaymentUtils.ts index e4f90c33fda9..ebe3b7c5a6f4 100644 --- a/src/libs/PaymentUtils.ts +++ b/src/libs/PaymentUtils.ts @@ -270,7 +270,6 @@ const selectPaymentType = (params: SelectPaymentTypeParams) => { approveMoneyRequest({ expenseReport: iouReport, expenseReportPolicy, - policy, currentUserAccountIDParam: currentAccountID, currentUserEmailParam: currentEmail, hasViolations, diff --git a/src/libs/actions/IOU/ReportWorkflow.ts b/src/libs/actions/IOU/ReportWorkflow.ts index 91e14bd26ca9..d1c18135bdd9 100644 --- a/src/libs/actions/IOU/ReportWorkflow.ts +++ b/src/libs/actions/IOU/ReportWorkflow.ts @@ -77,7 +77,6 @@ import {getReportFromHoldRequestsOnyxData} from './Hold'; type ApproveMoneyRequestFunctionParams = { expenseReport: OnyxEntry; expenseReportPolicy: OnyxEntry; - policy: OnyxEntry; currentUserAccountIDParam: number; currentUserEmailParam: string; hasViolations: boolean; @@ -384,7 +383,6 @@ function getReportOriginalCreationTimestamp(expenseReport?: OnyxEntry { currency: CONST.CURRENCY.USD, statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED, }; + const expenseReportPolicy = { + ...createRandomPolicy(Number(expenseReport.policyID), CONST.POLICY.TYPE.TEAM), + approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC, + }; approveMoneyRequest({ expenseReport, - expenseReportPolicy: createRandomPolicy(Number(expenseReport.policyID), CONST.POLICY.TYPE.TEAM), - policy: {} as Policy, + expenseReportPolicy, currentUserAccountIDParam: CARLOS_ACCOUNT_ID, currentUserEmailParam: CARLOS_EMAIL, hasViolations: false, @@ -2056,11 +2060,14 @@ describe('actions/IOU/ReportWorkflow', () => { currency: CONST.CURRENCY.USD, statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED, }; + const expenseReportPolicy = { + ...createRandomPolicy(Number(expenseReport.policyID), CONST.POLICY.TYPE.TEAM), + approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC, + }; approveMoneyRequest({ expenseReport, - expenseReportPolicy: createRandomPolicy(Number(expenseReport.policyID), CONST.POLICY.TYPE.TEAM), - policy: {} as Policy, + expenseReportPolicy, currentUserAccountIDParam: CARLOS_ACCOUNT_ID, currentUserEmailParam: CARLOS_EMAIL, hasViolations: false, @@ -2564,10 +2571,9 @@ describe('actions/IOU/ReportWorkflow', () => { policyID, }); - const createApproveMoneyRequestParams = (expenseReport: Report, expenseReportPolicy: Policy, policy: Policy = teamPolicy) => ({ + const createApproveMoneyRequestParams = (expenseReport: Report, expenseReportPolicy: OnyxEntry) => ({ expenseReport, expenseReportPolicy, - policy, currentUserAccountIDParam: CARLOS_ACCOUNT_ID, currentUserEmailParam: CARLOS_EMAIL, hasViolations: false, @@ -2595,30 +2601,6 @@ describe('actions/IOU/ReportWorkflow', () => { expect(Navigation.navigate).toHaveBeenCalledWith(expectedRoute); }); - it('gates upgrade by expenseReportPolicy instead of the policy param', () => { - const expenseReport = createSubmittedExpenseReport(); - const expectedRoute = ROUTES.WORKSPACE_UPGRADE.getRoute(submitPolicyID, upgradeFeatureAlias, ROUTES.REPORT_WITH_ID.getRoute(expenseReport.reportID), expenseReport.reportID); - - approveMoneyRequest(createApproveMoneyRequestParams(expenseReport, submitPolicy, teamPolicy)); - - expect(Navigation.navigate).toHaveBeenCalledTimes(1); - expect(Navigation.navigate).toHaveBeenCalledWith(expectedRoute); - }); - - it('falls back to policy when expenseReportPolicy is undefined', () => { - const expenseReport = createSubmittedExpenseReport(submitPolicyID); - const expectedRoute = ROUTES.WORKSPACE_UPGRADE.getRoute(submitPolicyID, upgradeFeatureAlias, ROUTES.REPORT_WITH_ID.getRoute(expenseReport.reportID), expenseReport.reportID); - - approveMoneyRequest({ - ...createApproveMoneyRequestParams(expenseReport, submitPolicy), - expenseReportPolicy: undefined, - policy: submitPolicy, - }); - - expect(Navigation.navigate).toHaveBeenCalledTimes(1); - expect(Navigation.navigate).toHaveBeenCalledWith(expectedRoute); - }); - it('uses Navigation.getActiveRoute as backTo when available', () => { const expenseReport = createSubmittedExpenseReport(); const activeRoute = `search?q=reportID%3A${expenseReport.reportID}`; @@ -2778,7 +2760,6 @@ describe('actions/IOU/ReportWorkflow', () => { approveMoneyRequest({ expenseReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: adminAccountID, currentUserEmailParam: adminEmail, hasViolations: false, @@ -2830,7 +2811,6 @@ describe('actions/IOU/ReportWorkflow', () => { approveMoneyRequest({ expenseReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: managerAccountID, currentUserEmailParam: managerEmail, hasViolations: false, @@ -2878,7 +2858,6 @@ describe('actions/IOU/ReportWorkflow', () => { approveMoneyRequest({ expenseReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: adminAccountID, currentUserEmailParam: adminEmail, hasViolations: false, @@ -3002,7 +2981,6 @@ describe('actions/IOU/ReportWorkflow', () => { approveMoneyRequest({ expenseReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: managerAccountID, currentUserEmailParam: managerEmail, hasViolations: false, @@ -3033,7 +3011,6 @@ describe('actions/IOU/ReportWorkflow', () => { approveMoneyRequest({ expenseReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: managerAccountID, currentUserEmailParam: managerEmail, hasViolations: false, @@ -3062,7 +3039,6 @@ describe('actions/IOU/ReportWorkflow', () => { approveMoneyRequest({ expenseReport: updatedReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: adminAccountID, currentUserEmailParam: adminEmail, hasViolations: false, @@ -3121,7 +3097,6 @@ describe('actions/IOU/ReportWorkflow', () => { approveMoneyRequest({ expenseReport: singleApproverReport, expenseReportPolicy: singleApproverPolicy, - policy: singleApproverPolicy, currentUserAccountIDParam: managerAccountID, currentUserEmailParam: managerEmail, hasViolations: false, @@ -3140,6 +3115,69 @@ describe('actions/IOU/ReportWorkflow', () => { expect(updatedReport?.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED); expect(updatedReport?.statusNum).toBe(CONST.REPORT.STATUS_NUM.APPROVED); }); + + it('uses the expense report policy (not the activePolicy) to determine if it is a DEW approval', () => { + const activeDEWPolicy: Policy = { + ...policy, + id: '2', + approvalMode: CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL, + }; + const normalReport: Report = { + ...expenseReport, + reportID: '789', + managerID: managerAccountID, + }; + const transaction = { + ...createRandomTransaction(1), + reportID: normalReport.reportID, + }; + + return Onyx.multiSet({ + [ONYXKEYS.SESSION]: { + email: managerEmail, + accountID: managerAccountID, + }, + [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: activeDEWPolicy.id, + [`${ONYXKEYS.COLLECTION.POLICY}${activeDEWPolicy.id}`]: activeDEWPolicy, + [`${ONYXKEYS.COLLECTION.REPORT}${normalReport.reportID}`]: normalReport, + [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction, + } as unknown as OnyxMultiSetInput) + .then(() => { + approveMoneyRequest({ + expenseReport: normalReport, + expenseReportPolicy: policy, + currentUserAccountIDParam: managerAccountID, + currentUserEmailParam: managerEmail, + hasViolations: false, + isASAPSubmitBetaEnabled: false, + expenseReportCurrentNextStepDeprecated: undefined, + betas: [CONST.BETAS.ALL], + userBillingGracePeriodEnds: undefined, + amountOwed: 0, + ownerBillingGracePeriodEnd: undefined, + delegateEmail: undefined, + }); + return waitForBatchedUpdates(); + }) + .then(() => getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${normalReport.reportID}`)) + .then((updatedReport) => { + expect(updatedReport?.stateNum).toBe(CONST.REPORT.STATE_NUM.SUBMITTED); + expect(updatedReport?.statusNum).toBe(CONST.REPORT.STATUS_NUM.SUBMITTED); + expect(updatedReport?.managerID).toBe(adminAccountID); + + const previewAction = getReportPreviewAction({ + isReportArchived: false, + currentUserAccountID: managerAccountID, + currentUserLogin: managerEmail, + report: updatedReport, + policy, + transactions: [transaction], + bankAccountList: {}, + reportMetadata: undefined, + }); + expect(previewAction).not.toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE); + }); + }); }); describe('approveMoneyRequest partially', () => { @@ -3236,7 +3274,6 @@ describe('actions/IOU/ReportWorkflow', () => { const newExpenseReportID = approveMoneyRequest({ expenseReport, expenseReportPolicy: policy, - policy, currentUserAccountIDParam: adminAccountID, currentUserEmailParam: adminEmail, hasViolations: false, diff --git a/tests/unit/PaymentUtilsTest.ts b/tests/unit/PaymentUtilsTest.ts index 2903ed53503a..2da8e89e59df 100644 --- a/tests/unit/PaymentUtilsTest.ts +++ b/tests/unit/PaymentUtilsTest.ts @@ -271,7 +271,6 @@ describe('PaymentUtils', () => { expect(approveMoneyRequest).toHaveBeenCalledWith({ expenseReport: params.iouReport, expenseReportPolicy: params.expenseReportPolicy, - policy: params.policy, currentUserAccountIDParam: params.currentAccountID, currentUserEmailParam: params.currentEmail, hasViolations: params.hasViolations, @@ -294,7 +293,6 @@ describe('PaymentUtils', () => { expect(approveMoneyRequest).toHaveBeenCalledWith({ expenseReport: params.iouReport, expenseReportPolicy: params.expenseReportPolicy, - policy: params.policy, currentUserAccountIDParam: params.currentAccountID, currentUserEmailParam: params.currentEmail, hasViolations: params.hasViolations,