@zeniai/client-epic-state 5.2.47 → 5.2.49-beta0ND

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

@@ -107,32 +107,27 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
                         draft.selectedTab = 'review';
                         draft.selectedAccountId = action.payload.accountId;
                     }
-                    const accountReconciliationRecords = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod)];
-                    const { transactionFetchState } = accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId];
-                    if (transactionFetchState.fetchState !== 'Completed' ||
+                    const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod)]?.reconciliationByAccountID[action.payload.accountId];
+                    if (accountRecon == null) {
+                        return;
+                    }
+                    if (accountRecon.transactionFetchState.fetchState !== 'Completed' ||
                         action.payload.cacheOverride === true) {
-                        const data = accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId];
                         if (action.payload.refreshViewInBackground === true) {
-                            accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId] = {
-                                ...data,
-                                refreshStatus: {
-                                    fetchState: 'In-Progress',
-                                    error: undefined,
-                                },
-                                accountId: action.payload.accountId,
-                                reconciliationId: undefined,
+                            accountRecon.refreshStatus = {
+                                fetchState: 'In-Progress',
+                                error: undefined,
                             };
+                            accountRecon.accountId = action.payload.accountId;
+                            accountRecon.reconciliationId = undefined;
                         }
                         else {
-                            accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId] = {
-                                ...data,
-                                transactionFetchState: {
-                                    fetchState: 'In-Progress',
-                                    error: undefined,
-                                },
-                                accountId: action.payload.accountId,
-                                reconciliationId: undefined,
+                            accountRecon.transactionFetchState = {
+                                fetchState: 'In-Progress',
+                                error: undefined,
                             };
+                            accountRecon.accountId = action.payload.accountId;
+                            accountRecon.reconciliationId = undefined;
                         }
                     }
                 }
@@ -184,14 +179,17 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
                 }
             }
             else {
-                const accountReconciliationRecords = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod)];
+                const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod)]?.reconciliationByAccountID[action.payload.accountId];
+                if (accountRecon == null) {
+                    return;
+                }
                 if (action.payload.refreshViewInBackground === true) {
-                    accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId].refreshStatus.error = action.payload.error;
-                    accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId].refreshStatus.fetchState = 'Error';
+                    accountRecon.refreshStatus.error = action.payload.error;
+                    accountRecon.refreshStatus.fetchState = 'Error';
                 }
                 else {
-                    accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId].transactionFetchState.error = action.payload.error;
-                    accountReconciliationRecords.reconciliationByAccountID[action.payload.accountId].transactionFetchState.fetchState = 'Error';
+                    accountRecon.transactionFetchState.error = action.payload.error;
+                    accountRecon.transactionFetchState.fetchState = 'Error';
                 }
             }
         },
@@ -396,8 +394,11 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         },
         setStatementParseInProgress: (draft, action) => {
             const { accountId, selectedPeriod, statementParseInProgress } = action.payload;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementParseInProgress =
-                statementParseInProgress;
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.statementParseInProgress = statementParseInProgress;
         },
         setStatementProcessingDismissedToBackground: (draft, action) => {
             const { accountId, selectedPeriod, dismissedToBackground } = action.payload;
@@ -481,15 +482,23 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         },
         uploadAccountStatementSuccess: (draft, action) => {
             const { accountId, selectedPeriod } = action.payload;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementUploadStatus = {
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.statementUploadStatus = {
                 fetchState: 'Completed',
                 error: undefined,
             };
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementParseInProgress = true;
+            accountRecon.statementParseInProgress = true;
         },
         uploadAccountStatementFailure: (draft, action) => {
             const { accountId, selectedPeriod } = action.payload;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementUploadStatus = {
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.statementUploadStatus = {
                 fetchState: 'Error',
                 error: action.payload.error,
             };
@@ -682,23 +691,34 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         },
         reparseStatementFailure: (draft, action) => {
             const { accountId, selectedPeriod } = action.payload;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].reparseStatementStatus = {
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.reparseStatementStatus = {
                 fetchState: 'Error',
                 error: action.payload.error,
             };
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].statementProcessingFailed = true;
+            accountRecon.statementProcessingFailed = true;
         },
         resetReparseStatementStatus: (draft, action) => {
             const { accountId, selectedPeriod } = action.payload;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].reparseStatementStatus = {
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.reparseStatementStatus = {
                 fetchState: 'Not-Started',
                 error: undefined,
             };
         },
         updateParsedStatementData: (draft, action) => {
             const { accountId, selectedPeriod, parsedStatementData } = action.payload;
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].parsedStatementData =
-                parsedStatementData;
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            accountRecon.parsedStatementData = parsedStatementData;
         },
         updateStatementUpdateLocalData: (draft, action) => {
             const { accountId, selectedPeriod, statementUpdateLocalData, statementUploadId, } = action.payload;
@@ -824,17 +844,21 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         },
         updateAccountReconciliationLocalData: (draft, action) => {
             const { accountId, selectedPeriod, localData } = action.payload;
-            const oldLocalData = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].localData;
+            const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+            if (accountRecon == null) {
+                return;
+            }
+            const oldLocalData = accountRecon.localData;
             if (oldLocalData == null) {
-                draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].localData = localData;
+                accountRecon.localData = localData;
             }
             else {
-                draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].localData = {
+                accountRecon.localData = {
                     ...oldLocalData,
                     ...localData,
                 };
             }
