@zeniai/client-epic-state 5.1.17 → 5.1.18-betaRD1

package/lib/entity/customer/customerPayload.d.ts

@@ -1,11 +1,17 @@
 import { URLPayload } from '../../commonPayloadTypes/urlPayload';
 import { Customer, CustomerBase } from './customerState';
 export interface CustomerBasePayload {
-    customer_id: string;
+    customer_id: string | null;
     customer_name: string;
     logo?: URLPayload;
     qbo_id?: string;
 }
+/**
+ * Resolves the effective customer identifier from a payload.
+ * For JE/Deposit transactions, customer_id is null at runtime — qbo_id is the
+ * actual identity.
+ */
+export declare const getCustomerPayloadIdentifier: (customer: CustomerBasePayload) => string | null;
 export declare const toCustomerBase: (payload: CustomerBasePayload, parseOutParentName: boolean) => CustomerBase;
 export declare const toCustomerBasePayload: (customer: CustomerBase | undefined, customerUpdates?: CustomerBase) => CustomerBasePayload;
 export interface CustomerPayload extends CustomerBasePayload {

package/lib/entity/customer/customerPayload.js

@@ -1,16 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toCustomer = exports.toCustomerBasePayload = exports.toCustomerBase = void 0;
+exports.toCustomer = exports.toCustomerBasePayload = exports.toCustomerBase = exports.getCustomerPayloadIdentifier = void 0;
 const urlPayload_1 = require("../../commonPayloadTypes/urlPayload");
 const zeniDayJS_1 = require("../../zeniDayJS");
-const toCustomerBase = (payload, parseOutParentName) => ({
-    id: payload.customer_id,
-    name: parseOutParentName
-        ? removeParentName(payload.customer_name)
-        : payload.customer_name,
-    qboId: payload.qbo_id,
-    logo: payload.logo != null ? (0, urlPayload_1.toURL)(payload.logo) : undefined,
-});
+/**
+ * Resolves the effective customer identifier from a payload.
+ * For JE/Deposit transactions, customer_id is null at runtime — qbo_id is the
+ * actual identity.
+ */
+const getCustomerPayloadIdentifier = (customer) => {
+    const cid = customer.customer_id;
+    if (cid != null && cid !== '') {
+        return cid;
+    }
+    const qid = customer.qbo_id;
+    if (qid != null && qid !== '') {
+        return qid;
+    }
+    return null;
+};
+exports.getCustomerPayloadIdentifier = getCustomerPayloadIdentifier;
+const toCustomerBase = (payload, parseOutParentName) => {
+    const id = (0, exports.getCustomerPayloadIdentifier)(payload);
+    if (id == null) {
+        throw new Error(`toCustomerBase: no identifier (customer_id/qbo_id) found for customer "${payload.customer_name}".`);
+    }
+    return {
+        id,
+        name: parseOutParentName
+            ? removeParentName(payload.customer_name)
+            : payload.customer_name,
+        qboId: payload.qbo_id,
+        logo: payload.logo != null ? (0, urlPayload_1.toURL)(payload.logo) : undefined,
+    };
+};
 exports.toCustomerBase = toCustomerBase;
 const toCustomerBasePayload = (customer, customerUpdates) => {
     if (customerUpdates != null && customerUpdates.id != null) {

package/lib/entity/reimbursement/reimbursementPayload.js

@@ -184,7 +184,8 @@ const toLineDetail = (payload) => ({
     account: payload.account?.account_id != null
         ? (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(payload.account)
         : undefined,
-    customer: payload.customer?.customer_id != null
+    customer: payload.customer != null &&
+        (0, customerPayload_1.getCustomerPayloadIdentifier)(payload.customer) != null
         ? (0, customerPayload_1.toCustomerBase)(payload.customer, false)
         : undefined,
 });

package/lib/entity/transaction/payloadTypes/customerTransactionPayload.js

@@ -12,7 +12,9 @@ const toCustomerTransaction = (payload) => {
     const transaction = (0, transactionPayload_1.toTransaction)(payload);
     return {
         ...transaction,
-        customer: payload.customer_id != null ? (0, customerPayload_1.toCustomerBase)(payload, false) : undefined,
+        customer: Boolean(payload.customer_id) === true
+            ? (0, customerPayload_1.toCustomerBase)(payload, false)
+            : undefined,
         documentId: payload.document_id,
         paymentType: (0, paymentType_1.toPaymentTypeStrict)(payload.payment_type),
         paymentTypeName: payload.payment_type_name,

package/lib/entity/transaction/payloadTypes/transactionLinePayload.js

@@ -39,7 +39,7 @@ const toTransactionWithAccountAndClassLine = (payload, currency, type = 'transac
     class: (0, classPayload_1.mapClassBasePayloadToClassBase)(payload.line_detail.class ?? {}), // Note: why bother about empty {} object ? because sometimes backend sends empty objects, sometimes it sends undefined or null
     account: (0, accountPayload_1.mapAccountBasePayloadToAccountBase)(payload.line_detail.account),
     customer: payload.line_detail.customer != null &&
-        payload.line_detail.customer.customer_id != null
+        (0, customerPayload_1.getCustomerPayloadIdentifier)(payload.line_detail.customer) != null
         ? (0, customerPayload_1.toCustomerBase)(payload.line_detail.customer, false)
         : undefined,
     vendor: payload.line_detail.vendor != null &&

package/lib/entity/transaction/payloadTypes/vendorTransactionPayload.d.ts

@@ -12,7 +12,7 @@ export interface VendorTransactionPayload extends VendorBasePayload, Omit<Transa
     payment_type_name?: string;
 }
 export interface VendorTransactionWithCustomerPayload extends VendorTransactionPayload {
-    customer_id: string;
+    customer_id: string | null;
     customer_name: string;
 }
 export declare const isVendorTransactionPayload: (payload: TransactionPayload) => boolean;

package/lib/entity/transactionActivityLog/transactionActivityLogPayload.js

@@ -18,7 +18,10 @@ const toTransactionActivityLogLine = (line) => {
         class: line.accounting_class
             ? (0, classPayload_1.mapClassBasePayloadToClassBase)(line.accounting_class)
             : undefined,
-        customer: line.customer ? (0, customerPayload_1.toCustomerBase)(line.customer, false) : undefined,
+        customer: line.customer != null &&
+            (0, customerPayload_1.getCustomerPayloadIdentifier)(line.customer) != null
+            ? (0, customerPayload_1.toCustomerBase)(line.customer, false)
+            : undefined,
         vendor: line.vendor != null && (0, vendorPayload_1.getVendorPayloadIdentifier)(line.vendor) != null
             ? (0, vendorPayload_1.mapVendorBasePayloadToVendorBase)(line.vendor)
             : undefined,

package/lib/esm/entity/customer/customerPayload.js

@@ -1,13 +1,35 @@
 import { toURL } from '../../commonPayloadTypes/urlPayload';
 import { date } from '../../zeniDayJS';
-export const toCustomerBase = (payload, parseOutParentName) => ({
-    id: payload.customer_id,
-    name: parseOutParentName
-        ? removeParentName(payload.customer_name)
-        : payload.customer_name,
-    qboId: payload.qbo_id,
-    logo: payload.logo != null ? toURL(payload.logo) : undefined,
-});
+/**
+ * Resolves the effective customer identifier from a payload.
+ * For JE/Deposit transactions, customer_id is null at runtime — qbo_id is the
+ * actual identity.
+ */
+export const getCustomerPayloadIdentifier = (customer) => {
+    const cid = customer.customer_id;
+    if (cid != null && cid !== '') {
+        return cid;
+    }
+    const qid = customer.qbo_id;
+    if (qid != null && qid !== '') {
+        return qid;
+    }
+    return null;
+};
+export const toCustomerBase = (payload, parseOutParentName) => {
+    const id = getCustomerPayloadIdentifier(payload);
+    if (id == null) {
+        throw new Error(`toCustomerBase: no identifier (customer_id/qbo_id) found for customer "${payload.customer_name}".`);
+    }
+    return {
+        id,
+        name: parseOutParentName
+            ? removeParentName(payload.customer_name)
+            : payload.customer_name,
+        qboId: payload.qbo_id,
+        logo: payload.logo != null ? toURL(payload.logo) : undefined,
+    };
+};
 export const toCustomerBasePayload = (customer, customerUpdates) => {
     if (customerUpdates != null && customerUpdates.id != null) {
         return {

package/lib/esm/entity/reimbursement/reimbursementPayload.js

@@ -5,7 +5,7 @@ import { date, dateNow } from '../../zeniDayJS';
 import { mapAccountBasePayloadToAccountBase, toAccountPayload, } from '../account/accountPayload';
 import { toBillPaymentMethod, toBillPaymentStatus, toBillStage, toBillStatus, toBulkProcessingDetail, toDeletionInfo, } from '../billPay/billTransaction/billTransactionPayload';
 import { mapClassBasePayloadToClassBase, toClassBasePayload, } from '../class/classPayload';
-import { toCustomerBase, toCustomerBasePayload, } from '../customer/customerPayload';
+import { getCustomerPayloadIdentifier, toCustomerBase, toCustomerBasePayload, } from '../customer/customerPayload';
 import { mapMerchantBasePayloadToMerchantBase, toMerchantBasePayload, } from '../merchant/merchantPayload';
 import { toAttachment, } from '../transaction/payloadTypes/attachmentPayload';
 const ALL_REIMBURSEMENT_TRANSACTION_TYPE = ['reimbursement'];
@@ -178,7 +178,8 @@ const toLineDetail = (payload) => ({
     account: payload.account?.account_id != null
         ? mapAccountBasePayloadToAccountBase(payload.account)
         : undefined,
-    customer: payload.customer?.customer_id != null
+    customer: payload.customer != null &&
+        getCustomerPayloadIdentifier(payload.customer) != null
         ? toCustomerBase(payload.customer, false)
         : undefined,
 });

package/lib/esm/entity/transaction/payloadTypes/customerTransactionPayload.js

@@ -8,7 +8,9 @@ export const toCustomerTransaction = (payload) => {
     const transaction = toTransaction(payload);
     return {
         ...transaction,
-        customer: payload.customer_id != null ? toCustomerBase(payload, false) : undefined,
+        customer: Boolean(payload.customer_id) === true
+            ? toCustomerBase(payload, false)
+            : undefined,
         documentId: payload.document_id,
         paymentType: toPaymentTypeStrict(payload.payment_type),
         paymentTypeName: payload.payment_type_name,

package/lib/esm/entity/transaction/payloadTypes/transactionLinePayload.js

@@ -1,7 +1,7 @@
 import { toAmountWC } from '../../../commonStateTypes/amount';
 import { mapAccountBasePayloadToAccountBase, toAccountPayload, } from '../../account/accountPayload';
 import { mapClassBasePayloadToClassBase, toClassBasePayload, } from '../../class/classPayload';
-import { toCustomerBase, toCustomerBasePayload, } from '../../customer/customerPayload';
+import { getCustomerPayloadIdentifier, toCustomerBase, toCustomerBasePayload, } from '../../customer/customerPayload';
 import { mapProjectBasePayloadToProjectBase, toProjectBasePayload, } from '../../project/projectPayload';
 import { getVendorPayloadIdentifier, mapVendorBasePayloadToVendorBase, toVendorBasePayload, } from '../../vendor/vendorPayload';
 import { toCategorizationStatusType, toPlatformLineDetailType, } from '../stateTypes/transactionLine';
@@ -35,7 +35,7 @@ export const toTransactionWithAccountAndClassLine = (payload, currency, type = '
     class: mapClassBasePayloadToClassBase(payload.line_detail.class ?? {}), // Note: why bother about empty {} object ? because sometimes backend sends empty objects, sometimes it sends undefined or null
     account: mapAccountBasePayloadToAccountBase(payload.line_detail.account),
     customer: payload.line_detail.customer != null &&
-        payload.line_detail.customer.customer_id != null
+        getCustomerPayloadIdentifier(payload.line_detail.customer) != null
         ? toCustomerBase(payload.line_detail.customer, false)
         : undefined,
     vendor: payload.line_detail.vendor != null &&

package/lib/esm/entity/transactionActivityLog/transactionActivityLogPayload.js

@@ -1,7 +1,7 @@
 import { date } from '../../zeniDayJS';
 import { mapAccountBasePayloadToAccountBase, } from '../account/accountPayload';
 import { mapClassBasePayloadToClassBase, } from '../class/classPayload';
-import { toCustomerBase } from '../customer/customerPayload';
+import { getCustomerPayloadIdentifier, toCustomerBase } from '../customer/customerPayload';
 import { toAISummary, } from '../transaction/payloadTypes/transactionLinePayload';
 import { getVendorPayloadIdentifier, mapVendorBasePayloadToVendorBase, } from '../vendor/vendorPayload';
 import { toActivityLogEventType, } from './transactionActivityLogState';
@@ -14,7 +14,10 @@ const toTransactionActivityLogLine = (line) => {
         class: line.accounting_class
             ? mapClassBasePayloadToClassBase(line.accounting_class)
             : undefined,
-        customer: line.customer ? toCustomerBase(line.customer, false) : undefined,
+        customer: line.customer != null &&
+            getCustomerPayloadIdentifier(line.customer) != null
+            ? toCustomerBase(line.customer, false)
+            : undefined,
         vendor: line.vendor != null && getVendorPayloadIdentifier(line.vendor) != null
             ? mapVendorBasePayloadToVendorBase(line.vendor)
             : undefined,

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

@@ -1,5 +1,5 @@
 import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, filter, groupBy, mergeMap, switchMap } from 'rxjs/operators';
 import { toString } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
@@ -8,7 +8,10 @@ import { getLineItemsByTransactionsIdsFromResponse } from '../../helpers/transac
 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) => {
+export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchTransactionCategorization.match), 
+// Per-tab switchMap: cancels in-flight requests for the same tab on a new
+// request, but allows both tabs to fetch concurrently (e.g. dual search).
+groupBy((action) => action.payload.selectedTab), mergeMap((group$) => group$.pipe(switchMap((action) => {
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationTransactionsViewState, } = state$.value;
     const { period, keepExistingListItems, selectedTab, refreshViewInBackground, } = action.payload;
     const uiState = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab].uiState;
@@ -24,6 +27,10 @@ export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) =>
         page_token: pageToken,
         page_size: 25,
         search_text: uiState.searchString,
+        // Always scope to the active tab's auto_categorized status;
+        // cross-status search (omit or true) is reserved for Receipts
+        // manual-match.
+        search_all_statuses: false,
         sub_tab: selectedTab === 'autoCategorized'
             ? expenseAutomationTransactionsViewState.selectedTransactionCategorizationCompletedSubTab
             : DEFAULT_COMPLETED_SUB_TAB,
@@ -36,10 +43,19 @@ export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) =>
             updateActions.push(updateTransactions(response.data.transactions, (value) => value.transaction_id, 'merge'));
             const transactionIds = response.data.transactions.map((transaction) => transaction.transaction_id);
             const lineItemsByTransactionIds = getLineItemsByTransactionsIdsFromResponse(response.data.transactions);
+            // Only propagate the fields the response provides (pageToken).
+            // Do NOT spread the captured uiState — that would re-apply
+            // searchString/sortKey/etc. from request-start and overwrite
+            // any state changes made during the in-flight request (e.g.
+            // user clearing search triggers restoreFullDatasetSnapshot
+            // before this response lands).
+            // pageToken is also set by saveTransactionCategorizationLocalData
+            // via initializeTransactionCategorizationViewLocalDataEpic, so
+            // null values are handled correctly there regardless of the
+            // != null guard in updateTransactionCategorizationUIState.
             updateActions.push(updateTransactionCategorizationUIState({
                 selectedTab,
                 uiState: {
-                    ...uiState,
                     pageToken: response.data.next_page_token ?? null,
                 },
             }));
@@ -79,4 +95,4 @@ export const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) =>
         status: createZeniAPIStatus('Unexpected Error', 'fetch Transaction Categorization REST API call errored out' +
             JSON.stringify(error)),
     }))));
-}));
+}))));

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

