@zeniai/client-epic-state 5.0.71-betaML41 → 5.0.71-betaVR2

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/fetchMultipleBatchDetailsEpic.js

@@ -31,10 +31,19 @@ export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
 }
 export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatchesSuccess.match), mergeMap((action) => {
     const batchList = action.payload.batchList;
-    const { batchDetailsById } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const { batchDetailsById, batchDetailsRevalidating } = bulkUpload;
     /** Only completed list rows may trigger batch-details API; preserve platform order. */
-    const completedBatchesMissingDetails = filterBatchListItemsForBatchDetailsFetch(batchList).filter((batch) => batchDetailsById[batch.batchId] == null);
-    const completedBatchIds = completedBatchesMissingDetails.map((batch) => batch.batchId);
+    const completedRows = filterBatchListItemsForBatchDetailsFetch(batchList);
+    /**
+     * Stale-while-revalidate: when a manual refresh has set `batchDetailsRevalidating`, refresh
+     * every completed list row (replacing entries via `storeBatchDetails` as they arrive). On a
+     * normal first fetch we still only request rows whose details are missing.
+     */
+    const candidateRows = batchDetailsRevalidating === true
+        ? completedRows
+        : completedRows.filter((batch) => batchDetailsById[batch.batchId] == null);
+    const completedBatchIds = candidateRows.map((batch) => batch.batchId);
     const batchIdsToFetch = completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE);
     if (batchIdsToFetch.length === 0) {
         /**
@@ -42,7 +51,6 @@ export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => acti
          * `currentBatchId` may not appear in the filtered list but still needs `GET /batches/:id`.
          * Fall back to the single-batch-details epic so `phase` and details can resolve.
          */
-        const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
         const currentId = bulkUpload.currentBatchId;
         if (currentId != null &&
             bulkUpload.phase === 'matching' &&
@@ -50,7 +58,15 @@ export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => acti
             shouldFetchBatchDetailsForBatchId(bulkUpload.batchStatusById, bulkUpload.batchListByPeriod, currentId)) {
             return of(fetchBulkUploadBatchDetails());
         }
-        return EMPTY;
+        /**
+         * Close the pagination loop so the Unmatched-tab loading heuristic can settle.
+         * `fetchMoreBatchDetailsComplete` also clears `batchDetailsRevalidating` and flips
+         * `initialBatchDetailsLoaded` to true. Without this, `batchDetailsPaginationState` stays
+         * at `Not-Started` forever after a list refresh that finds zero completed rows (or all
+         * already cached) — the direct-open-Unmatched-without-upload path used to render an
+         * infinite skeleton.
+         */
+        return of(fetchMoreBatchDetailsComplete());
     }
     return concat(of(setInitialBatchDetailsLoading()), fetchBatchDetailsByIds(batchIdsToFetch, zeniAPI), of(fetchMoreBatchDetailsComplete()));
 }));

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/refreshBatchDetailsForBatchIdEpic.js

