@zeniai/client-epic-state 4.19.37-betaVR2 → 4.19.37-betaVR21

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

@@ -6,6 +6,8 @@ import { TransactionPayload } from '../../../entity/transaction/payloadTypes/tra
 import { SupportedTransactionPayload } from '../../../entity/transaction/transactionState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import type { BatchDetails, BatchListItem, BatchStatus, BulkUploadResultsTab, BulkUploadSortKey, BulkUploadState, CompletedSubTab, ManualSearchResult, MissingReceiptsViewState, MissingReceiptsViewUIState } from '../types/missingReceiptsViewState';
+import type { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+export declare const getCompletedTransactionsCacheKey: (periodId: MonthYearPeriodId, sortKey: BulkUploadSortKey, sortOrder: SortOrder, subTab: CompletedSubTab) => string;
 export declare const initialBulkUploadState: BulkUploadState;
 export declare const initialState: MissingReceiptsViewState;
 export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, minimumTransactionAmount: Amount, cacheOverride?: any, refreshViewInBackground?: any], {
@@ -34,9 +36,15 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
     batchId: ID;
 }, "expenseAutomationMissingReceiptsView/bulkUploadReceiptsSuccess">, bulkUploadReceiptsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
-}, "expenseAutomationMissingReceiptsView/bulkUploadReceiptsFailure">, updateBulkUploadBatchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchStatus, "expenseAutomationMissingReceiptsView/updateBulkUploadBatchStatus">, pusherBatchStatusUpdate: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchStatus, "expenseAutomationMissingReceiptsView/pusherBatchStatusUpdate">, fetchBulkUploadBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetails">, fetchBulkUploadBatchDetailsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchDetails, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetailsSuccess">, fetchBulkUploadBatchDetailsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "expenseAutomationMissingReceiptsView/bulkUploadReceiptsFailure">, pusherBatchStatusUpdate: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchStatus, "expenseAutomationMissingReceiptsView/pusherBatchStatusUpdate">, requestMissingReceiptsTabNavigation: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    tab: BulkUploadResultsTab;
+}, "expenseAutomationMissingReceiptsView/requestMissingReceiptsTabNavigation">, clearMissingReceiptsTabNavigation: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/clearMissingReceiptsTabNavigation">, fetchBulkUploadBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetails">, fetchBulkUploadBatchDetailsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchDetails, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetailsSuccess">, fetchBulkUploadBatchDetailsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
-}, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetailsFailure">, storeBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchDetails, "expenseAutomationMissingReceiptsView/storeBatchDetails">, fetchBulkUploadBatches: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any], {
+}, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatchDetailsFailure">, storeBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithPayload<BatchDetails, "expenseAutomationMissingReceiptsView/storeBatchDetails">, batchDetailFetchFailed: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    batchId: ID;
+}, "expenseAutomationMissingReceiptsView/batchDetailFetchFailed">, setInitialBatchDetailsLoading: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/setInitialBatchDetailsLoading">, fetchMoreBatchDetails: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchMoreBatchDetails">, fetchMoreBatchDetailsComplete: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/fetchMoreBatchDetailsComplete">, fetchMoreBatchDetailsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    error: ZeniAPIStatus;
+}, "expenseAutomationMissingReceiptsView/fetchMoreBatchDetailsFailure">, fetchBulkUploadBatches: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any], {
     cacheOverride: any;
 }, "expenseAutomationMissingReceiptsView/fetchBulkUploadBatches", never, never>, fetchBulkUploadBatchesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     batchList: BatchListItem[];
@@ -59,12 +67,19 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
 }, "expenseAutomationMissingReceiptsView/confirmBulkUploadMatchFailure">, setBulkUploadResultsTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<BulkUploadResultsTab, "expenseAutomationMissingReceiptsView/setBulkUploadResultsTab">, setBulkUploadCompletedSubTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<CompletedSubTab, "expenseAutomationMissingReceiptsView/setBulkUploadCompletedSubTab">, setBulkUploadSortConfig: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     sortKey: BulkUploadSortKey;
     sortOrder: SortOrder;
-}, "expenseAutomationMissingReceiptsView/setBulkUploadSortConfig">, clearBulkUpload: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/clearBulkUpload">, searchTransactionsForManualMatch: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[query: string], {
+}, "expenseAutomationMissingReceiptsView/setBulkUploadSortConfig">, clearBulkUpload: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/clearBulkUpload">, searchTransactionsForManualMatch: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[query: string, pageToken?: string | null | undefined], {
     query: string;
