@zeniai/client-epic-state 5.0.80 → 5.0.81-betaAD01

package/lib/esm/view/recommendation/recommendationHelper.js

@@ -1,4 +1,5 @@
 import { transformRecommendation, transformRecommendationWithCOT, } from '../../entity/transaction/payloadTypes/transactionPayload';
+import { getActualTransactionID } from '../transactionDetail/transactionDetailState';
 export const getRecommendationFromRecommendationPayload = (payload) => {
     if (payload == null || payload.length === 0) {
         return undefined;
@@ -37,6 +38,34 @@ export const getRecommendationWithCOTFromRecommendationPayloadWithCOT = (payload
     });
     return recommendations;
 };
+// Pluralized URL segment for entity types. Mirrors the legacy
+// fetchEntityRecommendationsByTransactionIdEpic.toEntityTypeURL.
+const toEntityTypeUrlSegment = (entityType) => `${entityType}s`;
+// Build the recommendations URL for a single entity + transaction target.
+// Centralizes the URL shape so the legacy
+// fetchEntityRecommendationsByTransactionIdEpic and the new
+// fetchEntityRecommendationsForLineUpdateEpic stay in lockstep.
+export const buildRecommendationUrl = (accountMicroServiceBaseUrl, entity, amount, transactionDetails, isFetchCOT) => {
+    const entityQuery = {
+        entity_name: entity.name,
+        entity_type: entity.type,
+    };
+    // Entity-id-null case: server expects entity_name / entity_type query
+    // instead of the {entityType}/{qboId}/recommendations path.
+    if (entity.qboId === entity.name) {
+        return `${accountMicroServiceBaseUrl}/1.0/recommendations?query=${encodeURIComponent(JSON.stringify(entityQuery))}`;
+    }
+    const query = {
+        amount,
+        transaction_id: getActualTransactionID(transactionDetails.transactionId.id),
+        transaction_type: transactionDetails.transaction.type,
+        line_ids: transactionDetails.lineIds,
+    };
+    if (isFetchCOT === true) {
+        query.include_cot = true;
+    }
+    return `${accountMicroServiceBaseUrl}/1.0/${toEntityTypeUrlSegment(entity.type)}/${entity.qboId}/recommendations?query=${encodeURIComponent(JSON.stringify(query))}`;
+};
 export const getRecommendationByLineIdWithCOTFromRecommendationPayloadWithCOT = (recommendationPayload, lineIds) => {
     if (recommendationPayload.length === 0) {
         return undefined;

package/lib/esm/view/recommendation/recommendationReducer.js

@@ -33,6 +33,31 @@ const recommendation = createSlice({
                 };
             },
         },
+        // Targeted recommendations fetch fired when the user changes the
+        // payee/customer on a single transaction line (or the JE sibling set
+        // for that change). Routed by `fetchEntityRecommendationsForLineUpdateEpic`
+        // which uses groupBy + switchMap to keep fetches for distinct targets
+        // running in parallel while same-target re-fetches still cancel each
+        // other. The flowType discriminator selects the categorization vs
+        // detail slice for the per-line In-Progress / Completed / Error state.
+        fetchEntityRecommendationsForLineUpdate: {
+            reducer(draft, action) {
+                const { entity } = action.payload;
+                const key = getEntityRecommendationKey(entity.type, entity.id);
+                // Unconditional flip to In-Progress; the previous variant only
+                // seeded when missing, which left stale fetchStates when a prior
+                // fetch had already populated the entity entry.
+                draft.recommendationByEntity[key] = {
+                    ...(draft.recommendationByEntity[key] ??
+                        initialEntityRecommendationState),
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(args) {
+                return { payload: args };
+            },
+        },
         fetchRecommendationByEntityName: {
             reducer(draft, action) {
                 const { entityName, entityType } = action.payload;
@@ -111,7 +136,7 @@ const recommendation = createSlice({
         },
     },
 });
-export const { fetchEntityRecommendationsByTransactionId, fetchRecommendationByEntityName, fetchRecommendationByEntityId, updateRecommendationForEntity, updateRecommendationForEntityFailure, indicateReadyToInitializeRecommendation, clearRecommendation, } = recommendation.actions;
+export const { fetchEntityRecommendationsByTransactionId, fetchEntityRecommendationsForLineUpdate, fetchRecommendationByEntityName, fetchRecommendationByEntityId, updateRecommendationForEntity, updateRecommendationForEntityFailure, indicateReadyToInitializeRecommendation, clearRecommendation, } = recommendation.actions;
 export default recommendation.reducer;
 const doUpdateRecommendationForEntity = (draft, entityId, entityType, payload) => {
     const key = getEntityRecommendationKey(entityType, entityId);

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) => ({

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

@@ -14,18 +14,21 @@ export const fetchChargeCardListPageEpic = (actions$, state$) => actions$.pipe(f
     const state = state$.value;
     const cashbackDetailState = state.cashbackDetailState;
     if (cacheOverride === true) {
+        // Forward cacheOverride to all sub-fetches to prevent skeleton flash.
         if (doFetchCreditAccountsDebitSummaryAndCashback === true) {
             if (isCreditCardEnabled) {
-                chargeCardListPageAction.push(fetchCreditAccount());
-                chargeCardListPageAction.push(fetchCreditAccountRepayment());
+                chargeCardListPageAction.push(fetchCreditAccount(true));
+                chargeCardListPageAction.push(fetchCreditAccountRepayment(true));
             }
             if (isDebitCardEnabled) {
-                chargeCardListPageAction.push(fetchDebitCardSummary());
+                chargeCardListPageAction.push(fetchDebitCardSummary(true));
             }
-            chargeCardListPageAction.push(fetchCashbackDetail());
+            chargeCardListPageAction.push(fetchCashbackDetail(true));
         }
-        chargeCardListPageAction.push(fetchChargeCardList());
-        chargeCardListPageAction.push(fetchChargeCardConfig());
+        chargeCardListPageAction.push(fetchChargeCardList(true));
+        // Config participates in the list page's reduceFetchState — needs cacheOverride.
+        chargeCardListPageAction.push(fetchChargeCardConfig(true));
+        // These don't participate in the list page's reduceFetchState.
         chargeCardListPageAction.push(fetchUserListByType('cardHolderCandidate', true));
         chargeCardListPageAction.push(fetchUserListByType('cardAdmin', true));
         chargeCardListPageAction.push(fetchClassList());

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

@@ -1,4 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
 import { initialChargeCardPaymentHistoryState, } from './chargeCardPaymentHistory';
 export const initialState = initialChargeCardPaymentHistoryState;
 const chargeCardPaymentHistory = createSlice({
@@ -17,10 +18,10 @@ const chargeCardPaymentHistory = createSlice({
                 };
             },
         },
-        fetchChargeCardPaymentHistory(draft) {
+        fetchChargeCardPaymentHistory: createCacheOverrideFetchReducer((draft) => {
             draft.fetchState = 'In-Progress';
             draft.error = undefined;
-        },
+        }),
         updateChargeCardPaymentHistory(draft, action) {
             const payload = action.payload;
             draft.creditAccountId = payload.credit_account_id;

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

@@ -8,7 +8,7 @@ export const fetchChargeCardPaymentPageEpic = (actions$, state$) => actions$.pip
     const state = state$.value;
     const chargeCardPaymentHistoryState = state.chargeCardPaymentHistoryState;
     if (cacheOverride === true) {
-        chargeCardPaymentPageActions.push(fetchChargeCardPaymentHistory());
+        chargeCardPaymentPageActions.push(fetchChargeCardPaymentHistory(true));
     }
     else {
         if (chargeCardPaymentHistoryState.fetchState !== 'Completed' &&

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

@@ -1,4 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { createCacheOverrideFetchReducer } from '../../../../commonStateTypes/cacheOverrideFetchReducer';
 export const initialState = {
     localData: {
         amount: {
@@ -17,9 +18,12 @@ const chargeCardRepaymentDetail = createSlice({
     name: 'chargeCardRepaymentDetail',
     initialState,
     reducers: {
-        fetchChargeCardRepaymentDetail() {
-            //do nothing
-        },
+        // No-op reducer — fetchState is managed by the Pay flow reducers.
+        // Uses createCacheOverrideFetchReducer for API consistency with the
+        // silent-refresh family (cacheOverride flag at dispatch site).
+        fetchChargeCardRepaymentDetail: createCacheOverrideFetchReducer(() => {
+            // do nothing
+        }),
         updateChargeCardRepaymentLocalStore(draft, action) {
             draft.localData = action.payload;
         },

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

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

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

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

package/lib/esm/view/taskManager/cannedResponsesView/epics/fetchCannedResponsesEpic.js

@@ -1,5 +1,5 @@
 import { of } from 'rxjs';
-import { catchError, filter, switchMap, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { mapCannedResponsePayloadToCannedResponse, } from '../cannedResponsesPayload';
 import { fetchCannedResponses, updateCannedResponses, updateCannedResponsesFetchStatus, } from '../cannedResponsesReducer';

package/lib/esm/view/taskManager/cannedResponsesView/epics/saveCannedResponseEpic.js

@@ -1,5 +1,5 @@
 import { of } from 'rxjs';
-import { catchError, filter, switchMap, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { fetchCannedResponses, saveCannedResponse, saveCannedResponseFailure, saveCannedResponseSuccess, } from '../cannedResponsesReducer';
 export const saveCannedResponseEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(saveCannedResponse.match), switchMap((action) => {

package/lib/esm/view/taskManager/taskDetailView/epics/unsnoozeTaskEpic.js

@@ -4,7 +4,7 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTasks } from '../../../../entity/task/taskReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { fetchTaskList, removeTaskFromList, } from '../../taskListView/taskListReducer';
-import { snoozeTaskSuccessOrFailure, unsnoozeTask, } from '../taskDetailReducer';
+import { snoozeTaskSuccessOrFailure, unsnoozeTask } from '../taskDetailReducer';
 export const unsnoozeTaskEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(unsnoozeTask.match), mergeMap((action) => handleUnsnoozeTask(action.payload.taskId, zeniAPI)));
 const handleUnsnoozeTask = (taskId, zeniAPI) => {
     const unsnoozeTaskApi$ = zeniAPI.deleteAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/snooze`);

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

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