@zeniai/client-epic-state 5.0.72 → 5.0.74

package/lib/esm/view/aiAccountantView/epics/fetchAiAccountantCustomersEpic.js

@@ -7,9 +7,7 @@ import { fetchAiAccountantCustomers, updateAiAccountantCustomers, updateAiAccoun
 export const fetchAiAccountantCustomersEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchAiAccountantCustomers.match), switchMap(() => {
     const base = `${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/cockpit-panels`;
     const url = `${base}/ai-accountant/customers`;
-    return zeniAPI
-        .getJSON(url)
-        .pipe(mergeMap((response) => {
+    return zeniAPI.getJSON(url).pipe(mergeMap((response) => {
         if (isSuccessResponse(response)) {
             const customers = response.data?.customers ?? [];
             const users = response.data?.users ?? [];
@@ -22,6 +20,5 @@ export const fetchAiAccountantCustomersEpic = (actions$, _, zeniAPI) => actions$
         else {
             return of(updateAiAccountantCustomersFailure(response.status));
         }
-    }), catchError((error) => of(updateAiAccountantCustomersFailure(createZeniAPIStatus('Unexpected error', 'AI Accountant customers fetch failed: ' +
-        JSON.stringify(error))))));
+    }), catchError((error) => of(updateAiAccountantCustomersFailure(createZeniAPIStatus('Unexpected error', 'AI Accountant customers fetch failed: ' + JSON.stringify(error))))));
 }));

package/lib/esm/view/aiAccountantView/epics/fetchAiAccountantJobsEpic.js

@@ -20,9 +20,7 @@ export const fetchAiAccountantJobsEpic = (actions$, state$, zeniAPI) => actions$
     }
     const base = `${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/cockpit-panels`;
     const url = `${base}/ai-accountant/jobs?${params.toString()}`;
-    return zeniAPI
-        .getJSON(url)
-        .pipe(mergeMap((response) => {
+    return zeniAPI.getJSON(url).pipe(mergeMap((response) => {
         if (isSuccessResponse(response)) {
             const jobs = response.data?.jobs ?? [];
             const users = response.data?.users ?? [];
@@ -41,7 +39,6 @@ export const fetchAiAccountantJobsEpic = (actions$, state$, zeniAPI) => actions$
         }
     }), catchError((error) => of(updateAiAccountantJobsFailure({
         tenantId,
-        error: createZeniAPIStatus('Unexpected error', 'AI Accountant jobs fetch failed: ' +
-            JSON.stringify(error)),
+        error: createZeniAPIStatus('Unexpected error', 'AI Accountant jobs fetch failed: ' + JSON.stringify(error)),
     }))));
 }));

package/lib/esm/view/aiAccountantView/epics/triggerAiAccountantJobEpic.js

@@ -51,7 +51,10 @@ export const triggerAiAccountantJobEpic = (actions$, state$, zeniAPI) => actions
             messageText: 'failed',
             type: 'error',
             variables: [
-                { variableName: '__reason__', variableValue: 'Unexpected error' },
+                {
+                    variableName: '__reason__',
+                    variableValue: 'Unexpected error',
+                },
             ],
         }),
     ])));

package/lib/esm/view/companyHealthMetricView/companyHealthMetricViewSelector.js

@@ -291,7 +291,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/companyTaskManagerView/companyTaskManagerViewSelector.js

