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

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

@@ -1,6 +1,6 @@
 import { from } from 'rxjs';
 import { catchError, filter, mergeMap, takeUntil } from 'rxjs/operators';
-import { updateActualMatchingMatches } from '../../../../../entity/actualMatching/actualMatchingReducer';
+import { removeActualMatchingMatch, updateActualMatchingMatches, } from '../../../../../entity/actualMatching/actualMatchingReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { clearAll } from '../../../../../rootActions';
 import { fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, } from '../../../reducers/actualMatchingViewReducer';
@@ -32,5 +32,7 @@ export const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actio
             refreshViewInBackground,
             status: createZeniAPIStatus('Unexpected Error', `Fetch actual matching match REST API call errored out ${JSON.stringify(error)}`),
         }),
-    ])), takeUntil(actions$.pipe(filter(clearAll.match))));
+    ])), takeUntil(actions$.pipe(filter((action) => clearAll.match(action) ||
+        (removeActualMatchingMatch.match(action) &&
+            action.payload.matchId === matchId)))));
 }));

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

@@ -1,15 +1,15 @@
 import { from, of } from 'rxjs';
-import { catchError, exhaustMap, filter, mergeMap, takeUntil } from 'rxjs/operators';
+import { catchError, exhaustMap, filter, groupBy, mergeMap, takeUntil, } from 'rxjs/operators';
 import { getActualMatchingMatchById } from '../../../../../entity/actualMatching/actualMatchingSelector';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-import { createZeniAPIStatus, isSuccessResponse } from '../../../../../responsePayload';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { clearAll } from '../../../../../rootActions';
 import { toMatchAndReverseResult, } from '../../../payload/actualMatchingPayload';
 import { clearMatchNewModal, fetchActualMatchingMatch, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, } from '../../../reducers/actualMatchingViewReducer';
 import { isMatchAndReverseCompleteStatus, } from '../../../types/actualMatchingViewState';
 import { refreshActualMatchingList } from './refreshActualMatchingList';
 function isMatchFailedStatus(status) {
-    return (status === 'conflict' || status === 'claim_lost' || status === 'error');
+    return status === 'conflict' || status === 'claim_lost' || status === 'error';
 }
 function matchAndReverseSnackbar(results, vendorName) {
     const reversedCount = results.filter((result) => result.status === 'reversed').length;
@@ -56,12 +56,15 @@ function matchAndReverseHttpFailSnackbar(vendorName) {
     });
 }
 function matchVendorName(state, matchId) {
-    return getActualMatchingMatchById(state.actualMatchingState, matchId)?.vendorName ?? '';
+    return (getActualMatchingMatchById(state.actualMatchingState, matchId)
+        ?.vendorName ?? '');
 }
 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, lineIds, accrualIds, transactionSyncToken, } = action.payload;