-}, "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatch", never, never>, searchTransactionsForManualMatchSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<ManualSearchResult[], "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatchSuccess">, searchTransactionsForManualMatchFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    pageToken: string | undefined;
+}, "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatch", never, never>, searchTransactionsForManualMatchSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    append: boolean;
+    nextPageToken: string | null;
+    results: ManualSearchResult[];
+    totalCount: number;
+}, "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatchSuccess">, searchTransactionsForManualMatchFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
-}, "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatchFailure">, clearManualSearchResults: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/clearManualSearchResults">, fetchCompletedTransactions: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[pageToken?: string | undefined], {
+}, "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatchFailure">, clearManualSearchResults: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/clearManualSearchResults">, fetchCompletedTransactions: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[pageToken?: string | undefined, cacheOverride?: boolean | undefined], {
     pageToken: string | undefined;
+    cacheOverride: boolean | undefined;
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactions", never, never>, fetchCompletedTransactionsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     isInitialLoad: boolean;
     nextPageToken: string | null;

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

@@ -1,11 +1,14 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchCompletedTransactionsFailure = exports.fetchCompletedTransactionsSuccess = exports.fetchCompletedTransactions = exports.clearManualSearchResults = exports.searchTransactionsForManualMatchFailure = exports.searchTransactionsForManualMatchSuccess = exports.searchTransactionsForManualMatch = exports.clearBulkUpload = exports.setBulkUploadSortConfig = exports.setBulkUploadCompletedSubTab = exports.setBulkUploadResultsTab = exports.confirmBulkUploadMatchFailure = exports.confirmBulkUploadMatchSuccess = exports.confirmBulkUploadMatch = exports.fetchBulkUploadBatchesFailure = exports.fetchBulkUploadBatchesSuccess = exports.fetchBulkUploadBatches = exports.storeBatchDetails = exports.fetchBulkUploadBatchDetailsFailure = exports.fetchBulkUploadBatchDetailsSuccess = exports.fetchBulkUploadBatchDetails = exports.pusherBatchStatusUpdate = exports.updateBulkUploadBatchStatus = exports.bulkUploadReceiptsFailure = exports.bulkUploadReceiptsSuccess = exports.updateBulkUploadProgress = exports.bulkUploadReceipts = exports.clearExpenseAutomationMissingReceiptsView = exports.markMissingReceiptAsDone = exports.updateMissingReceiptsUIState = exports.updateMissingReceiptUploadState = exports.uploadMissingReceiptSuccess = exports.fetchMissingReceiptsFailure = exports.fetchMissingReceiptsSuccess = exports.fetchMissingReceipts = exports.initialState = exports.initialBulkUploadState = void 0;
+exports.fetchCompletedTransactionsFailure = exports.fetchCompletedTransactionsSuccess = exports.fetchCompletedTransactions = exports.clearManualSearchResults = exports.searchTransactionsForManualMatchFailure = exports.searchTransactionsForManualMatchSuccess = exports.searchTransactionsForManualMatch = exports.clearBulkUpload = exports.setBulkUploadSortConfig = exports.setBulkUploadCompletedSubTab = exports.setBulkUploadResultsTab = exports.confirmBulkUploadMatchFailure = exports.confirmBulkUploadMatchSuccess = exports.confirmBulkUploadMatch = exports.fetchBulkUploadBatchesFailure = exports.fetchBulkUploadBatchesSuccess = exports.fetchBulkUploadBatches = exports.fetchMoreBatchDetailsFailure = exports.fetchMoreBatchDetailsComplete = exports.fetchMoreBatchDetails = exports.setInitialBatchDetailsLoading = exports.batchDetailFetchFailed = exports.storeBatchDetails = exports.fetchBulkUploadBatchDetailsFailure = exports.fetchBulkUploadBatchDetailsSuccess = exports.fetchBulkUploadBatchDetails = exports.clearMissingReceiptsTabNavigation = exports.requestMissingReceiptsTabNavigation = exports.pusherBatchStatusUpdate = exports.bulkUploadReceiptsFailure = exports.bulkUploadReceiptsSuccess = exports.updateBulkUploadProgress = exports.bulkUploadReceipts = exports.clearExpenseAutomationMissingReceiptsView = exports.markMissingReceiptAsDone = exports.updateMissingReceiptsUIState = exports.updateMissingReceiptUploadState = exports.uploadMissingReceiptSuccess = exports.fetchMissingReceiptsFailure = exports.fetchMissingReceiptsSuccess = exports.fetchMissingReceipts = exports.initialState = exports.initialBulkUploadState = exports.getCompletedTransactionsCacheKey = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
+const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => `completed-${subTab}-${sortKey}-${sortOrder === 'ascending' ? 'asc' : 'desc'}-${periodId}`;
+exports.getCompletedTransactionsCacheKey = getCompletedTransactionsCacheKey;
 exports.initialBulkUploadState = {
     batchDetailsById: {},
+    batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
     batchListByPeriod: {},
     batchListFetchState: { fetchState: 'Not-Started', error: undefined },
     batchStatusById: {},
@@ -14,10 +17,15 @@ exports.initialBulkUploadState = {
     confirmMatchStatus: { fetchState: 'Not-Started', error: undefined },
     currentBatchId: undefined,
     currentResultsTab: 'unmatched',
+    failedBatchDetailIds: [],
     manualSearch: {
         fetchState: { fetchState: 'Not-Started', error: undefined },
+        isLoadingMore: false,
+        nextPageToken: null,
+        pageSize: 25,
         results: [],
         searchQuery: '',
+        totalCount: 0,
     },
     phase: 'idle',
     sortKey: 'date',
@@ -27,6 +35,7 @@ exports.initialBulkUploadState = {
 };
 exports.initialState = {
     bulkUpload: exports.initialBulkUploadState,
+    pendingMissingReceiptsTabNavigation: null,
     uploadReceiptStatusById: {},
     refreshStatus: {
         fetchState: 'Not-Started',
@@ -179,14 +188,16 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
             };
             draft.bulkUpload.phase = 'idle';
         },
-        updateBulkUploadBatchStatus(draft, action) {
-            const batchStatus = action.payload;
-            draft.bulkUpload.batchStatusById[batchStatus.batchId] = batchStatus;
-        },
         pusherBatchStatusUpdate(draft, action) {
             const batchStatus = action.payload;
             draft.bulkUpload.batchStatusById[batchStatus.batchId] = batchStatus;
         },
+        requestMissingReceiptsTabNavigation(draft, action) {
+            draft.pendingMissingReceiptsTabNavigation = action.payload.tab;
+        },
+        clearMissingReceiptsTabNavigation(draft) {
+            draft.pendingMissingReceiptsTabNavigation = null;
+        },
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         fetchBulkUploadBatchDetails(_draft) {
             // trigger epic, no state change needed
@@ -203,6 +214,58 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         storeBatchDetails(draft, action) {
             const details = action.payload;
             draft.bulkUpload.batchDetailsById[details.batchId] = details;
+            /**
+             * Multi-batch fetch paths use `storeBatchDetails` (not `fetchBulkUploadBatchDetailsSuccess`).
+             * Without this, `phase` stays `matching` after upload forever and the Unmatched tab keeps
+             * showing the skeleton (`bulkUploadPhase === 'matching'` in web-components).
+             */
+            if (draft.bulkUpload.phase === 'matching' &&
+                draft.bulkUpload.currentBatchId === details.batchId) {
+                draft.bulkUpload.phase = 'completed';
+            }
+        },
+        batchDetailFetchFailed(draft, action) {
+            const { batchId } = action.payload;
+            if (!draft.bulkUpload.failedBatchDetailIds.includes(batchId)) {
+                draft.bulkUpload.failedBatchDetailIds.push(batchId);
+            }
+            if (draft.bulkUpload.phase === 'matching' &&
+                draft.bulkUpload.currentBatchId === batchId) {
+                draft.bulkUpload.phase = 'completed';
+            }
+        },
+        setInitialBatchDetailsLoading(draft) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+        },
+        fetchMoreBatchDetails(_draft) {
+            _draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+        },
+        fetchMoreBatchDetailsComplete(draft) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            const currentId = draft.bulkUpload.currentBatchId;
+            const currentDetails = currentId != null
+                ? draft.bulkUpload.batchDetailsById[currentId]
+                : undefined;
+            if (draft.bulkUpload.phase === 'matching' &&
+                currentId != null &&
+                currentDetails?.status === 'completed') {
+                draft.bulkUpload.phase = 'completed';
+            }
+        },
+        fetchMoreBatchDetailsFailure(draft, action) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
         },
         fetchBulkUploadBatches: {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -277,7 +340,6 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         },
         setBulkUploadCompletedSubTab(draft, action) {
             draft.bulkUpload.completedSubTab = action.payload;
-            draft.bulkUpload.completedTransactionsByPeriod = {};
         },
         setBulkUploadSortConfig(draft, action) {
             draft.bulkUpload.sortKey = action.payload.sortKey;
@@ -285,28 +347,51 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         },
         clearBulkUpload(draft) {
             Object.assign(draft.bulkUpload, exports.initialBulkUploadState);
+            draft.pendingMissingReceiptsTabNavigation = null;
         },
         searchTransactionsForManualMatch: {
             reducer(draft, action) {
-                draft.bulkUpload.manualSearch.searchQuery = action.payload.query;
-                draft.bulkUpload.manualSearch.fetchState = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-                draft.bulkUpload.manualSearch.results = [];
+                const { query, pageToken } = action.payload;
+                const isLoadMore = pageToken != null;
+                draft.bulkUpload.manualSearch.searchQuery = query;
+                if (isLoadMore) {
+                    draft.bulkUpload.manualSearch.isLoadingMore = true;
+                }
+                else {
+                    draft.bulkUpload.manualSearch.isLoadingMore = false;
+                    draft.bulkUpload.manualSearch.results = [];
+                    draft.bulkUpload.manualSearch.nextPageToken = null;
+                    draft.bulkUpload.manualSearch.totalCount = 0;
+                    draft.bulkUpload.manualSearch.fetchState = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                }
             },
-            prepare(query) {
-                return { payload: { query } };
+            prepare(query, pageToken) {
+                return { payload: { query, pageToken: pageToken ?? undefined } };
             },
         },
         searchTransactionsForManualMatchSuccess(draft, action) {
-            draft.bulkUpload.manualSearch.results = action.payload;
+            const { append, nextPageToken, results, totalCount } = action.payload;
+            if (append) {
+                const merged = [...draft.bulkUpload.manualSearch.results, ...results];
+                const byId = new Map(merged.map((r) => [r.transactionId, r]));
+                draft.bulkUpload.manualSearch.results = Array.from(byId.values());
+            }
+            else {
+                draft.bulkUpload.manualSearch.results = results;
+            }
+            draft.bulkUpload.manualSearch.nextPageToken = nextPageToken;
+            draft.bulkUpload.manualSearch.totalCount = totalCount;
+            draft.bulkUpload.manualSearch.isLoadingMore = false;
             draft.bulkUpload.manualSearch.fetchState = {
                 fetchState: 'Completed',
                 error: undefined,
             };
         },
         searchTransactionsForManualMatchFailure(draft, action) {
+            draft.bulkUpload.manualSearch.isLoadingMore = false;
             draft.bulkUpload.manualSearch.fetchState = {
                 fetchState: 'Error',
                 error: action.payload.error,
@@ -332,15 +417,16 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                     }
                 }
             },
