@zeniai/client-epic-state 5.1.7 → 5.1.8-betaAS1

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/reorderBillPayApprovalRulesEpic.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reorderBillPayApprovalRulesEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const approvalRuleReducer_1 = require("../../../../../entity/approvalRule/approvalRuleReducer");
+const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReducer");
+const responsePayload_1 = require("../../../../../responsePayload");
+const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
+const reorderBillPayApprovalRulesEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.reorderBillPayApprovalRules.match), (0, operators_1.switchMap)((action) => {
+    const { approvalRuleIds, useV3 } = action.payload;
+    // Approval Rules 3.0 — flag-gated endpoint selection. Mirrors
+    // the pattern used by delete + fetch epics: the v3 dev host
+    // until the production base URL ships the v2 reorder route.
+    const endpoint = `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2/reorder`;
+    return zeniAPI
+        .putAndGetJSON(endpoint, {
+        rule_ids: approvalRuleIds,
+    })
+        .pipe((0, operators_1.mergeMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const serverOrderedIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
+            const actions = [
+                (0, approvalRuleReducer_1.updateApprovalRules)(response.data.approval_rules),
+                (0, billPaySetupApproverViewReducer_1.reorderBillPayApprovalRulesSuccess)(serverOrderedIds),
+                (0, snackbarReducer_1.openSnackbar)({
+                    messageSection: `bill_pay_approval_reorder`,
+                    messageText: 'success',
+                    type: 'success',
+                }),
+            ];
+            return (0, rxjs_1.from)(actions);
+        }
+        else {
+            const recovery = [
+                (0, billPaySetupApproverViewReducer_1.reorderBillPayApprovalRulesFailure)(response.status),
+                (0, snackbarReducer_1.openSnackbar)({
+                    messageSection: `bill_pay_approval_reorder`,
+                    messageText: 'failed',
+                    type: 'error',
+                }),
+                // Refetch to revert the optimistic order to server truth.
+                (0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, useV3),
+            ];
+            return (0, rxjs_1.from)(recovery);
+        }
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.from)([
+        (0, billPaySetupApproverViewReducer_1.reorderBillPayApprovalRulesFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Reorder Bill Pay Approval Rules errored out' +
+            JSON.stringify(error))),
+        (0, snackbarReducer_1.openSnackbar)({
+            messageSection: `bill_pay_approval_reorder`,
+            messageText: 'failed',
+            type: 'error',
+        }),
+        (0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, useV3),
+    ])));
+}));
+exports.reorderBillPayApprovalRulesEpic = reorderBillPayApprovalRulesEpic;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/saveBillPaySetupApproverViewUpdatesEpic.js

