@zeniai/client-epic-state 5.0.55-betaAR1 → 5.0.55-betaAR2

package/lib/esm/entity/approvalRule/approvalRulePayload.js

@@ -14,139 +14,18 @@ export const toApprovalRule = (payload) => ({
     version: payload.version,
     criteria: toApprovalCriteria(payload.criteria),
     steps: toApprovalSteps(payload.steps),
-    description: payload.description ?? undefined,
-    priority: payload.priority,
-    isFallback: payload.is_fallback ?? false,
-    // separationOfDuties: backend doesn't ship this field yet; left undefined
-    // until the spec is finalized.
-    areApprovalsSerialized: payload.are_approvals_serialized,
-    pendingApprovalsCount: payload.pending_approvals_count,
-    pendingEntityApprovalUpdateStatus: payload.pending_entity_approval_update_status,
 });
-/**
- * Maps the wire-level criteria block into the state-side discriminated
- * `Criteria[]` union.
- *
- * The wire keeps each condition as a flat row inside `conditions[]`.
- * Amount comparisons can show up as a `gte` only, a `lte` only, or a
- * `gte` + `lte` pair — those collapse into a single AmountCriteria whose
- * `comparator` is `greater_than`, `less_than`, or `range` respectively.
- *
- * Vendor and department conditions map one-to-one: `in` becomes `is`,
- * `not_in` becomes `is_not`.
- *
- * Resilient to two forms of upstream drift:
- *  - Missing / null criteria → returns [].
- *  - Legacy criteria shape (array of amount-range objects, the pre-3.0
- *    wire) → converted to an AmountCriteria so existing rules in production
- *    still render while the backend rolls out.
- */
 const toApprovalCriteria = (payload) => {
-    if (payload == null) {
-        return [];
-    }
-    if (Array.isArray(payload)) {
-        // Legacy pre-3.0 wire: an array of amount-range entries.
-        return legacyAmountRangeToCriteria(payload);
-    }
-    if (!Array.isArray(payload.conditions)) {
-        return [];
-    }
-    const results = [];
-    const amountCriteria = toAmountCriteria(payload);
-    if (amountCriteria != null) {
-        results.push(amountCriteria);
-    }
-    payload.conditions
-        .filter((condition) => condition.field === 'vendor_id')
-        .forEach((condition) => {
-        const vendor = toVendorCriteria(condition);
-        if (vendor != null) {
-            results.push(vendor);
-        }
-    });
-    payload.conditions
-        .filter((condition) => condition.field === 'department_id')
-        .forEach((condition) => {
-        const department = toDepartmentCriteria(condition);
-        if (department != null) {
-            results.push(department);
-        }
-    });
-    return results;
-};
-const legacyAmountRangeToCriteria = (legacy) => {
-    if (legacy.length === 0) {
-        return [];
-    }
-    const first = legacy[0] ?? {};
-    const currency = first.currency_code ?? 'USD';
-    const symbol = first.currency_symbol ?? '$';
-    const min = typeof first.min === 'number'
-        ? toAmount(first.min, currency, symbol)
-        : undefined;
-    const max = typeof first.max === 'number'
-        ? toAmount(first.max, currency, symbol)
-        : undefined;
-    if (min == null && max == null) {
-        return [];
-    }
-    const comparator = min != null && max != null
-        ? 'range'
-        : min != null
-            ? 'greater_than'
-            : 'less_than';
-    return [{ type: 'amount', comparator, min, max }];
-};
-const toAmountCriteria = (payload) => {
-    if (!Array.isArray(payload.conditions)) {
-        return undefined;
-    }
-    const amountConditions = payload.conditions.filter((condition) => condition.field === 'amount');
-    const gteCondition = amountConditions.find((condition) => condition.type === 'gte' || condition.type === 'eq');
-    const lteCondition = amountConditions.find((condition) => condition.type === 'lte');
-    if (gteCondition == null && lteCondition == null) {
-        return undefined;
-    }
-    const currencyCode = payload.currency_code ?? 'USD';
-    const currencySymbol = payload.currency_symbol ?? '$';
-    const min = typeof gteCondition?.value === 'number'
-        ? toAmount(gteCondition.value, currencyCode, currencySymbol)
-        : undefined;
-    const max = typeof lteCondition?.value === 'number'
-        ? toAmount(lteCondition.value, currencyCode, currencySymbol)
-        : undefined;
-    let comparator;
-    if (min != null && max != null) {
-        comparator = 'range';
-    }
-    else if (min != null) {
-        comparator = 'greater_than';
-    }
-    else {
-        comparator = 'less_than';
-    }
-    return { type: 'amount', comparator, min, max };
-};
-const toVendorCriteria = (condition) => {
-    if (!Array.isArray(condition.value)) {
-        return undefined;
-    }
-    return {
-        type: 'vendor',
-        operator: condition.type === 'not_in' ? 'is_not' : 'is',
-        vendorIds: condition.value,
-    };
-};
-const toDepartmentCriteria = (condition) => {
-    if (!Array.isArray(condition.value)) {
-        return undefined;
-    }
-    return {
-        type: 'department',
-        operator: condition.type === 'not_in' ? 'is_not' : 'is',
-        departmentIds: condition.value,
-    };
+    return payload.map((criteria) => ({
+        rangeType: criteria.type,
+        rangeEntity: criteria.range_entity,
+        range: {
+            min: toAmount(criteria.min, criteria.currency_code, criteria.currency_symbol),
+            max: criteria.max != null
+                ? toAmount(criteria.max, criteria.currency_code, criteria.currency_symbol)
+                : undefined,
+        },
+    }));
 };
 const toApprovalSteps = (payload) => {
     return payload.map((step) => ({

package/lib/esm/entity/approvalRule/approvalRuleSelector.js

@@ -7,38 +7,3 @@ export function getApprovalRulesByIds(approvalRuleState, approvalRuleIds) {
         .filter((value) => value != null);
     return approvalRulesByIds;
 }
-/**
- * Returns the amount-range portion of a rule's criteria, if any.
- *
- * Use this whenever a caller needs to read amount min/max from the new
- * discriminated `Criteria` union without inlining a type guard.
- */
-export function getAmountCriteria(criteria) {
-    return criteria.find((c) => c.type === 'amount');
-}
-export function getVendorCriteria(criteria) {
-    return criteria.find((c) => c.type === 'vendor');
-}
-export function getDepartmentCriteria(criteria) {
-    return criteria.find((c) => c.type === 'department');
-}
-/**
- * Returns all rules of the given entityType, sorted by `priority` ascending.
- *
- * Rules without a `priority` value sort to the end (treated as Infinity).
- * Use this for the list page where rules render in evaluation order.
- */
-export function getApprovalRulesByEntityType(approvalRuleState, entityType) {
-    return Object.values(approvalRuleState.approvalRuleById)
-        .filter((rule) => rule.entityType === entityType)
-        .sort((a, b) => (a.priority ?? Infinity) - (b.priority ?? Infinity));
-}
-/**
- * Returns the tenant's fallback rule for the given entityType, if one exists.
- *
- * The fallback rule is shown by the "fallback engine active" banner on the
- * list page and is used to handle bills/reimbursements that match no other rule.
- */
-export function getFallbackApprovalRule(approvalRuleState, entityType) {
-    return Object.values(approvalRuleState.approvalRuleById).find((rule) => rule.entityType === entityType && rule.isFallback === true);
-}

package/lib/esm/entity/class/classSelector.js

@@ -50,3 +50,10 @@ export function getClassReport(classState, accountState, id, filter) {
         accounts: accountReport,
     };
 }
+/**
+ * Returns all classes currently in state (single pass over classesByKey).
+ * Use for dropdowns that need class names; map to { classId, className } as needed.
+ */
+export function getAllClasses(classState) {
+    return Object.values(classState.classesByKey);
+}

package/lib/esm/index.js

@@ -31,7 +31,6 @@ import { getAccountGroupKey, toAccountGroupType, } from './entity/accountGroup/a
 import { getAccountReconByAccountIdAndSelectedPeriod, } from './entity/accountRecon/accountReconSelector';
 import { getAddressByAddressId } from './entity/address/addressSelector';
 import { toAttributeOrRoleTypeStrict, toAttributeTypeStrict, toRoleTypeStrict, } from './entity/approvalRule/approvalRuleState';
-import { getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria, } from './entity/approvalRule/approvalRuleSelector';
 import { toOutsideZeniPaymentModeType, } from './entity/billPay/billTransaction/billTransactionState';
 import { toRecurringBillFrequency, toRecurringBillFrequencyStrict, } from './entity/billPay/recurringBills/recurringBillsState';
 import { toCardAddressType, toCardType, toCreditLimitFrequencyCodeType, toShippingAddressType, } from './entity/chargeCard/chargeCard';
@@ -560,7 +559,7 @@ export { getUserFinancialAccount };
 export { fetchRemiSetupView, updateMileageDetails, saveRemiSetupViewDataInLocalStore, acceptRemiTerms, acceptEmployeeRemiTerms, clearRemiSetupView, getRemiSetupViewDetails, getRemiBusinessVerificationDetails, };
 export { VERIFIED_PAYMENT_ACCOUNT_PROVIDER_VERIFICATION_STATUS, };
 export { isSuccessResponse, isInvalidSessionError, isAccessDeniedError, };
-export { getAmountCriteria, getApprovalRulesByEntityType, getDepartmentCriteria, getFallbackApprovalRule, getVendorCriteria, toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
+export { toAttributeTypeStrict, toAttributeOrRoleTypeStrict, toRoleTypeStrict, };
 export { getBillPaySetupApproverView, getBillPaySetupApproverUpdateDataView, fetchBillPaySetupApproverView, fetchBillPayApproversDetails, fetchBillPayApproversList, deleteBillPayApprovalRule, saveBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdates, setBillsSetupApproverViewListeningToPusherEvent, initializeBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverView, };
 export { getRemiSetupApproverView, getRemiSetupApproverUpdateDataView, fetchRemiSetupApproverView, fetchRemiApproversList, fetchRemiApproversDetails, deleteRemiApprovalRule, saveRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdates, initializeRemiSetupApproverViewUpdateData, setRemiSetupApproverViewListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, };
 export { getRemiDetailView, checkApproveRejectBtnShowForRemi, };

package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js

@@ -27,6 +27,10 @@ export const initialTransactionTabViewState = {
         totalCount: {},
         limit: 10,
     },
+    filters: {
+        categoryCombinationOperator: 'AND',
+        categories: [],
+    },
     fetchState: 'Not-Started',
     error: undefined,
     hasValidState() {
@@ -236,6 +240,12 @@ const expenseAutomationTransactionsView = createSlice({
                     uiState.totalCount;
             }
         },
+        updateTransactionFilters(draft, action) {
+            const { selectedTab, filters } = action.payload;
+            if (filters != null) {
+                draft.transactionCategorizationView[selectedTab].filters = filters;
+            }
+        },
         saveTransactionCategorization: {
             prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
                 return {
@@ -803,5 +813,5 @@ const expenseAutomationTransactionsView = createSlice({
         },
     },
 });
-export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
+export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, updateTransactionFilters, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
 export default expenseAutomationTransactionsView.reducer;

package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -4,14 +4,33 @@ import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, } from '../../../entity/tenant/tenantSelector';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
 import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
+import { applyAdvancedFiltersOnList, } from '../../spendManagement/spendManagementFilterHelpers';
 import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { getProjectList } from '../../projectList/projectListSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
+export const toTransactionView = (transaction, transactionLocalData) => {
+    return {
+        id: transaction.id,
+        date: transaction.date,
+        amount: transaction.amount,
+        vendorName: transaction.vendorName,
+        customerName: transaction.customerName,
+        vendorId: transaction.vendorId,
+        customerId: transaction.customerId,
+        description: transaction.description,
+        memo: transaction.memo,
+        type: transaction.type,
+        typeName: transaction.typeName,
+        createTime: transaction.createTime,
+        transaction: transaction,
+        transactionLocalData,
+    };
+};
 export function getExpenseAutomationTransactionView(state) {
     const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = getUncategorizedAccounts(accountState, accountListState, 'accountList');
     const accountList = getAccountList(accountState, accountListState, 'accountList');
     const classList = getClassList(classState, classListState);
@@ -30,10 +49,42 @@ export function getExpenseAutomationTransactionView(state) {
         ? transactionIdsBySelectedPeriod[monthYearPeriodId]
         : null;
     const transactionIds = transactionIdsForSelectedPeriod ?? [];
-    const transactionLocalData = transactionIds
-        .map((transactionId) => {
+    const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
+    const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
+    const transactionLocalDataMap = new Map();
+    transactionIds.forEach((transactionId) => {
         const transactionData = transactionReviewLocalDataById[transactionId];
         if (transactionData != null) {
+            transactionLocalDataMap.set(transactionId, {
+                transactionId,
+                transactionReviewLocalData: transactionData.transactionReviewLocalData,
+            });
+        }
+    });
+    // Step 2: Convert to TransactionView and apply advanced filters
+    const transactionViews = transactionsWithCOT.map((transaction) => {
+        const localData = transactionLocalDataMap.get(transaction.id);
+        return toTransactionView(transaction, localData);
+    });
+    // Apply advanced filters if they exist
+    const filteredTransactionViews = applyAdvancedFiltersOnList('transaction_categorization', transactionViews, filters);
+    // Convert back to TransactionWithCOT for return
+    const filteredTransactionsWithCOT = filteredTransactionViews.map((view) => view.transaction);
+    // Get transactionLocalData for filtered transactions
+    // Also include transactionLocalData for transactions that don't exist in transactionState
+    // but have local data (to match original behavior)
+    const filteredTransactionIds = new Set(filteredTransactionViews.map((view) => view.id));
+    const filteredTransactionLocalData = transactionIds
+        .map((transactionId) => {
+        const transactionData = transactionReviewLocalDataById[transactionId];
+        if (transactionData == null) {
+            return null;
+        }
+        // Include if transaction is in filtered results, or if transaction doesn't exist in state
+        // (to maintain backward compatibility with tests)
+        const transactionExists = transactions.some((t) => t.id === transactionId);
+        if (filteredTransactionIds.has(transactionId) ||
+            !transactionExists) {
             return {
                 transactionId,
                 transactionReviewLocalData: transactionData.transactionReviewLocalData,
@@ -41,9 +92,7 @@ export function getExpenseAutomationTransactionView(state) {
         }
         return null;
     })
-        .filter((transaction) => transaction != null);
-    const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
-    const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
+        .filter((data) => data != null);
     const monthEndFetchState = monthYearPeriodId != null
         ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
         : { fetchState: 'Not-Started', error: undefined };
@@ -90,7 +139,7 @@ export function getExpenseAutomationTransactionView(state) {
         version: 0,
         fetchState: fetchStatus.fetchState,
         error: fetchStatus.error,
-        transactions: transactionsWithCOT,
+        transactions: filteredTransactionsWithCOT,
         selectedCheckBoxTransactionIds,
         transactionIdsWithUnsavedData,
         uncategorizedAccounts: uncategorizedIncomeExpense,
@@ -101,7 +150,7 @@ export function getExpenseAutomationTransactionView(state) {
         classHierarchyList,
         isAccountingProjectsEnabled,
         projectList,
-        transactionLocalData,
+        transactionLocalData: filteredTransactionLocalData,
         uiState,
         refreshStatus,
         saveStatus,

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,13 +8,15 @@ 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,
                 },
             };
             fetchActions.push(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewUpdateData));
@@ -23,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/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,12 +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;
-    }
     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/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,13 +8,15 @@ 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,
                 },
             };
             fetchActions.push(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewUpdateData));
@@ -23,7 +25,7 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$)
     else {
         const remiSetupApproverViewCreateData = {
             steps: [],
-            criteria: {},
+            criteria: undefined,
         };
         fetchActions.push(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewCreateData));
     }