-            prepare(pageToken) {
-                return { payload: { pageToken } };
+            prepare(pageToken, cacheOverride) {
+                return { payload: { pageToken, cacheOverride } };
             },
         },
         fetchCompletedTransactionsSuccess(draft, action) {
             const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad } = action.payload;
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
+            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
             if (isInitialLoad) {
-                draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     transactionIds,
                     nextPageToken,
                     totalCount,
@@ -348,7 +434,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                 };
             }
             else {
-                const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+                const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
                 if (existing != null) {
                     existing.transactionIds.push(...transactionIds);
                     existing.nextPageToken = nextPageToken;
@@ -356,7 +442,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                     existing.fetchState = { fetchState: 'Completed', error: undefined };
                 }
                 else {
-                    draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                    draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                         transactionIds,
                         nextPageToken,
                         totalCount,
@@ -367,7 +453,8 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         },
         fetchCompletedTransactionsFailure(draft, action) {
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod);
-            const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
             if (existing != null) {
                 existing.fetchState = {
                     fetchState: 'Error',
@@ -375,7 +462,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                 };
             }
             else {
-                draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     fetchState: { fetchState: 'Error', error: action.payload.error },
                     nextPageToken: null,
                     totalCount: 0,
@@ -387,7 +474,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
 });
 _a = expenseAutomationMissingReceiptsView.actions, exports.fetchMissingReceipts = _a.fetchMissingReceipts, exports.fetchMissingReceiptsSuccess = _a.fetchMissingReceiptsSuccess, exports.fetchMissingReceiptsFailure = _a.fetchMissingReceiptsFailure, exports.uploadMissingReceiptSuccess = _a.uploadMissingReceiptSuccess, exports.updateMissingReceiptUploadState = _a.updateMissingReceiptUploadState, exports.updateMissingReceiptsUIState = _a.updateMissingReceiptsUIState, exports.markMissingReceiptAsDone = _a.markMissingReceiptAsDone, exports.clearExpenseAutomationMissingReceiptsView = _a.clearExpenseAutomationMissingReceiptsView, 
 // Bulk Upload