@@ -4,7 +4,7 @@ import { getTagsByIds } from '../../entity/tag/tagSelector';
 import { getTaskById } from '../../entity/task/taskSelector';
 import { getUserByUserId, getUsersByUserIds, } from '../../entity/user/userSelector';
 export const getCompanyTaskManagerView = createSelector((state) => state.companyTaskManagerViewState, (state) => state.companyState, (state) => state.userState, (state) => state.taskState, (state) => state.tagState, (companyTaskManagerViewState, companyState, userState, taskState, tagState) => {
-    const { taskIds, uiState, fetchState, error, totalTaskCount, metrics, metricsFetchState } = companyTaskManagerViewState;
+    const { taskIds, uiState, fetchState, error, totalTaskCount, metrics, metricsFetchState, } = companyTaskManagerViewState;
     const tasksList = [];
     taskIds.forEach((taskId) => {
         const task = getTaskById(taskState, taskId);

package/lib/esm/view/companyTaskManagerView/epics/fetchTaskManagerMetricsEpic.js

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
-import { isSuccessResponse, } from '../../../responsePayload';
+import { isSuccessResponse } from '../../../responsePayload';
 import { fetchTaskManagerMetrics, updateTaskManagerMetrics, updateTaskManagerMetricsOnFailure, } from '../companyTaskManagerViewReducer';
 export const fetchTaskManagerMetricsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchTaskManagerMetrics.match), switchMap(() => {
     const query = JSON.stringify({ is_filter_by_logged_in_user: true });

package/lib/esm/view/companyView/helpers/cockpitHelpers.js

@@ -48,7 +48,7 @@ export const filterCompanyOnCategoriesWithSingleValue = (categoryValue, currentF
         return filterCompanyOnRangeCategoryType(categoryValue, currentFilter);
     }
     // if filter category is not annualRecurringRevenue OR monthlyRecurringRevenue
-    if (currentFilter.matchingOperator === 'not-equal') {
+    if (currentFilter.matchingOperator === 'not_equal') {
         return currentFilter.values.indexOf(categoryValue) === -1;
     }
     return currentFilter.values.indexOf(categoryValue) > -1;

package/lib/esm/view/companyView/selector/companyManagementViewSelector.js

@@ -150,7 +150,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/companyView/selector/companyPortfolioViewSelector.js

@@ -116,7 +116,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/expenseAutomationView/epics/missingReceipts/fetchBulkUploadBatchesEpic.js

@@ -3,10 +3,10 @@ import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { toBatchListItem, } from '../../payload/missingReceiptsPayload';
-import { fetchBulkUploadBatches, fetchBulkUploadBatchesFailure, fetchBulkUploadBatchesSuccess, } from '../../reducers/missingReceiptsViewReducer';
 import { BULK_UPLOAD_BATCH_LIST_DATE_RANGE_DAYS } from '../../helpers/bulkUploadTiming';
 import { rollingCalendarDateRangeInclusive } from '../../helpers/rollingCalendarDateRangeInclusive';
+import { toBatchListItem, } from '../../payload/missingReceiptsPayload';
+import { fetchBulkUploadBatches, fetchBulkUploadBatchesFailure, fetchBulkUploadBatchesSuccess, } from '../../reducers/missingReceiptsViewReducer';
 export const fetchBulkUploadBatchesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatches.match), switchMap((action) => {
     const { cacheOverride } = action.payload;
     const state = state$.value;

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

@@ -5,6 +5,7 @@ import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { fetchCompletedTransactions, fetchCompletedTransactionsFailure, fetchCompletedTransactionsSuccess, getCompletedTransactionsCacheKey, } from '../../reducers/missingReceiptsViewReducer';
+import { DEFAULT_COMPLETED_SUB_TAB } from '../../types/completedSubTab';
 export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchCompletedTransactions.match), switchMap((action) => {
     const state = state$.value;
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload }, } = state;
@@ -39,7 +40,7 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     if (sortOrder != null) {
         queryPayload.sort_order = sortOrder === 'ascending' ? 'asc' : 'desc';
     }
-    if (completedSubTab !== 'all') {
+    if (completedSubTab !== DEFAULT_COMPLETED_SUB_TAB) {
         queryPayload.match_type = completedSubTab;
     }
     const encodedQuery = encodeURIComponent(JSON.stringify(queryPayload));

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

@@ -1,12 +1,12 @@
 import { EMPTY, concat, from, of } from 'rxjs';
 import { catchError, concatMap, filter, mergeMap, take } from 'rxjs/operators';
+import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { isSuccessResponse } from '../../../../responsePayload';
-import { isBatchDetailsStatusPendingOrProcessing, toBatchListItem, } from '../../payload/missingReceiptsPayload';
-import { fetchBulkUploadBatchesSuccess, restoreBulkUploadAutomatchingOnMount, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
 import { BULK_UPLOAD_BATCH_LIST_DATE_RANGE_DAYS } from '../../helpers/bulkUploadTiming';
 import { rollingCalendarDateRangeInclusive } from '../../helpers/rollingCalendarDateRangeInclusive';
-import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
-import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { isBatchDetailsStatusPendingOrProcessing, toBatchListItem, } from '../../payload/missingReceiptsPayload';
+import { fetchBulkUploadBatchesSuccess, restoreBulkUploadAutomatchingOnMount, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
 /**
  * On missing-receipts entry / period switch, hydrate the automatching banner for the logged-in
  * user without relying on UI-driven list fetches (the Missing tab does not fetch the batch list
@@ -49,10 +49,12 @@ export const restoreBulkUploadAutomatchingOnMountEpic = (actions$, state$, zeniA
         bulkUpload.batchListFetchState.fetchState === 'Completed';
     const listSource = alreadyCached
         ? of(null)
-        : zeniAPI.getJSON(listUrl).pipe(catchError(() => of(null)));
+        : zeniAPI
+            .getJSON(listUrl)
+            .pipe(catchError(() => of(null)));
     return listSource.pipe(mergeMap((listResponse) => {
         const batchList = alreadyCached
-            ? bulkUpload.batchListByPeriod[periodId] ?? []
+            ? (bulkUpload.batchListByPeriod[periodId] ?? [])
             : listResponse != null &&
                 isSuccessResponse(listResponse) &&
                 listResponse.data != null

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

@@ -2,10 +2,11 @@ import { EMPTY, from, merge, of } from 'rxjs';
 import { catchError, debounceTime, filter, mergeMap, switchMap, } from 'rxjs/operators';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { rollingCalendarDateRangeInclusive } from '../../helpers/rollingCalendarDateRangeInclusive';
 import { supportedTransactionPayloadToManualSearchResult } from '../../payload/missingReceiptsPayload';
 import { searchTransactionsForManualMatch, searchTransactionsForManualMatchFailure, searchTransactionsForManualMatchSuccess, } from '../../reducers/missingReceiptsViewReducer';
+import { DEFAULT_COMPLETED_SUB_TAB } from '../../types/completedSubTab';
 import { toTransactionsSortKey } from '../../types/transactionsViewState';
-import { rollingCalendarDateRangeInclusive } from '../../helpers/rollingCalendarDateRangeInclusive';
 /**
  * `auto_categorized` for manual transaction search (Unmatched).
  * Backend contract TBD — align with `fetchTransactionCategorizationEpic` (`selectedTab === 'autoCategorized'`)
@@ -46,6 +47,11 @@ export const searchTransactionsForManualMatchEpic = (actions$, state$, zeniAPI)
             page_token: pageToken ?? null,
             page_size: manualSearch.pageSize,
             search_text: query,
+            // Manual search ignores the Completed sub-tab axis — always span the
+            // default sentinel so the receipt-matching UX returns results
+            // regardless of where the transaction would otherwise be bucketed on
+            // the Completed tab.
+            sub_tab: DEFAULT_COMPLETED_SUB_TAB,
         };
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationEpic.js

@@ -5,7 +5,8 @@ import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { getLineItemsByTransactionsIdsFromResponse } from '../../helpers/transactionCategorizationLocalDataHelper';
-import { fetchTransactionCategorization, fetchTransactionCategorizationFailure, fetchTransactionCategorizationSuccess, initializeTransactionCategorizationViewLocalData, resetOtherTabsFetchState, updateTotalCountForTransactionCategorization, updateTransactionCategorizationUIState, } from '../../reducers/transactionsViewReducer';
+import { fetchTransactionCategorization, fetchTransactionCategorizationFailure, fetchTransactionCategorizationSuccess, initializeTransactionCategorizationViewLocalData, resetOtherTabsFetchState, updateParentTotalCountForTab, updateTotalCountForTransactionCategorization, updateTransactionCategorizationUIState, } from '../../reducers/transactionsViewReducer';
+import { DEFAULT_COMPLETED_SUB_TAB } from '../../types/completedSubTab';
 import { TRANSACTIONS_TABS, toTransactionsSortKey, } from '../../types/transactionsViewState';
 export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchTransactionCategorization.match), switchMap((action) => {
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationTransactionsViewState, } = state$.value;
@@ -23,6 +24,9 @@ export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) =>
         page_token: pageToken,
         page_size: 25,
         search_text: uiState.searchString,
+        sub_tab: selectedTab === 'autoCategorized'
+            ? expenseAutomationTransactionsViewState.selectedTransactionCategorizationCompletedSubTab
+            : DEFAULT_COMPLETED_SUB_TAB,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
@@ -45,6 +49,12 @@ export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) =>
                 selectedTab,
                 totalCount: response.data.total_count,
             }));
+            updateActions.push(updateParentTotalCountForTab({
+                selectedPeriod,
+                selectedTab,
+                parentTotalCount: response.data.parent_tab_total_count ??
+                    response.data.total_count,
+            }));
             updateActions.push(resetOtherTabsFetchState({
                 refreshViewInBackground,
                 tabs: TRANSACTIONS_TABS.filter((tab) => selectedTab !== tab),

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

@@ -1,5 +1,6 @@
 import { createAction, createSlice } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { DEFAULT_COMPLETED_SUB_TAB, } from '../types/completedSubTab';
 import { MIN_MANUAL_TRANSACTION_SEARCH_LENGTH, } from '../types/missingReceiptsViewState';
 export const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => {
     const sortKeyPart = sortKey ?? 'none';
@@ -12,7 +13,7 @@ export const initialBulkUploadState = {
     batchListByPeriod: {},
     batchListFetchState: { fetchState: 'Not-Started', error: undefined },
     batchStatusById: {},
-    completedSubTab: 'all',
+    completedSubTab: DEFAULT_COMPLETED_SUB_TAB,
     completedTransactionsByPeriod: {},
     confirmMatchStatus: { fetchState: 'Not-Started', error: undefined },
     currentBatchId: undefined,

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

@@ -4,6 +4,7 @@ import uniq from 'lodash/uniq';
 import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { isVendorTransaction } from '../../../entity/transaction/stateTypes/vendorTransaction';
 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: {
         fetchState: 'Not-Started',
@@ -27,6 +28,10 @@ export const initialTransactionTabViewState = {
         totalCount: {},
         limit: 10,
     },
+    filters: {
+        categoryCombinationOperator: 'AND',
+        categories: [],
+    },
     fetchState: 'Not-Started',
     error: undefined,
     hasValidState() {
@@ -41,12 +46,74 @@ export const initialTransactionTabViewState = {
     selectedTransactionLineId: undefined,
 };
 export const initialState = {
+    autoCategorizedSubTabCache: {},
+    parentTotalCountByTab: {
+        review: {},
+        autoCategorized: {},
+    },
     selectedTransactionCategorizationTab: 'review',
+    selectedTransactionCategorizationCompletedSubTab: DEFAULT_COMPLETED_SUB_TAB,
     transactionCategorizationView: {
         review: { ...initialTransactionTabViewState },
         autoCategorized: { ...initialTransactionTabViewState },
     },
 };
+/**
+ * Capture the autoCategorized tab's current paginated dataset for a sub-tab.
+ * The mid-flight `'In-Progress'` state is normalised to `'Completed'` because
+ * the in-flight request is cancelled by `switchMap` in the fetch epic when the
+ * sub-tab changes — restoring `'In-Progress'` later would leave the UI stuck
+ * showing a phantom loading state with no fetch actually running. Length-zero
+ * datasets degrade to `'Not-Started'` so the next visit triggers a fresh
+ * fetch from page 1 instead of short-circuiting on stale empty caches.
+ *
+ * Snapshot scope (deliberately narrow):
+ * - Captured: `pageToken`, `totalCount`, `transactionIdsBySelectedPeriod`,
+ *   `fetchState`, `error`, `scrollPosition`. The first five are the keys the
+ *   fetch epic's cache check reads to decide whether to short-circuit a
+ *   sub-tab revisit; `scrollPosition` is captured per sub-tab so revisiting
+ *   restores the user's last offset and switching to a never-visited sub-tab
+ *   starts at the top instead of inheriting the outgoing sub-tab's offset
+ *   (which would land the user at a meaningless row index against a
+ *   completely different list).
+ * - Intentionally NOT captured (left in place on `autoCat` and inherited by
+ *   the incoming sub-tab):
+ *     - `uiState.searchString`, `uiState.sortKey`, `uiState.sortOrder`,
+ *       `uiState.nodeCollapseState`, `uiState.limit` — search and sort are
+ *       user-applied preferences that persist across sub-tabs by design (a
+ *       search query stays active when the user toggles between Manual / AI
+ *       Accountant).
+ *     - `selectedCheckBoxTransactionIds` — selection state is intentionally
+ *       cleared at the action source (the fetch epic / save flow), not
+ *       by the snapshot path. Carrying selection across sub-tabs is safe
+ *       because every sub-tab change goes through a fetch round-trip that
+ *       reconciles selection against the new row IDs.
+ *     - `transactionReviewLocalDataById`, `transactionIdsWithUnsavedData`,
+ *       `uploadReceiptStatusById`, `saveStatus`, `refreshStatus`,
+ *       `markAsNotMiscategorizedStatus` — these are per-row / per-flight
+ *       caches that are write-through global state, not sub-tab-scoped.
+ *
+ * If the contract changes (e.g. selection should reset on every sub-tab
+ * switch), update both this comment and the snapshot return shape together.
+ */
+function snapshotAutoCategorizedTab(autoCat) {
+    const transactionIdsBySelectedPeriod = {
+        ...autoCat.transactionIdsBySelectedPeriod,
+    };
+    const hasAnyLoadedRows = Object.values(transactionIdsBySelectedPeriod).some((ids) => ids.length > 0);
+    let normalisedFetchState = autoCat.fetchState;
+    if (normalisedFetchState === 'In-Progress') {
+        normalisedFetchState = hasAnyLoadedRows ? 'Completed' : 'Not-Started';
+    }
+    return {
+        error: autoCat.error,
+        fetchState: normalisedFetchState,
+        pageToken: autoCat.uiState.pageToken,
+        scrollPosition: autoCat.uiState.scrollPosition,
+        totalCount: { ...autoCat.uiState.totalCount },
+        transactionIdsBySelectedPeriod,
+    };
+}
 const expenseAutomationTransactionsView = createSlice({
     name: 'expenseAutomationTransactionsView',
     initialState,
@@ -236,6 +303,12 @@ const expenseAutomationTransactionsView = createSlice({
                     uiState.totalCount;
             }
         },
+        updateTransactionFilters(draft, action) {
+            const { selectedTab, filters } = action.payload;
+            // `filters` is non-nullable per the payload type, so no runtime
+            // null-check is needed — dropping it removes a dead defensive branch.
+            draft.transactionCategorizationView[selectedTab].filters = filters;
+        },
         saveTransactionCategorization: {
             prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
                 return {
@@ -260,6 +333,55 @@ const expenseAutomationTransactionsView = createSlice({
                 return { payload: { newSelectedTab } };
             },
         },
+        updateTransactionCategorizationCompletedSubTab: {
+            reducer(draft, action) {
+                const { newSubTab } = action.payload;
+                const previousSubTab = draft.selectedTransactionCategorizationCompletedSubTab;
+                if (previousSubTab === newSubTab) {
+                    return;
+                }
+                const autoCat = draft.transactionCategorizationView.autoCategorized;
+                // Snapshot the outgoing sub-tab so a future revisit can short-circuit
+                // the fetch epic (mirrors the parent-tab "don't refetch what's
+                // already cached" behaviour). Period-scoped data is preserved as-is
+                // because the snapshot itself is keyed only by sub-tab; the active
+                // tab's per-period maps remain the source of truth while live.
+                draft.autoCategorizedSubTabCache[previousSubTab] =
+                    snapshotAutoCategorizedTab(autoCat);
+                const cached = draft.autoCategorizedSubTabCache[newSubTab];
+                if (cached != null) {
+                    autoCat.uiState.pageToken = cached.pageToken;
+                    autoCat.uiState.totalCount = { ...cached.totalCount };
+                    autoCat.uiState.scrollPosition = cached.scrollPosition;
+                    autoCat.transactionIdsBySelectedPeriod = {
+                        ...cached.transactionIdsBySelectedPeriod,
+                    };
+                    autoCat.fetchState = cached.fetchState;
+                    autoCat.error = cached.error;
+                }
+                else {
+                    // Sub-tab has never been visited — clear the active slot so the
+                    // view-epic's `fetchState === 'Not-Started' || transactionIds.length
+                    // === 0` cache check falls through and triggers a fresh page-1
+                    // fetch for the new dataset. `scrollPosition` is reset to the top
+                    // so the incoming list isn't anchored to the outgoing sub-tab's
+                    // offset (different rows → previous offset is meaningless).
+                    autoCat.uiState.pageToken = null;
+                    autoCat.uiState.totalCount = {};
+                    autoCat.uiState.scrollPosition = {
+                        scrollTop: 0,
+                        scrollLeft: undefined,
+                    };
+                    autoCat.transactionIdsBySelectedPeriod = {};
+                    autoCat.fetchState = 'Not-Started';
+                    autoCat.error = undefined;
+                }
+                draft.selectedTransactionCategorizationCompletedSubTab = newSubTab;
+            },
+            prepare(newSubTab) {
+                return { payload: { newSubTab } };
+            },
+        },
         updateTransactionCategorization: {
             reducer(draft, action) {
                 const selectedTab = action.payload.selectedTab;
@@ -697,6 +819,10 @@ const expenseAutomationTransactionsView = createSlice({
             const { selectedTab, selectedPeriod, totalCount } = action.payload;
             draft.transactionCategorizationView[selectedTab].uiState.totalCount[toMonthYearPeriodId(selectedPeriod)] = totalCount;
         },
+        updateParentTotalCountForTab(draft, action) {
+            const { selectedTab, selectedPeriod, parentTotalCount } = action.payload;
+            draft.parentTotalCountByTab[selectedTab][toMonthYearPeriodId(selectedPeriod)] = parentTotalCount;
+        },
         updateSelectedCheckboxTransactionIds(draft, action) {
             const selectedTab = action.payload.selectedTab;
             const transactionIds = action.payload.transactionIds;
@@ -707,6 +833,16 @@ const expenseAutomationTransactionsView = createSlice({
             draft.transactionCategorizationView[selectedTab] = {
                 ...initialTransactionTabViewState,
             };
+            draft.parentTotalCountByTab[selectedTab] = {};
+            // The per-sub-tab snapshot cache lives at the slice root and is
+            // exclusively populated by the autoCategorized tab's sub-tab switching
+            // (see updateTransactionCategorizationCompletedSubTab). When that tab
+            // is reset, leaving stale snapshots behind would short-circuit the
+            // next sub-tab visit with phantom row IDs / page tokens that no longer
+            // correspond to anything in state — drop them in lockstep.
+            if (selectedTab === 'autoCategorized') {
+                draft.autoCategorizedSubTabCache = {};
+            }
         },
         clearExpenseAutomationTransactionsView(draft) {
             Object.assign(draft, initialState);
@@ -803,5 +939,5 @@ const expenseAutomationTransactionsView = createSlice({
         },
     },
 });
-export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, fetchTransactionCategorizationFailure, saveTransactionCategorization, updateTransactionCategorization, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationSaveStatus, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateSelectedVendorForTransaction, updateSelectedCustomerForTransaction, setAllItemsToCategoryClassInLocalDataForCategorization, updateTotalCountForTransactionCategorization, fetchTransactionCategorizationSuccess, resetOtherTabsFetchState, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
+export const { fetchTransactionCategorization, updateTransactionCategorizationUIState, updateTransactionFilters, 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/transactionCategorizationSelector.js

@@ -4,14 +4,33 @@ import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, } from '../../../entity/tenant/tenantSelector';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
 import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
+import { applyTransactionFilters, } from '../transactionFilterHelpers';
 import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { getProjectList } from '../../projectList/projectListSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
+export const toTransactionView = (transaction, transactionLocalData) => {
+    return {
+        id: transaction.id,
+        date: transaction.date,
+        amount: transaction.amount,
+        vendorName: transaction.vendorName,
+        customerName: transaction.customerName,
+        vendorId: transaction.vendorId,
+        customerId: transaction.customerId,
+        description: transaction.description,
+        memo: transaction.memo,
+        type: transaction.type,
+        typeName: transaction.typeName,
+        createTime: transaction.createTime,
+        transaction: transaction,
+        transactionLocalData,
+    };
+};
 export function getExpenseAutomationTransactionView(state) {
     const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
-    const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { selectedTransactionCategorizationCompletedSubTab, selectedTransactionCategorizationTab, } = expenseAutomationTransactionsViewState;
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = getUncategorizedAccounts(accountState, accountListState, 'accountList');
     const accountList = getAccountList(accountState, accountListState, 'accountList');
     const classList = getClassList(classState, classListState);
@@ -30,20 +49,58 @@ export function getExpenseAutomationTransactionView(state) {
         ? transactionIdsBySelectedPeriod[monthYearPeriodId]
         : null;
     const transactionIds = transactionIdsForSelectedPeriod ?? [];
-    const transactionLocalData = transactionIds
-        .map((transactionId) => {
+    const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
+    const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
+    const transactionLocalDataMap = new Map();
+    transactionIds.forEach((transactionId) => {
         const transactionData = transactionReviewLocalDataById[transactionId];
         if (transactionData != null) {
-            return {
+            transactionLocalDataMap.set(transactionId, {
                 transactionId,
                 transactionReviewLocalData: transactionData.transactionReviewLocalData,
-            };
+            });
         }
-        return null;
-    })
-        .filter((transaction) => transaction != null);
-    const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
-    const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
+    });
+    // Step 2: Convert to TransactionView and apply advanced filters
+    const transactionViews = transactionsWithCOT.map((transaction) => {
+        const localData = transactionLocalDataMap.get(transaction.id);
+        return toTransactionView(transaction, localData);
+    });
+    // Apply TC-specific filters (lives under expenseAutomationView, independent
+    // of the Spend Management filter pipeline).
+    const filteredTransactionViews = applyTransactionFilters(transactionViews, filters);
+    // Convert back to TransactionWithCOT for return
+    const filteredTransactionsWithCOT = filteredTransactionViews.map((view) => view.transaction);
+    // Get transactionLocalData for filtered transactions
+    // Also include transactionLocalData for transactions that don't exist in transactionState
+    // but have local data (to match original behavior)
+    const filteredTransactionIds = new Set(filteredTransactionViews.map((view) => view.id));
+    // Pre-compute the membership set once. The previous implementation called
+    // `transactions.some(t => t.id === transactionId)` inside the per-id loop,
+    // turning the pipeline into O(n × m) — measurable on tenants with large
+    // transaction lists since this selector runs on every Redux dispatch.
+    const transactionExistsById = new Set(transactions.map((t) => t.id));
+    // `.flatMap` returns `X[]` directly when the callback returns `[]` for the
+    // skip case, so we don't need the trailing `.filter((d): d is X => …)` type
+    // predicate that the previous `map → filter` pipeline required.
+    const filteredTransactionLocalData = transactionIds.flatMap((transactionId) => {
+        const transactionData = transactionReviewLocalDataById[transactionId];
+        if (transactionData == null) {
+            return [];
+        }
+        // Include if transaction is in filtered results, or if transaction doesn't exist in state
+        // (to maintain backward compatibility with tests)
+        const transactionExists = transactionExistsById.has(transactionId);
+        if (filteredTransactionIds.has(transactionId) || !transactionExists) {
+            return [
+                {
+                    transactionId,
+                    transactionReviewLocalData: transactionData.transactionReviewLocalData,
+                },
+            ];
+        }
+        return [];
+    });
     const monthEndFetchState = monthYearPeriodId != null
         ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
         : { fetchState: 'Not-Started', error: undefined };
@@ -63,10 +120,27 @@ export function getExpenseAutomationTransactionView(state) {
         .uiState.totalCount;
     const totalCountByAutoCat = expenseAutomationTransactionsViewState.transactionCategorizationView
         .autoCategorized.uiState.totalCount;
+    // Per-(sub-)tab counts powering pagination, in-list "showing X of Y", and
+    // any save/refresh round-trips. Sourced from `uiState.totalCount` which
+    // mirrors the response's `total_count` for whatever tab/sub-tab the user is
+    // viewing (e.g. only the Manual sub-tab rows for Completed → Manual).
     const totalCountByTab = {
         review: monthYearPeriodId != null ? totalCountByReview[monthYearPeriodId] : 0,
         autoCategorized: monthYearPeriodId != null ? totalCountByAutoCat[monthYearPeriodId] : 0,
     };
+    // Parent-tab badge counts. Sourced from `parent_tab_total_count` in the
+    // listing response and used exclusively by the navbar / tab strip badges.
+    // Independent of which Completed sub-tab is active so the badge stays
+    // stable across sub-tab switches.
+    const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
+    const parentTabTotalCountByTab = {
+        review: monthYearPeriodId != null
+            ? (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
+            : 0,
+        autoCategorized: monthYearPeriodId != null
+            ? (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
+            : 0,
+    };
     const fetchStateByTab = {
         review: {
             fetchState: expenseAutomationTransactionsViewState.transactionCategorizationView
@@ -90,7 +164,7 @@ export function getExpenseAutomationTransactionView(state) {
         version: 0,
         fetchState: fetchStatus.fetchState,
         error: fetchStatus.error,
-        transactions: transactionsWithCOT,
+        transactions: filteredTransactionsWithCOT,
         selectedCheckBoxTransactionIds,
         transactionIdsWithUnsavedData,
         uncategorizedAccounts: uncategorizedIncomeExpense,
@@ -101,16 +175,18 @@ export function getExpenseAutomationTransactionView(state) {
         classHierarchyList,
         isAccountingProjectsEnabled,
         projectList,
-        transactionLocalData,
+        transactionLocalData: filteredTransactionLocalData,
         uiState,
         refreshStatus,
         saveStatus,
         markAsNotMiscategorizedStatus,
         completionStatus,
         totalCountByTab,
+        parentTabTotalCountByTab,
         fetchStateByTransactionTabs: fetchStateByTab,
         uploadReceiptStatusById,
         selectedTransactionId,
         selectedTransactionLineId,
+        selectedTransactionCategorizationCompletedSubTab,
     };
 }