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

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

@@ -19,13 +19,24 @@ const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((
     const chargeCardAction = [];
     const state = state$.value;
     const chargeCardDetail = (0, get_1.default)(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((0, chargeCardDetailReducer_1.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,
@@ -43,6 +54,8 @@ const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((
                 }));
             }
             else {
+                // Surface errors even on silent refresh so the user
+                // knows data is stale (follow-up: consider toast instead).
                 return (0, rxjs_1.of)((0, chargeCardDetailReducer_1.updateChargeCardDetailFetchState)({
                     chargeCardId,
                     fetchState: 'Error',
@@ -51,6 +64,7 @@ const fetchChargeCardDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((
                 }));
             }
         }), (0, operators_1.catchError)((error) => {
+            // Surface network failures even on silent refresh.
             return (0, rxjs_1.of)((0, chargeCardDetailReducer_1.updateChargeCardDetailFetchState)({
                 chargeCardId,
                 fetchState: 'Error',

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

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

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListReducer.d.ts

@@ -10,15 +10,30 @@ export declare const fetchChargeCardListPage: import("@reduxjs/toolkit").ActionC
     isDebitCardEnabled: boolean;
     isCreditCardEnabled: boolean;
     cacheOverride: any;
-}, "chargeCardList/fetchChargeCardListPage", never, never>, fetchCreditAccountRepayment: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardList/fetchCreditAccountRepayment">, updateCreditAccountRepayment: import("@reduxjs/toolkit").ActionCreatorWithPayload<CreditAccountRepaymentPayload, "chargeCardList/updateCreditAccountRepayment">, updateCreditAccountRepaymentFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardList/updateCreditAccountRepaymentFailure">, updateCreditAccountRepaymentAmountAndDate: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "chargeCardList/fetchChargeCardListPage", never, never>, fetchCreditAccountRepayment: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
+    cacheOverride: boolean;
+}, "chargeCardList/fetchCreditAccountRepayment", never, never>, updateCreditAccountRepayment: import("@reduxjs/toolkit").ActionCreatorWithPayload<CreditAccountRepaymentPayload, "chargeCardList/updateCreditAccountRepayment">, updateCreditAccountRepaymentFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardList/updateCreditAccountRepaymentFailure">, updateCreditAccountRepaymentAmountAndDate: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     amount: Amount;
     date: ZeniDate;
-}, "chargeCardList/updateCreditAccountRepaymentAmountAndDate">, updateRowActionCardId: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, "chargeCardList/updateRowActionCardId">, fetchCreditAccount: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardList/fetchCreditAccount">, updateCreditAccount: import("@reduxjs/toolkit").ActionCreatorWithPayload<CreditAccountPayload[], "chargeCardList/updateCreditAccount">, updateCreditAccountFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardList/updateCreditAccountFailure">, fetchDebitCardSummary: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardList/fetchDebitCardSummary">, updateDebitCardSummary: import("@reduxjs/toolkit").ActionCreatorWithPayload<DebitCardSummariesPayload, "chargeCardList/updateDebitCardSummary">, updateDebitCardSummaryFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardList/updateDebitCardSummaryFailure">, fetchChargeCardList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardList/fetchChargeCardList">, updateChargeCardList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "chargeCardList/updateCreditAccountRepaymentAmountAndDate">, updateRowActionCardId: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<string | undefined, "chargeCardList/updateRowActionCardId">, fetchCreditAccount: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
+    cacheOverride: boolean;
+}, "chargeCardList/fetchCreditAccount", never, never>, updateCreditAccount: import("@reduxjs/toolkit").ActionCreatorWithPayload<CreditAccountPayload[], "chargeCardList/updateCreditAccount">, updateCreditAccountFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardList/updateCreditAccountFailure">, fetchDebitCardSummary: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
+    cacheOverride: boolean;
+}, "chargeCardList/fetchDebitCardSummary", never, never>, updateDebitCardSummary: import("@reduxjs/toolkit").ActionCreatorWithPayload<DebitCardSummariesPayload, "chargeCardList/updateDebitCardSummary">, updateDebitCardSummaryFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardList/updateDebitCardSummaryFailure">, fetchChargeCardList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
+    cacheOverride: boolean;
+}, "chargeCardList/fetchChargeCardList", never, never>, updateChargeCardList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     chargeCardListPayload: ChargeCardListPayload;
     keepExistingListItems?: boolean;
 }, "chargeCardList/updateChargeCardList">, updateChargeCardListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardList/updateChargeCardListFailure">, updateSearchText: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "chargeCardList/updateSearchText">, updateBulkActionCardIds: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "chargeCardList/updateBulkActionCardIds">, updateChargeCardListUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     uiState: Partial<ChargeCardListUIState>;
-}, "chargeCardList/updateChargeCardListUIState">, clearChargeCardList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardList/clearChargeCardList">, resendCardInvite: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cardId: string], {
+}, "chargeCardList/updateChargeCardListUIState">, updateCreditAccountBalanceFromPusher: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    currencyCode: string;
+    currencySymbol: string;
+    available?: number;
+    balance?: number;
+    cashback?: number;
+    hold?: number;
+}, "chargeCardList/updateCreditAccountBalanceFromPusher">, clearChargeCardList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardList/clearChargeCardList">, resendCardInvite: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cardId: string], {
     cardId: string;
 }, "chargeCardList/resendCardInvite", never, never>, resendCardInviteSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     cardId: ID;

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

