@zeniai/client-epic-state 5.2.34-beta0ND → 5.2.35-beta0MM

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

@@ -0,0 +1,296 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseActualMatchingMatchId = parseActualMatchingMatchId;
+exports.isAutoReversedAccrual = isAutoReversedAccrual;
+exports.isManuallyReversedAccrual = isManuallyReversedAccrual;
+exports.isPendingReviewAccrual = isPendingReviewAccrual;
+exports.isReversedMatchKind = isReversedMatchKind;
+exports.getClearedMatchedAmount = getClearedMatchedAmount;
+exports.getActualMatchingAmount = getActualMatchingAmount;
+exports.getActualMatchingReversalDate = getActualMatchingReversalDate;
+exports.getExpenseAutomationActualMatchingMatchView = getExpenseAutomationActualMatchingMatchView;
+exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
+const orderBy_1 = __importDefault(require("lodash/orderBy"));
+const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
+const actualMatchingSelector_1 = require("../../../entity/actualMatching/actualMatchingSelector");
+const jeScheduleHelper_1 = require("../../../entity/jeSchedules/jeScheduleHelper");
+const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
+const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
+function toMatchModalAccrual(member) {
+    if ('jeOneTimeAccrualKey' in member && member.jeOneTimeAccrualKey != null) {
+        return member;
+    }
+    return {
+        ...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(`${row.transactionId}:${row.lineId}`, row));
+    searched.forEach((row) => {
+        const key = `${row.transactionId}:${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) {
+        return null;
+    }
+    return {
+        transactionType: matchId.slice(0, separator).toLowerCase(),
+        transactionIntegrationId: matchId.slice(separator + 1),
+    };
+}
+const NOT_STARTED = {
+    fetchState: 'Not-Started',
+    error: undefined,
+};
+function isAutoReversedAccrual(accrual) {
+    return (accrual.accrualStatus === 'reversed' &&
+        accrual.reversalTrigger === 'bill_match');
+}
+function isManuallyReversedAccrual(accrual) {
+    return (accrual.accrualStatus === 'reversed' &&
+        accrual.reversalTrigger === 'manual_reverse');
+}
+function isPendingReviewAccrual(accrual) {
+    if (accrual.accrualStatus !== 'posted' || accrual.matchSuggestion == null) {
+        return false;
+    }
+    const resolution = accrual.matchSuggestion.resolution;
+    return resolution == null || resolution.length === 0;
+}
+function isReversedMatchKind(kind) {
+    return kind === 'auto_reversed' || kind === 'manually_reversed';
+}
+function getClearedMatchedAmount(accrual) {
+    return accrual.cleared?.matchedAmount?.amount;
+}
+function getActualMatchingAmount(row) {
+    return row.actualAmount?.amount ?? row.estimatedAmount.amount;
+}
+function getActualMatchingReversalDate(accrual) {
+    if (isPendingReviewAccrual(accrual)) {
+        return accrual.matchSuggestion.matchedTransactionDate;
+    }
+    return accrual.cleared?.matchedTransactionDate;
+}
+function collectGroupedMembers(members) {
+    if (members.length <= 1) {
+        return undefined;
+    }
+    return members.map((member) => ({
+        accrualId: member.accrualId,
+        estimatedAmount: member.estimatedAmount,
+        jeDebitAccountName: member.jeDebitAccountName,
+        memo: member.memo,
+        serviceMonth: member.serviceMonth,
+    }));
+}
+function toActualMatchingRow(match) {
+    const firstMember = match.members[0];
+    if (firstMember == null) {
+        throw new Error('Actual matching row requires at least one member');
+    }
+    const first = toMatchModalAccrual(firstMember);
+    return {
+        ...first,
+        matchId: match.matchId,
+        kind: match.kind,
+        accruedAmount: match.accruedAmount,
+        actualAmount: match.actualAmount,
+        matchTier: match.matchTier,
+        matchShape: match.matchShape,
+        transactionType: match.transactionType,
+        transactionDate: match.transactionDate,
+        groupedAccrualIds: match.members.map((member) => member.accrualId),
+        groupedMembers: collectGroupedMembers(match.members),
+        reversalDate: getActualMatchingReversalDate(first),
+        vendorName: match.vendorName !== '' ? match.vendorName : first.vendorName,
+        estimatedAmount: match.accruedAmount,
+    };
+}
+function matchesSearch(row, searchString) {
+    const trimmed = searchString.trim().toLowerCase();
+    if (trimmed.length === 0) {
+        return true;
+    }
+    if (row.vendorName.toLowerCase().includes(trimmed)) {
+        return true;
+    }
+    if (row.memo.toLowerCase().includes(trimmed)) {
+        return true;
+    }
+    return (row.groupedMembers ?? []).some((member) => (member.memo ?? '').toLowerCase().includes(trimmed));
+}
+function getActualMatchingSortValue(row, sortKey) {
+    switch (sortKey) {
+        case 'vendor':
+            return row.vendorName.toLowerCase();
+        case 'date':
+            return row.reversalDate?.valueOf() ?? row.transactionDate;
+        case 'amount':
+            return getActualMatchingAmount(row);
+        case 'category':
+            return row.jeDebitAccountName?.toLowerCase();
+        case 'class':
+            return row.jeDebitAccountingClassName?.toLowerCase();
+        case 'type':
+            return row.transactionType?.toLowerCase();
+        case 'lifecycle':
+            return row.kind;
+        case 'service':
+            return row.serviceMonth;
+        case 'accrued':
+            return row.accruedAmount?.amount ?? row.estimatedAmount.amount;
+        case 'actual':
+            return row.actualAmount?.amount;
+        case 'variance': {
+            const accrued = row.accruedAmount?.amount ?? row.estimatedAmount.amount;
+            const actual = row.actualAmount?.amount;
+            if (actual == null || accrued === 0) {
+                return undefined;
+            }
+            return ((actual - accrued) / Math.abs(accrued)) * 100;
+        }
+        default:
+            return undefined;
+    }
+}
+function sortActualMatchingRows(rows, uiState) {
+    const lodashOrder = uiState.sortOrder === 'ascending' ? 'asc' : 'desc';
+    return (0, orderBy_1.default)(rows, [(row) => getActualMatchingSortValue(row, uiState.sortKey)], [lodashOrder]);
+}
+function emptyKpiSummary() {
+    return {
+        autoReversed: { count: 0, amount: 0 },
+        pendingReview: { count: 0, amount: 0 },
+        totalThisClose: { count: 0, amount: 0 },
+        ai: { count: 0 },
+        manual: { count: 0 },
+    };
+}
+function sumRowAmounts(rows) {
+    return rows.reduce((sum, row) => sum + getActualMatchingAmount(row), 0);
+}
+function getExpenseAutomationActualMatchingMatchView(state, matchId) {
+    const view = state.expenseAutomationActualMatchingViewState;
+    return {
+        match: (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId),
+        detailFetchState: view.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
+        refreshStatus: view.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
+        undoReversalStatus: view.undoReversalStatus ?? NOT_STARTED,
+    };
+}
+function getExpenseAutomationActualMatchingView(state) {
+    const { expenseAutomationActualMatchingViewState, expenseAutomationViewState } = state;
+    const { matchIdsByPeriod, fetchState, error, refreshStatus, uiState, matchModal, undoReversalStatus, } = expenseAutomationActualMatchingViewState;
+    const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
+    const selectedPeriod = expenseAutomationViewState.selectedPeriodByTenantId[currentTenant?.tenantId ?? ''];
+    const monthYearPeriodId = selectedPeriod != null ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : undefined;
+    const matchIds = monthYearPeriodId != null ? matchIdsByPeriod[monthYearPeriodId] : undefined;
+    const rows = (matchIds ?? [])
+        .map((matchId) => (0, actualMatchingSelector_1.getActualMatchingMatchById)(state.actualMatchingState, matchId))
+        .filter((match) => match != null)
+        .filter((match) => match.members.length > 0)
+        .map(toActualMatchingRow)
+        .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 autoReversedForKpi = reversed.filter((row) => row.kind === 'auto_reversed');
+    const listedRows = [...reversed, ...pendingReview];
+    const kpiSummary = listedRows.length === 0
+        ? emptyKpiSummary()
+        : {
+            autoReversed: {
+                count: autoReversedForKpi.length,
+                amount: sumRowAmounts(autoReversedForKpi),
+            },
+            pendingReview: {
+                count: pendingReview.length,
+                amount: sumRowAmounts(pendingReview),
+            },
+            totalThisClose: {
+                count: listedRows.length,
+                amount: sumRowAmounts(listedRows),
+            },
+            ai: {
+                count: listedRows.filter((row) => row.origin === 'agent').length,
+            },
+            manual: {
+                count: listedRows.filter((row) => row.origin === 'human').length,
+            },
+        };
+    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 ?? []).map(toMatchModalAccrual);
+    const firstSuggestion = openedMatch?.members[0]?.matchSuggestion;
+    const prefill = openedMatch == null
+        ? undefined
+        : {
+            selectedAccrualIds: openedMatch.members.map((member) => member.accrualId),
+            actualAmount: openedMatch.actualAmount.amount,
+            matchedLineId: firstSuggestion?.matchedLineId,
+            matchedTransactionId: firstSuggestion?.matchedTransactionId,
+        };
+    return {
+        fetchState,
+        error,
+        reversed,
+        pendingReview,
+        kpiSummary,
+        uiState,
+        refreshStatus,
+        hasLoadedForSelectedPeriod: matchIds != null,
+        undoReversalStatus,
+        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),
+                fetchState: {
+                    fetchState: matchModal.transactionSearch.fetchState,
+                    error: matchModal.transactionSearch.error,
+                },
+                nextPageToken: matchModal.transactionSearch.nextPageToken,
+                isLoadingMore: matchModal.transactionSearch.isLoadingMore,
+            },
+            accrualSearch: {
+                query: matchModal.accrualSearch.query,
+                results: uniqueMatchModalAccruals(pinnedAccruals, searchedAccruals),
+                fetchState: {
+                    fetchState: matchModal.accrualSearch.fetchState,
+                    error: matchModal.accrualSearch.error,
+                },
+                nextPageToken: matchModal.accrualSearch.nextPageToken,
+                isLoadingMore: matchModal.accrualSearch.isLoadingMore,
+            },
+        },
+    };
+}

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

@@ -381,6 +381,9 @@ function getExpenseAutomationJESchedulesView(state) {
     // reports undefined rather than 0, so the UI can hide the badge instead of asserting "none".
     const scheduleCountsByTab = {};
     jeSchedulesViewState_1.ALL_JE_PAGE_TABS.forEach((pageTab) => {
+        if (pageTab === 'actual_matching') {
+            return;
+        }
         const periodTabKey = monthYearPeriodId != null
             ? (0, jeSchedulesViewState_1.getJESchedulePeriodTabKey)(pageTab, monthYearPeriodId)
             : null;

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

@@ -0,0 +1,99 @@
+import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
+import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
+import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { ActualMatchingMatchId } from '../../../entity/actualMatching/actualMatchingTypes';
+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 MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
+export declare const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
+export declare const MATCH_SEARCH_DEBOUNCE_MS = 300;
+export declare const toMatchAndReverseResultStatus: (v: string) => "error" | "reversed" | "noop" | "conflict" | "claim_lost";
+export type MatchAndReverseResultStatus = ReturnType<typeof toMatchAndReverseResultStatus>;
+export interface ActualMatchingViewUIState {
+    scrollPosition: {
+        scrollTop: number;
+        scrollLeft?: number;
+    } | undefined;
+    searchString: string;
+    sortKey: ActualMatchingSortKey;
+    sortOrder: SortOrder;
+}
+/**
+ * Sibling of Missing Receipts `MatchCandidate`. Confirm needs `lineId` and
+ * `transactionIntegrationId` on every row — those fields are required here.
+ */
+export interface ActualMatchingTransactionSearchResult {
+    amount: number;
+    currencyCode: string;
+    currencySymbol: string;
+    lineId: string;
+    syncToken: string;
+    transactionDate: string;
+    transactionId: ID;
+    transactionIntegrationId: string;
+    transactionType: string;
+    vendorName: string;
+    accountDescription?: string;
+    accountId?: ID;
+    accountingClassId?: ID;
+    accountingClassName?: string;
+    accountName?: string;
+    transactionDescription?: string;
+    transactionMemo?: string;
+    transactionTypeName?: string;
+    vendorId?: ID;
+}
+export interface MatchAndReverseResult {
+    accrualId: ID;
+    status: MatchAndReverseResultStatus;
+    reason?: string;
+}
+export interface MatchAndReverseAccrualsParams {
+    accrualIds: ID[];
+    lineId: string;
+    transactionId: ID;
+    transactionIntegrationId: string;
+    transactionSyncToken: string;
+    transactionType: string;
+}
+export declare const toUndoReversalResultStatus: (v: string) => "error" | "claim_lost" | "undone";
+export type UndoReversalResultStatus = ReturnType<typeof toUndoReversalResultStatus>;
+export interface UndoReversalResult {
+    accrualId: ID;
+    status: UndoReversalResultStatus;
+    reason?: string;
+}
+export interface UndoReversalAccrualsParams {
+    accrualIds: ID[];
+}
+export interface ActualMatchingTransactionSearchState extends FetchStateAndError {
+    isLoadingMore: boolean;
+    nextPageToken: string | null;
+    query: string;
+    results: ActualMatchingTransactionSearchResult[];
+}
+export interface ActualMatchingAccrualSearchState extends FetchStateAndError {
+    isLoadingMore: boolean;
+    nextPageToken: string | null;
+    query: string;
+    results: JEOneTimeAccrualKey[];
+}
+export interface ActualMatchingMatchModalState {
+    accrualSearch: ActualMatchingAccrualSearchState;
+    confirmStatus: FetchStateAndError;
+    isOpen: boolean;
+    pinnedTransactionResults: ActualMatchingTransactionSearchResult[];
+    transactionSearch: ActualMatchingTransactionSearchState;
+    lastBatchResults?: MatchAndReverseResult[];
+    openedFromMatchId?: ActualMatchingMatchId;
+}
+export interface ActualMatchingViewState extends FetchedState {
+    detailFetchStateByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    detailRefreshStatusByMatchId: Record<ActualMatchingMatchId, FetchStateAndError>;
+    matchIdsByPeriod: Record<MonthYearPeriodId, ActualMatchingMatchId[]>;
+    matchModal: ActualMatchingMatchModalState;
+    refreshStatus: FetchStateAndError;
+    uiState: ActualMatchingViewUIState;
+    undoReversalStatus: FetchStateAndError;
+}

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

@@ -0,0 +1,38 @@
+"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;
+const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
+const ACTUAL_MATCHING_SORT_KEYS = [
+    'vendor',
+    'date',
+    'amount',
+    'category',
+    'class',
+    'type',
+    'lifecycle',
+    'service',
+    'accrued',
+    'actual',
+    'variance',
+];
+const toActualMatchingSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_SORT_KEYS);
+exports.toActualMatchingSortKey = toActualMatchingSortKey;
+exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
+exports.MATCH_ACCRUAL_SEARCH_LIMIT = 50;
+exports.MATCH_SEARCH_DEBOUNCE_MS = 300;
+const MATCH_AND_REVERSE_RESULT_STATUSES = [
+    'reversed',
+    'noop',
+    'conflict',
+    'claim_lost',
+    'error',
+];
+const toMatchAndReverseResultStatus = (v) => (0, stringToUnion_1.stringToUnion)(v, MATCH_AND_REVERSE_RESULT_STATUSES);
+exports.toMatchAndReverseResultStatus = toMatchAndReverseResultStatus;
+const UNDO_REVERSAL_RESULT_STATUSES = [
+    'undone',
+    'claim_lost',
+    'error',
+];
+const toUndoReversalResultStatus = (v) => (0, stringToUnion_1.stringToUnion)(v, UNDO_REVERSAL_RESULT_STATUSES);
+exports.toUndoReversalResultStatus = toUndoReversalResultStatus;

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

@@ -12,7 +12,7 @@ import { ZeniDate } from '../../../zeniDayJS';
 import { JETransactionLink } from '../../scheduleView/scheduleDetailView/scheduleDetailState';
 export declare const toJEScheduleSortKey: (v: string) => "type" | "vendor" | "category" | "class" | "memo" | "jePostingDate" | "runningBalance" | "depCategory" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "remainingMonths" | "totalAmount" | "transactionDate";
 export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
-export declare const toJEPageTab: (v: string) => "schedules" | "existing_schedules";
+export declare const toJEPageTab: (v: string) => "schedules" | "actual_matching" | "existing_schedules";
 export type JEPageTab = ReturnType<typeof toJEPageTab>;
 export declare const ALL_JE_PAGE_TABS: readonly JEPageTab[];
 export type JESchedulePeriodTabKey = `${JEPageTab}_${MonthYearPeriodId}`;

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

@@ -20,7 +20,11 @@ const JE_SCHEDULE_SORT_KEYS = [
 ];
 const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
 exports.toJEScheduleSortKey = toJEScheduleSortKey;
-const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
+const JE_PAGE_TABS = [
+    'schedules',
+    'actual_matching',
+    'existing_schedules',
+];
 const toJEPageTab = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_PAGE_TABS);
 exports.toJEPageTab = toJEPageTab;
 exports.ALL_JE_PAGE_TABS = JE_PAGE_TABS;

package/lib/view/notificationPreferencesView/epics/saveNotificationPreferencesEpic.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveNotificationPreferencesEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const notificationRegistryState_1 = require("../../../entity/notificationRegistry/notificationRegistryState");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const notificationPreferencesEndpoint_1 = require("../notificationPreferencesEndpoint");
@@ -17,19 +16,9 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
 // ignored, so stale success/failure actions cannot clobber the newer
 // batch's state. Server-side ordering is arrival-order LWW.
 (0, operators_1.switchMap)(([, state]) => {
-    // A clean domain is omitted entirely: an empty patch is still a write against it.
-    const overridesByDomain = {};
-    const body = {};
-    notificationRegistryState_1.NOTIFICATION_DOMAINS.forEach((domain) => {
-        const overrides = (0, notificationPreferencesViewSelector_1.getNotificationLocalOverridesForDomain)(state, domain);
-        const preferencesPatch = (0, notificationPreferencesViewPayload_1.mapPreferencesToPayload)(overrides);
-        if (Object.keys(preferencesPatch).length === 0) {
-            return;
-        }
-        overridesByDomain[domain] = overrides;
-        body[`${domain}_preferences`] = preferencesPatch;
-    });
-    if (Object.keys(body).length === 0) {
+    const overrides = (0, notificationPreferencesViewSelector_1.getNotificationLocalOverrides)(state);
+    const preferencesPatch = (0, notificationPreferencesViewPayload_1.mapPreferencesToPayload)(overrides);
+    if (Object.keys(preferencesPatch).length === 0) {
         // No diff → do not dispatch a synthetic success (that would wipe
         // stored preferences via the reducer). Simply no-op.
         return rxjs_1.EMPTY;
@@ -42,6 +31,7 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
     // in-flight save's response (Success/Failure never dispatched, so
     // the counter never drained and future saves got their merge dropped).
     const cancelEpochAtDispatch = state.notificationPreferencesViewState.cancelEpoch;
+    const body = { task_checklist_preferences: preferencesPatch };
     // Suppress the error snackbar when the response lands AFTER the user
     // pressed Cancel — the Failure reducer already swallows the state
     // update, so the toast would be a stale error for a save the user
@@ -70,11 +60,8 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             return (0, rxjs_1.of)((0, notificationPreferencesViewReducer_1.saveNotificationPreferencesSuccess)({
                 cancelEpochAtDispatch,
-                savedOverridesByDomain: overridesByDomain,
-                serverEchoByDomain: {
-                    task_checklist: response.data?.task_checklist_preferences,
-                    commenting: response.data?.commenting_preferences,
-                },
+                savedOverrides: overrides,
+                serverEcho: response.data?.task_checklist_preferences,
             }));
         }
         const actions = [

package/lib/view/notificationPreferencesView/notificationPreferencesViewReducer.d.ts

@@ -1,33 +1,30 @@
-import { NotificationChannel, NotificationDomain, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
+import { NotificationChannel, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
 import { ZeniAPIStatus } from '../../responsePayload';
 import { NotificationPreferencesPayload } from './notificationPreferencesViewPayload';
-import { NotificationPreferencesByDomain, NotificationPreferencesViewState } from './notificationPreferencesViewState';
+import { NotificationPreferences, NotificationPreferencesViewState } from './notificationPreferencesViewState';
 export declare const initialState: NotificationPreferencesViewState;
 export interface SetFrequencyPayload {
     frequency: NotificationFrequency;
     groupId: string;
-    domain?: NotificationDomain;
 }
 export interface TogglePreferencePayload {
     channel: NotificationChannel;
     enabled: boolean;
     eventId: string;
-    domain?: NotificationDomain;
 }
 export interface SetGroupChannelMasterPayload {
     channel: NotificationChannel;
     enabled: boolean;
     groupId: string;
-    domain?: NotificationDomain;
 }
 export interface FetchNotificationPreferencesSuccessPayload {
-    preferencesByDomain: Partial<Record<NotificationDomain, NotificationPreferencesPayload | undefined>>;
+    preferences: NotificationPreferencesPayload | undefined;
     saveEpochAtDispatch: number;
 }
 export interface SaveNotificationPreferencesSuccessPayload {
     cancelEpochAtDispatch: number;
-    savedOverridesByDomain: NotificationPreferencesByDomain;
-    serverEchoByDomain: Partial<Record<NotificationDomain, NotificationPreferencesPayload | undefined>>;
+    savedOverrides: NotificationPreferences;
+    serverEcho: NotificationPreferencesPayload | undefined;
 }
 export interface SaveNotificationPreferencesFailurePayload {
     cancelEpochAtDispatch: number;