@zeniai/client-epic-state 4.19.37-betaVR1 → 4.19.37-betaVR11

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

@@ -1,16 +1,46 @@
 import { of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { convertToPeriod, toMonthYearPeriodId, } from '../../../../commonStateTypes/timePeriod';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { toBatchListItem, } from '../../payload/missingReceiptsPayload';
 import { fetchBulkUploadBatches, fetchBulkUploadBatchesFailure, fetchBulkUploadBatchesSuccess, } from '../../reducers/missingReceiptsViewReducer';
-export const fetchBulkUploadBatchesEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatches.match), mergeMap(() => zeniAPI
-    .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipts/batches?days=30`)
-    .pipe(mergeMap((response) => {
-    if (isSuccessResponse(response) && response.data != null) {
-        return of(fetchBulkUploadBatchesSuccess(response.data.batches.map(toBatchListItem)));
+export const fetchBulkUploadBatchesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatches.match), switchMap((action) => {
+    const { cacheOverride } = action.payload;
+    const state = state$.value;
+    const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload }, } = state;
+    const currentTenant = getCurrentTenant(state);
+    const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
+    const periodId = toMonthYearPeriodId(selectedPeriod);
+    const existingBatches = bulkUpload.batchListByPeriod[periodId] ?? [];
+    if (cacheOverride !== true && existingBatches.length > 0) {
+        return of(fetchBulkUploadBatchesSuccess({
+            batchList: existingBatches,
+            selectedPeriod,
+        }));
     }
-    return of(fetchBulkUploadBatchesFailure({ error: response.status }));
-}), catchError((error) => of(fetchBulkUploadBatchesFailure({
-    error: createZeniAPIStatus('Unexpected Error', 'Fetch bulk upload batches errored out: ' +
-        JSON.stringify(error)),
-}))))));
+    const period = 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))}`)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            return of(fetchBulkUploadBatchesSuccess({
+                batchList: response.data.batches.map(toBatchListItem),
+                selectedPeriod,
+            }));
+        }
+        return of(fetchBulkUploadBatchesFailure({
+            error: response.status,
+            selectedPeriod,
+        }));
+    }), catchError((error) => of(fetchBulkUploadBatchesFailure({
+        error: createZeniAPIStatus('Unexpected Error', 'Fetch bulk upload batches errored out: ' +
+            JSON.stringify(error)),
+        selectedPeriod,
+    }))));
+}));

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

