@zeniai/client-epic-state 5.2.70 → 5.2.71

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

@@ -5,13 +5,15 @@ import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelecto
 import { ZeniDate } from '../../../zeniDayJS';
 import { ActualMatchingTransactionSearchResult, ActualMatchingViewUIState, MatchAndReverseResult } from '../types/actualMatchingViewState';
 export type ActualMatchingRowKind = 'auto_reversed' | 'pending_review' | 'manually_reversed';
-export type ActualMatchingGroupedAccrual = {
+export type ActualMatchingJournalEntryIds = Pick<JEOneTimeAccrual, 'reversalTransactionId' | 'reversalTransactionIntegrationId' | 'transactionId' | 'transactionIntegrationId'>;
+export type ActualMatchingLeftoverAccrual = {
     accrualId: ID;
     estimatedAmount?: Amount;
     jeDebitAccountName?: string;
     memo?: string;
     serviceMonth?: string;
 };
+export type ActualMatchingGroupedAccrual = ActualMatchingLeftoverAccrual & ActualMatchingJournalEntryIds;
 export interface ActualMatchingRow extends JEOneTimeAccrual {
     accruedAmount: Amount;
     actualAmount: Amount;
@@ -20,7 +22,7 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     groupedAccrualIds?: ID[];
     groupedMembers?: ActualMatchingGroupedAccrual[];
     intendedAccrualIds?: ID[];
-    leftovers?: ActualMatchingGroupedAccrual[];
+    leftovers?: ActualMatchingLeftoverAccrual[];
     matchShape?: string;
     matchTier?: string;
     reversalDate?: ZeniDate;
@@ -43,6 +45,9 @@ export interface ActualMatchingKpiSummary {
         count: number;
         estimatedMinutesToClear: number;
     };
+    reversed: {
+        count: number;
+    };
     variance: {
         averagePercentPerMatch: number;
         netAmount: number;
@@ -67,21 +72,30 @@ export interface ActualMatchingMatchModalView {
         results: ActualMatchingTransactionSearchResult[];
     };
     lastBatchResults?: MatchAndReverseResult[];
-    openedFromMatchId?: string;
-    prefill?: {
-        selectedAccrualIds: ID[];
-        actualAmount?: number;
-        consumedLineIds?: ID[];
-        matchedLineId?: string;
-        matchedTransactionId?: string;
-    };
+}
+export interface ActualMatchingMatchView {
+    accruedAmount: Amount;
+    actualAmount: Amount;
+    kind: ActualMatchingRowKind;
+    matchId: string;
+    members: JEOneTimeAccrual[];
+    transactionIntegrationId: ID;
+    transactionType: string;
+    leftovers?: JEOneTimeAccrual[];
+    matchShape?: string;
+    matchTier?: string;
+    transactionDate?: string;
+    vendorId?: ID;
+    vendorName?: string;
 }
 export interface ExpenseAutomationActualMatchingViewSelector extends SelectorView {
     hasLoadedForSelectedPeriod: boolean;
+    ignoreStatusByMatchId: Record<string, FetchStateAndError>;
     kpiSummary: ActualMatchingKpiSummary;
     matchModal: ActualMatchingMatchModalView;
     pendingReview: ActualMatchingRow[];
     refreshStatus: FetchStateAndError;
     reversed: ActualMatchingRow[];
     uiState: ActualMatchingViewUIState;
+    undoReversalStatusByMatchId: Record<string, FetchStateAndError>;
 }

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

@@ -1,13 +1,12 @@
 import { FetchStateAndError } from '../../../commonStateTypes/common';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
 import { DisplayCurrencyFallback } from '../../../entity/actualMatching/actualMatchingPayload';
-import { ActualMatchingMatch } from '../../../entity/actualMatching/actualMatchingState';
 import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatchingTypes';
 import { JEOneTimeAccrual } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { JEOneTimeAccrualMatchSuggestion } from '../../../entity/jeSchedules/jeSchedulesState';
 import { RootState } from '../../../rootStateTypes';
 import { ZeniDate } from '../../../zeniDayJS';
-import { ActualMatchingKpiSummary, ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
+import { ActualMatchingKpiSummary, ActualMatchingMatchView, ActualMatchingRow, ActualMatchingRowKind, ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/actualMatchingViewSelectorTypes';
 import { MatchAndReverseResult, UndoReversalResult } from '../types/actualMatchingViewState';
 export declare function getSelectedMonthYearForCurrentTenant(state: RootState): MonthYearPeriod | undefined;
 export declare function getTenantDisplayCurrency(state: RootState): DisplayCurrencyFallback | undefined;
@@ -27,12 +26,16 @@ export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual,
 export declare function buildActualMatchingKpiSummary(rows: ActualMatchingRow[], displayCurrencyCode?: string): ActualMatchingKpiSummary;
 export interface ExpenseAutomationActualMatchingMatchView {
     detailFetchState: FetchStateAndError;
+    ignoreStatus: FetchStateAndError;
     refreshStatus: FetchStateAndError;
     undoReversalStatus: FetchStateAndError;
     lastMatchResults?: MatchAndReverseResult[];
     lastUndoResults?: UndoReversalResult[];
-    match?: ActualMatchingMatch;
+    match?: ActualMatchingMatchView;
 }
 export declare function getExpenseAutomationActualMatchingMatchView(state: RootState, matchId: ActualMatchingMatchId): ExpenseAutomationActualMatchingMatchView;
-export declare function getCloseMatchAfterUndo(state: RootState): boolean;
+export declare function getCloseMatchAfterUndo(state: RootState): ActualMatchingMatchId | undefined;
+export declare function getCloseMatchAfterUndoMatchId(state: RootState): ActualMatchingMatchId | undefined;
+export declare function getCloseMatchAfterIgnoreMatchId(state: RootState): ActualMatchingMatchId | undefined;
+export declare function getActualMatchingMatchModalConfirmStatus(state: RootState, matchId?: ActualMatchingMatchId): FetchStateAndError;
 export declare function getExpenseAutomationActualMatchingView(state: RootState): ExpenseAutomationActualMatchingViewSelector;

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

@@ -16,7 +16,11 @@ exports.getActualMatchingReversalDate = getActualMatchingReversalDate;
 exports.buildActualMatchingKpiSummary = buildActualMatchingKpiSummary;
 exports.getExpenseAutomationActualMatchingMatchView = getExpenseAutomationActualMatchingMatchView;
 exports.getCloseMatchAfterUndo = getCloseMatchAfterUndo;
+exports.getCloseMatchAfterUndoMatchId = getCloseMatchAfterUndoMatchId;
+exports.getCloseMatchAfterIgnoreMatchId = getCloseMatchAfterIgnoreMatchId;
+exports.getActualMatchingMatchModalConfirmStatus = getActualMatchingMatchModalConfirmStatus;
 exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
+const toolkit_1 = require("@reduxjs/toolkit");
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const actualMatchingSelector_1 = require("../../../entity/actualMatching/actualMatchingSelector");
@@ -24,7 +28,6 @@ const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const zeniDayJS_1 = require("../../../zeniDayJS");
-const actualMatchingViewState_1 = require("../types/actualMatchingViewState");
 function getSelectedMonthYearForCurrentTenant(state) {
     const tenantId = (0, tenantSelector_1.getCurrentTenant)(state)?.tenantId;
     if (tenantId == null) {
@@ -53,27 +56,6 @@ function toMatchModalAccrual(member) {
         jeOneTimeAccrualKey: (0, jeScheduleHelper_1.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((0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(row.transactionType, row.transactionIntegrationId, row.lineId), row));
-    searched.forEach((row) => {
-        const key = (0, actualMatchingViewState_1.actualMatchingTransactionLineKey)(row.transactionType, row.transactionIntegrationId, row.lineId);
-        if (!byKey.has(key)) {
-            byKey.set(key, row);
-        }
-    });
-    return Array.from(byKey.values());
-}
 function parseActualMatchingMatchId(matchId) {
     const separator = matchId.indexOf(':');
     if (separator <= 0 || separator === matchId.length - 1) {
@@ -134,13 +116,18 @@ function collectGroupedMembers(members) {
         estimatedAmount: member.estimatedAmount,
         jeDebitAccountName: member.jeDebitAccountName,
         memo: member.memo,
+        reversalTransactionId: member.reversalTransactionId,
+        reversalTransactionIntegrationId: member.reversalTransactionIntegrationId,
         serviceMonth: member.serviceMonth,
+        transactionId: member.transactionId,
+        transactionIntegrationId: member.transactionIntegrationId,
     }));
 }
 function collectLeftoverMembers(leftovers) {
     if (leftovers == null || leftovers.length === 0) {
         return undefined;
     }
+    // Leftover accruals did not post, so they have no journal-entry ids to open.
     return leftovers.map((member) => ({
         accrualId: member.accrualId,
         estimatedAmount: member.estimatedAmount,
@@ -246,6 +233,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 },
     };
 }
@@ -301,6 +289,7 @@ 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);
@@ -326,6 +315,9 @@ 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
@@ -338,23 +330,66 @@ function buildActualMatchingKpiSummary(rows, displayCurrencyCode) {
         },
     };
 }
-function getExpenseAutomationActualMatchingMatchView(state, matchId) {
-    const view = state.expenseAutomationActualMatchingViewState;
+function toActualMatchingMatchView(match) {
     return {
-        match: (0, actualMatchingSelector_1.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 matchViewSelectorById = new Map();
+function getExpenseAutomationActualMatchingMatchView(state, matchId) {
+    let selector = matchViewSelectorById.get(matchId);
+    if (selector == null) {
+        selector = (0, toolkit_1.createSelector)([
+            (root) => root.expenseAutomationActualMatchingViewState
+                .detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState.ignoreStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .lastMatchResultsByMatchId?.[matchId],
+            (root) => root.expenseAutomationActualMatchingViewState
+                .lastUndoResultsByMatchId?.[matchId],
+            (root) => root.expenseAutomationActualMatchingViewState
+                .detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => (0, actualMatchingSelector_1.getActualMatchingMatchById)(root.actualMatchingState, matchId),
+        ], (detailFetchState, ignoreStatus, lastMatchResults, lastUndoResults, refreshStatus, undoReversalStatus, match) => ({
+            detailFetchState,
+            ignoreStatus,
+            lastMatchResults,
+            lastUndoResults,
+            match: match == null ? undefined : toActualMatchingMatchView(match),
+            refreshStatus,
+            undoReversalStatus,
+        }));
+        matchViewSelectorById.set(matchId, selector);
+    }
+    return selector(state);
+}
 function getCloseMatchAfterUndo(state) {
-    return state.expenseAutomationActualMatchingViewState.closeMatchAfterUndo;
+    return state.expenseAutomationActualMatchingViewState
+        .closeMatchAfterUndoMatchIds[0];
+}
+function getCloseMatchAfterUndoMatchId(state) {
+    return getCloseMatchAfterUndo(state);
+}
+function getCloseMatchAfterIgnoreMatchId(state) {
+    return state.expenseAutomationActualMatchingViewState
+        .closeMatchAfterIgnoreMatchIds[0];
+}
+function getActualMatchingMatchModalConfirmStatus(state, matchId) {
+    if (matchId != null && matchId !== '') {
+        return (state.expenseAutomationActualMatchingViewState.confirmStatusByMatchId[matchId] ?? NOT_STARTED);
+    }
+    return state.expenseAutomationActualMatchingViewState.matchModal
+        .confirmStatus;
 }
 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 ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : undefined;
     const matchIds = monthYearPeriodId != null ? matchIdsByPeriod[monthYearPeriodId] : undefined;
@@ -370,32 +405,6 @@ function getExpenseAutomationActualMatchingView(state) {
     const searchedAccruals = matchModal.accrualSearch.results
         .map((key) => (0, jeSchedulesSelector_1.getJEOneTimeAccrualByKey)(key, state.jeSchedulesState))
         .filter((accrual) => accrual != null);
-    const openedMatch = matchModal.openedFromMatchId != null
-        ? (0, actualMatchingSelector_1.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
@@ -413,16 +422,16 @@ 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,
@@ -432,7 +441,7 @@ 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/view/expenseAutomationView/types/actualMatchingViewState.d.ts

@@ -5,6 +5,8 @@ import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatc
 import { JEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
 export declare const toActualMatchingSortKey: (v: string) => "type" | "date" | "vendor" | "category" | "class" | "amount" | "variance" | "lifecycle" | "service" | "accrued" | "actual";
 export type ActualMatchingSortKey = ReturnType<typeof toActualMatchingSortKey>;
+export declare const toActualMatchingStatusFilter: (v: string) => "pending_review" | "reversed" | "all";
+export type ActualMatchingStatusFilter = ReturnType<typeof toActualMatchingStatusFilter>;
 export declare const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 export declare const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 export declare const MATCH_SEARCH_DEBOUNCE_MS = 300;
@@ -18,6 +20,11 @@ export interface ActualMatchingViewUIState {
     searchString: string;
     sortKey: ActualMatchingSortKey;
     sortOrder: SortOrder;
+    /**
+     * Unused by the list: Pending review and Reversed always render as separate
+     * tables. Kept so persisted UI state and older clients still hydrate.
+     */
+    statusFilter: ActualMatchingStatusFilter;
 }
 /**
  * Sibling of Missing Receipts `MatchCandidate`. Confirm needs `lineId` and
@@ -69,6 +76,14 @@ export interface UndoReversalAccrualsParams {
     accrualIds: ID[];
     matchId: ActualMatchingMatchId;
 }
+export declare const toActualMatchingIgnoreReasonType: (v: string) => "other_ignore" | "already_handled" | "amount_off" | "wrong_period" | "wrong_bill";
+export type ActualMatchingIgnoreReasonType = ReturnType<typeof toActualMatchingIgnoreReasonType>;
+export declare const ALL_ACTUAL_MATCHING_IGNORE_REASONS: readonly ActualMatchingIgnoreReasonType[];
+export interface IgnoreActualMatchingSuggestionParams {
+    matchId: ActualMatchingMatchId;
+    reason: ActualMatchingIgnoreReasonType;
+    note?: string;
+}
 export interface ActualMatchingTransactionSearchState extends FetchStateAndError {
     isLoadingMore: boolean;
     nextPageToken: string | null;
@@ -84,18 +99,18 @@ export interface ActualMatchingAccrualSearchState extends FetchStateAndError {
 export interface ActualMatchingMatchModalState {
     accrualSearch: ActualMatchingAccrualSearchState;
     confirmStatus: FetchStateAndError;
-    didPinPrefillTransactions: boolean;
     isOpen: boolean;
-    pinnedTransactionResults: ActualMatchingTransactionSearchResult[];
     transactionSearch: ActualMatchingTransactionSearchState;
     lastBatchResults?: MatchAndReverseResult[];
-    openedFromMatchId?: ActualMatchingMatchId;
 }
 export declare function actualMatchingTransactionLineKey(transactionType: string, transactionIntegrationId: string, lineId: string): string;
 export interface ActualMatchingViewState extends FetchedState {
-    closeMatchAfterUndo: boolean;
+    closeMatchAfterIgnoreMatchIds: ActualMatchingMatchId[];
+    closeMatchAfterUndoMatchIds: ActualMatchingMatchId[];
+    confirmStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    ignoreStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
     lastMatchResultsByMatchId: Record<ActualMatchingMatchId, MatchAndReverseResult[]>;
     lastUndoResultsByMatchId: Record<ActualMatchingMatchId, UndoReversalResult[]>;
     matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toUndoReversalResultStatus = exports.toMatchAndReverseResultStatus = exports.MATCH_SEARCH_DEBOUNCE_MS = exports.MATCH_ACCRUAL_SEARCH_LIMIT = exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = exports.toActualMatchingSortKey = void 0;
+exports.ALL_ACTUAL_MATCHING_IGNORE_REASONS = exports.toActualMatchingIgnoreReasonType = exports.toUndoReversalResultStatus = exports.toMatchAndReverseResultStatus = exports.MATCH_SEARCH_DEBOUNCE_MS = exports.MATCH_ACCRUAL_SEARCH_LIMIT = exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = exports.toActualMatchingStatusFilter = exports.toActualMatchingSortKey = void 0;
 exports.isMatchAndReverseCompleteStatus = isMatchAndReverseCompleteStatus;
 exports.actualMatchingTransactionLineKey = actualMatchingTransactionLineKey;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
@@ -19,6 +19,13 @@ const ACTUAL_MATCHING_SORT_KEYS = [
 ];
 const toActualMatchingSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_SORT_KEYS);
 exports.toActualMatchingSortKey = toActualMatchingSortKey;
+const ACTUAL_MATCHING_STATUS_FILTERS = [
+    'all',
+    'pending_review',
+    'reversed',
+];
+const toActualMatchingStatusFilter = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_STATUS_FILTERS);
+exports.toActualMatchingStatusFilter = toActualMatchingStatusFilter;
 exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 exports.MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 exports.MATCH_SEARCH_DEBOUNCE_MS = 300;
@@ -41,6 +48,16 @@ const UNDO_REVERSAL_RESULT_STATUSES = [
 ];
 const toUndoReversalResultStatus = (v) => (0, stringToUnion_1.stringToUnion)(v, UNDO_REVERSAL_RESULT_STATUSES);
 exports.toUndoReversalResultStatus = toUndoReversalResultStatus;
+const ACTUAL_MATCHING_IGNORE_REASONS = [
+    'wrong_bill',
+    'wrong_period',
+    'amount_off',
+    'already_handled',
+    'other_ignore',
+];
+const toActualMatchingIgnoreReasonType = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_IGNORE_REASONS);
+exports.toActualMatchingIgnoreReasonType = toActualMatchingIgnoreReasonType;
+exports.ALL_ACTUAL_MATCHING_IGNORE_REASONS = ACTUAL_MATCHING_IGNORE_REASONS;
 function actualMatchingTransactionLineKey(transactionType, transactionIntegrationId, lineId) {
     return `${transactionType}:${transactionIntegrationId}:${lineId}`;
 }

package/lib/view/invoicing/settingsView/settingsViewSelector.d.ts

@@ -4,6 +4,7 @@ import { InvoicingDunningActionOption, InvoicingFieldHelpByCode, InvoicingNamedO
 import { File } from '../../../entity/file/fileState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { RootState } from '../../../rootStateTypes';
+import { AddressUpdatableInfo } from '../../addressView/addressViewState';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from '../invoicingQboView/invoicingQboViewPayload';
 import { InvoicingAccountingOption } from '../invoicingQboView/invoicingQboViewSelector';
 import { InvoicingBrandingFormLocalData } from './invoicingBrandingFormConfig';
@@ -113,6 +114,8 @@ export interface InvoicingQboSettingsFormView {
     localData: InvoicingQboSettingsLocalData;
     nestedAccountHierarchy: NestedAccountHierarchyForReport[];
     retryFetchStateByTaskId: Record<string, FetchStateAndError>;
+    /** The saved values the draft is compared against. */
+    savedLocalData: InvoicingQboSettingsLocalData;
     saveState: FetchStateAndError;
     settingsFetchState: FetchState;
     syncStatusOptions: InvoicingNamedOption[];
@@ -134,14 +137,20 @@ export interface InvoicingBrandingFormView {
     fieldHelp: InvoicingFieldHelpByCode;
     localData: InvoicingBrandingFormLocalData;
     saveState: FetchStateAndError;
+    /** The business address to show: the in-progress edit, else what is saved. */
+    address?: AddressUpdatableInfo;
     addressLabel?: string;
     settings?: InvoicingSettingsPayload;
 }
 /**
  * Bundled view for the branding settings form: the draft `localData` (seeded
- * from the existing settings until the user edits), the business-address label
- * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview), the backend date-format choices and the
+ * from the existing settings until the user edits), the business address, the
+ * raw settings (for the logo/preview), the backend date-format choices and the
  * save fetch state.
+ *
+ * The address is resolved here rather than read from the Address screen's
+ * staging store alone: that store is only seeded when settings are fetched, and
+ * returning to this page does not refetch, so a saved address would otherwise
+ * have no way to reach the screen.
  */
 export declare const getInvoicingBrandingFormView: (state: RootState) => InvoicingBrandingFormView;

package/lib/view/invoicing/settingsView/settingsViewSelector.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingBrandingFormView = exports.getInvoicingQboSettingsFormView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = void 0;
 exports.deriveInvoicingEnablePrerequisites = deriveInvoicingEnablePrerequisites;
 const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
+const addressSelector_1 = require("../../../entity/address/addressSelector");
 const fileSelector_1 = require("../../../entity/file/fileSelector");
 const addressViewSelector_1 = require("../../addressView/addressViewSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
@@ -126,6 +127,7 @@ const getInvoicingQboSettingsFormView = (state) => {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'settings'),
         accountMappingKindOptions: qboAccountMappingKindOptions,
         accounts: qboView.accounts,
+        savedLocalData: (0, invoicingQboSettingsFormConfig_1.entityToInvoicingQboSettingsLocalData)(settings?.qbo),
         backfillState: qboView.backfillState,
         connection: qboView.connection,
         configFetchState,
@@ -152,20 +154,27 @@ const getInvoicingQboSettingsFormView = (state) => {
 exports.getInvoicingQboSettingsFormView = getInvoicingQboSettingsFormView;
 /**
  * Bundled view for the branding settings form: the draft `localData` (seeded
- * from the existing settings until the user edits), the business-address label
- * (from the shared Address screen, seeded on load from `address_id`), the raw
- * settings (for the logo/preview), the backend date-format choices and the
+ * from the existing settings until the user edits), the business address, the
+ * raw settings (for the logo/preview), the backend date-format choices and the
  * save fetch state.
+ *
+ * The address is resolved here rather than read from the Address screen's
+ * staging store alone: that store is only seeded when settings are fetched, and
+ * returning to this page does not refetch, so a saved address would otherwise
+ * have no way to reach the screen.
  */
 const getInvoicingBrandingFormView = (state) => {
     const { brandingDraft, saveFetchState, settings } = state.invoicingSettingsViewState;
-    const newAddress = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE];
-    const addressLabel = newAddress?.addressToCreate != null
-        ? (0, addressViewSelector_1.getFormattedAddress)(newAddress.addressToCreate)
-        : undefined;
+    const savedAddressId = settings?.address?.address_id;
+    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]
+        ?.addressToCreate ??
+        (savedAddressId != null
+            ? (0, addressSelector_1.getAddressByAddressId)(state.addressState, savedAddressId)
+            : undefined);
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'settings'),
-        addressLabel,
+        address,
+        addressLabel: address != null ? (0, addressViewSelector_1.getFormattedAddress)(address) : undefined,
         dateFormatOptions: (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).dateFormatOptions,
         localData: brandingDraft ?? (0, invoicingBrandingFormConfig_1.entityToInvoicingBrandingFormLocalData)(settings),
         saveState: saveFetchState,

package/lib/view/invoicing/settingsView/submitInvoicingBrandingFormEpic.js

@@ -4,6 +4,7 @@ exports.submitInvoicingBrandingFormEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const addressReducer_1 = require("../../../entity/address/addressReducer");
+const addressSelector_1 = require("../../../entity/address/addressSelector");
 const fileReducer_1 = require("../../../entity/file/fileReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const addressViewReducer_1 = require("../../addressView/addressViewReducer");
@@ -19,7 +20,11 @@ const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => actions$.
     const state = state$.value;
     const { brandingDraft, settings } = state.invoicingSettingsViewState;
     const localData = brandingDraft ?? (0, invoicingBrandingFormConfig_1.entityToInvoicingBrandingFormLocalData)(settings);
-    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate;
+    const savedAddressId = settings?.address?.address_id;
+    const address = state.addressViewState.newAddressState?.[invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate ??
+        (savedAddressId != null
+            ? (0, addressSelector_1.getAddressByAddressId)(state.addressState, savedAddressId)
+            : undefined);
     const data = (0, invoicingBrandingFormConfig_1.brandingLocalDataToSettingsPayload)(localData, address);
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     return zeniAPI
@@ -40,7 +45,11 @@ const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => actions$.
                     ? [(0, fileReducer_1.updateFiles)({ files: [savedLogoFile] })]
                     : []),
                 (0, settingsViewReducer_1.saveInvoicingSettingsSuccess)(response.data),
-                (0, addressViewReducer_1.resetNewAddressDataInLocalStore)(invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE),
+                ...(savedAddress == null
+                    ? [
+                        (0, addressViewReducer_1.resetNewAddressDataInLocalStore)(invoicingBrandingFormConfig_1.INVOICING_BUSINESS_ADDRESS_TYPE),
+                    ]
+                    : []),
             ];
         }
         return (0, rxjs_1.of)((0, settingsViewReducer_1.saveInvoicingSettingsFailure)(response.status));

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.70",
+  "version": "5.2.71",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",