@zeniai/client-epic-state 5.0.9 → 5.0.10-betaVR1

package/lib/entity/sectionProjectView/sectionProjectView.d.ts

@@ -1,3 +1,4 @@
+import { NestedAccountIDHierarchy } from '../../commonStateTypes/accountView/nestedAccountID';
 import { COABalanceGroupedByPeriod } from '../../commonStateTypes/coaBalance/coaBalance';
 import { ID } from '../../commonStateTypes/common';
 import { ReportID } from '../../commonStateTypes/viewAndReport/viewAndReport';
@@ -6,6 +7,7 @@ export interface SectionProjectView {
     projectId: ID;
     sectionId: ID;
     balancesByPeriod?: COABalanceGroupedByPeriod;
+    nestedAccountIds?: NestedAccountIDHierarchy[];
 }
 export declare function getSectionProjectViewKey(sectionId: ID, projectId: ID, reportId: ReportID): `${string}-${string}-cash_balance` | `${string}-${string}-card_balance` | `${string}-${string}-expense_automation_card` | `${string}-${string}-operating_expenses` | `${string}-${string}-operating_expenses_by_classes` | `${string}-${string}-revenue` | `${string}-${string}-revenue_by_classes` | `${string}-${string}-net_burn_or_income` | `${string}-${string}-net_burn_or_income_story_card` | `${string}-${string}-net_burn_or_income_by_classes` | `${string}-${string}-cash_position` | `${string}-${string}-top_expenses` | `${string}-${string}-profit_and_loss` | `${string}-${string}-profit_and_loss_by_classes` | `${string}-${string}-profit_and_loss_by_projects` | `${string}-${string}-balance_sheet` | `${string}-${string}-cash_flow` | `${string}-${string}-dashboard` | `${string}-${string}-finance_statement` | `${string}-${string}-transaction_list_of_account` | `${string}-${string}-transaction_list_missing_receipt` | `${string}-${string}-transaction_list_of_account_by_class` | `${string}-${string}-transaction_detail` | `${string}-${string}-cash_in_cash_out` | `${string}-${string}-insights_dashboard` | `${string}-${string}-company_details` | `${string}-${string}-class_list` | `${string}-${string}-account_list` | `${string}-${string}-account_list_by_type` | `${string}-${string}-vendor` | `${string}-${string}-task_card` | `${string}-${string}-bill_pay` | `${string}-${string}-reimbursement` | `${string}-${string}-bill_pay_card` | `${string}-${string}-reimbursement_card` | `${string}-${string}-bill_pay_promo_card` | `${string}-${string}-zeni_accounts` | `${string}-${string}-zeni_accounts_promo_card` | `${string}-${string}-zeni_treasury` | `${string}-${string}-charge_cards` | `${string}-${string}-other_connection` | `${string}-${string}-reimbursement_promo_card` | `${string}-${string}-onboarding` | `${string}-${string}-operating_expenses_by_vendor` | `${string}-${string}-operating_expenses_by_vendor_summary` | `${string}-${string}-vendors_tab` | `${string}-${string}-accounts_payable_aging` | `${string}-${string}-accounts_receivable_aging` | `${string}-${string}-vendor_global_review` | `${string}-${string}-prepaid_expenses` | `${string}-${string}-fixed_assets` | `${string}-${string}-notification` | `${string}-${string}-rewards_card` | `${string}-${string}-billing` | `${string}-${string}-flux_analysis_operating_expense` | `${string}-${string}-account_reconciliation` | `${string}-${string}-zeni_credit_promo_card` | `${string}-${string}-treasury_promo_card` | `${string}-${string}-excluded_account_reconciliation`;
 export type SectionProjectKey = ReturnType<typeof getSectionProjectViewKey>;

package/lib/entity/sectionProjectView/sectionProjectViewHelper.d.ts

@@ -1,5 +1,6 @@
 import { COABalanceGroupedByPeriodPayloadV2 } from '../../commonPayloadTypes/v2/coaBalancePayload';
 import { CurrencyPayload } from '../../commonPayloadTypes/v2/viewAndReportPayloadv2';
+import { NestedAccountIDHierarchy } from '../../commonStateTypes/accountView/nestedAccountID';
 import { ID } from '../../commonStateTypes/common';
 import { ReportID } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { SectionProjectView } from './sectionProjectView';
