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

package/lib/entity/account/accountSelector.d.ts

@@ -1,9 +1,9 @@
 import { AccountsViewParentID } from '../../commonStateTypes/accountView/nestedAccountID';
 import { ClassesViewParentID } from '../../commonStateTypes/classesView/nestedClassID';
-import { ProjectsViewParentID } from '../../commonStateTypes/projectView/projectViewParentID';
 import { AdditionalBalancesOptions } from '../../commonStateTypes/coaBalance/additionalBalances/getAdditionalBalances';
 import { COABalancesFilter } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
 import { ID } from '../../commonStateTypes/common';
+import { ProjectsViewParentID } from '../../commonStateTypes/projectView/projectViewParentID';
 import { EntityOrder } from '../../commonStateTypes/selectorTypes/selectorTypes';
 import { ReportIDPlusForecastID } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { Account, AccountBase, AccountState, AccountType } from './accountState';
@@ -123,3 +123,22 @@ export declare const getAccountsOrdered: (filter: COABalancesFilter, accountStat
 export declare const getAccountsByType: (accountState: AccountState, accountTypes: AccountType[]) => Partial<Record<AccountType, Account[]>>;
 export declare const getAccountIdsForTypes: (accountState: AccountState, accountTypes: AccountType[]) => ID[];
 export declare const getAccountIdsForLabels: (accountState: AccountState, labels: string[]) => ID[];
+/**
+ * Returns all accounts currently in state (single pass over accountsByKey).
+ * Use for dropdowns that need account names and types; map to
+ * { accountId, accountName, accountType } as needed.
+ */
+export declare const getAllAccounts: (accountState: AccountState) => Account[];
+export interface AccountFilterOption {
+    accountId: ID;
+    accountName: string;
+    accountType: AccountType;
+}
+/**
+ * Partitions accounts for transaction filter dropdowns: bank/credit_card → paymentAccountNames,
+ * all other account types → categoryOptions. Use for payment_account_name and category filter options.
+ */
+export declare const getTransactionFilterAccountOptions: (accountState: AccountState) => {
+    categoryOptions: AccountFilterOption[];
+    paymentAccountNames: AccountFilterOption[];
+};

package/lib/entity/account/accountSelector.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountIdsForLabels = exports.getAccountIdsForTypes = exports.getAccountsByType = exports.getAccountsOrdered = exports.getAccountBase = void 0;
+exports.getTransactionFilterAccountOptions = exports.getAllAccounts = exports.getAccountIdsForLabels = exports.getAccountIdsForTypes = exports.getAccountsByType = exports.getAccountsOrdered = exports.getAccountBase = void 0;
 exports.getAccount = getAccount;
 exports.getAccountWithBalance = getAccountWithBalance;
 const flatMap_1 = __importDefault(require("lodash/flatMap"));
@@ -192,3 +192,37 @@ const getAccountIdsForLabels = (accountState, labels) => {
     return allAccountIdsForLabels;
 };
 exports.getAccountIdsForLabels = getAccountIdsForLabels;
+/**
+ * Returns all accounts currently in state (single pass over accountsByKey).
+ * Use for dropdowns that need account names and types; map to
+ * { accountId, accountName, accountType } as needed.
+ */
+const getAllAccounts = (accountState) => Object.values(accountState.accountsByKey);
+exports.getAllAccounts = getAllAccounts;
+/**
+ * Partitions accounts for transaction filter dropdowns: bank/credit_card → paymentAccountNames,
+ * all other account types → categoryOptions. Use for payment_account_name and category filter options.
+ */
+const getTransactionFilterAccountOptions = (accountState) => {
+    const accounts = (0, exports.getAllAccounts)(accountState);
+    const paymentAccountNames = [];
+    const categoryOptions = [];
+    for (const account of accounts) {
+        if (account.accountType == null) {
+            continue;
+        }
+        const option = {
+            accountId: account.accountId,
+            accountName: account.accountName,
+            accountType: account.accountType,
+        };
+        if ((0, accountState_1.isPaymentAccountType)(account.accountType)) {
+            paymentAccountNames.push(option);
+        }
+        else {
+            categoryOptions.push(option);
+        }
+    }
+    return { categoryOptions, paymentAccountNames };
+};
+exports.getTransactionFilterAccountOptions = getTransactionFilterAccountOptions;

package/lib/entity/account/accountState.d.ts

@@ -8,9 +8,14 @@ import { RecommendationBase } from '../../commonStateTypes/recommendationBase';
 import { Status } from '../../commonStateTypes/status';
 import { ReportIDPlusForecastID } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { ZeniUrl } from '../../zeniUrl';
+export declare const ALL_ACCOUNT_TYPES: readonly ["bank", "credit_card", "expenses", "cogs", "income", "cash_in", "cash_out", "cash_position", "other_income", "other_expense", "accounts_receivable", "other_current_assets", "fixed_assets", "other_assets", "accounts_payable", "other_current_liabilities", "long_term_liabilities", "equity", "current_liabilities", "current_assets"];
 export declare const toAccountType: (v: string) => "cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets";
 export type AccountType = ReturnType<typeof toAccountType>;
 export declare const toAccountTypeStrict: (v: string | null | undefined) => AccountType | undefined;
+/** Account types used for payment-account filters (e.g. transaction filter "payment account name"). */
+export declare const PAYMENT_ACCOUNT_TYPES: readonly ["bank", "credit_card"];
+export type PaymentAccountType = (typeof PAYMENT_ACCOUNT_TYPES)[number];
+export declare function isPaymentAccountType(accountType: AccountType | undefined): accountType is PaymentAccountType;
 export type UncategorizedAccountTypes = 'expense' | 'income';
 declare const toAccountLabel: (v: string) => "prepaid_expenses" | "fixed_assets" | "uncategorized_income" | "uncategorized_expense" | "bank_charges_and_fees" | "travel_transportation" | "accrued_expenses";
 export type AccountLabel = ReturnType<typeof toAccountLabel>;

package/lib/entity/account/accountState.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toReconciliationAccountSourceStrict = exports.toReconciliationAccountSource = exports.toAccountLabelStrict = exports.toAccountTypeStrict = exports.toAccountType = void 0;
+exports.toReconciliationAccountSourceStrict = exports.toReconciliationAccountSource = exports.toAccountLabelStrict = exports.PAYMENT_ACCOUNT_TYPES = exports.toAccountTypeStrict = exports.toAccountType = exports.ALL_ACCOUNT_TYPES = void 0;
+exports.isPaymentAccountType = isPaymentAccountType;
 exports.getAccountKey = getAccountKey;
 const nestedAccountID_1 = require("../../commonStateTypes/accountView/nestedAccountID");
 const nestedClassID_1 = require("../../commonStateTypes/classesView/nestedClassID");
 const stringToUnion_1 = require("../../commonStateTypes/stringToUnion");
-const ALL_ACCOUNT_TYPES = [
+exports.ALL_ACCOUNT_TYPES = [
     'bank',
     'credit_card',
     'expenses',
@@ -27,10 +28,16 @@ const ALL_ACCOUNT_TYPES = [
     'current_liabilities',
     'current_assets',
 ];
-const toAccountType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_ACCOUNT_TYPES);
+const toAccountType = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.ALL_ACCOUNT_TYPES);
 exports.toAccountType = toAccountType;
-const toAccountTypeStrict = (v) => (0, stringToUnion_1.stringToUnionStrict)(v ?? '', ALL_ACCOUNT_TYPES);
+const toAccountTypeStrict = (v) => (0, stringToUnion_1.stringToUnionStrict)(v ?? '', exports.ALL_ACCOUNT_TYPES);
 exports.toAccountTypeStrict = toAccountTypeStrict;
+/** Account types used for payment-account filters (e.g. transaction filter "payment account name"). */
+exports.PAYMENT_ACCOUNT_TYPES = ['bank', 'credit_card'];
+function isPaymentAccountType(accountType) {
+    return (accountType != null &&
+        exports.PAYMENT_ACCOUNT_TYPES.includes(accountType));
+}
 const ALL_ACCOUNT_LABELS = [
     'uncategorized_income',
     'uncategorized_expense',

package/lib/entity/class/classSelector.d.ts

@@ -20,3 +20,8 @@ export declare function getClassReport(classState: ClassState, accountState: Acc
     reportId: ReportID;
     classesViewParentId?: ClassesViewParentID;
 }, filter: COABalancesFilter): ClassReport | undefined;
+/**
+ * Returns all classes currently in state (single pass over classesByKey).
+ * Use for dropdowns that need class names; map to { classId, className } as needed.
+ */
+export declare function getAllClasses(classState: ClassState): Class[];

package/lib/entity/class/classSelector.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClassesByIds = getClassesByIds;
 exports.getClassById = getClassById;
 exports.getClassReport = getClassReport;
+exports.getAllClasses = getAllClasses;
 const get_1 = __importDefault(require("lodash/get"));
 const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
 const accountSelector_1 = require("../account/accountSelector");
@@ -58,3 +59,10 @@ 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.
+ */
+function getAllClasses(classState) {
+    return Object.values(classState.classesByKey);
+}

package/lib/esm/entity/account/accountSelector.js

@@ -1,7 +1,7 @@
 import flatMap from 'lodash/flatMap';
 import { getCOABalances } from '../../commonStateTypes/coaBalance/coaBalance';
 import { sortComparator } from '../../commonStateTypes/coaBalance/sortBalancesByFreeRangeTotal';
-import { getAccountKey, } from './accountState';
+import { getAccountKey, isPaymentAccountType, } from './accountState';
 function getCommonAccountFields(accountState, id) {
     const key = getAccountKey(id.reportId, id.accountId, id.classesViewParentId, id.accountsViewParentId, id.projectsViewParentId);
     const account = accountState.accountsByKey[key];
@@ -179,3 +179,35 @@ export const getAccountIdsForLabels = (accountState, labels) => {
     });
     return allAccountIdsForLabels;
 };
