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

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

@@ -2,6 +2,10 @@ import { ID } from '../../commonStateTypes/common';
 import { JEOneTimeAccrualPayload } from '../jeSchedules/jeSchedulesPayload';
 import { ActualMatchingMatch } from './actualMatchingState';
 import { ActualMatchingMatchId } from './actualMatchingTypes';
+export interface DisplayCurrencyFallback {
+    currencyCode: string;
+    currencySymbol: string;
+}
 export interface ActualMatchingMatchPayload {
     accrued_amount: number;
     actual_amount: number;
@@ -12,6 +16,7 @@ export interface ActualMatchingMatchPayload {
     transaction_type: string;
     currency_code?: string | null;
     currency_symbol?: string | null;
+    leftovers?: JEOneTimeAccrualPayload[];
     match_shape?: string | null;
     match_tier?: string | null;
     transaction_date?: string | null;
@@ -22,4 +27,4 @@ export interface ActualMatchingListResponsePayload {
     matches: ActualMatchingMatchPayload[];
     total: number;
 }
-export declare function toActualMatchingMatch(payload: ActualMatchingMatchPayload): ActualMatchingMatch;
+export declare function toActualMatchingMatch(payload: ActualMatchingMatchPayload, fallbackCurrency?: DisplayCurrencyFallback): ActualMatchingMatch;

package/lib/entity/actualMatching/actualMatchingPayload.js

@@ -4,29 +4,23 @@ exports.toActualMatchingMatch = toActualMatchingMatch;
 const amount_1 = require("../../commonStateTypes/amount");
 const stringToUnion_1 = require("../../commonStateTypes/stringToUnion");
 const jeSchedulesPayload_1 = require("../jeSchedules/jeSchedulesPayload");
-const USD_CURRENCY_CODE = 'USD';
-const USD_CURRENCY_SYMBOL = '$';
 const MATCH_KINDS = [
     'auto_reversed',
     'pending_review',
     'manually_reversed',
 ];
 function toMatchKind(raw) {
-    const kind = (0, stringToUnion_1.stringToUnionStrict)(raw, MATCH_KINDS);
-    if (kind == null) {
-        console.error(`Unknown ActualMatchingMatchKind: ${raw}`);
-        return 'auto_reversed';
-    }
-    return kind;
+    return (0, stringToUnion_1.stringToUnion)(raw, MATCH_KINDS);
 }
-function toActualMatchingMatch(payload) {
+function toActualMatchingMatch(payload, fallbackCurrency) {
     const currencyCode = payload.currency_code != null && payload.currency_code !== ''
         ? payload.currency_code
-        : USD_CURRENCY_CODE;
+        : fallbackCurrency?.currencyCode ?? '';
     const currencySymbol = payload.currency_symbol != null && payload.currency_symbol !== ''
         ? payload.currency_symbol
-        : currencyCode === USD_CURRENCY_CODE
-            ? USD_CURRENCY_SYMBOL
+        : fallbackCurrency != null &&
+            currencyCode === fallbackCurrency.currencyCode
+            ? fallbackCurrency.currencySymbol
             : currencyCode;
     return {
         matchId: payload.match_id,
@@ -34,12 +28,13 @@ function toActualMatchingMatch(payload) {
         transactionIntegrationId: payload.transaction_integration_id,
         transactionDate: payload.transaction_date ?? undefined,
         vendorId: payload.vendor_id ?? undefined,
-        vendorName: payload.vendor_name ?? '',
+        vendorName: payload.vendor_name ?? undefined,
         kind: toMatchKind(payload.kind),
         matchTier: payload.match_tier ?? undefined,
         matchShape: payload.match_shape ?? undefined,
         accruedAmount: (0, amount_1.toAmount)(payload.accrued_amount, currencyCode, currencySymbol),
         actualAmount: (0, amount_1.toAmount)(payload.actual_amount, currencyCode, currencySymbol),
         members: payload.members.map(jeSchedulesPayload_1.toJEOneTimeAccrual),
+        leftovers: (payload.leftovers ?? []).map(jeSchedulesPayload_1.toJEOneTimeAccrual),
     };
 }

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

@@ -1,8 +1,9 @@
-import { ActualMatchingMatchPayload } from './actualMatchingPayload';
+import { ActualMatchingMatchPayload, DisplayCurrencyFallback } from './actualMatchingPayload';
 import { ActualMatchingState } from './actualMatchingState';
 export declare const initialState: ActualMatchingState;
-export declare const updateActualMatchingMatches: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matches: ActualMatchingMatchPayload[]], {
+export declare const updateActualMatchingMatches: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matches: ActualMatchingMatchPayload[], fallbackCurrency?: DisplayCurrencyFallback | undefined], {
     matches: ActualMatchingMatchPayload[];
+    fallbackCurrency: DisplayCurrencyFallback | undefined;
 }, "actualMatching/updateActualMatchingMatches", never, never>;
 declare const _default: import("redux").Reducer<ActualMatchingState>;
 export default _default;

package/lib/entity/actualMatching/actualMatchingReducer.js

@@ -12,12 +12,12 @@ const actualMatching = (0, toolkit_1.createSlice)({
     initialState: exports.initialState,
     reducers: {
         updateActualMatchingMatches: {
-            prepare(matches) {
-                return { payload: { matches } };
+            prepare(matches, fallbackCurrency) {
+                return { payload: { matches, fallbackCurrency } };
             },
             reducer(draft, action) {
                 action.payload.matches.forEach((payload) => {
-                    const match = (0, actualMatchingPayload_1.toActualMatchingMatch)(payload);
+                    const match = (0, actualMatchingPayload_1.toActualMatchingMatch)(payload, action.payload.fallbackCurrency);
                     draft.byMatchId[match.matchId] = match;
                 });
             },

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

@@ -9,13 +9,14 @@ export interface ActualMatchingMatch {
     kind: ActualMatchingMatchKind;
     matchId: ActualMatchingMatchId;
     members: JEOneTimeAccrualState[];
-    transactionIntegrationId: string;
+    transactionIntegrationId: ID;
     transactionType: string;
-    vendorName: string;
+    leftovers?: JEOneTimeAccrualState[];
     matchShape?: string;
     matchTier?: string;
     transactionDate?: string;
     vendorId?: ID;
+    vendorName?: string;
 }
 export interface ActualMatchingState {
     byMatchId: Record<ActualMatchingMatchId, ActualMatchingMatch>;

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

@@ -1,29 +1,23 @@
 import { toAmount } from '../../commonStateTypes/amount';
-import { stringToUnionStrict } from '../../commonStateTypes/stringToUnion';
+import { stringToUnion } from '../../commonStateTypes/stringToUnion';
 import { toJEOneTimeAccrual, } from '../jeSchedules/jeSchedulesPayload';
-const USD_CURRENCY_CODE = 'USD';
-const USD_CURRENCY_SYMBOL = '$';
 const MATCH_KINDS = [
     'auto_reversed',
     'pending_review',
     'manually_reversed',
 ];
 function toMatchKind(raw) {
-    const kind = stringToUnionStrict(raw, MATCH_KINDS);
-    if (kind == null) {
-        console.error(`Unknown ActualMatchingMatchKind: ${raw}`);
-        return 'auto_reversed';
-    }
-    return kind;
+    return stringToUnion(raw, MATCH_KINDS);
 }
-export function toActualMatchingMatch(payload) {
+export function toActualMatchingMatch(payload, fallbackCurrency) {
     const currencyCode = payload.currency_code != null && payload.currency_code !== ''
         ? payload.currency_code
-        : USD_CURRENCY_CODE;
+        : fallbackCurrency?.currencyCode ?? '';
     const currencySymbol = payload.currency_symbol != null && payload.currency_symbol !== ''
         ? payload.currency_symbol
-        : currencyCode === USD_CURRENCY_CODE
-            ? USD_CURRENCY_SYMBOL
+        : fallbackCurrency != null &&
+            currencyCode === fallbackCurrency.currencyCode
+            ? fallbackCurrency.currencySymbol
             : currencyCode;
     return {
         matchId: payload.match_id,
@@ -31,12 +25,13 @@ export function toActualMatchingMatch(payload) {
         transactionIntegrationId: payload.transaction_integration_id,
         transactionDate: payload.transaction_date ?? undefined,
         vendorId: payload.vendor_id ?? undefined,
-        vendorName: payload.vendor_name ?? '',
+        vendorName: payload.vendor_name ?? undefined,
         kind: toMatchKind(payload.kind),
         matchTier: payload.match_tier ?? undefined,
         matchShape: payload.match_shape ?? undefined,
         accruedAmount: toAmount(payload.accrued_amount, currencyCode, currencySymbol),
         actualAmount: toAmount(payload.actual_amount, currencyCode, currencySymbol),
         members: payload.members.map(toJEOneTimeAccrual),
+        leftovers: (payload.leftovers ?? []).map(toJEOneTimeAccrual),
     };
 }

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

@@ -9,12 +9,12 @@ const actualMatching = createSlice({
     initialState,
     reducers: {
         updateActualMatchingMatches: {
-            prepare(matches) {
-                return { payload: { matches } };
+            prepare(matches, fallbackCurrency) {
+                return { payload: { matches, fallbackCurrency } };
             },
             reducer(draft, action) {
                 action.payload.matches.forEach((payload) => {
-                    const match = toActualMatchingMatch(payload);
+                    const match = toActualMatchingMatch(payload, action.payload.fallbackCurrency);
                     draft.byMatchId[match.matchId] = match;
                 });
             },

package/lib/esm/index.js

@@ -200,7 +200,7 @@ import { getExpenseAutomationReconciliationView, getLedgerAccountIdsWithStatemen
 import { getExpenseAutomationTransactionView, getLastTransferEntryReplacement, } from './view/expenseAutomationView/selectors/transactionCategorizationSelector';
 import { applyTransactionFilters } from './view/expenseAutomationView/transactionFilterHelpers';
 import { TRANSACTION_FILTER_CATEGORIES, } from './view/expenseAutomationView/transactionFilterTypes';
-import { MATCH_ACCRUAL_SEARCH_LIMIT, MATCH_SEARCH_DEBOUNCE_MS, MATCH_TRANSACTION_SEARCH_PAGE_SIZE, toActualMatchingSortKey as toExpenseAutomationActualMatchingSortKey, toMatchAndReverseResultStatus, toUndoReversalResultStatus, } from './view/expenseAutomationView/types/actualMatchingViewState';
+import { MATCH_ACCRUAL_SEARCH_LIMIT, MATCH_SEARCH_DEBOUNCE_MS, MATCH_TRANSACTION_SEARCH_PAGE_SIZE, actualMatchingTransactionLineKey, toActualMatchingSortKey as toExpenseAutomationActualMatchingSortKey, toMatchAndReverseResultStatus, toUndoReversalResultStatus, } from './view/expenseAutomationView/types/actualMatchingViewState';
 import { DEFAULT_COMPLETED_SUB_TAB, toCompletedSubTab, } from './view/expenseAutomationView/types/completedSubTab';
 import { ALL_JE_PAGE_TABS, toJEScheduleSortKey as toExpenseAutomationJEScheduleSortKey, toJEPageTab, } from './view/expenseAutomationView/types/jeSchedulesViewState';
 import { BATCH_FILE_STATUSES, isUnmatchedTabFileStatus, toBatchFileStatus, toBatchStatusValue, toBulkUploadPhase, toBulkUploadResultsTab, toBulkUploadSortKey, toMatchSource, toMissingReceiptsTab, } from './view/expenseAutomationView/types/missingReceiptsViewState';
@@ -491,7 +491,7 @@ export { stringToUnion, stringToUnionStrict };
 export { fetchMonthEndCloseChecks, fetchMonthClosePerformanceTrend, getMonthEndCloseChecksViewByTenantId, ALL_MONTH_END_CLOSE_CHECKS_FREQUENCY, };
 export { 
 // Bulk Upload Types
-BATCH_FILE_STATUSES, isUnmatchedTabFileStatus, DEFAULT_COMPLETED_SUB_TAB, DEFAULT_TRANSACTION_GROUP, TRANSACTION_GROUPS, toTransactionGroup, toBatchFileStatus, toBatchStatusValue, toBulkUploadPhase, toBulkUploadResultsTab, toBulkUploadSortKey, toCompletedSubTab, toMatchSource, toMissingReceiptsTab, ALL_JE_PAGE_TABS, MATCH_ACCRUAL_SEARCH_LIMIT, MATCH_SEARCH_DEBOUNCE_MS, MATCH_TRANSACTION_SEARCH_PAGE_SIZE, toExpenseAutomationJEScheduleSortKey, toExpenseAutomationActualMatchingSortKey, toJEPageTab, toMatchAndReverseResultStatus, toUndoReversalResultStatus, toggleJECreatedGroupCollapsed, toggleJEPendingGroupCollapsed, updateJEScheduleTypeFilter, getExpenseAutomationView, toExpenseAutomationMissingReceiptsSortKey, toExpenseAutomationTransactionsTabKey, toExpenseAutomationViewType, toExpenseAutomationViewTypeStrict, uploadExpenseAutomationMissingReceiptSuccess, markExpenseAutomationMissingReceiptAsDone, fetchAllExpenseAutomationTabs, refreshExpenseAutomationCurrentTab, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationCompletedSubTab, updateTransactionGroup, fetchExpenseAutomationMissingReceipts, 
+BATCH_FILE_STATUSES, isUnmatchedTabFileStatus, DEFAULT_COMPLETED_SUB_TAB, DEFAULT_TRANSACTION_GROUP, TRANSACTION_GROUPS, toTransactionGroup, toBatchFileStatus, toBatchStatusValue, toBulkUploadPhase, toBulkUploadResultsTab, toBulkUploadSortKey, toCompletedSubTab, toMatchSource, toMissingReceiptsTab, actualMatchingTransactionLineKey, ALL_JE_PAGE_TABS, MATCH_ACCRUAL_SEARCH_LIMIT, MATCH_SEARCH_DEBOUNCE_MS, MATCH_TRANSACTION_SEARCH_PAGE_SIZE, toExpenseAutomationJEScheduleSortKey, toExpenseAutomationActualMatchingSortKey, toJEPageTab, toMatchAndReverseResultStatus, toUndoReversalResultStatus, toggleJECreatedGroupCollapsed, toggleJEPendingGroupCollapsed, updateJEScheduleTypeFilter, getExpenseAutomationView, toExpenseAutomationMissingReceiptsSortKey, toExpenseAutomationTransactionsTabKey, toExpenseAutomationViewType, toExpenseAutomationViewTypeStrict, uploadExpenseAutomationMissingReceiptSuccess, markExpenseAutomationMissingReceiptAsDone, fetchAllExpenseAutomationTabs, refreshExpenseAutomationCurrentTab, updateCurrentSelectedTransactionCategorizationTab, updateTransactionCategorizationCompletedSubTab, updateTransactionGroup, fetchExpenseAutomationMissingReceipts, 
 // Bulk Upload Actions
 bulkUploadReceipts, bulkUploadAutomatchingTimedOut, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, restoreBulkUploadAutomatchingOnMount, restoreBulkUploadMatchingState, updateBulkUploadProgress, pusherBatchStatusUpdate, requestMissingReceiptsTabNavigation, clearMissingReceiptsTabNavigation, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, clearBulkUploadBatchDetailsForScopeChange, markBatchDetailRefreshAttempted, refreshBatchDetailsForBatchId, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, setBulkUploadUploadedFileCount, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, acknowledgeBulkUploadConfirmMatchComplete, fetchCompletedTransactions, fetchCompletedTransactionsSuccess, fetchCompletedTransactionsFailure, fetchFluxAnalysisView, clearExpenseAutomationFluxAnalysisView, updateOperatingExpensesIdsForReview as updateFluxOperatingExpensesIdsForReview, updateSelectedSectionIdsForReview as updateFluxAnalysisSelectedSectionIdsForReview, reviewFluxAnalysisView, updateExpenseAutomationMissingReceiptUploadState, updateExpenseAutomationMissingReceiptsUIState, updateTransactionCategorizationUploadReceiptState, uploadTransactionCategorizationReceiptSuccess, getExpenseAutomationFluxAnalysisView, updateCurrentSelectedView, updateCurrentSelectedPeriod, getExpenseAutomationTransactionView, getLastTransferEntryReplacement, updateFluxAnalysisViewUIState, updateFluxAnalysisViewPageMetaData, MAX_SELECTION_LIMIT, checkIfAllLineItemsAreCategoryClassFilled, getLineItemsByTransactionIdsFromLocalData, isAnyItemWithUncategorizedExpenseAccount, excludeAccountFromReconciliation, includeAccountInReconciliation, saveExpenseAutomationReconciliationDetail, updateExpenseAutomationReconcileTabListScrollState, updateExpenseAutomationReconReviewTabListSortState, updateExpenseAutomationReconcileTabListSortState, updateExpenseAutomationReconcileTabLocalData, updateExpenseAutomationAccountReconciliationSelectedTab, updateExpenseAutomationAccountReconciliationSelectedAccountId, getExpenseAutomationReconciliationView, getLedgerAccountIdsWithStatementOverrideWarning, getLedgerAccountsForCombinedStatementMapping, getReparseStatementStatusByAccountId, getUnavailableLedgerAccountIds, fetchReconciliationView, uploadAccountStatementIntoDocumentAI, updateExpenseAutomationReconListScrollPosition, setConnectionInProgressForAccountReconciliation, getAccountReconByAccountIdAndSelectedPeriod, toReconciliationTabsType, isAccountReconReport, updateExpenseAutomationReconReviewTabLocalData, updateExpenseAutomationSelectedDrawerAccountId, updateStatementProcessingFailed, saveExpenseAutomationReconciliationReview, updateExpenseAutomationAccountReconciliationLocalData, toReconciliationAccountSource, deleteAccountStatement, deleteCombinedStatement, uploadAccountStatement, parseCombinedStatement, parseStatement, parseStatementSuccess, parseStatementFailure, reparseStatement, reparseStatementSuccess, reparseStatementFailure, resetReparseStatementStatus, updateParsedStatementData, updateNodeCollapseState, updateStatementUploadChosen, submitCombinedStatementUpdate, submitStatementUpdate, clearStatementDateConflict, confirmStatementMapping, updateStatementUpdateLocalData, isReviewTransactionBankTransferType, isReviewTransactionBillPaymentType, isReviewTransactionCreditCardPaymentType, isReviewTransactionDepositType, isReviewTransactionExpenseType, isReviewTransactionCreditCardCreditType, setStatementParseInProgress, setStatementProcessingDismissedToBackground, updateStatementProcessingBackgroundCompletedSteps, };
 export { computeNewScheduleJeDetails, createOneTimeAccrual, createOneTimeAccrualFailure, createOneTimeAccrualSuccess, fetchOneTimeAccrual, getJeNewAccrualAccountsView, ignoreOneTimeAccrual, promoteOneTimeAccrual, revertJeSchedule, revertOneTimeAccrual, getJeNewScheduleSearchTransactionsView, getJeNewScheduleView, };

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

@@ -5,7 +5,7 @@ import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePay
 import { clearAll } from '../../../../rootActions';
 import { toServiceMonthFromPeriod, } from '../../payload/actualMatchingPayload';
 import { fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingSuccess, } from '../../reducers/actualMatchingViewReducer';
-import { getSelectedMonthYearForCurrentTenant } from '../../selectors/actualMatchingViewSelector';
+import { getSelectedMonthYearForCurrentTenant, getTenantDisplayCurrency, } from '../../selectors/actualMatchingViewSelector';
 export const fetchActualMatchingEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchActualMatching.match), switchMap((action) => {
     const state = state$.value;
     const { period, refreshViewInBackground } = action.payload;
@@ -21,7 +21,7 @@ export const fetchActualMatchingEpic = (actions$, state$, zeniAPI) => actions$.p
             const matches = response.data.matches;
             const updateActions = [];
             if (matches.length > 0) {
-                updateActions.push(updateActualMatchingMatches(matches));
+                updateActions.push(updateActualMatchingMatches(matches, getTenantDisplayCurrency(state)));
             }
             updateActions.push(fetchActualMatchingSuccess({
                 matchIds: matches.map((match) => match.match_id),

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

@@ -4,14 +4,15 @@ import { updateActualMatchingMatches } from '../../../../entity/actualMatching/a
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { clearAll } from '../../../../rootActions';
 import { fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, } from '../../reducers/actualMatchingViewReducer';
-export const fetchActualMatchingMatchEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchActualMatchingMatch.match), mergeMap((action) => {
+import { getTenantDisplayCurrency } from '../../selectors/actualMatchingViewSelector';
+export const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchActualMatchingMatch.match), mergeMap((action) => {
     const { matchId, refreshViewInBackground } = action.payload;
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return from([
-                updateActualMatchingMatches([response.data]),
+                updateActualMatchingMatches([response.data], getTenantDisplayCurrency(state$.value)),
                 fetchActualMatchingMatchSuccess({
                     matchId,
                     refreshViewInBackground,

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

@@ -1,25 +1,13 @@
 import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap, takeUntil } from 'rxjs/operators';
-import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { catchError, exhaustMap, filter, mergeMap, takeUntil } from 'rxjs/operators';
+import { createZeniAPIStatus, isSuccessResponse } from '../../../../responsePayload';
 import { clearAll } from '../../../../rootActions';
-import { toMatchAndReverseResult, } from '../../payload/actualMatchingPayload';
-import { clearMatchNewModal, fetchActualMatching, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, } from '../../reducers/actualMatchingViewReducer';
-import { getSelectedMonthYearForCurrentTenant } from '../../selectors/actualMatchingViewSelector';
-function refreshActualMatchingList(state) {
-    const selectedMonthYear = getSelectedMonthYearForCurrentTenant(state);
-    if (selectedMonthYear == null) {
-        return [];
-    }
-    const period = convertToPeriod(selectedMonthYear);
-    const start = toAbsoluteDay(period.start);
-    const end = toAbsoluteDay(period.end);
-    if (start == null || end == null) {
-        return [];
-    }
-    return [fetchActualMatching({ start, end }, true)];
-}
-export const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(matchAndReverseAccruals.match), mergeMap((action) => {
+import { toMatchAndReverseResult } from '../../payload/actualMatchingPayload';
+import { clearMatchNewModal, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess } from '../../reducers/actualMatchingViewReducer';
+import { refreshActualMatchingList } from './refreshActualMatchingList';
+export const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(matchAndReverseAccruals.match), 
+// Posts reversing JEs; drop duplicate clicks while a request is in flight.
+exhaustMap((action) => {
     const { transactionId, transactionIntegrationId, transactionType, lineId, accrualIds, transactionSyncToken, } = action.payload;
     const body = {
         transaction_id: transactionId,
@@ -34,12 +22,21 @@ export const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => action
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             const results = response.data.results.map(toMatchAndReverseResult);
+            const openedFromMatchId = state$.value.expenseAutomationActualMatchingViewState.matchModal
+                .openedFromMatchId;
+            const matchId = openedFromMatchId ??
+                `${transactionType}:${transactionIntegrationId}`;
             const successActions = [
-                matchAndReverseAccrualsSuccess({ results }),
+                matchAndReverseAccrualsSuccess({ matchId, results }),
             ];
-            const anyReversed = results.some((result) => result.status === 'reversed');
-            if (anyReversed) {
-                successActions.push(...refreshActualMatchingList(state$.value), 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(...refreshActualMatchingList(state$.value));
+            }
+            if (allComplete) {
+                successActions.push(clearMatchNewModal());
             }
             return from(successActions);
         }

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

@@ -0,0 +1,16 @@
+import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
+import { fetchActualMatching } from '../../reducers/actualMatchingViewReducer';
+import { getSelectedMonthYearForCurrentTenant } from '../../selectors/actualMatchingViewSelector';
+export function refreshActualMatchingList(state) {
+    const selectedMonthYear = getSelectedMonthYearForCurrentTenant(state);
+    if (selectedMonthYear == null) {
+        return [];
+    }
+    const period = convertToPeriod(selectedMonthYear);
+    const start = toAbsoluteDay(period.start);
+    const end = toAbsoluteDay(period.end);
+    if (start == null || end == null) {
+        return [];
+    }
+    return [fetchActualMatching({ start, end }, true)];
+}

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

@@ -5,15 +5,15 @@ import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePay
 import { clearAll } from '../../../../rootActions';
 import { toActualMatchingTransactionSearchResult, } from '../../payload/actualMatchingPayload';
 import { openMatchNewModal, searchMatchAccruals, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, } from '../../reducers/actualMatchingViewReducer';
-import { parseActualMatchingMatchId } from '../../selectors/actualMatchingViewSelector';
+import { getTenantDisplayCurrency, parseActualMatchingMatchId, } from '../../selectors/actualMatchingViewSelector';
 import { MATCH_SEARCH_DEBOUNCE_MS, MATCH_TRANSACTION_SEARCH_PAGE_SIZE, } from '../../types/actualMatchingViewState';
 export const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
     const openModal$ = actions$.pipe(filter(openMatchNewModal.match), mergeMap((action) => {
         const matchId = action.payload.matchId;
         if (matchId == null || matchId === '') {
             return from([
-                searchMatchTransactions({ query: '' }),
-                searchMatchAccruals({ query: '' }),
+                searchMatchTransactions(''),
+                searchMatchAccruals(''),
             ]);
         }
         const match = getActualMatchingMatchById(state$.value.actualMatchingState, matchId);
@@ -26,11 +26,7 @@ export const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
             ? match.transactionIntegrationId
             : parsed?.transactionIntegrationId;
         return from([
-            searchMatchTransactions({
-                query: '',
-                transactionType,
-                transactionIntegrationId,
-            }),
+            searchMatchTransactions('', undefined, transactionType, transactionIntegrationId),
         ]);
     }));
     const searchActions$ = actions$.pipe(filter(searchMatchTransactions.match));
@@ -55,7 +51,8 @@ export const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const { transactions, next_page_token } = response.data;
                 const append = pageToken != null;
-                const results = transactions.map(toActualMatchingTransactionSearchResult);
+                const fallbackCurrency = getTenantDisplayCurrency(state$.value);
+                const results = transactions.map((transaction) => toActualMatchingTransactionSearchResult(transaction, fallbackCurrency));
                 return of(searchMatchTransactionsSuccess({
                     append,
                     nextPageToken: next_page_token ?? null,

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

@@ -1,33 +1,16 @@
 import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap, takeUntil } from 'rxjs/operators';
-import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
+import { catchError, exhaustMap, filter, mergeMap, takeUntil, } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { clearAll } from '../../../../rootActions';
 import { toUndoReversalResult, } from '../../payload/actualMatchingPayload';
-import { fetchActualMatching, fetchActualMatchingMatch, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, } from '../../reducers/actualMatchingViewReducer';
-import { getSelectedMonthYearForCurrentTenant } from '../../selectors/actualMatchingViewSelector';
-function refreshActualMatchingList(state) {
-    const selectedMonthYear = getSelectedMonthYearForCurrentTenant(state);
-    if (selectedMonthYear == null) {
-        return [];
-    }
-    const period = convertToPeriod(selectedMonthYear);
-    const start = toAbsoluteDay(period.start);
-    const end = toAbsoluteDay(period.end);
-    if (start == null || end == null) {
-        return [];
-    }
-    return [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) => fetchActualMatchingMatch(matchId, true));
-}
-export const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(undoReversalAccruals.match), mergeMap((action) => {
+import { fetchActualMatchingMatch, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, } from '../../reducers/actualMatchingViewReducer';
+import { refreshActualMatchingList } from './refreshActualMatchingList';
+export const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(undoReversalAccruals.match), 
+// Posts QBO deletes; drop duplicate clicks while a request is in flight.
+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)
@@ -35,16 +18,20 @@ export const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.
         if (isSuccessResponse(response) && response.data != null) {
             const results = response.data.results.map(toUndoReversalResult);
             const successActions = [
-                undoReversalAccrualsSuccess({ results }),
+                undoReversalAccrualsSuccess(matchId, results),
             ];
             const anyUndone = results.some((result) => result.status === 'undone');
             if (anyUndone) {
-                successActions.push(...refreshActualMatchingList(state$.value), ...refreshOpenMatchDetails(state$.value));
+                successActions.push(...refreshActualMatchingList(state$.value), fetchActualMatchingMatch(matchId, true));
             }
             return from(successActions);
         }
-        return of(undoReversalAccrualsFailure({ status: response.status }));
+        return of(undoReversalAccrualsFailure({
+            matchId,
+            status: response.status,
+        }));
     }), catchError((error) => of(undoReversalAccrualsFailure({
+        matchId,
         status: createZeniAPIStatus('Unexpected Error', 'Undo reversal accruals REST API call errored out' +
             JSON.stringify(error)),
     }))), takeUntil(actions$.pipe(filter(clearAll.match))));

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,18 +16,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;
 }
-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,
@@ -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: [],
@@ -43,7 +44,9 @@ export const initialState = {
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
     },
     matchModal: initialMatchModalState,
-    undoReversalStatus: { fetchState: 'Not-Started', error: undefined },
+    undoReversalStatusByMatchId: {},
+    lastUndoResultsByMatchId: {},
+    lastMatchResultsByMatchId: {},
     hasValidState() {
         return this.fetchState == 'Completed';
     },
@@ -224,7 +227,7 @@ const expenseAutomationActualMatchingView = createSlice({
                     draft.matchModal.transactionSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken, transactionType, transactionIntegrationId, }) {
+            prepare(query, pageToken, transactionType, transactionIntegrationId) {
                 return {
                     payload: {
                         query,
@@ -243,7 +246,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());
@@ -281,7 +284,7 @@ const expenseAutomationActualMatchingView = createSlice({
                     draft.matchModal.accrualSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken }) {
+            prepare(query, pageToken) {
                 return { payload: { query, pageToken: pageToken ?? undefined } };
             },
         },
@@ -312,8 +315,17 @@ const expenseAutomationActualMatchingView = 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) {
@@ -322,6 +334,10 @@ const expenseAutomationActualMatchingView = 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 = {
@@ -330,29 +346,31 @@ 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: {
-            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,
             };