@zeniai/client-epic-state 4.19.51 → 4.19.53-betaAR1

package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.js

@@ -0,0 +1,83 @@
+import { createSlice } from '@reduxjs/toolkit';
+import { initialChargeCardPaymentHistoryState, } from './chargeCardPaymentHistory';
+export const initialState = initialChargeCardPaymentHistoryState;
+const chargeCardPaymentHistory = createSlice({
+    name: 'chargeCardPaymentHistory',
+    initialState,
+    reducers: {
+        fetchChargeCardPaymentPage: {
+            reducer() {
+                // do nothing
+            },
+            prepare(cacheOverride = false) {
+                return {
+                    payload: {
+                        cacheOverride,
+                    },
+                };
+            },
+        },
+        fetchChargeCardPaymentHistory(draft) {
+            draft.fetchState = 'In-Progress';
+            draft.error = undefined;
+        },
+        updateChargeCardPaymentHistory(draft, action) {
+            const payload = action.payload;
+            draft.creditAccountId = payload.credit_account_id;
+            draft.currencyCode = payload.currency_code;
+            draft.currencySymbol = payload.currency_symbol;
+            draft.isAutoPayEnabled = payload.is_auto_pay_enabled;
+            draft.repaymentHistoryIds = payload.repayment_history.map((repayment) => repayment.card_repayment_id);
+            draft.totalRepayments = payload.total_repayments;
+            draft.fetchState = 'Completed';
+            draft.error = undefined;
+        },
+        updateChargeCardPaymentHistoryFailure(draft, action) {
+            draft.fetchState = 'Error';
+            draft.error = action.payload;
+        },
+        addRepaymentToChargeCardPaymentHistory(draft, action) {
+            const { cardRepaymentId, zeniCreditAccountId } = action.payload;
+            if (draft.creditAccountId !== zeniCreditAccountId) {
+                return;
+            }
+            if (draft.repaymentHistoryIds.includes(cardRepaymentId)) {
+                return;
+            }
+            draft.repaymentHistoryIds.unshift(cardRepaymentId);
+            draft.totalRepayments += 1;
+        },
+        clearChargeCardPaymentHistory(draft) {
+            Object.assign(draft, initialState);
+        },
+        updatePaymentHistoryFilters(draft, action) {
+            if (action.payload.filters != null) {
+                draft.filters = action.payload.filters;
+            }
+        },
+        updatePaymentHistorySearchText(draft, action) {
+            if (action.payload != null) {
+                draft.searchText = action.payload;
+            }
+        },
+        updatePaymentHistoryUIState(draft, action) {
+            if (action.payload.uiState.sortKey != null) {
+                draft.uiState.sortKey = action.payload.uiState.sortKey;
+            }
+            if (action.payload.uiState.sortOrder != null) {
+                draft.uiState.sortOrder = action.payload.uiState.sortOrder;
+            }
+            if (action.payload.uiState.scrollYOffset != null) {
+                draft.uiState.scrollYOffset = action.payload.uiState.scrollYOffset;
+            }
+        },
+        updatePaymentHistoryDownloadUIState(draft, action) {
+            if (action.payload.uiState.downloadState != null) {
+                draft.downloadUIState.downloadState =
+                    action.payload.uiState.downloadState;
+            }
+        },
+    },
+});
+export const { addRepaymentToChargeCardPaymentHistory, fetchChargeCardPaymentPage, fetchChargeCardPaymentHistory, updateChargeCardPaymentHistory, updateChargeCardPaymentHistoryFailure, clearChargeCardPaymentHistory, updatePaymentHistoryFilters, updatePaymentHistorySearchText, updatePaymentHistoryDownloadUIState, updatePaymentHistoryUIState, } = chargeCardPaymentHistory.actions;
+export default chargeCardPaymentHistory.reducer;

package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector.js

