@zeniai/client-epic-state 5.0.90-betaAR4 → 5.0.90-betaAS1

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

@@ -9,17 +9,9 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const deleteBillPayApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.deleteBillPayApprovalRule.match), (0, operators_1.switchMap)((action) => {
-    const { approvalRuleId, useV3 } = action.payload;
-    // Approval Rules 3.0 — flag-gated endpoint selection.
-    // Explicit `=== true` keeps `strict-boolean-expressions` happy
-    // when RTK's payload type widens to `any` in some configs.
-    const endpoint = useV3 === true
-        ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
-        : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
+    const { approvalRuleId } = action.payload;
     return zeniAPI
-        .deleteAndGetJSON(endpoint, {
-        approval_rule_id: approvalRuleId,
-    })
+        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, { approval_rule_id: approvalRuleId })
         .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/epic/fetchBillPaySetupApproverViewEpic.js

@@ -9,7 +9,7 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView.match), (0, operators_1.switchMap)((action) => {
-    const { cacheOverride, useV3 } = action.payload;
+    const { cacheOverride } = action.payload;
     const { billPaySetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, billPaySetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -17,13 +17,9 @@ const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions
             billPaySetupApproverViewState.approvalRuleIds.length ||
         (billPaySetupApproverViewState.hasValidState() === false &&
             billPaySetupApproverViewState.fetchState !== 'In-Progress')) {
-        // Approval Rules 3.0 — flag-gated endpoint selection.
-        // Explicit `=== true` keeps `strict-boolean-expressions` happy
-        // when RTK's payload type widens to `any` in some configs.
-        const endpoint = useV3 === true
-            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
-            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
-        return zeniAPI.getJSON(endpoint).pipe((0, operators_1.mergeMap)((response) => {
+        return zeniAPI
+            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`)
+            .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);
                 const actions = [

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

@@ -11,20 +11,16 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
     if (approvalRuleId != null) {
         const approvalRule = (0, approvalRuleSelector_1.getApprovalRuleById)(state$.value.approvalRuleState, approvalRuleId);
         if (approvalRule != null) {
+            const criteria = approvalRule.criteria[0];
+            const range = criteria?.range;
             const billPaySetupApproverViewUpdateData = {
                 approvalRuleId,
                 steps: approvalRule.steps,
                 criteria: {
-                    amount: (0, approvalRuleSelector_1.getAmountCriteria)(approvalRule.criteria),
-                    vendor: (0, approvalRuleSelector_1.getVendorCriteria)(approvalRule.criteria),
-                    department: (0, approvalRuleSelector_1.getDepartmentCriteria)(approvalRule.criteria),
+                    rangeType: criteria?.rangeType,
+                    rangeEntity: criteria?.rangeEntity,
+                    range,
                 },
-                // Approval Rules 3.0 — seed rule-level fields so the form can
-                // round-trip them on edit. Each may be undefined on legacy rules.
-                name: approvalRule.name,
-                description: approvalRule.description,
-                separationOfDuties: approvalRule.separationOfDuties,
-                isFallback: approvalRule.isFallback,
             };
             fetchActions.push((0, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewUpdateData));
         }
@@ -32,7 +28,7 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
     else {
         const billPaySetupApproverViewCreateData = {
             steps: [],
-            criteria: {},
+            criteria: undefined,
         };
         fetchActions.push((0, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewCreateData));
     }

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

@@ -9,23 +9,14 @@ 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)((action) => {
+const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdates.match), (0, operators_1.switchMap)(() => {
     const { billPaySetupApproverViewState } = state$.value;
     const billPaySetupApproverViewUpdateData = billPaySetupApproverViewState.billPaySetupApproverViewUpdateData;
     if (billPaySetupApproverViewUpdateData != null &&
         billPaySetupApproverViewUpdateData.data != null) {
-        // 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`;
+        const payload = (0, commonPayload_1.toApprovalChangableInfoPayload)(billPaySetupApproverViewUpdateData.data);
         return zeniAPI
-            .postAndGetJSON(endpoint, payload)
+            .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, 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,67 +14,9 @@ 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,51 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toApprovalChangableInfoPayloadV1 = exports.toApprovalChangableInfoPayload = void 0;
+exports.toApprovalChangableInfoPayload = void 0;
 const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
-    // 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;
+    let criteriaPayload = [];
     if (approverViewUpdateData.criteria != null) {
-        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({
-                field: 'department_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 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 steps = approverViewUpdateData.steps.map((step) => {
         return {
@@ -66,90 +38,13 @@ 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 criteriaEntry = {
-        type: 'range',
-        range_entity: 'currency',
-        min: minAmount?.amount ?? null,
-        max: maxAmount?.amount ?? null,
-        currency_code: currencyCode,
-        currency_symbol: currencySymbol,
-    };
-    const payload = {
-        steps,
-        is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
-        criteria: [criteriaEntry],
-    };
-    if (isUpdate) {
-        payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
-    }
-    return payload;
-};
-exports.toApprovalChangableInfoPayloadV1 = toApprovalChangableInfoPayloadV1;

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

@@ -1,45 +1,19 @@
 import { FetchStateAndError, ID } from '../../../../../commonStateTypes/common';
-import { AmountCriteria, DepartmentCriteria, Step, VendorCriteria } from '../../../../../entity/approvalRule/approvalRuleState';
+import { Criteria, Step } from '../../../../../entity/approvalRule/approvalRuleState';
 export type ApprovalUpdateActionType = 'approval_create' | 'approval_update';
 export interface ApproverViewUpdateData {
     type: ApprovalUpdateActionType;
     updateStatus: FetchStateAndError;
     data?: ApprovalRuleUpdateData | ApprovalRuleCreateData;
 }
-/**
- * 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 {
+export interface ApprovalRuleUpdateData {
     approvalRuleId: ID;
-    criteria: ApprovalRuleFormCriteria;
+    criteria: Criteria;
     steps: Step[];
     isApplicableOnPendingApprovalEntity?: boolean;
 }
-export interface ApprovalRuleCreateData extends ApprovalRuleFormBase {
-    criteria: ApprovalRuleFormCriteria;
+export interface ApprovalRuleCreateData {
+    criteria: Criteria;
     steps: Step[];
     isApplicableOnPendingApprovalEntity?: boolean;
 }

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

@@ -100,13 +100,6 @@ 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;
@@ -164,4 +157,4 @@ export declare const getDefaultWithdrawFromAccount: (state: RootState, depositAc
     accountId: ID;
     accountType: AccountTypeSubConfigCodeKeyType;
 }) => FundingAccount | undefined;
-export declare const checkIfCreatorIsApprover: (billAmount: number, approvalRules: ApprovalRuleWithUser[], signedInUser?: LoggedInUser, billVendorId?: ID, billDepartmentId?: ID) => boolean;
+export declare const checkIfCreatorIsApprover: (billAmount: number, approvalRules: ApprovalRuleWithUser[], signedInUser?: LoggedInUser) => boolean;

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

@@ -9,7 +9,6 @@ exports.getPaymentSection = getPaymentSection;
 exports.toPaymentToOption = toPaymentToOption;
 const get_1 = __importDefault(require("lodash/get"));
 const has_1 = __importDefault(require("lodash/has"));
-const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const bankAccountSelector_1 = require("../../../../entity/bankAccount/bankAccountSelector");
 const contactSelector_1 = require("../../../../entity/billPay/contact/contactSelector");
@@ -366,14 +365,6 @@ 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,
@@ -704,59 +695,12 @@ const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSe
     return undefined;
 };
 exports.getDefaultWithdrawFromAccount = getDefaultWithdrawFromAccount;
-const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser, billVendorId, billDepartmentId) => {
+const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser) => {
     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 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;
+        const { max, min } = rule.criteria[0].range;
+        return (billAmount > min.amount &&
+            (max?.amount != null ? billAmount <= max?.amount : true));
     });
     if (approvalRule != null) {
         const requireApprovalSteps = approvalRule.steps.filter((step) => step.action === 'require_approval');

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

@@ -16,17 +16,24 @@ const initializeIntlVerificationFormEpic = (actions$, state$) => actions$.pipe((
             ? onboardingDataFromCompanyInfo[formFieldKey]?.values
             : undefined;
         if (values != null) {
-            localData[formFieldKey] =
-                internationalWireFormPayload[formFieldKey].type === 'enum'
-                    ? internationalWireFormPayload[formFieldKey]
-                        .is_multiple_values_allowed === false
+            const fieldPayload = internationalWireFormPayload[formFieldKey];
+            if (fieldPayload.type === 'enum') {
+                localData[formFieldKey] =
+                    fieldPayload.is_multiple_values_allowed === false
                         ? typeof values[0] === 'object' && 'code' in values[0]
                             ? values[0].code
                             : ''
                         : values.map((value) => typeof value === 'object' && 'code' in value
                             ? value.code
-                            : '')
-                    : values[0];
+                            : '');
+            }
+            else if (fieldPayload.type === 'file' &&
+                fieldPayload.is_multiple_values_allowed === true) {
+                localData[formFieldKey] = values.filter((value) => typeof value === 'string');
+            }
+            else {
+                localData[formFieldKey] = values[0] ?? '';
+            }
         }
         else {
             localData[formFieldKey] =

package/lib/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationPayload.d.ts

@@ -1,17 +1,39 @@
 import { AllowedValueWithCode } from '../../../../commonStateTypes/allowedValue';
 import { ZeniAPIResponse } from '../../../../responsePayload';
 import { VerificationFormField } from './internationalWireVerificationState';
+export declare const InternationalWireVerificationFormOrder: readonly ["certificate_of_good_standing", "business_ownership", "company_proof_of_address", "company_officer_proof_of_address", "company_registration_date", "annual_turnover", "expected_transaction_volume", "employee_count", "intended_use_of_account", "transaction_countries", "stake_holder", "controlling_person"];
+export interface FieldOptionPayload {
+    label: string;
+}
+export interface SubFieldPayload {
+    label: string;
+    type: string;
+    field_hint_text?: string;
+    field_values?: {
+        code: string;
+        description: string;
+    }[];
+    is_multiple_options_supported?: boolean;
+    options?: Record<string, FieldOptionPayload>;
+}
 export interface FieldPayload {
     label: string;
     type: string;
+    default?: boolean;
     field_hint_text?: string;
     field_values?: {
         code: string;
         description: string;
     }[];
+    is_multiple_options_supported?: boolean;
     is_multiple_values_allowed?: boolean;
+    options?: Record<string, FieldOptionPayload>;
+    requirements?: string[];
+    subfields?: Record<string, SubFieldPayload>;
 }
 export declare const toDynamicFormField: (key: string, payload: FieldPayload) => VerificationFormField;
+export declare const sortVerificationFormFields: (fields: VerificationFormField[]) => VerificationFormField[];
+export declare const toVerificationFormFields: (internationalWireFormPayload: Record<string, FieldPayload>) => VerificationFormField[];
 export type IntlVerificationFormResponse = ZeniAPIResponse<IntlVerificationFormPayload>;
 export interface IntlVerificationFormPayload {
     create_time: string;

package/lib/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationPayload.js

@@ -1,19 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toDynamicFormField = void 0;
+exports.toVerificationFormFields = exports.sortVerificationFormFields = exports.toDynamicFormField = exports.InternationalWireVerificationFormOrder = void 0;
+exports.InternationalWireVerificationFormOrder = [
+    'certificate_of_good_standing',
+    'business_ownership',
+    'company_proof_of_address',
+    'company_officer_proof_of_address',
+    'company_registration_date',
+    'annual_turnover',
+    'expected_transaction_volume',
+    'employee_count',
+    'intended_use_of_account',
+    'transaction_countries',
+    'stake_holder',
+    'controlling_person',
+];
+const toFieldValues = (fieldValues) => fieldValues?.map(({ code, description }) => ({ code, description })) ?? [];
+const toSubField = (subfield) => ({
+    label: subfield.label,
+    placeholder: subfield.field_hint_text ?? '',
+    type: subfield.type,
+    fieldValues: toFieldValues(subfield.field_values),
+    isMultipleOptionsSupported: subfield.is_multiple_options_supported,
+    options: subfield.options,
+});
 const toDynamicFormField = (key, payload) => ({
     name: key,
     label: payload.label,
     placeholder: payload.field_hint_text ?? '',
     isMultipleValuesAllowed: payload.is_multiple_values_allowed ?? false,
     type: payload.type,
-    fieldValues: payload.field_values != null && payload.field_values.length > 0
-        ? payload.field_values.map((fieldValue) => {
-            return {
-                code: fieldValue.code,
-                description: fieldValue.description,
-            };
-        })
-        : [],
+    fieldValues: toFieldValues(payload.field_values),
+    isMultipleOptionsSupported: payload.is_multiple_options_supported,
+    options: payload.options,
+    requirements: payload.requirements,
+    default: payload.default,
+    subfields: payload.subfields != null
+        ? Object.fromEntries(Object.entries(payload.subfields).map(([subfieldKey, subfield]) => [
+            subfieldKey,
+            toSubField(subfield),
+        ]))
+        : undefined,
 });
 exports.toDynamicFormField = toDynamicFormField;
+const sortVerificationFormFields = (fields) => {
+    const orderIndex = new Map(exports.InternationalWireVerificationFormOrder.map((name, index) => [name, index]));
+    return fields.slice().sort((a, b) => {
+        const aIndex = orderIndex.get(a.name) ?? exports.InternationalWireVerificationFormOrder.length;
+        const bIndex = orderIndex.get(b.name) ?? exports.InternationalWireVerificationFormOrder.length;
+        if (aIndex !== bIndex) {
+            return aIndex - bIndex;
+        }
+        return a.name.localeCompare(b.name);
+    });
+};
+exports.sortVerificationFormFields = sortVerificationFormFields;
+const toVerificationFormFields = (internationalWireFormPayload) => (0, exports.sortVerificationFormFields)(Object.keys(internationalWireFormPayload).map((key) => (0, exports.toDynamicFormField)(key, internationalWireFormPayload[key])));
+exports.toVerificationFormFields = toVerificationFormFields;