@zeniai/client-epic-state 4.19.37-betaVR27 → 4.19.37-betaVR3

package/lib/view/expenseAutomationView/epics/missingReceipts/bulkUploadReceiptsEpic.d.ts

@@ -1,7 +1,7 @@
 import { ActionsObservable } from 'redux-observable';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { bulkUploadReceipts, bulkUploadReceiptsFailure, bulkUploadReceiptsSuccess } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof bulkUploadReceipts> | ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof bulkUploadReceiptsFailure>;
+import { bulkUploadReceipts, bulkUploadReceiptsFailure, bulkUploadReceiptsSuccess, updateBulkUploadProgress } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof bulkUploadReceipts> | ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof bulkUploadReceiptsFailure> | ReturnType<typeof updateBulkUploadProgress>;
 export declare const bulkUploadReceiptsEpic: (actions$: ActionsObservable<ActionType>, _state$: unknown, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
     payload: {
         batchId: import("../../../..").ID;
@@ -12,4 +12,7 @@ export declare const bulkUploadReceiptsEpic: (actions$: ActionsObservable<Action
         error: import("../../../../responsePayload").ZeniAPIStatus;
     };
     type: "expenseAutomationMissingReceiptsView/bulkUploadReceiptsFailure";
+} | {
+    payload: number;
+    type: "expenseAutomationMissingReceiptsView/updateBulkUploadProgress";
 }>;

package/lib/view/expenseAutomationView/epics/missingReceipts/bulkUploadReceiptsEpic.js

@@ -12,8 +12,12 @@ const bulkUploadReceiptsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0,
         formData.append('files', file, file.name);
     }
     return zeniAPI