@@ -9,14 +9,23 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const commonPayload_1 = require("../types/commonPayload");
-const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdates.match), (0, operators_1.switchMap)(() => {
+const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdates.match), (0, operators_1.switchMap)((action) => {
     const { billPaySetupApproverViewState } = state$.value;
     const billPaySetupApproverViewUpdateData = billPaySetupApproverViewState.billPaySetupApproverViewUpdateData;
     if (billPaySetupApproverViewUpdateData != null &&
         billPaySetupApproverViewUpdateData.data != null) {
-        const payload = (0, commonPayload_1.toApprovalChangableInfoPayload)(billPaySetupApproverViewUpdateData.data);
+        // Approval Rules 3.0 — gate URL + write-side payload mapper on
+        // the `approval_rule_v3_config` dynamic config. `useV3` arrives
+        // on the action payload from the screen connector.
+        const { useV3 } = action.payload;
+        const payload = useV3
+            ? (0, commonPayload_1.toApprovalChangableInfoPayload)(billPaySetupApproverViewUpdateData.data)
+            : (0, commonPayload_1.toApprovalChangableInfoPayloadV1)(billPaySetupApproverViewUpdateData.data);
+        const endpoint = useV3
+            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
+            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
         return zeniAPI
-            .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, payload)
+            .postAndGetJSON(endpoint, payload)
             .pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.d.ts

@@ -14,9 +14,67 @@ interface ApproverViewStepPayload extends Omit<StepPayload, 'actors'> {
 }
 interface ApprovalUpdatableInfoPayload {
     approval_rule_id: ID;
-    criteria: CriteriaPayload[];
+    criteria: CriteriaPayload;
     is_applicable_on_pending_approval_entity: boolean;
     steps: ApproverViewStepPayload[];
+    description?: string;
+    is_fallback?: boolean;
+    is_separation_of_duty_enabled?: boolean;
+    /**
+     * Approval Rules 3.0 — rule-level wire fields. The backend accepts these
+     * as optional today; once 3.0 ships they become first-class. The SoD
+     * field name matches the GET response shape (confirmed with backend),
+     * so the same identifier flows both directions on the wire.
+     */
+    name?: string;
+}
+/**
+ * V1 / pre-3.0 wire shape. Kept so the rollback flag (gated by
+ * 'approval_rule_v3_config' dynamic config) can target the original
+ * '/approval-rules' endpoint with the legacy snake_case array of
+ * range entries. None of the 3.0 rule-level fields are sent.
+ *
+ * Reference: 'entityApprovalStatusPayload.json' fixture, which carries
+ * a real V1 approval rule from the legacy backend:
+ *   criteria: [{type: 'range', range_entity: 'currency',
+ *               min, max, currency_code, currency_symbol}]
+ * with 'min' / 'max' as scalar numbers and 'null' representing an
+ * absent bound for one-sided rules. The read-side mapper in
+ * 'approvalRulePayload.ts' (see 'LegacyAmountRangeCriterionPayload')
+ * decodes the same shape — write-side has to match.
+ */
+interface ApprovalUpdatableInfoPayloadV1CriterionEntry {
+    currency_code: string;
+    currency_symbol: string;
+    /** Upper bound. 'null' for a 'greater_than' (open-upper) rule. */
+    max: number | null;
+    /** Lower bound. 'null' for a 'less_than' (open-lower) rule. */
+    min: number | null;
+    range_entity: 'currency';
+    type: 'range';
+}
+interface ApprovalUpdatableInfoPayloadV1 {
+    criteria: ApprovalUpdatableInfoPayloadV1CriterionEntry[];
+    is_applicable_on_pending_approval_entity: boolean;
+    steps: ApproverViewStepPayload[];
+    approval_rule_id?: ID;
 }
 export declare const toApprovalChangableInfoPayload: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayload>;
+/**
+ * V1 wire mapper — used when 'approval_rule_v3_config' resolves to OFF
+ * for the current tenant. Emits the legacy snake_case array shape that
+ * '/approval-rules' historically consumed (see the V1 fixture in
+ * 'entity/entityApprovalStatus/__mocks__/json/entityApprovalStatusPayload.json'):
+ *   criteria: [{type: 'range', range_entity: 'currency', min, max,
+ *               currency_code, currency_symbol}]
+ *
+ * Open-ended semantics are preserved on the wire: an absent 'min' or
+ * 'max' is sent as 'null' rather than synthesised to '0' or
+ * 'MAX_SAFE_INTEGER', so a 'greater_than' / 'less_than' rule stays
+ * one-sided after rollback rather than collapsing into a closed range.
+ *
+ * The V1 backend does not understand vendor / department criteria or
+ * the rule-level 3.0 fields, so those are dropped on the wire.
+ */
+export declare const toApprovalChangableInfoPayloadV1: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayloadV1>;
 export {};

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js

@@ -1,23 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toApprovalChangableInfoPayload = void 0;
+exports.toApprovalChangableInfoPayloadV1 = exports.toApprovalChangableInfoPayload = void 0;
 const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
-    let criteriaPayload = [];
+    // Form-side criteria is a structured object with optional slots for
+    // amount / vendor / department; flatten it into the wire format's
+    // `conditions[]` array.
+    let criteriaPayload;
     if (approverViewUpdateData.criteria != null) {
-        const criteria = approverViewUpdateData.criteria;
-        const { rangeType, rangeEntity, range } = criteria;
-        const { min, max } = range;
-        const { currencyCode, currencySymbol } = min;
-        criteriaPayload = [
-            {
-                type: rangeType,
-                range_entity: rangeEntity,
-                min: min.amount,
-                max: max?.amount ?? null,
-                currency_code: currencyCode,
-                currency_symbol: currencySymbol,
-            },
-        ];
+        const { amount, vendor, department } = approverViewUpdateData.criteria;
+        const conditions = [];
+        if (amount?.min != null) {
+            conditions.push({
+                field: 'amount',
+                type: 'gte',
+                value: amount.min.amount,
+            });
+        }
+        if (amount?.max != null) {
+            conditions.push({
+                field: 'amount',
+                type: 'lte',
+                value: amount.max.amount,
+            });
+        }
+        if (vendor != null && vendor.vendorIds.length > 0) {
+            conditions.push({
+                field: 'vendor_id',
+                type: vendor.operator === 'is_not' ? 'not_in' : 'in',
+                value: vendor.vendorIds,
+            });
+        }
+        if (department != null && department.departmentIds.length > 0) {
+            conditions.push({
+                // The backend models 'department' as the accounting class
+                // entity, so the wire field name is 'accounting_class_id'
+                // (not 'department_id'). State-side and form-side keep
+                // 'department' / 'departmentIds' to match product copy.
+                field: 'accounting_class_id',
+                type: department.operator === 'is_not' ? 'not_in' : 'in',
+                value: department.departmentIds,
+            });
+        }
+        if (conditions.length > 0) {
+            const currency = amount?.min ?? amount?.max ?? null;
+            criteriaPayload = {
+                conditions,
+                criteria_operator: 'and',
+                currency_code: currency?.currencyCode ?? 'USD',
+                currency_symbol: currency?.currencySymbol ?? '$',
+            };
+        }
     }
     const steps = approverViewUpdateData.steps.map((step) => {
         return {
@@ -38,13 +70,110 @@ const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
     });
     const isUpdate = approverViewUpdateData.approvalRuleId != null;
     const payload = {
-        criteria: criteriaPayload,
         steps,
         is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
     };
+    if (criteriaPayload != null) {
+        payload.criteria = criteriaPayload;
+    }
+    // Approval Rules 3.0 — surface rule-level fields when the form set them.
+    // Send only what the user actually entered: an undefined value means
+    // "no opinion" and stays off the wire.
+    if (approverViewUpdateData.name != null) {
+        payload.name = approverViewUpdateData.name;
+    }
+    if (approverViewUpdateData.description != null) {
+        payload.description = approverViewUpdateData.description;
+    }
+    if (approverViewUpdateData.separationOfDuties != null) {
+        payload.is_separation_of_duty_enabled =
+            approverViewUpdateData.separationOfDuties;
+    }
+    if (approverViewUpdateData.isFallback != null) {
+        payload.is_fallback = approverViewUpdateData.isFallback;
+    }
     if (isUpdate) {
         payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
     }
     return payload;
 };
 exports.toApprovalChangableInfoPayload = toApprovalChangableInfoPayload;
+/**
+ * V1 wire mapper — used when 'approval_rule_v3_config' resolves to OFF
+ * for the current tenant. Emits the legacy snake_case array shape that
+ * '/approval-rules' historically consumed (see the V1 fixture in
+ * 'entity/entityApprovalStatus/__mocks__/json/entityApprovalStatusPayload.json'):
+ *   criteria: [{type: 'range', range_entity: 'currency', min, max,
+ *               currency_code, currency_symbol}]
+ *
+ * Open-ended semantics are preserved on the wire: an absent 'min' or
+ * 'max' is sent as 'null' rather than synthesised to '0' or
+ * 'MAX_SAFE_INTEGER', so a 'greater_than' / 'less_than' rule stays
+ * one-sided after rollback rather than collapsing into a closed range.
+ *
+ * The V1 backend does not understand vendor / department criteria or
+ * the rule-level 3.0 fields, so those are dropped on the wire.
+ */
+const toApprovalChangableInfoPayloadV1 = (approverViewUpdateData) => {
+    const amount = approverViewUpdateData.criteria?.amount;
+    const minAmount = amount?.min;
+    const maxAmount = amount?.max;
+    const currencyCode = minAmount?.currencyCode ?? maxAmount?.currencyCode ?? 'USD';
+    const currencySymbol = minAmount?.currencySymbol ?? maxAmount?.currencySymbol ?? '$';
+    const steps = approverViewUpdateData.steps.map((step) => {
+        return {
+            action: step.action,
+            operator: step.operator,
+            actors: step.actors
+                .filter((actor) => actor.subType !== 'admin')
+                .map((actor) => {
+                return {
+                    type: actor.type,
+                    id: actor.userId ?? null,
+                    sub_type: actor.subType ?? null,
+                    id_type: actor.idType ?? null,
+                    is_implicit_actor: actor.isImplicitActor ?? false,
+                };
+            }),
+        };
+    });
+    const isUpdate = approverViewUpdateData.approvalRuleId != null;
+    const minValue = minAmount?.amount ?? null;
+    const maxValue = maxAmount?.amount ?? null;
+    // Approval Rules 3.0 — guard against the both-null case. The form
+    // is expected to always set at least one bound, but if drift ever
+    // hands us a rule with no min and no max we'd otherwise emit
+    // '[{type: range, min: null, max: null, ...}]' — a payload that
+    // (a) the read-side 'legacyAmountRangeToCriteria' decodes back to
+    // '[]' (asymmetric round-trip), and (b) the V1 backend will
+    // reject anyway. Emit 'criteria: []' instead so the save fails
+    // cleanly on the server side and we leave a breadcrumb in the
+    // console for diagnosis rather than persisting mis-shaped data.
+    const criteria = [];
+    if (minValue == null && maxValue == null) {
+        console.warn('[approvalRules][V1] toApprovalChangableInfoPayloadV1: rule has ' +
+            'no amount bounds; emitting empty criteria array. The V1 backend ' +
+            'will reject this save — caller should ensure at least one bound ' +
+            'is set on the form.');
+    }
+    else {
+        criteria.push({
+            type: 'range',
+            range_entity: 'currency',
+            min: minValue,
+            max: maxValue,
+            currency_code: currencyCode,
+            currency_symbol: currencySymbol,
+        });
+    }
+    const payload = {
+        steps,
+        is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
+        criteria,
+    };
+    if (isUpdate) {
+        payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
+    }
+    return payload;
+};
+exports.toApprovalChangableInfoPayloadV1 = toApprovalChangableInfoPayloadV1;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonState.d.ts

@@ -1,19 +1,45 @@
 import { FetchStateAndError, ID } from '../../../../../commonStateTypes/common';
-import { Criteria, Step } from '../../../../../entity/approvalRule/approvalRuleState';
+import { AmountCriteria, DepartmentCriteria, Step, VendorCriteria } from '../../../../../entity/approvalRule/approvalRuleState';
 export type ApprovalUpdateActionType = 'approval_create' | 'approval_update';
 export interface ApproverViewUpdateData {
     type: ApprovalUpdateActionType;
     updateStatus: FetchStateAndError;
     data?: ApprovalRuleUpdateData | ApprovalRuleCreateData;
 }
-export interface ApprovalRuleUpdateData {
+/**
+ * Form-side criteria shape used by the rule create/edit form.
+ *
+ * Each condition kind gets its own optional slot, mirroring how the UI
+ * edits them as distinct rows. At most one of each kind is present; this
+ * matches the design constraint that each condition type can be added once.
+ */
+export interface ApprovalRuleFormCriteria {
+    amount?: AmountCriteria;
+    department?: DepartmentCriteria;
+    vendor?: VendorCriteria;
+}
+/**
+ * Rule-level fields shared by both create and update flows.
+ *
+ * These come from the 3.0 design: the form now owns a name, an optional
+ * description, an optional Separation-of-Duties toggle, and a flag that
+ * marks the rule as the org-wide fallback rule. They live alongside
+ * criteria/steps but are not part of either.
+ */
+export interface ApprovalRuleFormBase {
+    description?: string;
+    isFallback?: boolean;
+    name?: string;
+    separationOfDuties?: boolean;
+}
+export interface ApprovalRuleUpdateData extends ApprovalRuleFormBase {
     approvalRuleId: ID;
-    criteria: Criteria;
+    criteria: ApprovalRuleFormCriteria;
     steps: Step[];
     isApplicableOnPendingApprovalEntity?: boolean;
 }
-export interface ApprovalRuleCreateData {
-    criteria: Criteria;
+export interface ApprovalRuleCreateData extends ApprovalRuleFormBase {
+    criteria: ApprovalRuleFormCriteria;
     steps: Step[];
     isApplicableOnPendingApprovalEntity?: boolean;
 }

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.d.ts

@@ -100,6 +100,13 @@ export interface EditBillDetailSelectorView extends SelectorView {
     withdrawFromList: FundingAccount[];
     billPayInfo?: BillPayInfo;
     bookCloseDate?: ZeniDate;
+    /**
+     * Bill-level accounting class id. Approval Rules 3.0 'department'
+     * criteria match against this — selectors needing to evaluate a
+     * department-narrowed rule against the current bill should read
+     * this rather than digging through 'state.billTransactionState'.
+     */
+    classId?: ID;
     createTime?: ZeniDate;
     editBillInitialDetails?: EditBillInitialDetails;
     internationalWireOnboardingStatus?: AllowedValueWithCode;
@@ -157,4 +164,4 @@ export declare const getDefaultWithdrawFromAccount: (state: RootState, depositAc
     accountId: ID;
     accountType: AccountTypeSubConfigCodeKeyType;
 }) => FundingAccount | undefined;
-export declare const checkIfCreatorIsApprover: (billAmount: number, approvalRules: ApprovalRuleWithUser[], signedInUser?: LoggedInUser) => boolean;
+export declare const checkIfCreatorIsApprover: (billAmount: number, approvalRules: ApprovalRuleWithUser[], signedInUser?: LoggedInUser, billVendorId?: ID, billDepartmentId?: ID) => boolean;

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -10,6 +10,7 @@ exports.toPaymentToOption = toPaymentToOption;
 const get_1 = __importDefault(require("lodash/get"));
 const has_1 = __importDefault(require("lodash/has"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
+const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const bankAccountSelector_1 = require("../../../../entity/bankAccount/bankAccountSelector");
 const contactSelector_1 = require("../../../../entity/billPay/contact/contactSelector");
 const companySelector_1 = require("../../../../entity/company/companySelector");
@@ -365,6 +366,14 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         isDeleted,
         showAutofill,
         addBillAutoFields,
+        // Bill-level accounting class. Approval Rules 3.0 'department'
+        // criteria match against this. Lives on BillTransaction; not on
+        // any sub-section. Empty-string is normalised to 'undefined'
+        // so downstream readers treat "no class" uniformly regardless
+        // of whether the wire used '' or omitted the field.
+        classId: transaction?.classId != null && transaction.classId !== ''
+            ? transaction.classId
+            : undefined,
         billStage,
         deleteStatus,
         billActivities,
@@ -695,12 +704,59 @@ const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSe
     return undefined;
 };
 exports.getDefaultWithdrawFromAccount = getDefaultWithdrawFromAccount;
-const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser) => {
+const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser, billVendorId, billDepartmentId) => {
     let isCreatorAlsoApprover = false;
+    // Approval Rules 3.0 — a rule applies to a bill only when all of
+    // its present criteria are satisfied. Criteria not declared on
+    // the rule are treated as "no narrowing on this axis".
+    //
+    // Strict-match semantics for vendor / department: if the rule
+    // narrows by an axis but the bill has no value on that axis, the
+    // rule does NOT apply (an absent bill-side value can't satisfy
+    // either 'is' or 'is_not'). Amount is always present on a rule
+    // (the form enforces this), but bounds may be one-sided.
     const approvalRule = approvalRules.find((rule) => {
-        const { max, min } = rule.criteria[0].range;
-        return (billAmount > min.amount &&
-            (max?.amount != null ? billAmount <= max?.amount : true));
+        const vendorCriteria = (0, approvalRuleSelector_1.getVendorCriteria)(rule.criteria);
+        if (vendorCriteria != null) {
+            if (billVendorId == null) {
+                return false;
+            }
+            const includesVendor = vendorCriteria.vendorIds.includes(billVendorId);
+            if (vendorCriteria.operator === 'is' && !includesVendor) {
+                return false;
+            }
+            if (vendorCriteria.operator === 'is_not' && includesVendor) {
+                return false;
+            }
+        }
+        const departmentCriteria = (0, approvalRuleSelector_1.getDepartmentCriteria)(rule.criteria);
+        if (departmentCriteria != null) {
+            if (billDepartmentId == null) {
+                return false;
+            }
+            const includesDepartment = departmentCriteria.departmentIds.includes(billDepartmentId);
+            if (departmentCriteria.operator === 'is' && !includesDepartment) {
+                return false;
+            }
+            if (departmentCriteria.operator === 'is_not' && includesDepartment) {
+                return false;
+            }
+        }
+        const amountCriteria = (0, approvalRuleSelector_1.getAmountCriteria)(rule.criteria);
+        if (amountCriteria == null) {
+            // The form guarantees an amount criterion on every rule, so
+            // this branch is defensive against backend drift. Keep
+            // pre-3.0 behaviour: a rule that doesn't declare amount
+            // doesn't participate here.
+            return false;
+        }
+        // Bounds use the wire's inclusive 'gte' / 'lte' semantics, and
+        // either side may be absent for a one-sided 'greater_than' /
+        // 'less_than' rule.
+        const { min, max } = amountCriteria;
+        const matchesMin = min == null || billAmount >= min.amount;
+        const matchesMax = max == null || billAmount <= max.amount;
+        return matchesMin && matchesMax;
     });
     if (approvalRule != null) {
         const requireApprovalSteps = approvalRule.steps.filter((step) => step.action === 'require_approval');

package/lib/view/spendManagement/billPay/editBillView/epics/fetchEditBillDetailPageEpic.js

@@ -41,7 +41,10 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         else {
             billDetailActions.push((0, editBillViewReducer_1.updateShowAutofill)(true));
         }
-        billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true));
+        // Side-fetch from the edit-bill page bootstrap. The triggering
+        // action doesn't carry the V3 flag, so we explicitly target v1
+        // here; tenants on v3 re-fetch through their own screen connector.
+        billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, false));
     }
     else {
         if (state.ownerListState.fetchState !== 'In-Progress' &&
@@ -84,7 +87,10 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         // While opening New Bill Refresh Approval Rules and Payment Accounts
         if (approvalViewFetchState !== 'In-Progress' &&
             approvalViewFetchState !== 'Completed') {
-            billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true));
+            // Side-fetch from the edit-bill page bootstrap. The triggering
+            // action doesn't carry the V3 flag, so we explicitly target v1
+            // here; tenants on v3 re-fetch through their own screen connector.
+            billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, false));
         }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(billDetailActions));

