@zeniai/client-epic-state 5.3.13 → 5.3.14-beta1MM

package/lib/commonStateTypes/animations.d.ts

@@ -1,2 +1,2 @@
-export declare const toAnimationsFileName: (v: string) => "Success" | "AiAgent" | "AiIconEntry" | "AiIconExit" | "AiIconLoop" | "AiStar" | "AiStarIcon" | "AiStarPlain" | "AIPoweredInvoiceDark" | "AIPoweredInvoiceLight" | "Angry" | "AutoTransfer" | "CloseCard" | "Confetti" | "ConfettiSuccess" | "DashboardChristmasSnow" | "DashboardHalloweenBats" | "DashboardNewYearShow" | "DashboardSidebarBottomChristmas" | "DashboardSidebarBottomHalloween" | "DashboardSidebarBottomNewYear" | "DashboardSidebarBottomThanksgiving" | "DashboardSidebarTopChristmas" | "DashboardSidebarTopHalloween" | "DashboardSidebarTopNewYear" | "DashboardSidebarTopThanksgiving" | "Distribution" | "DistributionDark" | "EarnYield" | "FastestWayDark" | "FastestWayLight" | "FinanceTeamDark" | "FinanceTeamLight" | "Happy" | "Liquidity" | "LockCard" | "MoneyTransferSuccess" | "MultiLevelApprovalDark" | "MultiLevelApprovalLight" | "NotHappy" | "Protection" | "ReceiptDark" | "ReceiptLight" | "Recurring" | "RecurringDark" | "ReimburseDark" | "ReimburseLight" | "RewardsDark" | "RewardsDarkHover" | "RewardsLight" | "RewardsLightHover" | "Ripple" | "Secure" | "Target" | "TargetDark" | "UnlockCard" | "VeryHappy" | "Welcome" | "ZeniAssist";
+export declare const toAnimationsFileName: (v: string) => "Success" | "AiAgent" | "AiIconEntry" | "AiIconExit" | "AiIconLoop" | "AiStar" | "AiStarIcon" | "AiStarPlain" | "AIPoweredInvoiceDark" | "AIPoweredInvoiceLight" | "Angry" | "AutoTransfer" | "CloseCard" | "Confetti" | "ConfettiSuccess" | "DashboardChristmasSnow" | "DashboardHalloweenBats" | "DashboardNewYearShow" | "DashboardSidebarBottomChristmas" | "DashboardSidebarBottomNewYear" | "DashboardSidebarBottomThanksgiving" | "DashboardSidebarTopChristmas" | "DashboardSidebarTopNewYear" | "DashboardSidebarTopThanksgiving" | "Distribution" | "DistributionDark" | "EarnYield" | "FastestWayDark" | "FastestWayLight" | "FinanceTeamDark" | "FinanceTeamLight" | "Happy" | "Liquidity" | "LockCard" | "MoneyTransferSuccess" | "MultiLevelApprovalDark" | "MultiLevelApprovalLight" | "NotHappy" | "Protection" | "ReceiptDark" | "ReceiptLight" | "Recurring" | "RecurringDark" | "ReimburseDark" | "ReimburseLight" | "RewardsDark" | "RewardsDarkHover" | "RewardsLight" | "RewardsLightHover" | "Ripple" | "Secure" | "Target" | "TargetDark" | "UnlockCard" | "VeryHappy" | "Welcome" | "ZeniAssist";
 export type AnimationFileName = ReturnType<typeof toAnimationsFileName>;

package/lib/commonStateTypes/animations.js

