diff --git a/src/pages/iou/request/step/IOURequestEditReport.tsx b/src/pages/iou/request/step/IOURequestEditReport.tsx index 67793c860db6..26402fd8c840 100644 --- a/src/pages/iou/request/step/IOURequestEditReport.tsx +++ b/src/pages/iou/request/step/IOURequestEditReport.tsx @@ -138,6 +138,11 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { }); const createReport = () => { + const restrictionPolicyID = hasPerDiemTransactions ? selectedReport?.policyID : policyForMovingExpensesID; + if (restrictionPolicyID && shouldRestrictUserBillableActions(restrictionPolicyID, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds)) { + Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(restrictionPolicyID)); + return; + } if (hasPerDiemTransactions) { handleCreateReport(); return; @@ -149,10 +154,6 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) { Navigation.navigate(ROUTES.NEW_REPORT_WORKSPACE_SELECTION.getRoute(true, backTo)); return; } - if (policyForMovingExpensesID && shouldRestrictUserBillableActions(policyForMovingExpensesID, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds)) { - Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policyForMovingExpensesID)); - return; - } handleCreateReport(); }; diff --git a/src/pages/iou/request/step/IOURequestStepReport.tsx b/src/pages/iou/request/step/IOURequestStepReport.tsx index 4e8058271582..9c92aa2e524f 100644 --- a/src/pages/iou/request/step/IOURequestStepReport.tsx +++ b/src/pages/iou/request/step/IOURequestStepReport.tsx @@ -259,6 +259,11 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { }); const createReport = () => { + const restrictionPolicyID = isPerDiemTransaction ? perDiemOriginalPolicy?.id : policyForMovingExpensesID; + if (restrictionPolicyID && shouldRestrictUserBillableActions(restrictionPolicyID, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds)) { + Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(restrictionPolicyID)); + return; + } if (isPerDiemTransaction) { handleCreateReport(); return; @@ -271,10 +276,6 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) { Navigation.navigate(ROUTES.NEW_REPORT_WORKSPACE_SELECTION.getRoute(true, backTo)); return; } - if (policyForMovingExpensesID && shouldRestrictUserBillableActions(policyForMovingExpensesID, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds)) { - Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policyForMovingExpensesID)); - return; - } handleCreateReport(); };