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

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

@@ -1,30 +1,39 @@
-import { from, of } from 'rxjs';
+import { EMPTY, from, of } 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 { extractTransactionPayloadsFromBatchFiles, isBatchDetailsApiStatusCompleted, shouldFetchBatchDetailsForBatchId, toBatchDetails, } from '../../payload/missingReceiptsPayload';
 import { fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsFailure, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, } from '../../reducers/missingReceiptsViewReducer';
 export const fetchBulkUploadBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatchDetails.match), mergeMap(() => {
-    const { currentBatchId } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const { currentBatchId } = bulkUpload;
     if (currentBatchId == null) {
         return of(fetchBulkUploadBatchDetailsFailure({
             error: createZeniAPIStatus('Unexpected Error', 'No current batch ID available'),
         }));
     }
+    if (!shouldFetchBatchDetailsForBatchId(bulkUpload.batchStatusById, bulkUpload.batchListByPeriod, currentBatchId)) {
+        return EMPTY;
+    }
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${currentBatchId}`)
         .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));
+        if (!isSuccessResponse(response) ||
+            response.data == null ||
+            !isBatchDetailsApiStatusCompleted(response.data.status)) {
+            if (isSuccessResponse(response) && response.data != null) {
+                return EMPTY;
             }
-            actions.push(fetchBulkUploadBatchDetailsSuccess(toBatchDetails(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
-            actions.push(fetchBulkUploadBatches(true));
-            return from(actions);
+            return of(fetchBulkUploadBatchDetailsFailure({ error: response.status }));
+        }
+        const actions = [];
+        const transactionPayloads = extractTransactionPayloadsFromBatchFiles(response.data.files);
+        if (transactionPayloads.length > 0) {
+            actions.push(updateTransactions(transactionPayloads, (value) => value.transaction_id));
         }
-        return of(fetchBulkUploadBatchDetailsFailure({ error: response.status }));
+        actions.push(fetchBulkUploadBatchDetailsSuccess(toBatchDetails(response.data, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
+        actions.push(fetchBulkUploadBatches(true));
+        return from(actions);
     }), catchError((error) => of(fetchBulkUploadBatchDetailsFailure({
         error: createZeniAPIStatus('Unexpected Error', 'Fetch batch details errored out: ' + JSON.stringify(error)),
     }))));

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

@@ -29,6 +29,7 @@ export const fetchBulkUploadBatchesEpic = (actions$, state$, zeniAPI) => actions
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
+            /** Full list (all statuses) for UI; batch-details epics filter to `completed` only. */
             return of(fetchBulkUploadBatchesSuccess({
                 batchList: response.data.batches.map(toBatchListItem),
                 selectedPeriod,

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

@@ -1,10 +1,9 @@
-import orderBy from 'lodash/orderBy';
 import { concat, of } from 'rxjs';
 import { catchError, exhaustMap, filter } from 'rxjs/operators';
 import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus } from '../../../../responsePayload';
-import { isBatchListStatusCompleted } from '../../payload/missingReceiptsPayload';
+import { filterBatchListItemsForBatchDetailsFetch } from '../../payload/missingReceiptsPayload';
 import { fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, } from '../../reducers/missingReceiptsViewReducer';
 import { fetchBatchDetailsByIds } from './fetchMultipleBatchDetailsEpic';
 const MORE_BATCH_PAGE_SIZE = 4;
@@ -21,10 +20,9 @@ exhaustMap(() => {
     const periodId = toMonthYearPeriodId(selectedPeriod);
     const batchList = bulkUpload.batchListByPeriod[periodId] ?? [];
     const failedIds = new Set(bulkUpload.failedBatchDetailIds);
-    const unfetchedBatches = batchList.filter((batch) => isBatchListStatusCompleted(batch.status) &&
-        bulkUpload.batchDetailsById[batch.batchId] == null &&
+    const unfetchedBatches = filterBatchListItemsForBatchDetailsFetch(batchList).filter((batch) => bulkUpload.batchDetailsById[batch.batchId] == null &&
         !failedIds.has(batch.batchId));
-    const unfetchedBatchIds = orderBy(unfetchedBatches, (b) => new Date(b.createdAt).valueOf(), 'asc').map((batch) => batch.batchId);
+    const unfetchedBatchIds = unfetchedBatches.map((batch) => batch.batchId);
     if (unfetchedBatchIds.length === 0) {
         return of(fetchMoreBatchDetailsComplete());
     }

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

@@ -1,9 +1,8 @@
-import orderBy from 'lodash/orderBy';
 import { EMPTY, concat, from, of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { extractTransactionPayloadsFromBatchFiles, isBatchListStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
+import { extractTransactionPayloadsFromBatchFiles, filterBatchListItemsForBatchDetailsFetch, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
 import { batchDetailFetchFailed, fetchBulkUploadBatchesSuccess, fetchMoreBatchDetailsComplete, setInitialBatchDetailsLoading, storeBatchDetails, } from '../../reducers/missingReceiptsViewReducer';
 const INITIAL_BATCH_PAGE_SIZE = 4;
 export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
@@ -13,16 +12,18 @@ export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
     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);
+        if (!isSuccessResponse(response) ||
+            response.data == null ||
+            !isBatchDetailsApiStatusCompleted(response.data.status)) {
+            return EMPTY;
         }
-        return EMPTY;
+        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);
     }), catchError((error) => {
         console.error(`Failed to fetch batch details for ${batchId}:`, createZeniAPIStatus('Unexpected Error', 'Fetch batch details errored out: ' +
             JSON.stringify(error)));
@@ -32,10 +33,9 @@ export function fetchBatchDetailsByIds(batchIds, zeniAPI) {
 export const fetchMultipleBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBulkUploadBatchesSuccess.match), mergeMap((action) => {
     const batchList = action.payload.batchList;
     const { batchDetailsById } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
-    /** Oldest first — matches primary-batch selection in missingReceiptsSelector (chronological). */
-    const completedBatchesMissingDetails = batchList.filter((batch) => isBatchListStatusCompleted(batch.status) &&
-        batchDetailsById[batch.batchId] == null);
-    const completedBatchIds = orderBy(completedBatchesMissingDetails, (b) => new Date(b.createdAt).valueOf(), 'asc').map((batch) => batch.batchId);
+    /** Only completed list rows may trigger batch-details API; preserve platform order. */
+    const completedBatchesMissingDetails = 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) {
         return EMPTY;

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

@@ -2,14 +2,11 @@ import { EMPTY, from, merge, of, timer } from 'rxjs';
 import { catchError, debounceTime, filter, mergeMap, switchMap, takeUntil, } from 'rxjs/operators';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { isSuccessResponse } from '../../../../responsePayload';
-import { extractTransactionPayloadsFromBatchFiles, toBatchDetails, } from '../../payload/missingReceiptsPayload';
+import { extractTransactionPayloadsFromBatchFiles, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
 import { bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, } from '../../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;
-function isBatchDetailsCompletedStatus(status) {
-    return status.toLowerCase() === 'completed';
-}
 /**
  * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
  * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
@@ -23,8 +20,9 @@ export const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => act
     return timer(FALLBACK_FIRST_DELAY_MS, FALLBACK_POLL_INTERVAL_MS).pipe(takeUntil(merge(actions$.pipe(filter(clearBulkUpload.match)), actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((a) => a.payload.batchId === batchId)), actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match), filter((a) => a.payload.batchId === batchId)))), switchMap(() => zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
         .pipe(mergeMap((response) => {
+        /** Same batch-details URL; polls until `status` is completed (Pusher may win first). */
         if (isSuccessResponse(response) && response.data != null) {
-            if (isBatchDetailsCompletedStatus(response.data.status)) {
+            if (isBatchDetailsApiStatusCompleted(response.data.status)) {
                 const actions = [];
                 const transactionPayloads = extractTransactionPayloadsFromBatchFiles(response.data.files);
                 if (transactionPayloads.length > 0) {

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

@@ -75,6 +75,49 @@ export function toBatchDetails(payload, filesEndPoint) {
 export function isBatchListStatusCompleted(status) {
     return status.toLowerCase() === 'completed';
 }
+/**
+ * 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 function filterBatchListItemsForBatchDetailsFetch(batches) {
+    return batches.filter((b) => isBatchListStatusCompleted(b.status));
+}
+/**
+ * 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 function isBatchDetailsApiStatusCompleted(status) {
+    return status.toLowerCase() === 'completed';
+}
+export function findBatchListItemForBatchId(batchListByPeriod, batchId) {
+    for (const list of Object.values(batchListByPeriod)) {
+        const found = list.find((b) => b.batchId === batchId);
+        if (found != null) {
+            return found;
+        }
+    }
+    return 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 function shouldFetchBatchDetailsForBatchId(batchStatusById, batchListByPeriod, batchId) {
+    const live = batchStatusById[batchId]?.status;
+    if (live === 'completed') {
+        return true;
+    }
+    if (live === 'pending' || live === 'processing') {
+        return false;
+    }
+    const listItem = findBatchListItemForBatchId(batchListByPeriod, batchId);
+    if (listItem != null && !isBatchListStatusCompleted(listItem.status)) {
+        return false;
+    }
+    return true;
+}
 export function toBatchListItem(payload) {
     return {
         batchId: payload.batch_id,

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

@@ -56,15 +56,13 @@ export function getExpenseAutomationMissingReceiptsView(state) {
     const batchList = monthYearPeriodId != null
         ? bulkUpload.batchListByPeriod[monthYearPeriodId] ?? []
         : [];
-    /** API returns newest-first (`sort_order: desc`); primary batch uses oldest-first order. */
-    const batchListChronological = orderBy(batchList, (b) => new Date(b.createdAt).valueOf(), 'asc');
     /**
-     * Primary "Unmatched" batch = first completed batch in chronological order, preferring the
+     * Primary "Unmatched" batch = first completed batch in platform list 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.
+     * so we do not block the whole tab while other rows are not fetched yet.
      */
-    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchListChronological, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
+    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchList, 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
@@ -208,17 +206,17 @@ 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.
+ * `batchList` must match platform order (same sequence as the bulk-upload batches API). 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.
+ * If details are not loaded for an earlier list row but that row reports no unmatched work, we
+ * skip it so later rows with loaded details can be primary (avoids an empty tab when the first
+ * fetch page only loaded later 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) {
+function getPrimaryBatchIdFromBatchListOrder(batchListInPlatformOrder, batchDetailsById, failedBatchDetailIds) {
     const failedIds = new Set(failedBatchDetailIds);
-    const anyCompletedBatchHasUnmatchedWork = batchListChronological.some((b) => {
+    const anyCompletedBatchHasUnmatchedWork = batchListInPlatformOrder.some((b) => {
         if (failedIds.has(b.batchId)) {
             return false;
         }
@@ -230,7 +228,7 @@ function getPrimaryBatchIdFromBatchListOrder(batchListChronological, batchDetail
         }
         return d == null && batchListItemHasUnmatchedWork(b);
     });
-    for (const batch of batchListChronological) {
+    for (const batch of batchListInPlatformOrder) {
         if (failedIds.has(batch.batchId)) {
             continue;
         }

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

@@ -8,26 +8,35 @@ 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 { currentBatchId } = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const bulkUpload = state$.value.expenseAutomationMissingReceiptsViewState.bulkUpload;
+    const { currentBatchId } = 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}`)
         .pipe((0, operators_1.mergeMap)((response) => {
-        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));
+        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;
             }
-            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 }));
+        }
+        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 }));
+        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);
     }), (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

@@ -32,6 +32,7 @@ const fetchBulkUploadBatchesEpic = (actions$, state$, zeniAPI) => actions$.pipe(
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
         .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/fetchMoreBatchDetailsEpic.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchMoreBatchDetailsEpic = void 0;
-const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
@@ -27,10 +23,9 @@ const fetchMoreBatchDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((
     const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
     const batchList = bulkUpload.batchListByPeriod[periodId] ?? [];
     const failedIds = new Set(bulkUpload.failedBatchDetailIds);
-    const unfetchedBatches = batchList.filter((batch) => (0, missingReceiptsPayload_1.isBatchListStatusCompleted)(batch.status) &&
-        bulkUpload.batchDetailsById[batch.batchId] == null &&
+    const unfetchedBatches = (0, missingReceiptsPayload_1.filterBatchListItemsForBatchDetailsFetch)(batchList).filter((batch) => bulkUpload.batchDetailsById[batch.batchId] == null &&
         !failedIds.has(batch.batchId));
-    const unfetchedBatchIds = (0, orderBy_1.default)(unfetchedBatches, (b) => new Date(b.createdAt).valueOf(), 'asc').map((batch) => batch.batchId);
+    const unfetchedBatchIds = unfetchedBatches.map((batch) => batch.batchId);
     if (unfetchedBatchIds.length === 0) {
         return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchMoreBatchDetailsComplete)());
     }

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

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchMultipleBatchDetailsEpic = void 0;
 exports.fetchBatchDetailsByIds = fetchBatchDetailsByIds;
-const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const transactionReducer_1 = require("../../../../entity/transaction/transactionReducer");
@@ -20,16 +16,18 @@ function fetchBatchDetailsByIds(batchIds, zeniAPI) {
     return (0, rxjs_1.from)(batchIds).pipe((0, operators_1.mergeMap)((batchId) => zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.communicationAgentMicroServiceBaseUrl}/1.0/batches/${batchId}`)
         .pipe((0, operators_1.mergeMap)((response) => {
-        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, zeniAPI.apiEndPoints.fileMicroServiceBaseUrl)));
-            return (0, rxjs_1.from)(actions);
+        if (!(0, responsePayload_1.isSuccessResponse)(response) ||
+            response.data == null ||
+            !(0, missingReceiptsPayload_1.isBatchDetailsApiStatusCompleted)(response.data.status)) {
+            return rxjs_1.EMPTY;
         }
-        return rxjs_1.EMPTY;
+        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);
     }), (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)));
@@ -39,10 +37,9 @@ function fetchBatchDetailsByIds(batchIds, zeniAPI) {
 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;
-    /** Oldest first — matches primary-batch selection in missingReceiptsSelector (chronological). */
-    const completedBatchesMissingDetails = batchList.filter((batch) => (0, missingReceiptsPayload_1.isBatchListStatusCompleted)(batch.status) &&
-        batchDetailsById[batch.batchId] == null);
-    const completedBatchIds = (0, orderBy_1.default)(completedBatchesMissingDetails, (b) => new Date(b.createdAt).valueOf(), 'asc').map((batch) => batch.batchId);
+    /** 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) {
         return rxjs_1.EMPTY;

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

@@ -10,9 +10,6 @@ const missingReceiptsViewReducer_1 = require("../../reducers/missingReceiptsView
 /** 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;
-function isBatchDetailsCompletedStatus(status) {
-    return status.toLowerCase() === 'completed';
-}
 /**
  * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
  * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.
@@ -27,8 +24,9 @@ const pollBulkUploadBatchStatusEpic = (actions$, _state$, zeniAPI) => actions$.p
     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}`)
         .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 (isBatchDetailsCompletedStatus(response.data.status)) {
+            if ((0, missingReceiptsPayload_1.isBatchDetailsApiStatusCompleted)(response.data.status)) {
                 const actions = [];
                 const transactionPayloads = (0, missingReceiptsPayload_1.extractTransactionPayloadsFromBatchFiles)(response.data.files);
                 if (transactionPayloads.length > 0) {

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

@@ -2,7 +2,8 @@ import { URLPayload } from '../../../commonPayloadTypes/urlPayload';
 import { TransactionPayload } from '../../../entity/transaction/payloadTypes/transactionPayload';
 import { SupportedTransactionPayload } from '../../../entity/transaction/transactionState';
 import { ZeniAPIResponse } from '../../../responsePayload';
-import type { BatchDetails, BatchFile, BatchListItem, BatchSummary, ManualSearchResult } from '../types/missingReceiptsViewState';
+import type { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import type { BatchDetails, BatchFile, BatchListItem, BatchStatus, BatchSummary, ManualSearchResult } from '../types/missingReceiptsViewState';
 export interface MissingReceiptsQueryPayload {
     end_date: string;
     is_attachment_missing_only: boolean;
@@ -83,6 +84,24 @@ export declare function toBatchSummary(payload: BatchDetailsResponsePayload['sum
 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 toBatchListItem(payload: BatchListItemPayload): BatchListItem;
 /** Maps expense-automation transaction rows to manual-search list rows (Unmatched tab). */
 export declare function supportedTransactionPayloadToManualSearchResult(payload: SupportedTransactionPayload): ManualSearchResult;

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

@@ -5,6 +5,10 @@ exports.extractTransactionPayloadsFromBatchFiles = extractTransactionPayloadsFro
 exports.toBatchSummary = toBatchSummary;
 exports.toBatchDetails = toBatchDetails;
 exports.isBatchListStatusCompleted = isBatchListStatusCompleted;
+exports.filterBatchListItemsForBatchDetailsFetch = filterBatchListItemsForBatchDetailsFetch;
+exports.isBatchDetailsApiStatusCompleted = isBatchDetailsApiStatusCompleted;
+exports.findBatchListItemForBatchId = findBatchListItemForBatchId;
+exports.shouldFetchBatchDetailsForBatchId = shouldFetchBatchDetailsForBatchId;
 exports.toBatchListItem = toBatchListItem;
 exports.supportedTransactionPayloadToManualSearchResult = supportedTransactionPayloadToManualSearchResult;
 const urlPayload_1 = require("../../../commonPayloadTypes/urlPayload");
@@ -84,6 +88,49 @@ function toBatchDetails(payload, filesEndPoint) {
 function isBatchListStatusCompleted(status) {
     return status.toLowerCase() === 'completed';
 }
+/**
+ * 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.
+ */
+function filterBatchListItemsForBatchDetailsFetch(batches) {
+    return batches.filter((b) => isBatchListStatusCompleted(b.status));
+}
+/**
+ * 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).
+ */
+function isBatchDetailsApiStatusCompleted(status) {
+    return status.toLowerCase() === 'completed';
+}
+function findBatchListItemForBatchId(batchListByPeriod, batchId) {
+    for (const list of Object.values(batchListByPeriod)) {
+        const found = list.find((b) => b.batchId === batchId);
+        if (found != null) {
+            return found;
+        }
+    }
+    return 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).
+ */
+function shouldFetchBatchDetailsForBatchId(batchStatusById, batchListByPeriod, batchId) {
+    const live = batchStatusById[batchId]?.status;
+    if (live === 'completed') {
+        return true;
+    }
+    if (live === 'pending' || live === 'processing') {
+        return false;
+    }
+    const listItem = findBatchListItemForBatchId(batchListByPeriod, batchId);
+    if (listItem != null && !isBatchListStatusCompleted(listItem.status)) {
+        return false;
+    }
+    return true;
+}
 function toBatchListItem(payload) {
     return {
         batchId: payload.batch_id,

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

@@ -62,15 +62,13 @@ function getExpenseAutomationMissingReceiptsView(state) {
     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
+     * Primary "Unmatched" batch = first completed batch in platform list 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.
+     * so we do not block the whole tab while other rows are not fetched yet.
      */
-    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchListChronological, bulkUpload.batchDetailsById, bulkUpload.failedBatchDetailIds);
+    const primaryBatchIdFromDetailsOrder = getPrimaryBatchIdFromBatchListOrder(batchList, 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
@@ -214,17 +212,17 @@ 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.
+ * `batchList` must match platform order (same sequence as the bulk-upload batches API). 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.
+ * If details are not loaded for an earlier list row but that row reports no unmatched work, we
+ * skip it so later rows with loaded details can be primary (avoids an empty tab when the first
+ * fetch page only loaded later 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) {
+function getPrimaryBatchIdFromBatchListOrder(batchListInPlatformOrder, batchDetailsById, failedBatchDetailIds) {
     const failedIds = new Set(failedBatchDetailIds);
-    const anyCompletedBatchHasUnmatchedWork = batchListChronological.some((b) => {
+    const anyCompletedBatchHasUnmatchedWork = batchListInPlatformOrder.some((b) => {
         if (failedIds.has(b.batchId)) {
             return false;
         }
@@ -236,7 +234,7 @@ function getPrimaryBatchIdFromBatchListOrder(batchListChronological, batchDetail
         }
         return d == null && batchListItemHasUnmatchedWork(b);
     });
-    for (const batch of batchListChronological) {
+    for (const batch of batchListInPlatformOrder) {
         if (failedIds.has(batch.batchId)) {
             continue;
         }

package/package.json

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