-exports.bulkUploadReceipts = _a.bulkUploadReceipts, exports.updateBulkUploadProgress = _a.updateBulkUploadProgress, exports.bulkUploadReceiptsSuccess = _a.bulkUploadReceiptsSuccess, exports.bulkUploadReceiptsFailure = _a.bulkUploadReceiptsFailure, exports.updateBulkUploadBatchStatus = _a.updateBulkUploadBatchStatus, exports.pusherBatchStatusUpdate = _a.pusherBatchStatusUpdate, exports.fetchBulkUploadBatchDetails = _a.fetchBulkUploadBatchDetails, exports.fetchBulkUploadBatchDetailsSuccess = _a.fetchBulkUploadBatchDetailsSuccess, exports.fetchBulkUploadBatchDetailsFailure = _a.fetchBulkUploadBatchDetailsFailure, exports.storeBatchDetails = _a.storeBatchDetails, exports.fetchBulkUploadBatches = _a.fetchBulkUploadBatches, exports.fetchBulkUploadBatchesSuccess = _a.fetchBulkUploadBatchesSuccess, exports.fetchBulkUploadBatchesFailure = _a.fetchBulkUploadBatchesFailure, exports.confirmBulkUploadMatch = _a.confirmBulkUploadMatch, exports.confirmBulkUploadMatchSuccess = _a.confirmBulkUploadMatchSuccess, exports.confirmBulkUploadMatchFailure = _a.confirmBulkUploadMatchFailure, exports.setBulkUploadResultsTab = _a.setBulkUploadResultsTab, exports.setBulkUploadCompletedSubTab = _a.setBulkUploadCompletedSubTab, exports.setBulkUploadSortConfig = _a.setBulkUploadSortConfig, exports.clearBulkUpload = _a.clearBulkUpload, exports.searchTransactionsForManualMatch = _a.searchTransactionsForManualMatch, exports.searchTransactionsForManualMatchSuccess = _a.searchTransactionsForManualMatchSuccess, exports.searchTransactionsForManualMatchFailure = _a.searchTransactionsForManualMatchFailure, exports.clearManualSearchResults = _a.clearManualSearchResults, 
+exports.bulkUploadReceipts = _a.bulkUploadReceipts, exports.updateBulkUploadProgress = _a.updateBulkUploadProgress, exports.bulkUploadReceiptsSuccess = _a.bulkUploadReceiptsSuccess, exports.bulkUploadReceiptsFailure = _a.bulkUploadReceiptsFailure, exports.pusherBatchStatusUpdate = _a.pusherBatchStatusUpdate, exports.requestMissingReceiptsTabNavigation = _a.requestMissingReceiptsTabNavigation, exports.clearMissingReceiptsTabNavigation = _a.clearMissingReceiptsTabNavigation, exports.fetchBulkUploadBatchDetails = _a.fetchBulkUploadBatchDetails, exports.fetchBulkUploadBatchDetailsSuccess = _a.fetchBulkUploadBatchDetailsSuccess, exports.fetchBulkUploadBatchDetailsFailure = _a.fetchBulkUploadBatchDetailsFailure, exports.storeBatchDetails = _a.storeBatchDetails, exports.batchDetailFetchFailed = _a.batchDetailFetchFailed, exports.setInitialBatchDetailsLoading = _a.setInitialBatchDetailsLoading, exports.fetchMoreBatchDetails = _a.fetchMoreBatchDetails, exports.fetchMoreBatchDetailsComplete = _a.fetchMoreBatchDetailsComplete, exports.fetchMoreBatchDetailsFailure = _a.fetchMoreBatchDetailsFailure, exports.fetchBulkUploadBatches = _a.fetchBulkUploadBatches, exports.fetchBulkUploadBatchesSuccess = _a.fetchBulkUploadBatchesSuccess, exports.fetchBulkUploadBatchesFailure = _a.fetchBulkUploadBatchesFailure, exports.confirmBulkUploadMatch = _a.confirmBulkUploadMatch, exports.confirmBulkUploadMatchSuccess = _a.confirmBulkUploadMatchSuccess, exports.confirmBulkUploadMatchFailure = _a.confirmBulkUploadMatchFailure, exports.setBulkUploadResultsTab = _a.setBulkUploadResultsTab, exports.setBulkUploadCompletedSubTab = _a.setBulkUploadCompletedSubTab, exports.setBulkUploadSortConfig = _a.setBulkUploadSortConfig, exports.clearBulkUpload = _a.clearBulkUpload, exports.searchTransactionsForManualMatch = _a.searchTransactionsForManualMatch, exports.searchTransactionsForManualMatchSuccess = _a.searchTransactionsForManualMatchSuccess, exports.searchTransactionsForManualMatchFailure = _a.searchTransactionsForManualMatchFailure, exports.clearManualSearchResults = _a.clearManualSearchResults, 
 // Completed Transactions
 exports.fetchCompletedTransactions = _a.fetchCompletedTransactions, exports.fetchCompletedTransactionsSuccess = _a.fetchCompletedTransactionsSuccess, exports.fetchCompletedTransactionsFailure = _a.fetchCompletedTransactionsFailure;
 exports.default = expenseAutomationMissingReceiptsView.reducer;