@@ -1,34 +1,43 @@
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
-import { convertToPeriod } from '../../../../commonStateTypes/timePeriod';
+import { convertToPeriod, toMonthYearPeriodId, } from '../../../../commonStateTypes/timePeriod';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { completedTransactionPayloadToSupportedTransactionPayload, } from '../../payload/missingReceiptsPayload';
 import { fetchCompletedTransactions, fetchCompletedTransactionsFailure, fetchCompletedTransactionsSuccess, } from '../../reducers/missingReceiptsViewReducer';
 export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchCompletedTransactions.match), switchMap((action) => {
     const state = state$.value;
-    const { expenseAutomationMissingReceiptsViewState: { bulkUpload }, } = state;
-    const { selectedPeriod } = action.payload;
-    const queryPayload = {};
-    if (bulkUpload.completedSubTab !== 'all') {
-        queryPayload.match_type = bulkUpload.completedSubTab;
+    const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload }, } = state;
+    const currentTenant = getCurrentTenant(state);
+    const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
+    const periodId = toMonthYearPeriodId(selectedPeriod);
+    const isInitialLoad = action.payload.pageToken == null;
+    const existingData = bulkUpload.completedTransactionsByPeriod[periodId];
+    if (isInitialLoad && existingData != null && existingData.transactionIds.length > 0) {
+        return from([]);
     }
     const period = convertToPeriod(selectedPeriod);
-    queryPayload.start_date = period.start;
-    queryPayload.end_date = period.end;
-    if (action.payload.pageToken != null) {
-        queryPayload.page_token = action.payload.pageToken;
+    const queryPayload = {
+        start_date: period.start,
+        end_date: period.end,
+        sort_by: bulkUpload.sortKey,
+        sort_order: bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc',
+        page_token: action.payload.pageToken ?? null,
+        page_size: 25,
+    };
+    if (bulkUpload.completedSubTab !== 'all') {
+        queryPayload.match_type = bulkUpload.completedSubTab;
     }
     const encodedQuery = encodeURIComponent(JSON.stringify(queryPayload));
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipt-agent/transactions/completed?query=${encodedQuery}`)
+        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/receipt-agent/transactions/completed?query=${encodedQuery}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
-            const transactionPayloads = response.data.transactions.map(completedTransactionPayloadToSupportedTransactionPayload);
             const transactionIds = response.data.transactions.map((t) => t.transaction_id);
             const updateActions = [];
-            updateActions.push(updateTransactions(transactionPayloads, (value) => value.transaction_id));
+            updateActions.push(updateTransactions(response.data.transactions, (value) => value.transaction_id));
             updateActions.push(fetchCompletedTransactionsSuccess({
+                isInitialLoad,
                 transactionIds,
                 nextPageToken: response.data.next_page_token,
                 totalCount: response.data.total_count,

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

@@ -0,0 +1,31 @@
+import { concat, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { createZeniAPIStatus } from '../../../../responsePayload';
+import { fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, } from '../../reducers/missingReceiptsViewReducer';
+import { fetchBatchDetailsByIds } from './fetchMultipleBatchDetailsEpic';
+const MORE_BATCH_PAGE_SIZE = 4;
+export const fetchMoreBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchMoreBatchDetails.match), mergeMap(() => {
+    const state = state$.value;
+    const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload }, } = state;
+    const currentTenant = getCurrentTenant(state);
+    const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
+    if (selectedPeriod == null) {
+        return of(fetchMoreBatchDetailsComplete());
+    }
+    const periodId = toMonthYearPeriodId(selectedPeriod);
+    const batchList = bulkUpload.batchListByPeriod[periodId] ?? [];
+    const unfetchedBatchIds = batchList
+        .filter((batch) => batch.status === 'completed' &&
+        bulkUpload.batchDetailsById[batch.batchId] == null)
+        .map((batch) => batch.batchId);
+    if (unfetchedBatchIds.length === 0) {
+        return of(fetchMoreBatchDetailsComplete());
+    }
+    const nextPage = unfetchedBatchIds.slice(0, MORE_BATCH_PAGE_SIZE);
+    return concat(fetchBatchDetailsByIds(nextPage, zeniAPI), of(fetchMoreBatchDetailsComplete())).pipe(catchError((error) => of(fetchMoreBatchDetailsFailure({
+        error: createZeniAPIStatus('Unexpected Error', 'Fetch more batch details errored out: ' +
+            JSON.stringify(error)),
+    }))));
+}));

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

@@ -0,0 +1,39 @@
+import { EMPTY, from } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { extractTransactionPayloadsFromBatchFiles, toBatchDetails, } from '../../payload/missingReceiptsPayload';
+import { fetchBulkUploadBatchesSuccess, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
+const INITIAL_BATCH_PAGE_SIZE = 4;
+export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
+    if (batchIds.length === 0) {
+        return EMPTY;
+    }
+    return from(batchIds).pipe(mergeMap((batchId) => zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const actions = [];
+            const transactionPayloads = extractTransactionPayloadsFromBatchFiles(response.data.files);
+            if (transactionPayloads.length > 0) {
+                actions.push(updateTransactions(transactionPayloads, (value) => value.transaction_id));
+            }
+            actions.push(storeBatchDetails(toBatchDetails(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
+            return from(actions);
+        }
+        return EMPTY;
+    }), catchError((error) => {
+        console.error(`Failed to fetch batch details for ${batchId}:`, createZeniAPIStatus('Unexpected Error', 'Fetch batch details errored out: ' +
+            JSON.stringify(error)));
+        return EMPTY;
+    })), 5));
+}
+export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatchesSuccess.match), mergeMap((action) => {
+    const batchList = action.payload.batchList;
+    const { batchDetailsById } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const completedBatchIds = batchList
+        .filter((batch) => batch.status === 'completed' &&
+        batchDetailsById[batch.batchId] == null)
+        .map((batch) => batch.batchId);
+    return fetchBatchDetailsByIds(completedBatchIds.slice(0, INITIAL_BATCH_PAGE_SIZE), zeniAPI);
+}));

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

@@ -1,39 +1,47 @@
 import { of, timer } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap, takeUntil, takeWhile, } from 'rxjs/operators';
+import { convertToPeriod } from '../../../../commonStateTypes/timePeriod';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { isSuccessResponse } from '../../../../responsePayload';
-import { toBatchStatus, } from '../../payload/missingReceiptsPayload';
-import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, pusherBatchStatusUpdate, updateBulkUploadBatchStatus, } from '../../reducers/missingReceiptsViewReducer';
-/**
- * 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`.
- */
-// Pusher-driven: when Pusher delivers a completed status, fetch details
+import { toBatchListItem, } from '../../payload/missingReceiptsPayload';
+import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchesSuccess, pusherBatchStatusUpdate, } from '../../reducers/missingReceiptsViewReducer';
 export const pusherBatchStatusCompletionEpic = (actions$) => actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((action) => action.payload.status === 'completed'), mergeMap(() => of(fetchBulkUploadBatchDetails())));