@@ -1,9 +1,10 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.revokeChargeCardsInviteSuccessOrFailure = exports.revokeChargeCardsInvite = exports.closeChargeCardsSuccessOrFailure = exports.closeChargeCards = exports.unlockChargeCardsSuccessOrFailure = exports.unlockChargeCards = exports.lockChargeCardsSuccessOrFailure = exports.lockChargeCards = exports.updateChargeCardsSpendLimitSuccessOrFailure = exports.updateChargeCardsSpendLimit = exports.revokeCardInviteFailure = exports.revokeCardInviteSuccess = exports.revokeCardInvite = exports.resendCardInviteFailure = exports.resendCardInviteSuccess = exports.resendCardInvite = exports.clearChargeCardList = exports.updateChargeCardListUIState = exports.updateBulkActionCardIds = exports.updateSearchText = exports.updateChargeCardListFailure = exports.updateChargeCardList = exports.fetchChargeCardList = exports.updateDebitCardSummaryFailure = exports.updateDebitCardSummary = exports.fetchDebitCardSummary = exports.updateCreditAccountFailure = exports.updateCreditAccount = exports.fetchCreditAccount = exports.updateRowActionCardId = exports.updateCreditAccountRepaymentAmountAndDate = exports.updateCreditAccountRepaymentFailure = exports.updateCreditAccountRepayment = exports.fetchCreditAccountRepayment = exports.fetchChargeCardListPage = exports.initialState = void 0;
+exports.revokeChargeCardsInviteSuccessOrFailure = exports.revokeChargeCardsInvite = exports.closeChargeCardsSuccessOrFailure = exports.closeChargeCards = exports.unlockChargeCardsSuccessOrFailure = exports.unlockChargeCards = exports.lockChargeCardsSuccessOrFailure = exports.lockChargeCards = exports.updateChargeCardsSpendLimitSuccessOrFailure = exports.updateChargeCardsSpendLimit = exports.revokeCardInviteFailure = exports.revokeCardInviteSuccess = exports.revokeCardInvite = exports.resendCardInviteFailure = exports.resendCardInviteSuccess = exports.resendCardInvite = exports.clearChargeCardList = exports.updateCreditAccountBalanceFromPusher = exports.updateChargeCardListUIState = exports.updateBulkActionCardIds = exports.updateSearchText = exports.updateChargeCardListFailure = exports.updateChargeCardList = exports.fetchChargeCardList = exports.updateDebitCardSummaryFailure = exports.updateDebitCardSummary = exports.fetchDebitCardSummary = exports.updateCreditAccountFailure = exports.updateCreditAccount = exports.fetchCreditAccount = exports.updateRowActionCardId = exports.updateCreditAccountRepaymentAmountAndDate = exports.updateCreditAccountRepaymentFailure = exports.updateCreditAccountRepayment = exports.fetchCreditAccountRepayment = exports.fetchChargeCardListPage = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const amount_1 = require("../../../../commonStateTypes/amount");
+const cacheOverrideFetchReducer_1 = require("../../../../commonStateTypes/cacheOverrideFetchReducer");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
 const chargeCardList_1 = require("./chargeCardList");
 exports.initialState = {
@@ -47,6 +48,10 @@ exports.initialState = {
     revokeCardInvite: chargeCardList_1.initialResendRevokeCardInvite,
     creditAccountRepayment: chargeCardList_1.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 = (0, toolkit_1.createSlice)({
     name: 'chargeCardList',
     initialState: exports.initialState,
@@ -66,10 +71,10 @@ const chargeCardList = (0, toolkit_1.createSlice)({
                 };
             },
         },
-        fetchCreditAccountRepayment(draft) {
+        fetchCreditAccountRepayment: (0, cacheOverrideFetchReducer_1.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;
@@ -87,10 +92,10 @@ const chargeCardList = (0, toolkit_1.createSlice)({
         updateRowActionCardId(draft, action) {
             draft.rowActionCardId = action.payload;
         },
-        fetchCreditAccount(draft) {
+        fetchCreditAccount: (0, cacheOverrideFetchReducer_1.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]);
@@ -103,10 +108,10 @@ const chargeCardList = (0, toolkit_1.createSlice)({
                 error: action.payload,
             };
         },
-        fetchDebitCardSummary(draft) {
+        fetchDebitCardSummary: (0, cacheOverrideFetchReducer_1.createCacheOverrideFetchReducer)((draft) => {
             draft.debitCardSummaries.fetchState = 'In-Progress';
             draft.debitCardSummaries.error = undefined;
-        },
+        }),
         updateDebitCardSummary(draft, action) {
             draft.debitCardSummaries = toDebitCardSummaries(action.payload);
         },
@@ -117,10 +122,10 @@ const chargeCardList = (0, toolkit_1.createSlice)({
                 error: action.payload,
             };
         },
-        fetchChargeCardList(draft) {
+        fetchChargeCardList: (0, cacheOverrideFetchReducer_1.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);
@@ -156,6 +161,18 @@ const chargeCardList = (0, toolkit_1.createSlice)({
                 draft.uiState.scrollYOffset = action.payload.uiState.scrollYOffset;
             }
         },
+        updateCreditAccountBalanceFromPusher(draft, action) {
+            const { currencyCode, currencySymbol } = action.payload;
+            const amt = (v) => v !== undefined ? (0, amount_1.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, exports.initialState);
         },
@@ -311,7 +328,7 @@ const chargeCardList = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = chargeCardList.actions, exports.fetchChargeCardListPage = _a.fetchChargeCardListPage, exports.fetchCreditAccountRepayment = _a.fetchCreditAccountRepayment, exports.updateCreditAccountRepayment = _a.updateCreditAccountRepayment, exports.updateCreditAccountRepaymentFailure = _a.updateCreditAccountRepaymentFailure, exports.updateCreditAccountRepaymentAmountAndDate = _a.updateCreditAccountRepaymentAmountAndDate, exports.updateRowActionCardId = _a.updateRowActionCardId, exports.fetchCreditAccount = _a.fetchCreditAccount, exports.updateCreditAccount = _a.updateCreditAccount, exports.updateCreditAccountFailure = _a.updateCreditAccountFailure, exports.fetchDebitCardSummary = _a.fetchDebitCardSummary, exports.updateDebitCardSummary = _a.updateDebitCardSummary, exports.updateDebitCardSummaryFailure = _a.updateDebitCardSummaryFailure, exports.fetchChargeCardList = _a.fetchChargeCardList, exports.updateChargeCardList = _a.updateChargeCardList, exports.updateChargeCardListFailure = _a.updateChargeCardListFailure, exports.updateSearchText = _a.updateSearchText, exports.updateBulkActionCardIds = _a.updateBulkActionCardIds, exports.updateChargeCardListUIState = _a.updateChargeCardListUIState, exports.clearChargeCardList = _a.clearChargeCardList, exports.resendCardInvite = _a.resendCardInvite, exports.resendCardInviteSuccess = _a.resendCardInviteSuccess, exports.resendCardInviteFailure = _a.resendCardInviteFailure, exports.revokeCardInvite = _a.revokeCardInvite, exports.revokeCardInviteSuccess = _a.revokeCardInviteSuccess, exports.revokeCardInviteFailure = _a.revokeCardInviteFailure, exports.updateChargeCardsSpendLimit = _a.updateChargeCardsSpendLimit, exports.updateChargeCardsSpendLimitSuccessOrFailure = _a.updateChargeCardsSpendLimitSuccessOrFailure, exports.lockChargeCards = _a.lockChargeCards, exports.lockChargeCardsSuccessOrFailure = _a.lockChargeCardsSuccessOrFailure, exports.unlockChargeCards = _a.unlockChargeCards, exports.unlockChargeCardsSuccessOrFailure = _a.unlockChargeCardsSuccessOrFailure, exports.closeChargeCards = _a.closeChargeCards, exports.closeChargeCardsSuccessOrFailure = _a.closeChargeCardsSuccessOrFailure, exports.revokeChargeCardsInvite = _a.revokeChargeCardsInvite, exports.revokeChargeCardsInviteSuccessOrFailure = _a.revokeChargeCardsInviteSuccessOrFailure;
+_a = chargeCardList.actions, exports.fetchChargeCardListPage = _a.fetchChargeCardListPage, exports.fetchCreditAccountRepayment = _a.fetchCreditAccountRepayment, exports.updateCreditAccountRepayment = _a.updateCreditAccountRepayment, exports.updateCreditAccountRepaymentFailure = _a.updateCreditAccountRepaymentFailure, exports.updateCreditAccountRepaymentAmountAndDate = _a.updateCreditAccountRepaymentAmountAndDate, exports.updateRowActionCardId = _a.updateRowActionCardId, exports.fetchCreditAccount = _a.fetchCreditAccount, exports.updateCreditAccount = _a.updateCreditAccount, exports.updateCreditAccountFailure = _a.updateCreditAccountFailure, exports.fetchDebitCardSummary = _a.fetchDebitCardSummary, exports.updateDebitCardSummary = _a.updateDebitCardSummary, exports.updateDebitCardSummaryFailure = _a.updateDebitCardSummaryFailure, exports.fetchChargeCardList = _a.fetchChargeCardList, exports.updateChargeCardList = _a.updateChargeCardList, exports.updateChargeCardListFailure = _a.updateChargeCardListFailure, exports.updateSearchText = _a.updateSearchText, exports.updateBulkActionCardIds = _a.updateBulkActionCardIds, exports.updateChargeCardListUIState = _a.updateChargeCardListUIState, exports.updateCreditAccountBalanceFromPusher = _a.updateCreditAccountBalanceFromPusher, exports.clearChargeCardList = _a.clearChargeCardList, exports.resendCardInvite = _a.resendCardInvite, exports.resendCardInviteSuccess = _a.resendCardInviteSuccess, exports.resendCardInviteFailure = _a.resendCardInviteFailure, exports.revokeCardInvite = _a.revokeCardInvite, exports.revokeCardInviteSuccess = _a.revokeCardInviteSuccess, exports.revokeCardInviteFailure = _a.revokeCardInviteFailure, exports.updateChargeCardsSpendLimit = _a.updateChargeCardsSpendLimit, exports.updateChargeCardsSpendLimitSuccessOrFailure = _a.updateChargeCardsSpendLimitSuccessOrFailure, exports.lockChargeCards = _a.lockChargeCards, exports.lockChargeCardsSuccessOrFailure = _a.lockChargeCardsSuccessOrFailure, exports.unlockChargeCards = _a.unlockChargeCards, exports.unlockChargeCardsSuccessOrFailure = _a.unlockChargeCardsSuccessOrFailure, exports.closeChargeCards = _a.closeChargeCards, exports.closeChargeCardsSuccessOrFailure = _a.closeChargeCardsSuccessOrFailure, exports.revokeChargeCardsInvite = _a.revokeChargeCardsInvite, exports.revokeChargeCardsInviteSuccessOrFailure = _a.revokeChargeCardsInviteSuccessOrFailure;
 exports.default = chargeCardList.reducer;
 // helper
 const toCreditAccount = (payload) => ({

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

@@ -17,18 +17,21 @@ const fetchChargeCardListPageEpic = (actions$, state$) => actions$.pipe((0, oper
     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((0, chargeCardListReducer_1.fetchCreditAccount)());
-                chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccountRepayment)());
+                chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccount)(true));
+                chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchCreditAccountRepayment)(true));
             }
             if (isDebitCardEnabled) {
-                chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchDebitCardSummary)());
+                chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchDebitCardSummary)(true));
             }
-            chargeCardListPageAction.push((0, cashbackDetailReducer_1.fetchCashbackDetail)());
+            chargeCardListPageAction.push((0, cashbackDetailReducer_1.fetchCashbackDetail)(true));
         }