+// Per-match exhaust: a second click on the same match drops while HTTP is in
+// flight. A different match must still run — a global exhaustMap left the
+// other match's reducer In-Progress with no request.
+groupBy((action) => `${action.payload.transactionType.toLowerCase()}:${action.payload.transactionIntegrationId}`), mergeMap((perMatch$) => perMatch$.pipe(exhaustMap((action) => {
+    const { transactionId, transactionIntegrationId, transactionType, lineIds, accrualIds, transactionSyncToken, forMatchModal, } = action.payload;
     const body = {
         transaction_id: transactionId,
         transaction_integration_id: transactionIntegrationId,
@@ -80,7 +83,11 @@ exhaustMap((action) => {
         if (isSuccessResponse(response) && response.data != null) {
             const results = response.data.results.map(toMatchAndReverseResult);
             const successActions = [
-                matchAndReverseAccrualsSuccess({ matchId, results }),
+                matchAndReverseAccrualsSuccess({
+                    matchId,
+                    results,
+                    ...(forMatchModal === true ? { forMatchModal: true } : {}),
+                }),
             ];
             const occupancyChanged = results.some((result) => isMatchAndReverseCompleteStatus(result.status));
             const allComplete = results.length > 0 &&
@@ -95,7 +102,7 @@ exhaustMap((action) => {
             if (snackbar != null) {
                 successActions.push(snackbar);
             }
-            if (allComplete) {
+            if (allComplete && forMatchModal === true) {
                 successActions.push(clearMatchNewModal());
             }
             return from(successActions);
@@ -103,10 +110,12 @@ exhaustMap((action) => {
         return of(matchAndReverseAccrualsFailure({
             status: response.status,
             matchId,
+            ...(forMatchModal === true ? { forMatchModal: true } : {}),
         }), matchAndReverseHttpFailSnackbar(vendorName));
     }), catchError((error) => of(matchAndReverseAccrualsFailure({
         matchId,
+        ...(forMatchModal === true ? { forMatchModal: true } : {}),
         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/reducers/actualMatchingViewReducer.js

@@ -47,14 +47,22 @@ export const initialState = {
     undoReversalStatusByMatchId: {},
     ignoreStatusByMatchId: {},
     confirmStatusByMatchId: {},
-    closeMatchAfterUndoMatchId: undefined,
-    closeMatchAfterIgnoreMatchId: undefined,
+    closeMatchAfterUndoMatchIds: [],
+    closeMatchAfterIgnoreMatchIds: [],
     lastMatchResultsByMatchId: {},
     lastUndoResultsByMatchId: {},
     hasValidState() {
         return this.fetchState == 'Completed';
     },
 };
+function enqueueCloseMatchId(ids, matchId) {
+    if (!ids.includes(matchId)) {
+        ids.push(matchId);
+    }
+}
+function dropCloseMatchId(ids, matchId) {
+    return ids.filter((id) => id !== matchId);
+}
 function pruneLastMatchResultsForUndone(draft, matchId, results) {
     const undoneIds = new Set(results
         .filter((result) => result.status === 'undone')
@@ -355,11 +363,13 @@ const expenseAutomationActualMatchingView = createSlice({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
-                draft.matchModal.confirmStatus = inProgress;
+                if (action.payload.forMatchModal === true) {
+                    draft.matchModal.confirmStatus = inProgress;
+                }
                 const matchId = `${action.payload.transactionType.toLowerCase()}:${action.payload.transactionIntegrationId}`;
                 draft.confirmStatusByMatchId[matchId] = inProgress;
             },
-            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
+            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds, forMatchModal) {
                 return {
                     payload: {
                         accrualIds,
@@ -368,6 +378,7 @@ const expenseAutomationActualMatchingView = createSlice({
                         transactionIntegrationId,
                         transactionSyncToken,
                         transactionType,
+                        forMatchModal,
                     },
                 };
             },
@@ -376,16 +387,18 @@ const expenseAutomationActualMatchingView = createSlice({
             const { results } = action.payload;
             const allComplete = results.length > 0 &&
                 results.every((result) => isMatchAndReverseCompleteStatus(result.status));
-            draft.matchModal.confirmStatus = allComplete
+            const confirmStatus = allComplete
                 ? { fetchState: 'Completed', error: undefined }
                 : {
                     fetchState: 'Error',
                     error: createZeniAPIStatus('Partial match-and-reverse', 'Some accruals were not reversed'),
                 };
-            draft.matchModal.lastBatchResults = results;
+            if (action.payload.forMatchModal === true) {
+                draft.matchModal.confirmStatus = confirmStatus;
+                draft.matchModal.lastBatchResults = results;
+            }
             if (action.payload.matchId != null) {
-                draft.confirmStatusByMatchId[action.payload.matchId] =
-                    draft.matchModal.confirmStatus;
+                draft.confirmStatusByMatchId[action.payload.matchId] = confirmStatus;
                 draft.lastMatchResultsByMatchId[action.payload.matchId] = results;
                 pruneLastUndoResultsForMatched(draft, action.payload.matchId, action.payload.results);
             }
@@ -395,7 +408,9 @@ const expenseAutomationActualMatchingView = createSlice({
                 fetchState: 'Error',
                 error: action.payload.status,
             };
-            draft.matchModal.confirmStatus = failed;
+            if (action.payload.forMatchModal === true) {
+                draft.matchModal.confirmStatus = failed;
+            }
             if (action.payload.matchId != null) {
                 draft.confirmStatusByMatchId[action.payload.matchId] = failed;
             }
@@ -420,7 +435,12 @@ const expenseAutomationActualMatchingView = createSlice({
                 };
                 const allUndone = results.length > 0 &&
                     results.every((result) => result.status === 'undone');
-                draft.closeMatchAfterUndoMatchId = allUndone ? matchId : undefined;
+                if (allUndone) {
+                    enqueueCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                }
+                else {
+                    draft.closeMatchAfterUndoMatchIds = dropCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                }
                 pruneLastMatchResultsForUndone(draft, matchId, results);
                 if (allUndone) {
                     delete draft.lastUndoResultsByMatchId[matchId];
@@ -434,7 +454,7 @@ const expenseAutomationActualMatchingView = createSlice({
             },
         },
         ackCloseMatchAfterUndo(draft) {
-            draft.closeMatchAfterUndoMatchId = undefined;
+            draft.closeMatchAfterUndoMatchIds.shift();
         },
         ignoreActualMatchingSuggestion: {
             prepare(matchId, reason, note) {
@@ -453,7 +473,7 @@ const expenseAutomationActualMatchingView = createSlice({
                 fetchState: 'Completed',
                 error: undefined,
             };
-            draft.closeMatchAfterIgnoreMatchId = matchId;
+            enqueueCloseMatchId(draft.closeMatchAfterIgnoreMatchIds, matchId);
             delete draft.lastMatchResultsByMatchId[matchId];
             delete draft.lastUndoResultsByMatchId[matchId];
             delete draft.detailFetchStateByMatchId[matchId];
@@ -471,7 +491,7 @@ const expenseAutomationActualMatchingView = createSlice({
             };
         },
         ackCloseMatchAfterIgnore(draft) {
-            draft.closeMatchAfterIgnoreMatchId = undefined;
+            draft.closeMatchAfterIgnoreMatchIds.shift();
         },
         undoReversalAccrualsFailure(draft, action) {
             draft.undoReversalStatusByMatchId[action.payload.matchId] = {

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

@@ -334,14 +334,15 @@ export function getExpenseAutomationActualMatchingMatchView(state, matchId) {
     return selector(state);
 }
 export function getCloseMatchAfterUndo(state) {
-    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndoMatchId;
+    return state.expenseAutomationActualMatchingViewState
+        .closeMatchAfterUndoMatchIds[0];
 }
 export function getCloseMatchAfterUndoMatchId(state) {
     return getCloseMatchAfterUndo(state);
 }
 export function getCloseMatchAfterIgnoreMatchId(state) {
     return state.expenseAutomationActualMatchingViewState
-        .closeMatchAfterIgnoreMatchId;
+        .closeMatchAfterIgnoreMatchIds[0];
 }
 export function getActualMatchingMatchModalConfirmStatus(state, matchId) {
     if (matchId != null && matchId !== '') {

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, depositAccountListState, paymentAccountListState, } = state;
+    const { paymentAccountState, depositAccountState, paymentAccountListState } = state;
     if (fromAccountId != null) {
         const withdrawFromAsDepositAcc = getDepositAccountByDepositAccountId(depositAccountState, fromAccountId);
         const withdrawFromAsPaymentAcc = getPaymentAccountByPaymentAccountId(paymentAccountState, fromAccountId);
@@ -639,41 +639,15 @@ export const getWithdrawFrom = (state, fromAccountId, fromAccountType, companyId
         }
     }
     else {
-        return getDefaultWithdrawFromAccount(state, depositAccountListState.accountIds, companyId ?? '', lastSelectedFromAccount);
+        return getDefaultWithdrawFromAccount(state, companyId ?? '', lastSelectedFromAccount);
     }
     return undefined;
 };
-export const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSelectedFromAccount) => {
+export const getDefaultWithdrawFromAccount = (state, companyId, lastSelectedFromAccount) => {
     const { depositAccountState, paymentAccountState, paymentAccountListState } = state;
     const companyView = getCompanyView(state, companyId, []);
     const primaryAccount = companyView?.company.company.companyBillPayInfo.primaryFundingAccount;
-    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;
-            }
-        }
-    }
+    const defaultAccount = primaryAccount ?? lastSelectedFromAccount;
     if (defaultAccount != null) {
         const defaultAccAsDepositAcc = getDepositAccountByDepositAccountId(depositAccountState, defaultAccount?.accountId);
         const defaultAccAsPaymentAcc = getPaymentAccountByPaymentAccountId(paymentAccountState, defaultAccount?.accountId);

package/lib/view/expenseAutomationView/epics/jeSchedule/actualMatching/fetchActualMatchingMatchEpic.d.ts

@@ -1,12 +1,12 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { ActualMatchingMatchPayload } from '../../../../../entity/actualMatching/actualMatchingPayload';
-import { updateActualMatchingMatches } from '../../../../../entity/actualMatching/actualMatchingReducer';
+import { removeActualMatchingMatch, updateActualMatchingMatches } from '../../../../../entity/actualMatching/actualMatchingReducer';
 import { ZeniAPIResponse } from '../../../../../responsePayload';
 import { clearAll } from '../../../../../rootActions';
 import { RootState } from '../../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess } from '../../../reducers/actualMatchingViewReducer';
 export type ActualMatchingMatchResponse = ZeniAPIResponse<ActualMatchingMatchPayload>;
-export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof fetchActualMatchingMatch> | ReturnType<typeof fetchActualMatchingMatchFailure> | ReturnType<typeof fetchActualMatchingMatchSuccess> | ReturnType<typeof updateActualMatchingMatches>;
+export type ActionType = ReturnType<typeof clearAll> | ReturnType<typeof fetchActualMatchingMatch> | ReturnType<typeof fetchActualMatchingMatchFailure> | ReturnType<typeof fetchActualMatchingMatchSuccess> | ReturnType<typeof removeActualMatchingMatch> | ReturnType<typeof updateActualMatchingMatches>;
 export declare const fetchActualMatchingMatchEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

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

@@ -35,6 +35,8 @@ const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pip
             refreshViewInBackground,
             status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', `Fetch actual matching match REST API call errored out ${JSON.stringify(error)}`),
         }),
-    ])), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
+    ])), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)((action) => rootActions_1.clearAll.match(action) ||
+        (actualMatchingReducer_1.removeActualMatchingMatch.match(action) &&
+            action.payload.matchId === matchId)))));
 }));
 exports.fetchActualMatchingMatchEpic = fetchActualMatchingMatchEpic;

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

@@ -12,7 +12,7 @@ const actualMatchingViewReducer_1 = require("../../../reducers/actualMatchingVie
 const actualMatchingViewState_1 = require("../../../types/actualMatchingViewState");
 const refreshActualMatchingList_1 = require("./refreshActualMatchingList");
 function isMatchFailedStatus(status) {
-    return (status === 'conflict' || status === 'claim_lost' || status === 'error');
+    return status === 'conflict' || status === 'claim_lost' || status === 'error';
 }
 function matchAndReverseSnackbar(results, vendorName) {
     const reversedCount = results.filter((result) => result.status === 'reversed').length;
@@ -59,12 +59,15 @@ function matchAndReverseHttpFailSnackbar(vendorName) {
     });
 }
 function matchVendorName(state, matchId) {
-    return (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)?.vendorName ?? '';
+    return ((0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId)
+        ?.vendorName ?? '');
 }
 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, lineIds, accrualIds, transactionSyncToken, } = action.payload;
+// Per-match exhaust: a second click on the same match drops while HTTP is in
+// flight. A different match must still run — a global exhaustMap left the
+// other match's reducer In-Progress with no request.
+(0, operators_1.groupBy)((action) => `${action.payload.transactionType.toLowerCase()}:${action.payload.transactionIntegrationId}`), (0, operators_1.mergeMap)((perMatch$) => perMatch$.pipe((0, operators_1.exhaustMap)((action) => {
+    const { transactionId, transactionIntegrationId, transactionType, lineIds, accrualIds, transactionSyncToken, forMatchModal, } = action.payload;
     const body = {
         transaction_id: transactionId,
         transaction_integration_id: transactionIntegrationId,
@@ -83,7 +86,11 @@ const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const results = response.data.results.map(actualMatchingPayload_1.toMatchAndReverseResult);
             const successActions = [
-                (0, actualMatchingViewReducer_1.matchAndReverseAccrualsSuccess)({ matchId, results }),
+                (0, actualMatchingViewReducer_1.matchAndReverseAccrualsSuccess)({
+                    matchId,
+                    results,
+                    ...(forMatchModal === true ? { forMatchModal: true } : {}),
+                }),
             ];
             const occupancyChanged = results.some((result) => (0, actualMatchingViewState_1.isMatchAndReverseCompleteStatus)(result.status));
             const allComplete = results.length > 0 &&
@@ -98,7 +105,7 @@ const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe
             if (snackbar != null) {
                 successActions.push(snackbar);
             }
-            if (allComplete) {
+            if (allComplete && forMatchModal === true) {
                 successActions.push((0, actualMatchingViewReducer_1.clearMatchNewModal)());
             }
             return (0, rxjs_1.from)(successActions);
@@ -106,11 +113,13 @@ const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe
         return (0, rxjs_1.of)((0, actualMatchingViewReducer_1.matchAndReverseAccrualsFailure)({
             status: response.status,
             matchId,
+            ...(forMatchModal === true ? { forMatchModal: true } : {}),
         }), matchAndReverseHttpFailSnackbar(vendorName));
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, actualMatchingViewReducer_1.matchAndReverseAccrualsFailure)({
         matchId,
+        ...(forMatchModal === true ? { forMatchModal: true } : {}),
         status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Match and reverse accruals REST API call errored out' +
             JSON.stringify(error)),
     }), matchAndReverseHttpFailSnackbar(vendorName))), (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)(rootActions_1.clearAll.match))));
-}));
+}))));
 exports.matchAndReverseAccrualsEpic = matchAndReverseAccrualsEpic;

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

@@ -40,18 +40,21 @@ export declare const ackCloseMatchAfterIgnore: import("@reduxjs/toolkit").Action
     status: ZeniAPIStatus;
 }, "expenseAutomationActualMatchingView/ignoreActualMatchingSuggestionFailure">, ignoreActualMatchingSuggestionSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     matchId: ActualMatchingMatchId;
-}, "expenseAutomationActualMatchingView/ignoreActualMatchingSuggestionSuccess">, matchAndReverseAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: string, transactionIntegrationId: string, transactionType: string, lineIds: string[], transactionSyncToken: string, accrualIds: string[]], {
+}, "expenseAutomationActualMatchingView/ignoreActualMatchingSuggestionSuccess">, matchAndReverseAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[transactionId: string, transactionIntegrationId: string, transactionType: string, lineIds: string[], transactionSyncToken: string, accrualIds: string[], forMatchModal?: boolean | undefined], {
     accrualIds: string[];
     lineIds: string[];
     transactionId: string;
     transactionIntegrationId: string;
     transactionSyncToken: string;
     transactionType: string;
+    forMatchModal: boolean | undefined;
 }, "expenseAutomationActualMatchingView/matchAndReverseAccruals", never, never>, matchAndReverseAccrualsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     status: ZeniAPIStatus;
