@zeniai/client-epic-state 5.2.62-beta0KB → 5.2.62-beta0MM

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

@@ -0,0 +1,50 @@
+import { from, of } from 'rxjs';
+import { catchError, exhaustMap, filter, groupBy, mergeMap, takeUntil, } from 'rxjs/operators';
+import { removeActualMatchingMatch } from '../../../../../entity/actualMatching/actualMatchingReducer';
+import { getActualMatchingMatchById } from '../../../../../entity/actualMatching/actualMatchingSelector';
+import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
+import { createZeniAPIStatus, isSuccessResponse } from '../../../../../responsePayload';
+import { clearAll } from '../../../../../rootActions';
+import { ignoreActualMatchingSuggestion, ignoreActualMatchingSuggestionFailure, ignoreActualMatchingSuggestionSuccess, } from '../../../reducers/actualMatchingViewReducer';
+import { refreshActualMatchingList } from './refreshActualMatchingList';
+function matchVendorName(state, matchId) {
+    return (getActualMatchingMatchById(state.actualMatchingState, matchId)?.vendorName ??
+        '');
+}
+function ignoreSuggestionSnackbar(vendorName, succeeded) {
+    return openSnackbar({
+        messageSection: 'actual_matching_ignore_suggestion',
+        messageText: succeeded ? 'success' : 'failed',
+        type: succeeded ? 'success' : 'error',
+        variables: [{ variableName: '_vendor_name_', variableValue: vendorName }],
+    });
+}
+export const ignoreActualMatchingSuggestionEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(ignoreActualMatchingSuggestion.match), groupBy((action) => action.payload.matchId), mergeMap((perMatch$) => perMatch$.pipe(exhaustMap((action) => {
+    const { matchId, reason, note } = action.payload;
+    const body = {
+        reason,
+        ...(note != null && note !== '' ? { note } : {}),
+    };
+    const vendorName = matchVendorName(state$.value, matchId);
+    return zeniAPI
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}/ignore`, body)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const successActions = [
+                removeActualMatchingMatch(matchId),
+                ignoreActualMatchingSuggestionSuccess({ matchId }),
+                ...refreshActualMatchingList(state$.value),
+                ignoreSuggestionSnackbar(vendorName, true),
+            ];
+            return from(successActions);
+        }
+        return of(ignoreActualMatchingSuggestionFailure({
+            matchId,
+            status: response.status,
+        }), ignoreSuggestionSnackbar(vendorName, false));
+    }), catchError((error) => of(ignoreActualMatchingSuggestionFailure({
+        matchId,
+        status: createZeniAPIStatus('Unexpected Error', 'Ignore actual matching suggestion REST API call errored out' +
+            JSON.stringify(error)),
+    }), ignoreSuggestionSnackbar(vendorName, false))), takeUntil(actions$.pipe(filter(clearAll.match))));
+}))));

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

@@ -87,8 +87,8 @@ exhaustMap((action) => {
                 results.every((result) => isMatchAndReverseCompleteStatus(result.status));
             if (occupancyChanged) {
                 // List + detail: list can omit leftovers; detail GET always
-                // writes intended occupancy so Continue match prefills the
-                // remaining leftover set instead of a stale cached row.
+                // writes intended occupancy so leftover retry can join C
+                // onto the occupied bill instead of a stale cached row.
                 successActions.push(...refreshActualMatchingList(state$.value), fetchActualMatchingMatch(matchId, true));
             }
             const snackbar = matchAndReverseSnackbar(results, vendorName);
@@ -100,8 +100,12 @@ exhaustMap((action) => {
             }
             return from(successActions);
         }
-        return of(matchAndReverseAccrualsFailure({ status: response.status }), matchAndReverseHttpFailSnackbar(vendorName));
+        return of(matchAndReverseAccrualsFailure({
+            status: response.status,
+            matchId,
+        }), matchAndReverseHttpFailSnackbar(vendorName));
     }), catchError((error) => of(matchAndReverseAccrualsFailure({
+        matchId,
         status: createZeniAPIStatus('Unexpected Error', 'Match and reverse accruals REST API call errored out' +
             JSON.stringify(error)),
     }), matchAndReverseHttpFailSnackbar(vendorName))), takeUntil(actions$.pipe(filter(clearAll.match))));

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

@@ -1,34 +1,13 @@
 import { from, merge, of } from 'rxjs';
 import { catchError, debounceTime, filter, mergeMap, switchMap, takeUntil, } from 'rxjs/operators';
-import { getActualMatchingMatchById } from '../../../../../entity/actualMatching/actualMatchingSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { clearAll } from '../../../../../rootActions';
 import { toActualMatchingTransactionSearchResult, } from '../../../payload/actualMatchingPayload';
 import { openMatchNewModal, searchMatchAccruals, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, } from '../../../reducers/actualMatchingViewReducer';
-import { getTenantDisplayCurrency, parseActualMatchingMatchId, } from '../../../selectors/actualMatchingViewSelector';
+import { getTenantDisplayCurrency } 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(''),
-                searchMatchAccruals(''),
-            ]);
-        }
-        const match = getActualMatchingMatchById(state$.value.actualMatchingState, matchId);
-        const parsed = parseActualMatchingMatchId(matchId);
-        const transactionType = match?.transactionType != null && match.transactionType !== ''
-            ? match.transactionType
-            : parsed?.transactionType;
-        const transactionIntegrationId = match?.transactionIntegrationId != null &&
-            match.transactionIntegrationId !== ''
-            ? match.transactionIntegrationId
-            : parsed?.transactionIntegrationId;
-        return from([
-            searchMatchTransactions('', undefined, transactionType, transactionIntegrationId),
-        ]);
-    }));
+    const openModal$ = actions$.pipe(filter(openMatchNewModal.match), mergeMap(() => from([searchMatchTransactions(''), searchMatchAccruals('')])));
     const searchActions$ = actions$.pipe(filter(searchMatchTransactions.match));
     const pagination$ = searchActions$.pipe(filter((action) => action.payload.pageToken != null));
     const newSearchDebounced$ = searchActions$.pipe(filter((action) => action.payload.pageToken == null), debounceTime(MATCH_SEARCH_DEBOUNCE_MS));

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

@@ -22,9 +22,6 @@ export const initialAccrualSearchState = {
 };
 export const initialMatchModalState = {
     isOpen: false,
-    openedFromMatchId: undefined,
-    didPinPrefillTransactions: false,
-    pinnedTransactionResults: [],
     transactionSearch: initialTransactionSearchState,
     accrualSearch: initialAccrualSearchState,
     confirmStatus: { fetchState: 'Not-Started', error: undefined },
@@ -44,10 +41,14 @@ export const initialState = {
         sortOrder: 'descending',
         searchString: '',
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
+        statusFilter: 'all',
     },
     matchModal: initialMatchModalState,
     undoReversalStatusByMatchId: {},
-    closeMatchAfterUndo: false,
+    ignoreStatusByMatchId: {},
+    confirmStatusByMatchId: {},
+    closeMatchAfterUndoMatchId: undefined,
+    closeMatchAfterIgnoreMatchId: undefined,
     lastMatchResultsByMatchId: {},
     lastUndoResultsByMatchId: {},
     hasValidState() {
@@ -96,9 +97,6 @@ function resetMatchModalSearches(draft) {
         error: undefined,
     };
     draft.matchModal.lastBatchResults = undefined;
-    draft.matchModal.openedFromMatchId = undefined;
-    draft.matchModal.didPinPrefillTransactions = false;
-    draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = createSlice({
     name: 'expenseAutomationActualMatchingView',
@@ -239,21 +237,13 @@ const expenseAutomationActualMatchingView = createSlice({
             if (action.payload.scrollPosition != null) {
                 draft.uiState.scrollPosition = action.payload.scrollPosition;
             }
+            if (action.payload.statusFilter != null) {
+                draft.uiState.statusFilter = action.payload.statusFilter;
+            }
         },
-        openMatchNewModal: {
-            prepare(matchId) {
-                return { payload: { matchId } };
-            },
-            reducer(draft, action) {
-                resetMatchModalSearches(draft);
-                draft.matchModal.isOpen = true;
-                const matchId = action.payload.matchId;
-                draft.matchModal.openedFromMatchId =
-                    matchId != null && matchId !== '' ? matchId : undefined;
-                if (draft.matchModal.openedFromMatchId != null) {
-                    draft.matchModal.accrualSearch.fetchState = 'Completed';
-                }
-            },
+        openMatchNewModal(draft) {
+            resetMatchModalSearches(draft);
+            draft.matchModal.isOpen = true;
         },
         // Dismiss (Cancel / overlay). Store reset matches `clearMatchNewModal`;
         // the actions stay distinct so confirm-success vs user-dismiss stay observable.
@@ -308,11 +298,6 @@ const expenseAutomationActualMatchingView = createSlice({
             }
             else {
                 draft.matchModal.transactionSearch.results = results;
-                if (draft.matchModal.openedFromMatchId != null &&
-                    !draft.matchModal.didPinPrefillTransactions) {
-                    draft.matchModal.didPinPrefillTransactions = true;
-                    draft.matchModal.pinnedTransactionResults = results;
-                }
             }
             draft.matchModal.transactionSearch.nextPageToken = nextPageToken;
             draft.matchModal.transactionSearch.isLoadingMore = false;
@@ -365,21 +350,24 @@ const expenseAutomationActualMatchingView = createSlice({
             draft.matchModal.accrualSearch.error = action.payload.error;
         },
         matchAndReverseAccruals: {
-            reducer(draft) {
-                draft.matchModal.confirmStatus = {
+            reducer(draft, action) {
+                const inProgress = {
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
+                draft.matchModal.confirmStatus = inProgress;
+                const matchId = `${action.payload.transactionType.toLowerCase()}:${action.payload.transactionIntegrationId}`;
+                draft.confirmStatusByMatchId[matchId] = inProgress;
             },
             prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
                 return {
                     payload: {
+                        accrualIds,
+                        lineIds,
                         transactionId,
                         transactionIntegrationId,
-                        transactionType,
-                        lineIds,
                         transactionSyncToken,
-                        accrualIds,
+                        transactionType,
                     },
                 };
             },
@@ -396,15 +384,21 @@ const expenseAutomationActualMatchingView = createSlice({
                 };
             draft.matchModal.lastBatchResults = results;
             if (action.payload.matchId != null) {
+                draft.confirmStatusByMatchId[action.payload.matchId] =
+                    draft.matchModal.confirmStatus;
                 draft.lastMatchResultsByMatchId[action.payload.matchId] = results;
                 pruneLastUndoResultsForMatched(draft, action.payload.matchId, action.payload.results);
             }
         },
         matchAndReverseAccrualsFailure(draft, action) {
-            draft.matchModal.confirmStatus = {
+            const failed = {
                 fetchState: 'Error',
                 error: action.payload.status,
             };
+            draft.matchModal.confirmStatus = failed;
+            if (action.payload.matchId != null) {
+                draft.confirmStatusByMatchId[action.payload.matchId] = failed;
+            }
         },
         undoReversalAccruals: {
             reducer(draft, action) {
@@ -426,7 +420,7 @@ const expenseAutomationActualMatchingView = createSlice({
                 };
                 const allUndone = results.length > 0 &&
                     results.every((result) => result.status === 'undone');
-                draft.closeMatchAfterUndo = allUndone;
+                draft.closeMatchAfterUndoMatchId = allUndone ? matchId : undefined;
                 pruneLastMatchResultsForUndone(draft, matchId, results);
                 if (allUndone) {
                     delete draft.lastUndoResultsByMatchId[matchId];
@@ -440,7 +434,44 @@ const expenseAutomationActualMatchingView = createSlice({
             },
         },
         ackCloseMatchAfterUndo(draft) {
-            draft.closeMatchAfterUndo = false;
+            draft.closeMatchAfterUndoMatchId = undefined;
+        },
+        ignoreActualMatchingSuggestion: {
+            prepare(matchId, reason, note) {
+                return { payload: { matchId, reason, note } };
+            },
+            reducer(draft, action) {
+                draft.ignoreStatusByMatchId[action.payload.matchId] = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+        },
+        ignoreActualMatchingSuggestionSuccess(draft, action) {
+            const { matchId } = action.payload;
+            draft.ignoreStatusByMatchId[matchId] = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            draft.closeMatchAfterIgnoreMatchId = matchId;
+            delete draft.lastMatchResultsByMatchId[matchId];
+            delete draft.lastUndoResultsByMatchId[matchId];
+            delete draft.detailFetchStateByMatchId[matchId];
+            delete draft.detailRefreshStatusByMatchId[matchId];
+            delete draft.undoReversalStatusByMatchId[matchId];
+            delete draft.confirmStatusByMatchId[matchId];
+            Object.keys(draft.matchIdsByPeriod).forEach((periodId) => {
+                draft.matchIdsByPeriod[periodId] = draft.matchIdsByPeriod[periodId].filter((id) => id !== matchId);
+            });
+        },
+        ignoreActualMatchingSuggestionFailure(draft, action) {
+            draft.ignoreStatusByMatchId[action.payload.matchId] = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
+        ackCloseMatchAfterIgnore(draft) {
+            draft.closeMatchAfterIgnoreMatchId = undefined;
         },
         undoReversalAccrualsFailure(draft, action) {
             draft.undoReversalStatusByMatchId[action.payload.matchId] = {
@@ -458,5 +489,5 @@ const expenseAutomationActualMatchingView = createSlice({
         });
     },
 });
-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 const { ackCloseMatchAfterIgnore, ackCloseMatchAfterUndo, clearActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, fetchActualMatchingPage, fetchActualMatchingSuccess, ignoreActualMatchingSuggestion, ignoreActualMatchingSuggestionFailure, ignoreActualMatchingSuggestionSuccess, 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/selectors/actualMatchingViewSelector.js

@@ -1,11 +1,11 @@
 import orderBy from 'lodash/orderBy';
+import { createSelector } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { getActualMatchingMatchById } from '../../../entity/actualMatching/actualMatchingSelector';
 import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
 import { getJEOneTimeAccrualByKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { date } from '../../../zeniDayJS';
-import { actualMatchingTransactionLineKey, } from '../types/actualMatchingViewState';
 export function getSelectedMonthYearForCurrentTenant(state) {
     const tenantId = getCurrentTenant(state)?.tenantId;
     if (tenantId == null) {
@@ -34,27 +34,6 @@ function toMatchModalAccrual(member) {
         jeOneTimeAccrualKey: generateJEOneTimeAccrualKey(member.accrualId),
     };
 }
-function uniqueMatchModalAccruals(pinned, searched) {
-    const byId = new Map();
-    pinned.forEach((row) => byId.set(row.accrualId, row));
-    searched.forEach((row) => {
-        if (!byId.has(row.accrualId)) {
-            byId.set(row.accrualId, row);
-        }
-    });
-    return Array.from(byId.values());
-}
-function uniqueTransactionSearchResults(pinned, searched) {
-    const byKey = new Map();
-    pinned.forEach((row) => byKey.set(actualMatchingTransactionLineKey(row.transactionType, row.transactionIntegrationId, row.lineId), row));
-    searched.forEach((row) => {
-        const key = actualMatchingTransactionLineKey(row.transactionType, row.transactionIntegrationId, row.lineId);
-        if (!byKey.has(key)) {
-            byKey.set(key, row);
-        }
-    });
-    return Array.from(byKey.values());
-}
 export function parseActualMatchingMatchId(matchId) {
     const separator = matchId.indexOf(':');
     if (separator <= 0 || separator === matchId.length - 1) {
@@ -227,6 +206,7 @@ function emptyKpiSummary() {
         actualsReceived: { count: 0, expectedCount: 0, vendorsPending: 0 },
         autoReversed: { count: 0, percent: 0, clearedAmount: 0 },
         pendingReview: { count: 0, amount: 0, estimatedMinutesToClear: 0 },
+        reversed: { count: 0 },
         variance: { percent: 0, averagePercentPerMatch: 0, netAmount: 0 },
     };
 }
@@ -282,6 +262,7 @@ export function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
     }
     const autoReversed = kpiRows.filter((row) => row.kind === 'auto_reversed');
     const pendingReview = kpiRows.filter((row) => row.kind === 'pending_review');
+    const reversed = kpiRows.filter((row) => isReversedMatchKind(row.kind));
     const receivedCount = kpiRows.length;
     const rowsWithActual = kpiRows.filter((row) => row.actualAmount?.amount != null);
     const accruedTotal = rowsWithActual.reduce((sum, row) => sum + (row.accruedAmount?.amount ?? row.estimatedAmount.amount), 0);
@@ -307,6 +288,9 @@ export function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
             amount: sumRowAmounts(pendingReview, displayCurrencyCode),
             estimatedMinutesToClear: pendingReview.length * ESTIMATED_MINUTES_PER_PENDING_MATCH,
         },
+        reversed: {
+            count: reversed.length,
+        },
         variance: {
             percent: accruedTotal === 0
                 ? 0
@@ -319,23 +303,55 @@ export function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
         },
     };
 }
-export function getExpenseAutomationActualMatchingMatchView(state, matchId) {
-    const view = state.expenseAutomationActualMatchingViewState;
+function toActualMatchingMatchView(match) {
     return {
-        match: getActualMatchingMatchById(state.actualMatchingState, matchId),
-        detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
-        refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
-        undoReversalStatus: view.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
-        lastMatchResults: view.lastMatchResultsByMatchId?.[matchId],
-        lastUndoResults: view.lastUndoResultsByMatchId?.[matchId],
+        ...match,
+        members: match.members.map(toMatchModalAccrual),
+        leftovers: match.leftovers == null
+            ? undefined
+            : match.leftovers.map(toMatchModalAccrual),
     };
 }
+const EMPTY_ACTUAL_MATCHING_ROWS = [];
+const matchViewSelectorById = new Map();
+export function getExpenseAutomationActualMatchingMatchView(state, matchId) {
+    let selector = matchViewSelectorById.get(matchId);
+    if (selector == null) {
+        selector = createSelector([
+            (root) => root.expenseAutomationActualMatchingViewState,
+            (root) => getActualMatchingMatchById(root.actualMatchingState, matchId),
+        ], (view, match) => ({
+            detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
+            ignoreStatus: view.ignoreStatusByMatchId[matchId] ?? NOT_STARTED,
+            lastMatchResults: view.lastMatchResultsByMatchId?.[matchId],
+            lastUndoResults: view.lastUndoResultsByMatchId?.[matchId],
+            match: match == null ? undefined : toActualMatchingMatchView(match),
+            refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
+            undoReversalStatus: view.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
+        }));
+        matchViewSelectorById.set(matchId, selector);
+    }
+    return selector(state);
+}
 export function getCloseMatchAfterUndo(state) {
-    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndo;
+    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndoMatchId;
+}
+export function getCloseMatchAfterUndoMatchId(state) {
+    return getCloseMatchAfterUndo(state);
+}
+export function getCloseMatchAfterIgnoreMatchId(state) {
+    return state.expenseAutomationActualMatchingViewState
+        .closeMatchAfterIgnoreMatchId;
+}
+export function getActualMatchingMatchModalConfirmStatus(state, matchId) {
+    if (matchId != null && matchId !== '') {
+        return (state.expenseAutomationActualMatchingViewState.confirmStatusByMatchId[matchId] ?? NOT_STARTED);
+    }
+    return state.expenseAutomationActualMatchingViewState.matchModal.confirmStatus;
 }
 export function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
-    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
+    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, ignoreStatusByMatchId, undoReversalStatusByMatchId, } = expenseAutomationActualMatchingViewState;
     const selectedPeriod = getSelectedMonthYearForCurrentTenant(state);
     const monthYearPeriodId = selectedPeriod != null ? toMonthYearPeriodId(selectedPeriod) : undefined;
     const matchIds = monthYearPeriodId != null ? matchIdsByPeriod[monthYearPeriodId] : undefined;
@@ -345,38 +361,18 @@ export function getExpenseAutomationActualMatchingView(state) {
         .filter((match) => match.members.length > 0)
         .map(toActualMatchingRow);
     const rows = allRows.filter((row) => matchesSearch(row, uiState.searchString));
-    const reversed = sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState);
-    const pendingReview = sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState);
+    const includePendingReview = uiState.statusFilter !== 'reversed';
+    const includeReversed = uiState.statusFilter !== 'pending_review';
+    const reversed = includeReversed
+        ? sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState)
+        : EMPTY_ACTUAL_MATCHING_ROWS;
+    const pendingReview = includePendingReview
+        ? sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState)
+        : EMPTY_ACTUAL_MATCHING_ROWS;
     const kpiSummary = buildActualMatchingKpiSummary(allRows, getTenantDisplayCurrency(state)?.currencyCode);
     const searchedAccruals = matchModal.accrualSearch.results
         .map((key) => getJEOneTimeAccrualByKey(key, state.jeSchedulesState))
         .filter((accrual) => accrual != null);
-    const openedMatch = matchModal.openedFromMatchId != null
-        ? getActualMatchingMatchById(state.actualMatchingState, matchModal.openedFromMatchId)
-        : undefined;
-    const pinnedAccruals = [
-        ...(openedMatch?.members ?? []),
-        ...(openedMatch?.leftovers ?? []),
-    ].map(toMatchModalAccrual);
-    const firstMember = openedMatch?.members[0];
-    const cleared = firstMember?.cleared;
-    const suggestion = firstMember?.matchSuggestion;
-    const stamp = cleared ?? suggestion;
-    const consumedLineIds = cleared?.consumedLineIds;
-    const prefill = openedMatch == null
-        ? undefined
-        : {
-            selectedAccrualIds: [
-                ...openedMatch.members.map((member) => member.accrualId),
-                ...(openedMatch.leftovers ?? []).map((leftover) => leftover.accrualId),
-            ],
-            actualAmount: openedMatch.actualAmount.amount,
-            matchedTransactionId: stamp?.matchedTransactionId,
-            matchedLineId: cleared == null ? suggestion?.matchedLineId : undefined,
-            ...(consumedLineIds != null && consumedLineIds.length > 0
-                ? { consumedLineIds }
-                : {}),
-        };
     // `fetchState` is a flat slice field that survives a period switch. Until this
     // month's ids land, leftover Completed/Error is the previous month. Report
     // Not-Started so chrome matches Review's "cache slot missing" skeleton, not
@@ -394,16 +390,16 @@ export function getExpenseAutomationActualMatchingView(state) {
         kpiSummary,
         uiState,
         refreshStatus,
+        ignoreStatusByMatchId,
+        undoReversalStatusByMatchId,
         hasLoadedForSelectedPeriod: matchIds != null,
         matchModal: {
             isOpen: matchModal.isOpen,
-            openedFromMatchId: matchModal.openedFromMatchId,
-            prefill,
             confirmStatus: matchModal.confirmStatus,
             lastBatchResults: matchModal.lastBatchResults,
             transactionSearch: {
                 query: matchModal.transactionSearch.query,
-                results: uniqueTransactionSearchResults(matchModal.pinnedTransactionResults, matchModal.transactionSearch.results),
+                results: matchModal.transactionSearch.results,
                 fetchState: {
                     fetchState: matchModal.transactionSearch.fetchState,
                     error: matchModal.transactionSearch.error,
@@ -413,7 +409,7 @@ export function getExpenseAutomationActualMatchingView(state) {
             },
             accrualSearch: {
                 query: matchModal.accrualSearch.query,
-                results: uniqueMatchModalAccruals(pinnedAccruals, searchedAccruals),
+                results: searchedAccruals,
                 fetchState: {
                     fetchState: matchModal.accrualSearch.fetchState,
                     error: matchModal.accrualSearch.error,

package/lib/esm/view/expenseAutomationView/types/actualMatchingViewState.js

@@ -13,6 +13,12 @@ const ACTUAL_MATCHING_SORT_KEYS = [
     'variance',
 ];
 export const toActualMatchingSortKey = (v) => stringToUnion(v, ACTUAL_MATCHING_SORT_KEYS);
+const ACTUAL_MATCHING_STATUS_FILTERS = [
+    'all',
+    'pending_review',
+    'reversed',
+];
+export const toActualMatchingStatusFilter = (v) => stringToUnion(v, ACTUAL_MATCHING_STATUS_FILTERS);
 export const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 export const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 export const MATCH_SEARCH_DEBOUNCE_MS = 300;
@@ -33,6 +39,15 @@ const UNDO_REVERSAL_RESULT_STATUSES = [
     'error',
 ];
 export const toUndoReversalResultStatus = (v) => stringToUnion(v, UNDO_REVERSAL_RESULT_STATUSES);
+const ACTUAL_MATCHING_IGNORE_REASONS = [
+    'wrong_bill',
+    'wrong_period',
+    'amount_off',
+    'already_handled',
+    'other_ignore',
+];
+export const toActualMatchingIgnoreReasonType = (v) => stringToUnion(v, ACTUAL_MATCHING_IGNORE_REASONS);
+export const ALL_ACTUAL_MATCHING_IGNORE_REASONS = ACTUAL_MATCHING_IGNORE_REASONS;
 export function actualMatchingTransactionLineKey(transactionType, transactionIntegrationId, lineId) {
     return `${transactionType}:${transactionIntegrationId}:${lineId}`;
 }

package/lib/esm/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -625,7 +625,7 @@ export const getDueDate = (billStageCode, dueDate, invoiceDate, bookCloseDate) =
     }
 };
 export const getWithdrawFrom = (state, fromAccountId, fromAccountType, companyId, lastSelectedFromAccount) => {
-    const { paymentAccountState, depositAccountState, paymentAccountListState } = state;
+    const { paymentAccountState, depositAccountState, depositAccountListState, paymentAccountListState, } = state;
     if (fromAccountId != null) {
         const withdrawFromAsDepositAcc = getDepositAccountByDepositAccountId(depositAccountState, fromAccountId);
         const withdrawFromAsPaymentAcc = getPaymentAccountByPaymentAccountId(paymentAccountState, fromAccountId);
@@ -639,15 +639,41 @@ export const getWithdrawFrom = (state, fromAccountId, fromAccountType, companyId
         }
     }
     else {
-        return getDefaultWithdrawFromAccount(state, companyId ?? '', lastSelectedFromAccount);
+        return getDefaultWithdrawFromAccount(state, depositAccountListState.accountIds, companyId ?? '', lastSelectedFromAccount);
     }
     return undefined;
 };
-export const getDefaultWithdrawFromAccount = (state, companyId, lastSelectedFromAccount) => {
+export const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSelectedFromAccount) => {
     const { depositAccountState, paymentAccountState, paymentAccountListState } = state;
     const companyView = getCompanyView(state, companyId, []);
     const primaryAccount = companyView?.company.company.companyBillPayInfo.primaryFundingAccount;
-    const defaultAccount = primaryAccount ?? lastSelectedFromAccount;
+    let defaultAccount = undefined;
+    // User paying bill for first time or previously paid with external account
+    if (lastSelectedFromAccount == null ||
+        lastSelectedFromAccount?.accountType === 'paymentAccount') {
+        if (depositAccounts.length === 0) {
+            defaultAccount = primaryAccount;
+        }
+        else {
+            if (primaryAccount?.accountType === 'depositAccount') {
+                defaultAccount = primaryAccount;
+            }
+        }
+    }
+    else {
+        // User paid with Zeni account previously
+        if (depositAccounts.length === 1) {
+            defaultAccount = lastSelectedFromAccount;
+        }
+        else {
+            if (primaryAccount?.accountType === 'depositAccount') {
+                defaultAccount = primaryAccount;
+            }
+            else {
+                defaultAccount = lastSelectedFromAccount;
+            }
+        }
+    }
     if (defaultAccount != null) {
         const defaultAccAsDepositAcc = getDepositAccountByDepositAccountId(depositAccountState, defaultAccount?.accountId);
         const defaultAccAsPaymentAcc = getPaymentAccountByPaymentAccountId(paymentAccountState, defaultAccount?.accountId);