@zeniai/client-epic-state 5.2.35-beta2MM → 5.2.35-beta4MM

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

@@ -3,26 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.matchAndReverseAccrualsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const responsePayload_1 = require("../../../../responsePayload");
 const rootActions_1 = require("../../../../rootActions");
 const actualMatchingPayload_1 = require("../../payload/actualMatchingPayload");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
-const actualMatchingViewSelector_1 = require("../../selectors/actualMatchingViewSelector");
-function refreshActualMatchingList(state) {
-    const selectedMonthYear = (0, actualMatchingViewSelector_1.getSelectedMonthYearForCurrentTenant)(state);
-    if (selectedMonthYear == null) {
-        return [];
-    }
-    const period = (0, timePeriod_1.convertToPeriod)(selectedMonthYear);
-    const start = (0, timePeriod_1.toAbsoluteDay)(period.start);
-    const end = (0, timePeriod_1.toAbsoluteDay)(period.end);
-    if (start == null || end == null) {
-        return [];
-    }
-    return [(0, actualMatchingViewReducer_1.fetchActualMatching)({ start, end }, true)];
-}
-const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.matchAndReverseAccruals.match), (0, operators_1.mergeMap)((action) => {
+const refreshActualMatchingList_1 = require("./refreshActualMatchingList");
+const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.matchAndReverseAccruals.match), 
+// Posts reversing JEs; drop duplicate clicks while a request is in flight.
+(0, operators_1.exhaustMap)((action) => {
     const { transactionId, transactionIntegrationId, transactionType, lineId, accrualIds, transactionSyncToken, } = action.payload;
     const body = {
         transaction_id: transactionId,
@@ -37,12 +25,21 @@ const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const results = response.data.results.map(actualMatchingPayload_1.toMatchAndReverseResult);
+            const openedFromMatchId = state$.value.expenseAutomationActualMatchingViewState.matchModal
+                .openedFromMatchId;
+            const matchId = openedFromMatchId ??
+                `${transactionType}:${transactionIntegrationId}`;
             const successActions = [
-                (0, actualMatchingViewReducer_1.matchAndReverseAccrualsSuccess)({ results }),
+                (0, actualMatchingViewReducer_1.matchAndReverseAccrualsSuccess)({ matchId, results }),
             ];
-            const anyReversed = results.some((result) => result.status === 'reversed');
-            if (anyReversed) {
-                successActions.push(...refreshActualMatchingList(state$.value), (0, actualMatchingViewReducer_1.clearMatchNewModal)());
+            const occupancyChanged = results.some((result) => result.status === 'reversed' || result.status === 'noop');
+            const allComplete = results.length > 0 &&
+                results.every((result) => result.status === 'reversed' || result.status === 'noop');
+            if (occupancyChanged) {
+                successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value));
+            }
+            if (allComplete) {
+                successActions.push((0, actualMatchingViewReducer_1.clearMatchNewModal)());
             }
             return (0, rxjs_1.from)(successActions);
         }

package/lib/view/expenseAutomationView/epics/actualMatching/refreshActualMatchingList.d.ts

@@ -0,0 +1,3 @@
+import { RootState } from '../../../../rootStateTypes';
+import { fetchActualMatching } from '../../reducers/actualMatchingViewReducer';
+export declare function refreshActualMatchingList(state: RootState): ReturnType<typeof fetchActualMatching>[];

package/lib/view/expenseAutomationView/epics/actualMatching/refreshActualMatchingList.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshActualMatchingList = refreshActualMatchingList;
+const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
+const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
+const actualMatchingViewSelector_1 = require("../../selectors/actualMatchingViewSelector");
+function refreshActualMatchingList(state) {
+    const selectedMonthYear = (0, actualMatchingViewSelector_1.getSelectedMonthYearForCurrentTenant)(state);
+    if (selectedMonthYear == null) {
+        return [];
+    }
+    const period = (0, timePeriod_1.convertToPeriod)(selectedMonthYear);
+    const start = (0, timePeriod_1.toAbsoluteDay)(period.start);
+    const end = (0, timePeriod_1.toAbsoluteDay)(period.end);
+    if (start == null || end == null) {
+        return [];
+    }
+    return [(0, actualMatchingViewReducer_1.fetchActualMatching)({ start, end }, true)];
+}

package/lib/view/expenseAutomationView/epics/actualMatching/searchMatchTransactionsEpic.js

@@ -15,8 +15,8 @@ const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
         const matchId = action.payload.matchId;
         if (matchId == null || matchId === '') {
             return (0, rxjs_1.from)([
-                (0, actualMatchingViewReducer_1.searchMatchTransactions)({ query: '' }),
-                (0, actualMatchingViewReducer_1.searchMatchAccruals)({ query: '' }),
+                (0, actualMatchingViewReducer_1.searchMatchTransactions)(''),
+                (0, actualMatchingViewReducer_1.searchMatchAccruals)(''),
             ]);
         }
         const match = (0, actualMatchingSelector_1.getActualMatchingMatchById)(state$.value.actualMatchingState, matchId);
@@ -29,11 +29,7 @@ const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
             ? match.transactionIntegrationId
             : parsed?.transactionIntegrationId;
         return (0, rxjs_1.from)([
-            (0, actualMatchingViewReducer_1.searchMatchTransactions)({
-                query: '',
-                transactionType,
-                transactionIntegrationId,
-            }),
+            (0, actualMatchingViewReducer_1.searchMatchTransactions)('', undefined, transactionType, transactionIntegrationId),
         ]);
     }));
     const searchActions$ = actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.searchMatchTransactions.match));