+/**
+ * Returns all accounts currently in state (single pass over accountsByKey).
+ * Use for dropdowns that need account names and types; map to
+ * { accountId, accountName, accountType } as needed.
+ */
+export const getAllAccounts = (accountState) => Object.values(accountState.accountsByKey);
+/**
+ * Partitions accounts for transaction filter dropdowns: bank/credit_card → paymentAccountNames,
+ * all other account types → categoryOptions. Use for payment_account_name and category filter options.
+ */
+export const getTransactionFilterAccountOptions = (accountState) => {
+    const accounts = getAllAccounts(accountState);
+    const paymentAccountNames = [];
+    const categoryOptions = [];
+    for (const account of accounts) {
+        if (account.accountType == null) {
+            continue;
+        }
+        const option = {
+            accountId: account.accountId,
+            accountName: account.accountName,
+            accountType: account.accountType,
+        };
+        if (isPaymentAccountType(account.accountType)) {
+            paymentAccountNames.push(option);
+        }
+        else {
+            categoryOptions.push(option);
+        }
+    }
+    return { categoryOptions, paymentAccountNames };
+};

package/lib/esm/entity/account/accountState.js

@@ -1,7 +1,7 @@
 import { getNestedAccountIDStr, } from '../../commonStateTypes/accountView/nestedAccountID';
 import { getNestedClassIDStr, } from '../../commonStateTypes/classesView/nestedClassID';
 import { stringToUnion, stringToUnionStrict, } from '../../commonStateTypes/stringToUnion';