+    forMatchModal?: boolean;
     matchId?: ActualMatchingMatchId;
 }, "expenseAutomationActualMatchingView/matchAndReverseAccrualsFailure">, matchAndReverseAccrualsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     results: MatchAndReverseResult[];
+    forMatchModal?: boolean;
     matchId?: ActualMatchingMatchId;
 }, "expenseAutomationActualMatchingView/matchAndReverseAccrualsSuccess">, openMatchNewModal: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationActualMatchingView/openMatchNewModal">, searchMatchAccruals: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[query: string, pageToken?: string | null | undefined], {
     query: string;

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

@@ -51,14 +51,22 @@ exports.initialState = {
     undoReversalStatusByMatchId: {},
     ignoreStatusByMatchId: {},
     confirmStatusByMatchId: {},
-    closeMatchAfterUndoMatchId: undefined,
-    closeMatchAfterIgnoreMatchId: undefined,
+    closeMatchAfterUndoMatchIds: [],
+    closeMatchAfterIgnoreMatchIds: [],
     lastMatchResultsByMatchId: {},
     lastUndoResultsByMatchId: {},
     hasValidState() {
         return this.fetchState == 'Completed';
     },
 };
+function enqueueCloseMatchId(ids, matchId) {
+    if (!ids.includes(matchId)) {
+        ids.push(matchId);
+    }
+}
+function dropCloseMatchId(ids, matchId) {
+    return ids.filter((id) => id !== matchId);
+}
 function pruneLastMatchResultsForUndone(draft, matchId, results) {
     const undoneIds = new Set(results
         .filter((result) => result.status === 'undone')
@@ -359,11 +367,13 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                     fetchState: 'In-Progress',
                     error: undefined,
                 };
-                draft.matchModal.confirmStatus = inProgress;
+                if (action.payload.forMatchModal === true) {
+                    draft.matchModal.confirmStatus = inProgress;
+                }
                 const matchId = `${action.payload.transactionType.toLowerCase()}:${action.payload.transactionIntegrationId}`;
                 draft.confirmStatusByMatchId[matchId] = inProgress;
             },