@@ -6,7 +6,8 @@ import { fetchAccountList } from '../../../accountList/accountListReducer';
 import { fetchClassList } from '../../../classList/classListReducer';
 import { fetchOwnerList } from '../../../ownerList/ownerListReducer';
 import { fetchProjectList } from '../../../projectList/projectListReducer';
-import { fetchTransactionCategorization, fetchTransactionCategorizationView, } from '../../reducers/transactionsViewReducer';
+import { fetchTransactionCategorization, fetchTransactionCategorizationView, restoreFullDatasetSnapshot, } from '../../reducers/transactionsViewReducer';
+import { TRANSACTIONS_TABS, } from '../../types/transactionsViewState';
 export const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pipe(filter(fetchTransactionCategorizationView.match), mergeMap((action) => {
     const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     const updateActions = [];
@@ -16,8 +17,14 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
         month: period.start.month,
         year: period.start.year,
     };
-    const transactionIds = transactionIdsBySelectedPeriod[toMonthYearPeriodId(monthYearPeriod)] ??
-        [];
+    const periodId = toMonthYearPeriodId(monthYearPeriod);
+    const transactionIds = transactionIdsBySelectedPeriod[periodId] ?? [];
+    const hasUsableSnapshot = (tabKey) => {
+        const snapshot = expenseAutomationTransactionsViewState.transactionCategorizationView[tabKey].fullDatasetSnapshot;
+        return (snapshot != null &&
+            snapshot.periodId === periodId &&
+            snapshot.transactionIds.length > 0);
+    };
     const accountList = state$.value.accountListState.byReportId['accountList'];
     if (accountList.hasValidState() === false &&
         accountList.fetchState === 'Not-Started') {
@@ -39,10 +46,47 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
         vendorOwnerList.fetchState === 'Not-Started') {
         updateActions.push(fetchOwnerList());
     }
-    if (cacheOverride === true ||
+    // When clearing search (searchString === ''), restore from the pre-search
+    // snapshot if one exists — avoids a round-trip since all data is already
+    // in the entity store. Fall back to a normal fetch if no snapshot (the
+    // tab was never loaded before the search was applied).
+    if (searchString === '' && hasUsableSnapshot(selectedTab)) {
+        updateActions.push(restoreFullDatasetSnapshot({ selectedTab, period }));
+    }
+    else if (cacheOverride === true ||
         fetchState === 'Not-Started' ||
         transactionIds.length === 0) {
         updateActions.push(fetchTransactionCategorization(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems, isUncategorizedExpenseCategoryEnabled));
     }
+    // On the initial load of a tab (searchString undefined = non-search fetch),
+    // preload every other tab that hasn't been fetched yet for this period.
+    // This makes switching to the other tab instant instead of triggering a
+    // fresh fetch on click. refreshViewInBackground=true keeps it silent.
+    if (searchString === undefined) {
+        TRANSACTIONS_TABS.filter((tab) => tab !== selectedTab).forEach((otherTab) => {
+            const otherTabFetchState = expenseAutomationTransactionsViewState.transactionCategorizationView[otherTab].fetchState;
+            if (otherTabFetchState === 'Not-Started') {
+                updateActions.push(fetchTransactionCategorization(otherTab, period, false, false, undefined, undefined, true, undefined, isUncategorizedExpenseCategoryEnabled));
+            }
+        });
+    }
+    // When search changes (searchString defined, including empty string to
+    // clear), also update every other tab so all tabs always reflect the same
+    // search query. Skip if the other tab already has this search string to
+    // avoid redundant work on noop updates. On clear, restore from snapshot
+    // if available; otherwise issue a background fetch.
+    if (searchString !== undefined) {
+        TRANSACTIONS_TABS.filter((tab) => tab !== selectedTab).forEach((otherTab) => {
+            const otherTabSearchString = expenseAutomationTransactionsViewState.transactionCategorizationView[otherTab].uiState.searchString;
+            if (searchString !== otherTabSearchString) {
+                if (searchString === '' && hasUsableSnapshot(otherTab)) {
+                    updateActions.push(restoreFullDatasetSnapshot({ selectedTab: otherTab, period }));
+                }
+                else {
+                    updateActions.push(fetchTransactionCategorization(otherTab, period, true, keepExistingListItems, searchString, undefined, true, true, isUncategorizedExpenseCategoryEnabled));
+                }
+            }
+        });
+    }
     return from(updateActions);
 }));

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