@@ -7,4 +8,4 @@ export declare const mapProjectCOABalanceGroupedPayloadToSectionProjectView: (ti
     projectId: ID;
     reportId: ReportID;
     sectionId: ID;
-}) => SectionProjectView;
+}, nestedAccountIds: NestedAccountIDHierarchy[]) => SectionProjectView;

package/lib/entity/sectionProjectView/sectionProjectViewHelper.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapProjectCOABalanceGroupedPayloadToSectionProjectView = void 0;
 const coaBalancePayload_1 = require("../../commonPayloadTypes/v2/coaBalancePayload");
 const sectionProjectView_1 = require("./sectionProjectView");
-const mapProjectCOABalanceGroupedPayloadToSectionProjectView = (timeframe, projectBalancesPayload, currencyPayload, id) => {
+const mapProjectCOABalanceGroupedPayloadToSectionProjectView = (timeframe, projectBalancesPayload, currencyPayload, id, nestedAccountIds) => {
     return {
         key: (0, sectionProjectView_1.getSectionProjectViewKey)(id.sectionId, id.projectId, id.reportId),
         projectId: id.projectId,
         sectionId: id.sectionId,
         balancesByPeriod: (0, coaBalancePayload_1.mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod)(projectBalancesPayload, currencyPayload, timeframe),
+        nestedAccountIds,
     };
 };
 exports.mapProjectCOABalanceGroupedPayloadToSectionProjectView = mapProjectCOABalanceGroupedPayloadToSectionProjectView;

package/lib/entity/sectionProjectView/sectionProjectViewReducer.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearAllSectionsProjectView = exports.updateSectionProjectView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const coaBalancePayload_1 = require("../../commonPayloadTypes/v2/coaBalancePayload");
+const accountPayload_1 = require("../account/accountPayload");
+const getNestedAccountIDHierarchyForSection_1 = require("../sectionAccountsView/getNestedAccountIDHierarchyForSection");
 const sectionProjectView_1 = require("./sectionProjectView");
 const sectionProjectViewHelper_1 = require("./sectionProjectViewHelper");
 exports.initialState = {
@@ -27,11 +29,16 @@ const sectionProjectView = (0, toolkit_1.createSlice)({
                 };
             },
             reducer(draft, action) {
-                const { timeframe, sectionPayload, sectionId, reportId, currencyPayload } = action.payload;
+                const { timeframe, sectionPayload, sectionId, reportId, currencyPayload, accountsMetadataPayload, } = action.payload;
                 if (sectionPayload.projects != null) {
+                    const accountsMetadata = accountsMetadataPayload.map((eachAccount) => (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)(eachAccount));
                     Object.keys(sectionPayload.projects).forEach((projectId) => {
                         const projectPayload = sectionPayload.projects[projectId];
-                        updateSectionProject(draft, timeframe, projectPayload, sectionId, projectId, reportId, currencyPayload);
+                        const projectAccountIds = projectPayload.accounts != null
+                            ? Object.keys(projectPayload.accounts)
+                            : [];
+                        const nestedAccountIds = (0, getNestedAccountIDHierarchyForSection_1.getNestedAccountIDHierarchyForAccounts)(projectAccountIds, accountsMetadata);
+                        updateSectionProject(draft, timeframe, projectPayload, sectionId, projectId, reportId, currencyPayload, nestedAccountIds);
                     });
                 }
             },
@@ -43,14 +50,15 @@ const sectionProjectView = (0, toolkit_1.createSlice)({
 });
 _a = sectionProjectView.actions, exports.updateSectionProjectView = _a.updateSectionProjectView, exports.clearAllSectionsProjectView = _a.clearAllSectionsProjectView;
 exports.default = sectionProjectView.reducer;
-const updateSectionProject = (draft, timeframe, projectPayload, sectionId, projectId, reportId, currencyPayload) => {
+const updateSectionProject = (draft, timeframe, projectPayload, sectionId, projectId, reportId, currencyPayload, nestedAccountIds) => {
     const sectionKey = (0, sectionProjectView_1.getSectionProjectViewKey)(sectionId, projectId, reportId);
     const section = draft.sectionsByKey[sectionKey];
     if (section != null) {
         draft.sectionsByKey[sectionKey].balancesByPeriod = Object.assign({}, draft.sectionsByKey[sectionKey].balancesByPeriod, (0, coaBalancePayload_1.mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod)(projectPayload, currencyPayload, timeframe));
+        draft.sectionsByKey[sectionKey].nestedAccountIds = nestedAccountIds;
     }
     else {
         draft.sectionsByKey[sectionKey] =
-            (0, sectionProjectViewHelper_1.mapProjectCOABalanceGroupedPayloadToSectionProjectView)(timeframe, projectPayload, currencyPayload, { sectionId, projectId, reportId });
+            (0, sectionProjectViewHelper_1.mapProjectCOABalanceGroupedPayloadToSectionProjectView)(timeframe, projectPayload, currencyPayload, { sectionId, projectId, reportId }, nestedAccountIds);
     }
 };

package/lib/entity/sectionProjectView/sectionProjectViewSelector.js

@@ -7,41 +7,21 @@ exports.getSectionProjectViewReport = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
 const getSumOfBalancesGroupedByPeriod_1 = require("../../commonStateTypes/coaBalance/classBalances/getSumOfBalancesGroupedByPeriod");
-const accountPayload_1 = require("../account/accountPayload");
-const accountState_1 = require("../account/accountState");
 const subAccountSelector_1 = require("../account/subAccountSelector");
 const projectSelector_1 = require("../project/projectSelector");
-const getNestedAccountIDHierarchyForSection_1 = require("../sectionAccountsView/getNestedAccountIDHierarchyForSection");
 const sectionProjectView_1 = require("./sectionProjectView");
 const getSectionProjectViewReport = (accountState, projectState, sectionState, projectIds, id, filter) => {
     const projectIdsToShow = projectIds.filter((projectId) => !filter.projectsToFilterOut.includes(projectId));
     const projectReports = [];
     const sectionBalancesTotalByPeriodArray = [];
-    const accountsByProject = getAccountsByProject(accountState, id.sectionId, id.reportId);
     projectIdsToShow.forEach((projectId) => {
         const project = (0, projectSelector_1.getProjectById)(projectState, projectId);
         if (project == null) {
             return;
         }
-        const projectAccountIds = accountsByProject[projectId] ?? [];
-        const accountsMetadata = projectAccountIds
-            .map((accountId) => {
-            const key = (0, accountState_1.getAccountKey)(id.reportId, accountId, undefined, undefined, { projectId, sectionId: id.sectionId });
-            const account = accountState.accountsByKey[key];
-            if (account == null) {
-                return undefined;
-            }
-            return (0, accountPayload_1.mapAccountMetadataPayloadToAccountMetadata)({
-                account_id: account.accountId,
-                account_name: account.accountName,
-                account_description: account.accountDescription,
-                labels: account.labels,
-                is_sub_account: account.accountsViewParentId != null,
-                parent_account_id: account.accountsViewParentId?.parentAccountId?.[0] ?? null,
-            });
-        })
-            .filter((metadata) => metadata != null);
-        const nestedAccountHierarchy = (0, getNestedAccountIDHierarchyForSection_1.getNestedAccountIDHierarchyForAccounts)(projectAccountIds, accountsMetadata);
+        const projectSectionKey = (0, sectionProjectView_1.getSectionProjectViewKey)(id.sectionId, projectId, id.reportId);
+        const projectSectionView = (0, get_1.default)(sectionState.sectionsByKey, projectSectionKey, undefined);
+        const nestedAccountHierarchy = projectSectionView?.nestedAccountIds ?? [];
         const nestedAccountReports = [];
         nestedAccountHierarchy.forEach((accountIdHierarchy) => {
             const report = (0, subAccountSelector_1.getNestedAccountReportForAccount)(accountState, {
@@ -56,8 +36,6 @@ const getSectionProjectViewReport = (accountState, projectState, sectionState, p
                 nestedAccountReports.push(report);
             }
         });
-        const projectSectionKey = (0, sectionProjectView_1.getSectionProjectViewKey)(id.sectionId, projectId, id.reportId);
-        const projectSectionView = (0, get_1.default)(sectionState.sectionsByKey, projectSectionKey, undefined);
         const projectBalancesTotalByPeriod = projectSectionView?.balancesByPeriod ?? {};
         const projectReport = {
             projectId,
@@ -77,18 +55,3 @@ const getSectionProjectViewReport = (accountState, projectState, sectionState, p
     };
 };
 exports.getSectionProjectViewReport = getSectionProjectViewReport;
-const getAccountsByProject = (accountState, sectionId, reportId) => {
-    const result = {};
-    Object.values(accountState.accountsByKey).forEach((account) => {
-        if (account.projectsViewParentId != null &&
-            account.projectsViewParentId.sectionId === sectionId &&
-            account.key.endsWith(reportId)) {
-            const projectId = account.projectsViewParentId.projectId;
-            if (result[projectId] == null) {
-                result[projectId] = [];
-            }
-            result[projectId].push(account.accountId);
-        }
-    });
-    return result;
-};

package/lib/esm/entity/sectionProjectView/sectionProjectViewHelper.js

@@ -1,10 +1,11 @@
 import { mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod, } from '../../commonPayloadTypes/v2/coaBalancePayload';
 import { getSectionProjectViewKey, } from './sectionProjectView';
-export const mapProjectCOABalanceGroupedPayloadToSectionProjectView = (timeframe, projectBalancesPayload, currencyPayload, id) => {
+export const mapProjectCOABalanceGroupedPayloadToSectionProjectView = (timeframe, projectBalancesPayload, currencyPayload, id, nestedAccountIds) => {
     return {
         key: getSectionProjectViewKey(id.sectionId, id.projectId, id.reportId),
         projectId: id.projectId,
         sectionId: id.sectionId,
         balancesByPeriod: mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod(projectBalancesPayload, currencyPayload, timeframe),
+        nestedAccountIds,
     };
 };

package/lib/esm/entity/sectionProjectView/sectionProjectViewReducer.js

@@ -1,5 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod } from '../../commonPayloadTypes/v2/coaBalancePayload';
+import { mapAccountMetadataPayloadToAccountMetadata, } from '../account/accountPayload';
+import { getNestedAccountIDHierarchyForAccounts } from '../sectionAccountsView/getNestedAccountIDHierarchyForSection';
 import { getSectionProjectViewKey } from './sectionProjectView';
 import { mapProjectCOABalanceGroupedPayloadToSectionProjectView } from './sectionProjectViewHelper';
 export const initialState = {
@@ -23,11 +25,16 @@ const sectionProjectView = createSlice({
                 };
             },
             reducer(draft, action) {
-                const { timeframe, sectionPayload, sectionId, reportId, currencyPayload } = action.payload;
+                const { timeframe, sectionPayload, sectionId, reportId, currencyPayload, accountsMetadataPayload, } = action.payload;
                 if (sectionPayload.projects != null) {
+                    const accountsMetadata = accountsMetadataPayload.map((eachAccount) => mapAccountMetadataPayloadToAccountMetadata(eachAccount));
                     Object.keys(sectionPayload.projects).forEach((projectId) => {
                         const projectPayload = sectionPayload.projects[projectId];
-                        updateSectionProject(draft, timeframe, projectPayload, sectionId, projectId, reportId, currencyPayload);
+                        const projectAccountIds = projectPayload.accounts != null
+                            ? Object.keys(projectPayload.accounts)
+                            : [];
+                        const nestedAccountIds = getNestedAccountIDHierarchyForAccounts(projectAccountIds, accountsMetadata);
+                        updateSectionProject(draft, timeframe, projectPayload, sectionId, projectId, reportId, currencyPayload, nestedAccountIds);
                     });
                 }
             },
@@ -39,14 +46,15 @@ const sectionProjectView = createSlice({
 });
 export const { updateSectionProjectView, clearAllSectionsProjectView } = sectionProjectView.actions;
 export default sectionProjectView.reducer;
-const updateSectionProject = (draft, timeframe, projectPayload, sectionId, projectId, reportId, currencyPayload) => {
+const updateSectionProject = (draft, timeframe, projectPayload, sectionId, projectId, reportId, currencyPayload, nestedAccountIds) => {
     const sectionKey = getSectionProjectViewKey(sectionId, projectId, reportId);
     const section = draft.sectionsByKey[sectionKey];
     if (section != null) {
         draft.sectionsByKey[sectionKey].balancesByPeriod = Object.assign({}, draft.sectionsByKey[sectionKey].balancesByPeriod, mapCOABalanceGroupedByPeriodPayloadV2ToCOABalanceGroupedByPeriod(projectPayload, currencyPayload, timeframe));
+        draft.sectionsByKey[sectionKey].nestedAccountIds = nestedAccountIds;
     }
     else {
         draft.sectionsByKey[sectionKey] =
-            mapProjectCOABalanceGroupedPayloadToSectionProjectView(timeframe, projectPayload, currencyPayload, { sectionId, projectId, reportId });
+            mapProjectCOABalanceGroupedPayloadToSectionProjectView(timeframe, projectPayload, currencyPayload, { sectionId, projectId, reportId }, nestedAccountIds);
     }
 };

package/lib/esm/entity/sectionProjectView/sectionProjectViewSelector.js

@@ -1,41 +1,21 @@
 import recordGet from 'lodash/get';
 import { getCOABalances, } from '../../commonStateTypes/coaBalance/coaBalance';
 import { getSumOfBalancesByGroupedByPeriod } from '../../commonStateTypes/coaBalance/classBalances/getSumOfBalancesGroupedByPeriod';
-import { mapAccountMetadataPayloadToAccountMetadata } from '../account/accountPayload';
-import { getAccountKey } from '../account/accountState';
 import { getNestedAccountReportForAccount, } from '../account/subAccountSelector';
 import { getProjectById } from '../project/projectSelector';
-import { getNestedAccountIDHierarchyForAccounts } from '../sectionAccountsView/getNestedAccountIDHierarchyForSection';
 import { getSectionProjectViewKey } from './sectionProjectView';
 export const getSectionProjectViewReport = (accountState, projectState, sectionState, projectIds, id, filter) => {
     const projectIdsToShow = projectIds.filter((projectId) => !filter.projectsToFilterOut.includes(projectId));
     const projectReports = [];
     const sectionBalancesTotalByPeriodArray = [];
-    const accountsByProject = getAccountsByProject(accountState, id.sectionId, id.reportId);
     projectIdsToShow.forEach((projectId) => {
         const project = getProjectById(projectState, projectId);
         if (project == null) {
             return;
         }
-        const projectAccountIds = accountsByProject[projectId] ?? [];
-        const accountsMetadata = projectAccountIds
-            .map((accountId) => {
-            const key = getAccountKey(id.reportId, accountId, undefined, undefined, { projectId, sectionId: id.sectionId });
-            const account = accountState.accountsByKey[key];
-            if (account == null) {
-                return undefined;
-            }
-            return mapAccountMetadataPayloadToAccountMetadata({
-                account_id: account.accountId,
-                account_name: account.accountName,
-                account_description: account.accountDescription,
-                labels: account.labels,
-                is_sub_account: account.accountsViewParentId != null,
-                parent_account_id: account.accountsViewParentId?.parentAccountId?.[0] ?? null,
-            });
-        })
-            .filter((metadata) => metadata != null);
-        const nestedAccountHierarchy = getNestedAccountIDHierarchyForAccounts(projectAccountIds, accountsMetadata);
+        const projectSectionKey = getSectionProjectViewKey(id.sectionId, projectId, id.reportId);
+        const projectSectionView = recordGet(sectionState.sectionsByKey, projectSectionKey, undefined);
+        const nestedAccountHierarchy = projectSectionView?.nestedAccountIds ?? [];
         const nestedAccountReports = [];
         nestedAccountHierarchy.forEach((accountIdHierarchy) => {
             const report = getNestedAccountReportForAccount(accountState, {
@@ -50,8 +30,6 @@ export const getSectionProjectViewReport = (accountState, projectState, sectionS
                 nestedAccountReports.push(report);
             }
         });
-        const projectSectionKey = getSectionProjectViewKey(id.sectionId, projectId, id.reportId);
-        const projectSectionView = recordGet(sectionState.sectionsByKey, projectSectionKey, undefined);
         const projectBalancesTotalByPeriod = projectSectionView?.balancesByPeriod ?? {};
         const projectReport = {
             projectId,
@@ -70,18 +48,3 @@ export const getSectionProjectViewReport = (accountState, projectState, sectionS
         sectionBalancesTotalByPeriod,
     };
 };
-const getAccountsByProject = (accountState, sectionId, reportId) => {
-    const result = {};
-    Object.values(accountState.accountsByKey).forEach((account) => {
-        if (account.projectsViewParentId != null &&
-            account.projectsViewParentId.sectionId === sectionId &&
-            account.key.endsWith(reportId)) {
-            const projectId = account.projectsViewParentId.projectId;
-            if (result[projectId] == null) {
-                result[projectId] = [];
-            }
-            result[projectId].push(account.accountId);
-        }
-    });
-    return result;
-};

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

@@ -12,7 +12,13 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const periodId = toMonthYearPeriodId(selectedPeriod);
     const isInitialLoad = action.payload.pageToken == null;
-    const cacheKey = getCompletedTransactionsCacheKey(periodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab);
+    /**
+     * Snapshot sort config + subTab at request time so success/failure write
+     * into the same cache key the request was made under, even if the user
+     * toggles sort while the request is in flight.
+     */
+    const { sortKey, sortOrder, completedSubTab } = bulkUpload;
+    const cacheKey = getCompletedTransactionsCacheKey(periodId, sortKey, sortOrder, completedSubTab);
     const existingData = bulkUpload.completedTransactionsByPeriod[cacheKey];
     if (isInitialLoad &&
         action.payload.cacheOverride !== true &&
@@ -24,13 +30,13 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     const queryPayload = {
         start_date: period.start,
         end_date: period.end,
-        sort_by: bulkUpload.sortKey,
-        sort_order: bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc',
+        sort_by: sortKey,
+        sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
         page_token: action.payload.pageToken ?? null,
         page_size: 25,
     };
-    if (bulkUpload.completedSubTab !== 'all') {
-        queryPayload.match_type = bulkUpload.completedSubTab;
+    if (completedSubTab !== 'all') {
+        queryPayload.match_type = completedSubTab;
     }
     const encodedQuery = encodeURIComponent(JSON.stringify(queryPayload));
     return zeniAPI
@@ -46,16 +52,25 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
                 nextPageToken: response.data.next_page_token,
                 totalCount: response.data.total_count,
                 selectedPeriod,
+                sortKey,
+                sortOrder,
+                completedSubTab,
             }));
             return from(updateActions);
         }
         return of(fetchCompletedTransactionsFailure({
             error: response.status,
             selectedPeriod,
+            sortKey,
+            sortOrder,
+            completedSubTab,
         }));
     }), catchError((error) => of(fetchCompletedTransactionsFailure({
         error: createZeniAPIStatus('Unexpected Error', 'Fetch completed transactions errored: ' +
             JSON.stringify(error)),
         selectedPeriod,
+        sortKey,
+        sortOrder,
+        completedSubTab,
     }))));
 }));

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

@@ -5,7 +5,7 @@ import { updateTransactions } from '../../../../entity/transaction/transactionRe
 import { isSuccessResponse } from '../../../../responsePayload';
 import { BULK_UPLOAD_AUTOMATCHING_TIMEOUT_MS } from '../../helpers/bulkUploadTiming';
 import { extractTransactionPayloadsFromBatchFiles, isBatchDetailsApiStatusCompleted, toBatchDetails, } from '../../payload/missingReceiptsPayload';
-import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
+import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadMatchingState, } from '../../reducers/missingReceiptsViewReducer';
 /** First poll after upload; then interval while batch not resolved via Pusher or API. */
 const FALLBACK_FIRST_DELAY_MS = 30000;
 /** Shorter first poll for restored sessions — batch may already be near completion. */
@@ -35,9 +35,17 @@ export const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.
         if (bulk.phase !== 'matching' || bulk.currentBatchId !== batchId) {
             return EMPTY;
         }
+        /**
+         * Also request the single-batch details directly so the "X out of Y Receipts Matched"
+         * toast still fires when the backend actually completed between the last Pusher ping
+         * and this timeout. If Pusher already tagged the batch as still `processing`,
+         * `fetchBulkUploadBatchDetailsEpic`'s guard will skip the call and we simply rely on
+         * the list refresh to eventually populate details via `fetchMultipleBatchDetailsEpic`.
+         */
         return from([
             bulkUploadAutomatchingTimedOut(batchId),
             fetchBulkUploadBatches({ cacheOverride: true }),
+            fetchBulkUploadBatchDetails(),
         ]);
     }), takeUntil(merge(actions$.pipe(filter(clearBulkUpload.match)), actions$.pipe(filter(pusherBatchStatusUpdate.match), filter((a) => a.payload.batchId === batchId &&
         a.payload.status === 'completed')), actions$.pipe(filter(fetchBulkUploadBatchDetailsSuccess.match), filter((a) => a.payload.batchId === batchId)))));

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

@@ -522,9 +522,9 @@ const expenseAutomationMissingReceiptsView = createSlice({
             },
         },
         fetchCompletedTransactionsSuccess(draft, action) {
-            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, } = action.payload;
+            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, sortKey, sortOrder, completedSubTab, } = action.payload;
             const periodId = toMonthYearPeriodId(selectedPeriod);
-            const cacheKey = getCompletedTransactionsCacheKey(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const cacheKey = getCompletedTransactionsCacheKey(periodId, sortKey, sortOrder, completedSubTab);
             if (isInitialLoad) {
                 draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     transactionIds,
@@ -553,7 +553,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
         },
         fetchCompletedTransactionsFailure(draft, action) {
             const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
-            const cacheKey = getCompletedTransactionsCacheKey(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const cacheKey = getCompletedTransactionsCacheKey(periodId, action.payload.sortKey, action.payload.sortOrder, action.payload.completedSubTab);
             const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
             if (existing != null) {
                 existing.fetchState = {

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

@@ -15,7 +15,13 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
     const isInitialLoad = action.payload.pageToken == null;
-    const cacheKey = (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(periodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab);
+    /**
+     * Snapshot sort config + subTab at request time so success/failure write
+     * into the same cache key the request was made under, even if the user
+     * toggles sort while the request is in flight.
+     */
+    const { sortKey, sortOrder, completedSubTab } = bulkUpload;
+    const cacheKey = (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(periodId, sortKey, sortOrder, completedSubTab);
     const existingData = bulkUpload.completedTransactionsByPeriod[cacheKey];
     if (isInitialLoad &&
         action.payload.cacheOverride !== true &&
@@ -27,13 +33,13 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
     const queryPayload = {
         start_date: period.start,
         end_date: period.end,
-        sort_by: bulkUpload.sortKey,
-        sort_order: bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc',
+        sort_by: sortKey,
+        sort_order: sortOrder === 'ascending' ? 'asc' : 'desc',
         page_token: action.payload.pageToken ?? null,
         page_size: 25,
     };
-    if (bulkUpload.completedSubTab !== 'all') {
-        queryPayload.match_type = bulkUpload.completedSubTab;
+    if (completedSubTab !== 'all') {
+        queryPayload.match_type = completedSubTab;
     }
     const encodedQuery = encodeURIComponent(JSON.stringify(queryPayload));
     return zeniAPI
@@ -49,17 +55,26 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
                 nextPageToken: response.data.next_page_token,
                 totalCount: response.data.total_count,
                 selectedPeriod,
+                sortKey,
+                sortOrder,
+                completedSubTab,
             }));
             return (0, rxjs_1.from)(updateActions);
         }
         return (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchCompletedTransactionsFailure)({
             error: response.status,
             selectedPeriod,
+            sortKey,
+            sortOrder,
+            completedSubTab,
         }));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, missingReceiptsViewReducer_1.fetchCompletedTransactionsFailure)({
         error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch completed transactions errored: ' +
             JSON.stringify(error)),
         selectedPeriod,
+        sortKey,
+        sortOrder,
+        completedSubTab,
     }))));
 }));
 exports.fetchCompletedTransactionsEpic = fetchCompletedTransactionsEpic;

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

