@zeniai/client-epic-state 5.0.85-betaAR1 → 5.0.85-betaAR3

package/lib/esm/view/expenseAutomationView/transactionFilterHelpers.js

@@ -28,28 +28,57 @@ export const TRANSACTION_FILTER_CATEGORIES = [
     { value: 'class', type: 'dropdown' },
     { value: 'amount', type: 'numberRange' },
 ];
+/**
+ * Per-line amounts for a transaction, preserving the canonical source
+ * precedence:
+ *
+ *   1. `transactionLocalData.transactionReviewLocalData.lineItemById` —
+ *      the locally-edited line items the user sees in the grid. Reflects
+ *      unsaved edits so the filter matches what the user actually has on
+ *      screen, not the pre-edit server state.
+ *   2. `transaction.transaction.lines` — persisted lines from the
+ *      transaction payload.
+ *   3. `[transaction.amount.amount]` — single-element fallback for
+ *      transactions that don't have a `lines` array at all (treat the
+ *      transaction-level amount as a one-line transaction).
+ *
+ * Returned as an array so the amount filter in `transactionMatchesCategory`
+ * can OR-combine per-line `matchAmount` results: a transaction is included
+ * if ANY of its lines satisfies the operator, and the full row (with all
+ * lines, matching or not) renders downstream. Before the per-line change
+ * this helper's predecessor in `getCategoryValueForTransaction` summed
+ * these values into a single aggregate and compared the sum.
+ */
+const getLineAmountsForTransaction = (transaction) => {
+    const localData = transaction.transactionLocalData?.transactionReviewLocalData;
+    if (localData?.lineItemById != null) {
+        const lineItems = Object.values(localData.lineItemById);
+        if (lineItems.length > 0) {
+            return lineItems.map((lineItem) => lineItem.amount?.amount ?? 0);
+        }
+    }
+    if (transaction.transaction.lines != null &&
+        transaction.transaction.lines.length > 0) {
+        return transaction.transaction.lines.map((line) => line.amount?.amount ?? 0);
+    }
+    return [transaction.amount.amount];
+};
 /**
  * Resolve the comparable value for a transaction against a given filter field.
  * Returns undefined when the transaction doesn't carry the field — callers
  * decide whether absence counts as a match (for 'not_equal' it does).
+ *
+ * NOTE: the `'amount'` field is NOT handled here. Amount matching is
+ * per-line (see `getLineAmountsForTransaction` + the early-return in
+ * `transactionMatchesCategory`) and would otherwise need to return a
+ * non-scalar value that doesn't fit this helper's contract.
  */
 const getCategoryValueForTransaction = (key, transaction) => {
     switch (key) {
         case 'amount': {
-            // Prefer transactionLocalData line items (sum). Fall back to lines on
-            // the transaction itself. Final fallback: transaction-level amount.
-            const localDataForAmount = transaction.transactionLocalData?.transactionReviewLocalData;
-            if (localDataForAmount?.lineItemById) {
-                const lineItems = Object.values(localDataForAmount.lineItemById);
-                if (lineItems.length > 0) {
-                    return lineItems.reduce((sum, lineItem) => sum + (lineItem.amount?.amount ?? 0), 0);
-                }
-            }
-            if (transaction.transaction.lines &&
-                transaction.transaction.lines.length > 0) {
-                return transaction.transaction.lines.reduce((sum, line) => sum + (line.amount?.amount ?? 0), 0);
-            }
-            return transaction.amount.amount;
+            // Handled per-line in `transactionMatchesCategory` — see the note on
+            // this function's JSDoc and `getLineAmountsForTransaction` above.
+            return undefined;
         }
         case 'payee': {
             if (isNonEmptyString(transaction.vendorName)) {
@@ -187,6 +216,27 @@ const matchAmount = (amount, category) => {
     return op === 'not_equal' ? !matched : matched;
 };
 const transactionMatchesCategory = (transaction, category) => {
+    if (category.field === 'amount') {
+        // Per-line matching: the transaction is included if ANY of its lines
+        // satisfies the operator. This is what the user expects when a
+        // multi-line transaction contains lines at different amounts — they
+        // want the row to surface if even one line falls in the filter's
+        // range. The full row (with non-matching lines too) renders
+        // downstream; this matcher only decides row inclusion. Same
+        // operator + sign semantics as the aggregate version, just applied
+        // per line.
+        //
+        // `not_equal` deserves a sanity-check: `matchAmount` already inverts
+        // internally for that operator, so for a line whose amount is NOT
+        // in the filter's `values`, matchAmount returns true; for a line
+        // whose amount IS in the values, it returns false. `.some()` over
+        // lines therefore means "the transaction has at least one line that
+        // is not equal to any of the filter values" — which is the right
+        // match-any-line interpretation of `not_equal` (a transaction
+        // matches if it has a line that satisfies the negation).
+        const lineAmounts = getLineAmountsForTransaction(transaction);
+        return lineAmounts.some((lineAmount) => matchAmount(lineAmount, category));
+    }
     const value = getCategoryValueForTransaction(category.field, transaction);
     if (value == null) {
         // Absent-value semantics — pinning these down explicitly so the
@@ -206,12 +256,10 @@ const transactionMatchesCategory = (transaction, category) => {
         //              are filtered out.
         //
         // Only the `not_equal` branch returns `true` here; everything else
-        // falls through to the `false` below.
+        // falls through to the `false` below. Note: 'amount' never lands here
+        // because it short-circuits to the per-line path above.
         return category.matchingOperator === 'not_equal';
     }
-    if (category.field === 'amount') {
-        return matchAmount(Number(value), category);
-    }
     const valueStr = value.toString();
     const valueInList = category.values.some((v) => v.toString() === valueStr);
     return category.matchingOperator === 'not_equal' ? !valueInList : valueInList;

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,68 +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;
-                draft.reorderStatus = { fetchState: 'In-Progress', error: undefined };
-                // Optimistic: render new order immediately. On failure, the
-                // epic dispatches fetchBillPaySetupApproverView to restore.
-                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;
-            },
-            prepare(approvalRuleIds) {
-                return { payload: { approvalRuleIds } };
-            },
-        },
-        reorderBillPayApprovalRulesFailure: {
-            reducer(draft, action) {
-                const { status } = action.payload;
-                draft.reorderStatus = { fetchState: 'Error', error: status };
-            },
-            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) {
@@ -302,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,88 +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. Translates the form-side amount criteria into
- * the legacy `{rangeType, rangeEntity, range: {min, max}}` shape. The
- * V1 backend does not understand vendor / department criteria or the
- * rule-level 3.0 fields, so those are dropped on the wire.
- *
- * The form-side amount slot is always read as a `range`-style criteria
- * here: V1 schemas only supported ranges, so an absent `min` or `max`
- * falls back to `0` / `Number.MAX_SAFE_INTEGER`.
- */
-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 payload = {
-        steps,
-        is_applicable_on_pending_approval_entity: approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? true,
-        criteria: {
-            rangeType: 'range',
-            rangeEntity: 'currency',
-            range: {
-                min: {
-                    amount: minAmount?.amount ?? 0,
-                    currencyCode,
-                    currencySymbol,
-                },
-                max: {
-                    amount: maxAmount?.amount ?? Number.MAX_SAFE_INTEGER,
-                    currencyCode,
-                    currencySymbol,
-                },
-            },
-        },
-    };
     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 } from '../../../../entity/approvalRule/approvalRuleSelector';
 import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
 import { getBankAccountByBankAccountId, getBankAccountsByBankAccountIds, } from '../../../../entity/bankAccount/bankAccountSelector';
 import { getContactById, getContactsByIds, } from '../../../../entity/billPay/contact/contactSelector';
@@ -682,13 +681,9 @@ export const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId,
 export const checkIfCreatorIsApprover = (billAmount, approvalRules, signedInUser) => {
     let isCreatorAlsoApprover = false;
     const approvalRule = approvalRules.find((rule) => {
-        const amountCriteria = getAmountCriteria(rule.criteria);
-        if (amountCriteria?.min == null) {
-            return false;
-        }
-        const { min, max } = amountCriteria;
+        const { max, min } = rule.criteria[0].range;
         return (billAmount > min.amount &&
-            (max?.amount != null ? billAmount <= max.amount : true));
+            (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/reimbursement/remiSetupApproverView/epic/deleteRemiApprovalRuleEpic.js

@@ -6,17 +6,9 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { deleteRemiApprovalRule, deleteRemiApprovalRuleFailure, deleteRemiApprovalRuleSuccess, } from '../remiSetupApproverViewReducer';
 export const deleteRemiApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteRemiApprovalRule.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/reimbursements/approval-rules-v2`
-        : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
+    const { approvalRuleId } = action.payload;
     return zeniAPI
-        .deleteAndGetJSON(endpoint, {
-        approval_rule_id: approvalRuleId,
-    })
+        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/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/reimbursement/remiSetupApproverView/epic/fetchRemiSetupApproverViewEpic.js

@@ -6,7 +6,7 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { fetchRemiSetupApproverView, fetchRemiSetupApproverViewFailure, fetchRemiSetupApproverViewSuccess, } from '../remiSetupApproverViewReducer';
 export const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchRemiSetupApproverView.match), switchMap((action) => {
-    const { cacheOverride, resolveAttributeToUser, includeImplicitActors, useV3, } = action.payload;
+    const { cacheOverride, resolveAttributeToUser, includeImplicitActors } = action.payload;
     const { remiSetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = getApprovalRulesByIds(approvalRuleState, remiSetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -14,14 +14,8 @@ export const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => act
             remiSetupApproverViewState.approvalRuleIds.length ||
         (remiSetupApproverViewState.hasValidState() === false &&
             remiSetupApproverViewState.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 basePath = useV3 === true
-            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules-v2`
-            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
         return zeniAPI
-            .getJSON(`${basePath}?query={"is_include_implicit_actors": ${includeImplicitActors}, "is_resolve_attribute_to_user":${resolveAttributeToUser}}`)
+            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules?query={"is_include_implicit_actors": ${includeImplicitActors}, "is_resolve_attribute_to_user":${resolveAttributeToUser}}`)
             .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/reimbursement/remiSetupApproverView/epic/initializeRemiSetupApproverViewUpdateDataEpic.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 { clearRemiSetupApproverViewUpdateData, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, } from '../remiSetupApproverViewReducer';
 export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$) => actions$.pipe(filter(initializeRemiSetupApproverViewUpdateData.match), mergeMap((action) => {
     const { approvalRuleId } = action.payload;
@@ -8,20 +8,16 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (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 remiSetupApproverViewUpdateData = {
                 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(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewUpdateData));
         }
@@ -29,7 +25,7 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$)
     else {
         const remiSetupApproverViewCreateData = {
             steps: [],
-            criteria: {},
+            criteria: undefined,
         };
         fetchActions.push(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewCreateData));
     }