@@ -38,6 +38,7 @@ export const initialTransactionTabViewState = {
     hasValidState() {
         return this.fetchState == 'Completed';
     },
+    fullDatasetSnapshot: undefined,
     transactionReviewLocalDataById: {},
     transactionIdsBySelectedPeriod: {},
     selectedCheckBoxTransactionIds: [],
@@ -156,8 +157,12 @@ const expenseAutomationTransactionsView = createSlice({
                 }
                 draft.transactionCategorizationView[selectedTab].uiState.pageToken =
                     pageToken ?? null;
-                draft.transactionCategorizationView[selectedTab].uiState.searchString =
-                    searchString ?? '';
+                // Only overwrite when explicitly set; undefined means a non-search fetch
+                // (tab switch, period change) should preserve the existing search string.
+                if (searchString !== undefined) {
+                    draft.transactionCategorizationView[selectedTab].uiState.searchString =
+                        searchString;
+                }
                 draft.transactionCategorizationView[selectedTab].error = undefined;
                 // Reset list when we change the sort order and fetch list again
                 if (resetListItems === true) {
@@ -165,8 +170,30 @@ const expenseAutomationTransactionsView = createSlice({
                         month: period.start.month,
                         year: period.start.year,
                     };
+                    const periodId = toMonthYearPeriodId(monthYearPeriod);
                     const transactionIdsBySelectedPeriod = draft.transactionCategorizationView[selectedTab]
-                        .transactionIdsBySelectedPeriod[toMonthYearPeriodId(monthYearPeriod)];
+                        .transactionIdsBySelectedPeriod[periodId] ?? [];
+                    // When starting a non-empty search, snapshot the current full dataset
+                    // so clearing the search can restore instantly without an API round-trip.
+                    // Only save the snapshot when there are rows to restore; skip for tabs
+                    // that have never been loaded (empty list → no useful snapshot).
+                    if (searchString !== undefined &&
+                        searchString !== '' &&
+                        transactionIdsBySelectedPeriod.length > 0) {
+                        const snapshot = {
+                            parentTotalCount: draft.parentTotalCountByTab[selectedTab][periodId],
+                            periodId,
+                            totalCount: draft.transactionCategorizationView[selectedTab].uiState
+                                .totalCount[periodId],
+                            transactionIds: [...transactionIdsBySelectedPeriod],
+                            transactionReviewLocalDataById: {
+                                ...draft.transactionCategorizationView[selectedTab]
+                                    .transactionReviewLocalDataById,
+                            },
+                        };
+                        draft.transactionCategorizationView[selectedTab].fullDatasetSnapshot =
+                            snapshot;
+                    }
                     transactionIdsBySelectedPeriod.forEach((transactionId) => {
                         delete draft.transactionCategorizationView[selectedTab]
                             .transactionReviewLocalDataById[transactionId];
@@ -305,10 +332,12 @@ const expenseAutomationTransactionsView = createSlice({
             }
         },
         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;
+            const { filters } = action.payload;
+            // Filters are tab-agnostic (payee/category/class/amount), so apply to
+            // all tabs so switching tabs after filtering shows consistent results.
+            TRANSACTIONS_TABS.forEach((tab) => {
+                draft.transactionCategorizationView[tab].filters = filters;
+            });
         },
         saveTransactionCategorization: {
             prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
@@ -660,20 +689,63 @@ const expenseAutomationTransactionsView = createSlice({
         resetOtherTabsFetchState(draft, action) {
             const { tabs, refreshViewInBackground } = action.payload;
             tabs.forEach((tab) => {
-                if (draft.transactionCategorizationView[tab].fetchState ===
-                    'In-Progress' ||
-                    refreshViewInBackground !== true) {
+                const tabFetchState = draft.transactionCategorizationView[tab].fetchState;
+                if (refreshViewInBackground !== true) {
+                    // Foreground fetch completed: mark other tabs as Completed.
                     draft.transactionCategorizationView[tab].fetchState = 'Completed';
                     draft.transactionCategorizationView[tab].error = undefined;
                 }
-                else {
+                else if (tabFetchState !== 'In-Progress') {
+                    // Background fetch completed: reset the other tab's refreshStatus,
+                    // but only when it is not mid-load. During a dual-search the active
+                    // tab has its own foreground fetch in flight — clobbering its
+                    // fetchState here would drop the skeleton and show an empty list.
                     draft.transactionCategorizationView[tab].refreshStatus = {
                         fetchState: 'Not-Started',
                         error: undefined,
                     };
                 }
+                // If tabFetchState === 'In-Progress' and refreshViewInBackground === true,
+                // leave the other tab's state untouched — it has its own active fetch.
             });
         },
+        restoreFullDatasetSnapshot(draft, action) {
+            const { selectedTab, period } = action.payload;
+            const periodId = toMonthYearPeriodId({
+                month: period.start.month,
+                year: period.start.year,
+            });
+            const snapshot = draft.transactionCategorizationView[selectedTab].fullDatasetSnapshot;
+            if (snapshot == null || snapshot.periodId !== periodId) {
+                return;
+            }
+            draft.transactionCategorizationView[selectedTab]
+                .transactionIdsBySelectedPeriod[periodId] = snapshot.transactionIds;
+            // Merge back per-transaction local data; skip entries that were updated
+            // during the search (e.g. a save that happened while filtered results
+            // were showing) so those saves are not overwritten.
+            Object.entries(snapshot.transactionReviewLocalDataById).forEach(([transactionId, localData]) => {
+                if (draft.transactionCategorizationView[selectedTab]
+                    .transactionReviewLocalDataById[transactionId] == null) {
+                    draft.transactionCategorizationView[selectedTab]
+                        .transactionReviewLocalDataById[transactionId] = localData;
+                }
+            });
+            if (snapshot.totalCount != null) {
+                draft.transactionCategorizationView[selectedTab].uiState.totalCount[periodId] = snapshot.totalCount;
+            }
+            if (snapshot.parentTotalCount != null) {
+                draft.parentTotalCountByTab[selectedTab][periodId] =
+                    snapshot.parentTotalCount;
+            }
+            draft.transactionCategorizationView[selectedTab].uiState.searchString =
+                '';
+            draft.transactionCategorizationView[selectedTab].uiState.pageToken = null;
+            draft.transactionCategorizationView[selectedTab].fetchState = 'Completed';
+            draft.transactionCategorizationView[selectedTab].error = undefined;
+            draft.transactionCategorizationView[selectedTab].fullDatasetSnapshot =
+                undefined;
+        },
         fetchTransactionCategorizationFailure(draft, action) {
             const { selectedTab, selectedPeriod } = action.payload;
             draft.transactionCategorizationView[selectedTab].transactionIdsBySelectedPeriod[toMonthYearPeriodId(selectedPeriod)] =
@@ -1054,5 +1126,5 @@ const expenseAutomationTransactionsView = createSlice({
         },
     },
 });
-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, markCategoryClassRecommendationsInProgressForCategorization, markCategoryClassRecommendationsCompletedForCategorization, markCategoryClassRecommendationsFailureForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, removeTransactionFromAllTabs, 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, restoreFullDatasetSnapshot, fetchTransactionCategorizationView, updateSelectedCheckboxTransactionIds, clearExpenseAutomationTransactionsViewPerTabView, clearExpenseAutomationTransactionsView, setEntityRecommendationForLineIdsForCategorization, markCategoryClassRecommendationsInProgressForCategorization, markCategoryClassRecommendationsCompletedForCategorization, markCategoryClassRecommendationsFailureForCategorization, updateSelectedTransactionId, syncTransactionCategorizationFromDetailSave, backgroundRefetchReviewTab, removeTransactionFromAllTabs, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, } = expenseAutomationTransactionsView.actions;
 export default expenseAutomationTransactionsView.reducer;

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

@@ -11,7 +11,10 @@ const transactionCategorizationLocalDataHelper_1 = require("../../helpers/transa
 const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
 const completedSubTab_1 = require("../../types/completedSubTab");
 const transactionsViewState_1 = require("../../types/transactionsViewState");
-const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.fetchTransactionCategorization.match), (0, operators_1.switchMap)((action) => {
+const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.fetchTransactionCategorization.match), 
+// Per-tab switchMap: cancels in-flight requests for the same tab on a new
+// request, but allows both tabs to fetch concurrently (e.g. dual search).
+(0, operators_1.groupBy)((action) => action.payload.selectedTab), (0, operators_1.mergeMap)((group$) => group$.pipe((0, operators_1.switchMap)((action) => {
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationTransactionsViewState, } = state$.value;
     const { period, keepExistingListItems, selectedTab, refreshViewInBackground, } = action.payload;
     const uiState = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab].uiState;
@@ -27,6 +30,10 @@ const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => action
         page_token: pageToken,
         page_size: 25,
         search_text: uiState.searchString,
+        // Always scope to the active tab's auto_categorized status;
+        // cross-status search (omit or true) is reserved for Receipts
+        // manual-match.
+        search_all_statuses: false,
         sub_tab: selectedTab === 'autoCategorized'
             ? expenseAutomationTransactionsViewState.selectedTransactionCategorizationCompletedSubTab
             : completedSubTab_1.DEFAULT_COMPLETED_SUB_TAB,
@@ -39,10 +46,19 @@ const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => action
             updateActions.push((0, transactionReducer_1.updateTransactions)(response.data.transactions, (value) => value.transaction_id, 'merge'));
             const transactionIds = response.data.transactions.map((transaction) => transaction.transaction_id);
             const lineItemsByTransactionIds = (0, transactionCategorizationLocalDataHelper_1.getLineItemsByTransactionsIdsFromResponse)(response.data.transactions);
+            // Only propagate the fields the response provides (pageToken).
+            // Do NOT spread the captured uiState — that would re-apply
+            // searchString/sortKey/etc. from request-start and overwrite
+            // any state changes made during the in-flight request (e.g.
+            // user clearing search triggers restoreFullDatasetSnapshot
+            // before this response lands).
+            // pageToken is also set by saveTransactionCategorizationLocalData
+            // via initializeTransactionCategorizationViewLocalDataEpic, so
+            // null values are handled correctly there regardless of the
+            // != null guard in updateTransactionCategorizationUIState.
             updateActions.push((0, transactionsViewReducer_1.updateTransactionCategorizationUIState)({
                 selectedTab,
                 uiState: {
-                    ...uiState,
                     pageToken: response.data.next_page_token ?? null,
                 },
             }));
@@ -82,5 +98,5 @@ const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => action
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'fetch Transaction Categorization REST API call errored out' +
             JSON.stringify(error)),
     }))));
-}));
+}))));
 exports.fetchTransactionCategorizationEpic = fetchTransactionCategorizationEpic;