package/lib/view/expenseAutomationView/selectorTypes/missingReceiptsSelectorTypes.d.ts

@@ -15,9 +15,11 @@ export interface ResolvedCandidate {
 }
 export interface ResolvedBatchFile {
     attachmentId: ID;
+    batchId: ID;
+    fileDownloadUrl: string | null;
     fileId: ID;
     filename: string;
-    filePreviewUrl: string;
+    filePreviewUrl: string | null;
     status: BatchFileStatus;
     candidates?: ResolvedCandidate[];
     matchedTransaction?: SupportedTransaction;
@@ -25,6 +27,7 @@ export interface ResolvedBatchFile {
 }
 export interface BulkUploadSelectorData {
     batchDetails: ResolvedBatchDetails | undefined;
+    batchDetailsPaginationState: FetchStateAndError;
     batchList: BatchListItem[];
     batchListFetchState: FetchStateAndError;
     batchStatus: BatchStatus | undefined;
@@ -32,6 +35,7 @@ export interface BulkUploadSelectorData {
     completedTransactions: CompletedTransactionsSelectorData;
     confirmMatchStatus: FetchStateAndError;
     currentResultsTab: BulkUploadResultsTab;
+    hasMoreBatchDetails: boolean;
     manualSearch: ManualSearchState;
     matchedFiles: ResolvedBatchFile[];
     pastBatches: BatchListItem[];
@@ -64,6 +68,8 @@ export interface ResolvedBatchDetails {
 export interface ExpenseAutomationMissingReceiptsViewSelector extends SelectorView {
     bulkUpload: BulkUploadSelectorData;
     completionStatus: CompletionStatusType;
+    /** When set, UI should switch bulk-upload sub-tab once (e.g. Unmatched on batch completion). */
+    pendingMissingReceiptsTabNavigation: BulkUploadResultsTab | null;
     refreshStatus: FetchStateAndError;
     transactions: SupportedTransaction[];
     uiState: MissingReceiptsViewUIState;

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

@@ -9,6 +9,8 @@ const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
+const missingReceiptsPayload_1 = require("../payload/missingReceiptsPayload");
+const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewReducer");
 function getExpenseAutomationMissingReceiptsView(state) {
     const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -53,14 +55,34 @@ function getExpenseAutomationMissingReceiptsView(state) {
     const completionStatus = missingReceiptsCompletionStatus != null
         ? missingReceiptsCompletionStatus
         : 'incomplete';
-    const { bulkUpload } = expenseAutomationMissingReceiptsViewState;
+    const { bulkUpload, pendingMissingReceiptsTabNavigation, } = expenseAutomationMissingReceiptsViewState;
     const currentBatchStatus = bulkUpload.currentBatchId != null
         ? bulkUpload.batchStatusById[bulkUpload.currentBatchId]
         : undefined;
-    const currentBatchDetails = bulkUpload.currentBatchId != null
-        ? bulkUpload.batchDetailsById[bulkUpload.currentBatchId]
+    const batchList = monthYearPeriodId != null
+        ? bulkUpload.batchListByPeriod[monthYearPeriodId] ?? []
+        : [];
+    /** API returns newest-first (`sort_order: desc`); primary batch uses oldest-first order. */
+    const batchListChronological = (0, orderBy_1.default)(batchList, (b) => new Date(b.createdAt).valueOf(), 'asc');
+    /**
+     * Primary "Unmatched" batch = first completed batch in chronological order, preferring the
+     * first batch that still has un_matched/no_match work when any completed batch has such work.
+     * Batches without details yet: wait if the list row still reports unmatched work; otherwise skip
+     * so we do not block the whole tab while older rows are not fetched yet.
+     */
+    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchListChronological, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
+    /** During upload/matching, the in-flight batch may not appear in batchList yet — prefer currentBatchId. */
+    const unmatchedSectionBatchId = bulkUpload.phase === 'matching' || bulkUpload.phase === 'uploading'
+        ? bulkUpload.currentBatchId ?? primaryBatchIdFromDetailsOrder
+        : primaryBatchIdFromDetailsOrder;
+    const completedBatchesInApiOrder = batchList.filter((b) => (0, missingReceiptsPayload_1.isBatchListStatusCompleted)(b.status));
+    const currentBatchDetails = unmatchedSectionBatchId != null
+        ? bulkUpload.batchDetailsById[unmatchedSectionBatchId]
         : undefined;
-    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, transactionState));
+    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, currentBatchDetails.batchId, transactionState));
+    const failedIds = new Set(bulkUpload.failedBatchDetailIds);
+    const hasMoreBatchDetails = completedBatchesInApiOrder.some((b) => bulkUpload.batchDetailsById[b.batchId] == null &&
+        !failedIds.has(b.batchId));
     const getSortValue = (file) => {
         const t = file.matchedTransaction;
         if (t == null) {
@@ -98,11 +120,14 @@ function getExpenseAutomationMissingReceiptsView(state) {
                 : 0,
         }
         : { total: 0, processed: 0, percentage: 0 };
-    const batchList = monthYearPeriodId != null
-        ? bulkUpload.batchListByPeriod[monthYearPeriodId] ?? []
-        : [];
     const batchListFetchState = bulkUpload.batchListFetchState;
-    const pastBatches = batchList.filter((b) => b.batchId !== bulkUpload.currentBatchId);
+    /**
+     * When primary batch is not resolved yet, still aggregate unmatched files from every batch
+     * that has details loaded (otherwise past is empty and receipts vanish from the UI).
+     */
+    const pastBatches = unmatchedSectionBatchId != null
+        ? batchList.filter((b) => b.batchId !== unmatchedSectionBatchId)
+        : batchList;
     const pastUnmatchedFiles = pastBatches.flatMap((b) => {
         const details = bulkUpload.batchDetailsById[b.batchId];
         if (details == null) {
@@ -110,10 +135,13 @@ function getExpenseAutomationMissingReceiptsView(state) {
         }
         return details.files
             .filter((f) => f.status === 'un_matched' || f.status === 'no_match')
-            .map((f) => resolveBatchFile(f, transactionState));
+            .map((f) => resolveBatchFile(f, b.batchId, transactionState));
     });
-    const completedTransactionsForPeriod = monthYearPeriodId != null
-        ? bulkUpload.completedTransactionsByPeriod[monthYearPeriodId]
+    const completedTransactionsCacheKey = monthYearPeriodId != null
+        ? (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(monthYearPeriodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab)
+        : undefined;
+    const completedTransactionsForPeriod = completedTransactionsCacheKey != null
+        ? bulkUpload.completedTransactionsByPeriod[completedTransactionsCacheKey]
         : undefined;
     const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
     const resolvedCompletedTransactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, completedTransactionIds);
@@ -126,6 +154,13 @@ function getExpenseAutomationMissingReceiptsView(state) {
             summary: currentBatchDetails.summary,
         }
         : undefined;
+    const manualSearchResults = bulkUpload.manualSearch.results.map((r) => {
+        const t = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, r.transactionId);
+        return {
+            ...r,
+            vendorLogo: r.vendorLogo ?? t?.logo?.href,
+        };
+    });
     return {
         fetchState,
         error,
@@ -134,6 +169,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
         refreshStatus,
         transactions: sortedTransactions,
         completionStatus,
+        pendingMissingReceiptsTabNavigation: pendingMissingReceiptsTabNavigation ?? null,
         bulkUpload: {
             phase: bulkUpload.phase,
             uploadStatus: bulkUpload.uploadStatus,
@@ -160,12 +196,71 @@ function getExpenseAutomationMissingReceiptsView(state) {
             pastBatches,
             pastUnmatchedFiles,
             confirmMatchStatus: bulkUpload.confirmMatchStatus,
-            manualSearch: bulkUpload.manualSearch,
+            hasMoreBatchDetails,
+            batchDetailsPaginationState: bulkUpload.batchDetailsPaginationState,
+            manualSearch: {
+                ...bulkUpload.manualSearch,
+                results: manualSearchResults,
+            },
             uploadProgress: bulkUpload.uploadProgress,
         },
     };
 }
-function resolveBatchFile(file, transactionState) {
+function batchDetailsHasUnmatchedWork(details) {
+    return details.files.some((f) => f.status === 'un_matched' || f.status === 'no_match');
+}
+/** List row summary before batch details load — aligns with unmatched / possible-match work. */
+function batchListItemHasUnmatchedWork(batch) {
+    return batch.noMatchCount > 0 || batch.possibleMatchesCount > 0;
+}
+/**
+ * `batchList` must be in chronological order (oldest first). Picks the primary batch for the
+ * top "Unmatched" section. Skips failed detail fetches.
+ *
+ * If details are not loaded for an older batch but the list row reports no unmatched work, we
+ * skip that batch so newer batches with loaded details can be primary (avoids an empty tab when
+ * the first fetch page only loaded newer batches). If the list reports unmatched work but details
+ * are still loading, we wait (undefined) so primary order stays correct once details arrive.
+ */
+function getPrimaryBatchIdFromBatchListOrder(batchListChronological, batchDetailsById, failedBatchDetailIds) {
+    const failedIds = new Set(failedBatchDetailIds);
+    const anyCompletedBatchHasUnmatchedWork = batchListChronological.some((b) => {
+        if (failedIds.has(b.batchId)) {
+            return false;
+        }
+        const d = batchDetailsById[b.batchId];
+        if (d != null &&
+            d.status === 'completed' &&
+            batchDetailsHasUnmatchedWork(d)) {
+            return true;
+        }
+        return d == null && batchListItemHasUnmatchedWork(b);
+    });
+    for (const batch of batchListChronological) {
+        if (failedIds.has(batch.batchId)) {
+            continue;
+        }
+        const details = batchDetailsById[batch.batchId];
+        if (details == null) {
+            if (batchListItemHasUnmatchedWork(batch)) {
+                return undefined;
+            }
+            continue;
+        }
+        if (details.status !== 'completed') {
+            continue;
+        }
+        if (anyCompletedBatchHasUnmatchedWork) {
+            if (batchDetailsHasUnmatchedWork(details)) {
+                return batch.batchId;
+            }
+            continue;
+        }
+        return batch.batchId;
+    }
+    return undefined;
+}
+function resolveBatchFile(file, batchId, transactionState) {
     const matchedTransaction = file.matchedTransactionId != null
         ? (0, transactionSelector_1.getSupportedTransactionById)(transactionState, file.matchedTransactionId)
         : undefined;
@@ -179,6 +274,8 @@ function resolveBatchFile(file, transactionState) {
         .filter((c) => c != null);
     return {
         attachmentId: file.attachmentId,
+        batchId,
+        fileDownloadUrl: file.fileDownloadUrl,
         fileId: file.fileId,
         filename: file.filename,
         filePreviewUrl: file.filePreviewUrl,

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

@@ -36,9 +36,10 @@ export interface MatchCandidate {
 }
 export interface BatchFile {
     attachmentId: ID;
+    fileDownloadUrl: string | null;
     fileId: ID;
     filename: string;
-    filePreviewUrl: string;
+    filePreviewUrl: string | null;
     status: BatchFileStatus;
     candidates?: CandidateRef[];
     matchedTransactionId?: ID;
@@ -85,11 +86,18 @@ export interface ManualSearchResult {
     transactionId: ID;
     transactionType: string;
     vendorName: string;
+    /** Present when API/merged transaction state supplies a logo URL. */
+    vendorLogo?: string;
 }
 export interface ManualSearchState {
     fetchState: FetchStateAndError;
+    /** True while appending the next page (initial search uses fetchState only). */
+    isLoadingMore: boolean;
+    nextPageToken: string | null;
+    pageSize: number;
     results: ManualSearchResult[];
     searchQuery: string;
+    totalCount: number;
 }
 export type CompletedTransactionsMatchType = 'all' | 'ai_accountant' | 'manual';
 export interface CompletedTransactionsState {
@@ -100,13 +108,15 @@ export interface CompletedTransactionsState {
 }
 export interface BulkUploadState {
     batchDetailsById: Record<ID, BatchDetails>;
+    batchDetailsPaginationState: FetchStateAndError;
     batchListByPeriod: Record<MonthYearPeriodId, BatchListItem[]>;
     batchListFetchState: FetchStateAndError;
     batchStatusById: Record<ID, BatchStatus>;
     completedSubTab: CompletedSubTab;
-    completedTransactionsByPeriod: Record<MonthYearPeriodId, CompletedTransactionsState>;
+    completedTransactionsByPeriod: Record<string, CompletedTransactionsState>;
     confirmMatchStatus: FetchStateAndError;
     currentResultsTab: BulkUploadResultsTab;
+    failedBatchDetailIds: ID[];
     manualSearch: ManualSearchState;
     phase: BulkUploadPhase;
     sortKey: BulkUploadSortKey;
@@ -117,6 +127,11 @@ export interface BulkUploadState {
 }
 export interface MissingReceiptsViewState extends FetchedState {
     bulkUpload: BulkUploadState;
+    /**
+     * When set, the app shell should switch the Missing Receipts sub-tab (e.g. to Unmatched)
+     * once, then clear via `clearMissingReceiptsTabNavigation`.
+     */
+    pendingMissingReceiptsTabNavigation: BulkUploadResultsTab | null;
     refreshStatus: FetchStateAndError;
     transactionIdsBySelectedPeriod: Record<MonthYearPeriodId, ID[]>;
     uiState: MissingReceiptsViewUIState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.37-betaVR2",
+  "version": "4.19.37-betaVR21",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -111,7 +111,7 @@
     "find-dead-code": "ts-prune | grep -v '(used in module)'",
     "find-unused-exports": "ts-unused-exports ./tsconfig.json",
     "circular-dependency": "npx madge --circular --extensions ts ./src",
-    "build": "concurrently --kill-others-on-fail --handle-input \"echo 'Running ESLint...' && eslint . --ext .js,.jsx,.ts,.tsx\" \"echo 'TypeScript build in progress...' && time tsc && echo 'ESM build...' && tsc -p tsconfig.esm.json\" \"echo 'Running tests and typecheck...' && pnpm test\" && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
+    "build": "concurrently --kill-others-on-fail --handle-input \"echo 'Running ESLint...' && eslint . --ext .js,.jsx,.ts,.tsx\" \"echo 'TypeScript build in progress...' && time tsc && echo 'ESM build...' && tsc -p tsconfig.esm.json\"",
     "only-build": "eslint . --ext .js,.jsx,.ts,.tsx && time tsc && tsc -p tsconfig.esm.json && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
     "format": "prettier --write --ignore-unknown \"src/**/*\" && pnpm lint",
     "format-watch": "(git diff --name-only --diff-filter=ACM && git ls-files --others --exclude-standard) | grep -E '\\.(ts|tsx)$' | xargs prettier --write",