@zeniai/client-epic-state 5.0.72 → 5.0.74

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

@@ -0,0 +1,258 @@
+/**
+ * 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 !== '';
+/**
+ * First line item in UI order. `lineItemById` is a Record whose iteration
+ * order is not guaranteed to match what the user sees; `sortedLineItems`
+ * is the canonical ordering used by the categorization list/detail views.
+ */
+const getFirstLineItemFromReviewLocalData = (localData) => {
+    const { sortedLineItems, lineItemById } = localData;
+    if (sortedLineItems.length > 0) {
+        return lineItemById[sortedLineItems[0]];
+    }
+    const lineItems = Object.values(lineItemById);
+    return lineItems.length > 0 ? lineItems[0] : undefined;
+};
+export const TRANSACTION_FILTER_CATEGORIES = [
+    { value: 'payment_account_name', type: 'dropdown' },
+    { value: 'payment_account_type', type: 'dropdown' },
+    { 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 = getFirstLineItemFromReviewLocalData(localDataForCategory);
+                const accountId = firstLineItem?.account?.accountId;
+                if (isNonEmptyString(accountId)) {
+                    return accountId;
+                }
+                const qboId = firstLineItem?.account?.qboId;
+                if (isNonEmptyString(qboId)) {
+                    return qboId;
+                }
+                const accountName = firstLineItem?.account?.accountName;
+                if (isNonEmptyString(accountName)) {
+                    return accountName;
+                }
+            }
+            const firstLineForCategory = transaction.transaction.lines?.[0];
+            if (firstLineForCategory?.type ===
+                'transaction_with_account_and_class_line' ||
+                firstLineForCategory?.type ===
+                    'transaction_with_product_or_service_line' ||
+                firstLineForCategory?.type === 'journal_entry_transaction_line') {
+                const account = firstLineForCategory.account;
+                return account?.accountId ?? account?.qboId ?? account?.accountName;
+            }
+            return undefined;
+        }
+        case 'class': {
+            const localDataForClass = transaction.transactionLocalData?.transactionReviewLocalData;
+            if (localDataForClass != null) {
+                const firstLineItemForClass = getFirstLineItemFromReviewLocalData(localDataForClass);
+                const classId = firstLineItemForClass?.class?.classId;
+                if (isNonEmptyString(classId)) {
+                    return classId;
+                }
+                const qboId = firstLineItemForClass?.class?.qboId;
+                if (isNonEmptyString(qboId)) {
+                    return qboId;
+                }
+                const className = firstLineItemForClass?.class?.className;
+                if (isNonEmptyString(className)) {
+                    return className;
+                }
+            }
+            const firstLineForClass = transaction.transaction.lines?.[0];
+            if (firstLineForClass?.type === 'transaction_with_account_and_class_line' ||
+                firstLineForClass?.type ===
+                    'transaction_with_product_or_service_line' ||
+                firstLineForClass?.type === 'journal_entry_transaction_line') {
+                const classData = firstLineForClass.class;
+                return classData?.classId ?? classData?.qboId ?? classData?.className;
+            }
+            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/expenseAutomationView/types/completedSubTab.js

@@ -0,0 +1,17 @@
+import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
+/**
+ * Sub-tabs that can appear under any "Completed" tab in the Expense Automation
+ * surface (Transaction Categorization Completed and Missing Receipts Completed
+ * both use this exact union). Forwarded verbatim to listing APIs as `sub_tab`
+ * / `match_type`. `'all'` preserves parent-tab semantics on the backend.
+ */
+const COMPLETED_SUB_TABS = ['all', 'ai_accountant', 'manual'];
+export const toCompletedSubTab = (v) => stringToUnion(v.trim().toLowerCase(), COMPLETED_SUB_TABS);
+/**
+ * "No sub-tab filter" sentinel — single source of truth for the default
+ * value of {@link CompletedSubTab}. Use this constant in initial slice
+ * state and at any call site that needs to fall back to the parent-tab
+ * listing semantics (review tab requests, manual-search overrides, etc.)
+ * so a future rename of the union doesn't require chasing literals.
+ */
+export const DEFAULT_COMPLETED_SUB_TAB = 'all';

package/lib/esm/view/expenseAutomationView/types/missingReceiptsViewState.js

@@ -39,8 +39,6 @@ const BULK_UPLOAD_RESULTS_TABS = ['completed', 'unmatched'];
 export const toBulkUploadResultsTab = (v) => stringToUnion(v.trim().toLowerCase(), BULK_UPLOAD_RESULTS_TABS);
 const MISSING_RECEIPTS_TABS = ['missing', 'completed', 'unmatched'];
 export const toMissingReceiptsTab = (v) => stringToUnion(v.trim().toLowerCase(), MISSING_RECEIPTS_TABS);
-const COMPLETED_SUB_TABS = ['all', 'ai_accountant', 'manual'];
-export const toCompletedSubTab = (v) => stringToUnion(v.trim().toLowerCase(), COMPLETED_SUB_TABS);
 const MATCH_SOURCES = ['ai', 'manual'];
 export const toMatchSource = (v) => stringToUnion(v.trim().toLowerCase(), MATCH_SOURCES);
 const BULK_UPLOAD_SORT_KEYS = [

package/lib/esm/view/financeStatement/financeStatementSelector.js

@@ -2,6 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
 import { stripCompareAdditionalBalanceTypes } from '../../commonStateTypes/coaBalance/coaBalanceType';
 import { newBalancesFilter, newBalancesFilterForDateRange, } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
 import { newBalancesFilterClassesView } from '../../commonStateTypes/coaBalance/coaBalancesFilterClassesView';
+import { newBalancesFilterProjectView } from '../../commonStateTypes/coaBalance/coaBalancesFilterProjectView';
 import { getNumberOfPeriods, } from '../../commonStateTypes/dataAvailable';
 import { reduceAnyCompletedFetchState } from '../../commonStateTypes/reduceFetchState';
 import { toTimeframeTick, } from '../../commonStateTypes/timeframeTick';
@@ -9,7 +10,6 @@ import { extractThisPeriod } from '../../commonStateTypes/viewAndReport/thisPeri
 import { getBalanceSheet } from '../balanceSheet/balanceSheetSelector';
 import { getCashFlow } from '../cashFlow/cashFlowSelector';
 import { getProfitAndLossReport, } from '../profitAndLoss/profitAndLossSelector';
-import { newBalancesFilterProjectView } from '../../commonStateTypes/coaBalance/coaBalancesFilterProjectView';
 import { getProfitAndLossClassesHorizontalView } from '../profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector';
 import { getProfitAndLossClassesView } from '../profitAndLossClassesView/profitAndLossClassesViewSelector';
 import { getProfitAndLossProjectView } from '../profitAndLossProjectView/profitAndLossProjectViewSelector';

package/lib/esm/view/spendManagement/chargeCards/cashbackDetail/cashbackDetailReducer.js

@@ -1,6 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { mapCurrencyPayloadToCurrency } from '../../../../commonPayloadTypes/v2/viewAndReportPayloadv2';
 import { toAmount } from '../../../../commonStateTypes/amount';
+import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
 import { initialCashbackAnalytics, } from './cashbackDetailState';
 export const initialState = {
     fetchState: 'Not-Started',
@@ -27,10 +28,10 @@ const cashbackDetail = createSlice({
     name: 'cashbackDetail',
     initialState,
     reducers: {
-        fetchCashbackDetail(draft) {
+        fetchCashbackDetail: createCacheOverrideFetchReducer((draft) => {
             draft.fetchState = 'In-Progress';
             draft.error = undefined;
-        },
+        }),
         updateCashbackDetail(draft, action) {
             draft.cashbackByPeriod = toCashbackByPeriod(action.payload);
             draft.cashbackSummary = toCashbackSummary(action.payload);

package/lib/esm/view/spendManagement/chargeCards/chargeCardConfig/chargeCardConfigReducer.js

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { toAmount } from '../../../../commonStateTypes/amount';
+import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
 import { toCreditLimitFrequencyCodeType } from '../../../../entity/chargeCard/chargeCard';
 import { toCreditTerm, toRePaymentInfo, } from './chargeCardConfigPayload';
 export const initialState = {
@@ -30,10 +31,10 @@ const chargeCardConfig = createSlice({
     name: 'chargeCardConfig',
     initialState,
     reducers: {
-        fetchChargeCardConfig(draft) {
+        fetchChargeCardConfig: createCacheOverrideFetchReducer((draft) => {
             draft.fetchState = 'In-Progress';
             draft.error = undefined;
-        },
+        }),
         updateChargeCardConfig(draft, action) {
             const { payload } = action;
             draft.creditLimitFrequency =

package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer.js

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { mapSortOrderPayloadToSortOrder, } from '../../../../commonPayloadTypes/sortOrderPayload';
+import { addChargeCardTransactionFromPusher, addDeclinedChargeCardTransactionFromPusher, } from '../../../../commonStateTypes/pusherActions';
 import { toAttachment, } from '../../../../entity/transaction/payloadTypes/attachmentPayload';
 import { emptyChargeCardDetail, mapChargeCardTransactionStatisticsPayloadToChargeCardTransactionStatistics, toChargeCardTransactionSortKeyType, } from './chargeCardDetail';
 export const initialState = {
@@ -64,19 +65,30 @@ const chargeCardDetail = createSlice({
         },
         fetchChargeCardTransactionList: {
             reducer(draft, action) {
-                const { chargeCardId, pageToken, pageTokenType } = action.payload;
+                const { chargeCardId, pageToken, pageTokenType, cacheOverride } = action.payload;
                 const existingCardDetail = draft.detailById[chargeCardId] ?? emptyChargeCardDetail;
+                const existingUi = existingCardDetail.transactionList.uiState;
+                // cacheOverride=true (Pusher): preserve fetchState, error, and scroll
+                // to avoid skeleton flash. Normal fetches reset as before.
                 draft.detailById[chargeCardId] = {
                     ...existingCardDetail,
                     transactionList: {
                         ...existingCardDetail.transactionList,
-                        fetchState: 'In-Progress',
-                        error: undefined,
+                        fetchState: cacheOverride
+                            ? existingCardDetail.transactionList.fetchState
+                            : 'In-Progress',
+                        error: cacheOverride
+                            ? existingCardDetail.transactionList.error
+                            : undefined,
                         uiState: {
-                            ...existingCardDetail.transactionList.uiState,
-                            scrollYOffset: existingCardDetail.transactionList.uiState.pageToken === null
-                                ? 0
-                                : existingCardDetail.transactionList.uiState.scrollYOffset,
+                            ...existingUi,
+                            // Preserve scroll on silent refresh so users aren't snapped
+                            // away from their reading position.
+                            scrollYOffset: cacheOverride
+                                ? existingUi.scrollYOffset
+                                : existingUi.pageToken === null
+                                    ? 0
+                                    : existingUi.scrollYOffset,
                             pageToken: pageToken,
                             pageTokenType: pageTokenType,
                         },
@@ -93,18 +105,24 @@ const chargeCardDetail = createSlice({
             const { chargeCardId, data, cacheOverride } = action.payload;
             const existingCardDetail = draft.detailById[chargeCardId] ?? emptyChargeCardDetail;
             const newTransactionIds = data.transactions.map((tran) => tran.transaction_id);
+            const existingIds = existingCardDetail.transactionList.transactionIds;
+            // cacheOverride (Pusher): refresh page 1 but keep page 2+ IDs.
+            // Normal pagination: append new page, deduped.
+            const newIdSet = new Set(newTransactionIds);
+            const mergedTransactionIds = cacheOverride
+                ? [
+                    ...newTransactionIds,
+                    ...existingIds.filter((id) => !newIdSet.has(id)),
+                ]
+                : [
+                    ...existingIds,
+                    ...newTransactionIds.filter((id) => !existingIds.includes(id)),
+                ];
             draft.detailById[chargeCardId] = {
                 ...existingCardDetail,
                 transactionList: {
                     ...existingCardDetail.transactionList,
-                    transactionIds: [
-                        ...new Set([
-                            ...(cacheOverride
-                                ? []
-                                : existingCardDetail.transactionList.transactionIds),
-                            ...newTransactionIds,
-                        ]),
-                    ],
+                    transactionIds: mergedTransactionIds,
                     fetchState: 'Completed',
                     error: undefined,
                     uiState: {
@@ -116,9 +134,12 @@ const chargeCardDetail = createSlice({
                         limit: data.query.limit,
                         pageToken: data.query.page_token,
                         pageTokenType: data.query.page_token_type,
-                        scrollYOffset: existingCardDetail.transactionList.uiState.pageToken === null
-                            ? 0
-                            : existingCardDetail.transactionList.uiState.scrollYOffset,
+                        // Preserve scroll on silent refresh; reset on user-triggered first page.
+                        scrollYOffset: cacheOverride
+                            ? existingCardDetail.transactionList.uiState.scrollYOffset
+                            : existingCardDetail.transactionList.uiState.pageToken === null
+                                ? 0
+                                : existingCardDetail.transactionList.uiState.scrollYOffset,
                     },
                 },
             };
@@ -632,6 +653,22 @@ const chargeCardDetail = createSlice({
             Object.assign(draft, initialState);
         },
     },
+    extraReducers: (builder) => {
+        const prependTransaction = (draft, cardId, txId) => {
+            const detail = draft.detailById[cardId];
+            if (detail != null &&
+                !detail.transactionList.transactionIds.includes(txId)) {
+                detail.transactionList.transactionIds.unshift(txId);
+            }
+        };
+        builder
+            .addCase(addChargeCardTransactionFromPusher, (draft, action) => {
+            prependTransaction(draft, action.payload.cardId, action.payload.transaction.transaction_id);
+        })
+            .addCase(addDeclinedChargeCardTransactionFromPusher, (draft, action) => {
+            prependTransaction(draft, action.payload.cardId, action.payload.transaction.transaction_id);
+        });
+    },
 });
 export const { fetchChargeCardDetailPage, fetchChargeCardDetail, updateChargeCardDetailFetchState, fetchChargeCardTransactionList, updateChargeCardDetailUIState, updateChargeCardTransactionList, updateChargeCardTransactionUploadReceiptsFetchStatus, fetchChargeCardTransactionAttachments, updateChargeCardTransactionIsViewReceiptClicked, updateChargeCardTransactionAttachmentsFailure, updatePhysicalChargeCardAttemptSuccessOrFailure, updatePhysicalChargeCardAttempt, updateDebitCardPinAttempt, updateDebitCardPinAttemptSuccessOrFailure, updateChargeCardTransactionReceiptsShowTickFetchStatus, updateChargeCardTransactionAttachmentsInCardDetail, updateChargeCardTransactionListFailure, updateChargeCardDetail, startCVVActivationWait, completeCVVActivationWait, startDebitCardSetPinWait, completeDebitCardSetPinWait, updateChargeCardDetailUpdateStatus, updateChargeCardSpendLimit, updateChargeCardSpendLimitSuccessOrFailure, updateChargeCardName, updateChargeCardNameSuccessOrFailure, lockChargeCard, lockChargeCardSuccessOrFailure, unlockChargeCard, unlockChargeCardSuccessOrFailure, closeChargeCard, closeChargeCardSuccessOrFailure, fetchDepositAccountLimit, updateDepositAccountLimitFetchStatus, fetchChargeCardTransactionStatistics, updateChargeCardTransactionStatistics, updateChargeCardTransactionStatisticsFetchState, fetchChargeCardsRecurringExpenses, updateChargeCardsRecurringExpenses, updateChargeCardsRecurringExpensesFetchState, sendOtpCardHolder, resendOtpCardHolder, sendOtpCardHolderSuccess, sendOtpCardHolderFailure, verifyOtpCardHolder, verifyOtpCardHolderSuccess, verifyOtpCardHolderFailure, clearChargeCardDetail, } = chargeCardDetail.actions;
 export default chargeCardDetail.reducer;

package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailEpic.js

@@ -13,13 +13,24 @@ export const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$
     const chargeCardAction = [];
     const state = state$.value;
     const chargeCardDetail = recordGet(state.chargeCardDetailState.detailById, chargeCardId, undefined);
+    // Skip if a user-triggered fetch is already in-flight (not applicable
+    // to cacheOverride/Pusher refreshes, which always proceed).
     if (cacheOverride === true ||
         chargeCardDetail == null ||
         chargeCardDetail.fetchState !== 'In-Progress') {
+        // Silent refresh: preserve fetchState to avoid skeleton flash.
+        // Discriminate via fetchState (not null-check) because the reducer
+        // always creates an entry before the epic runs.
+        const isSilentRefresh = cacheOverride === true &&
+            chargeCardDetail != null &&
+            chargeCardDetail.fetchState !== 'Not-Started';
         chargeCardAction.push(updateChargeCardDetailFetchState({
             chargeCardId,
-            isRefreshingViewInBackground: cacheOverride,
-            fetchState: 'In-Progress',
+            isRefreshingViewInBackground: isSilentRefresh,
+            fetchState: isSilentRefresh
+                ? chargeCardDetail.fetchState
+                : 'In-Progress',
+            error: isSilentRefresh ? chargeCardDetail.error : undefined,
         }));
         const query = {
             is_include_card_activation_events: true,
@@ -37,6 +48,8 @@ export const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$
                 }));
             }
             else {
+                // Surface errors even on silent refresh so the user
+                // knows data is stale (follow-up: consider toast instead).
                 return of(updateChargeCardDetailFetchState({
                     chargeCardId,
                     fetchState: 'Error',
@@ -45,6 +58,7 @@ export const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$
                 }));
             }
         }), catchError((error) => {
+            // Surface network failures even on silent refresh.
             return of(updateChargeCardDetailFetchState({
                 chargeCardId,
                 fetchState: 'Error',

package/lib/esm/view/spendManagement/chargeCards/chargeCardDetail/fetchChargeCardDetailPageEpic.js

@@ -15,15 +15,16 @@ export const fetchChargeCardDetailPageEpic = (actions$, state$) => actions$.pipe
         ? exsitingChargeCardDetail.transactionList.uiState.pageTokenType
         : null;
     if (cacheOverride === true) {
+        // Forward cacheOverride to all sub-fetches to prevent skeleton flash.
         chargeCardTransactionListAction.push(fetchChargeCardDetail(chargeCardId, cacheOverride));
         //latest transactions need to be fetched hence removing pageToken and pageTokenType
-        chargeCardTransactionListAction.push(fetchChargeCardTransactionList(chargeCardId, null, null));
-        chargeCardTransactionListAction.push(fetchChargeCardConfig());
+        chargeCardTransactionListAction.push(fetchChargeCardTransactionList(chargeCardId, null, null, true));
+        chargeCardTransactionListAction.push(fetchChargeCardConfig(true));
         if (doFetchCreditAccounts && isCreditCardEnabled) {
-            chargeCardTransactionListAction.push(fetchCreditAccount());
+            chargeCardTransactionListAction.push(fetchCreditAccount(true));
         }
         if (doFetchCreditAccounts && isCreditCardEnabled) {
-            chargeCardTransactionListAction.push(fetchCreditAccountRepayment());
+            chargeCardTransactionListAction.push(fetchCreditAccountRepayment(true));
         }
     }
     else {

package/lib/esm/view/spendManagement/chargeCards/chargeCardList/chargeCardListReducer.js

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { toAmount } from '../../../../commonStateTypes/amount';
+import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
 import { date } from '../../../../zeniDayJS';
 import { initialCreditAcc, initialCreditAccountRepayment, initialDebitCardSummaries, initialResendRevokeCardInvite, toCreditAccountStatusType, } from './chargeCardList';
 export const initialState = {
@@ -43,6 +44,10 @@ export const initialState = {
     revokeCardInvite: initialResendRevokeCardInvite,
     creditAccountRepayment: initialCreditAccountRepayment,
 };
+// Silent-Pusher-refresh contract: when cacheOverride=true, fetch reducers
+// leave fetchState and error unchanged so the list page's reduceFetchState
+// selector stays 'Completed' and doesn't flash ChargeCardListLoading.
+// See createCacheOverrideFetchReducer for details.
 const chargeCardList = createSlice({
     name: 'chargeCardList',
     initialState,
@@ -62,10 +67,10 @@ const chargeCardList = createSlice({
                 };
             },
         },
-        fetchCreditAccountRepayment(draft) {
+        fetchCreditAccountRepayment: createCacheOverrideFetchReducer((draft) => {
             draft.creditAccountRepayment.fetchState = 'In-Progress';
             draft.creditAccountRepayment.error = undefined;
-        },
+        }),
         updateCreditAccountRepaymentAmountAndDate(draft, action) {
             draft.creditAccountRepayment.initiatedRepayments = action.payload.amount;
             draft.creditAccountRepayment.initiatedRepaymentDate = action.payload.date;
@@ -83,10 +88,10 @@ const chargeCardList = createSlice({
         updateRowActionCardId(draft, action) {
             draft.rowActionCardId = action.payload;
         },
-        fetchCreditAccount(draft) {
+        fetchCreditAccount: createCacheOverrideFetchReducer((draft) => {
             draft.creditAccount.fetchState = 'In-Progress';
             draft.creditAccount.error = undefined;
-        },
+        }),
         updateCreditAccount(draft, action) {
             if (action.payload.length > 0) {
                 draft.creditAccount = toCreditAccount(action.payload[0]);
@@ -99,10 +104,10 @@ const chargeCardList = createSlice({
                 error: action.payload,
             };
         },
-        fetchDebitCardSummary(draft) {
+        fetchDebitCardSummary: createCacheOverrideFetchReducer((draft) => {
             draft.debitCardSummaries.fetchState = 'In-Progress';
             draft.debitCardSummaries.error = undefined;
-        },
+        }),
         updateDebitCardSummary(draft, action) {
             draft.debitCardSummaries = toDebitCardSummaries(action.payload);
         },
@@ -113,10 +118,10 @@ const chargeCardList = createSlice({
                 error: action.payload,
             };
         },
-        fetchChargeCardList(draft) {
+        fetchChargeCardList: createCacheOverrideFetchReducer((draft) => {
             draft.fetchState = 'In-Progress';
             draft.error = undefined;
-        },
+        }),
         updateChargeCardList(draft, action) {
             const { cards, unassigned_credit } = action.payload.chargeCardListPayload;
             const newCard = cards.map((card) => card.card_id);
@@ -152,6 +157,18 @@ const chargeCardList = createSlice({
                 draft.uiState.scrollYOffset = action.payload.uiState.scrollYOffset;
             }
         },
+        updateCreditAccountBalanceFromPusher(draft, action) {
+            const { currencyCode, currencySymbol } = action.payload;
+            const amt = (v) => v !== undefined ? toAmount(v, currencyCode, currencySymbol) : undefined;
+            draft.creditAccount.available =
+                amt(action.payload.available) ?? draft.creditAccount.available;
+            draft.creditAccount.balance =
+                amt(action.payload.balance) ?? draft.creditAccount.balance;
+            draft.creditAccount.hold =
+                amt(action.payload.hold) ?? draft.creditAccount.hold;
+            draft.creditAccount.cashback =
+                amt(action.payload.cashback) ?? draft.creditAccount.cashback;
+        },
         clearChargeCardList(draft) {
             Object.assign(draft, initialState);
         },
@@ -307,7 +324,7 @@ const chargeCardList = createSlice({
         },
     },
 });
-export const { fetchChargeCardListPage, fetchCreditAccountRepayment, updateCreditAccountRepayment, updateCreditAccountRepaymentFailure, updateCreditAccountRepaymentAmountAndDate, updateRowActionCardId, fetchCreditAccount, updateCreditAccount, updateCreditAccountFailure, fetchDebitCardSummary, updateDebitCardSummary, updateDebitCardSummaryFailure, fetchChargeCardList, updateChargeCardList, updateChargeCardListFailure, updateSearchText, updateBulkActionCardIds, updateChargeCardListUIState, clearChargeCardList, resendCardInvite, resendCardInviteSuccess, resendCardInviteFailure, revokeCardInvite, revokeCardInviteSuccess, revokeCardInviteFailure, updateChargeCardsSpendLimit, updateChargeCardsSpendLimitSuccessOrFailure, lockChargeCards, lockChargeCardsSuccessOrFailure, unlockChargeCards, unlockChargeCardsSuccessOrFailure, closeChargeCards, closeChargeCardsSuccessOrFailure, revokeChargeCardsInvite, revokeChargeCardsInviteSuccessOrFailure, } = chargeCardList.actions;
+export const { fetchChargeCardListPage, fetchCreditAccountRepayment, updateCreditAccountRepayment, updateCreditAccountRepaymentFailure, updateCreditAccountRepaymentAmountAndDate, updateRowActionCardId, fetchCreditAccount, updateCreditAccount, updateCreditAccountFailure, fetchDebitCardSummary, updateDebitCardSummary, updateDebitCardSummaryFailure, fetchChargeCardList, updateChargeCardList, updateChargeCardListFailure, updateSearchText, updateBulkActionCardIds, updateChargeCardListUIState, updateCreditAccountBalanceFromPusher, clearChargeCardList, resendCardInvite, resendCardInviteSuccess, resendCardInviteFailure, revokeCardInvite, revokeCardInviteSuccess, revokeCardInviteFailure, updateChargeCardsSpendLimit, updateChargeCardsSpendLimitSuccessOrFailure, lockChargeCards, lockChargeCardsSuccessOrFailure, unlockChargeCards, unlockChargeCardsSuccessOrFailure, closeChargeCards, closeChargeCardsSuccessOrFailure, revokeChargeCardsInvite, revokeChargeCardsInviteSuccessOrFailure, } = chargeCardList.actions;
 export default chargeCardList.reducer;
 // helper
 const toCreditAccount = (payload) => ({