-        .postFormData(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/receipts/bulk-upload`, formData)
-        .pipe((0, operators_1.mergeMap)((response) => {
+        .postFormDataWithProgress(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/receipts/bulk-upload`, formData)
+        .pipe((0, operators_1.mergeMap)((event) => {
+        if (event.type === 'progress') {
+            return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.updateBulkUploadProgress)(event.percentage));
+        }
+        const response = event.data;
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.bulkUploadReceiptsSuccess)({
                 batchId: response.data.batch_id,

package/lib/view/expenseAutomationView/epics/missingReceipts/confirmBulkUploadMatchEpic.js

@@ -6,7 +6,7 @@ const operators_1 = require("rxjs/operators");
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
-const confirmBulkUploadMatchEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.confirmBulkUploadMatch.match), (0, operators_1.exhaustMap)((action) => {
+const confirmBulkUploadMatchEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.confirmBulkUploadMatch.match), (0, operators_1.mergeMap)((action) => {
     const { batchId, attachmentId, transactionId, transactionType, fileName } = action.payload;
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/receipts/manual-match`, {

package/lib/view/expenseAutomationView/epics/missingReceipts/fetchBulkUploadBatchDetailsEpic.js

@@ -8,35 +8,26 @@ const responsePayload_1 = require("../../../../responsePayload");
 const missingReceiptsPayload_1 = require("../../payload/missingReceiptsPayload");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
 const fetchBulkUploadBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails.match), (0, operators_1.mergeMap)(() => {
-    const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
-    const { currentBatchId } = bulkUpload;
+    const { currentBatchId } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
     if (currentBatchId == null) {
         return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsFailure)({
             error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'No current batch ID available'),
         }));
     }
-    if (!(0, missingReceiptsPayload_1.shouldFetchBatchDetailsForBatchId)(bulkUpload.batchStatusById, bulkUpload.batchListByPeriod, currentBatchId)) {
-        return rxjs_1.EMPTY;
-    }
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${currentBatchId}`)
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipts/batches/${currentBatchId}`)
         .pipe((0, operators_1.mergeMap)((response) => {
-        if (!(0, responsePayload_1.isSuccessResponse)(response) ||
-            response.data == null ||
-            !(0, missingReceiptsPayload_1.isBatchDetailsApiStatusCompleted)(response.data.status)) {
-            if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
-                return rxjs_1.EMPTY;
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const actions = [];
+            const transactionPayloads = (0, missingReceiptsPayload_1.extractTransactionPayloadsFromBatchFiles)(response.data.files);
+            if (transactionPayloads.length > 0) {
+                actions.push((0, transactionReducer_1.updateTransactions)(transactionPayloads, (value) => value.transaction_id));
             }
-            return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsFailure)({ error: response.status }));
-        }
-        const actions = [];
-        const transactionPayloads = (0, missingReceiptsPayload_1.extractTransactionPayloadsFromBatchFiles)(response.data.files);
-        if (transactionPayloads.length > 0) {
-            actions.push((0, transactionReducer_1.updateTransactions)(transactionPayloads, (value) => value.transaction_id));
+            actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess)((0, missingReceiptsPayload_1.toBatchDetails)(response.data)));
+            actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)(true));
+            return (0, rxjs_1.from)(actions);
         }
-        actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess)((0, missingReceiptsPayload_1.toBatchDetails)(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
-        actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)(true));
-        return (0, rxjs_1.from)(actions);
+        return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsFailure)({ error: response.status }));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsFailure)({
         error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch batch details errored out: ' + JSON.stringify(error)),
     }))));

package/lib/view/expenseAutomationView/epics/missingReceipts/fetchBulkUploadBatchesEpic.js

@@ -23,16 +23,10 @@ const fetchBulkUploadBatchesEpic = (actions$, state$, zeniAPI) => actions$.pipe(
         }));
     }
     const period = (0, timePeriod_1.convertToPeriod)(selectedPeriod);
-    const queryParam = {
-        start_date: period.start,
-        end_date: period.end,
-        sort_order: 'desc',
-    };
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipts/batches?start_date=${period.start}&end_date=${period.end}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
-            /** Full list (all statuses) for UI; batch-details epics filter to `completed` only. */
             return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchesSuccess)({
                 batchList: response.data.batches.map(missingReceiptsPayload_1.toBatchListItem),
                 selectedPeriod,

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

@@ -15,12 +15,8 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
     const isInitialLoad = action.payload.pageToken == null;
-    const cacheKey = (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(periodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab);
-    const existingData = bulkUpload.completedTransactionsByPeriod[cacheKey];
-    if (isInitialLoad &&
-        action.payload.cacheOverride !== true &&
-        existingData != null &&
-        existingData.transactionIds.length > 0) {
+    const existingData = bulkUpload.completedTransactionsByPeriod[periodId];
+    if (isInitialLoad && existingData != null && existingData.transactionIds.length > 0) {
         return (0, rxjs_1.from)([]);
     }
     const period = (0, timePeriod_1.convertToPeriod)(selectedPeriod);

package/lib/view/expenseAutomationView/epics/missingReceipts/fetchMultipleBatchDetailsEpic.d.ts

@@ -3,7 +3,6 @@ import { Observable } from 'rxjs';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { batchDetailFetchFailed, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetailsComplete, setInitialBatchDetailsLoading, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof updateTransactions> | ReturnType<typeof storeBatchDetails> | ReturnType<typeof batchDetailFetchFailed> | ReturnType<typeof setInitialBatchDetailsLoading> | ReturnType<typeof fetchMoreBatchDetailsComplete>;
-export declare function fetchBatchDetailsByIds(batchIds: string[], zeniAPI: ZeniAPI): Observable<ActionType>;
+import { fetchBulkUploadBatchesSuccess, storeBatchDetails } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof fetchBulkUploadBatchesSuccess> | ReturnType<typeof updateTransactions> | ReturnType<typeof storeBatchDetails>;
 export declare const fetchMultipleBatchDetailsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -1,62 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchMultipleBatchDetailsEpic = void 0;
-exports.fetchBatchDetailsByIds = fetchBatchDetailsByIds;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const transactionReducer_1 = require("../../../../entity/transaction/transactionReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const missingReceiptsPayload_1 = require("../../payload/missingReceiptsPayload");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
-const INITIAL_BATCH_PAGE_SIZE = 1;
-function fetchBatchDetailsByIds(batchIds, zeniAPI) {
-    if (batchIds.length === 0) {
+const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchBulkUploadBatchesSuccess.match), (0, operators_1.mergeMap)((action) => {
+    const batchList = action.payload.batchList;
+    const { batchDetailsById } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const completedBatchIds = batchList
+        .filter((batch) => batch.status === 'completed' &&
+        batchDetailsById[batch.batchId] == null)
+        .map((batch) => batch.batchId);
+    if (completedBatchIds.length === 0) {
         return rxjs_1.EMPTY;
     }
-    return (0, rxjs_1.from)(batchIds).pipe((0, operators_1.mergeMap)((batchId) => zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
+    return (0, rxjs_1.from)(completedBatchIds).pipe((0, operators_1.mergeMap)((batchId) => zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipts/batches/${batchId}`)
         .pipe((0, operators_1.mergeMap)((response) => {
-        if (!(0, responsePayload_1.isSuccessResponse)(response) ||
-            response.data == null ||
-            !(0, missingReceiptsPayload_1.isBatchDetailsApiStatusCompleted)(response.data.status)) {
-            return rxjs_1.EMPTY;
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const actions = [];
+            const transactionPayloads = (0, missingReceiptsPayload_1.extractTransactionPayloadsFromBatchFiles)(response.data.files);
+            if (transactionPayloads.length > 0) {
+                actions.push((0, transactionReducer_1.updateTransactions)(transactionPayloads, (value) => value.transaction_id));
+            }
+            actions.push((0, missingReceiptsViewReducer_1.storeBatchDetails)((0, missingReceiptsPayload_1.toBatchDetails)(response.data)));
+            return (0, rxjs_1.from)(actions);
         }
-        const actions = [];
-        const transactionPayloads = (0, missingReceiptsPayload_1.extractTransactionPayloadsFromBatchFiles)(response.data.files);
-        if (transactionPayloads.length > 0) {
-            actions.push((0, transactionReducer_1.updateTransactions)(transactionPayloads, (value) => value.transaction_id));
-        }
-        actions.push((0, missingReceiptsViewReducer_1.storeBatchDetails)((0, missingReceiptsPayload_1.toBatchDetails)(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
-        return (0, rxjs_1.from)(actions);
+        return rxjs_1.EMPTY;
     }), (0, operators_1.catchError)((error) => {
         console.error(`Failed to fetch batch details for ${batchId}:`, (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch batch details errored out: ' +
             JSON.stringify(error)));
-        return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.batchDetailFetchFailed)({ batchId }));
-    })), 5));
-}
-const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchBulkUploadBatchesSuccess.match), (0, operators_1.mergeMap)((action) => {
-    const batchList = action.payload.batchList;
-    const { batchDetailsById } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
-    /** Only completed list rows may trigger batch-details API; preserve platform order. */
-    const completedBatchesMissingDetails = (0, missingReceiptsPayload_1.filterBatchListItemsForBatchDetailsFetch)(batchList).filter((batch) => batchDetailsById[batch.batchId] == null);
-    const completedBatchIds = completedBatchesMissingDetails.map((batch) => batch.batchId);
-    const batchIdsToFetch = completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE);
-    if (batchIdsToFetch.length === 0) {
-        /**
-         * List refresh can complete while no row is `completed` yet (multi-fetch skips), or
-         * `currentBatchId` may not appear in the filtered list but still needs `GET /batches/:id`.
-         * Fall back to the single-batch-details epic so `phase` and details can resolve.
-         */
-        const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
-        const currentId = bulkUpload.currentBatchId;
-        if (currentId != null &&
-            bulkUpload.phase === 'matching' &&
-            bulkUpload.batchDetailsById[currentId] == null &&
-            (0, missingReceiptsPayload_1.shouldFetchBatchDetailsForBatchId)(bulkUpload.batchStatusById, bulkUpload.batchListByPeriod, currentId)) {
-            return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails)());
-        }
         return rxjs_1.EMPTY;
