@zeniai/client-epic-state 5.2.35-beta0MM → 5.2.35-beta11MM

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulePageEpic.js

@@ -2,24 +2,34 @@ import { concat, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { fetchAccountList } from '../../../accountList/accountListReducer';
 import { getAccountsTypesForScheduleEpics } from '../../../scheduleView/scheduleListView/scheduleListHelper';
+import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedules, fetchJeSchedulesPage, initializeAccountSettingsView, } from '../../reducers/jeSchedulesViewReducer';
 export const fetchJeSchedulesPageEpic = (actions$, state$) => actions$.pipe(filter(fetchJeSchedulesPage.match), mergeMap((action) => {
     const jeSchedulePageActions = [];
     const { period, refreshViewInBackground } = action.payload;
+    const state = state$.value;
+    const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
     const accountType = getAccountsTypesForScheduleEpics();
-    const accountListState = state$.value.accountListState;
+    const accountListState = state.accountListState;
     if (accountListState.byReportId[accountType.accountListKey].fetchState ===
         'Not-Started') {
         // call this only if the account list for schedules is not fetched already
         jeSchedulePageActions.push(fetchAccountList(accountType.accountListKey, true, false, false, false, accountType.allowedAccountList));
     }
-    jeSchedulePageActions.push(fetchJeSchedules(period, refreshViewInBackground));
+    // AM is chrome on this page but a different endpoint. fetchJeSchedules with
+    // selectedPageTab === 'actual_matching' would hit /1.0/schedules and write a bogus cache slot.
+    if (selectedPageTab === 'actual_matching') {
+        jeSchedulePageActions.push(fetchActualMatchingPage(period, refreshViewInBackground));
+    }
+    else {
+        jeSchedulePageActions.push(fetchJeSchedules(period, refreshViewInBackground));
+    }
     // Only on the first page load. Account settings cannot change from a tab switch or a
     // refresh, and re-initializing puts accountSettingsView back to 'In-Progress' -- which the
     // page reads as "still loading" and answers with a full skeleton over rows it already has.
     // The action also resets localData, so re-dispatching it blindly would empty the settings
     // form until the refetch lands. Saving account settings still re-initializes explicitly.
-    if (!state$.value.expenseAutomationJESchedulesViewState.accountSettings
+    if (!state.expenseAutomationJESchedulesViewState.accountSettings
         .hasLoadedAccountSettings) {
         jeSchedulePageActions.push(initializeAccountSettingsView());
     }

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/prefetchOtherJeSchedulesTabEpic.js

@@ -1,7 +1,8 @@
-import { EMPTY, of } from 'rxjs';
+import { EMPTY, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { toMonthYearPeriodId } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedules, fetchJeSchedulesPage, } from '../../reducers/jeSchedulesViewReducer';
 import { ALL_JE_PAGE_TABS, getJESchedulePeriodTabKey, } from '../../types/jeSchedulesViewState';
 /**
@@ -9,29 +10,46 @@ import { ALL_JE_PAGE_TABS, getJESchedulePeriodTabKey, } from '../../types/jeSche
  *
  * Listens for `fetchJeSchedulesPage` rather than `fetchJeSchedules` on purpose: the prefetch emits
  * `fetchJeSchedules`, so listening for that would make this epic feed itself.
+ *
+ * Review <-> Existing share `/1.0/schedules`. Actual Matching is a different endpoint; it is
+ * warmed with `fetchActualMatchingPage` when the page action carries `isAccrualEnabled`.
  */
 export const prefetchOtherJeSchedulesTabEpic = (actions$, state$) => actions$.pipe(filter(fetchJeSchedulesPage.match), mergeMap((action) => {
     const state = state$.value;
-    const { period } = action.payload;
+    const { period, isAccrualEnabled } = action.payload;
     const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
-    // Actual Matching has its own CES slice and API; warming it with fetchJeSchedules
-    // would prefetch the wrong endpoint. Only Review <-> Existing share that fetch.
+    const actions = [];
+    // AM is chrome-only on ALL_JE_PAGE_TABS; warming it with fetchJeSchedules
+    // would hit the wrong endpoint.
     const otherPageTab = ALL_JE_PAGE_TABS.find((pageTab) => pageTab !== selectedPageTab && pageTab !== 'actual_matching');
-    if (otherPageTab == null) {
-        return EMPTY;
-    }
     const currentTenant = getCurrentTenant(state);
     const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
-    if (selectedPeriod == null) {
-        return EMPTY;
+    if (otherPageTab != null && selectedPeriod != null) {
+        const otherPeriodTabKey = getJESchedulePeriodTabKey(otherPageTab, toMonthYearPeriodId(selectedPeriod));
+        const isOtherTabAlreadyLoaded = state.expenseAutomationJESchedulesViewState
+            .jeScheduleTransactionKeysByPeriodAndTab[otherPeriodTabKey] != null;
+        if (!isOtherTabAlreadyLoaded) {
+            actions.push(fetchJeSchedules(period, true, otherPageTab));
+        }
+    }
+    // GET /actual-matching is not Statsig-gated; CES has no Statsig. The screen
+    // passes is_accrual_enabled so disabled tenants do not pay for a list they
+    // cannot open. Visible AM is fetchJeSchedulesPageEpic's job.
+    if (isAccrualEnabled === true &&
+        selectedPageTab !== 'actual_matching') {
+        const periodId = toMonthYearPeriodId({
+            month: period.start.month,
+            year: period.start.year,
+        });
+        // `fetchState` is global across months. Skipping on In-Progress would drop
+        // October prefetch while September is still loading; September's success
+        // then marks the slice Completed and October looks loaded with no ids.
+        if (state.expenseAutomationActualMatchingViewState.matchIdsByPeriod[periodId] == null) {
+            actions.push(fetchActualMatchingPage(period, true));
+        }
     }
-    // Already warm for this period: without this check every tab switch would refetch the tab
-    // just left, since a switch also fires fetchJeSchedulesPage.
-    const otherPeriodTabKey = getJESchedulePeriodTabKey(otherPageTab, toMonthYearPeriodId(selectedPeriod));
-    const isOtherTabAlreadyLoaded = state.expenseAutomationJESchedulesViewState
-        .jeScheduleTransactionKeysByPeriodAndTab[otherPeriodTabKey] != null;
-    if (isOtherTabAlreadyLoaded) {
+    if (actions.length === 0) {
         return EMPTY;
     }
-    return of(fetchJeSchedules(period, true, otherPageTab));
+    return from(actions);
 }));

package/lib/esm/view/expenseAutomationView/epics/jeSchedule/switchJESchedulesTabEpic.js

@@ -2,13 +2,17 @@ import { EMPTY, of } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
-import { fetchActualMatchingPage } from '../../reducers/actualMatchingViewReducer';
 import { fetchJeSchedulesPage, updateJESchedulesUIState, } from '../../reducers/jeSchedulesViewReducer';
-export const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe(filter(updateJESchedulesUIState.match), filter((action) => action.payload.selectedPageTab != null), mergeMap(() => {
+export const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe(filter(updateJESchedulesUIState.match), filter((action) => action.payload.selectedPageTab != null), mergeMap((action) => {
     const state = state$.value;
+    const nextTab = action.payload.selectedPageTab;
     const { fetchState, refreshStatus } = state.expenseAutomationJESchedulesViewState;
-    if (fetchState === 'In-Progress' ||
-        refreshStatus.fetchState === 'In-Progress') {
+    // Review/Existing share `/1.0/schedules`; skip a second JE fetch while one
+    // is in flight. AM is a different endpoint — do not block it on JE
+    // In-Progress or the tab stays on a skeleton until the user leaves.
+    if (nextTab !== 'actual_matching' &&
+        (fetchState === 'In-Progress' ||
+            refreshStatus.fetchState === 'In-Progress')) {
         return EMPTY;
     }
     const currentTenant = getCurrentTenant(state);
@@ -25,9 +29,5 @@ export const switchJESchedulesTabEpic = (actions$, state$) => actions$.pipe(filt
     if (timePeriodStart == null || timePeriodEnd == null) {
         return EMPTY;
     }
-    const { selectedPageTab } = state.expenseAutomationJESchedulesViewState.uiState;
-    if (selectedPageTab === 'actual_matching') {
-        return of(fetchActualMatchingPage({ start: timePeriodStart, end: timePeriodEnd }, true));
-    }
     return of(fetchJeSchedulesPage({ start: timePeriodStart, end: timePeriodEnd }, true));
 }));

package/lib/esm/view/expenseAutomationView/expenseAutomationViewReducer.js

@@ -19,11 +19,12 @@ const expenseAutomationView = createSlice({
             reducer() {
                 //do nothing
             },
-            prepare(cacheOverride = false, refreshViewInBackground = false) {
+            prepare(cacheOverride = false, refreshViewInBackground = false, isAccrualEnabled = false) {
                 return {
                     payload: {
                         cacheOverride,
                         refreshViewInBackground,
+                        isAccrualEnabled,
                     },
                 };
             },

package/lib/esm/view/expenseAutomationView/expenseAutomationViewSelector.js

@@ -22,7 +22,7 @@ const isPreviousStepDisabled = (selectedTransactionCategorizationTab, allSteps,
     return allSteps[stepIndex - 1].isDisabled;
 };
 export function getExpenseAutomationView(state) {
-    const { expenseAutomationViewState, tenantState, expenseAutomationMissingReceiptsViewState, expenseAutomationJESchedulesViewState, expenseAutomationActualMatchingViewState, expenseAutomationTransactionsViewState, expenseAutomationReconciliationViewState, monthEndCloseChecksState, companyState, } = state;
+    const { expenseAutomationViewState, tenantState, expenseAutomationMissingReceiptsViewState, expenseAutomationJESchedulesViewState, expenseAutomationTransactionsViewState, expenseAutomationReconciliationViewState, monthEndCloseChecksState, companyState, } = state;
     const { loggedInUser, currentTenantId } = tenantState;
     const currentTenant = getCurrentTenant(state);
     const { currentSelectedView, selectedPeriodByTenantId } = expenseAutomationViewState;
@@ -43,6 +43,7 @@ export function getExpenseAutomationView(state) {
     const reconciliation = getExpenseAutomationReconciliationView(state);
     const expenseAutomationTransactionsView = getExpenseAutomationTransactionView(state);
     const jeSchedules = getExpenseAutomationJESchedulesView(state);
+    // Top-level sibling of `jeSchedules`: see ExpenseAutomationViewSelector.
     const actualMatching = getExpenseAutomationActualMatchingView(state);
     switch (currentSelectedView) {
         case 'reconciliation':
@@ -101,10 +102,12 @@ export function getExpenseAutomationView(state) {
             };
             break;
     }
+    // AM is optional (flag-off / background prefetch) and must not keep the
+    // page-level AND-complete fetchState stuck on Not-Started. Tab chrome uses
+    // currentSelectedViewFetchState, which already switches to AM when selected.
     const fetchStateVariables = [
         expenseAutomationMissingReceiptsViewState,
         expenseAutomationJESchedulesViewState,
-        expenseAutomationActualMatchingViewState,
         expenseAutomationTransactionsView,
         expenseAutomationReconciliationViewState,
     ];

package/lib/esm/view/expenseAutomationView/expenseAutomationViewState.js

@@ -1,5 +1,5 @@
-import { stringToUnion } from '../../commonStateTypes/stringToUnion';
-export const EXPENSE_AUTOMATION_VIEW_TYPES = [
+import { stringToUnion, stringToUnionStrict, } from '../../commonStateTypes/stringToUnion';
+const EXPENSE_AUTOMATION_VIEW_TYPES = [
     'transaction_categorization',
     'je_schedules',
     'reconciliation',
@@ -8,3 +8,5 @@ export const EXPENSE_AUTOMATION_VIEW_TYPES = [
     'month_end_insights',
 ];
 export const toExpenseAutomationViewType = (v) => stringToUnion(v, EXPENSE_AUTOMATION_VIEW_TYPES);
+/** Unlike `toExpenseAutomationViewType`, unknown strings return `undefined`. */
+export const toExpenseAutomationViewTypeStrict = (v) => stringToUnionStrict(v, EXPENSE_AUTOMATION_VIEW_TYPES);

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

@@ -3,8 +3,6 @@ import { toMatchAndReverseResultStatus, toUndoReversalResultStatus, } from '../t
 export function toServiceMonthFromPeriod(period) {
     return toString(period.start).slice(0, 7);
 }
-const DEFAULT_CURRENCY_CODE = 'USD';
-const DEFAULT_CURRENCY_SYMBOL = '$';
 function resolveMatchSearchAmount(payload) {
     const raw = payload.total_amount ?? payload.amount;
     if (typeof raw === 'number' && Number.isFinite(raw)) {
@@ -18,22 +16,24 @@ function resolveMatchSearchAmount(payload) {
     }
     return 0;
 }
-function resolveMatchSearchCurrencySymbol(payload, currencyCode) {
+function resolveMatchSearchCurrencySymbol(payload, currencyCode, fallbackCurrency) {
     if (payload.currency_symbol != null && payload.currency_symbol !== '') {
         return payload.currency_symbol;
     }
-    return currencyCode === DEFAULT_CURRENCY_CODE
-        ? DEFAULT_CURRENCY_SYMBOL
-        : currencyCode;
+    if (fallbackCurrency != null &&
+        currencyCode === fallbackCurrency.currencyCode) {
+        return fallbackCurrency.currencySymbol;
+    }
+    return currencyCode;
 }
-export function toActualMatchingTransactionSearchResult(payload) {
+export function toActualMatchingTransactionSearchResult(payload, fallbackCurrency) {
     const currencyCode = payload.currency_code != null && payload.currency_code !== ''
         ? payload.currency_code
-        : DEFAULT_CURRENCY_CODE;
+        : fallbackCurrency?.currencyCode ?? '';
     return {
         transactionId: payload.transaction_id,
         transactionIntegrationId: payload.transaction_integration_id,
-        transactionType: payload.transaction_type,
+        transactionType: (payload.transaction_type || '').toLowerCase(),
         lineId: payload.line_id,
         vendorId: payload.vendor_id ?? undefined,
         vendorName: payload.vendor_name ?? '',
@@ -45,7 +45,7 @@ export function toActualMatchingTransactionSearchResult(payload) {
         accountingClassId: payload.accounting_class_id ?? undefined,
         accountingClassName: payload.accounting_class_name ?? undefined,
         currencyCode,
-        currencySymbol: resolveMatchSearchCurrencySymbol(payload, currencyCode),
+        currencySymbol: resolveMatchSearchCurrencySymbol(payload, currencyCode, fallbackCurrency),
         transactionMemo: payload.transaction_memo ?? undefined,
         transactionDescription: payload.transaction_description ?? undefined,
         transactionTypeName: payload.transaction_type_name ?? undefined,

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

@@ -1,7 +1,8 @@
 import { createSlice } from '@reduxjs/toolkit';
-import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
+import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
 import { clearAll } from '../../../rootActions';
+import { actualMatchingTransactionLineKey } from '../types/actualMatchingViewState';
 export const initialTransactionSearchState = {
     query: '',
     results: [],
@@ -21,6 +22,7 @@ export const initialAccrualSearchState = {
 export const initialMatchModalState = {
     isOpen: false,
     openedFromMatchId: undefined,
+    didPinPrefillTransactions: false,
     pinnedTransactionResults: [],
     transactionSearch: initialTransactionSearchState,
     accrualSearch: initialAccrualSearchState,
@@ -43,11 +45,48 @@ export const initialState = {
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
     },
     matchModal: initialMatchModalState,
-    undoReversalStatus: { fetchState: 'Not-Started', error: undefined },
+    undoReversalStatusByMatchId: {},
+    closeMatchAfterUndo: false,
+    lastMatchResultsByMatchId: {},
+    lastUndoResultsByMatchId: {},
     hasValidState() {
         return this.fetchState == 'Completed';
     },
 };
+function pruneLastMatchResultsForUndone(draft, matchId, results) {
+    const undoneIds = new Set(results
+        .filter((result) => result.status === 'undone')
+        .map((result) => result.accrualId));
+    if (undoneIds.size === 0) {
+        return;
+    }
+    const existing = draft.lastMatchResultsByMatchId[matchId];
+    if (existing == null) {
+        return;
+    }
+    const kept = existing.filter((result) => !undoneIds.has(result.accrualId));
+    if (kept.length === 0) {
+        delete draft.lastMatchResultsByMatchId[matchId];
+        return;
+    }
+    draft.lastMatchResultsByMatchId[matchId] = kept;
+}
+function pruneLastUndoResultsForMatched(draft, matchId, results) {
+    const matchedIds = new Set(results.map((result) => result.accrualId));
+    if (matchedIds.size === 0) {
+        return;
+    }
+    const existing = draft.lastUndoResultsByMatchId[matchId];
+    if (existing == null) {
+        return;
+    }
+    const kept = existing.filter((result) => !matchedIds.has(result.accrualId));
+    if (kept.length === 0) {
+        delete draft.lastUndoResultsByMatchId[matchId];
+        return;
+    }
+    draft.lastUndoResultsByMatchId[matchId] = kept;
+}
 function resetMatchModalSearches(draft) {
     draft.matchModal.transactionSearch = initialTransactionSearchState;
     draft.matchModal.accrualSearch = initialAccrualSearchState;
@@ -57,6 +96,7 @@ function resetMatchModalSearches(draft) {
     };
     draft.matchModal.lastBatchResults = undefined;
     draft.matchModal.openedFromMatchId = undefined;
+    draft.matchModal.didPinPrefillTransactions = false;
     draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = createSlice({
@@ -81,6 +121,9 @@ const expenseAutomationActualMatchingView = createSlice({
                 const { refreshViewInBackground } = action.payload;
                 if (refreshViewInBackground) {
                     draft.refreshStatus = { fetchState: 'In-Progress', error: undefined };
+                    if (draft.fetchState === 'Not-Started') {
+                        draft.fetchState = 'In-Progress';
+                    }
                 }
                 else {
                     draft.fetchState = 'In-Progress';
@@ -102,6 +145,10 @@ const expenseAutomationActualMatchingView = createSlice({
             draft.matchIdsByPeriod[periodId] = matchIds;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
+                if (draft.fetchState !== 'Completed') {
+                    draft.fetchState = 'Completed';
+                    draft.error = undefined;
+                }
             }
             else {
                 draft.fetchState = 'Completed';
@@ -112,6 +159,10 @@ const expenseAutomationActualMatchingView = createSlice({
             const { status, refreshViewInBackground } = action.payload;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Error', error: status };
+                if (draft.fetchState !== 'Completed') {
+                    draft.fetchState = 'Error';
+                    draft.error = status;
+                }
             }
             else {
                 draft.fetchState = 'Error';
@@ -197,10 +248,13 @@ const expenseAutomationActualMatchingView = createSlice({
                 }
             },
         },
+        // Dismiss (Cancel / overlay). Store reset matches `clearMatchNewModal`;
+        // the actions stay distinct so confirm-success vs user-dismiss stay observable.
         closeMatchNewModal(draft) {
             draft.matchModal.isOpen = false;
             resetMatchModalSearches(draft);
         },
+        // Confirm-success / host reset. Same slice write as close; different action type.
         clearMatchNewModal(draft) {
             draft.matchModal.isOpen = false;
             resetMatchModalSearches(draft);
@@ -221,7 +275,7 @@ const expenseAutomationActualMatchingView = createSlice({
                     draft.matchModal.transactionSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken, transactionType, transactionIntegrationId, }) {
+            prepare(query, pageToken, transactionType, transactionIntegrationId) {
                 return {
                     payload: {
                         query,
@@ -240,7 +294,7 @@ const expenseAutomationActualMatchingView = createSlice({
                     ...results,
                 ];
                 const byKey = new Map(merged.map((result) => [
-                    `${result.transactionId}:${result.lineId}`,
+                    actualMatchingTransactionLineKey(result.transactionType, result.transactionIntegrationId, result.lineId),
                     result,
                 ]));
                 draft.matchModal.transactionSearch.results = Array.from(byKey.values());
@@ -248,7 +302,8 @@ const expenseAutomationActualMatchingView = createSlice({
             else {
                 draft.matchModal.transactionSearch.results = results;
                 if (draft.matchModal.openedFromMatchId != null &&
-                    draft.matchModal.pinnedTransactionResults.length === 0) {
+                    !draft.matchModal.didPinPrefillTransactions) {
+                    draft.matchModal.didPinPrefillTransactions = true;
                     draft.matchModal.pinnedTransactionResults = results;
                 }
             }
@@ -278,7 +333,7 @@ const expenseAutomationActualMatchingView = createSlice({
                     draft.matchModal.accrualSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken }) {
+            prepare(query, pageToken) {
                 return { payload: { query, pageToken: pageToken ?? undefined } };
             },
         },
@@ -309,8 +364,17 @@ const expenseAutomationActualMatchingView = createSlice({
                     error: undefined,
                 };
             },
-            prepare(params) {
-                return { payload: params };
+            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
+                return {
+                    payload: {
+                        transactionId,
+                        transactionIntegrationId,
+                        transactionType,
+                        lineIds,
+                        transactionSyncToken,
+                        accrualIds,
+                    },
+                };
             },
         },
         matchAndReverseAccrualsSuccess(draft, action) {
@@ -319,6 +383,11 @@ const expenseAutomationActualMatchingView = createSlice({
                 error: undefined,
             };
             draft.matchModal.lastBatchResults = action.payload.results;
+            if (action.payload.matchId != null) {
+                draft.lastMatchResultsByMatchId[action.payload.matchId] =
+                    action.payload.results;
+                pruneLastUndoResultsForMatched(draft, action.payload.matchId, action.payload.results);
+            }
         },
         matchAndReverseAccrualsFailure(draft, action) {
             draft.matchModal.confirmStatus = {
@@ -327,25 +396,43 @@ const expenseAutomationActualMatchingView = createSlice({
             };
         },
         undoReversalAccruals: {
-            reducer(draft) {
-                draft.undoReversalStatus = {
+            reducer(draft, action) {
+                draft.undoReversalStatusByMatchId[action.payload.matchId] = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
             },
-            prepare(params) {
-                return { payload: params };
+            prepare(matchId, accrualIds) {
+                return { payload: { matchId, accrualIds } };
             },
         },
-        undoReversalAccrualsSuccess(draft, action) {
-            draft.undoReversalStatus = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-            void action;
+        undoReversalAccrualsSuccess: {
+            reducer(draft, action) {
+                const { matchId, results } = action.payload;
+                draft.undoReversalStatusByMatchId[matchId] = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+                const allUndone = results.length > 0 &&
+                    results.every((result) => result.status === 'undone');
+                draft.closeMatchAfterUndo = allUndone;
+                pruneLastMatchResultsForUndone(draft, matchId, results);
+                if (allUndone) {
+                    delete draft.lastUndoResultsByMatchId[matchId];
+                }
+                else {
+                    draft.lastUndoResultsByMatchId[matchId] = results;
+                }
+            },
+            prepare(matchId, results) {
+                return { payload: { matchId, results } };
+            },
+        },
+        ackCloseMatchAfterUndo(draft) {
+            draft.closeMatchAfterUndo = false;
         },
         undoReversalAccrualsFailure(draft, action) {
-            draft.undoReversalStatus = {
+            draft.undoReversalStatusByMatchId[action.payload.matchId] = {
                 fetchState: 'Error',
                 error: action.payload.status,
             };
@@ -360,5 +447,5 @@ const expenseAutomationActualMatchingView = createSlice({
         });
     },
 });
-export const { clearActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, fetchActualMatchingPage, fetchActualMatchingSuccess, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, openMatchNewModal, searchMatchAccruals, searchMatchAccrualsFailure, searchMatchAccrualsSuccess, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, updateActualMatchingUIState, } = expenseAutomationActualMatchingView.actions;
+export const { ackCloseMatchAfterUndo, clearActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, fetchActualMatchingPage, fetchActualMatchingSuccess, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, openMatchNewModal, searchMatchAccruals, searchMatchAccrualsFailure, searchMatchAccrualsSuccess, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, updateActualMatchingUIState, } = expenseAutomationActualMatchingView.actions;
 export default expenseAutomationActualMatchingView.reducer;

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

@@ -105,11 +105,12 @@ const expenseAutomationJESchedulesView = createSlice({
     initialState,
     reducers: {
         fetchJeSchedulesPage: {
-            prepare(period, refreshViewInBackground = false) {
+            prepare(period, refreshViewInBackground = false, isAccrualEnabled = false) {
                 return {
                     payload: {
                         period,
                         refreshViewInBackground,
+                        isAccrualEnabled,
                     },
                 };
             },