-        chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)());
-        chargeCardListPageAction.push((0, chargeCardConfigReducer_1.fetchChargeCardConfig)());
+        chargeCardListPageAction.push((0, chargeCardListReducer_1.fetchChargeCardList)(true));
+        // Config participates in the list page's reduceFetchState — needs cacheOverride.
+        chargeCardListPageAction.push((0, chargeCardConfigReducer_1.fetchChargeCardConfig)(true));
+        // These don't participate in the list page's reduceFetchState.
         chargeCardListPageAction.push((0, userListViewReducer_1.fetchUserListByType)('cardHolderCandidate', true));
         chargeCardListPageAction.push((0, userListViewReducer_1.fetchUserListByType)('cardAdmin', true));
         chargeCardListPageAction.push((0, classListReducer_1.fetchClassList)());

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory.d.ts

@@ -36,7 +36,7 @@ export interface PaymentHistoryFilters {
 }
 export interface PaymentHistoryFilterCategory {
     field: PaymentHistoryFilterCategoryField;
-    matchingOperator: 'equal' | 'not-equal';
+    matchingOperator: 'equal' | 'not_equal';
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }

package/lib/view/spendManagement/chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistoryReducer.d.ts

@@ -8,7 +8,9 @@ export declare const addRepaymentToChargeCardPaymentHistory: import("@reduxjs/to
     zeniCreditAccountId: ID;
 }, "chargeCardPaymentHistory/addRepaymentToChargeCardPaymentHistory">, fetchChargeCardPaymentPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any], {
     cacheOverride: any;
-}, "chargeCardPaymentHistory/fetchChargeCardPaymentPage", never, never>, fetchChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardPaymentHistory/fetchChargeCardPaymentHistory">, updateChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithPayload<ChargeCardPaymentHistoryPayload, "chargeCardPaymentHistory/updateChargeCardPaymentHistory">, updateChargeCardPaymentHistoryFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardPaymentHistory/updateChargeCardPaymentHistoryFailure">, clearChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardPaymentHistory/clearChargeCardPaymentHistory">, updatePaymentHistoryFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "chargeCardPaymentHistory/fetchChargeCardPaymentPage", never, never>, fetchChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
+    cacheOverride: boolean;
+}, "chargeCardPaymentHistory/fetchChargeCardPaymentHistory", never, never>, updateChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithPayload<ChargeCardPaymentHistoryPayload, "chargeCardPaymentHistory/updateChargeCardPaymentHistory">, updateChargeCardPaymentHistoryFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "chargeCardPaymentHistory/updateChargeCardPaymentHistoryFailure">, clearChargeCardPaymentHistory: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardPaymentHistory/clearChargeCardPaymentHistory">, updatePaymentHistoryFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     filters: PaymentHistoryFilters;
 }, "chargeCardPaymentHistory/updatePaymentHistoryFilters">, updatePaymentHistorySearchText: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "chargeCardPaymentHistory/updatePaymentHistorySearchText">, updatePaymentHistoryDownloadUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     uiState: Partial<ChargeCardPaymentHistoryDownloadUIState>;

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