@@ -0,0 +1,52 @@
+import { EMPTY, concat, from, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { extractTransactionPayloadsFromBatchFiles, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
+import { batchDetailFetchFailed, markBatchDetailRefreshAttempted, refreshBatchDetailsForBatchId, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
+/**
+ * Pusher resends the same `completed` event in some cases (reconnect, server retry). Skip a
+ * targeted refresh if we issued one for the same batch within this window — the cached details
+ * are already fresh, so another `GET /1.0/batches/:id` is wasteful and visually flickers nothing.
+ */
+const TARGETED_REFRESH_DEDUPE_MS = 5000;
+/**
+ * Single-batch stale-while-revalidate refresh. Triggered by `pusherBatchStatusCompletionEpic`
+ * (and any other path that wants to update one batch without wiping the cache). The response is
+ * stored via `storeBatchDetails`, which replaces the entry by `batchId` so the row updates in
+ * place — no skeleton, no list reflow.
+ *
+ * Throttle: `lastBatchDetailRefreshAtById[batchId]` is checked against `TARGETED_REFRESH_DEDUPE_MS`
+ * before issuing the call. The marker is emitted first so concurrent dispatches (e.g. Pusher
+ * resend during an in-flight request) see the dedupe timestamp and collapse to a single call.
+ */
+export const refreshBatchDetailsForBatchIdEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(refreshBatchDetailsForBatchId.match), mergeMap((action) => {
+    const { batchId } = action.payload;
+    const now = Date.now();
+    const lastAttempt = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload
+        .lastBatchDetailRefreshAtById[batchId];
+    if (lastAttempt != null &&
+        now - lastAttempt < TARGETED_REFRESH_DEDUPE_MS) {
+        return EMPTY;
+    }
+    const apiCall = zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
+        .pipe(mergeMap((response) => {
+        if (!isSuccessResponse(response) ||
+            response.data == null ||
+            !isBatchDetailsApiStatusCompleted(response.data.status)) {
+            return EMPTY;
+        }
+        const actions = [];
+        const transactionPayloads = extractTransactionPayloadsFromBatchFiles(response.data.files);
+        if (transactionPayloads.length > 0) {
+            actions.push(updateTransactions(transactionPayloads, (value) => value.transaction_id));
+        }
+        actions.push(storeBatchDetails(toBatchDetails(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
+        return from(actions);
+    }), catchError((error) => {
+        console.error(`Failed to refresh batch details for ${batchId}:`, createZeniAPIStatus('Unexpected Error', 'Refresh batch details errored out: ' + JSON.stringify(error)));
+        return of(batchDetailFetchFailed({ batchId }));
+    }));
+    return concat(of(markBatchDetailRefreshAttempted({ batchId, timestamp: now })), apiCall);
+}));

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/syncTabsAfterAutomatchEpic.js

@@ -0,0 +1,53 @@
+import { EMPTY, from, merge } from 'rxjs';
+import { filter, switchMap, take, takeUntil } from 'rxjs/operators';
+import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, fetchCompletedTransactions, fetchMissingReceipts, restoreBulkUploadMatchingState, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
+/**
+ * After automatch completes for the active bulk-upload batch, refresh the two
+ * caches that are not invalidated by the existing batch-details refresh path:
+ *   - Missing Receipts list (`transactionIdsBySelectedPeriod`)
+ *   - Completed transactions cache (`bulkUpload.completedTransactionsByPeriod`)
+ *
+ * The Unmatched tab is already kept fresh via `pusherBatchStatusCompletionEpic`
+ * dispatching `fetchBulkUploadBatches({invalidateBatchDetailsCache: true})`,
+ * which feeds `fetchMultipleBatchDetailsEpic` and re-stores batch details.
+ *
+ * Lifecycle mirrors `bulkUploadMatchResultToastEpic`: trigger on
+ * `bulkUploadReceiptsSuccess` (fresh upload) or `restoreBulkUploadMatchingState`
+ * (restored session), then wait for the first batch-details action for that
+ * batchId — landing as either `fetchBulkUploadBatchDetailsSuccess` or
+ * `storeBatchDetails`. `clearBulkUpload` cancels the in-flight wait.
+ *
+ * Refetches use `cacheOverride: true` to bypass per-tab cache guards, and
+ * `fetchMissingReceipts` uses `refreshViewInBackground: true` to keep the
+ * existing rows visible while fresh data is in flight (the authoritative
+ * server filter `is_attachment_missing_only=true` removes matched rows once
+ * the response lands).
+ */
+export const syncTabsAfterAutomatchEpic = (actions$, state$) => actions$.pipe(filter((action) => bulkUploadReceiptsSuccess.match(action) ||
+    restoreBulkUploadMatchingState.match(action)), switchMap((uploadAction) => {
+    const { batchId } = uploadAction.payload;
+    return merge(actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match)), actions$.pipe(filter(storeBatchDetails.match))).pipe(filter((a) => a.payload.batchId === batchId), take(1), switchMap((action) => {
+        const { summary } = action.payload;
+        if (summary.matched <= 0) {
+            return EMPTY;
+        }
+        const state = state$.value;
+        const currentTenant = getCurrentTenant(state);
+        const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
+        if (selectedPeriod == null) {
+            return from([fetchCompletedTransactions(undefined, true)]);
+        }
+        const period = convertToPeriod(selectedPeriod);
+        const timePeriodStart = toAbsoluteDay(period.start);
+        const timePeriodEnd = toAbsoluteDay(period.end);
+        if (timePeriodStart == null || timePeriodEnd == null) {
+            return from([fetchCompletedTransactions(undefined, true)]);
+        }
+        return from([
+            fetchMissingReceipts({ start: timePeriodStart, end: timePeriodEnd }, { amount: 75.0, currencyCode: 'USD', currencySymbol: '$' }, true, true),
+            fetchCompletedTransactions(undefined, true),
+        ]);
+    }), takeUntil(actions$.pipe(filter(clearBulkUpload.match))));
+}));

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/watchBulkUploadBatchStatusEpic.js

@@ -5,23 +5,27 @@ import { updateTransactions } from '../../../../entity/transaction/transactionRe
 import { isSuccessResponse } from '../../../../responsePayload';
 import { BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS } from '../../helpers/bulkUploadTiming';
 import { extractTransactionPayloadsFromBatchFiles, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
-import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
+import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, refreshBatchDetailsForBatchId, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
 /** First poll after upload; then interval while batch not resolved via Pusher or API. */
 const FALLBACK_FIRST_DELAY_MS = 30000;
 /** Shorter first poll for restored sessions — batch may already be near completion. */
 const RESTORE_FIRST_DELAY_MS = 5000;
 const FALLBACK_POLL_INTERVAL_MS = 10000;
 /**
- * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs).
- * Debounced to reduce duplicate refreshes. The post-match tab decision
- * (Unmatched vs Completed) is made client-side in `ExpenseAutomationPage` once fresh
+ * On Pusher batch completion: refresh the batch list (so summary counts update) and dispatch a
+ * targeted single-batch details refresh for the batch that just completed. Stale-while-revalidate:
+ * we no longer pass `invalidateBatchDetailsCache: true` — existing `batchDetailsById` entries stay
+ * on screen and the just-completed row replaces in place via `storeBatchDetails`. The post-match
+ * tab decision (Unmatched vs Completed) is made client-side in `ExpenseAutomationPage` once fresh
  * batch details land -- do not dispatch `requestMissingReceiptsTabNavigation` here.
+ *
+ * Pusher resend storms (same batch completing twice within the dedupe window) are throttled in
+ * `refreshBatchDetailsForBatchIdEpic` via `lastBatchDetailRefreshAtById`, so this epic stays
+ * stateless and just forwards the event.
  */
-export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.status === 'completed'), debounceTime(300), mergeMap(() => from([
-    fetchBulkUploadBatches({
-        cacheOverride: true,
-        invalidateBatchDetailsCache: true,
-    }),
+export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.status === 'completed'), debounceTime(300), mergeMap((action) => from([
+    fetchBulkUploadBatches({ cacheOverride: true }),
+    refreshBatchDetailsForBatchId({ batchId: action.payload.batchId }),
 ])));
 /**
  * If Pusher and batch-details are delayed beyond {@link BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS},

package/lib/esm/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js

@@ -59,22 +59,6 @@ export const filterAutoTabLineItems = (tabView, transactionId, updatedTransactio
     }
 };
 export const MAX_SELECTION_LIMIT = 5;
-// Returns true when the transaction should be auto-added to the
-// selectedCheckBoxTransactionIds list after a categorization-related
-// state mutation: all line items are filled, the selection limit has
-// not been hit, and the id isn't already in the list. Consolidates the
-// triplet that was inlined at four sites (updateSelectedCustomer/Vendor,
-// setAllItemsToCategoryClassInLocalDataForCategorization, and
-// setEntityRecommendationForLineIdInLocalData below).
-export const shouldAutoSelectAndAdd = (transaction, localData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) => {
-    if (selectedCheckBoxTransactionIds.includes(transaction.id)) {
-        return false;
-    }
-    if (selectedCheckBoxTransactionIds.length >= MAX_SELECTION_LIMIT) {
-        return false;
-    }
-    return checkIfAllLineItemsAreCategoryClassFilled(transaction, localData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled);
-};
 export const toTransactionDetailLocalData = (transaction, selectedTab, lineItemsByTransactionIds, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled) => {
     const transactionLocal = {
         ...initialSupportedTransactionCategorization.transactionReviewLocalData,
@@ -560,14 +544,10 @@ export const setEntityRecommendationForLineIdInLocalData = (draft, transaction,
         selectedEntity: transactionDetailLocalData.selectedEntity,
         tabSpecificLineItems: transactionDetailLocalData.tabSpecificLineItems,
     };
-    // Auto-uncheck if not all line items are filled (the row's
-    // category/class became stale after the entity update). Otherwise
-    // route through shouldAutoSelectAndAdd so the MAX_SELECTION_LIMIT
-    // gate is consistently applied across all auto-add sites.
     if (!checkIfAllLineItemsAreCategoryClassFilled(transaction, newLocalData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
         selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds.filter((id) => id !== transaction.id);
     }
-    else if (shouldAutoSelectAndAdd(transaction, newLocalData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
+    else if (selectedCheckBoxTransactionIds.includes(transaction.id) === false) {
         selectedCheckBoxTransactionIds.push(transaction.id);
     }
     draft.selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds;

package/lib/esm/view/expenseAutomationView/reducers/missingReceiptsViewReducer.js

@@ -10,6 +10,7 @@ export const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, s
 export const initialBulkUploadState = {
     batchDetailsById: {},
     batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
+    batchDetailsRevalidating: false,
     batchListByPeriod: {},
     batchListFetchState: { fetchState: 'Not-Started', error: undefined },
     batchStatusById: {},
@@ -19,6 +20,8 @@ export const initialBulkUploadState = {
     currentBatchId: undefined,
     currentResultsTab: 'unmatched',
     failedBatchDetailIds: [],
+    initialBatchDetailsLoaded: false,
+    lastBatchDetailRefreshAtById: {},
     manualSearchUiResetKey: 0,
     manualSearch: {
         fetchState: { fetchState: 'Not-Started', error: undefined },
@@ -65,6 +68,13 @@ export const fetchBulkUploadBatchDetails = createAction('expenseAutomationMissin
  * after a hard refresh. The epic owns the list + details API calls end-to-end.
  */
 export const restoreBulkUploadAutomatchingOnMount = createAction('expenseAutomationMissingReceiptsView/restoreBulkUploadAutomatchingOnMount');
+/**
+ * Epic trigger only. Targeted stale-while-revalidate refresh for a single batch's details — used
+ * by `pusherBatchStatusCompletionEpic` so a Pusher 'completed' event re-fetches only that one
+ * batch instead of wiping the entire `batchDetailsById` cache. The epic dedupes via
+ * `lastBatchDetailRefreshAtById` so resend storms don't trigger waves of API calls.
+ */
+export const refreshBatchDetailsForBatchId = createAction('expenseAutomationMissingReceiptsView/refreshBatchDetailsForBatchId');
 const expenseAutomationMissingReceiptsView = createSlice({
     name: 'expenseAutomationMissingReceiptsView',
     initialState,
@@ -251,6 +261,16 @@ const expenseAutomationMissingReceiptsView = createSlice({
             const details = action.payload;
             draft.bulkUpload.batchDetailsById[details.batchId] = details;
             draft.bulkUpload.phase = 'completed';
+            draft.bulkUpload.initialBatchDetailsLoaded = true;
+            /**
+             * A successful detail load supersedes any previous failure for this batch — without this,
+             * `getPrimaryBatchIdFromBatchListOrder` (and pagination) would keep skipping the batch
+             * across the recovery, hiding now-valid Unmatched-tab work.
+             */
+            const failedIndex = draft.bulkUpload.failedBatchDetailIds.indexOf(details.batchId);
+            if (failedIndex >= 0) {
+                draft.bulkUpload.failedBatchDetailIds.splice(failedIndex, 1);
+            }
         },
         fetchBulkUploadBatchDetailsFailure: {
             reducer(draft) {
@@ -272,6 +292,19 @@ const expenseAutomationMissingReceiptsView = createSlice({
                 draft.bulkUpload.currentBatchId === details.batchId) {
                 draft.bulkUpload.phase = 'completed';
             }
+            /** Stale-while-revalidate: any successful detail load means we have rendered data. */
+            draft.bulkUpload.initialBatchDetailsLoaded = true;
+            /**
+             * Stale-while-revalidate recovery: if this batch had previously failed, a successful
+             * targeted refresh (Pusher `completed` → `refreshBatchDetailsForBatchIdEpic`) or
+             * multi-batch revalidation (manual refresh) supersedes the failure. Selectors that gate
+             * on `failedBatchDetailIds` (primary-batch resolution, `hasMoreBatchDetails`) must see the
+             * batch as recovered so it can show fresh Unmatched work.
+             */
+            const failedIndex = draft.bulkUpload.failedBatchDetailIds.indexOf(details.batchId);
+            if (failedIndex >= 0) {
+                draft.bulkUpload.failedBatchDetailIds.splice(failedIndex, 1);
+            }
         },
         batchDetailFetchFailed(draft, action) {
             const { batchId } = action.payload;
@@ -300,6 +333,14 @@ const expenseAutomationMissingReceiptsView = createSlice({
                 fetchState: 'Completed',
                 error: undefined,
             };
+            /**
+             * Stale-while-revalidate: a completed pagination round means the initial page (or a
+             * subsequent revalidation) has fully resolved. Once `initialBatchDetailsLoaded` flips to
+             * `true` it stays `true` for the session — only `clearBulkUpload` /
+             * `clearBulkUploadBatchDetailsForScopeChange` can reset it.
+             */
+            draft.bulkUpload.initialBatchDetailsLoaded = true;
+            draft.bulkUpload.batchDetailsRevalidating = false;
             const currentId = draft.bulkUpload.currentBatchId;
             const currentDetails = currentId != null
                 ? draft.bulkUpload.batchDetailsById[currentId]
@@ -315,12 +356,21 @@ const expenseAutomationMissingReceiptsView = createSlice({
                 fetchState: 'Error',
                 error: action.payload.error,
             };
+            draft.bulkUpload.batchDetailsRevalidating = false;
         },
         fetchBulkUploadBatches: {
             reducer(draft, action) {
+                /**
+                 * Stale-while-revalidate: when caller asks for a full details refresh (manual refresh
+                 * button), we keep `batchDetailsById` and `failedBatchDetailIds` intact so the existing
+                 * UI stays rendered, and flip `batchDetailsRevalidating: true`. The post-success epic
+                 * (`fetchMultipleBatchDetailsEpic`) sees this flag and re-fetches every completed list
+                 * row, replacing entries via `storeBatchDetails` as each response arrives. This avoids
+                 * the previous "wipe to empty → render skeleton" flash. To genuinely drop details (e.g.
+                 * tenant/period scope change), use `clearBulkUploadBatchDetailsForScopeChange` instead.
+                 */
                 if (action.payload.invalidateBatchDetailsCache === true) {
-                    draft.bulkUpload.batchDetailsById = {};
-                    draft.bulkUpload.failedBatchDetailIds = [];
+                    draft.bulkUpload.batchDetailsRevalidating = true;
                 }
                 draft.bulkUpload.batchListFetchState = {
                     fetchState: 'In-Progress',
@@ -337,6 +387,31 @@ const expenseAutomationMissingReceiptsView = createSlice({
                 };
             },
         },
+        /**
+         * Tenant/period scope change — the new scope's data is genuinely unknown so the existing
+         * details cache and `initialBatchDetailsLoaded` flag must be reset (the Unmatched skeleton
+         * is acceptable on scope change). Distinct from a stale-while-revalidate refresh.
+         */
+        clearBulkUploadBatchDetailsForScopeChange(draft) {
+            draft.bulkUpload.batchDetailsById = {};
+            draft.bulkUpload.failedBatchDetailIds = [];
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'Not-Started',
+                error: undefined,
+            };
+            draft.bulkUpload.batchDetailsRevalidating = false;
+            draft.bulkUpload.initialBatchDetailsLoaded = false;
+            draft.bulkUpload.lastBatchDetailRefreshAtById = {};
+        },
+        /**
+         * Records the last time we issued a targeted refresh for `batchId`. Set by
+         * `refreshBatchDetailsForBatchIdEpic` before each API call so subsequent Pusher resends in the
+         * dedupe window are skipped.
+         */
+        markBatchDetailRefreshAttempted(draft, action) {
+            draft.bulkUpload.lastBatchDetailRefreshAtById[action.payload.batchId] =
+                action.payload.timestamp;
+        },
         fetchBulkUploadBatchesSuccess(draft, action) {
             const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
             draft.bulkUpload.batchListByPeriod[periodId] = action.payload.batchList;
@@ -579,7 +654,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
 });
 export const { fetchMissingReceipts, fetchMissingReceiptsSuccess, fetchMissingReceiptsFailure, uploadMissingReceiptSuccess, updateMissingReceiptUploadState, updateMissingReceiptsUIState, markMissingReceiptAsDone, clearExpenseAutomationMissingReceiptsView, 
 // Bulk Upload
-bulkUploadReceipts, updateBulkUploadProgress, setBulkUploadUploadedFileCount, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, restoreBulkUploadMatchingState, bulkUploadAutomatchingTimedOut, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, clearMissingReceiptsTabNavigation, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, batchDetailFetchFailed, setInitialBatchDetailsLoading, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, acknowledgeBulkUploadConfirmMatchComplete, 
+bulkUploadReceipts, updateBulkUploadProgress, setBulkUploadUploadedFileCount, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, restoreBulkUploadMatchingState, bulkUploadAutomatchingTimedOut, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, clearMissingReceiptsTabNavigation, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, batchDetailFetchFailed, setInitialBatchDetailsLoading, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, clearBulkUploadBatchDetailsForScopeChange, markBatchDetailRefreshAttempted, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, acknowledgeBulkUploadConfirmMatchComplete, 
 // Completed Transactions
 fetchCompletedTransactions, fetchCompletedTransactionsSuccess, fetchCompletedTransactionsFailure, } = expenseAutomationMissingReceiptsView.actions;
 export default expenseAutomationMissingReceiptsView.reducer;

package/lib/esm/view/expenseAutomationView/reducers/transactionsViewReducer.js

@@ -3,7 +3,7 @@ import recordGet from 'lodash/get';
 import uniq from 'lodash/uniq';
 import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { isVendorTransaction } from '../../../entity/transaction/stateTypes/vendorTransaction';
-import { filterAutoTabLineItems, mergeTabSpecificLineItems, removeTransactionFromTabView, setEntityRecommendationForLineIdInLocalData, shouldAutoSelectAndAdd, toSetAllLineItemsToCategoryClass, toTransactionDetailLocalData, } from '../helpers/transactionCategorizationLocalDataHelper';
+import { MAX_SELECTION_LIMIT, checkIfAllLineItemsAreCategoryClassFilled, filterAutoTabLineItems, mergeTabSpecificLineItems, removeTransactionFromTabView, setEntityRecommendationForLineIdInLocalData, toSetAllLineItemsToCategoryClass, toTransactionDetailLocalData, } from '../helpers/transactionCategorizationLocalDataHelper';
 import { DEFAULT_COMPLETED_SUB_TAB, } from '../types/completedSubTab';
 export const initialTransactionTabViewState = {
     saveStatus: {
@@ -420,9 +420,12 @@ const expenseAutomationTransactionsView = createSlice({
                     const selectedCheckBoxTransactionIds = draft.transactionCategorizationView[selectedTab]
                         .selectedCheckBoxTransactionIds;
                     if (selectedTransaction != null &&
-                        shouldAutoSelectAndAdd(selectedTransaction, newTransactionLocalData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
+                        checkIfAllLineItemsAreCategoryClassFilled(selectedTransaction, newTransactionLocalData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) === true && // check if all line items are filled
+                        selectedCheckBoxTransactionIds.length < MAX_SELECTION_LIMIT &&
+                        selectedCheckBoxTransactionIds.includes(transactionId) === false) {
                         draft.transactionCategorizationView[selectedTab].selectedCheckBoxTransactionIds = [
-                            ...selectedCheckBoxTransactionIds,
+                            ...draft.transactionCategorizationView[selectedTab]
+                                .selectedCheckBoxTransactionIds,
                             transactionId,
                         ];
                     }
@@ -505,26 +508,9 @@ const expenseAutomationTransactionsView = createSlice({
                 const transactionLocalData = recordGet(draft.transactionCategorizationView[selectedTab]
                     .transactionReviewLocalDataById, transactionId.id, undefined);
                 if (transactionLocalData != null) {
-                    const newLocalData = setEntityRecommendationForLineIdInLocalData(draft.transactionCategorizationView[selectedTab], transaction, transactionLocalData.transactionReviewLocalData, entity, lineIds, uncategorizedAccounts, action.payload.recommendationWithCOTByLineId, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled);
-                    // Release the per-line fetch flag for every line this fetch
-                    // covered. Done in-place on the freshly returned local data
-                    // (the helper produces a new mutable object), before we write
-                    // it back to the draft.
-                    lineIds.forEach((lineId) => {
-                        const lineItem = newLocalData.lineItemById[lineId];
-                        if (lineItem != null) {
-                            newLocalData.lineItemById[lineId] = {
-                                ...lineItem,
-                                categoryClassRecommendationsFetchState: {
-                                    fetchState: 'Completed',
-                                    error: undefined,
-                                },
-                            };
-                        }
-                    });
                     draft.transactionCategorizationView[selectedTab].transactionReviewLocalDataById[transaction.id] = {
                         transactionId: transaction.id,
-                        transactionReviewLocalData: newLocalData,
+                        transactionReviewLocalData: setEntityRecommendationForLineIdInLocalData(draft.transactionCategorizationView[selectedTab], transaction, transactionLocalData.transactionReviewLocalData, entity, lineIds, uncategorizedAccounts, action.payload.recommendationWithCOTByLineId, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled),
                     };
                     // Mark transaction as dirty (autofill happened)
                     if (!draft.transactionCategorizationView[selectedTab].transactionIdsWithUnsavedData.includes(transaction.id)) {
@@ -537,99 +523,6 @@ const expenseAutomationTransactionsView = createSlice({
                 }
             },
         },
-        // Start arm of the line-update recommendations fetch. Flips covered
-        // lines to In-Progress AND removes the transaction from
-        // selectedCheckBoxTransactionIds — the row is unchecked + disabled
-        // until either the success arm (recheck if limit allows) or the
-        // failure arm releases the per-line flag.
-        markCategoryClassRecommendationsInProgressForCategorization: {
-            reducer(draft, action) {
-                const { selectedTab, transactionId, lineIds } = action.payload;
-                const tab = draft.transactionCategorizationView[selectedTab];
-                const transactionLocalData = recordGet(tab.transactionReviewLocalDataById, transactionId.id, undefined);
-                if (transactionLocalData != null) {
-                    lineIds.forEach((lineId) => {
-                        const lineItem = transactionLocalData.transactionReviewLocalData.lineItemById[lineId];
-                        if (lineItem != null) {
-                            transactionLocalData.transactionReviewLocalData.lineItemById[lineId] = {
-                                ...lineItem,
-                                categoryClassRecommendationsFetchState: {
-                                    fetchState: 'In-Progress',
-                                    error: undefined,
-                                },
-                            };
-                        }
-                    });
-                }
-                // Uncheck on fetch start: the row's existing category/class are
-                // stale after a payee change, so we drop the auto-selection until
-                // fresh recommendations land.
-                if (tab.selectedCheckBoxTransactionIds.includes(transactionId.id)) {
-                    tab.selectedCheckBoxTransactionIds =
-                        tab.selectedCheckBoxTransactionIds.filter((id) => id !== transactionId.id);
-                }
-            },
-            prepare(selectedTab, transactionId, lineIds) {
-                return { payload: { selectedTab, transactionId, lineIds } };
-            },
-        },
-        // Completed arm. Used by the epic when the HTTP call succeeds but the
-        // server returned no per-line recommendations — we still need to
-        // release the In-Progress flag so the skeleton resolves. Successful
-        // responses with recommendations go through
-        // setEntityRecommendationForLineIdsForCategorization instead (which
-        // also flips the lines to Completed).
-        markCategoryClassRecommendationsCompletedForCategorization: {
-            reducer(draft, action) {
-                const { selectedTab, transactionId, lineIds } = action.payload;
-                const transactionLocalData = recordGet(draft.transactionCategorizationView[selectedTab]
-                    .transactionReviewLocalDataById, transactionId.id, undefined);
-                if (transactionLocalData != null) {
-                    lineIds.forEach((lineId) => {
-                        const lineItem = transactionLocalData.transactionReviewLocalData.lineItemById[lineId];
-                        if (lineItem != null) {
-                            transactionLocalData.transactionReviewLocalData.lineItemById[lineId] = {
-                                ...lineItem,
-                                categoryClassRecommendationsFetchState: {
-                                    fetchState: 'Completed',
-                                    error: undefined,
-                                },
-                            };
-                        }
-                    });
-                }
-            },
-            prepare(selectedTab, transactionId, lineIds) {
-                return { payload: { selectedTab, transactionId, lineIds } };
-            },
-        },
-        // Failure arm. Flips covered lines to Error so the skeleton resolves
-        // and downstream UI can react to the failure. The transaction stays
-        // unchecked from the start-arm action.
-        markCategoryClassRecommendationsFailureForCategorization: {
-            reducer(draft, action) {
-                const { selectedTab, transactionId, lineIds, error } = action.payload;
-                const transactionLocalData = recordGet(draft.transactionCategorizationView[selectedTab]
-                    .transactionReviewLocalDataById, transactionId.id, undefined);
-                if (transactionLocalData != null) {
-                    lineIds.forEach((lineId) => {
-                        const lineItem = transactionLocalData.transactionReviewLocalData.lineItemById[lineId];
-                        if (lineItem != null) {
-                            transactionLocalData.transactionReviewLocalData.lineItemById[lineId] = {
-                                ...lineItem,
-                                categoryClassRecommendationsFetchState: {
-                                    fetchState: 'Error',
-                                    error,
-                                },
-                            };
-                        }
-                    });
-                }
-            },
-            prepare(selectedTab, transactionId, lineIds, error) {
-                return { payload: { selectedTab, transactionId, lineIds, error } };
-            },
-        },
         fetchTransactionCategorizationSuccess(draft, action) {
             const { selectedTab, refreshViewInBackground } = action.payload;
             if (draft.transactionCategorizationView[selectedTab].fetchState ===
@@ -725,7 +618,9 @@ const expenseAutomationTransactionsView = createSlice({
                     .selectedCheckBoxTransactionIds;
                 if (newTransactionLocalData.customer != null &&
                     newTransactionLocalData.customer.id != null &&
-                    shouldAutoSelectAndAdd(selectedTransaction, newTransactionLocalData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
+                    checkIfAllLineItemsAreCategoryClassFilled(selectedTransaction, newTransactionLocalData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) === true && // check if all line items are filled
+                    selectedCheckBoxTransactionIds.length < MAX_SELECTION_LIMIT &&
+                    selectedCheckBoxTransactionIds.includes(transactionId) === false) {
                     draft.transactionCategorizationView[selectedTab].selectedCheckBoxTransactionIds = [
                         ...selectedCheckBoxTransactionIds,
                         transactionId,
@@ -799,7 +694,9 @@ const expenseAutomationTransactionsView = createSlice({
                     .selectedCheckBoxTransactionIds;
                 if (newTransactionLocalData.vendor != null &&
                     newTransactionLocalData.vendor.id != null &&
-                    shouldAutoSelectAndAdd(selectedTransaction, newTransactionLocalData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
+                    checkIfAllLineItemsAreCategoryClassFilled(selectedTransaction, newTransactionLocalData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) === true && // check if all line items are filled
+                    selectedCheckBoxTransactionIds.length < MAX_SELECTION_LIMIT &&
+                    selectedCheckBoxTransactionIds.includes(transactionId) === false) {
                     draft.transactionCategorizationView[selectedTab].selectedCheckBoxTransactionIds = [
                         ...selectedCheckBoxTransactionIds,
                         transactionId,
@@ -1032,5 +929,5 @@ const expenseAutomationTransactionsView = createSlice({
         },
     },
 });
-export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationCompletedSubTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, updateParentTotalCountForTab, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, markCategoryClassRecommendationsInProgressForCategorization, markCategoryClassRecommendationsCompletedForCategorization, markCategoryClassRecommendationsFailureForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
+export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationCompletedSubTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, updateParentTotalCountForTab, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
 export default expenseAutomationTransactionsView.reducer;

package/lib/esm/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -224,6 +224,8 @@ export function getExpenseAutomationMissingReceiptsView(state) {
             manualSearchUiResetKey: bulkUpload.manualSearchUiResetKey,
             hasMoreBatchDetails,
             batchDetailsPaginationState: bulkUpload.batchDetailsPaginationState,
+            batchDetailsRevalidating: bulkUpload.batchDetailsRevalidating,
+            initialBatchDetailsLoaded: bulkUpload.initialBatchDetailsLoaded,
             manualSearch: {
                 ...bulkUpload.manualSearch,
                 results: manualSearchResults,