package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.d.ts

@@ -5,6 +5,6 @@ import { fetchAccountList } from '../../../accountList/accountListReducer';
 import { fetchClassList } from '../../../classList/classListReducer';
 import { fetchOwnerList } from '../../../ownerList/ownerListReducer';
 import { fetchProjectList } from '../../../projectList/projectListReducer';
-import { fetchTransactionCategorization, fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
-export type ActionType = ReturnType<typeof fetchTransactionCategorizationView> | ReturnType<typeof fetchTransactionCategorization> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchOwnerList> | ReturnType<typeof fetchProjectList>;
+import { fetchTransactionCategorization, fetchTransactionCategorizationView, restoreFullDatasetSnapshot } from '../../reducers/transactionsViewReducer';
+export type ActionType = ReturnType<typeof fetchTransactionCategorizationView> | ReturnType<typeof fetchTransactionCategorization> | ReturnType<typeof restoreFullDatasetSnapshot> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchOwnerList> | ReturnType<typeof fetchProjectList>;
 export declare const fetchTransactionCategorizationViewEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.js

@@ -10,6 +10,7 @@ const classListReducer_1 = require("../../../classList/classListReducer");
 const ownerListReducer_1 = require("../../../ownerList/ownerListReducer");
 const projectListReducer_1 = require("../../../projectList/projectListReducer");
 const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
+const transactionsViewState_1 = require("../../types/transactionsViewState");
 const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.fetchTransactionCategorizationView.match), (0, operators_1.mergeMap)((action) => {
     const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, isUncategorizedExpenseCategoryEnabled, } = action.payload;
     const updateActions = [];
@@ -19,8 +20,14 @@ const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pi
         month: period.start.month,
         year: period.start.year,
     };