-            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds) {
+            prepare(transactionId, transactionIntegrationId, transactionType, lineIds, transactionSyncToken, accrualIds, forMatchModal) {
                 return {
                     payload: {
                         accrualIds,
@@ -372,6 +382,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                         transactionIntegrationId,
                         transactionSyncToken,
                         transactionType,
+                        forMatchModal,
                     },
                 };
             },
@@ -380,16 +391,18 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             const { results } = action.payload;
             const allComplete = results.length > 0 &&
                 results.every((result) => (0, actualMatchingViewState_1.isMatchAndReverseCompleteStatus)(result.status));
-            draft.matchModal.confirmStatus = allComplete
+            const confirmStatus = allComplete
                 ? { fetchState: 'Completed', error: undefined }
                 : {
                     fetchState: 'Error',
                     error: (0, responsePayload_1.createZeniAPIStatus)('Partial match-and-reverse', 'Some accruals were not reversed'),
                 };
-            draft.matchModal.lastBatchResults = results;
+            if (action.payload.forMatchModal === true) {
+                draft.matchModal.confirmStatus = confirmStatus;
+                draft.matchModal.lastBatchResults = results;
+            }
             if (action.payload.matchId != null) {
-                draft.confirmStatusByMatchId[action.payload.matchId] =
-                    draft.matchModal.confirmStatus;
+                draft.confirmStatusByMatchId[action.payload.matchId] = confirmStatus;
                 draft.lastMatchResultsByMatchId[action.payload.matchId] = results;
                 pruneLastUndoResultsForMatched(draft, action.payload.matchId, action.payload.results);
             }
@@ -399,7 +412,9 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 fetchState: 'Error',
                 error: action.payload.status,
             };