-            draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId].localData = {
+            accountRecon.localData = {
                 ...oldLocalData,
                 ...localData,
             };
@@ -1124,7 +1148,10 @@ function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliation
     }
 }
 function updateReconciliationByAccountID(draft, accounts, selectedPeriod, accountId, reconciliationData, refreshViewInBackground) {
-    const oldRecord = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId];
+    const accountRecon = draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)]?.reconciliationByAccountID[accountId];
+    if (accountRecon == null) {
+        return;
+    }
     const oldConnectionStatus = draft.accountConnectionStatusByAccountID[accountId];
     draft.accountConnectionStatusByAccountID[accountId] = {
         status: (0, accountReconState_1.toBankStatusCodeType)(reconciliationData.bank_status.code),
@@ -1134,21 +1161,17 @@ function updateReconciliationByAccountID(draft, accounts, selectedPeriod, accoun
             : false,
         paymentAccountId: accounts.payment_account_id ?? undefined,
     };
-    const statementParseInProgress = resolveStatementParseInProgressAfterFetch(oldRecord, reconciliationData);
+    const statementParseInProgress = resolveStatementParseInProgressAfterFetch(accountRecon, reconciliationData);
+    accountRecon.reconciliationId =
+        reconciliationData.reconciliation_id ?? undefined;
+    accountRecon.statementParseInProgress = statementParseInProgress;
     if (refreshViewInBackground === true) {
-        draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId] = {
-            ...oldRecord,
-            reconciliationId: reconciliationData.reconciliation_id ?? undefined,
-            refreshStatus: { fetchState: 'Completed', error: undefined },
-            statementParseInProgress,
-        };
+        accountRecon.refreshStatus = { fetchState: 'Completed', error: undefined };
     }
     else {
-        draft.accountReconciliationRecordsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod)].reconciliationByAccountID[accountId] = {
-            ...oldRecord,
-            statementParseInProgress,
-            reconciliationId: reconciliationData.reconciliation_id ?? undefined,
-            transactionFetchState: { fetchState: 'Completed', error: undefined },
+        accountRecon.transactionFetchState = {
+            fetchState: 'Completed',
+            error: undefined,
         };
     }
 }