@@ -4,8 +4,8 @@ import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadMatchingState } from '../../reducers/missingReceiptsViewReducer';
-export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof restoreBulkUploadMatchingState> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetailsSuccess> | ReturnType<typeof fetchBulkUploadBatches> | ReturnType<typeof requestMissingReceiptsTabNavigation> | ReturnType<typeof updateTransactions> | ReturnType<typeof clearBulkUpload> | ReturnType<typeof openSnackbar> | ReturnType<typeof bulkUploadAutomatchingTimedOut>;
+import { bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, clearBulkUpload, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, restoreBulkUploadMatchingState } from '../../reducers/missingReceiptsViewReducer';
+export type ActionType = ReturnType<typeof bulkUploadReceiptsSuccess> | ReturnType<typeof restoreBulkUploadMatchingState> | ReturnType<typeof pusherBatchStatusUpdate> | ReturnType<typeof fetchBulkUploadBatchDetails> | ReturnType<typeof fetchBulkUploadBatchDetailsSuccess> | ReturnType<typeof fetchBulkUploadBatches> | ReturnType<typeof requestMissingReceiptsTabNavigation> | ReturnType<typeof updateTransactions> | ReturnType<typeof clearBulkUpload> | ReturnType<typeof openSnackbar> | ReturnType<typeof bulkUploadAutomatchingTimedOut>;
 /**
  * On Pusher batch completion: refresh batch list (then fetchMultipleBatchDetailsEpic runs),
  * and request switching to the Unmatched tab. Debounced to reduce duplicate refreshes.

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

@@ -39,9 +39,17 @@ const bulkUploadAutomatchingTimeoutEpic = (actions$, state$) => actions$.pipe((0
         if (bulk.phase !== 'matching' || bulk.currentBatchId !== batchId) {
             return rxjs_1.EMPTY;
         }
+        /**
+         * Also request the single-batch details directly so the "X out of Y Receipts Matched"
+         * toast still fires when the backend actually completed between the last Pusher ping
+         * and this timeout. If Pusher already tagged the batch as still `processing`,
+         * `fetchBulkUploadBatchDetailsEpic`'s guard will skip the call and we simply rely on
+         * the list refresh to eventually populate details via `fetchMultipleBatchDetailsEpic`.
+         */
         return (0, rxjs_1.from)([
             (0, missingReceiptsViewReducer_1.bulkUploadAutomatchingTimedOut)(batchId),
             (0, missingReceiptsViewReducer_1.fetchBulkUploadBatches)({ cacheOverride: true }),
+            (0, missingReceiptsViewReducer_1.fetchBulkUploadBatchDetails)(),
         ]);
     }), (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 &&
         a.payload.status === 'completed')), actions$.pipe((0, operators_1.filter)(missingReceiptsViewReducer_1.fetchBulkUploadBatchDetailsSuccess.match), (0, operators_1.filter)((a) => a.payload.batchId === batchId)))));

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