@@ -3,6 +3,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePaymentHistoryUIState = exports.updatePaymentHistoryDownloadUIState = exports.updatePaymentHistorySearchText = exports.updatePaymentHistoryFilters = exports.clearChargeCardPaymentHistory = exports.updateChargeCardPaymentHistoryFailure = exports.updateChargeCardPaymentHistory = exports.fetchChargeCardPaymentHistory = exports.fetchChargeCardPaymentPage = exports.addRepaymentToChargeCardPaymentHistory = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const cacheOverrideFetchReducer_1 = require("../../../../commonStateTypes/cacheOverrideFetchReducer");
 const chargeCardPaymentHistory_1 = require("./chargeCardPaymentHistory");
 exports.initialState = chargeCardPaymentHistory_1.initialChargeCardPaymentHistoryState;
 const chargeCardPaymentHistory = (0, toolkit_1.createSlice)({
@@ -21,10 +22,10 @@ const chargeCardPaymentHistory = (0, toolkit_1.createSlice)({
                 };
             },
         },
-        fetchChargeCardPaymentHistory(draft) {
+        fetchChargeCardPaymentHistory: (0, cacheOverrideFetchReducer_1.createCacheOverrideFetchReducer)((draft) => {
             draft.fetchState = 'In-Progress';
             draft.error = undefined;
-        },
+        }),
         updateChargeCardPaymentHistory(draft, action) {
             const payload = action.payload;
             draft.creditAccountId = payload.credit_account_id;

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

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

package/lib/view/spendManagement/chargeCards/chargeCardRepaymentDetail/chargeCardRepaymentDetailReducer.d.ts

@@ -3,7 +3,9 @@ import { ZeniAPIStatus } from '../../../../responsePayload';
 import { FundingAccount } from '../../commonSetup/setupViewSelector';
 import { ChargeCardRepaymentDetailLocalData, ChargeCardRepaymentDetailState } from './chargeCardRepaymentDetailState';
 export declare const initialState: ChargeCardRepaymentDetailState;
-export declare const fetchChargeCardRepaymentDetail: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"chargeCardRepaymentDetail/fetchChargeCardRepaymentDetail">, initiateChargeCardRepayment: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+export declare const fetchChargeCardRepaymentDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: boolean | undefined], {
+    cacheOverride: boolean;
+}, "chargeCardRepaymentDetail/fetchChargeCardRepaymentDetail", never, never>, initiateChargeCardRepayment: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     companyId: ID;
 }, "chargeCardRepaymentDetail/initiateChargeCardRepayment">, updateNewAddedChargeCardPaymentAccount: import("@reduxjs/toolkit").ActionCreatorWithPayload<FundingAccount, "chargeCardRepaymentDetail/updateNewAddedChargeCardPaymentAccount">, updateChargeCardRepaymentLocalStore: import("@reduxjs/toolkit").ActionCreatorWithPayload<ChargeCardRepaymentDetailLocalData, "chargeCardRepaymentDetail/updateChargeCardRepaymentLocalStore">, updateChargeCardRepaymentStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     fetchState: FetchState;

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