-const ALL_ACCOUNT_TYPES = [
+export const ALL_ACCOUNT_TYPES = [
     'bank',
     'credit_card',
     'expenses',
@@ -25,6 +25,12 @@ const ALL_ACCOUNT_TYPES = [
 ];
 export const toAccountType = (v) => stringToUnion(v, ALL_ACCOUNT_TYPES);
 export const toAccountTypeStrict = (v) => stringToUnionStrict(v ?? '', ALL_ACCOUNT_TYPES);
+/** Account types used for payment-account filters (e.g. transaction filter "payment account name"). */
+export const PAYMENT_ACCOUNT_TYPES = ['bank', 'credit_card'];
+export function isPaymentAccountType(accountType) {
+    return (accountType != null &&
+        PAYMENT_ACCOUNT_TYPES.includes(accountType));
+}
 const ALL_ACCOUNT_LABELS = [
     'uncategorized_income',
     'uncategorized_expense',

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/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/spendManagementFilterHelpers.js

@@ -7,28 +7,81 @@ import { ALL_BILL_TABS, getBillListKey, } from './billPay/billList/billListState
 import { getActualPaymentDate } from './helpers';
 import { getApproversOrRejectors as getApproversOrRejectorsForReimbursement, } from './reimbursement/remiListView/remiListSelector';
 import { ALL_REMI_TABS, getRemiListKey, } from './reimbursement/remiListView/remiListState';
+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' },
+];
 //filters items against filter values representing a range. ex: date (from-to), amount(1k<-->5k)
+// For amount: supports new transaction_categorization operators (inBetween, lessThan, greaterThan) and
+// backward compatibility for old format values: ["1000<->5000"] with matchingOperator "equal".
+// Other entities (bill_pay, reimbursement, etc.) use only equal/not-equal and are unchanged.
 const filterItemOnRangeCategoryType = (valueForItem, currentFilter) => {
     let doesItemFallInValueRange = false;
     const filterField = currentFilter.field;
     if (filterField === 'amount') {
-        for (const filterValue of currentFilter.values) {
-            const currentValue = parseInt(valueForItem.toString());
-            const lowerValue = parseInt(filterValue?.toString()?.split('<->')[0] ?? '');
-            const higherValue = parseInt(filterValue?.toString()?.split('<->')[1] ?? '');
-            if (currentValue >= lowerValue && currentValue <= higherValue) {
-                doesItemFallInValueRange = true;
+        const currentValue = Number(valueForItem);
+        const op = currentFilter.matchingOperator;
+        const values = currentFilter.values;
+        if (op === 'inBetween') {
+            // New format: values = [min, max] (expense automation transaction_categorization only)
+            if (values.length >= 2) {
+                const min = Number(values[0]);
+                const max = Number(values[1]);
+                doesItemFallInValueRange = currentValue >= min && currentValue <= max;
             }
         }
-    }
-    else {
-        const currentValue = valueForItem;
-        const lowerValue = currentFilter.values[0];
-        const higherValue = currentFilter.values[1];
-        if (currentValue.isSameOrAfter(lowerValue) &&
-            currentValue.isSameOrBefore(higherValue)) {
-            doesItemFallInValueRange = true;
+        else if (op === 'lessThan') {
+            if (values.length >= 1) {
+                const threshold = Number(values[0]);
+                doesItemFallInValueRange = currentValue < threshold;
+            }
+        }
+        else if (op === 'greaterThan') {
+            if (values.length >= 1) {
+                const threshold = Number(values[0]);
+                doesItemFallInValueRange = currentValue > threshold;
+            }
+        }
+        else if (op === 'equal' &&
+            values.length === 1 &&
+            String(values[0]).includes('<->')) {
+            // Backward compatibility: old format ["1000<->5000"] with matchingOperator "equal"
+            const parts = String(values[0]).split('<->');
+            const lowerValue = Number(parts[0] ?? '');
+            const higherValue = Number(parts[1] ?? '');
+            doesItemFallInValueRange =
+                currentValue >= lowerValue && currentValue <= higherValue;
+        }
+        else if (op === 'equal' && values.length === 1) {
+            // New format: exact match on single value (expense automation)
+            const val = Number(values[0]);
+            doesItemFallInValueRange = currentValue === val;
+        }
+        else {
+            // Existing logic for equal/not-equal (bill_pay, reimbursement, etc. or multiple range values)
+            for (const filterValue of values) {
+                const lowerValue = Number.parseInt(filterValue?.toString()?.split('<->')[0] ?? '', 10);
+                const higherValue = Number.parseInt(filterValue?.toString()?.split('<->')[1] ?? '', 10);
+                if (currentValue >= lowerValue && currentValue <= higherValue) {
+                    doesItemFallInValueRange = true;
+                }
+            }
         }
+        return op === 'not-equal'
+            ? !doesItemFallInValueRange
+            : doesItemFallInValueRange;
+    }
+    // Date range and other range fields (unchanged for other entities)
+    const currentValue = valueForItem;
+    const lowerValue = currentFilter.values[0];
+    const higherValue = currentFilter.values[1];
+    if (currentValue.isSameOrAfter(lowerValue) &&
+        currentValue.isSameOrBefore(higherValue)) {
+        doesItemFallInValueRange = true;
     }
     return currentFilter.matchingOperator === 'equal'
         ? doesItemFallInValueRange
@@ -113,7 +166,11 @@ export const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredIt
                 ? getCategoryValueForReimbursement(key, item)
                 : entity === 'task_management'
                     ? getCategoryValueForTaskList(key, item)
-                    : getCategoryValueForPaymentHistory(key, item);
+                    : entity === 'transaction_categorization'
+                        ? getCategoryValueForTransaction(key, item)
+                        : entity === 'charge_card_payment_history'
+                            ? getCategoryValueForPaymentHistory(key, item)
+                            : undefined;
         if (categoryValue == null) {
             if (currentFilter.matchingOperator === 'not-equal') {
                 return true;
@@ -234,6 +291,119 @@ const getCategoryValueForReimbursement = (key, reimbursement) => {
             return undefined;
     }
 };
+const getCategoryValueForTransaction = (key, transaction) => {
+    switch (key) {
+        case 'amount': {
+            // Get from transactionLocalData line items (preferred) - sum all line item amounts
+            const localDataForAmount = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localDataForAmount?.lineItemById) {
+                const lineItems = Object.values(localDataForAmount.lineItemById);
+                if (lineItems.length > 0) {
+                    // Sum all line item amounts
+                    const totalAmount = lineItems.reduce((sum, lineItem) => sum + (lineItem.amount?.amount ?? 0), 0);
+                    return totalAmount;
+                }
+            }
+            // Fallback to transaction-level amount or sum from transaction lines
+            if (transaction.transaction.lines &&
+                transaction.transaction.lines.length > 0) {
+                const totalAmount = transaction.transaction.lines.reduce((sum, line) => sum + (line.amount?.amount ?? 0), 0);
+                return totalAmount;
+            }
+            // Final fallback to transaction amount
+            return transaction.amount.amount;
+        }
+        case 'payee': {
+            // Priority: vendorName > customerName > from transactionLocalData
+            if (transaction.vendorName) {
+                return transaction.vendorName;
+            }
+            if (transaction.customerName) {
+                return transaction.customerName;
+            }
+            // Check transactionLocalData for vendor/customer
+            const localData = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localData?.vendor?.name) {
+                return localData.vendor.name;
+            }
+            if (localData?.customer?.name) {
+                return localData.customer.name;
+            }
+            return undefined;
+        }
+        case 'payment_account_name': {
+            // Match the value the row renders: TransactionCategorizationListRow reads
+            // `currentTransaction?.account?.accountName` for the Payment Account Name
+            // column. Returning the same field here keeps filter-match parity with the
+            // visible cell, so any row a user can see is also a row the filter can match.
+            return transaction.transaction.account?.accountName;
+        }
+        case 'payment_account_type': {
+            // Compare against the raw `paymentType` enum (e.g. "credit_card", "check",
+            // "cash"). The same enum is what TransactionCategorizationListRow uses for
+            // its icon switch on line ~1675, and it's what the dropdown options emit
+            // as `value`. Display labels come from each account's `paymentTypeName`
+            // field (populated by mapAccountBasePayloadToAccountBase from the backend
+            // payload) — no client-side label map required.
+            return transaction.transaction.paymentType;
+        }
+        case 'category': {
+            // Get from transactionLocalData (preferred) or from transaction lines
+            const localDataForCategory = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localDataForCategory) {
+                // Get category from first line item or most common
+                const firstLineItem = Object.values(localDataForCategory.lineItemById)[0];
+                if (firstLineItem?.account?.accountId) {
+                    return firstLineItem.account.accountId;
+                }
+                if (firstLineItem?.account?.qboId) {
+                    return firstLineItem.account.qboId;
+                }
+                if (firstLineItem?.account?.accountName) {
+                    return firstLineItem.account.accountName;
+                }
+            }
+            // Fallback to transaction lines
+            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': {
+            // Similar to category but for class
+            const localDataForClass = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localDataForClass) {
+                const firstLineItemForClass = Object.values(localDataForClass.lineItemById)[0];
+                if (firstLineItemForClass?.class?.classId) {
+                    return firstLineItemForClass.class.classId;
+                }
+                if (firstLineItemForClass?.class?.qboId) {
+                    return firstLineItemForClass.class.qboId;
+                }
+                if (firstLineItemForClass?.class?.className) {
+                    return firstLineItemForClass.class.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;
+    }
+};
 const getCategoryValueForPaymentHistory = (key, repayment) => {
     switch (key) {
         case 'repaymentDate':

package/lib/esm/view/spendManagement/zeniAccounts/depositAccountDetail/depositAccountDetailSelector.js

@@ -30,7 +30,7 @@ export const getDepositAccountDetail = (state, depositAccountId) => {
     const zeniAccountDetail = zeniAccountDetailState.depositAccountDetailById[depositAccountId];
     const depositAccount = getDepositAccountByDepositAccountId(depositAccountState, depositAccountId);
     const zeniAccountsConfig = getZeniAccountsConfigDetail(state);
-    const transactionListView = getDepositAccountTransactionList(state, depositAccountId, 5);
+    const transactionListView = getDepositAccountTransactionList(state, depositAccountId);
     let accountUpdateStatus = {
         editName: {
             fetchState: 'Not-Started',

package/lib/esm/view/spendManagement/zeniAccounts/depositAccountDetail/fetchDepositAccountDetailEpic.js

@@ -16,7 +16,7 @@ export const fetchDepositAccountDetailEpic = (actions$, state$) => actions$.pipe
         zeniAccountActions.push(fetchPaymentAccountList());
         zeniAccountActions.push(fetchZeniAccountsConfig());
         zeniAccountActions.push(fetchDepositAccount(depositAccountId));
-        zeniAccountActions.push(fetchDepositAccountTransactionList(depositAccountId, true, 5));
+        zeniAccountActions.push(fetchDepositAccountTransactionList(depositAccountId, true));
         zeniAccountActions.push(fetchAccountHistory(depositAccountId));
     }
     else {
@@ -37,7 +37,12 @@ export const fetchDepositAccountDetailEpic = (actions$, state$) => actions$.pipe
                 targetZeniAccountAccount.fetchState !== 'In-Progress')) {
             zeniAccountActions.push(fetchDepositAccount(depositAccountId));
         }
-        zeniAccountActions.push(fetchDepositAccountTransactionList(depositAccountId, false, 5));
+        const transactionList = state.depositAccountTransactionListState.byDepositId[depositAccountId];
+        if (transactionList == null ||
+            (transactionList.fetchState !== 'Completed' &&
+                transactionList.fetchState !== 'In-Progress')) {
+            zeniAccountActions.push(fetchDepositAccountTransactionList(depositAccountId, false));
+        }
         const zeniAccountsConfig = state.zeniAccountsConfigState;
         if (zeniAccountsConfig.hasValidState() === false &&
             zeniAccountsConfig.fetchState !== 'In-Progress') {