@@ -101,14 +101,20 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
     pageToken: string | undefined;
     cacheOverride: boolean | undefined;
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactions", never, never>, fetchCompletedTransactionsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    completedSubTab: CompletedSubTab;
     isInitialLoad: boolean;
     nextPageToken: string | null;
     selectedPeriod: MonthYearPeriod;
+    sortKey: BulkUploadSortKey;
+    sortOrder: SortOrder;
     totalCount: number;
     transactionIds: ID[];
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactionsSuccess">, fetchCompletedTransactionsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    completedSubTab: CompletedSubTab;
     error: ZeniAPIStatus;
     selectedPeriod: MonthYearPeriod;
+    sortKey: BulkUploadSortKey;
+    sortOrder: SortOrder;
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactionsFailure">;
 declare const _default: import("redux").Reducer<MissingReceiptsViewState>;
 export default _default;

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

@@ -527,9 +527,9 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
             },
         },
         fetchCompletedTransactionsSuccess(draft, action) {
-            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, } = action.payload;
+            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad, sortKey, sortOrder, completedSubTab, } = action.payload;
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
-            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, sortKey, sortOrder, completedSubTab);
             if (isInitialLoad) {
                 draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     transactionIds,
@@ -558,7 +558,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         },
         fetchCompletedTransactionsFailure(draft, action) {
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod);
-            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, action.payload.sortKey, action.payload.sortOrder, action.payload.completedSubTab);
             const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
             if (existing != null) {
                 existing.fetchState = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.0.9",
+  "version": "5.0.10-betaVR1",
   "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__\"",
     "only-build-dev": "eslint . --ext .js,.jsx,.ts,.tsx && time tsc -p tsconfig.dev.json && tsc -p tsconfig.esm.dev.json && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
     "format": "prettier --write --ignore-unknown \"src/**/*\" && pnpm lint",