-// Polling fallback: relaxed interval as safety net
 const FALLBACK_POLL_INTERVAL_MS = 10000;
-export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), switchMap((action) => {
+export const pollBulkUploadBatchStatusEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(bulkUploadReceiptsSuccess.match), switchMap((action) => {
     const { batchId } = action.payload;
     return timer(0, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(actions$.pipe(filter((a) => clearBulkUpload.match(a) ||
         (pusherBatchStatusUpdate.match(a) &&
-            a.payload.status === 'completed')))), switchMap(() => zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/receipts/batches/${batchId}/status`)
-        .pipe(mergeMap((response) => {
-        if (isSuccessResponse(response) && response.data != null) {
-            const batchStatus = toBatchStatus(response.data);
-            const actions = [
-                updateBulkUploadBatchStatus(batchStatus),
-            ];
-            if (batchStatus.status === 'completed') {
-                actions.push(fetchBulkUploadBatchDetails());
+            a.payload.status === 'completed')))), switchMap(() => {
+        const state = state$.value;
+        const { expenseAutomationViewState: { selectedPeriodByTenantId }, } = state;
+        const currentTenant = getCurrentTenant(state);
+        const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
+        const period = 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))}`)
+            .pipe(mergeMap((response) => {
+            if (isSuccessResponse(response) && response.data != null) {
+                const batchList = response.data.batches.map(toBatchListItem);
+                const currentBatch = batchList.find((b) => b.batchId === batchId);
+                if (currentBatch?.status === 'completed') {
+                    return [
+                        fetchBulkUploadBatchesSuccess({
+                            batchList,
+                            selectedPeriod,
+                        }),
+                        fetchBulkUploadBatchDetails(),
+                    ];
+                }
             }
-            return actions;
-        }
-        return [];
-    }), catchError(() => of()))), takeWhile((action) => {
-        if (fetchBulkUploadBatchDetails.match(action)) {
+            return [];
+        }), catchError(() => of()));
+    }), takeWhile((emittedAction) => {
+        if (fetchBulkUploadBatchDetails.match(emittedAction)) {
             return false;
         }
         return true;

package/lib/esm/view/expenseAutomationView/payload/missingReceiptsPayload.js

@@ -1,14 +1,19 @@
+import { toURL } from '../../../commonPayloadTypes/urlPayload';
 // -- Converter functions --
-export function toBatchFile(payload) {
+export function toBatchFile(payload, filesEndPoint) {
     return {
         attachmentId: payload.attachment_id,
         candidates: payload.candidates?.map((c) => ({
             transactionId: c.transaction_id,
             matchScore: c.match_score,
         })),
+        fileDownloadUrl: payload.file_id != null && filesEndPoint != null
+            ? `${filesEndPoint}/1.0/files/${payload.file_id}?query=${encodeURIComponent(JSON.stringify({ download_file: true }))}`
+            : null,
         fileId: payload.file_id,
         filePreviewUrl: payload.file_preview_url,
         filename: payload.filename,
+        matchSource: payload.match_source,
         matchedTransactionId: payload.matched_transaction?.transaction_id,
         status: payload.status,
     };
@@ -39,10 +44,12 @@ export function extractTransactionPayloadsFromBatchFiles(files) {
 function matchedTransactionPayloadToSupportedTransactionPayload(payload) {
     return {
         transaction_id: payload.transaction_id,
-        transaction_date: payload.transaction_date,
+        transaction_type: payload.transaction_type ?? 'expense',
+        transaction_date: payload.transaction_date ?? '',
         currency_code: payload.currency_code,
         total_amount: payload.amount,
         vendor_name: payload.vendor_name,
+        logo: payload.vendor_logo == null ? undefined : toURL(payload.vendor_logo),
     };
 }
 export function toBatchSummary(payload) {
@@ -54,18 +61,11 @@ export function toBatchSummary(payload) {
         total: payload.total,
     };
 }
-export function toBatchStatus(payload) {
-    return {
-        batchId: payload.batch_id,
-        progress: payload.progress,
-        status: payload.status,
-    };
-}
-export function toBatchDetails(payload) {
+export function toBatchDetails(payload, filesEndPoint) {
     return {
         batchId: payload.batch_id,
         createdAt: payload.created_at,
-        files: payload.files.map(toBatchFile),
+        files: payload.files.map((f) => toBatchFile(f, filesEndPoint)),
         status: payload.status,
         summary: toBatchSummary(payload.summary),
     };
@@ -85,7 +85,7 @@ export function toBatchListItem(payload) {
 export function toManualSearchResult(payload) {
     return {
         amount: payload.amount,
-        currency: payload.currency,
+        currencyCode: payload.currency,
         entityId: payload.entity_id,
         memo: payload.memo,
         transactionDate: payload.transaction_date,
@@ -94,71 +94,3 @@ export function toManualSearchResult(payload) {
         vendorName: payload.vendor_name,
     };
 }
-function completedTransactionAttachmentToAttachmentPayload(payload) {
-    return {
-        attachment_create_time: payload.attachment_create_time ?? '',
-        attachment_id: payload.attachment_id,
-        attachment_update_time: payload.attachment_update_time ?? '',
-        content_type: payload.content_type,
-        file_checksum: null,
-        file_download_url: payload.file_download_url,
-        file_name: payload.file_name,
-        file_size: payload.file_size,
-    };
-}
-function completedTransactionLineToLinePayload(payload) {
-    return {
-        amount: payload.amount,
-        line_description: payload.line_description,
-        line_detail_type: payload.line_detail_type,
-        line_id: payload.line_id,
-        categorization_status: payload.categorization_status,
-        line_detail: {
-            account: {
-                account_id: payload.line_detail.account?.account_id ?? '',
-                account_name: payload.line_detail.account?.account_name ?? '',
-                labels: [],
-                coa_id: payload.line_detail.account?.coa_id,
-                qbo_id: payload.line_detail.account?.qbo_id,
-            },
-            class: {
-                accounting_class_id: payload.line_detail.class?.accounting_class_id ?? '',
-                accounting_class_name: payload.line_detail.class?.accounting_class_name ?? '',
-                accounting_class_number: payload.line_detail.class?.accounting_class_number,
-                fully_qualified_accounting_class_name: payload.line_detail.class?.fully_qualified_accounting_class_name,
-                qbo_id: payload.line_detail.class?.qbo_id,
-            },
-            line_detail_type: payload.line_detail_type,
-            customer: payload.line_detail.customer != null
-                ? {
-                    customer_id: payload.line_detail.customer.customer_id,
-                    customer_name: payload.line_detail.customer.customer_name,
-                    qbo_id: payload.line_detail.customer.qbo_id,
-                }
-                : undefined,
-            vendor: payload.line_detail.vendor != null
-                ? {
-                    vendor_id: payload.line_detail.vendor.vendor_id,
-                    vendor_name: payload.line_detail.vendor.vendor_name,
-                }
-                : undefined,
-        },
-    };
-}
-export function completedTransactionPayloadToSupportedTransactionPayload(payload) {
-    return {
-        transaction_id: payload.transaction_id,
-        transaction_type: payload.transaction_type,
-        transaction_date: payload.transaction_date,
-        transaction_type_name: payload.transaction_type_name,
-        currency_code: payload.currency_code,
-        currency_symbol: payload.currency_symbol,
-        total_amount: payload.total_amount,
-        vendor_id: payload.vendor_id,
-        vendor_name: payload.vendor_name,
-        account_id: payload.account_id,
-        account_name: payload.account_name,
-        attachments: payload.attachments.map(completedTransactionAttachmentToAttachmentPayload),
-        lines: payload.lines.map(completedTransactionLineToLinePayload),
-    };
-}

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

@@ -2,7 +2,8 @@ import { createSlice } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 export const initialBulkUploadState = {
     batchDetailsById: {},
-    batchList: [],
+    batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
+    batchListByPeriod: {},
     batchListFetchState: { fetchState: 'Not-Started', error: undefined },
     batchStatusById: {},
     completedSubTab: 'all',
@@ -175,10 +176,6 @@ const expenseAutomationMissingReceiptsView = 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;
@@ -196,14 +193,44 @@ const expenseAutomationMissingReceiptsView = createSlice({
         fetchBulkUploadBatchDetailsFailure(draft, _action) {
             draft.bulkUpload.phase = 'completed';
         },
-        fetchBulkUploadBatches(draft) {
-            draft.bulkUpload.batchListFetchState = {
+        storeBatchDetails(draft, action) {
+            const details = action.payload;
+            draft.bulkUpload.batchDetailsById[details.batchId] = details;
+        },
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        fetchMoreBatchDetails(_draft) {
+            _draft.bulkUpload.batchDetailsPaginationState = {
                 fetchState: 'In-Progress',
                 error: undefined,
             };
         },
+        fetchMoreBatchDetailsComplete(draft) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        fetchMoreBatchDetailsFailure(draft, action) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+        },
+        fetchBulkUploadBatches: {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            reducer(draft, _action) {
+                draft.bulkUpload.batchListFetchState = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(cacheOverride = false) {
+                return { payload: { cacheOverride } };
+            },
+        },
         fetchBulkUploadBatchesSuccess(draft, action) {
-            draft.bulkUpload.batchList = action.payload;
+            const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
+            draft.bulkUpload.batchListByPeriod[periodId] = action.payload.batchList;
             draft.bulkUpload.batchListFetchState = {
                 fetchState: 'Completed',
                 error: undefined,
@@ -223,8 +250,8 @@ const expenseAutomationMissingReceiptsView = createSlice({
                     error: undefined,
                 };
             },
-            prepare(batchId, attachmentId, transactionId) {
-                return { payload: { batchId, attachmentId, transactionId } };
+            prepare(batchId, attachmentId, transactionId, transactionType, fileName) {
+                return { payload: { batchId, attachmentId, transactionId, transactionType, fileName } };
             },
         },
         confirmBulkUploadMatchSuccess(draft, action) {
@@ -237,12 +264,18 @@ const expenseAutomationMissingReceiptsView = createSlice({
             if (details != null) {
                 const file = details.files.find((f) => f.attachmentId === attachmentId);
                 if (file != null) {
+                    const originalStatus = file.status;
                     file.status = 'matched';
                     file.matchedTransactionId = transactionId;
                     file.candidates = undefined;
+                    details.summary.matched += 1;
+                    if (originalStatus === 'no_match') {
+                        details.summary.noMatch = Math.max(0, details.summary.noMatch - 1);
+                    }
+                    else {
+                        details.summary.possibleMatches = Math.max(0, details.summary.possibleMatches - 1);
+                    }
                 }
-                details.summary.matched += 1;
-                details.summary.possibleMatches = Math.max(0, details.summary.possibleMatches - 1);
             }
         },
         confirmBulkUploadMatchFailure(draft, action) {
@@ -297,43 +330,28 @@ const expenseAutomationMissingReceiptsView = createSlice({
         // -- Completed Transactions Actions --
         fetchCompletedTransactions: {
             reducer(draft, action) {
-                const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
-                const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
-                if (action.payload.pageToken == null) {
-                    draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
-                        fetchState: { fetchState: 'In-Progress', error: undefined },
-                        nextPageToken: null,
-                        totalCount: 0,
-                        transactionIds: [],
-                    };
-                }
-                else if (existing != null) {
-                    existing.fetchState = { fetchState: 'In-Progress', error: undefined };
-                }
-                else {
-                    draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
-                        fetchState: { fetchState: 'In-Progress', error: undefined },
-                        nextPageToken: null,
-                        totalCount: 0,
-                        transactionIds: [],
-                    };
+                const { pageToken } = action.payload;
+                if (pageToken != null) {
+                    const periods = draft.bulkUpload.completedTransactionsByPeriod;
+                    for (const entry of Object.values(periods)) {
+                        if (entry.nextPageToken === pageToken) {
+                            entry.fetchState = {
+                                fetchState: 'In-Progress',
+                                error: undefined,
+                            };
+                            break;
+                        }
+                    }
                 }
             },
-            prepare(selectedPeriod, pageToken) {
-                return { payload: { selectedPeriod, pageToken } };
+            prepare(pageToken) {
+                return { payload: { pageToken } };
             },
         },
         fetchCompletedTransactionsSuccess(draft, action) {
-            const { transactionIds, nextPageToken, totalCount, selectedPeriod } = action.payload;
+            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad } = action.payload;
             const periodId = toMonthYearPeriodId(selectedPeriod);
-            const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
-            if (existing != null) {
-                existing.transactionIds.push(...transactionIds);
-                existing.nextPageToken = nextPageToken;
-                existing.totalCount = totalCount;
-                existing.fetchState = { fetchState: 'Completed', error: undefined };
-            }
-            else {
+            if (isInitialLoad) {
                 draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
                     transactionIds,
                     nextPageToken,
@@ -341,6 +359,23 @@ const expenseAutomationMissingReceiptsView = createSlice({
                     fetchState: { fetchState: 'Completed', error: undefined },
                 };
             }
+            else {
+                const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+                if (existing != null) {
+                    existing.transactionIds.push(...transactionIds);
+                    existing.nextPageToken = nextPageToken;
+                    existing.totalCount = totalCount;
+                    existing.fetchState = { fetchState: 'Completed', error: undefined };
+                }
+                else {
+                    draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                        transactionIds,
+                        nextPageToken,
+                        totalCount,
+                        fetchState: { fetchState: 'Completed', error: undefined },
+                    };
+                }
+            }
         },
         fetchCompletedTransactionsFailure(draft, action) {
             const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
@@ -364,7 +399,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
 });
 export const { fetchMissingReceipts, fetchMissingReceiptsSuccess, fetchMissingReceiptsFailure, uploadMissingReceiptSuccess, updateMissingReceiptUploadState, updateMissingReceiptsUIState, markMissingReceiptAsDone, clearExpenseAutomationMissingReceiptsView, 
 // Bulk Upload
-bulkUploadReceipts, updateBulkUploadProgress, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, updateBulkUploadBatchStatus, pusherBatchStatusUpdate, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, 
+bulkUploadReceipts, updateBulkUploadProgress, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, pusherBatchStatusUpdate, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, 
 // Completed Transactions
 fetchCompletedTransactions, fetchCompletedTransactionsSuccess, fetchCompletedTransactionsFailure, } = expenseAutomationMissingReceiptsView.actions;
 export default expenseAutomationMissingReceiptsView.reducer;