@zeniai/client-epic-state 5.0.69-betaAR4 → 5.0.69-betaAR5

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 { applyTransactionFilters, } from '../transactionFilterHelpers';
 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 { selectedTransactionCategorizationCompletedSubTab, 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,20 +49,58 @@ 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) {
-            return {
+            transactionLocalDataMap.set(transactionId, {
                 transactionId,
                 transactionReviewLocalData: transactionData.transactionReviewLocalData,
-            };
+            });
         }
-        return null;
-    })
-        .filter((transaction) => transaction != null);
-    const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
-    const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
+    });
+    // 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 TC-specific filters (lives under expenseAutomationView, independent
+    // of the Spend Management filter pipeline).
+    const filteredTransactionViews = applyTransactionFilters(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));
+    // Pre-compute the membership set once. The previous implementation called
+    // `transactions.some(t => t.id === transactionId)` inside the per-id loop,
+    // turning the pipeline into O(n × m) — measurable on tenants with large
+    // transaction lists since this selector runs on every Redux dispatch.
+    const transactionExistsById = new Set(transactions.map((t) => t.id));
+    // `.flatMap` returns `X[]` directly when the callback returns `[]` for the
+    // skip case, so we don't need the trailing `.filter((d): d is X => …)` type
+    // predicate that the previous `map → filter` pipeline required.
+    const filteredTransactionLocalData = transactionIds.flatMap((transactionId) => {
+        const transactionData = transactionReviewLocalDataById[transactionId];
+        if (transactionData == null) {
+            return [];
+        }
+        // Include if transaction is in filtered results, or if transaction doesn't exist in state
+        // (to maintain backward compatibility with tests)
+        const transactionExists = transactionExistsById.has(transactionId);
+        if (filteredTransactionIds.has(transactionId) || !transactionExists) {
+            return [
+                {
+                    transactionId,
+                    transactionReviewLocalData: transactionData.transactionReviewLocalData,
+                },
+            ];
+        }
+        return [];
+    });
     const monthEndFetchState = monthYearPeriodId != null
         ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
         : { fetchState: 'Not-Started', error: undefined };