-    const transactionIds = transactionIdsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(monthYearPeriod)] ??
-        [];
+    const periodId = (0, timePeriod_1.toMonthYearPeriodId)(monthYearPeriod);
+    const transactionIds = transactionIdsBySelectedPeriod[periodId] ?? [];
+    const hasUsableSnapshot = (tabKey) => {
+        const snapshot = expenseAutomationTransactionsViewState.transactionCategorizationView[tabKey].fullDatasetSnapshot;
+        return (snapshot != null &&
+            snapshot.periodId === periodId &&
+            snapshot.transactionIds.length > 0);
+    };
     const accountList = state$.value.accountListState.byReportId['accountList'];
     if (accountList.hasValidState() === false &&
         accountList.fetchState === 'Not-Started') {
@@ -42,11 +49,48 @@ const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pi
         vendorOwnerList.fetchState === 'Not-Started') {
         updateActions.push((0, ownerListReducer_1.fetchOwnerList)());
     }
-    if (cacheOverride === true ||
+    // When clearing search (searchString === ''), restore from the pre-search
+    // snapshot if one exists — avoids a round-trip since all data is already
+    // in the entity store. Fall back to a normal fetch if no snapshot (the
+    // tab was never loaded before the search was applied).
+    if (searchString === '' && hasUsableSnapshot(selectedTab)) {
+        updateActions.push((0, transactionsViewReducer_1.restoreFullDatasetSnapshot)({ selectedTab, period }));
+    }
+    else if (cacheOverride === true ||
         fetchState === 'Not-Started' ||
         transactionIds.length === 0) {
         updateActions.push((0, transactionsViewReducer_1.fetchTransactionCategorization)(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems, isUncategorizedExpenseCategoryEnabled));
     }
+    // On the initial load of a tab (searchString undefined = non-search fetch),
+    // preload every other tab that hasn't been fetched yet for this period.
+    // This makes switching to the other tab instant instead of triggering a
+    // fresh fetch on click. refreshViewInBackground=true keeps it silent.
+    if (searchString === undefined) {
+        transactionsViewState_1.TRANSACTIONS_TABS.filter((tab) => tab !== selectedTab).forEach((otherTab) => {
+            const otherTabFetchState = expenseAutomationTransactionsViewState.transactionCategorizationView[otherTab].fetchState;
+            if (otherTabFetchState === 'Not-Started') {
+                updateActions.push((0, transactionsViewReducer_1.fetchTransactionCategorization)(otherTab, period, false, false, undefined, undefined, true, undefined, isUncategorizedExpenseCategoryEnabled));
+            }
+        });
+    }
+    // When search changes (searchString defined, including empty string to
+    // clear), also update every other tab so all tabs always reflect the same
+    // search query. Skip if the other tab already has this search string to
+    // avoid redundant work on noop updates. On clear, restore from snapshot
+    // if available; otherwise issue a background fetch.
+    if (searchString !== undefined) {
+        transactionsViewState_1.TRANSACTIONS_TABS.filter((tab) => tab !== selectedTab).forEach((otherTab) => {
+            const otherTabSearchString = expenseAutomationTransactionsViewState.transactionCategorizationView[otherTab].uiState.searchString;
+            if (searchString !== otherTabSearchString) {
+                if (searchString === '' && hasUsableSnapshot(otherTab)) {
+                    updateActions.push((0, transactionsViewReducer_1.restoreFullDatasetSnapshot)({ selectedTab: otherTab, period }));
+                }
+                else {
+                    updateActions.push((0, transactionsViewReducer_1.fetchTransactionCategorization)(otherTab, period, true, keepExistingListItems, searchString, undefined, true, true, isUncategorizedExpenseCategoryEnabled));
+                }
+            }
+        });
+    }
     return (0, rxjs_1.from)(updateActions);
 }));
 exports.fetchTransactionCategorizationViewEpic = fetchTransactionCategorizationViewEpic;