@@ -0,0 +1,104 @@
+import { reduceAllFetchState } from '../../../../commonStateTypes/reduceFetchState';
+import { getChargeCardRepaymentByIds } from '../../../../entity/chargeCardRepayment/chargeCardRepaymentSelector';
+import { getUsersByUserIds } from '../../../../entity/user/userSelector';
+import { getAllFundingAccounts, mapDepositAccToFundingAccount, mapPaymentAccToFundingAccount, } from '../../commonSetup/setupViewSelector';
+import { getDepositAccountByDepositAccountId } from '../../../../entity/depositAccount/depositAccountSelector';
+import { getPaymentAccountByPaymentAccountId } from '../../../../entity/paymentAccount/paymentAccountSelector';
+import { getAllDepositAccounts } from '../../zeniAccounts/depositAccountList/depositAccountListSelector';
+import { getAllPaymentAccounts } from '../../zeniAccounts/paymentAccountList/paymentAccountListSelector';
+import { applyPaymentHistoryFiltersSearchAndSort } from './chargeCardPaymentHistoryHelpers';
+export const getChargeCardPaymentHistoryView = (state) => {
+    const { chargeCardPaymentHistoryState, chargeCardRepaymentState, userState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, } = state;
+    const { creditAccountId, currencyCode, currencySymbol, filters, isAutoPayEnabled, repaymentHistoryIds, searchText, totalRepayments, uiState, fetchState, error, } = chargeCardPaymentHistoryState;
+    // Get the full repayment details from the entity state
+    const repaymentHistory = getChargeCardRepaymentByIds(chargeCardRepaymentState, repaymentHistoryIds);
+    const repaymentHistoryUserIds = Array.from(new Set(repaymentHistory.map((r) => r.paidById)));
+    // Get users first to enrich repayments
+    const repaymentHistoryUsers = getUsersByUserIds(userState, repaymentHistoryUserIds);
+    // Create a map of userId -> User for quick lookup
+    const userMap = new Map();
+    repaymentHistoryUsers.forEach((user) => {
+        userMap.set(user.userId, user);
+    });
+    // Enrich repayments with paidByUser details
+    let repaymentHistoryWithUsers = repaymentHistory.map((repayment) => ({
+        ...repayment,
+        paidByUser: userMap.get(repayment.paidById),
+    }));
+    // Get deposit and payment accounts views (used for funding accounts and fetch state)
+    const depositAccountsView = getAllDepositAccounts(depositAccountState, depositAccountListState);
+    const paymentAccountsView = getAllPaymentAccounts(paymentAccountState, paymentAccountListState);
+    // Extract unique funding account IDs from unfiltered repayment history (for accountInfoMap used in filter/sort)
+    const repaymentHistoryFundingAccountIdsForMap = Array.from(new Set(repaymentHistory
+        .map((repayment) => repayment.paymentAccountId)
+        .filter((id) => id !== undefined && id !== null)));
+    let fundingAccountsForMap = [];
+    if (repaymentHistoryFundingAccountIdsForMap.length > 0) {
+        const hasDepositData = depositAccountsView.fetchState === 'Completed';
+        const hasPaymentData = paymentAccountsView.fetchState === 'Completed';
+        if (hasDepositData || hasPaymentData) {
+            const matchingDepositAccountsForMap = hasDepositData
+                ? depositAccountsView.depositAccounts.filter((depositAccount) => repaymentHistoryFundingAccountIdsForMap.includes(depositAccount.id))
+                : [];
+            const matchingPaymentAccountsForMap = hasPaymentData
+                ? paymentAccountsView.paymentAccounts.filter((paymentAccount) => repaymentHistoryFundingAccountIdsForMap.includes(paymentAccount.paymentAccountId))
+                : [];
+            fundingAccountsForMap = getAllFundingAccounts(matchingDepositAccountsForMap, matchingPaymentAccountsForMap, paymentAccountListState.paymentAccountBalanceFetchStatus, false);
+            // Fallback: look up repayment-referenced accounts directly from entity stores
+            // in case they're not in the list state (e.g. race condition, stale list)
+            const existingIds = new Set(fundingAccountsForMap.map((fa) => fa.id).filter(Boolean));
+            for (const accountId of repaymentHistoryFundingAccountIdsForMap) {
+                if (existingIds.has(accountId)) {
+                    continue;
+                }
+                const depositAccount = getDepositAccountByDepositAccountId(depositAccountState, accountId);
+                if (depositAccount != null) {
+                    fundingAccountsForMap.push(mapDepositAccToFundingAccount(depositAccount));
+                    existingIds.add(accountId);
+                    continue;
+                }
+                const paymentAccount = getPaymentAccountByPaymentAccountId(paymentAccountState, accountId);
+                if (paymentAccount != null) {
+                    fundingAccountsForMap.push(mapPaymentAccToFundingAccount(paymentAccount, paymentAccountListState.paymentAccountBalanceFetchStatus));
+                    existingIds.add(accountId);
+                }
+            }
+        }
+    }
+    const accountInfoByAccountId = {};
+    fundingAccountsForMap.forEach((fa) => {
+        if (fa.id != null) {
+            accountInfoByAccountId[fa.id] = {
+                accountId: fa.id,
+                accountLogo: fa.logo,
+                accountType: fa.accType === 'depositAccount' ? 'depositAccount' : 'paymentAccount',
+                depositAccountLast4: fa.accountLast4,
+                depositAccountName: fa.label,
+            };
+        }
+    });
+    repaymentHistoryWithUsers = applyPaymentHistoryFiltersSearchAndSort(repaymentHistoryWithUsers, filters, searchText, uiState, accountInfoByAccountId);
+    const reducedFetchState = reduceAllFetchState([
+        { fetchState, error },
+        depositAccountsView,
+        paymentAccountsView,
+        ...Object.values(paymentAccountListState.paymentAccountBalanceFetchStatus),
+    ]);
+    return {
+        accountInfoByAccountId,
+        creditAccountId,
+        currencyCode,
+        currencySymbol,
+        filters,
+        isAutoPayEnabled,
+        repaymentHistory: repaymentHistoryWithUsers,
+        repaymentHistoryIds,
+        repaymentHistoryUsers,
+        searchText,
+        totalRepayments,
+        uiState,
+        fetchState: reducedFetchState.fetchState,
+        error: reducedFetchState.error,
+        version: 0,
+    };
+};