@@ -21,11 +21,9 @@ const ALL_ANIMATIONS_FILE_NAMES = [
     'DashboardHalloweenBats',
     'DashboardNewYearShow',
     'DashboardSidebarBottomChristmas',
-    'DashboardSidebarBottomHalloween',
     'DashboardSidebarBottomNewYear',
     'DashboardSidebarBottomThanksgiving',
     'DashboardSidebarTopChristmas',
-    'DashboardSidebarTopHalloween',
     'DashboardSidebarTopNewYear',
     'DashboardSidebarTopThanksgiving',
     'Distribution',

package/lib/entity/actualMatching/actualMatchingPayload.d.ts

@@ -17,8 +17,10 @@ export interface ActualMatchingMatchPayload {
     currency_code?: string | null;
     currency_symbol?: string | null;
     leftovers?: JEOneTimeAccrualPayload[];
+    match_batch_id?: string | null;
     match_shape?: string | null;
     match_tier?: string | null;
+    suggestion_key?: string | null;
     transaction_date?: string | null;
     vendor_id?: ID | null;
     vendor_name?: string | null;

package/lib/entity/actualMatching/actualMatchingPayload.js

@@ -34,6 +34,12 @@ function toActualMatchingMatch(payload, fallbackCurrency) {
             : currencyCode;
     return {
         matchId: payload.match_id,
+        matchBatchId: payload.match_batch_id != null && payload.match_batch_id !== ''
+            ? payload.match_batch_id
+            : undefined,
+        suggestionKey: payload.suggestion_key != null && payload.suggestion_key !== ''
+            ? payload.suggestion_key
+            : undefined,
         transactionType: (payload.transaction_type || '').toLowerCase(),
         transactionIntegrationId: payload.transaction_integration_id,
         transactionDate: payload.transaction_date ?? undefined,

package/lib/entity/actualMatching/actualMatchingReducer.js

@@ -5,6 +5,7 @@ exports.updateActualMatchingMatches = exports.removeActualMatchingMatch = export
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../rootActions");
 const actualMatchingPayload_1 = require("./actualMatchingPayload");
+const actualMatchingTypes_1 = require("./actualMatchingTypes");
 exports.initialState = {
     byMatchId: {},
 };
@@ -19,7 +20,7 @@ const actualMatching = (0, toolkit_1.createSlice)({
             reducer(draft, action) {
                 action.payload.matches.forEach((payload) => {
                     const match = (0, actualMatchingPayload_1.toActualMatchingMatch)(payload, action.payload.fallbackCurrency);
-                    draft.byMatchId[match.matchId] = match;
+                    draft.byMatchId[(0, actualMatchingTypes_1.actualMatchingRowKey)(match.matchId, match.matchBatchId, match.suggestionKey)] = match;
                 });
             },
         },

package/lib/entity/actualMatching/actualMatchingState.d.ts

@@ -12,8 +12,10 @@ export interface ActualMatchingMatch {
     transactionIntegrationId: ID;
     transactionType: string;
     leftovers?: JEOneTimeAccrualState[];
+    matchBatchId?: string;
     matchShape?: string;
     matchTier?: string;
+    suggestionKey?: string;
     transactionDate?: string;
     vendorId?: ID;
     vendorName?: string;

package/lib/entity/actualMatching/actualMatchingTypes.d.ts

@@ -1 +1,7 @@
 export type ActualMatchingMatchId = string;
+/** Store and status key. The route match id stays ``type:id``.
+
+The second part is the cleared ``match_batch_id`` when one exists, otherwise the
+pending suggestion's ``suggestion_key``.
+*/
+export declare function actualMatchingRowKey(matchId: string, matchBatchId?: string | null, suggestionKey?: string | null): string;

package/lib/entity/actualMatching/actualMatchingTypes.js

@@ -1,2 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.actualMatchingRowKey = actualMatchingRowKey;
+/** Store and status key. The route match id stays ``type:id``.
+
+The second part is the cleared ``match_batch_id`` when one exists, otherwise the
+pending suggestion's ``suggestion_key``.
+*/
+function actualMatchingRowKey(matchId, matchBatchId, suggestionKey) {
+    const batch = (matchBatchId ?? '').trim();
+    if (batch !== '') {
+        return `${matchId}\u0000${batch}`;
+    }
+    const suggestion = (suggestionKey ?? '').trim();
+    if (suggestion === '') {
+        return matchId;
+    }
+    return `${matchId}\u0000${suggestion}`;
+}

package/lib/esm/commonStateTypes/animations.js

@@ -18,11 +18,9 @@ const ALL_ANIMATIONS_FILE_NAMES = [
     'DashboardHalloweenBats',
     'DashboardNewYearShow',
     'DashboardSidebarBottomChristmas',
-    'DashboardSidebarBottomHalloween',
     'DashboardSidebarBottomNewYear',
     'DashboardSidebarBottomThanksgiving',
     'DashboardSidebarTopChristmas',
-    'DashboardSidebarTopHalloween',
     'DashboardSidebarTopNewYear',
     'DashboardSidebarTopThanksgiving',
     'Distribution',

package/lib/esm/entity/actualMatching/actualMatchingPayload.js

@@ -30,6 +30,12 @@ export function toActualMatchingMatch(payload, fallbackCurrency) {
             : currencyCode;
     return {
         matchId: payload.match_id,
+        matchBatchId: payload.match_batch_id != null && payload.match_batch_id !== ''
+            ? payload.match_batch_id
+            : undefined,
+        suggestionKey: payload.suggestion_key != null && payload.suggestion_key !== ''
+            ? payload.suggestion_key
+            : undefined,
         transactionType: (payload.transaction_type || '').toLowerCase(),
         transactionIntegrationId: payload.transaction_integration_id,
         transactionDate: payload.transaction_date ?? undefined,

package/lib/esm/entity/actualMatching/actualMatchingReducer.js

@@ -1,6 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { clearAll } from '../../rootActions';
 import { toActualMatchingMatch, } from './actualMatchingPayload';
+import { actualMatchingRowKey, } from './actualMatchingTypes';
 export const initialState = {
     byMatchId: {},
 };
@@ -15,7 +16,7 @@ const actualMatching = createSlice({
             reducer(draft, action) {
                 action.payload.matches.forEach((payload) => {
                     const match = toActualMatchingMatch(payload, action.payload.fallbackCurrency);
-                    draft.byMatchId[match.matchId] = match;
+                    draft.byMatchId[actualMatchingRowKey(match.matchId, match.matchBatchId, match.suggestionKey)] = match;
                 });
             },
         },

package/lib/esm/entity/actualMatching/actualMatchingTypes.js

@@ -1 +1,16 @@
-export {};
+/** Store and status key. The route match id stays ``type:id``.
+
+The second part is the cleared ``match_batch_id`` when one exists, otherwise the
+pending suggestion's ``suggestion_key``.
+*/
+export function actualMatchingRowKey(matchId, matchBatchId, suggestionKey) {
+    const batch = (matchBatchId ?? '').trim();
+    if (batch !== '') {
+        return `${matchId}\u0000${batch}`;
+    }
+    const suggestion = (suggestionKey ?? '').trim();
+    if (suggestion === '') {
+        return matchId;
+    }
+    return `${matchId}\u0000${suggestion}`;
+}

package/lib/esm/index.js

@@ -875,6 +875,7 @@ export { getInvoicingOnboardingGateView } from './view/invoicing/invoicingConfig
 // narrow a JEScheduleRow before reading baseTransaction / recurringAmount.
 export { getExpenseAutomationJEOneTimeAccrualDetailView, getJEScheduleRowType, isAccruedScheduleRow, isAiAccountantSchedule, isExistingTabRow, isOneTimeAccrualRow, isRenderableOneTimeAccrual, isPendingReviewRow, } from './view/expenseAutomationView/selectors/jeSchedulesViewSelector';
 export { getActualMatchingAmount, getActualMatchingReversalDate, getActualMatchingMatchModalConfirmStatus, getCloseMatchAfterIgnoreMatchId, getCloseMatchAfterUndo, getCloseMatchAfterUndoMatchId, parseActualMatchingMatchId, getExpenseAutomationActualMatchingMatchView, getExpenseAutomationActualMatchingView, isAutoReversedAccrual, isManuallyReversedAccrual, isPendingReviewAccrual, } from './view/expenseAutomationView/selectors/actualMatchingViewSelector';
+export { actualMatchingRowKey } from './entity/actualMatching/actualMatchingTypes';
 export { fetchCustomerSummaryDetail, fetchCustomerSummaryList, resetCustomerSummaryDetailUiState, saveCustomerSummaryDetail, updateCustomerAllTransactionsTabData, updateCustomerDetailSelectedTab, updateCustomerSummaryRevenueSelection, updateCustomerSummaryScrollYOffset, updateCustomerSummarySortUiState, updateCustomerTrendFilter, } from './view/customerSummaryView/customerSummaryViewReducer';
 export { getCustomerSummaryAllTransactionsTabData, getCustomerSummaryDetail, getCustomerSummaryList, getCustomerSummarySelectedTabType, getCustomerSummaryTrendFilter, isCustomersTabVisible, } from './view/customerSummaryView/customerSummaryViewSelector';
 export { CUSTOMER_REVENUE_KEYS } from './view/customerSummaryView/customerSummaryViewState';

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/actualMatching/fetchActualMatchingEpic.js

@@ -1,6 +1,7 @@
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap, takeUntil, } from 'rxjs/operators';
 import { updateActualMatchingMatches } from '../../../../../entity/actualMatching/actualMatchingReducer';
+import { actualMatchingRowKey } from '../../../../../entity/actualMatching/actualMatchingTypes';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { clearAll } from '../../../../../rootActions';
 import { toServiceMonthFromPeriod, } from '../../../payload/actualMatchingPayload';
@@ -26,7 +27,7 @@ export const fetchActualMatchingEpic = (actions$, state$, zeniAPI) => actions$.p
                 updateActions.push(updateActualMatchingMatches(matches, getTenantDisplayCurrency(state)));
             }
             updateActions.push(fetchActualMatchingSuccess({
-                matchIds: matches.map((match) => match.match_id),
+                matchIds: matches.map((match) => actualMatchingRowKey(match.match_id, match.match_batch_id, match.suggestion_key)),
                 selectedPeriod: requestPeriod,
                 refreshViewInBackground,
             }));

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/actualMatching/fetchActualMatchingMatchEpic.js

@@ -6,29 +6,44 @@ import { clearAll } from '../../../../../rootActions';
 import { fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, } from '../../../reducers/actualMatchingViewReducer';
 import { getTenantDisplayCurrency } from '../../../selectors/actualMatchingViewSelector';
 export const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchActualMatchingMatch.match), mergeMap((action) => {
-    const { matchId, refreshViewInBackground } = action.payload;
+    const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+    const detailQuery = new URLSearchParams();
+    if (matchBatchId != null && matchBatchId !== '') {
+        detailQuery.set('batch_id', matchBatchId);
+    }
+    else if (suggestionKey != null && suggestionKey !== '') {
+        detailQuery.set('suggestion_key', suggestionKey);
+    }
+    const encodedQuery = detailQuery.toString();
+    const batchQuery = encodedQuery === '' ? '' : `?${encodedQuery}`;
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}`)
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}${batchQuery}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return from([
                 updateActualMatchingMatches([response.data], getTenantDisplayCurrency(state$.value)),
                 fetchActualMatchingMatchSuccess({
+                    suggestionKey,
                     matchId,
+                    matchBatchId,
                     refreshViewInBackground,
                 }),
             ]);
         }
         return from([
             fetchActualMatchingMatchFailure({
+                suggestionKey,
                 matchId,
+                matchBatchId,
                 refreshViewInBackground,
                 status: response.status,
             }),
         ]);
     }), catchError((error) => from([
         fetchActualMatchingMatchFailure({
+            suggestionKey,
             matchId,
+            matchBatchId,
             refreshViewInBackground,
             status: createZeniAPIStatus('Unexpected Error', `Fetch actual matching match REST API call errored out ${JSON.stringify(error)}`),
         }),

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/actualMatching/matchAndReverseAccrualsEpic.js

@@ -56,8 +56,12 @@ function matchAndReverseHttpFailSnackbar(vendorName) {
     });
 }
 function matchVendorName(state, matchId) {
-    return (getActualMatchingMatchById(state.actualMatchingState, matchId)
-        ?.vendorName ?? '');
+    const stored = getActualMatchingMatchById(state.actualMatchingState, matchId);
+    if (stored?.vendorName != null && stored.vendorName !== '') {
+        return stored.vendorName;
+    }
+    const sameBill = Object.values(state.actualMatchingState.byMatchId).find((match) => match.matchId === matchId);
+    return sameBill?.vendorName ?? '';
 }
 export const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(matchAndReverseAccruals.match), 
 // Per-match exhaust: a second click on the same match drops while HTTP is in
@@ -96,7 +100,7 @@ groupBy((action) => `${action.payload.transactionType.toLowerCase()}:${action.pa
                 // List + detail: list can omit leftovers; detail GET always
                 // writes intended occupancy so leftover retry can join C
                 // onto the occupied bill instead of a stale cached row.
-                successActions.push(...refreshActualMatchingList(state$.value), fetchActualMatchingMatch(matchId, true));
+                successActions.push(...refreshActualMatchingList(state$.value), fetchActualMatchingMatch(matchId, true, response.data.match_batch_id));
             }
             const snackbar = matchAndReverseSnackbar(results, vendorName);
             if (snackbar != null) {

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/actualMatching/undoReversalAccrualsEpic.js

@@ -1,6 +1,7 @@
 import { from, of } from 'rxjs';
 import { catchError, exhaustMap, filter, groupBy, mergeMap, takeUntil, } from 'rxjs/operators';
 import { getActualMatchingMatchById } from '../../../../../entity/actualMatching/actualMatchingSelector';
+import { actualMatchingRowKey } from '../../../../../entity/actualMatching/actualMatchingTypes';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { clearAll } from '../../../../../rootActions';
@@ -37,41 +38,45 @@ function undoReversalSnackbar(results, vendorName) {
         variables,
     });
 }
-function matchVendorName(state, matchId) {
-    return (getActualMatchingMatchById(state.actualMatchingState, matchId)?.vendorName ??
+function matchVendorName(state, matchId, matchBatchId) {
+    const rowKey = actualMatchingRowKey(matchId, matchBatchId);
+    return (getActualMatchingMatchById(state.actualMatchingState, rowKey)?.vendorName ??
+        getActualMatchingMatchById(state.actualMatchingState, matchId)?.vendorName ??
         '');
 }
 export const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(undoReversalAccruals.match), 
 // Per-match exhaust: a second click on the same match drops while HTTP is in
 // flight. A different match must still run — a global exhaustMap left the
 // other match's reducer In-Progress with no request.
-groupBy((action) => action.payload.matchId), mergeMap((perMatch$) => perMatch$.pipe(exhaustMap((action) => {
-    const { accrualIds, matchId } = action.payload;
+groupBy((action) => actualMatchingRowKey(action.payload.matchId, action.payload.matchBatchId)), mergeMap((perMatch$) => perMatch$.pipe(exhaustMap((action) => {
+    const { accrualIds, matchId, matchBatchId } = action.payload;
     const body = {
         accrual_ids: accrualIds,
     };
-    const vendorName = matchVendorName(state$.value, matchId);
+    const vendorName = matchVendorName(state$.value, matchId, matchBatchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/undo-reversal`, body)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             const results = response.data.results.map(toUndoReversalResult);
             const successActions = [
-                undoReversalAccrualsSuccess(matchId, results),
+                undoReversalAccrualsSuccess(matchId, results, matchBatchId),
             ];
             const anyUndone = results.some((result) => result.status === 'undone');
             if (anyUndone) {
-                successActions.push(...refreshActualMatchingList(state$.value), fetchActualMatchingMatch(matchId, true));
+                successActions.push(...refreshActualMatchingList(state$.value), fetchActualMatchingMatch(matchId, true, matchBatchId));
             }
             successActions.push(undoReversalSnackbar(results, vendorName));
             return from(successActions);
         }
         return of(undoReversalAccrualsFailure({
             matchId,
+            matchBatchId,
             status: response.status,
         }), undoReversalSnackbar([], vendorName));
     }), catchError((error) => of(undoReversalAccrualsFailure({
         matchId,
+        matchBatchId,
         status: createZeniAPIStatus('Unexpected Error', 'Undo reversal accruals REST API call errored out' +
             JSON.stringify(error)),
     }), undoReversalSnackbar([], vendorName))), takeUntil(actions$.pipe(filter(clearAll.match))));

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

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { actualMatchingRowKey } from '../../../entity/actualMatching/actualMatchingTypes';
 import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
 import { createZeniAPIStatus } from '../../../responsePayload';
 import { clearAll } from '../../../rootActions';
@@ -183,19 +184,22 @@ const expenseAutomationActualMatchingView = createSlice({
             }
         },
         fetchActualMatchingMatch: {
-            prepare(matchId, refreshViewInBackground = false) {
-                return { payload: { matchId, refreshViewInBackground } };
+            prepare(matchId, refreshViewInBackground = false, matchBatchId, suggestionKey) {
+                return {
+                    payload: { suggestionKey, matchBatchId, matchId, refreshViewInBackground },
+                };
             },
             reducer(draft, action) {
-                const { matchId, refreshViewInBackground } = action.payload;
+                const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+                const rowKey = actualMatchingRowKey(matchId, matchBatchId, suggestionKey);
                 if (refreshViewInBackground) {
-                    draft.detailRefreshStatusByMatchId[matchId] = {
+                    draft.detailRefreshStatusByMatchId[rowKey] = {
                         fetchState: 'In-Progress',
                         error: undefined,
                     };
                 }
                 else {
-                    draft.detailFetchStateByMatchId[matchId] = {
+                    draft.detailFetchStateByMatchId[rowKey] = {
                         fetchState: 'In-Progress',
                         error: undefined,
                     };
@@ -203,30 +207,32 @@ const expenseAutomationActualMatchingView = createSlice({
             },
         },
         fetchActualMatchingMatchSuccess(draft, action) {
-            const { matchId, refreshViewInBackground } = action.payload;
+            const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+            const rowKey = actualMatchingRowKey(matchId, matchBatchId, suggestionKey);
             if (refreshViewInBackground) {
-                draft.detailRefreshStatusByMatchId[matchId] = {
+                draft.detailRefreshStatusByMatchId[rowKey] = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
             }
             else {
-                draft.detailFetchStateByMatchId[matchId] = {
+                draft.detailFetchStateByMatchId[rowKey] = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
             }
         },
         fetchActualMatchingMatchFailure(draft, action) {
-            const { matchId, refreshViewInBackground, status } = action.payload;
+            const { suggestionKey, matchBatchId, matchId, refreshViewInBackground, status } = action.payload;
+            const rowKey = actualMatchingRowKey(matchId, matchBatchId, suggestionKey);
             if (refreshViewInBackground) {
-                draft.detailRefreshStatusByMatchId[matchId] = {
+                draft.detailRefreshStatusByMatchId[rowKey] = {
                     fetchState: 'Error',
                     error: status,
                 };
             }
             else {
-                draft.detailFetchStateByMatchId[matchId] = {
+                draft.detailFetchStateByMatchId[rowKey] = {
                     fetchState: 'Error',
                     error: status,
                 };
@@ -417,40 +423,42 @@ const expenseAutomationActualMatchingView = createSlice({
         },
         undoReversalAccruals: {
             reducer(draft, action) {
-                draft.undoReversalStatusByMatchId[action.payload.matchId] = {
+                const rowKey = actualMatchingRowKey(action.payload.matchId, action.payload.matchBatchId);
+                draft.undoReversalStatusByMatchId[rowKey] = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
-            prepare(matchId, accrualIds) {
-                return { payload: { matchId, accrualIds } };
+            prepare(matchId, accrualIds, matchBatchId) {
+                return { payload: { matchId, accrualIds, matchBatchId } };
             },
         },
         undoReversalAccrualsSuccess: {
             reducer(draft, action) {
-                const { matchId, results } = action.payload;
-                draft.undoReversalStatusByMatchId[matchId] = {
+                const { matchId, matchBatchId, results } = action.payload;
+                const rowKey = actualMatchingRowKey(matchId, matchBatchId);
+                draft.undoReversalStatusByMatchId[rowKey] = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
                 const allUndone = results.length > 0 &&
                     results.every((result) => result.status === 'undone');
                 if (allUndone) {
-                    enqueueCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                    enqueueCloseMatchId(draft.closeMatchAfterUndoMatchIds, rowKey);
                 }
                 else {
-                    draft.closeMatchAfterUndoMatchIds = dropCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                    draft.closeMatchAfterUndoMatchIds = dropCloseMatchId(draft.closeMatchAfterUndoMatchIds, rowKey);
                 }
                 pruneLastMatchResultsForUndone(draft, matchId, results);
                 if (allUndone) {
-                    delete draft.lastUndoResultsByMatchId[matchId];
+                    delete draft.lastUndoResultsByMatchId[rowKey];
                 }
                 else {
-                    draft.lastUndoResultsByMatchId[matchId] = results;
+                    draft.lastUndoResultsByMatchId[rowKey] = results;
                 }
             },
-            prepare(matchId, results) {
-                return { payload: { matchId, results } };
+            prepare(matchId, results, matchBatchId) {
+                return { payload: { matchId, results, matchBatchId } };
             },
         },
         ackCloseMatchAfterUndo(draft) {
@@ -494,7 +502,8 @@ const expenseAutomationActualMatchingView = createSlice({
             draft.closeMatchAfterIgnoreMatchIds.shift();
         },
         undoReversalAccrualsFailure(draft, action) {
-            draft.undoReversalStatusByMatchId[action.payload.matchId] = {
+            const rowKey = actualMatchingRowKey(action.payload.matchId, action.payload.matchBatchId);
+            draft.undoReversalStatusByMatchId[rowKey] = {
                 fetchState: 'Error',
                 error: action.payload.status,
             };

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

@@ -130,7 +130,9 @@ function toActualMatchingRow(match) {
         ];
     return {
         ...first,
+        suggestionKey: match.suggestionKey,
         matchId: match.matchId,
+        matchBatchId: match.matchBatchId,
         kind: match.kind,
         accruedAmount: match.accruedAmount,
         actualAmount: match.actualAmount,

package/lib/index.d.ts

@@ -1274,6 +1274,7 @@ export type { ExpenseAutomationActualMatchingMatchView } from './view/expenseAut
 export type { ActualMatchingMatch, ActualMatchingMatchKind, } from './entity/actualMatching/actualMatchingState';
 export type { ActualMatchingMatchId } from './entity/actualMatching/actualMatchingTypes';
 export type { SessionEndpointsLoader } from './sessionEndpointsLoader';
+export { actualMatchingRowKey } from './entity/actualMatching/actualMatchingTypes';
 export type { DisplayCurrencyFallback } from './entity/actualMatching/actualMatchingPayload';
 export { fetchCustomerSummaryDetail, fetchCustomerSummaryList, resetCustomerSummaryDetailUiState, saveCustomerSummaryDetail, updateCustomerAllTransactionsTabData, updateCustomerDetailSelectedTab, updateCustomerSummaryRevenueSelection, updateCustomerSummaryScrollYOffset, updateCustomerSummarySortUiState, updateCustomerTrendFilter, } from './view/customerSummaryView/customerSummaryViewReducer';
 export { getCustomerSummaryAllTransactionsTabData, getCustomerSummaryDetail, getCustomerSummaryList, getCustomerSummarySelectedTabType, getCustomerSummaryTrendFilter, isCustomersTabVisible, } from './view/customerSummaryView/customerSummaryViewSelector';

package/lib/index.js

@@ -86,8 +86,8 @@ exports.startInvoicingMigration = exports.rollbackInvoicingMigration = exports.r
 exports.updateInvoicingTransactionFilters = exports.setInvoicingTransactionActiveTab = exports.fetchInvoicingTransactionListPage = exports.fetchInvoicingTransactionList = exports.updateInvoicingTransactions = exports.removeInvoicingTransaction = exports.getInvoicingSubscriptionById = exports.fetchInvoicingSubscriptionDetailPage = exports.fetchInvoicingSubscriptionDetail = exports.getInvoicingSubscriptionListView = exports.INVOICING_SUBSCRIPTION_COLUMNS = exports.ALL_INVOICING_SUBSCRIPTION_TAB_IDS = exports.ALL_INVOICING_SUBSCRIPTION_SORT_KEYS = exports.updateInvoicingSubscriptionFilters = exports.setInvoicingSubscriptionActiveTab = exports.fetchInvoicingSubscriptionListPage = exports.fetchInvoicingSubscriptionList = exports.fetchInvoicingSubscriptionCounts = exports.updateInvoicingSubscriptions = exports.removeInvoicingSubscription = exports.resetPromotionalCreditAction = exports.submitAddPromotionalCredits = exports.getInvoicingSetupIntentFetchState = exports.getInvoicingSetupIntent = exports.getInvoicingSentPaymentLinkMagicUrl = exports.getInvoicingSentPaymentLinkEmail = exports.getInvoicingPlaidLinkToken = exports.getInvoicingPaymentMethodSaveState = exports.getInvoicingPaymentLinkSendState = exports.sendInvoicingPaymentLink = exports.saveInvoicingPaymentMethod = exports.resetInvoicingCustomerPaymentMethod = exports.fetchInvoicingPlaidLinkToken = exports.createInvoicingSetupIntent = exports.fetchInvoicingPaymentLinkEmailPreviewPage = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.getInvoicingCustomerListView = exports.INVOICING_CUSTOMER_COLUMNS = exports.ALL_INVOICING_CUSTOMER_TAB_IDS = exports.ALL_INVOICING_CUSTOMER_SORT_KEYS = exports.updateInvoicingCustomerFilters = exports.setInvoicingCustomerActiveTab = exports.fetchInvoicingCustomerListPage = exports.fetchInvoicingCustomerList = exports.fetchInvoicingCustomerCounts = exports.updateInvoicingCustomers = exports.removeInvoicingCustomer = exports.INVOICING_LIST_PAGE_SIZE = exports.uploadInvoicingMigrationFiles = void 0;
 exports.INVOICING_DUNNING_CASE_COLUMNS = exports.ALL_INVOICING_DUNNING_CASE_TAB_IDS = exports.ALL_INVOICING_DUNNING_CASE_SORT_KEYS = exports.updateInvoicingDunningCaseFilters = exports.setInvoicingDunningCaseActiveTab = exports.fetchInvoicingDunningCaseListPage = exports.fetchInvoicingDunningCaseList = exports.fetchInvoicingDunningCaseCounts = exports.updateInvoicingDunningCases = exports.removeInvoicingDunningCase = exports.fetchInvoicingCouponDetail = exports.getInvoicingCouponById = exports.getInvoicingCouponListView = exports.getInvoicingCouponListNextCursor = exports.getInvoicingCouponListItems = exports.getInvoicingCouponListHasMore = exports.getInvoicingCouponListFilters = exports.getInvoicingCouponListFetchState = exports.getInvoicingCouponCounts = exports.INVOICING_COUPON_COLUMNS = exports.ALL_INVOICING_COUPON_TAB_IDS = exports.ALL_INVOICING_COUPON_SORT_KEYS = exports.updateInvoicingCouponFilters = exports.setInvoicingCouponActiveTab = exports.fetchInvoicingCouponListPage = exports.fetchInvoicingCouponList = exports.fetchInvoicingCouponCounts = exports.updateInvoicingCoupons = exports.removeInvoicingCoupon = exports.getInvoicingCreditNoteDetail = exports.getInvoicingCreditNoteById = exports.fetchInvoicingCreditNoteDetail = exports.getInvoicingCreditNoteListView = exports.INVOICING_CREDIT_NOTE_COLUMNS = exports.ALL_INVOICING_CREDIT_NOTE_TAB_IDS = exports.ALL_INVOICING_CREDIT_NOTE_SORT_KEYS = exports.updateInvoicingCreditNoteFilters = exports.setInvoicingCreditNoteActiveTab = exports.fetchInvoicingCreditNoteListPage = exports.fetchInvoicingCreditNoteList = exports.fetchInvoicingCreditNoteCounts = exports.updateInvoicingCreditNotes = exports.removeInvoicingCreditNote = exports.getInvoicingTransactionDetail = exports.getInvoicingTransactionById = exports.fetchInvoicingTransactionDetail = exports.getInvoicingTransactionListView = exports.INVOICING_TRANSACTION_COLUMNS = exports.ALL_INVOICING_TRANSACTION_TAB_IDS = exports.ALL_INVOICING_TRANSACTION_SORT_KEYS = void 0;
 exports.fetchInvoicingQboSyncHealth = exports.fetchInvoicingQboConnection = exports.fetchInvoicingAccountingPickers = exports.isStripeConnectedFromSettings = exports.initialInvoicingBrandingFormLocalData = exports.entityToInvoicingBrandingFormLocalData = exports.INVOICING_BUSINESS_ADDRESS_TYPE = exports.invoicingQboSettingsLocalDataToPayload = exports.initialInvoicingQboSettingsLocalData = exports.entityToInvoicingQboSettingsLocalData = exports.getInvoicingSettingsView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = exports.getInvoicingQboSettingsFormView = exports.getInvoicingBrandingFormView = exports.updateInvoicingSettings = exports.updateInvoicingQboSettingsDraft = exports.updateInvoicingBrandingFormDraft = exports.submitInvoicingQboSettings = exports.submitInvoicingBrandingForm = exports.saveInvoicingSettings = exports.resetSaveInvoicingSettings = exports.resetInvoicingQboSettingsDraft = exports.resetInvoicingBrandingFormDraft = exports.fetchInvoicingSettings = exports.disconnectInvoicingStripe = exports.connectInvoicingStripe = exports.getLowestInvoicingCatalogPricePointAmount = exports.getInvoicingCatalogItemById = exports.fetchInvoicingCatalogItemDetail = exports.getInvoicingCatalogListView = exports.updateInvoicingCatalogProductFilters = exports.updateInvoicingCatalogPlanFilters = exports.fetchInvoicingCatalogProductList = exports.fetchInvoicingCatalogPlanList = exports.fetchInvoicingCatalogListPage = exports.fetchInvoicingCatalogCounts = exports.updateInvoicingCatalogItems = exports.removeInvoicingCatalogItem = exports.mergeInvoicingCatalogPricePoint = exports.getInvoicingDunningEmailPreview = exports.getInvoicingDunningCaseDetail = exports.getInvoicingDunningCaseById = exports.invalidateInvoicingDunningEmailPreview = exports.fetchInvoicingDunningEmailPreviewPage = exports.fetchInvoicingDunningCaseDetailPage = exports.fetchInvoicingDunningCaseDetail = exports.clearInvoicingDunningCaseDetailView = exports.getInvoicingDunningCaseListView = void 0;
-exports.getCustomerSummaryTrendFilter = exports.getCustomerSummarySelectedTabType = exports.getCustomerSummaryList = exports.getCustomerSummaryDetail = exports.getCustomerSummaryAllTransactionsTabData = exports.updateCustomerTrendFilter = exports.updateCustomerSummarySortUiState = exports.updateCustomerSummaryScrollYOffset = exports.updateCustomerSummaryRevenueSelection = exports.updateCustomerDetailSelectedTab = exports.updateCustomerAllTransactionsTabData = exports.saveCustomerSummaryDetail = exports.resetCustomerSummaryDetailUiState = exports.fetchCustomerSummaryList = exports.fetchCustomerSummaryDetail = exports.isPendingReviewAccrual = exports.isManuallyReversedAccrual = exports.isAutoReversedAccrual = exports.getExpenseAutomationActualMatchingView = exports.getExpenseAutomationActualMatchingMatchView = exports.parseActualMatchingMatchId = exports.getCloseMatchAfterUndoMatchId = exports.getCloseMatchAfterUndo = exports.getCloseMatchAfterIgnoreMatchId = exports.getActualMatchingMatchModalConfirmStatus = exports.getActualMatchingReversalDate = exports.getActualMatchingAmount = exports.isPendingReviewRow = exports.isRenderableOneTimeAccrual = exports.isOneTimeAccrualRow = exports.isExistingTabRow = exports.isAiAccountantSchedule = exports.isAccruedScheduleRow = exports.getJEScheduleRowType = exports.getExpenseAutomationJEOneTimeAccrualDetailView = exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = exports.updateInvoicingConfig = exports.resetInvoicingConfigActionStates = exports.fetchInvoicingConfig = exports.enableInvoicing = exports.acceptInvoicingTerms = exports.toInvoicingQboCustomerMatchingMode = exports.toInvoicingNamedOptionsByKey = exports.getInvoicingQboAccountMappingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.getInvoicingQboView = exports.invoicingAccountsForQboAccountTypes = exports.startInvoicingQboBackfill = exports.retryInvoicingQboSyncTask = void 0;
-exports.CUSTOMER_REVENUE_KEYS = exports.isCustomersTabVisible = void 0;
+exports.getCustomerSummarySelectedTabType = exports.getCustomerSummaryList = exports.getCustomerSummaryDetail = exports.getCustomerSummaryAllTransactionsTabData = exports.updateCustomerTrendFilter = exports.updateCustomerSummarySortUiState = exports.updateCustomerSummaryScrollYOffset = exports.updateCustomerSummaryRevenueSelection = exports.updateCustomerDetailSelectedTab = exports.updateCustomerAllTransactionsTabData = exports.saveCustomerSummaryDetail = exports.resetCustomerSummaryDetailUiState = exports.fetchCustomerSummaryList = exports.fetchCustomerSummaryDetail = exports.actualMatchingRowKey = exports.isPendingReviewAccrual = exports.isManuallyReversedAccrual = exports.isAutoReversedAccrual = exports.getExpenseAutomationActualMatchingView = exports.getExpenseAutomationActualMatchingMatchView = exports.parseActualMatchingMatchId = exports.getCloseMatchAfterUndoMatchId = exports.getCloseMatchAfterUndo = exports.getCloseMatchAfterIgnoreMatchId = exports.getActualMatchingMatchModalConfirmStatus = exports.getActualMatchingReversalDate = exports.getActualMatchingAmount = exports.isPendingReviewRow = exports.isRenderableOneTimeAccrual = exports.isOneTimeAccrualRow = exports.isExistingTabRow = exports.isAiAccountantSchedule = exports.isAccruedScheduleRow = exports.getJEScheduleRowType = exports.getExpenseAutomationJEOneTimeAccrualDetailView = exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = exports.updateInvoicingConfig = exports.resetInvoicingConfigActionStates = exports.fetchInvoicingConfig = exports.enableInvoicing = exports.acceptInvoicingTerms = exports.toInvoicingQboCustomerMatchingMode = exports.toInvoicingNamedOptionsByKey = exports.getInvoicingQboAccountMappingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.getInvoicingQboView = exports.invoicingAccountsForQboAccountTypes = exports.startInvoicingQboBackfill = exports.retryInvoicingQboSyncTask = void 0;
+exports.CUSTOMER_REVENUE_KEYS = exports.isCustomersTabVisible = exports.getCustomerSummaryTrendFilter = void 0;
 const allowedValue_1 = require("./commonStateTypes/allowedValue");
 Object.defineProperty(exports, "isAllowedValueWithCode", { enumerable: true, get: function () { return allowedValue_1.isAllowedValueWithCode; } });
 Object.defineProperty(exports, "isAllowedValueWithID", { enumerable: true, get: function () { return allowedValue_1.isAllowedValueWithID; } });
@@ -3297,6 +3297,8 @@ Object.defineProperty(exports, "getExpenseAutomationActualMatchingView", { enume
 Object.defineProperty(exports, "isAutoReversedAccrual", { enumerable: true, get: function () { return actualMatchingViewSelector_1.isAutoReversedAccrual; } });
 Object.defineProperty(exports, "isManuallyReversedAccrual", { enumerable: true, get: function () { return actualMatchingViewSelector_1.isManuallyReversedAccrual; } });
 Object.defineProperty(exports, "isPendingReviewAccrual", { enumerable: true, get: function () { return actualMatchingViewSelector_1.isPendingReviewAccrual; } });
+var actualMatchingTypes_1 = require("./entity/actualMatching/actualMatchingTypes");
+Object.defineProperty(exports, "actualMatchingRowKey", { enumerable: true, get: function () { return actualMatchingTypes_1.actualMatchingRowKey; } });
 var customerSummaryViewReducer_1 = require("./view/customerSummaryView/customerSummaryViewReducer");
 Object.defineProperty(exports, "fetchCustomerSummaryDetail", { enumerable: true, get: function () { return customerSummaryViewReducer_1.fetchCustomerSummaryDetail; } });
 Object.defineProperty(exports, "fetchCustomerSummaryList", { enumerable: true, get: function () { return customerSummaryViewReducer_1.fetchCustomerSummaryList; } });

package/lib/view/expenseAutomationView/epics/jeSchedule/actualMatching/fetchActualMatchingEpic.js

@@ -4,6 +4,7 @@ exports.fetchActualMatchingEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const actualMatchingReducer_1 = require("../../../../../entity/actualMatching/actualMatchingReducer");
+const actualMatchingTypes_1 = require("../../../../../entity/actualMatching/actualMatchingTypes");
 const responsePayload_1 = require("../../../../../responsePayload");
 const rootActions_1 = require("../../../../../rootActions");
 const actualMatchingPayload_1 = require("../../../payload/actualMatchingPayload");
@@ -29,7 +30,7 @@ const fetchActualMatchingEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                 updateActions.push((0, actualMatchingReducer_1.updateActualMatchingMatches)(matches, (0, actualMatchingViewSelector_1.getTenantDisplayCurrency)(state)));
             }
             updateActions.push((0, actualMatchingViewReducer_1.fetchActualMatchingSuccess)({
-                matchIds: matches.map((match) => match.match_id),
+                matchIds: matches.map((match) => (0, actualMatchingTypes_1.actualMatchingRowKey)(match.match_id, match.match_batch_id, match.suggestion_key)),
                 selectedPeriod: requestPeriod,
                 refreshViewInBackground,
             }));

package/lib/view/expenseAutomationView/epics/jeSchedule/actualMatching/fetchActualMatchingMatchEpic.js

@@ -9,29 +9,44 @@ const rootActions_1 = require("../../../../../rootActions");
 const actualMatchingViewReducer_1 = require("../../../reducers/actualMatchingViewReducer");
 const actualMatchingViewSelector_1 = require("../../../selectors/actualMatchingViewSelector");
 const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.fetchActualMatchingMatch.match), (0, operators_1.mergeMap)((action) => {
-    const { matchId, refreshViewInBackground } = action.payload;
+    const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+    const detailQuery = new URLSearchParams();
+    if (matchBatchId != null && matchBatchId !== '') {
+        detailQuery.set('batch_id', matchBatchId);
+    }
+    else if (suggestionKey != null && suggestionKey !== '') {
+        detailQuery.set('suggestion_key', suggestionKey);
+    }
+    const encodedQuery = detailQuery.toString();
+    const batchQuery = encodedQuery === '' ? '' : `?${encodedQuery}`;
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}`)
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}${batchQuery}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.from)([
                 (0, actualMatchingReducer_1.updateActualMatchingMatches)([response.data], (0, actualMatchingViewSelector_1.getTenantDisplayCurrency)(state$.value)),
                 (0, actualMatchingViewReducer_1.fetchActualMatchingMatchSuccess)({
+                    suggestionKey,
                     matchId,
+                    matchBatchId,
                     refreshViewInBackground,
                 }),
             ]);
         }
         return (0, rxjs_1.from)([
             (0, actualMatchingViewReducer_1.fetchActualMatchingMatchFailure)({
+                suggestionKey,
                 matchId,
+                matchBatchId,
                 refreshViewInBackground,
                 status: response.status,
             }),
         ]);
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.from)([
         (0, actualMatchingViewReducer_1.fetchActualMatchingMatchFailure)({
+            suggestionKey,
             matchId,
+            matchBatchId,
             refreshViewInBackground,
             status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', `Fetch actual matching match REST API call errored out ${JSON.stringify(error)}`),
         }),

package/lib/view/expenseAutomationView/epics/jeSchedule/actualMatching/matchAndReverseAccrualsEpic.js

@@ -59,8 +59,12 @@ function matchAndReverseHttpFailSnackbar(vendorName) {
     });
 }
 function matchVendorName(state, matchId) {
-    return ((0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)
-        ?.vendorName ?? '');
+    const stored = (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId);
+    if (stored?.vendorName != null && stored.vendorName !== '') {
+        return stored.vendorName;
+    }
+    const sameBill = Object.values(state.actualMatchingState.byMatchId).find((match) => match.matchId === matchId);
+    return sameBill?.vendorName ?? '';
 }
 const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.matchAndReverseAccruals.match), 
 // Per-match exhaust: a second click on the same match drops while HTTP is in
@@ -99,7 +103,7 @@ const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe
                 // List + detail: list can omit leftovers; detail GET always
                 // writes intended occupancy so leftover retry can join C
                 // onto the occupied bill instead of a stale cached row.
-                successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value), (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true));
+                successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value), (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true, response.data.match_batch_id));
             }
             const snackbar = matchAndReverseSnackbar(results, vendorName);
             if (snackbar != null) {

package/lib/view/expenseAutomationView/epics/jeSchedule/actualMatching/undoReversalAccrualsEpic.js

@@ -4,6 +4,7 @@ exports.undoReversalAccrualsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const actualMatchingSelector_1 = require("../../../../../entity/actualMatching/actualMatchingSelector");
+const actualMatchingTypes_1 = require("../../../../../entity/actualMatching/actualMatchingTypes");
 const snackbarReducer_1 = require("../../../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const rootActions_1 = require("../../../../../rootActions");
@@ -40,41 +41,45 @@ function undoReversalSnackbar(results, vendorName) {
         variables,
     });
 }
-function matchVendorName(state, matchId) {
-    return ((0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)?.vendorName ??
+function matchVendorName(state, matchId, matchBatchId) {
+    const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId);
+    return ((0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, rowKey)?.vendorName ??
+        (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)?.vendorName ??
         '');
 }
 const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.undoReversalAccruals.match), 
 // Per-match exhaust: a second click on the same match drops while HTTP is in
 // flight. A different match must still run — a global exhaustMap left the
 // other match's reducer In-Progress with no request.
-(0, operators_1.groupBy)((action) => action.payload.matchId), (0, operators_1.mergeMap)((perMatch$) => perMatch$.pipe((0, operators_1.exhaustMap)((action) => {
-    const { accrualIds, matchId } = action.payload;
+(0, operators_1.groupBy)((action) => (0, actualMatchingTypes_1.actualMatchingRowKey)(action.payload.matchId, action.payload.matchBatchId)), (0, operators_1.mergeMap)((perMatch$) => perMatch$.pipe((0, operators_1.exhaustMap)((action) => {
+    const { accrualIds, matchId, matchBatchId } = action.payload;
     const body = {
         accrual_ids: accrualIds,
     };
-    const vendorName = matchVendorName(state$.value, matchId);
+    const vendorName = matchVendorName(state$.value, matchId, matchBatchId);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/undo-reversal`, body)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const results = response.data.results.map(actualMatchingPayload_1.toUndoReversalResult);
             const successActions = [
-                (0, actualMatchingViewReducer_1.undoReversalAccrualsSuccess)(matchId, results),
+                (0, actualMatchingViewReducer_1.undoReversalAccrualsSuccess)(matchId, results, matchBatchId),
             ];
             const anyUndone = results.some((result) => result.status === 'undone');
             if (anyUndone) {
-                successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value), (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true));
+                successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value), (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true, matchBatchId));
             }
             successActions.push(undoReversalSnackbar(results, vendorName));
             return (0, rxjs_1.from)(successActions);
         }
         return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({
             matchId,
+            matchBatchId,
             status: response.status,
         }), undoReversalSnackbar([], vendorName));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({
         matchId,
+        matchBatchId,
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Undo reversal accruals REST API call errored out' +
             JSON.stringify(error)),
     }), undoReversalSnackbar([], vendorName))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));

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

@@ -14,16 +14,22 @@ export declare const ackCloseMatchAfterIgnore: import("@reduxjs/toolkit").Action
     refreshViewInBackground: boolean;
     selectedPeriod: MonthYearPeriod;
     status: ZeniAPIStatus;
-}, "expenseAutomationActualMatchingView/fetchActualMatchingFailure">, fetchActualMatchingMatch: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, refreshViewInBackground?: any], {
+}, "expenseAutomationActualMatchingView/fetchActualMatchingFailure">, fetchActualMatchingMatch: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, refreshViewInBackground?: any, matchBatchId?: string | undefined, suggestionKey?: string | undefined], {
+    suggestionKey: string | undefined;
+    matchBatchId: string | undefined;
     matchId: string;
     refreshViewInBackground: any;
 }, "expenseAutomationActualMatchingView/fetchActualMatchingMatch", never, never>, fetchActualMatchingMatchFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     matchId: ActualMatchingMatchId;
     refreshViewInBackground: boolean;
     status: ZeniAPIStatus;
+    matchBatchId?: string;
+    suggestionKey?: string;
 }, "expenseAutomationActualMatchingView/fetchActualMatchingMatchFailure">, fetchActualMatchingMatchSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     matchId: ActualMatchingMatchId;
     refreshViewInBackground: boolean;
+    matchBatchId?: string;
+    suggestionKey?: string;
 }, "expenseAutomationActualMatchingView/fetchActualMatchingMatchSuccess">, fetchActualMatchingPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any], {
     period: TimePeriod;
     refreshViewInBackground: any;
@@ -76,15 +82,18 @@ export declare const ackCloseMatchAfterIgnore: import("@reduxjs/toolkit").Action
     append: boolean;
     nextPageToken: string | null;
     results: ActualMatchingTransactionSearchResult[];
-}, "expenseAutomationActualMatchingView/searchMatchTransactionsSuccess">, undoReversalAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, accrualIds: string[]], {
+}, "expenseAutomationActualMatchingView/searchMatchTransactionsSuccess">, undoReversalAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, accrualIds: string[], matchBatchId?: string | undefined], {
     matchId: string;
     accrualIds: string[];
+    matchBatchId: string | undefined;
 }, "expenseAutomationActualMatchingView/undoReversalAccruals", never, never>, undoReversalAccrualsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     matchId: ActualMatchingMatchId;
     status: ZeniAPIStatus;
-}, "expenseAutomationActualMatchingView/undoReversalAccrualsFailure">, undoReversalAccrualsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, results: UndoReversalResult[]], {
+    matchBatchId?: string;
+}, "expenseAutomationActualMatchingView/undoReversalAccrualsFailure">, undoReversalAccrualsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, results: UndoReversalResult[], matchBatchId?: string | undefined], {
     matchId: string;
     results: UndoReversalResult[];
+    matchBatchId: string | undefined;
 }, "expenseAutomationActualMatchingView/undoReversalAccrualsSuccess", never, never>, updateActualMatchingUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<Partial<ActualMatchingViewUIState>, "expenseAutomationActualMatchingView/updateActualMatchingUIState">;
 declare const _default: import("redux").Reducer<ActualMatchingViewState>;
 export default _default;

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateActualMatchingUIState = exports.undoReversalAccrualsSuccess = exports.undoReversalAccrualsFailure = exports.undoReversalAccruals = exports.searchMatchTransactionsSuccess = exports.searchMatchTransactionsFailure = exports.searchMatchTransactions = exports.searchMatchAccrualsSuccess = exports.searchMatchAccrualsFailure = exports.searchMatchAccruals = exports.openMatchNewModal = exports.matchAndReverseAccrualsSuccess = exports.matchAndReverseAccrualsFailure = exports.matchAndReverseAccruals = exports.ignoreActualMatchingSuggestionSuccess = exports.ignoreActualMatchingSuggestionFailure = exports.ignoreActualMatchingSuggestion = exports.fetchActualMatchingSuccess = exports.fetchActualMatchingPage = exports.fetchActualMatchingMatchSuccess = exports.fetchActualMatchingMatchFailure = exports.fetchActualMatchingMatch = exports.fetchActualMatchingFailure = exports.fetchActualMatching = exports.closeMatchNewModal = exports.clearMatchNewModal = exports.clearActualMatchingView = exports.ackCloseMatchAfterUndo = exports.ackCloseMatchAfterIgnore = exports.initialState = exports.initialMatchModalState = exports.initialAccrualSearchState = exports.initialTransactionSearchState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
+const actualMatchingTypes_1 = require("../../../entity/actualMatching/actualMatchingTypes");
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
 const responsePayload_1 = require("../../../responsePayload");
 const rootActions_1 = require("../../../rootActions");
@@ -187,19 +188,22 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             }
         },
         fetchActualMatchingMatch: {
-            prepare(matchId, refreshViewInBackground = false) {
-                return { payload: { matchId, refreshViewInBackground } };
+            prepare(matchId, refreshViewInBackground = false, matchBatchId, suggestionKey) {
+                return {
+                    payload: { suggestionKey, matchBatchId, matchId, refreshViewInBackground },
+                };
             },
             reducer(draft, action) {
-                const { matchId, refreshViewInBackground } = action.payload;
+                const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+                const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId, suggestionKey);
                 if (refreshViewInBackground) {
-                    draft.detailRefreshStatusByMatchId[matchId] = {
+                    draft.detailRefreshStatusByMatchId[rowKey] = {
                         fetchState: 'In-Progress',
                         error: undefined,
                     };
                 }
                 else {
-                    draft.detailFetchStateByMatchId[matchId] = {
+                    draft.detailFetchStateByMatchId[rowKey] = {
                         fetchState: 'In-Progress',
                         error: undefined,
                     };
@@ -207,30 +211,32 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             },
         },
         fetchActualMatchingMatchSuccess(draft, action) {
-            const { matchId, refreshViewInBackground } = action.payload;
+            const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+            const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId, suggestionKey);
             if (refreshViewInBackground) {
-                draft.detailRefreshStatusByMatchId[matchId] = {
+                draft.detailRefreshStatusByMatchId[rowKey] = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
             }
             else {
-                draft.detailFetchStateByMatchId[matchId] = {
+                draft.detailFetchStateByMatchId[rowKey] = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
             }
         },
         fetchActualMatchingMatchFailure(draft, action) {
-            const { matchId, refreshViewInBackground, status } = action.payload;
+            const { suggestionKey, matchBatchId, matchId, refreshViewInBackground, status } = action.payload;
+            const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId, suggestionKey);
             if (refreshViewInBackground) {
-                draft.detailRefreshStatusByMatchId[matchId] = {
+                draft.detailRefreshStatusByMatchId[rowKey] = {
                     fetchState: 'Error',
                     error: status,
                 };
             }
             else {
-                draft.detailFetchStateByMatchId[matchId] = {
+                draft.detailFetchStateByMatchId[rowKey] = {
                     fetchState: 'Error',
                     error: status,
                 };
@@ -421,40 +427,42 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
         },
         undoReversalAccruals: {
             reducer(draft, action) {
-                draft.undoReversalStatusByMatchId[action.payload.matchId] = {
+                const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(action.payload.matchId, action.payload.matchBatchId);
+                draft.undoReversalStatusByMatchId[rowKey] = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
-            prepare(matchId, accrualIds) {
-                return { payload: { matchId, accrualIds } };
+            prepare(matchId, accrualIds, matchBatchId) {
+                return { payload: { matchId, accrualIds, matchBatchId } };
             },
         },
         undoReversalAccrualsSuccess: {
             reducer(draft, action) {
-                const { matchId, results } = action.payload;
-                draft.undoReversalStatusByMatchId[matchId] = {
+                const { matchId, matchBatchId, results } = action.payload;
+                const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId);
+                draft.undoReversalStatusByMatchId[rowKey] = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
                 const allUndone = results.length > 0 &&
                     results.every((result) => result.status === 'undone');
                 if (allUndone) {
-                    enqueueCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                    enqueueCloseMatchId(draft.closeMatchAfterUndoMatchIds, rowKey);
                 }
                 else {
-                    draft.closeMatchAfterUndoMatchIds = dropCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                    draft.closeMatchAfterUndoMatchIds = dropCloseMatchId(draft.closeMatchAfterUndoMatchIds, rowKey);
                 }
                 pruneLastMatchResultsForUndone(draft, matchId, results);
                 if (allUndone) {
-                    delete draft.lastUndoResultsByMatchId[matchId];
+                    delete draft.lastUndoResultsByMatchId[rowKey];
                 }
                 else {
-                    draft.lastUndoResultsByMatchId[matchId] = results;
+                    draft.lastUndoResultsByMatchId[rowKey] = results;
                 }
             },
-            prepare(matchId, results) {
-                return { payload: { matchId, results } };
+            prepare(matchId, results, matchBatchId) {
+                return { payload: { matchId, results, matchBatchId } };
             },
         },
         ackCloseMatchAfterUndo(draft) {
@@ -498,7 +506,8 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             draft.closeMatchAfterIgnoreMatchIds.shift();
         },
         undoReversalAccrualsFailure(draft, action) {
-            draft.undoReversalStatusByMatchId[action.payload.matchId] = {
+            const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(action.payload.matchId, action.payload.matchBatchId);
+            draft.undoReversalStatusByMatchId[rowKey] = {
                 fetchState: 'Error',
                 error: action.payload.status,
             };

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

@@ -23,9 +23,11 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     groupedMembers?: ActualMatchingGroupedAccrual[];
     intendedAccrualIds?: ID[];
     leftovers?: ActualMatchingLeftoverAccrual[];
+    matchBatchId?: string;
     matchShape?: string;
     matchTier?: string;
     reversalDate?: ZeniDate;
+    suggestionKey?: string;
     transactionDate?: string;
     transactionType?: string;
 }

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

@@ -152,7 +152,9 @@ function toActualMatchingRow(match) {
         ];
     return {
         ...first,
+        suggestionKey: match.suggestionKey,
         matchId: match.matchId,
+        matchBatchId: match.matchBatchId,
         kind: match.kind,
         accruedAmount: match.accruedAmount,
         actualAmount: match.actualAmount,

package/package.json

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