package/lib/view/expenseAutomationView/payload/transactionCategorizationPayload.d.ts

@@ -19,6 +19,13 @@ export interface TransactionCategorizationQueryPayload {
      * on the backend.
      */
     sub_tab: CompletedSubTab;
+    /**
+     * When `false`, the backend scopes the search to the active tab's
+     * categorization status (respects `auto_categorized`). When `true` or
+     * omitted, the backend searches across all statuses — the legacy behaviour
+     * that the Receipts manual-match flow relies on.
+     */
+    search_all_statuses?: boolean;
 }
 export interface TransactionCategorizationPayload {
     next_page_token: string | null;

package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts

@@ -137,7 +137,10 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
 }, "expenseAutomationTransactionsView/fetchTransactionCategorizationSuccess">, resetOtherTabsFetchState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     tabs: TransactionsTab[];
     refreshViewInBackground?: boolean;
-}, "expenseAutomationTransactionsView/resetOtherTabsFetchState">, fetchTransactionCategorizationView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any, resetListItems?: any, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
+}, "expenseAutomationTransactionsView/resetOtherTabsFetchState">, restoreFullDatasetSnapshot: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    period: TimePeriod;
+    selectedTab: TransactionsTab;
+}, "expenseAutomationTransactionsView/restoreFullDatasetSnapshot">, fetchTransactionCategorizationView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any, resetListItems?: any, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
     selectedTab: "review" | "autoCategorized";
     period: TimePeriod;
     searchString: string | undefined;

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadTransactionCategorizationReceiptSuccess = exports.updateTransactionCategorizationUploadReceiptState = exports.removeTransactionFromAllTabs = exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.markCategoryClassRecommendationsFailureForCategorization = exports.markCategoryClassRecommendationsCompletedForCategorization = exports.markCategoryClassRecommendationsInProgressForCategorization = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateParentTotalCountForTab = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateTransactionCategorizationCompletedSubTab = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionFilters = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
+exports.uploadTransactionCategorizationReceiptSuccess = exports.updateTransactionCategorizationUploadReceiptState = exports.removeTransactionFromAllTabs = exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.markCategoryClassRecommendationsFailureForCategorization = exports.markCategoryClassRecommendationsCompletedForCategorization = exports.markCategoryClassRecommendationsInProgressForCategorization = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.restoreFullDatasetSnapshot = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateParentTotalCountForTab = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateTransactionCategorizationCompletedSubTab = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionFilters = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -45,6 +45,7 @@ exports.initialTransactionTabViewState = {
     hasValidState() {
         return this.fetchState == 'Completed';
     },
+    fullDatasetSnapshot: undefined,
     transactionReviewLocalDataById: {},
     transactionIdsBySelectedPeriod: {},
     selectedCheckBoxTransactionIds: [],
@@ -163,8 +164,12 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                 }
                 draft.transactionCategorizationView[selectedTab].uiState.pageToken =
                     pageToken ?? null;