@@ -107,7 +164,7 @@ export function getExpenseAutomationTransactionView(state) {
         version: 0,
         fetchState: fetchStatus.fetchState,
         error: fetchStatus.error,
-        transactions: transactionsWithCOT,
+        transactions: filteredTransactionsWithCOT,
         selectedCheckBoxTransactionIds,
         transactionIdsWithUnsavedData,
         uncategorizedAccounts: uncategorizedIncomeExpense,
@@ -118,7 +175,7 @@ export function getExpenseAutomationTransactionView(state) {
         classHierarchyList,
         isAccountingProjectsEnabled,
         projectList,
-        transactionLocalData,
+        transactionLocalData: filteredTransactionLocalData,
         uiState,
         refreshStatus,
         saveStatus,

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

@@ -0,0 +1,245 @@
+/**
+ * Narrowing type-guard for "has a non-empty string here". Used in place of
+ * raw `if (foo)` truthiness checks on `string | null | undefined` values so
+ * the `@typescript-eslint/strict-boolean-expressions` lint stays clean —
+ * empty strings should explicitly fall through to the next candidate
+ * (vendorName → customerName → localData.vendor.name → ...) rather than
+ * being implicitly coerced to falsy.
+ */
+const isNonEmptyString = (s) => s != null && s !== '';
+export const TRANSACTION_FILTER_CATEGORIES = [
+    { value: 'payment_account_name', type: 'dropdown' },
+    { value: 'payment_account_type', type: 'dropdown' },
+    { value: 'payee', type: 'searchAutocomplete' },
+    { value: 'category', type: 'dropdown' },
+    { value: 'class', type: 'dropdown' },
+    { value: 'amount', type: 'numberRange' },
+];
+/**
+ * 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).
+ */
+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;
+        }
+        case 'payee': {
+            if (isNonEmptyString(transaction.vendorName)) {
+                return transaction.vendorName;
+            }
+            if (isNonEmptyString(transaction.customerName)) {
+                return transaction.customerName;
+            }
+            const localData = transaction.transactionLocalData?.transactionReviewLocalData;
+            const vendorName = localData?.vendor?.name;
+            if (isNonEmptyString(vendorName)) {
+                return vendorName;
+            }
+            const customerName = localData?.customer?.name;
+            if (isNonEmptyString(customerName)) {
+                return customerName;
+            }
+            return undefined;
+        }
+        case 'payment_account_name': {
+            // Match what TransactionCategorizationListRow renders for the cell.
+            return transaction.transaction.account?.accountName;
+        }
+        case 'payment_account_type': {
+            // Raw `paymentType` enum ("credit_card" / "check" / "cash"). Dropdown
+            // option values use the same enum; row uses `paymentTypeName` for the
+            // human label.
+            return transaction.transaction.paymentType;
+        }
+        case 'category': {
+            const localDataForCategory = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localDataForCategory != null) {
+                const firstLineItem = Object.values(localDataForCategory.lineItemById)[0];
+                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;
+            }
+            return undefined;
+        }
+        case 'class': {
+            const localDataForClass = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localDataForClass != null) {
+                const firstLineItemForClass = Object.values(localDataForClass.lineItemById)[0];
+                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;
+            }
+            return undefined;
+        }
+        default:
+            return undefined;
+    }
+};
+/**
+ * TC-only amount matcher. Supports all five operators TC defines, including
+ * the legacy "1000<->5000" range-string form (kept for backward compatibility
+ * with persisted filter state that may still contain that encoding).
+ *
+ * The `'equal' | 'not_equal'` branch matches if `amount` equals ANY of the
+ * configured values (consistent with how non-amount filters interpret a
+ * multi-value `values` array). `.some()` over the values array also makes
+ * the empty-values case behave correctly — empty array → `matched = false`
+ * — though in practice `applyTransactionFilters` strips empty-values
+ * categories before they reach this matcher. The trailing
+ * `op === 'not_equal' ? !matched : matched` line inverts for `not_equal`.
+ */
+const matchAmount = (amount, category) => {
+    const op = category.matchingOperator;
+    const values = category.values;
+    let matched = false;
+    if (op === 'in_between') {
+        if (values.length >= 2) {
+            const min = Number(values[0]);
+            const max = Number(values[1]);
+            matched = amount >= min && amount <= max;
+        }
+    }
+    else if (op === 'less_than') {
+        if (values.length >= 1) {
+            matched = amount < Number(values[0]);
+        }
+    }
+    else if (op === 'greater_than') {
+        if (values.length >= 1) {
+            matched = amount > Number(values[0]);
+        }
+    }
+    else if (op === 'equal' || op === 'not_equal') {
+        matched = values.some((v) => {
+            const s = String(v);
+            // Backward compatibility: legacy "low<->high" range-string form
+            // persisted under `matchingOperator: 'equal'`.
+            if (s.includes('<->')) {
+                const parts = s.split('<->');
+                return (amount >= Number(parts[0] ?? '') && amount <= Number(parts[1] ?? ''));
+            }
+            return amount === Number(v);
+        });
+    }
+    return op === 'not_equal' ? !matched : matched;
+};
+const transactionMatchesCategory = (transaction, category) => {
+    const value = getCategoryValueForTransaction(category.field, transaction);
+    if (value == null) {
+        // Absent-value semantics — pinning these down explicitly so the
+        // asymmetry isn't surprising:
+        //
+        //   not_equal: a missing value IS NOT EQUAL to any candidate, so the
+        //              transaction matches the filter (passes through).
+        //   equal:     a missing value is not equal to any candidate, so the
+        //              transaction does NOT match (filtered out).
+        //   less_than / greater_than: SQL-style three-valued logic — comparing
+        //              against a missing value is "unknown", which we treat as
+        //              "does not match" (filtered out). A user setting
+        //              "amount < $1000" probably wants transactions with a
+        //              concrete amount that satisfies the bound, not rows
+        //              where the amount can't be determined.
+        //   in_between: same as the single-sided comparators — missing values
+        //              are filtered out.
+        //
+        // Only the `not_equal` branch returns `true` here; everything else
+        // falls through to the `false` below.
+        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;
+};
+/**
+ * TC-only equivalent of `applyAdvancedFiltersOnList`. Filters a list of
+ * `TransactionView` items against a `TransactionFilters` object using the
+ * AND/OR combination semantics from `categoryCombinationOperator`.
+ *
+ * Independent of `view/spendManagement` — keeps the TC filter pipeline cleanly
+ * inside the Expense Automation feature group.
+ */
+export const applyTransactionFilters = (transactions, filters) => {
+    if (filters?.categories == null || filters.categories.length === 0) {
+        return transactions;
+    }
+    // Mirrors the predicate used by `getTransactionAppliedFiltersCount` on the
+    // webc side. A half-filled category — e.g. `in_between` with only the
+    // `min` typed — would otherwise survive the filter pass and produce zero
+    // matches because `Number("")` collapses to `0`, artificially emptying
+    // the list while editing. Skipping such categories keeps the filtered
+    // view stable while the user finishes typing.
+    const activeCategories = filters.categories.filter((c) => {
+        if (c.field == null || c.values.length === 0) {
+            return false;
+        }
+        if (c.field === 'amount' && c.matchingOperator === 'in_between') {
+            return (c.values.length >= 2 &&
+                String(c.values[0] ?? '').trim() !== '' &&
+                String(c.values[1] ?? '').trim() !== '');
+        }
+        return String(c.values[0] ?? '').trim() !== '';
+    });
+    if (activeCategories.length === 0) {
+        return transactions;
+    }
+    const op = filters.categoryCombinationOperator;
+    return transactions.filter((txn) => {
+        if (op === 'AND') {
+            return activeCategories.every((cat) => transactionMatchesCategory(txn, cat));
+        }
+        return activeCategories.some((cat) => transactionMatchesCategory(txn, cat));
+    });
+};

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/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,27 +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.separation_of_duties = approverViewUpdateData.separationOfDuties;
-    }
-    if (approverViewUpdateData.isFallback != null) {
-        payload.is_fallback = approverViewUpdateData.isFallback;
-    }
     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,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));
     }