package/lib/view/spendManagement/billPay/internationalWireVerification/epics/fetchIntlVerificationFormEpic.d.ts

@@ -2,6 +2,6 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
-import { fetchInternationalVerificationForm, initializeIntlVerificationForm, updateInternationalVerificationForm, updateVerificationFormFailure } from '../internationalWireVerificationReducer';
-export type ActionType = ReturnType<typeof fetchInternationalVerificationForm> | ReturnType<typeof updateInternationalVerificationForm> | ReturnType<typeof updateVerificationFormFailure> | ReturnType<typeof initializeIntlVerificationForm>;
-export declare const fetchIntlVerificationFormEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+import { fetchInternationalVerificationForm, updateInternationalVerificationForm, updateVerificationFormFailure, updateVerificationFormLocalData } from '../internationalWireVerificationReducer';
+export type ActionType = ReturnType<typeof fetchInternationalVerificationForm> | ReturnType<typeof updateInternationalVerificationForm> | ReturnType<typeof updateVerificationFormFailure> | ReturnType<typeof updateVerificationFormLocalData>;
+export declare const fetchIntlVerificationFormEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/billPay/internationalWireVerification/epics/fetchIntlVerificationFormEpic.js

@@ -4,8 +4,9 @@ exports.fetchIntlVerificationFormEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../../../responsePayload");
+const internationalWireOnboardingDetailsToLocalData_1 = require("../internationalWireOnboardingDetailsToLocalData");
 const internationalWireVerificationReducer_1 = require("../internationalWireVerificationReducer");
-const fetchIntlVerificationFormEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(internationalWireVerificationReducer_1.fetchInternationalVerificationForm.match), (0, operators_1.switchMap)((action) => {
+const fetchIntlVerificationFormEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(internationalWireVerificationReducer_1.fetchInternationalVerificationForm.match), (0, operators_1.switchMap)((action) => {
     const query = {
         region: 'US',
         legal_type: 'BUSINESS',
@@ -14,11 +15,14 @@ const fetchIntlVerificationFormEpic = (actions$, _state$, zeniAPI) => actions$.p
         .getJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/international-wire/onboarding-fields?query=${encodeURIComponent(JSON.stringify(query))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const onboardingDataFromCompanyInfo = state$.value.companyState.companiesById[action.payload.companyId]
+                ?.companyBillPayInfo?.internationalWireOnboardingDetails;
+            const localData = (0, internationalWireOnboardingDetailsToLocalData_1.toVerificationFormLocalDataFromOnboardingDetails)(onboardingDataFromCompanyInfo, response.data.labels);
             return (0, rxjs_1.from)([
                 (0, internationalWireVerificationReducer_1.updateInternationalVerificationForm)({
                     internationalWireFormPayload: response.data.labels,
                 }),
-                (0, internationalWireVerificationReducer_1.initializeIntlVerificationForm)(action.payload.companyId, response.data.labels),
+                (0, internationalWireVerificationReducer_1.updateVerificationFormLocalData)(localData),
             ]);
         }
         else {

package/lib/view/spendManagement/billPay/internationalWireVerification/epics/initializeIntlVerificationFormEpic.d.ts

@@ -1,6 +1,7 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../../reducer';
+import { fetchBillPaySetupViewSuccess } from '../../billPaySetupView/billPaySetupViewReducer';
 import { initializeIntlVerificationForm, updateVerificationFormLocalData } from '../internationalWireVerificationReducer';
 export type ActionType = ReturnType<typeof updateVerificationFormLocalData> | ReturnType<typeof initializeIntlVerificationForm>;
-export declare const initializeIntlVerificationFormEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;
+export declare const initializeIntlVerificationFormEpic: (actions$: ActionsObservable<ActionType | ReturnType<typeof fetchBillPaySetupViewSuccess>>, state$: StateObservable<RootState>) => Observable<ActionType>;