-    }
-    return (0, rxjs_1.concat)((0, rxjs_1.of)((0, missingReceiptsViewReducer_1.setInitialBatchDetailsLoading)()), fetchBatchDetailsByIds(batchIdsToFetch, zeniAPI), (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchMoreBatchDetailsComplete)()));
+    })), 5));
 }));
 exports.fetchMultipleBatchDetailsEpic = fetchMultipleBatchDetailsEpic;

package/lib/view/expenseAutomationView/epics/missingReceipts/searchTransactionsForManualMatchEpic.d.ts

@@ -1,14 +1,6 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
+import { ActionsObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
-import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { searchTransactionsForManualMatch, searchTransactionsForManualMatchFailure, searchTransactionsForManualMatchSuccess } from '../../reducers/missingReceiptsViewReducer';
-/**
- * `auto_categorized` for manual transaction search (Unmatched).
- * Backend contract TBD — align with `fetchTransactionCategorizationEpic` (`selectedTab === 'autoCategorized'`)
- * when the expense-automation API documents the intended filter for this flow.
- */
-export declare const MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED = false;
-export type ActionType = ReturnType<typeof searchTransactionsForManualMatch> | ReturnType<typeof searchTransactionsForManualMatchSuccess> | ReturnType<typeof searchTransactionsForManualMatchFailure> | ReturnType<typeof updateTransactions>;
-export declare const searchTransactionsForManualMatchEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export type ActionType = ReturnType<typeof searchTransactionsForManualMatch> | ReturnType<typeof searchTransactionsForManualMatchSuccess> | ReturnType<typeof searchTransactionsForManualMatchFailure>;
+export declare const searchTransactionsForManualMatchEpic: (actions$: ActionsObservable<ActionType>, _state$: unknown, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -1,72 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchTransactionsForManualMatchEpic = exports.MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED = void 0;
+exports.searchTransactionsForManualMatchEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
-const transactionReducer_1 = require("../../../../entity/transaction/transactionReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const missingReceiptsPayload_1 = require("../../payload/missingReceiptsPayload");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
-const transactionsViewState_1 = require("../../types/transactionsViewState");
-/**
- * `auto_categorized` for manual transaction search (Unmatched).
- * Backend contract TBD — align with `fetchTransactionCategorizationEpic` (`selectedTab === 'autoCategorized'`)
- * when the expense-automation API documents the intended filter for this flow.
- */
-exports.MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED = false;
-const searchTransactionsForManualMatchEpic = (actions$, state$, zeniAPI) => {
-    const searchActions$ = actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.searchTransactionsForManualMatch.match));
-    const pagination$ = searchActions$.pipe((0, operators_1.filter)((a) => a.payload.pageToken != null));
-    const newSearch$ = searchActions$.pipe((0, operators_1.filter)((a) => a.payload.pageToken == null), (0, operators_1.debounceTime)(300));
-    return (0, rxjs_1.merge)(pagination$, newSearch$).pipe((0, operators_1.switchMap)((action) => {
-        const { query, pageToken } = action.payload;
-        const state = state$.value;
-        const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload: { manualSearch, sortKey, sortOrder }, }, } = state;
-        const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
-        const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
-        if (selectedPeriod == null) {
-            return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.searchTransactionsForManualMatchFailure)({
-                error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Manual search requires a selected accounting period.'),
-            }));
+const searchTransactionsForManualMatchEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.searchTransactionsForManualMatch.match), (0, operators_1.debounceTime)(300), (0, operators_1.switchMap)((action) => {
+    const { query } = action.payload;
+    const searchQuery = JSON.stringify({
+        search_text: query,
+        search_fields: ['date', 'amount', 'vendor_name'],
+    });
+    const encodedQuery = encodeURIComponent(searchQuery);
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.searchMicroServiceBaseUrl}/1.0/transaction-search?query=${encodedQuery}`)
+        .pipe((0, operators_1.switchMap)((response) => {
+        if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const results = response.data.transactions.map(missingReceiptsPayload_1.toManualSearchResult);
+            return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.searchTransactionsForManualMatchSuccess)(results));
         }
-        const period = (0, timePeriod_1.convertToPeriod)(selectedPeriod);
-        const queryParam = {
-            start_date: period.start,
-            end_date: period.end,
-            auto_categorized: exports.MANUAL_TRANSACTION_SEARCH_AUTO_CATEGORIZED,
-            sort_by: (0, transactionsViewState_1.toTransactionsSortKey)(sortKey),
-            sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
-            page_token: pageToken ?? null,
-            page_size: manualSearch.pageSize,
-            search_text: query,
-        };
-        return zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/expense-automation/transactions?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
-            .pipe((0, operators_1.mergeMap)((response) => {
-            if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
-                const { transactions, next_page_token, total_count } = response.data;
-                const append = pageToken != null;
-                const results = transactions.map(missingReceiptsPayload_1.supportedTransactionPayloadToManualSearchResult);
-                const actionsOut = [
-                    (0, transactionReducer_1.updateTransactions)(transactions, (value) => value.transaction_id, 'merge'),
-                    (0, missingReceiptsViewReducer_1.searchTransactionsForManualMatchSuccess)({
-                        append,
-                        nextPageToken: next_page_token ?? null,
-                        results,
-                        totalCount: total_count,
-                    }),
-                ];
-                return (0, rxjs_1.from)(actionsOut);
-            }
-            return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.searchTransactionsForManualMatchFailure)({
-                error: response.status,
-            }));
-        }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.searchTransactionsForManualMatchFailure)({
-            error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Search transactions for manual match errored: ' +
-                JSON.stringify(error)),
-        }))));
-    }));
-};
+        return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.searchTransactionsForManualMatchFailure)({
+            error: response.status,
+        }));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.searchTransactionsForManualMatchFailure)({
+        error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Search transactions for manual match errored: ' +
+            JSON.stringify(error)),
+    }))));
+}));
 exports.searchTransactionsForManualMatchEpic = searchTransactionsForManualMatchEpic;

package/lib/view/expenseAutomationView/epics/missingReceipts/watchBulkUploadBatchStatusEpic.d.ts

@@ -1,13 +1,15 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetailsSuccess> | ReturnType<typeof fetchBulkUploadBatches> | ReturnType<typeof requestMissingReceiptsTabNavigation> | ReturnType<typeof updateTransactions> | ReturnType<typeof clearBulkUpload>;
+import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, pusherBatchStatusUpdate, updateBulkUploadBatchStatus } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof updateBulkUploadBatchStatus> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof clearBulkUpload>;
 /**
- * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
- * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
+ * Watches batch status using two strategies:
+ * 1. Pusher (primary): Reacts to `pusherBatchStatusUpdate` dispatched by the UI layer
+ *    when a Pusher event arrives. Immediately fetches full details on completion.
+ * 2. Polling (fallback): Starts a relaxed 10s poll after upload success as a safety net
+ *    in case the Pusher event is missed. Stops on completion or `clearBulkUpload`.
  */
 export declare const pusherBatchStatusCompletionEpic: (actions$: ActionsObservable<ActionType>) => Observable<ActionType>;
 export declare const pollBulkUploadBatchStatusEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -3,45 +3,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pollBulkUploadBatchStatusEpic = exports.pusherBatchStatusCompletionEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const transactionReducer_1 = require("../../../../entity/transaction/transactionReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const missingReceiptsPayload_1 = require("../../payload/missingReceiptsPayload");
 const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsViewReducer");
-/** First poll after upload; then interval while batch not resolved via Pusher or API. */
-const FALLBACK_FIRST_DELAY_MS = 30000;
-const FALLBACK_POLL_INTERVAL_MS = 10000;
 /**
- * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
- * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
+ * Watches batch status using two strategies:
+ * 1. Pusher (primary): Reacts to `pusherBatchStatusUpdate` dispatched by the UI layer
+ *    when a Pusher event arrives. Immediately fetches full details on completion.
+ * 2. Polling (fallback): Starts a relaxed 10s poll after upload success as a safety net
+ *    in case the Pusher event is missed. Stops on completion or `clearBulkUpload`.
  */
-const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.pusherBatchStatusUpdate.match), (0, operators_1.filter)((action) => action.payload.status === 'completed'), (0, operators_1.debounceTime)(300), (0, operators_1.mergeMap)(() => (0, rxjs_1.from)([
-    (0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)({
-        cacheOverride: true,
-        invalidateBatchDetailsCache: true,
-    }),
-    (0, missingReceiptsViewReducer_1.requestMissingReceiptsTabNavigation)({ tab: 'unmatched' }),
-])));
+// Pusher-driven: when Pusher delivers a completed status, fetch details
+const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.pusherBatchStatusUpdate.match), (0, operators_1.filter)((action) => action.payload.status === 'completed'), (0, operators_1.mergeMap)(() => (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails)())));
 exports.pusherBatchStatusCompletionEpic = pusherBatchStatusCompletionEpic;
-const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.bulkUploadReceiptsSuccess.match), (0, operators_1.mergeMap)((action) => {
+// Polling fallback: relaxed interval as safety net
+const FALLBACK_POLL_INTERVAL_MS = 10000;
+const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.bulkUploadReceiptsSuccess.match), (0, operators_1.switchMap)((action) => {
     const { batchId } = action.payload;
-    return (0, rxjs_1.timer)(FALLBACK_FIRST_DELAY_MS, FALLBACK_POLL_INTERVAL_MS).pipe((0, operators_1.takeUntil)((0, rxjs_1.merge)(actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.clearBulkUpload.match)), actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.pusherBatchStatusUpdate.match), (0, operators_1.filter)((a) => a.payload.batchId === batchId)), actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess.match), (0, operators_1.filter)((a) => a.payload.batchId === batchId)))), (0, operators_1.switchMap)(() => zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
+    return (0, rxjs_1.timer)(0, FALLBACK_POLL_INTERVAL_MS).pipe((0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)((a) => missingReceiptsViewReducer_1.clearBulkUpload.match(a) ||
+        (missingReceiptsViewReducer_1.pusherBatchStatusUpdate.match(a) &&
+            a.payload.status === 'completed')))), (0, operators_1.switchMap)(() => zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipts/batches/${batchId}/status`)
         .pipe((0, operators_1.mergeMap)((response) => {
-        /** Same batch-details URL; polls until `status` is completed (Pusher may win first). */
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
-            if ((0, missingReceiptsPayload_1.isBatchDetailsApiStatusCompleted)(response.data.status)) {
-                const actions = [];
-                const transactionPayloads = (0, missingReceiptsPayload_1.extractTransactionPayloadsFromBatchFiles)(response.data.files);
-                if (transactionPayloads.length > 0) {
-                    actions.push((0, transactionReducer_1.updateTransactions)(transactionPayloads, (value) => value.transaction_id));
-                }
-                actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess)((0, missingReceiptsPayload_1.toBatchDetails)(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
-                actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)(true));
-                actions.push((0, missingReceiptsViewReducer_1.requestMissingReceiptsTabNavigation)({ tab: 'unmatched' }));
-                return (0, rxjs_1.from)(actions);
+            const batchStatus = (0, missingReceiptsPayload_1.toBatchStatus)(response.data);
+            const actions = [
+                (0, missingReceiptsViewReducer_1.updateBulkUploadBatchStatus)(batchStatus),
+            ];
+            if (batchStatus.status === 'completed') {
+                actions.push((0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails)());
             }
+            return actions;
+        }
+        return [];
+    }), (0, operators_1.catchError)(() => (0, rxjs_1.of)()))), (0, operators_1.takeWhile)((action) => {
+        if (missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails.match(action)) {
+            return false;
         }
-        return rxjs_1.EMPTY;
-    }), (0, operators_1.catchError)(() => (0, rxjs_1.of)()))));
+        return true;
+    }, true));
 }));
 exports.pollBulkUploadBatchStatusEpic = pollBulkUploadBatchStatusEpic;

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