-                draft.transactionCategorizationView[selectedTab].uiState.searchString =
-                    searchString ?? '';
+                // Only overwrite when explicitly set; undefined means a non-search fetch
+                // (tab switch, period change) should preserve the existing search string.
+                if (searchString !== undefined) {
+                    draft.transactionCategorizationView[selectedTab].uiState.searchString =
+                        searchString;
+                }
                 draft.transactionCategorizationView[selectedTab].error = undefined;
                 // Reset list when we change the sort order and fetch list again
                 if (resetListItems === true) {
@@ -172,8 +177,30 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                         month: period.start.month,
                         year: period.start.year,
                     };
+                    const periodId = (0, timePeriod_1.toMonthYearPeriodId)(monthYearPeriod);
                     const transactionIdsBySelectedPeriod = draft.transactionCategorizationView[selectedTab]
-                        .transactionIdsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(monthYearPeriod)];
+                        .transactionIdsBySelectedPeriod[periodId] ?? [];
+                    // When starting a non-empty search, snapshot the current full dataset
+                    // so clearing the search can restore instantly without an API round-trip.
+                    // Only save the snapshot when there are rows to restore; skip for tabs
+                    // that have never been loaded (empty list → no useful snapshot).
+                    if (searchString !== undefined &&
+                        searchString !== '' &&
+                        transactionIdsBySelectedPeriod.length > 0) {
+                        const snapshot = {
+                            parentTotalCount: draft.parentTotalCountByTab[selectedTab][periodId],
+                            periodId,
+                            totalCount: draft.transactionCategorizationView[selectedTab].uiState
+                                .totalCount[periodId],
+                            transactionIds: [...transactionIdsBySelectedPeriod],
+                            transactionReviewLocalDataById: {
+                                ...draft.transactionCategorizationView[selectedTab]
+                                    .transactionReviewLocalDataById,
+                            },
+                        };
+                        draft.transactionCategorizationView[selectedTab].fullDatasetSnapshot =
+                            snapshot;
+                    }
                     transactionIdsBySelectedPeriod.forEach((transactionId) => {
                         delete draft.transactionCategorizationView[selectedTab]
                             .transactionReviewLocalDataById[transactionId];
@@ -312,10 +339,12 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
             }
         },
         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;