package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentHistoryEpic.js

@@ -0,0 +1,31 @@
+import { of } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { updateChargeCardRepayments } from '../../../../entity/chargeCardRepayment/chargeCardRepaymentReducer';
+import { updateAllUsers } from '../../../../entity/user/userReducer';
+import { createZeniAPIStatus, isSuccessStatus, } from '../../../../responsePayload';
+import { fetchChargeCardPaymentHistory, updateChargeCardPaymentHistory, updateChargeCardPaymentHistoryFailure, } from './chargeCardPaymentHistoryReducer';
+export const fetchChargeCardPaymentHistoryEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchChargeCardPaymentHistory.match), switchMap(() => {
+    const queryParams = { include_history: true };
+    const queryString = encodeURIComponent(JSON.stringify(queryParams));
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.cardMicroServiceBaseUrl}/1.0/cards/repayments?query=${queryString}`)
+        .pipe(mergeMap((response) => {
+        if (isSuccessStatus(response) && response.data != null) {
+            return of(
+            // Store repayments FIRST before marking as completed
+            updateChargeCardRepayments(response.data.repayment_history), updateAllUsers({
+                users: response.data.repayment_history
+                    .map((repayment) => repayment.paid_by_user)
+                    .filter((user) => user != null),
+            }), 
+            // Mark as completed LAST, after all data is stored
+            updateChargeCardPaymentHistory(response.data));
+        }
+        else {
+            return of(updateChargeCardPaymentHistoryFailure(response.status));
+        }
+    }), catchError((error) => {
+        return of(updateChargeCardPaymentHistoryFailure(createZeniAPIStatus('Unexpected Error', 'Fetch charge card payment history REST API call errored out' +
+            JSON.stringify(error))));
+    }));
+}));

package/lib/esm/view/spendManagement/chargeCards/chargeCardPaymentHistory/fetchChargeCardPaymentPageEpic.js

@@ -0,0 +1,31 @@
+import { concat, from } from 'rxjs';
+import { filter, mergeMap } from 'rxjs/operators';
+import { fetchChargeCardRepaymentDetail } from '../chargeCardRepaymentDetail/chargeCardRepaymentDetailReducer';
+import { fetchChargeCardPaymentHistory, fetchChargeCardPaymentPage, } from './chargeCardPaymentHistoryReducer';
+export const fetchChargeCardPaymentPageEpic = (actions$, state$) => actions$.pipe(filter(fetchChargeCardPaymentPage.match), mergeMap((action) => {
+    const { cacheOverride } = action.payload;
+    const chargeCardPaymentPageActions = [];
+    const state = state$.value;
+    const chargeCardPaymentHistoryState = state.chargeCardPaymentHistoryState;
+    if (cacheOverride === true) {
+        chargeCardPaymentPageActions.push(fetchChargeCardPaymentHistory());
+    }
+    else {
+        if (chargeCardPaymentHistoryState.fetchState !== 'Completed' &&
+            chargeCardPaymentHistoryState.fetchState !== 'In-Progress') {
+            chargeCardPaymentPageActions.push(fetchChargeCardPaymentHistory());
+        }
+    }
+    // Fetch repayment detail if deposit or payment accounts are not fetched
+    //These are needed to get the transfer from accounts for the repayment history
+    const depositAccountListState = state.depositAccountListState;
+    const paymentAccountListState = state.paymentAccountListState;
+    const needsRepaymentDetailFetch = (depositAccountListState.fetchState !== 'Completed' &&
+        depositAccountListState.fetchState !== 'In-Progress') ||
+        (paymentAccountListState.fetchState !== 'Completed' &&
+            paymentAccountListState.fetchState !== 'In-Progress');
+    if (needsRepaymentDetailFetch) {
+        chargeCardPaymentPageActions.push(fetchChargeCardRepaymentDetail());
+    }
+    return concat(from(chargeCardPaymentPageActions));
+}));

package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailSelector.js

@@ -1,5 +1,5 @@
-import { reduceAllFetchState } from '../../../../commonStateTypes/reduceFetchState';
-import { getAllFundingAccounts, } from '../../commonSetup/setupViewSelector';
+import { reduceAnyCompletedFetchState } from '../../../../commonStateTypes/reduceFetchState';
+import { getAllFundingAccounts, mapDepositAccountWithLimitToFundingAccount, } from '../../commonSetup/setupViewSelector';
 import { getAllDepositAccounts } from '../../zeniAccounts/depositAccountList/depositAccountListSelector';
 import { getAllPaymentAccounts } from '../../zeniAccounts/paymentAccountList/paymentAccountListSelector';
 export const getChargeCardRepaymentDetail = (state) => {
@@ -8,11 +8,17 @@ export const getChargeCardRepaymentDetail = (state) => {
     const depositAccountsView = getAllDepositAccounts(depositAccountState, depositAccountListState);
     const paymentAccountsView = getAllPaymentAccounts(paymentAccountState, paymentAccountListState);
     let transferFromAccounts = [];
-    if (depositAccountsView.fetchState === 'Completed' &&
-        paymentAccountsView.fetchState === 'Completed') {
-        transferFromAccounts = getAllFundingAccounts(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
+    if (paymentAccountsView.fetchState === 'Completed') {
+        if (depositAccountsView.fetchState === 'Completed') {
+            transferFromAccounts = getAllFundingAccounts(depositAccountsView.depositAccounts, paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
+        }
+        else {
+            const depositFundingFromLimit = Object.values(depositAccountState.depositAccountLimitForChargeCardByID ?? {}).map(mapDepositAccountWithLimitToFundingAccount);
+            const paymentFundingAccounts = getAllFundingAccounts([], paymentAccountsView.paymentAccounts, paymentAccountListState.paymentAccountBalanceFetchStatus);
+            transferFromAccounts = [...depositFundingFromLimit, ...paymentFundingAccounts];
+        }
     }
-    const reducedFetchState = reduceAllFetchState([
+    const reducedFetchState = reduceAnyCompletedFetchState([
         depositAccountsView,
         paymentAccountsView,
         ...Object.values(paymentAccountListState.paymentAccountBalanceFetchStatus),

package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/fetchChargeCardRepaymentDetailEpic.js

@@ -7,8 +7,8 @@ export const fetchChargeCardRepaymentDetailEpic = (actions$, state$) => actions$
     const fetchChargeCardRepaymentDetailActions = [];
     const state = state$.value;
     const depositAccounts = state.depositAccountListState;
-    if (depositAccounts.fetchState !== 'In-Progress' &&
-        depositAccounts.fetchState !== 'Completed') {
+    const willFetchDeposit = depositAccounts.fetchState !== 'In-Progress' && depositAccounts.fetchState !== 'Completed';
+    if (willFetchDeposit) {
         fetchChargeCardRepaymentDetailActions.push(fetchDepositAccountList());
     }
     const paymentAccounts = state.paymentAccountListState;

package/lib/esm/view/spendManagement/chargeCards/chargeCardRepaymentDetail/initiateChargeCardRepaymentEpic.js

@@ -9,6 +9,7 @@ import { getAllFundingAccounts } from '../../commonSetup/setupViewSelector';
 import { accountTypeSubConfigCodeToAccType } from '../../helpers';
 import { getAllDepositAccounts } from '../../zeniAccounts/depositAccountList/depositAccountListSelector';
 import { getAllPaymentAccounts } from '../../zeniAccounts/paymentAccountList/paymentAccountListSelector';
+import { addRepaymentToChargeCardPaymentHistory } from '../chargeCardPaymentHistory/chargeCardPaymentHistoryReducer';
 import { updateCreditAccountRepaymentAmountAndDate } from '../chargeCardList/chargeCardListReducer';
 import { initiateChargeCardRepayment, updateChargeCardRepaymentStatus, } from './chargeCardRepaymentDetailReducer';
 export const initiateChargeCardRepaymentEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(initiateChargeCardRepayment.match), switchMap((action) => {
@@ -36,6 +37,10 @@ export const initiateChargeCardRepaymentEpic = (actions$, state$, zeniAPI) => ac
             if (isSuccessResponse(response) && response.data != null) {
                 const actions = [
                     updateChargeCardRepayment(response.data.card_repayment),
+                    addRepaymentToChargeCardPaymentHistory({
+                        cardRepaymentId: response.data.card_repayment.card_repayment_id,
+                        zeniCreditAccountId: response.data.card_repayment.zeni_credit_account_id,
+                    }),
                     updateCreditAccountRepaymentAmountAndDate({
                         amount: toAmount(response.data.card_repayment.amount, response.data.card_repayment.currency_code, response.data.card_repayment.currency_symbol),
                         date: date(response.data.card_repayment.repayment_date),

package/lib/esm/view/spendManagement/chargeCards/chargeCardSetUp/epic/fetchChargeCardSetupViewEpic.js

@@ -48,7 +48,7 @@ export const fetchChargeCardSetupViewEpic = (actions$, state$, zeniAPI) => actio
                     updateDepositAccounts(response.data.deposit_accounts ?? []),
                     updateDepositAccountList({
                         data: response.data?.deposit_accounts ?? [],
-                        updateType: 'replace',
+                        updateType: 'merge',
                     }),
                     updateSetupViewLocalStoreData({
                         companyId: response.data.companies[0].company_id,

package/lib/esm/view/spendManagement/commonSetup/setupViewSelector.js

@@ -219,6 +219,21 @@ export const mapDepositAccToFundingAccount = (depositAcc) => ({
     createTime: depositAcc.createTime,
     accountLast4: depositAcc.accountLast4,
 });
+export const mapDepositAccountWithLimitToFundingAccount = (depositAcc) => ({
+    id: depositAcc.id,
+    accType: 'depositAccount',
+    label: depositAcc.accountName,
+    maskedAccountNumber: depositAcc.maskedAccountNumber,
+    accountBalance: depositAcc.accountBalance,
+    logo: undefined,
+    zeniAccountId: depositAcc.zeniAccountId,
+    balanceFetchStatus: {
+        fetchState: 'Completed',
+        error: undefined,
+    },
+    createTime: depositAcc.createTime,
+    accountLast4: depositAcc.maskedAccountNumber.match(/(\d{4})$/)?.[1] ?? undefined,
+});
 export const mapPaymentAccToFundingAccount = (paymentAcc, paymentAccountBalanceFetchStatus) => ({
     id: paymentAcc.paymentAccountId,
     accType: 'paymentAccount',

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
@@ -66,10 +119,17 @@ const filterItemOnCategoriesWithMultipleValues = (categoryValue, currentFilter)
         return true;
     }
 };
+const getItemId = (item) => {
+    if ('cardRepaymentId' in item) {
+        return item.cardRepaymentId;
+    }
+    return item
+        .id;
+};
 const removeDuplicatesFromList = (list) => {
     const foundIds = [];
     return list.filter((item) => {
-        const itemId = item.id;
+        const itemId = getItemId(item);
         if (foundIds.indexOf(itemId) === -1) {
             foundIds.push(itemId);
             return true;
@@ -104,7 +164,13 @@ export const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredIt
             ? getCategoryValueForBill(key, item)
             : entity === 'reimbursement'
                 ? getCategoryValueForReimbursement(key, item)
-                : getCategoryValueForTaskList(key, item);
+                : entity === 'task_management'
+                    ? getCategoryValueForTaskList(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;
@@ -124,6 +190,7 @@ export const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredIt
                 'dueDate',
                 'creationDate',
                 'receiptDate',
+                'repaymentDate',
             ]);
         }
     });
@@ -224,6 +291,149 @@ 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': {
+            // Get from transaction.account or from lines
+            if (transaction.transaction.account?.accountName) {
+                return transaction.transaction.account.accountName;
+            }
+            // Get from first line's account
+            const firstLine = transaction.transaction.lines?.[0];
+            if (firstLine?.type === 'transaction_with_account_and_class_line' ||
+                firstLine?.type === 'transaction_with_product_or_service_line' ||
+                firstLine?.type === 'journal_entry_transaction_line') {
+                const accountLine = firstLine;
+                return accountLine.account?.accountName;
+            }
+            return undefined;
+        }
+        case 'payment_account_type': {
+            // Similar to payment_account_name but for type
+            if (transaction.transaction.account?.accountType) {
+                return transaction.transaction.account.accountType;
+            }
+            const firstLineForType = transaction.transaction.lines?.[0];
+            if (firstLineForType?.type === 'transaction_with_account_and_class_line' ||
+                firstLineForType?.type === 'transaction_with_product_or_service_line' ||
+                firstLineForType?.type === 'journal_entry_transaction_line') {
+                const accountLineForType = firstLineForType;
+                return accountLineForType.account?.accountType;
+            }
+            return undefined;
+        }
+        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':
+            return repayment.repaymentDate;
+        case 'sourceAccount': {
+            return repayment.paymentAccountId;
+        }
+        case 'status':
+            return repayment.status;
+        case 'initiatedBy':
+            return repayment.repaymentType === 'scheduled'
+                ? 'autopay'
+                : repayment.paidById;
+        default:
+            return undefined;
+    }
+};
 export const isBillListDownloadable = (state, currentTimePeriod) => {
     const { billListState, billTransactionState, entityApprovalStatusState, userState, } = state;
     const keys = ALL_BILL_TABS.filter((tab) => tab !== 'draft').map((tab) => getBillListKey(currentTimePeriod, tab));

package/lib/esm/view/spendManagement/zeniAccounts/depositAccountList/fetchDepositAccountListEpic.js

@@ -8,11 +8,13 @@ export const fetchDepositAccountListEpic = (actions$, _state$, zeniAPI) => actio
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.bankingMicroServiceBaseUrl}/1.0/deposit-accounts?query=${encodeURIComponent(`{"is_include_deposit_accounts_summary":true}`)}`)
         .pipe(mergeMap((response) => {
-        if (isSuccessResponse(response)) {
-            return of(updateDepositAccounts(response.data?.deposit_accounts ?? []), updateZeniAccountsSummary({
+        const isSuccess = isSuccessResponse(response);
+        if (isSuccess) {
+            const depositAccounts = response.data?.deposit_accounts ?? [];
+            return of(updateDepositAccounts(depositAccounts), updateZeniAccountsSummary({
                 summaryPayload: response.data?.all_deposit_accounts_summary,
             }), updateDepositAccountList({
-                data: response.data?.deposit_accounts ?? [],
+                data: depositAccounts,
                 updateType: 'replace',
             }));
         }