-            draft.matchModal.confirmStatus = failed;
+            if (action.payload.forMatchModal === true) {
+                draft.matchModal.confirmStatus = failed;
+            }
             if (action.payload.matchId != null) {
                 draft.confirmStatusByMatchId[action.payload.matchId] = failed;
             }
@@ -424,7 +439,12 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 };
                 const allUndone = results.length > 0 &&
                     results.every((result) => result.status === 'undone');
-                draft.closeMatchAfterUndoMatchId = allUndone ? matchId : undefined;
+                if (allUndone) {
+                    enqueueCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                }
+                else {
+                    draft.closeMatchAfterUndoMatchIds = dropCloseMatchId(draft.closeMatchAfterUndoMatchIds, matchId);
+                }
                 pruneLastMatchResultsForUndone(draft, matchId, results);
                 if (allUndone) {
                     delete draft.lastUndoResultsByMatchId[matchId];
@@ -438,7 +458,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             },
         },
         ackCloseMatchAfterUndo(draft) {
-            draft.closeMatchAfterUndoMatchId = undefined;
+            draft.closeMatchAfterUndoMatchIds.shift();
         },
         ignoreActualMatchingSuggestion: {
             prepare(matchId, reason, note) {
@@ -457,7 +477,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
                 fetchState: 'Completed',
                 error: undefined,
             };
-            draft.closeMatchAfterIgnoreMatchId = matchId;
+            enqueueCloseMatchId(draft.closeMatchAfterIgnoreMatchIds, matchId);
             delete draft.lastMatchResultsByMatchId[matchId];
             delete draft.lastUndoResultsByMatchId[matchId];
             delete draft.detailFetchStateByMatchId[matchId];
@@ -475,7 +495,7 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             };
         },
         ackCloseMatchAfterIgnore(draft) {
-            draft.closeMatchAfterIgnoreMatchId = undefined;
+            draft.closeMatchAfterIgnoreMatchIds.shift();
         },
         undoReversalAccrualsFailure(draft, action) {
             draft.undoReversalStatusByMatchId[action.payload.matchId] = {

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

@@ -356,14 +356,15 @@ function getExpenseAutomationActualMatchingMatchView(state, matchId) {
     return selector(state);
 }
 function getCloseMatchAfterUndo(state) {
-    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndoMatchId;
+    return state.expenseAutomationActualMatchingViewState
+        .closeMatchAfterUndoMatchIds[0];
 }
 function getCloseMatchAfterUndoMatchId(state) {
     return getCloseMatchAfterUndo(state);
 }
 function getCloseMatchAfterIgnoreMatchId(state) {
     return state.expenseAutomationActualMatchingViewState
-        .closeMatchAfterIgnoreMatchId;
+        .closeMatchAfterIgnoreMatchIds[0];
 }
 function getActualMatchingMatchModalConfirmStatus(state, matchId) {
     if (matchId != null && matchId !== '') {

package/lib/view/expenseAutomationView/types/actualMatchingViewState.d.ts

@@ -106,6 +106,8 @@ export interface ActualMatchingMatchModalState {
 }
 export declare function actualMatchingTransactionLineKey(transactionType: string, transactionIntegrationId: string, lineId: string): string;
 export interface ActualMatchingViewState extends FetchedState {
+    closeMatchAfterIgnoreMatchIds: ActualMatchingMatchId[];
+    closeMatchAfterUndoMatchIds: ActualMatchingMatchId[];
     confirmStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
@@ -117,6 +119,4 @@ export interface ActualMatchingViewState extends FetchedState {
     refreshStatus: FetchStateAndError;
     uiState: ActualMatchingViewUIState;
     undoReversalStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
-    closeMatchAfterIgnoreMatchId?: ActualMatchingMatchId;
-    closeMatchAfterUndoMatchId?: ActualMatchingMatchId;
 }

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.d.ts

@@ -141,7 +141,7 @@ export declare const getWithdrawFrom: (state: RootState, fromAccountId?: ID, fro
     accountId: ID;
     accountType: AccountTypeSubConfigCodeKeyType;
 }) => FundingAccount | undefined;
-export declare const getDefaultWithdrawFromAccount: (state: RootState, depositAccounts: ID[], companyId: ID, lastSelectedFromAccount?: {
+export declare const getDefaultWithdrawFromAccount: (state: RootState, companyId: ID, lastSelectedFromAccount?: {
     accountId: ID;
     accountType: AccountTypeSubConfigCodeKeyType;
 }) => FundingAccount | undefined;

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

@@ -640,7 +640,7 @@ const getDueDate = (billStageCode, dueDate, invoiceDate, bookCloseDate) => {
 };
 exports.getDueDate = getDueDate;
 const getWithdrawFrom = (state, fromAccountId, fromAccountType, companyId, lastSelectedFromAccount) => {
-    const { paymentAccountState, depositAccountState, depositAccountListState, paymentAccountListState, } = state;
+    const { paymentAccountState, depositAccountState, paymentAccountListState } = state;
     if (fromAccountId != null) {
         const withdrawFromAsDepositAcc = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, fromAccountId);
         const withdrawFromAsPaymentAcc = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, fromAccountId);
@@ -654,42 +654,16 @@ const getWithdrawFrom = (state, fromAccountId, fromAccountType, companyId, lastS
         }
     }
     else {
-        return (0, exports.getDefaultWithdrawFromAccount)(state, depositAccountListState.accountIds, companyId ?? '', lastSelectedFromAccount);
+        return (0, exports.getDefaultWithdrawFromAccount)(state, companyId ?? '', lastSelectedFromAccount);
     }
     return undefined;
 };
 exports.getWithdrawFrom = getWithdrawFrom;
-const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSelectedFromAccount) => {
+const getDefaultWithdrawFromAccount = (state, companyId, lastSelectedFromAccount) => {
     const { depositAccountState, paymentAccountState, paymentAccountListState } = state;
     const companyView = (0, getCompanyView_1.getCompanyView)(state, companyId, []);
     const primaryAccount = companyView?.company.company.companyBillPayInfo.primaryFundingAccount;
-    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;
-            }
-        }
-    }
+    const defaultAccount = primaryAccount ?? lastSelectedFromAccount;
     if (defaultAccount != null) {
         const defaultAccAsDepositAcc = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, defaultAccount?.accountId);
         const defaultAccAsPaymentAcc = (0, paymentAccountSelector_1.getPaymentAccountByPaymentAccountId)(paymentAccountState, defaultAccount?.accountId);

package/package.json

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