+            const { filters } = action.payload;
+            // Filters are tab-agnostic (payee/category/class/amount), so apply to
+            // all tabs so switching tabs after filtering shows consistent results.
+            transactionsViewState_1.TRANSACTIONS_TABS.forEach((tab) => {
+                draft.transactionCategorizationView[tab].filters = filters;
+            });
         },
         saveTransactionCategorization: {
             prepare(selectedTab, transactionIds, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled) {
@@ -667,20 +696,63 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         resetOtherTabsFetchState(draft, action) {
             const { tabs, refreshViewInBackground } = action.payload;
             tabs.forEach((tab) => {
-                if (draft.transactionCategorizationView[tab].fetchState ===
-                    'In-Progress' ||
-                    refreshViewInBackground !== true) {
+                const tabFetchState = draft.transactionCategorizationView[tab].fetchState;
+                if (refreshViewInBackground !== true) {
+                    // Foreground fetch completed: mark other tabs as Completed.
                     draft.transactionCategorizationView[tab].fetchState = 'Completed';
                     draft.transactionCategorizationView[tab].error = undefined;
                 }
-                else {
+                else if (tabFetchState !== 'In-Progress') {
+                    // Background fetch completed: reset the other tab's refreshStatus,
+                    // but only when it is not mid-load. During a dual-search the active
+                    // tab has its own foreground fetch in flight — clobbering its
+                    // fetchState here would drop the skeleton and show an empty list.
                     draft.transactionCategorizationView[tab].refreshStatus = {
                         fetchState: 'Not-Started',
                         error: undefined,
                     };
                 }
+                // If tabFetchState === 'In-Progress' and refreshViewInBackground === true,
+                // leave the other tab's state untouched — it has its own active fetch.
             });
         },
+        restoreFullDatasetSnapshot(draft, action) {
+            const { selectedTab, period } = action.payload;
+            const periodId = (0, timePeriod_1.toMonthYearPeriodId)({
+                month: period.start.month,
+                year: period.start.year,
+            });
+            const snapshot = draft.transactionCategorizationView[selectedTab].fullDatasetSnapshot;
+            if (snapshot == null || snapshot.periodId !== periodId) {
+                return;
+            }
+            draft.transactionCategorizationView[selectedTab]
+                .transactionIdsBySelectedPeriod[periodId] = snapshot.transactionIds;
+            // Merge back per-transaction local data; skip entries that were updated
+            // during the search (e.g. a save that happened while filtered results
+            // were showing) so those saves are not overwritten.
+            Object.entries(snapshot.transactionReviewLocalDataById).forEach(([transactionId, localData]) => {
+                if (draft.transactionCategorizationView[selectedTab]
+                    .transactionReviewLocalDataById[transactionId] == null) {
+                    draft.transactionCategorizationView[selectedTab]
+                        .transactionReviewLocalDataById[transactionId] = localData;
+                }
+            });
+            if (snapshot.totalCount != null) {
+                draft.transactionCategorizationView[selectedTab].uiState.totalCount[periodId] = snapshot.totalCount;
+            }
+            if (snapshot.parentTotalCount != null) {
+                draft.parentTotalCountByTab[selectedTab][periodId] =
+                    snapshot.parentTotalCount;
+            }
+            draft.transactionCategorizationView[selectedTab].uiState.searchString =
+                '';
+            draft.transactionCategorizationView[selectedTab].uiState.pageToken = null;
+            draft.transactionCategorizationView[selectedTab].fetchState = 'Completed';
+            draft.transactionCategorizationView[selectedTab].error = undefined;
+            draft.transactionCategorizationView[selectedTab].fullDatasetSnapshot =
+                undefined;
+        },
         fetchTransactionCategorizationFailure(draft, action) {
             const { selectedTab, selectedPeriod } = action.payload;
             draft.transactionCategorizationView[selectedTab].transactionIdsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)] =
@@ -1061,5 +1133,5 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.updateTransactionFilters = _a.updateTransactionFilters, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationCompletedSubTab = _a.updateTransactionCategorizationCompletedSubTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.updateParentTotalCountForTab = _a.updateParentTotalCountForTab, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.markCategoryClassRecommendationsInProgressForCategorization = _a.markCategoryClassRecommendationsInProgressForCategorization, exports.markCategoryClassRecommendationsCompletedForCategorization = _a.markCategoryClassRecommendationsCompletedForCategorization, exports.markCategoryClassRecommendationsFailureForCategorization = _a.markCategoryClassRecommendationsFailureForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab, exports.removeTransactionFromAllTabs = _a.removeTransactionFromAllTabs, exports.updateTransactionCategorizationUploadReceiptState = _a.updateTransactionCategorizationUploadReceiptState, exports.uploadTransactionCategorizationReceiptSuccess = _a.uploadTransactionCategorizationReceiptSuccess;
+_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.updateTransactionFilters = _a.updateTransactionFilters, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationCompletedSubTab = _a.updateTransactionCategorizationCompletedSubTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.updateParentTotalCountForTab = _a.updateParentTotalCountForTab, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.restoreFullDatasetSnapshot = _a.restoreFullDatasetSnapshot, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.markCategoryClassRecommendationsInProgressForCategorization = _a.markCategoryClassRecommendationsInProgressForCategorization, exports.markCategoryClassRecommendationsCompletedForCategorization = _a.markCategoryClassRecommendationsCompletedForCategorization, exports.markCategoryClassRecommendationsFailureForCategorization = _a.markCategoryClassRecommendationsFailureForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab, exports.removeTransactionFromAllTabs = _a.removeTransactionFromAllTabs, exports.updateTransactionCategorizationUploadReceiptState = _a.updateTransactionCategorizationUploadReceiptState, exports.uploadTransactionCategorizationReceiptSuccess = _a.uploadTransactionCategorizationReceiptSuccess;
 exports.default = expenseAutomationTransactionsView.reducer;

package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts

@@ -94,8 +94,24 @@ export interface SupportedTransactionCategorization {
     transactionId?: ID;
 }
 export declare const initialSupportedTransactionCategorization: SupportedTransactionCategorization;
+/**
+ * Snapshot of a tab's full (pre-search) dataset taken the moment the user
+ * first applies a non-empty search string. When the search is cleared the
+ * view epic restores from here instead of issuing a new API request.
+ *
+ * Only saved when there are actual rows to restore (`transactionIds` is
+ * non-empty); cleared once consumed or replaced by a fresh search.
+ */
+export interface FullDatasetSnapshot {
+    parentTotalCount: number | undefined;
+    periodId: MonthYearPeriodId;
+    totalCount: number | undefined;
+    transactionIds: ID[];
+    transactionReviewLocalDataById: Record<ID | TransactionDetailKey, SupportedTransactionCategorization>;
+}
 export interface TransactionsTabViewState extends FetchedState {
     filters: TransactionFilters;
+    fullDatasetSnapshot: FullDatasetSnapshot | undefined;
     markAsNotMiscategorizedStatus: FetchStateAndError;
     refreshStatus: FetchStateAndError;
     saveStatus: FetchStateAndError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.1.17",
+  "version": "5.1.18-betaRD1",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",