@@ -58,7 +54,8 @@ const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const { transactions, next_page_token } = response.data;
                 const append = pageToken != null;
-                const results = transactions.map(actualMatchingPayload_1.toActualMatchingTransactionSearchResult);
+                const fallbackCurrency = (0, actualMatchingViewSelector_1.getTenantDisplayCurrency)(state$.value);
+                const results = transactions.map((transaction) => (0, actualMatchingPayload_1.toActualMatchingTransactionSearchResult)(transaction, fallbackCurrency));
                 return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.searchMatchTransactionsSuccess)({
                     append,
                     nextPageToken: next_page_token ?? null,

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

@@ -3,34 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.undoReversalAccrualsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const responsePayload_1 = require("../../../../responsePayload");
 const rootActions_1 = require("../../../../rootActions");
 const actualMatchingPayload_1 = require("../../payload/actualMatchingPayload");
 const actualMatchingViewReducer_1 = require("../../reducers/actualMatchingViewReducer");
-const actualMatchingViewSelector_1 = require("../../selectors/actualMatchingViewSelector");
-function refreshActualMatchingList(state) {
-    const selectedMonthYear = (0, actualMatchingViewSelector_1.getSelectedMonthYearForCurrentTenant)(state);
-    if (selectedMonthYear == null) {
-        return [];
-    }
-    const period = (0, timePeriod_1.convertToPeriod)(selectedMonthYear);
-    const start = (0, timePeriod_1.toAbsoluteDay)(period.start);
-    const end = (0, timePeriod_1.toAbsoluteDay)(period.end);
-    if (start == null || end == null) {
-        return [];
-    }
-    return [(0, actualMatchingViewReducer_1.fetchActualMatching)({ start, end }, true)];
-}
-function refreshOpenMatchDetails(state) {
-    const detailState = state.expenseAutomationActualMatchingViewState.detailFetchStateByMatchId;
-    return Object.keys(detailState)
-        .filter((matchId) => detailState[matchId]?.fetchState !== 'Not-Started')
-        .map((matchId) => (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true));
-}
-const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.undoReversalAccruals.match), (0, operators_1.mergeMap)((action) => {
+const refreshActualMatchingList_1 = require("./refreshActualMatchingList");
+const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.undoReversalAccruals.match), 
+// Posts QBO deletes; drop duplicate clicks while a request is in flight.
+(0, operators_1.exhaustMap)((action) => {
+    const { accrualIds, matchId } = action.payload;
     const body = {
-        accrual_ids: action.payload.accrualIds,
+        accrual_ids: accrualIds,
     };
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/undo-reversal`, body)
@@ -38,16 +21,20 @@ const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const results = response.data.results.map(actualMatchingPayload_1.toUndoReversalResult);
             const successActions = [
-                (0, actualMatchingViewReducer_1.undoReversalAccrualsSuccess)({ results }),
+                (0, actualMatchingViewReducer_1.undoReversalAccrualsSuccess)(matchId, results),
             ];
             const anyUndone = results.some((result) => result.status === 'undone');
             if (anyUndone) {
-                successActions.push(...refreshActualMatchingList(state$.value), ...refreshOpenMatchDetails(state$.value));
+                successActions.push(...(0, refreshActualMatchingList_1.refreshActualMatchingList)(state$.value), (0, actualMatchingViewReducer_1.fetchActualMatchingMatch)(matchId, true));
             }
             return (0, rxjs_1.from)(successActions);
         }
-        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({ status: response.status }));
+        return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({
+            matchId,
+            status: response.status,
+        }));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.undoReversalAccrualsFailure)({
+        matchId,
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Undo reversal accruals REST API call errored out' +
             JSON.stringify(error)),
     }))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));

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

@@ -1,6 +1,6 @@
 import { ID } from '../../../commonStateTypes/common';
 import { TimePeriod } from '../../../commonStateTypes/timePeriod';
-import { ActualMatchingListResponsePayload } from '../../../entity/actualMatching/actualMatchingPayload';
+import { ActualMatchingListResponsePayload, DisplayCurrencyFallback } from '../../../entity/actualMatching/actualMatchingPayload';
 import { JEOneTimeAccrualPayload } from '../../../entity/jeSchedules/jeSchedulesPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { ActualMatchingTransactionSearchResult, MatchAndReverseResult, UndoReversalResult } from '../types/actualMatchingViewState';
@@ -47,7 +47,7 @@ export interface MatchTransactionSearchResponsePayload {
     next_page_token?: string | null;
 }
 export type MatchTransactionSearchResponse = ZeniAPIResponse<MatchTransactionSearchResponsePayload>;
-export declare function toActualMatchingTransactionSearchResult(payload: MatchTransactionSearchResultPayload): ActualMatchingTransactionSearchResult;
+export declare function toActualMatchingTransactionSearchResult(payload: MatchTransactionSearchResultPayload, fallbackCurrency?: DisplayCurrencyFallback): ActualMatchingTransactionSearchResult;
 export interface MatchAndReverseRequestPayload {
     accrual_ids: ID[];
     line_id: string;

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

@@ -9,8 +9,6 @@ const actualMatchingViewState_1 = require("../types/actualMatchingViewState");
 function toServiceMonthFromPeriod(period) {
     return (0, timePeriod_1.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)) {
@@ -24,18 +22,20 @@ 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;
 }
-function toActualMatchingTransactionSearchResult(payload) {
+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,
@@ -51,7 +51,7 @@ 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/view/expenseAutomationView/reducers/actualMatchingViewReducer.d.ts

@@ -2,7 +2,7 @@ import { MonthYearPeriod, TimePeriod } from '../../../commonStateTypes/timePerio
 import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatchingTypes';
 import { JEOneTimeAccrualPayload } from '../../../entity/jeSchedules/jeSchedulesPayload';
 import { ZeniAPIStatus } from '../../../responsePayload';
-import { ActualMatchingAccrualSearchState, ActualMatchingMatchModalState, ActualMatchingTransactionSearchResult, ActualMatchingTransactionSearchState, ActualMatchingViewState, ActualMatchingViewUIState, MatchAndReverseAccrualsParams, MatchAndReverseResult, UndoReversalAccrualsParams, UndoReversalResult } from '../types/actualMatchingViewState';
+import { ActualMatchingAccrualSearchState, ActualMatchingMatchModalState, ActualMatchingTransactionSearchResult, ActualMatchingTransactionSearchState, ActualMatchingViewState, ActualMatchingViewUIState, MatchAndReverseResult, UndoReversalResult } from '../types/actualMatchingViewState';
 export declare const initialTransactionSearchState: ActualMatchingTransactionSearchState;
 export declare const initialAccrualSearchState: ActualMatchingAccrualSearchState;
 export declare const initialMatchModalState: ActualMatchingMatchModalState;
@@ -31,16 +31,21 @@ export declare const clearActualMatchingView: import("@reduxjs/toolkit").ActionC
     matchIds: ActualMatchingMatchId[];
     refreshViewInBackground: boolean;
     selectedPeriod: MonthYearPeriod;
-}, "expenseAutomationActualMatchingView/fetchActualMatchingSuccess">, matchAndReverseAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[params: MatchAndReverseAccrualsParams], MatchAndReverseAccrualsParams, "expenseAutomationActualMatchingView/matchAndReverseAccruals", never, never>, matchAndReverseAccrualsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "expenseAutomationActualMatchingView/fetchActualMatchingSuccess">, matchAndReverseAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: string, transactionIntegrationId: string, transactionType: string, lineId: string, transactionSyncToken: string, accrualIds: string[]], {
+    transactionId: string;
+    transactionIntegrationId: string;
+    transactionType: string;
+    lineId: string;
+    transactionSyncToken: string;
+    accrualIds: string[];
+}, "expenseAutomationActualMatchingView/matchAndReverseAccruals", never, never>, matchAndReverseAccrualsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     status: ZeniAPIStatus;
 }, "expenseAutomationActualMatchingView/matchAndReverseAccrualsFailure">, matchAndReverseAccrualsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     results: MatchAndReverseResult[];
+    matchId?: ActualMatchingMatchId;
 }, "expenseAutomationActualMatchingView/matchAndReverseAccrualsSuccess">, openMatchNewModal: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId?: string | undefined], {
     matchId: string | undefined;
-}, "expenseAutomationActualMatchingView/openMatchNewModal", never, never>, searchMatchAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[{
-    query: string;
-    pageToken?: string | null;
-}], {
+}, "expenseAutomationActualMatchingView/openMatchNewModal", never, never>, searchMatchAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[query: string, pageToken?: string | null | undefined], {
     query: string;
     pageToken: string | undefined;
 }, "expenseAutomationActualMatchingView/searchMatchAccruals", never, never>, searchMatchAccrualsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
@@ -49,12 +54,7 @@ export declare const clearActualMatchingView: import("@reduxjs/toolkit").ActionC
     append: boolean;
     nextPageToken: string | null;
     results: JEOneTimeAccrualPayload[];
-}, "expenseAutomationActualMatchingView/searchMatchAccrualsSuccess">, searchMatchTransactions: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[{
-    query: string;
-    pageToken?: string | null;
-    transactionIntegrationId?: string;
-    transactionType?: string;
-}], {
+}, "expenseAutomationActualMatchingView/searchMatchAccrualsSuccess">, searchMatchTransactions: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[query: string, pageToken?: string | null | undefined, transactionType?: string | undefined, transactionIntegrationId?: string | undefined], {
     query: string;
     pageToken: string | undefined;
     transactionType: string | undefined;
@@ -65,11 +65,14 @@ export declare const clearActualMatchingView: import("@reduxjs/toolkit").ActionC
     append: boolean;
     nextPageToken: string | null;
     results: ActualMatchingTransactionSearchResult[];
-}, "expenseAutomationActualMatchingView/searchMatchTransactionsSuccess">, undoReversalAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[params: UndoReversalAccrualsParams], UndoReversalAccrualsParams, "expenseAutomationActualMatchingView/undoReversalAccruals", never, never>, undoReversalAccrualsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "expenseAutomationActualMatchingView/searchMatchTransactionsSuccess">, undoReversalAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, accrualIds: string[]], {
+    matchId: string;
+    accrualIds: string[];
+}, "expenseAutomationActualMatchingView/undoReversalAccruals", never, never>, undoReversalAccrualsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    matchId: ActualMatchingMatchId;
     status: ZeniAPIStatus;
-}, "expenseAutomationActualMatchingView/undoReversalAccrualsFailure">, undoReversalAccrualsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: {
-    results: UndoReversalResult[];
-}], {
+}, "expenseAutomationActualMatchingView/undoReversalAccrualsFailure">, undoReversalAccrualsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, results: UndoReversalResult[]], {
+    matchId: string;
     results: UndoReversalResult[];
 }, "expenseAutomationActualMatchingView/undoReversalAccrualsSuccess", never, never>, updateActualMatchingUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<Partial<ActualMatchingViewUIState>, "expenseAutomationActualMatchingView/updateActualMatchingUIState">;
 declare const _default: import("redux").Reducer<ActualMatchingViewState>;

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

@@ -6,6 +6,7 @@ const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
 const rootActions_1 = require("../../../rootActions");
+const actualMatchingViewState_1 = require("../types/actualMatchingViewState");
 exports.initialTransactionSearchState = {
     query: '',
     results: [],
@@ -47,7 +48,9 @@ exports.initialState = {
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
     },
     matchModal: exports.initialMatchModalState,
-    undoReversalStatus: { fetchState: 'Not-Started', error: undefined },
+    undoReversalStatusByMatchId: {},
+    lastUndoResultsByMatchId: {},
+    lastMatchResultsByMatchId: {},
     hasValidState() {
         return this.fetchState == 'Completed';
     },
@@ -228,7 +231,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     draft.matchModal.transactionSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken, transactionType, transactionIntegrationId, }) {
+            prepare(query, pageToken, transactionType, transactionIntegrationId) {
                 return {
                     payload: {
                         query,
@@ -247,7 +250,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     ...results,
                 ];
                 const byKey = new Map(merged.map((result) => [
-                    `${result.transactionId}:${result.lineId}`,
+                    (0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(result.transactionType, result.transactionIntegrationId, result.lineId),
                     result,
                 ]));
                 draft.matchModal.transactionSearch.results = Array.from(byKey.values());
@@ -285,7 +288,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     draft.matchModal.accrualSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken }) {
+            prepare(query, pageToken) {
                 return { payload: { query, pageToken: pageToken ?? undefined } };
             },
         },
@@ -316,8 +319,17 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     error: undefined,
                 };
             },
-            prepare(params) {
-                return { payload: params };
+            prepare(transactionId, transactionIntegrationId, transactionType, lineId, transactionSyncToken, accrualIds) {
+                return {
+                    payload: {
+                        transactionId,
+                        transactionIntegrationId,
+                        transactionType,
+                        lineId,
+                        transactionSyncToken,
+                        accrualIds,
+                    },
+                };
             },
         },
         matchAndReverseAccrualsSuccess(draft, action) {
@@ -326,6 +338,10 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 error: undefined,
             };
             draft.matchModal.lastBatchResults = action.payload.results;
+            if (action.payload.matchId != null) {
+                draft.lastMatchResultsByMatchId[action.payload.matchId] =
+                    action.payload.results;
+            }
         },
         matchAndReverseAccrualsFailure(draft, action) {
             draft.matchModal.confirmStatus = {
@@ -334,29 +350,31 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.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: {
-            reducer(draft) {
-                draft.undoReversalStatus = {
+            reducer(draft, action) {
+                const { matchId, results } = action.payload;
+                draft.undoReversalStatusByMatchId[matchId] = {
                     fetchState: 'Completed',
                     error: undefined,
                 };
+                draft.lastUndoResultsByMatchId[matchId] = results;
             },
-            prepare(payload) {
-                return { payload };
+            prepare(matchId, results) {
+                return { payload: { matchId, results } };
             },
         },
         undoReversalAccrualsFailure(draft, action) {
-            draft.undoReversalStatus = {
+            draft.undoReversalStatusByMatchId[action.payload.matchId] = {
                 fetchState: 'Error',
                 error: action.payload.status,
             };

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

@@ -81,5 +81,4 @@ export interface ExpenseAutomationActualMatchingViewSelector extends SelectorVie
     refreshStatus: FetchStateAndError;
     reversed: ActualMatchingRow[];
     uiState: ActualMatchingViewUIState;
-    undoReversalStatus?: FetchStateAndError;
 }

package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.d.ts

@@ -1,5 +1,6 @@
 import { FetchStateAndError } from '../../../commonStateTypes/common';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
+import { DisplayCurrencyFallback } from '../../../entity/actualMatching/actualMatchingPayload';
 import { ActualMatchingMatch } from '../../../entity/actualMatching/actualMatchingState';
 import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatchingTypes';
 import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelector';
@@ -7,7 +8,9 @@ import { JEOneTimeAccrualMatchSuggestion } from '../../../entity/jeSchedules/jeS
 import { RootState } from '../../../rootStateTypes';
 import { ZeniDate } from '../../../zeniDayJS';
 import { ActualMatchingKpiSummary, ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
+import { MatchAndReverseResult, UndoReversalResult } from '../types/actualMatchingViewState';
 export declare function getSelectedMonthYearForCurrentTenant(state: RootState): MonthYearPeriod | undefined;
+export declare function getTenantDisplayCurrency(state: RootState): DisplayCurrencyFallback | undefined;
 export declare function parseActualMatchingMatchId(matchId: string): {
     transactionIntegrationId: string;
     transactionType: string;
@@ -21,11 +24,13 @@ export declare function isReversedMatchKind(kind: ActualMatchingRowKind): boolea
 export declare function getClearedMatchedAmount(accrual: JEOneTimeAccrual): number | undefined;
 export declare function getActualMatchingAmount(row: ActualMatchingRow): number;
 export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual): ZeniDate | undefined;
-export declare function buildActualMatchingKpiSummary(rows: ActualMatchingRow[]): ActualMatchingKpiSummary;
+export declare function buildActualMatchingKpiSummary(rows: ActualMatchingRow[], displayCurrencyCode?: string): ActualMatchingKpiSummary;
 export interface ExpenseAutomationActualMatchingMatchView {
     detailFetchState: FetchStateAndError;
     refreshStatus: FetchStateAndError;
     undoReversalStatus: FetchStateAndError;
+    lastMatchResults?: MatchAndReverseResult[];
+    lastUndoResults?: UndoReversalResult[];
     match?: ActualMatchingMatch;
 }
 export declare function getExpenseAutomationActualMatchingMatchView(state: RootState, matchId: ActualMatchingMatchId): ExpenseAutomationActualMatchingMatchView;