@@ -3,6 +3,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearChargeCardRepaymentDetail = exports.updateChargeCardRepaymentStatus = exports.updateChargeCardRepaymentLocalStore = exports.updateNewAddedChargeCardPaymentAccount = exports.initiateChargeCardRepayment = exports.fetchChargeCardRepaymentDetail = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const cacheOverrideFetchReducer_1 = require("../../../../commonStateTypes/cacheOverrideFetchReducer");
 exports.initialState = {
     localData: {
         amount: {
@@ -21,9 +22,12 @@ const chargeCardRepaymentDetail = (0, toolkit_1.createSlice)({
     name: 'chargeCardRepaymentDetail',
     initialState: exports.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: (0, cacheOverrideFetchReducer_1.createCacheOverrideFetchReducer)(() => {
+            // do nothing
+        }),
         updateChargeCardRepaymentLocalStore(draft, action) {
             draft.localData = action.payload;
         },

package/lib/view/spendManagement/reimbursement/remiListView/remiListState.d.ts

@@ -46,7 +46,7 @@ export interface ReimbursementFilters {
 }
 export interface ReimbursementFilterCategory {
     field: RemiListViewFilterCategoryField;
-    matchingOperator: 'equal' | 'not-equal';
+    matchingOperator: 'equal' | 'not_equal';
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }

package/lib/view/spendManagement/spendManagementFilterHelpers.d.ts

@@ -1,3 +1,4 @@
+import { CategoryCombinationOperator, FilterCategoryType } from '../../commonStateTypes/filterPrimitives';
 import { TimePeriod } from '../../commonStateTypes/timePeriod';
 import { UserRoleType } from '../../entity/userRole/userRoleType';
 import { RootState } from '../../reducer';
@@ -12,12 +13,20 @@ import { ReimbursementView } from './reimbursement/remiListView/remiListSelector
 import { ReimbursementFilters, RemiListViewFilterCategoryField } from './reimbursement/remiListView/remiListState';
 export type SpendManagementFiltersType = BillPayFilters | ReimbursementFilters | TaskListFilters | PaymentHistoryFilters;
 export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'task_management' | 'charge_card_payment_history';
-export type FilterCategoryType = 'searchAutocomplete' | 'user' | 'dateRange' | 'numberRange' | 'dropdown';
+/**
+ * Re-exported here so consumers of `spendManagementFilterHelpers` keep
+ * their existing import path stable after the primitives moved to
+ * `commonStateTypes/filterPrimitives`. Downstream files (`taskList`,
+ * `remiListState`, `chargeCardPaymentHistory`, `billListState`) and the
+ * CES barrel still pull `CategoryCombinationOperator` / `FilterCategoryType`
+ * from this module — the source of truth is upstream but the surface is
+ * unchanged.
+ */
+export type { CategoryCombinationOperator, FilterCategoryType };
 export interface MatchingOperatorDropdownOption {
     label: 'is' | 'is not';
-    value: 'equal' | 'not-equal';
+    value: 'equal' | 'not_equal';
 }
-export type CategoryCombinationOperator = 'AND' | 'OR';
 export interface BillPayFilterCategoryDropdownOption {
     value: BillListViewFilterCategoryField;
     multiple?: boolean;

package/lib/view/spendManagement/spendManagementFilterHelpers.js

@@ -14,6 +14,8 @@ const helpers_1 = require("./helpers");
 const remiListSelector_1 = require("./reimbursement/remiListView/remiListSelector");
 const remiListState_1 = require("./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;
@@ -47,7 +49,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;
@@ -121,7 +123,7 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
                     ? 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/view/subscriptionView/subscriptionViewSelector.js

@@ -217,7 +217,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/view/taskManager/taskListView/taskList.d.ts

@@ -44,7 +44,7 @@ export interface TaskListFilters {
 }
 export interface TaskFilterCategory {
     field: TaskListFilterCategoryField;
-    matchingOperator: 'equal' | 'not-equal';
+    matchingOperator: 'equal' | 'not_equal';
     values: (string | ZeniDate)[];
     valuesCombinationOperator: 'ANY';
 }

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

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

package/lib/view/transactionDetail/transactionDetailReducer.d.ts

@@ -115,7 +115,17 @@ export declare const downloadAccountingProviderAttachment: import("@reduxjs/tool
     amount: number;
     recommendationWithCOTByLineId: RecommendationWithCOTByLineId;
     uncategorizedIncomeExpense: UncategorizedAccounts;
-}, "transactionDetail/setEntityRecommendationForLineIdsForTransactionDetail", never, never>, removeEntityRecommendationForLineIdForTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, transaction: SupportedTransaction, lineId: string], {
+}, "transactionDetail/setEntityRecommendationForLineIdsForTransactionDetail", never, never>, markCategoryClassRecommendationsInProgressForTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, lineIds: string[]], {
+    transactionId: TransactionID;
+    lineIds: string[];
+}, "transactionDetail/markCategoryClassRecommendationsInProgressForTransactionDetail", never, never>, markCategoryClassRecommendationsCompletedForTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, lineIds: string[]], {
+    transactionId: TransactionID;
+    lineIds: string[];
+}, "transactionDetail/markCategoryClassRecommendationsCompletedForTransactionDetail", never, never>, markCategoryClassRecommendationsFailureForTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, lineIds: string[], error: ZeniAPIStatus<Record<string, unknown>>], {
+    transactionId: TransactionID;
+    lineIds: string[];
+    error: ZeniAPIStatus<Record<string, unknown>>;
+}, "transactionDetail/markCategoryClassRecommendationsFailureForTransactionDetail", never, never>, removeEntityRecommendationForLineIdForTransactionDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: TransactionID, transaction: SupportedTransaction, lineId: string], {
     transactionId: TransactionID;
     transaction: SupportedTransaction;
     lineId: string;