@zeniai/client-epic-state 5.0.90-betaAR5 → 5.0.90-betaAR6

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

@@ -7,19 +7,6 @@
  * being implicitly coerced to falsy.
  */
 const isNonEmptyString = (s) => s != null && s !== '';
-/**
- * First line item in UI order. `lineItemById` is a Record whose iteration
- * order is not guaranteed to match what the user sees; `sortedLineItems`
- * is the canonical ordering used by the categorization list/detail views.
- */
-const getFirstLineItemFromReviewLocalData = (localData) => {
-    const { sortedLineItems, lineItemById } = localData;
-    if (sortedLineItems.length > 0) {
-        return lineItemById[sortedLineItems[0]];
-    }
-    const lineItems = Object.values(lineItemById);
-    return lineItems.length > 0 ? lineItems[0] : undefined;
-};
 export const TRANSACTION_FILTER_CATEGORIES = [
     { value: 'payment_account_name', type: 'dropdown' },
     { value: 'payment_account_type', type: 'dropdown' },
@@ -93,15 +80,141 @@ const getLineAmountsForTransaction = (transaction) => {
  * instead).
  */
 const isFiniteNumber = (value) => typeof value === 'number' && Number.isFinite(value);
+/**
+ * Per-line category (account) identifiers for a transaction. Source
+ * precedence mirrors `getLineAmountsForTransaction`:
+ *
+ *   1. `transactionLocalData.transactionReviewLocalData.lineItemById` —
+ *      every locally-edited line item participates (not just the first
+ *      sorted one, the way the old single-scalar `category` resolver did).
+ *   2. `transaction.transaction.lines` with the same type narrowing the
+ *      old code used: only the three line types that carry an `account`
+ *      (`transaction_with_account_and_class_line`,
+ *      `transaction_with_product_or_service_line`,
+ *      `journal_entry_transaction_line`) contribute. Payment-only / tax /
+ *      discount lines are skipped rather than coerced to a sentinel.
+ *
+ * Each contributing line resolves to a single identifier via the same
+ * `accountId → qboId → accountName` fallback the old code used. Lines
+ * whose account is absent or blank everywhere drop out so the empty-array
+ * case bubbles up to `transactionMatchesCategory`'s absent-value contract
+ * (only `not_equal` matches a fully-missing identifier, every other
+ * operator excludes the row).
+ */
+const getLineCategoryIdentifiersForTransaction = (transaction) => {
+    const localData = transaction?.transactionLocalData?.transactionReviewLocalData;
+    if (localData?.lineItemById != null) {
+        const lineItems = Object.values(localData.lineItemById);
+        if (lineItems.length > 0) {
+            return lineItems
+                .map((lineItem) => resolveAccountIdentifier(lineItem?.account))
+                .filter(isNonEmptyString);
+        }
+    }
+    if (transaction?.transaction?.lines != null &&
+        transaction.transaction.lines.length > 0) {
+        return transaction.transaction.lines
+            .map((line) => {
+            if (!isAccountAndClassLine(line)) {
+                return undefined;
+            }
+            return resolveAccountIdentifier(line.account);
+        })
+            .filter(isNonEmptyString);
+    }
+    return [];
+};
+/**
+ * Per-line class identifiers for a transaction. Same shape and precedence
+ * as `getLineCategoryIdentifiersForTransaction` but reads the `class`
+ * field on each line and uses the `classId → qboId → className` fallback.
+ */
+const getLineClassIdentifiersForTransaction = (transaction) => {
+    const localData = transaction?.transactionLocalData?.transactionReviewLocalData;
+    if (localData?.lineItemById != null) {
+        const lineItems = Object.values(localData.lineItemById);
+        if (lineItems.length > 0) {
+            return lineItems
+                .map((lineItem) => resolveClassIdentifier(lineItem?.class))
+                .filter(isNonEmptyString);
+        }
+    }
+    if (transaction?.transaction?.lines != null &&
+        transaction.transaction.lines.length > 0) {
+        return transaction.transaction.lines
+            .map((line) => {
+            if (!isAccountAndClassLine(line)) {
+                return undefined;
+            }
+            return resolveClassIdentifier(line.class);
+        })
+            .filter(isNonEmptyString);
+    }
+    return [];
+};
+/**
+ * Type-narrowing guard for the three persisted line shapes that carry an
+ * `account` + `class`. Kept as a single helper so the type list stays in
+ * one place if a new categorizable line variant is added.
+ *
+ * Typed against the union element produced by indexing `lines[number]` on
+ * the broader transaction type — the parameter is permitted to be
+ * `undefined` so callers can pass a possibly-sparse `lines` element
+ * without an extra null check.
+ */
+const isAccountAndClassLine = (line) => line?.type === 'transaction_with_account_and_class_line' ||
+    line?.type === 'transaction_with_product_or_service_line' ||
+    line?.type === 'journal_entry_transaction_line';
+/**
+ * Resolve an `account` substructure to the comparable identifier the
+ * filter values are keyed by — same precedence the old single-scalar
+ * resolver used. `isNonEmptyString` rather than `??` so an empty-string
+ * placeholder doesn't shadow a meaningful later candidate.
+ */
+const resolveAccountIdentifier = (account) => {
+    if (account == null) {
+        return undefined;
+    }
+    if (isNonEmptyString(account.accountId)) {
+        return account.accountId;
+    }
+    if (isNonEmptyString(account.qboId)) {
+        return account.qboId;
+    }
+    if (isNonEmptyString(account.accountName)) {
+        return account.accountName;
+    }
+    return undefined;
+};
+/**
+ * Mirror of `resolveAccountIdentifier` for the `class` substructure.
+ */
+const resolveClassIdentifier = (classData) => {
+    if (classData == null) {
+        return undefined;
+    }
+    if (isNonEmptyString(classData.classId)) {
+        return classData.classId;
+    }
+    if (isNonEmptyString(classData.qboId)) {
+        return classData.qboId;
+    }
+    if (isNonEmptyString(classData.className)) {
+        return classData.className;
+    }
+    return undefined;
+};
 /**
  * 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.
+ * NOTE: the `'amount'`, `'category'`, and `'class'` fields are NOT handled
+ * here. All three use per-line matching via the corresponding
+ * `getLine*ForTransaction` helper and an early-return in
+ * `transactionMatchesCategory` — they would otherwise need to return a
+ * non-scalar value that doesn't fit this helper's contract. Cases are
+ * preserved so the switch stays exhaustive over `TransactionFilterCategoryField`.
  */
 const getCategoryValueForTransaction = (key, transaction) => {
     switch (key) {
@@ -139,58 +252,13 @@ const getCategoryValueForTransaction = (key, transaction) => {
             return transaction.transaction.paymentType;
         }
         case 'category': {
-            const localDataForCategory = transaction.transactionLocalData?.transactionReviewLocalData;
-            if (localDataForCategory != null) {
-                const firstLineItem = getFirstLineItemFromReviewLocalData(localDataForCategory);
-                const accountId = firstLineItem?.account?.accountId;
-                if (isNonEmptyString(accountId)) {
-                    return accountId;
-                }
-                const qboId = firstLineItem?.account?.qboId;
-                if (isNonEmptyString(qboId)) {
-                    return qboId;
-                }
-                const accountName = firstLineItem?.account?.accountName;
-                if (isNonEmptyString(accountName)) {
-                    return accountName;
-                }
-            }
-            const firstLineForCategory = transaction.transaction.lines?.[0];
-            if (firstLineForCategory?.type ===
-                'transaction_with_account_and_class_line' ||
-                firstLineForCategory?.type ===
-                    'transaction_with_product_or_service_line' ||
-                firstLineForCategory?.type === 'journal_entry_transaction_line') {
-                const account = firstLineForCategory.account;
-                return account?.accountId ?? account?.qboId ?? account?.accountName;
-            }
+            // Handled per-line in `transactionMatchesCategory` — see
+            // `getLineCategoryIdentifiersForTransaction`.
             return undefined;
         }
         case 'class': {
-            const localDataForClass = transaction.transactionLocalData?.transactionReviewLocalData;
-            if (localDataForClass != null) {
-                const firstLineItemForClass = getFirstLineItemFromReviewLocalData(localDataForClass);
-                const classId = firstLineItemForClass?.class?.classId;
-                if (isNonEmptyString(classId)) {
-                    return classId;
-                }
-                const qboId = firstLineItemForClass?.class?.qboId;
-                if (isNonEmptyString(qboId)) {
-                    return qboId;
-                }
-                const className = firstLineItemForClass?.class?.className;
-                if (isNonEmptyString(className)) {
-                    return className;
-                }
-            }
-            const firstLineForClass = transaction.transaction.lines?.[0];
-            if (firstLineForClass?.type === 'transaction_with_account_and_class_line' ||
-                firstLineForClass?.type ===
-                    'transaction_with_product_or_service_line' ||
-                firstLineForClass?.type === 'journal_entry_transaction_line') {
-                const classData = firstLineForClass.class;
-                return classData?.classId ?? classData?.qboId ?? classData?.className;
-            }
+            // Handled per-line in `transactionMatchesCategory` — see
+            // `getLineClassIdentifiersForTransaction`.
             return undefined;
         }
         default:
@@ -246,6 +314,35 @@ const matchAmount = (amount, category) => {
     return op === 'not_equal' ? !matched : matched;
 };
 const transactionMatchesCategory = (transaction, category) => {
+    if (category.field === 'category' || category.field === 'class') {
+        // Per-line matching for category / class — mirrors the amount
+        // pattern below. A multi-line transaction surfaces when ANY of its
+        // lines has the selected account / class, instead of the old
+        // first-line-only behavior (which silently excluded transactions
+        // whose first sorted line wasn't categorized as the filter target,
+        // even if later lines were). The full row, with non-matching lines
+        // included, renders downstream. The matcher only decides row
+        // inclusion; it does NOT filter which lines are rendered inside the
+        // row.
+        //
+        // `not_equal` reads as "at least one line is NOT one of the filter
+        // values" — same `.some()` interpretation we adopted for amount.
+        // A row with lines [Software, Travel] matches `category != Software`
+        // (the Travel line satisfies the negation); a row with lines
+        // [Software, Software] does not (no line satisfies).
+        const lineIdentifiers = category.field === 'category'
+            ? getLineCategoryIdentifiersForTransaction(transaction)
+            : getLineClassIdentifiersForTransaction(transaction);
+        if (lineIdentifiers.length === 0) {
+            // Absent-value contract — same as amount's empty-array branch.
+            return category.matchingOperator === 'not_equal';
+        }
+        const filterValuesAsStrings = new Set(category.values.map((v) => v.toString()));
+        return lineIdentifiers.some((id) => {
+            const inList = filterValuesAsStrings.has(id);
+            return category.matchingOperator === 'not_equal' ? !inList : inList;
+        });
+    }
     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

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,13 +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. Required (no default) so a
-            // missing screen-connector wire surfaces at compile time rather
-            // than silently falling back to v1 on a v3 tenant.
-            prepare(cacheOverride = false, includeUserRoles = true, useV3) {
-                return { payload: { cacheOverride, includeUserRoles, useV3 } };
+            prepare(cacheOverride = false, includeUserRoles = true) {
+                return { payload: { cacheOverride, includeUserRoles } };
             },
         },
         fetchBillPaySetupApproverViewSuccess: {
@@ -118,12 +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. Required (no default) so a
-            // missing connector wire surfaces at compile time.
-            prepare(approvalRuleId, useV3) {
-                return { payload: { approvalRuleId, useV3 } };
+            prepare(approvalRuleId) {
+                return { payload: { approvalRuleId } };
             },
         },
         deleteBillPayApprovalRuleSuccess: {
@@ -155,100 +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;
-            },
-            // Approval Rules 3.0 — `useV3` required so a missing wire
-            // surfaces at compile time. The reorder epic always hits the
-            // v2 endpoint (v1 has no reorder route), but the payload still
-            // carries the flag for the failure-path refetch which needs it.
-            prepare(approvalRuleIds, useV3) {
-                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) {
@@ -337,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);