package/lib/esm/view/spendManagement/spendManagementFilterHelpers.js

@@ -8,6 +8,8 @@ import { getActualPaymentDate } from './helpers';
 import { getApproversOrRejectors as getApproversOrRejectorsForReimbursement, } from './reimbursement/remiListView/remiListSelector';
 import { ALL_REMI_TABS, getRemiListKey, } from './reimbursement/remiListView/remiListState';
 //filters items against filter values representing a range. ex: date (from-to), amount(1k<-->5k)
+// Spend Management uses only equal/not_equal — TC amount operators
+// (inBetween, lessThan, greaterThan) live in the TC filter pipeline.
 const filterItemOnRangeCategoryType = (valueForItem, currentFilter) => {
     let doesItemFallInValueRange = false;
     const filterField = currentFilter.field;
@@ -41,7 +43,7 @@ const filterItemOnCategoriesWithSingleValue = (categoryValue, currentFilter, ran
         return filterItemOnRangeCategoryType(categoryValue, currentFilter);
     }
     // if filter category is not rangeType
-    if (currentFilter.matchingOperator === 'not-equal') {
+    if (currentFilter.matchingOperator === 'not_equal') {
         return currentFilter.values.indexOf(categoryValue.toString()) === -1;
     }
     return currentFilter.values.indexOf(categoryValue.toString()) > -1;
@@ -115,7 +117,7 @@ export const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredIt
                     ? getCategoryValueForTaskList(key, item)
                     : getCategoryValueForPaymentHistory(key, item);
         if (categoryValue == null) {
-            if (currentFilter.matchingOperator === 'not-equal') {
+            if (currentFilter.matchingOperator === 'not_equal') {
                 return true;
             }
             return false;

package/lib/esm/view/subscriptionView/subscriptionViewSelector.js

@@ -208,7 +208,7 @@ const applyAdvancedFiltersOnCompaniesList = (allCompanies, filters, filteredComp
         const key = currentFilter.field;
         const categoryValue = getCategoryValueForCompany(key, company);
         if (categoryValue == null) {
-            if (currentFilter.matchingOperator === 'not-equal') {
+            if (currentFilter.matchingOperator === 'not_equal') {
                 return true;
             }
             return false;

package/lib/esm/view/taskManager/taskListView/taskListReducer.js

@@ -66,7 +66,7 @@ export const initialState = {
         categories: [
             {
                 field: 'status',
-                matchingOperator: 'not-equal',
+                matchingOperator: 'not_equal',
                 values: ['resolved'],
                 valuesCombinationOperator: 'ANY',
             },