@@ -1178,7 +1201,11 @@ const updateExcludedAccountExclusionInfo = (draft, account) => {
     };
 };
 const updateReconciliationByAccountIDOnIncludeAccount = (draft, accountId, reconciliation, monthYearPeriodId) => {
-    draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].reconciliationByAccountID[accountId] = {
+    const accountReconciliationRecords = draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId];
+    if (accountReconciliationRecords == null) {
+        return;
+    }
+    accountReconciliationRecords.reconciliationByAccountID[accountId] = {
         accountId,
         reconciliationId: reconciliation.reconciliation_id ?? undefined,
         transactionFetchState: { fetchState: 'Not-Started', error: undefined },

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

@@ -3,6 +3,7 @@ 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");
@@ -16,9 +17,19 @@ 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]) => {
-    const overrides = (0, notificationPreferencesViewSelector_1.getNotificationLocalOverrides)(state);
-    const preferencesPatch = (0, notificationPreferencesViewPayload_1.mapPreferencesToPayload)(overrides);
-    if (Object.keys(preferencesPatch).length === 0) {
+    // 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) {
         // No diff → do not dispatch a synthetic success (that would wipe
         // stored preferences via the reducer). Simply no-op.
         return rxjs_1.EMPTY;
@@ -31,7 +42,6 @@ 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
@@ -60,8 +70,11 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             return (0, rxjs_1.of)((0, notificationPreferencesViewReducer_1.saveNotificationPreferencesSuccess)({
                 cancelEpochAtDispatch,
-                savedOverrides: overrides,
-                serverEcho: response.data?.task_checklist_preferences,
+                savedOverridesByDomain: overridesByDomain,
+                serverEchoByDomain: {
+                    task_checklist: response.data?.task_checklist_preferences,
+                    commenting: response.data?.commenting_preferences,
+                },
             }));
         }
         const actions = [

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

@@ -1,30 +1,33 @@
-import { NotificationChannel, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
+import { NotificationChannel, NotificationDomain, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
 import { ZeniAPIStatus } from '../../responsePayload';
 import { NotificationPreferencesPayload } from './notificationPreferencesViewPayload';
-import { NotificationPreferences, NotificationPreferencesViewState } from './notificationPreferencesViewState';
+import { NotificationPreferencesByDomain, 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 {
-    preferences: NotificationPreferencesPayload | undefined;
+    preferencesByDomain: Partial<Record<NotificationDomain, NotificationPreferencesPayload | undefined>>;
     saveEpochAtDispatch: number;
 }
 export interface SaveNotificationPreferencesSuccessPayload {
     cancelEpochAtDispatch: number;
-    savedOverrides: NotificationPreferences;
-    serverEcho: NotificationPreferencesPayload | undefined;
+    savedOverridesByDomain: NotificationPreferencesByDomain;
+    serverEchoByDomain: Partial<Record<NotificationDomain, NotificationPreferencesPayload | undefined>>;
 }
 export interface SaveNotificationPreferencesFailurePayload {
     cancelEpochAtDispatch: number;

package/lib/view/notificationPreferencesView/notificationPreferencesViewReducer.js

@@ -3,16 +3,27 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toggleEventChannel = exports.setGroupFrequency = exports.setGroupChannelMaster = exports.saveNotificationPreferencesSuccess = exports.saveNotificationPreferencesFailure = exports.saveNotificationPreferences = exports.fetchNotificationPreferencesSuccess = exports.clearNotificationPreferencesLocalOverrides = exports.clearAllNotificationPreferencesView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const notificationRegistryState_1 = require("../../entity/notificationRegistry/notificationRegistryState");
 const rootActions_1 = require("../../rootActions");
 const notificationPreferencesViewPayload_1 = require("./notificationPreferencesViewPayload");
 const notificationPreferencesViewState_1 = require("./notificationPreferencesViewState");
 exports.initialState = {
     cancelEpoch: 0,
-    localOverrides: (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(),
-    preferences: (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(),
+    localOverridesByDomain: {},
+    preferencesByDomain: {},
     saveEpoch: 0,
     savePreferencesState: { fetchState: 'Not-Started' },
 };
+// Lazy: a gate-off tenant never receives that domain's key at all.
+const overridesFor = (byDomain, domain) => {
+    const existing = byDomain[domain];
+    if (existing != null) {
+        return existing;
+    }
+    const created = (0, notificationPreferencesViewState_1.emptyNotificationPreferences)();
+    byDomain[domain] = created;
+    return created;
+};
 const mergePreferences = (base, patch) => {
     const eventEnabledByChannel = {
         ...base.eventEnabledByChannel,
@@ -150,7 +161,8 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // Success/Failure never dispatches, subsequent legitimate saves
             // still work because their captured epoch matches the current one.
             draft.cancelEpoch += 1;
-            draft.localOverrides = (0, notificationPreferencesViewState_1.emptyNotificationPreferences)();
+            // One shared Save/Cancel footer, so Cancel discards every domain.
+            draft.localOverridesByDomain = {};
             // Also drop `savePreferencesState` back to Not-Started so any
             // "Saving…" affordance bound to `getNotificationPreferencesSaveState`
             // clears on Cancel. Without this, a Cancel-during-save whose stale
@@ -167,9 +179,6 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // them; the save-success path is the only clearer.
             // A `null`/`undefined` payload isn't a snapshot at all (e.g. the
             // envelope key was omitted); no-op instead of wiping preferences.
-            if (action.payload.preferences == null) {
-                return;
-            }
             // Stale-GET guard (Cursor Bugbot 3632510237): if the fetch epic
             // captured a `saveEpoch` lower than the current one, a save has
             // succeeded since this GET dispatched — the response is carrying
@@ -179,7 +188,13 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             if (action.payload.saveEpochAtDispatch < draft.saveEpoch) {
                 return;
             }
-            draft.preferences = (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(action.payload.preferences);
+            Object.entries(action.payload.preferencesByDomain).forEach(([domain, payload]) => {
+                if (payload == null) {
+                    return;
+                }
+                draft.preferencesByDomain[domain] =
+                    (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(payload);
+            });
         },
         saveNotificationPreferences(draft) {
             draft.savePreferencesState = { fetchState: 'In-Progress' };
@@ -238,33 +253,44 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             // skip the `preferences` replace. Cursor Bugbot 3632510237.
             draft.saveEpoch += 1;
             draft.savePreferencesState = { fetchState: 'Completed' };
-            const patch = action.payload.serverEcho == null
-                ? action.payload.savedOverrides
-                : (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(action.payload.serverEcho);
-            draft.preferences = mergePreferences(draft.preferences, patch);
-            draft.localOverrides = subtractSavedOverrides(draft.localOverrides, action.payload.savedOverrides);
+            Object.entries(action.payload.savedOverridesByDomain).forEach(([rawDomain, savedOverrides]) => {
+                if (savedOverrides == null) {
+                    return;
+                }
+                const domain = rawDomain;
+                const serverEcho = action.payload.serverEchoByDomain[domain];
+                const patch = serverEcho == null
+                    ? savedOverrides
+                    : (0, notificationPreferencesViewPayload_1.mapPayloadToPreferences)(serverEcho);
+                draft.preferencesByDomain[domain] = mergePreferences(draft.preferencesByDomain[domain] ?? (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(), patch);
+                draft.localOverridesByDomain[domain] = subtractSavedOverrides(draft.localOverridesByDomain[domain] ??
+                    (0, notificationPreferencesViewState_1.emptyNotificationPreferences)(), savedOverrides);
+            });
         },
         setGroupChannelMaster(draft, action) {
             // Mirror of `toggleEventChannel` but scoped to the group-channel master
             // held under `groupChannelEnabledByGroupId[groupId][channel]`.
             const { channel, enabled, groupId } = action.payload;
+            const overrides = overridesFor(draft.localOverridesByDomain, action.payload.domain ?? notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
             const groupMap = {
-                ...(draft.localOverrides.groupChannelEnabledByGroupId[groupId] ?? {}),
+                ...(overrides.groupChannelEnabledByGroupId[groupId] ?? {}),
             };
             groupMap[channel] = enabled;
-            draft.localOverrides.groupChannelEnabledByGroupId[groupId] = groupMap;
+            overrides.groupChannelEnabledByGroupId[groupId] = groupMap;
         },
         setGroupFrequency(draft, action) {
-            draft.localOverrides.groupFrequencyByGroupId[action.payload.groupId] =
+            const overrides = overridesFor(draft.localOverridesByDomain, action.payload.domain ?? notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
+            overrides.groupFrequencyByGroupId[action.payload.groupId] =
                 action.payload.frequency;
         },
         toggleEventChannel(draft, action) {
             const { channel, enabled, eventId } = action.payload;
+            const overrides = overridesFor(draft.localOverridesByDomain, action.payload.domain ?? notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
             const eventMap = {
-                ...(draft.localOverrides.eventEnabledByChannel[eventId] ?? {}),
+                ...(overrides.eventEnabledByChannel[eventId] ?? {}),
             };
             eventMap[channel] = enabled;
-            draft.localOverrides.eventEnabledByChannel[eventId] = eventMap;
+            overrides.eventEnabledByChannel[eventId] = eventMap;
         },
     },
     extraReducers: (builder) => {

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

@@ -1,7 +1,11 @@
 import { FetchStateAndError } from '../../commonStateTypes/common';
+import { NotificationDomain } from '../../entity/notificationRegistry/notificationRegistryState';
 import { RootState } from '../../rootStateTypes';
 import { NotificationPreferences } from './notificationPreferencesViewState';
 export declare const getNotificationPreferencesSaveState: (state: RootState) => FetchStateAndError;
+export declare const getEffectiveNotificationPreferencesForDomain: (state: RootState, domain: NotificationDomain) => NotificationPreferences;
 export declare const getEffectiveNotificationPreferences: (state: RootState) => NotificationPreferences;
+export declare const getNotificationLocalOverridesForDomain: (state: RootState, domain: NotificationDomain) => NotificationPreferences;
 export declare const getNotificationLocalOverrides: (state: RootState) => NotificationPreferences;
+export declare const hasUnsavedNotificationPreferencesForDomain: (state: RootState, domain: NotificationDomain) => boolean;
 export declare const hasUnsavedNotificationPreferences: (state: RootState) => boolean;

package/lib/view/notificationPreferencesView/notificationPreferencesViewSelector.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasUnsavedNotificationPreferences = exports.getNotificationLocalOverrides = exports.getEffectiveNotificationPreferences = exports.getNotificationPreferencesSaveState = void 0;
+exports.hasUnsavedNotificationPreferences = exports.hasUnsavedNotificationPreferencesForDomain = exports.getNotificationLocalOverrides = exports.getNotificationLocalOverridesForDomain = exports.getEffectiveNotificationPreferences = exports.getEffectiveNotificationPreferencesForDomain = exports.getNotificationPreferencesSaveState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const notificationRegistryState_1 = require("../../entity/notificationRegistry/notificationRegistryState");
+const notificationPreferencesViewState_1 = require("./notificationPreferencesViewState");
 const getView = (state) => state.notificationPreferencesViewState;
 const getNotificationPreferencesSaveState = (state) => getView(state).savePreferencesState;
 exports.getNotificationPreferencesSaveState = getNotificationPreferencesSaveState;
@@ -9,7 +11,12 @@ exports.getNotificationPreferencesSaveState = getNotificationPreferencesSaveStat
 // stable reference while neither input changes — a plain function would
 // allocate a fresh object on every call and re-render every `useSelector`
 // consumer on any unrelated dispatch.
-exports.getEffectiveNotificationPreferences = (0, toolkit_1.createSelector)((state) => getView(state).preferences, (state) => getView(state).localOverrides, (preferences, localOverrides) => {
+const EMPTY_PREFERENCES = (0, notificationPreferencesViewState_1.emptyNotificationPreferences)();
+// One per domain: a shared createSelector has a cache of one and would thrash across two.
+const effectivePreferencesSelectorByDomain = new Map();
+const createEffectivePreferencesSelector = (domain) => (0, toolkit_1.createSelector)((state) => getView(state).preferencesByDomain[domain], (state) => getView(state).localOverridesByDomain[domain], (storedPreferences, storedOverrides) => {
+    const preferences = storedPreferences ?? EMPTY_PREFERENCES;
+    const localOverrides = storedOverrides ?? EMPTY_PREFERENCES;
     const mergedEventEnabledByChannel = { ...preferences.eventEnabledByChannel };
     Object.entries(localOverrides.eventEnabledByChannel).forEach(([eventId, channels]) => {
         mergedEventEnabledByChannel[eventId] = {
@@ -33,8 +40,26 @@ exports.getEffectiveNotificationPreferences = (0, toolkit_1.createSelector)((sta
         },
     };
 });
-const getNotificationLocalOverrides = (state) => getView(state).localOverrides;
+const getEffectiveNotificationPreferencesForDomain = (state, domain) => {
+    let selector = effectivePreferencesSelectorByDomain.get(domain);
+    if (selector == null) {
+        selector = createEffectivePreferencesSelector(domain);
+        effectivePreferencesSelectorByDomain.set(domain, selector);
+    }
+    return selector(state);
+};
+exports.getEffectiveNotificationPreferencesForDomain = getEffectiveNotificationPreferencesForDomain;
+const getEffectiveNotificationPreferences = (state) => (0, exports.getEffectiveNotificationPreferencesForDomain)(state, notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
+exports.getEffectiveNotificationPreferences = getEffectiveNotificationPreferences;
+const getNotificationLocalOverridesForDomain = (state, domain) => getView(state).localOverridesByDomain[domain] ?? EMPTY_PREFERENCES;
+exports.getNotificationLocalOverridesForDomain = getNotificationLocalOverridesForDomain;
+const getNotificationLocalOverrides = (state) => (0, exports.getNotificationLocalOverridesForDomain)(state, notificationRegistryState_1.DEFAULT_NOTIFICATION_DOMAIN);
 exports.getNotificationLocalOverrides = getNotificationLocalOverrides;
-exports.hasUnsavedNotificationPreferences = (0, toolkit_1.createSelector)((state) => getView(state).localOverrides, (localOverrides) => Object.keys(localOverrides.eventEnabledByChannel).length > 0 ||
+const isDirty = (localOverrides) => Object.keys(localOverrides.eventEnabledByChannel).length > 0 ||
     Object.keys(localOverrides.groupChannelEnabledByGroupId).length > 0 ||
-    Object.keys(localOverrides.groupFrequencyByGroupId).length > 0);
+    Object.keys(localOverrides.groupFrequencyByGroupId).length > 0;
+const hasUnsavedNotificationPreferencesForDomain = (state, domain) => isDirty((0, exports.getNotificationLocalOverridesForDomain)(state, domain));
+exports.hasUnsavedNotificationPreferencesForDomain = hasUnsavedNotificationPreferencesForDomain;
+// Drives the shared page-level Save/Cancel footer.
+const hasUnsavedNotificationPreferences = (state) => Object.values(getView(state).localOverridesByDomain).some((localOverrides) => localOverrides != null && isDirty(localOverrides));
+exports.hasUnsavedNotificationPreferences = hasUnsavedNotificationPreferences;

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

@@ -1,5 +1,5 @@
 import { FetchStateAndError } from '../../commonStateTypes/common';
-import { NotificationChannel, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
+import { NotificationChannel, NotificationDomain, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
 export interface NotificationPreferences {
     eventEnabledByChannel: Record<string, Partial<Record<NotificationChannel, boolean>>>;
     groupChannelEnabledByGroupId: Record<string, Partial<Record<NotificationChannel, boolean>>>;
@@ -7,9 +7,10 @@ export interface NotificationPreferences {
 }
 export interface NotificationPreferencesViewState {
     cancelEpoch: number;
-    localOverrides: NotificationPreferences;
-    preferences: NotificationPreferences;
+    localOverridesByDomain: NotificationPreferencesByDomain;
+    preferencesByDomain: NotificationPreferencesByDomain;
     saveEpoch: number;
     savePreferencesState: FetchStateAndError;
 }
+export type NotificationPreferencesByDomain = Partial<Record<NotificationDomain, NotificationPreferences>>;
 export declare const emptyNotificationPreferences: () => NotificationPreferences;

package/lib/view/settingsView/epic/fetchNotificationSettingsEpic.js

@@ -41,11 +41,21 @@ const fetchNotificationSettingsEpic = (actions$, state$, zeniAPI) => actions$.pi
             // 67d6918e.
             updateActions.push((0, notificationRegistryReducer_1.updateNotificationRegistry)({
                 registry: response.data.task_checklist_registry ?? undefined,
+                // An absent `<domain>_registry` means that domain's gate is off.
+                registriesByDomain: {
+                    task_checklist: response.data.task_checklist_registry ?? undefined,
+                    commenting: response.data.commenting_registry ?? undefined,
+                },
                 registryEpochAtDispatch,
             }));
-            if (response.data.task_checklist_preferences != null) {
+            // One action so the domains cannot land on different store epochs.
+            const preferencesByDomain = {
+                task_checklist: response.data.task_checklist_preferences ?? undefined,
+                commenting: response.data.commenting_preferences ?? undefined,
+            };
+            if (Object.values(preferencesByDomain).some((preferences) => preferences != null)) {
                 updateActions.push((0, notificationPreferencesViewReducer_1.fetchNotificationPreferencesSuccess)({
-                    preferences: response.data.task_checklist_preferences,
+                    preferencesByDomain,
                     saveEpochAtDispatch,
                 }));
             }

package/lib/view/settingsView/settingsViewPayload.d.ts

@@ -37,6 +37,8 @@ export interface NotificationSettingsPayload {
     pending_bill_approval_notification: RemindersPayload | null;
     pending_reimbursement_approval_notification: RemindersPayload | null;
     uncategorized_transaction_notification: RemindersPayload | null;
+    commenting_preferences?: NotificationPreferencesPayload;
+    commenting_registry?: NotificationRegistryPayload;
     month_end_email_recipient_email_ids?: string[];
     task_checklist_preferences?: NotificationPreferencesPayload;
     task_checklist_registry?: NotificationRegistryPayload;

package/package.json

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