@@ -2,7 +2,6 @@ import { URLPayload } from '../../../commonPayloadTypes/urlPayload';
 import { TransactionPayload } from '../../../entity/transaction/payloadTypes/transactionPayload';
 import { SupportedTransactionPayload } from '../../../entity/transaction/transactionState';
 import { ZeniAPIResponse } from '../../../responsePayload';
-import type { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import type { BatchDetails, BatchFile, BatchListItem, BatchStatus, BatchSummary, ManualSearchResult } from '../types/missingReceiptsViewState';
 export interface MissingReceiptsQueryPayload {
     end_date: string;
@@ -17,17 +16,21 @@ interface MissingReceiptsPayload {
     transactions: TransactionPayload[];
 }
 export type MissingReceiptsResponse = ZeniAPIResponse<MissingReceiptsPayload>;
-export interface BatchListQueryPayload {
-    end_date: string;
-    sort_order: string;
-    start_date: string;
-}
 export interface BulkUploadResponsePayload {
     batch_id: string;
     status: string;
     total_files: number;
 }
 export type BulkUploadResponse = ZeniAPIResponse<BulkUploadResponsePayload>;
+export interface BatchStatusResponsePayload {
+    batch_id: string;
+    progress: {
+        processed: number;
+        total: number;
+    };
+    status: string;
+}
+export type BatchStatusResponse = ZeniAPIResponse<BatchStatusResponsePayload>;
 export interface BatchListResponsePayload {
     batches: BatchListItemPayload[];
 }
@@ -78,33 +81,31 @@ export interface BatchDetailsResponsePayload {
     };
 }
 export type BatchDetailsResponse = ZeniAPIResponse<BatchDetailsResponsePayload>;
-export declare function toBatchFile(payload: BatchFilePayload, filesEndPoint?: string): BatchFile;
+export declare function toBatchFile(payload: BatchFilePayload): BatchFile;
 export declare function extractTransactionPayloadsFromBatchFiles(files: BatchFilePayload[]): SupportedTransactionPayload[];
 export declare function toBatchSummary(payload: BatchDetailsResponsePayload['summary']): BatchSummary;
-export declare function toBatchDetails(payload: BatchDetailsResponsePayload, filesEndPoint?: string): BatchDetails;
-/** Batch list `status` is a string from the API — compare case-insensitively. */
-export declare function isBatchListStatusCompleted(status: string): boolean;
-/**
- * Subset of the get-all-batches (`/batches?query=...`) list that is eligible for
- * `GET /batches/:batchId` details fetches. The stored list may include pending, failed, or other
- * statuses for UI; only `completed` rows should trigger batch-details requests.
- */
-export declare function filterBatchListItemsForBatchDetailsFetch(batches: BatchListItem[]): BatchListItem[];
-/**
- * Batch details API response `status` field — only completed payloads should be stored from
- * multi-batch fetch paths (list can be briefly stale vs. live processing state).
- */
-export declare function isBatchDetailsApiStatusCompleted(status: string): boolean;
-export declare function findBatchListItemForBatchId(batchListByPeriod: Record<MonthYearPeriodId, BatchListItem[]>, batchId: string): BatchListItem | undefined;
-/**
- * Whether it is appropriate to call `GET .../batches/:id` for details.
- * Skips when live batch status or batch list row indicates the batch is not completed yet.
- * When status is unknown in both sources, allows the request (e.g. dispatch before list refresh).
- */
-export declare function shouldFetchBatchDetailsForBatchId(batchStatusById: Record<string, BatchStatus>, batchListByPeriod: Record<MonthYearPeriodId, BatchListItem[]>, batchId: string): boolean;
+export declare function toBatchStatus(payload: BatchStatusResponsePayload): BatchStatus;
+export declare function toBatchDetails(payload: BatchDetailsResponsePayload): BatchDetails;
 export declare function toBatchListItem(payload: BatchListItemPayload): BatchListItem;
-/** Maps expense-automation transaction rows to manual-search list rows (Unmatched tab). */
-export declare function supportedTransactionPayloadToManualSearchResult(payload: SupportedTransactionPayload): ManualSearchResult;
+export interface TransactionSearchQueryPayload {
+    search_text: string;
+    search_fields?: string[];
+}
+export interface TransactionSearchItemPayload {
+    amount: number;
+    currency: string;
+    entity_id: string;
+    memo: string;
+    transaction_date: string;
+    transaction_id: string;
+    transaction_type: string;
+    vendor_name: string;
+}
+export interface TransactionSearchResponsePayload {
+    transactions: TransactionSearchItemPayload[];
+}
+export type TransactionSearchResponse = ZeniAPIResponse<TransactionSearchResponsePayload>;
+export declare function toManualSearchResult(payload: TransactionSearchItemPayload): ManualSearchResult;
 export interface CompletedTransactionsQueryPayload {
     end_date?: string;
     match_type?: string;