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

package/lib/esm/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -52,12 +52,6 @@ export const getReviewPageBillDetail = (state, billId) => {
     let recurringConfig;
     let billPayInfo;
     let isBillMarkedForRetry = false;
-    // Bill-level accounting class id. Approval Rules 3.0 'department'
-    // criteria match against this. Sourced from BillTransaction so
-    // any selector that needs it (e.g. creator-as-approver lookup)
-    // can read it off the view rather than reaching into
-    // 'state.billTransactionState' itself.
-    let classId;
     const zeniAssistRetryStatus = billId != null
         ? billDetailViewState.billDetailById[key].zeniAssist.retryStatus
         : undefined;
@@ -68,13 +62,6 @@ export const getReviewPageBillDetail = (state, billId) => {
             transaction?.billPayInfo.isCollectToAccountInfoFromVendorContact ?? false;
         isRecurring = transaction?.isRecurring ?? false;
         billPayInfo = transaction?.billPayInfo;
-        // Normalise empty-string 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;
         if (isRecurring &&
             transaction?.recurringBillConfigId != null &&
             transaction.recurringBillInstance != null) {
@@ -191,6 +178,5 @@ export const getReviewPageBillDetail = (state, billId) => {
         zeniAssistRetryStatus,
         billPayInfo,
         outsideZeniPaymentInfo,
-        classId,
     };
 };

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js

@@ -13,7 +13,6 @@ export const initialState = {
     newApprovalRuleId: undefined,
     approvalRulesDeleteStatusById: {},
     billPaySetupApproverViewUpdateData: undefined,
-    reorderStatus: { fetchState: 'Not-Started', error: undefined },
     hasValidState() {
         return this.fetchState === 'Completed';
     },
@@ -27,11 +26,8 @@ const billPaySetupApproverView = createSlice({
                 draft.fetchState = 'In-Progress';
                 draft.error = undefined;
             },
-            // Approval Rules 3.0 — `useV3` arrives from the screen connector
-            // (`approval_rule_v3_config` dynamic config) and picks the v1 vs
-            // v2 endpoint in the fetch epic.
-            prepare(cacheOverride = false, includeUserRoles = true, useV3 = false) {
-                return { payload: { cacheOverride, includeUserRoles, useV3 } };
+            prepare(cacheOverride = false, includeUserRoles = true) {
+                return { payload: { cacheOverride, includeUserRoles } };
             },
         },
         fetchBillPaySetupApproverViewSuccess: {
@@ -116,11 +112,8 @@ const billPaySetupApproverView = createSlice({
                     error: undefined,
                 };
             },
-            // Approval Rules 3.0 — `useV3` flows from the screen connector
-            // (`approval_rule_v3_config` dynamic config) so the delete epic
-            // can pick the v1 vs v2 endpoint.
-            prepare(approvalRuleId, useV3 = false) {
-                return { payload: { approvalRuleId, useV3 } };
+            prepare(approvalRuleId) {
+                return { payload: { approvalRuleId } };
             },
         },
         deleteBillPayApprovalRuleSuccess: {
@@ -152,96 +145,13 @@ const billPaySetupApproverView = createSlice({
                 };
             },
         },
-        /**
-         * Approval Rules 3.0 — list-page drag-and-drop reorder.
-         *
-         * The trigger action carries the desired ordering as an ID list.
-         * The reducer optimistically replaces 'approvalRuleIds' so the
-         * list page renders the new order immediately; the epic then
-         * fires the PUT and either confirms (success — pulls updated
-         * priorities from the response) or recovers (failure — refetches
-         * the view so we don't strand a stale local order).
-         */
-        reorderBillPayApprovalRules: {
-            reducer(draft, action) {
-                const { approvalRuleIds } = action.payload;
-                const wasReorderInFlight = draft.reorderStatus.fetchState === 'In-Progress';
-                draft.reorderStatus = { fetchState: 'In-Progress', error: undefined };
-                // Stash the pre-reorder order so 'Failure' can restore it
-                // synchronously. The epic's refetch on failure remains as a
-                // safety net (covers cases where the server's truth has
-                // drifted from the local snapshot), but the snappy UX path
-                // is the in-memory rollback.
-                //
-                // Only capture a fresh snapshot when no reorder is already in
-                // flight. If a second drag fires before the first PUT lands,
-                // the existing snapshot already holds the last server-backed
-                // order; overwriting it with the first reorder's optimistic
-                // result would mean a Failure rolls back to an uncommitted
-                // intermediate order instead of the last good list.
-                if (!wasReorderInFlight) {
-                    draft.reorderRollbackIds = draft.approvalRuleIds;
-                }
-                // Optimistic: render new order immediately. On failure, the
-                // reducer restores 'reorderRollbackIds' and the epic refetch
-                // reconciles any drift.
-                draft.approvalRuleIds = approvalRuleIds;
-            },
-            prepare(approvalRuleIds, useV3 = false) {
-                return { payload: { approvalRuleIds, useV3 } };
-            },
-        },
-        reorderBillPayApprovalRulesSuccess: {
-            reducer(draft, action) {
-                const { approvalRuleIds } = action.payload;
-                draft.reorderStatus = { fetchState: 'Completed', error: undefined };
-                // The API response is authoritative — overwrite with the
-                // server's reported order in case it normalised anything.
-                draft.approvalRuleIds = approvalRuleIds;
-                // Reorder succeeded — discard the snapshot so the next
-                // reorder starts from this committed order.
-                draft.reorderRollbackIds = undefined;
-            },
-            prepare(approvalRuleIds) {
-                return { payload: { approvalRuleIds } };
-            },
-        },
-        reorderBillPayApprovalRulesFailure: {
-            reducer(draft, action) {
-                const { status } = action.payload;
-                draft.reorderStatus = { fetchState: 'Error', error: status };
-                // Restore the snapshot taken on the trigger reducer before
-                // the optimistic mutation. The epic still fires a refetch
-                // alongside the failure action for cross-tab drift recovery,
-                // but locally the user sees their last good order instantly.
-                if (draft.reorderRollbackIds != null) {
-                    draft.approvalRuleIds = draft.reorderRollbackIds;
-                    draft.reorderRollbackIds = undefined;
-                }
-            },
-            prepare(status) {
-                return { payload: { status } };
-            },
-        },
-        saveBillPaySetupApproverViewUpdates: {
-            // Approval Rules 3.0 — `useV3` is sourced from the
-            // `approval_rule_v3_config` dynamic config in the screen
-            // connector. The reducer doesn't read it (the field only
-            // matters in the save epic), but it must be declared so the
-            // action's payload type is correctly inferred for downstream
-            // consumers.
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            reducer(draft, _action) {
-                if (draft.billPaySetupApproverViewUpdateData != null) {
-                    draft.billPaySetupApproverViewUpdateData.updateStatus = {
-                        fetchState: 'In-Progress',
-                        error: undefined,
-                    };
-                }
-            },
-            prepare(useV3) {
-                return { payload: { useV3 } };
-            },
+        saveBillPaySetupApproverViewUpdates(draft) {
+            if (draft.billPaySetupApproverViewUpdateData != null) {
+                draft.billPaySetupApproverViewUpdateData.updateStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            }
         },
         saveBillPaySetupApproverViewUpdatesSuccess: {
             reducer(draft, action) {
@@ -330,5 +240,5 @@ const billPaySetupApproverView = createSlice({
         },
     },
 });
-export const { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewSuccess, fetchBillPaySetupApproverViewFailure, fetchBillPayApproversDetails, fetchBillPayApproversList, fetchBillPayApproversListSuccess, fetchBillPayApproversListFailure, deleteBillPayApprovalRule, deleteBillPayApprovalRuleSuccess, deleteBillPayApprovalRuleFailure, reorderBillPayApprovalRules, reorderBillPayApprovalRulesSuccess, reorderBillPayApprovalRulesFailure, saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesSuccess, saveBillPaySetupApproverViewUpdatesFailure, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, setListeningToPusherEvent, clearBillPaySetupApproverView, } = billPaySetupApproverView.actions;
+export const { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewSuccess, fetchBillPaySetupApproverViewFailure, fetchBillPayApproversDetails, fetchBillPayApproversList, fetchBillPayApproversListSuccess, fetchBillPayApproversListFailure, deleteBillPayApprovalRule, deleteBillPayApprovalRuleSuccess, deleteBillPayApprovalRuleFailure, saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesSuccess, saveBillPaySetupApproverViewUpdatesFailure, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, setListeningToPusherEvent, clearBillPaySetupApproverView, } = billPaySetupApproverView.actions;
 export default billPaySetupApproverView.reducer;

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

@@ -6,17 +6,9 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { deleteBillPayApprovalRule, deleteBillPayApprovalRuleFailure, deleteBillPayApprovalRuleSuccess, } from '../billPaySetupApproverViewReducer';
 export const deleteBillPayApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteBillPayApprovalRule.match), 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(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.js

@@ -6,7 +6,7 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewFailure, fetchBillPaySetupApproverViewSuccess, } from '../billPaySetupApproverViewReducer';
 export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBillPaySetupApproverView.match), switchMap((action) => {
-    const { cacheOverride, useV3 } = action.payload;
+    const { cacheOverride } = action.payload;
     const { billPaySetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = getApprovalRulesByIds(approvalRuleState, billPaySetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -14,13 +14,9 @@ export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) =>
             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(mergeMap((response) => {
+        return zeniAPI
+            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`)
+            .pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
                 const actions = [

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

@@ -1,6 +1,6 @@
 import { from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
-import { getAmountCriteria, getApprovalRuleById, getDepartmentCriteria, getVendorCriteria, } from '../../../../../entity/approvalRule/approvalRuleSelector';
+import { getApprovalRuleById } from '../../../../../entity/approvalRule/approvalRuleSelector';
 import { clearBillPaySetupApproverViewUpdateData, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, } from '../billPaySetupApproverViewReducer';
 export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => actions$.pipe(filter(initializeBillPaySetupApproverViewUpdateData.match), mergeMap((action) => {
     const { approvalRuleId } = action.payload;
@@ -8,20 +8,16 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state
     if (approvalRuleId != null) {
         const approvalRule = 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: getAmountCriteria(approvalRule.criteria),
-                    vendor: getVendorCriteria(approvalRule.criteria),
-                    department: 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(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewUpdateData));
         }
@@ -29,7 +25,7 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state
     else {
         const billPaySetupApproverViewCreateData = {
             steps: [],
-            criteria: {},
+            criteria: undefined,
         };
         fetchActions.push(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewCreateData));
     }

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

@@ -5,24 +5,15 @@ import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesFailure, saveBillPaySetupApproverViewUpdatesSuccess, } from '../billPaySetupApproverViewReducer';
-import { toApprovalChangableInfoPayload, toApprovalChangableInfoPayloadV1, } from '../types/commonPayload';
-export const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveBillPaySetupApproverViewUpdates.match), switchMap((action) => {
+import { toApprovalChangableInfoPayload } from '../types/commonPayload';
+export const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveBillPaySetupApproverViewUpdates.match), 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
-            ? toApprovalChangableInfoPayload(billPaySetupApproverViewUpdateData.data)
-            : 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 = toApprovalChangableInfoPayload(billPaySetupApproverViewUpdateData.data);
         return zeniAPI
-            .postAndGetJSON(endpoint, payload)
+            .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, payload)
             .pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

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

@@ -1,48 +1,20 @@
 export 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 {
@@ -63,86 +35,10 @@ export 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;
-};
-/**
- * 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 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;
     }

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

@@ -1,6 +1,5 @@
 import recordGet from 'lodash/get';
 import has from 'lodash/has';
-import { getAmountCriteria, getDepartmentCriteria, getVendorCriteria, } from '../../../../entity/approvalRule/approvalRuleSelector';
 import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
 import { getBankAccountByBankAccountId, getBankAccountsByBankAccountIds, } from '../../../../entity/bankAccount/bankAccountSelector';
 import { getContactById, getContactsByIds, } from '../../../../entity/billPay/contact/contactSelector';
@@ -357,14 +356,6 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
         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,
@@ -687,59 +678,12 @@ export const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId,
     }
     return undefined;
 };
-export const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser, billVendorId, billDepartmentId) => {
+export 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 = 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 = 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 = 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/esm/view/spendManagement/billPay/internationalWireVerification/epics/initializeIntlVerificationFormEpic.js

@@ -13,17 +13,24 @@ export const initializeIntlVerificationFormEpic = (actions$, state$) => actions$
             ? 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/esm/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationPayload.js

@@ -1,15 +1,53 @@
+export const 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,
+});
 export 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,
 });
+export const sortVerificationFormFields = (fields) => {
+    const orderIndex = new Map(InternationalWireVerificationFormOrder.map((name, index) => [name, index]));
+    return fields.slice().sort((a, b) => {
+        const aIndex = orderIndex.get(a.name) ?? InternationalWireVerificationFormOrder.length;
+        const bIndex = orderIndex.get(b.name) ?? InternationalWireVerificationFormOrder.length;
+        if (aIndex !== bIndex) {
+            return aIndex - bIndex;
+        }
+        return a.name.localeCompare(b.name);
+    });
+};
+export const toVerificationFormFields = (internationalWireFormPayload) => sortVerificationFormFields(Object.keys(internationalWireFormPayload).map((key) => toDynamicFormField(key, internationalWireFormPayload[key])));