@zeniai/client-epic-state 5.2.52 → 5.2.53-beta0ND

package/lib/view/aiCfoView/epics/fetchRoutineRunsEpic.js

@@ -30,7 +30,9 @@ const fetchRoutineRunsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, o
             // Filtered, not trusted: one malformed row must not take the
             // whole history down, and a run without an id is not addressable
             // by anything the UI does with it.
-            runs: (data.runs ?? []).filter(toRoutineRun_1.isRoutineRunPayload).map(toRoutineRun_1.toRoutineRun),
+            runs: (data.runs ?? [])
+                .filter(toRoutineRun_1.isRoutineRunPayload)
+                .map(toRoutineRun_1.toRoutineRun),
             scheduleId,
             sessionId: data.session_id ?? null,
         });

package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationEpic.js

@@ -9,7 +9,6 @@ const transactionReducer_1 = require("../../../../entity/transaction/transaction
 const responsePayload_1 = require("../../../../responsePayload");
 const transactionCategorizationLocalDataHelper_1 = require("../../helpers/transactionCategorizationLocalDataHelper");
 const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
-const completedSubTab_1 = require("../../types/completedSubTab");
 const transactionsViewState_1 = require("../../types/transactionsViewState");
 const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.fetchTransactionCategorization.match), 
 // Per-tab switchMap: cancels in-flight requests for the same tab on a new
@@ -36,9 +35,10 @@ const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => action
         // cross-status search (omit or true) is reserved for Receipts
         // manual-match.
         search_all_statuses: false,
-        sub_tab: selectedTab === 'autoCategorized'
-            ? expenseAutomationTransactionsViewState.selectedTransactionCategorizationCompletedSubTab
-            : completedSubTab_1.DEFAULT_COMPLETED_SUB_TAB,
+        // Sent on both tabs: the backend ignores it for Review's own rows but uses
+        // it to scope the Completed badge it returns alongside them.
+        sub_tab: expenseAutomationTransactionsViewState
+            .selectedTransactionCategorizationCompletedSubTab,
         transaction_group: expenseAutomationTransactionsViewState.selectedTransactionGroup,
     };
     return zeniAPI
@@ -90,6 +90,17 @@ const fetchTransactionCategorizationEpic = (actions$, state$, zeniAPI) => action
                 parentTotalCount: response.data.parent_tab_total_count ??
                     response.data.total_count,
             }));
+            // The inactive tab's badge, counted under the same filters. Absent on
+            // pages after the first and on the cross-tab search path, where the
+            // last known value stays correct.
+            const otherTabTotalCount = response.data.other_tab_total_count;
+            if (otherTabTotalCount != null) {
+                updateActions.push((0, transactionsViewReducer_1.updateParentTotalCountForTab)({
+                    selectedPeriod,
+                    selectedTab: selectedTab === 'review' ? 'autoCategorized' : 'review',
+                    parentTotalCount: otherTabTotalCount,
+                }));
+            }
             updateActions.push((0, transactionsViewReducer_1.resetOtherTabsFetchState)({
                 refreshViewInBackground,
                 tabs: transactionsViewState_1.TRANSACTIONS_TABS.filter((tab) => selectedTab !== tab),

package/lib/view/expenseAutomationView/payload/transactionCategorizationPayload.d.ts

@@ -15,9 +15,9 @@ export interface TransactionCategorizationQueryPayload {
     start_date: string | null;
     /**
      * Required. For the Completed (`auto_categorized=true`) listing, scopes the
-     * returned page + `total_count` to one of the Completed sub-tabs. For the
-     * Review listing it is forced to `'all'` to preserve parent-tab semantics
-     * on the backend.
+     * returned page + `total_count` to one of the Completed sub-tabs. It is sent
+     * on the Review listing too: the backend ignores it for Review's own status
+     * set, but uses it to scope the Completed badge in `other_tab_total_count`.
      */
     sub_tab: CompletedSubTab;
     /**
@@ -44,10 +44,21 @@ export interface TransactionCategorizationPayload {
     total_count: number;
     transactions: SupportedTransactionPayload[];
     /**
-     * Count of transactions for the entire parent tab (Review or Completed),
-     * regardless of which sub-tab the listing was scoped to. Used solely to
-     * drive the parent tab badge counts on the UI; pagination, list-level
-     * counts, and sub-tab chips continue to consume {@link total_count}.
+     * Badge count for the OTHER tab (Completed when this response is Review, and
+     * vice versa) under the same filters, so both badges move together with the
+     * Transaction Group dropdown and the Completed sub-tab without having to
+     * fetch that tab's rows.
+     *
+     * `null`/absent when the backend computed no badge — pages after the first
+     * (a scroll cannot change either badge) and the cross-tab search path used by
+     * Receipts manual-match. Consumers must keep their last known value then.
+     */
+    other_tab_total_count?: number | null;
+    /**
+     * Badge count for the tab this response belongs to, taken under every filter
+     * the request carried (`transaction_group`, `sub_tab`, `search_text`) — so it
+     * matches the rows rendered below it and equals {@link total_count}. Retained
+     * as its own key for wire compatibility.
      *
      * Optional at the wire boundary so that any version-skew scenario
      * (delayed BE rollout, cached SW response, hotfix without the BE change)

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

@@ -380,6 +380,16 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                 if (cached != null) {
                     autoCat.uiState.pageToken = cached.pageToken;
                     autoCat.uiState.totalCount = { ...cached.totalCount };
+                    // Keep the stored badge in step with the restored sub-tab: the selector
+                    // falls back to it for any period this sub-tab has not loaded. Merged,
+                    // not replaced -- the snapshot only holds periods this sub-tab actually
+                    // loaded, while the badge map also carries periods filled from a Review
+                    // response's `other_tab_total_count`. Overwriting would drop those and
+                    // leave the badge at 0 for any period this sub-tab never visited.
+                    draft.parentTotalCountByTab.autoCategorized = {
+                        ...draft.parentTotalCountByTab.autoCategorized,
+                        ...cached.totalCount,
+                    };
                     autoCat.uiState.scrollPosition = cached.scrollPosition;
                     autoCat.transactionIdsBySelectedPeriod = {
                         ...cached.transactionIdsBySelectedPeriod,

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

@@ -28,10 +28,14 @@ export interface ExpenseAutomationTransactionViewSelector extends SelectorView {
     isAccountingProjectsEnabled: boolean;
     markAsNotMiscategorizedStatus: FetchStateAndError;
     /**
-     * Parent tab badge counts, sourced from the listing response's
-     * `parent_tab_total_count`. Used exclusively to drive the navbar / tab
-     * strip badge labels — every other count consumer (pagination, in-list
-     * "showing X of Y", save flows) keeps reading {@link totalCountByTab}.
+     * Tab badge counts under the filters currently applied to the list
+     * (transaction group + Completed sub-tab + search), so each badge matches
+     * the rows its tab renders. The active tab's entry is {@link totalCountByTab}
+     * itself, so it cannot drift when a cache hit skips the fetch; the inactive
+     * tab's comes from the listing response's `other_tab_total_count`. Used
+     * exclusively to drive the navbar / tab strip badge labels — every other
+     * count consumer (pagination, in-list "showing X of Y", save flows) keeps
+     * reading {@link totalCountByTab}.
      */
     parentTabTotalCountByTab: Record<TransactionsTab, number>;
     projectList: ProjectListSelectorView;

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

@@ -182,18 +182,35 @@ function getExpenseAutomationTransactionView(state) {
         review: monthYearPeriodId != null ? totalCountByReview[monthYearPeriodId] : 0,
         autoCategorized: monthYearPeriodId != null ? totalCountByAutoCat[monthYearPeriodId] : 0,
     };
-    // Parent-tab badge counts. Sourced from `parent_tab_total_count` in the
-    // listing response and used exclusively by the navbar / tab strip badges.
-    // Independent of which Completed sub-tab is active so the badge stays
-    // stable across sub-tab switches.
+    // Tab badge counts, used exclusively by the navbar / tab strip badges. Both
+    // tabs are counted under the filters applied to the list, so a badge always
+    // equals the number of rows that tab shows.
+    //
+    // The ACTIVE tab prefers its own list count: the two are the same number (the
+    // backend's parent_tab_total_count mirrors total_count), but `uiState.totalCount`
+    // is restored by every cache path that skips a fetch -- switching back to an
+    // already-loaded period, or to a cached Completed sub-tab -- whereas the stored
+    // badge is only written when a response lands, so on those paths it would keep
+    // showing whatever was fetched last.
+    //
+    // The `in` check is load-bearing, not defensive: `totalCount` is a per-period
+    // map typed as `Record<MonthYearPeriodId, number>`, so indexing it is typed
+    // `number` but is `undefined` for any period the active (sub-)tab has not
+    // loaded -- the window between switching to a fresh sub-tab and its response
+    // landing. Falling back to the stored badge there keeps a real number in the
+    // label instead of blanking it.
     const parentTotalCountByTab = expenseAutomationTransactionsViewState.parentTotalCountByTab;
+    const storedBadgeByTab = (tab) => monthYearPeriodId != null
+        ? (parentTotalCountByTab[tab][monthYearPeriodId] ?? 0)
+        : 0;
+    const badgeForTab = (tab, listCountByPeriod) => selectedTransactionCategorizationTab === tab &&
+        monthYearPeriodId != null &&
+        monthYearPeriodId in listCountByPeriod
+        ? listCountByPeriod[monthYearPeriodId]
+        : storedBadgeByTab(tab);
     const parentTabTotalCountByTab = {
-        review: monthYearPeriodId != null
-            ? (parentTotalCountByTab.review[monthYearPeriodId] ?? 0)
-            : 0,
-        autoCategorized: monthYearPeriodId != null
-            ? (parentTotalCountByTab.autoCategorized[monthYearPeriodId] ?? 0)
-            : 0,
+        review: badgeForTab('review', totalCountByReview),
+        autoCategorized: badgeForTab('autoCategorized', totalCountByAutoCat),
     };
     const fetchStateByTab = {
         review: {

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

@@ -139,11 +139,14 @@ export type TransactionsViewState = {
      */
     autoCategorizedSubTabCache: Partial<Record<CompletedSubTab, AutoCategorizedSubTabSnapshot>>;
     /**
-     * Period-keyed parent tab counts, scoped per {@link TransactionsTab}.
-     * Sourced from the listing response's `parent_tab_total_count` and used
-     * exclusively to drive the parent tab badges on the UI — every other
-     * count consumer (pagination, sub-tab chips, in-tab "showing X of Y")
-     * keeps reading from {@link TransactionsViewUIState.totalCount}.
+     * Period-keyed tab badge counts, scoped per {@link TransactionsTab}. Every
+     * count here is taken under the filters currently applied to the list
+     * (`transaction_group` + Completed `sub_tab` + search), so a badge always
+     * matches the rows that tab renders. The active tab is filled from the
+     * listing response's `parent_tab_total_count` and the inactive one from its
+     * `other_tab_total_count`. Used exclusively to drive the tab badges — every
+     * other count consumer (pagination, in-tab "showing X of Y") keeps reading
+     * from {@link TransactionsViewUIState.totalCount}.
      */
     parentTotalCountByTab: Record<TransactionsTab, Record<MonthYearPeriodId, number>>;
     selectedTransactionCategorizationCompletedSubTab: CompletedSubTab;

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.d.ts

@@ -79,6 +79,13 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
      */
     qboAccountHierarchy: NestedAccountHierarchyForReport[];
     qboClassHierarchy: NestedClassHierarchyForReport[];
+    /**
+     * The ids within the account tree an income account may be picked from.
+     * QuickBooks only accepts an income account on a product, so a price point
+     * mapped to anything else — A/R, deferred revenue, a bank account — fails to
+     * sync once an invoice carrying it is pushed.
+     */
+    qboIncomeAccountIds: string[];
     /**
      * Loading the item, as distinct from this view's own `fetchState`, which
      * tracks the save.

package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewSelector.js

@@ -50,6 +50,21 @@ const NOT_STARTED = {
     error: undefined,
     fetchState: 'Not-Started',
 };
+/**
+ * The QuickBooks ids a price point's income account may be picked from.
+ *
+ * Memoized, and collapsing to one shared empty array while QBO is disconnected:
+ * the pages turn this into their picker options and re-seed their form defaults
+ * when those change, so a fresh array on every store change would reset the form
+ * under the user — including mid-save.
+ */
+const getInvoicingCatalogIncomeAccountIds = (0, toolkit_1.createSelector)([
+    invoicingQboViewSelector_1.getInvoicingQboAccountOptions,
+    (state) => (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).qboAccountMappingKindOptions,
+    invoicingQboViewSelector_1.isInvoicingQboConnected,
+], (accounts, qboAccountMappingKindOptions, isQboConnected) => isQboConnected
+    ? (0, invoicingQboViewSelector_1.invoicingQboAccountIdsForMappingSlot)(accounts, qboAccountMappingKindOptions, invoicingQboViewSelector_1.INVOICING_INCOME_ACCOUNT_MAPPING_SLOT, invoicingQboViewSelector_1.INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES)
+    : invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_IDS);
 const getInvoicingCatalogItemFormView = (state, id) => {
     const { editDraftById, error, fetchState, newItemDraft, savedItemId, savedKind, } = state.editInvoicingCatalogItemDetailViewState;
     const plan = id != null ? (0, planSelector_1.getInvoicingPlanById)(state.invoicingPlanState, id) : undefined;
@@ -100,8 +115,9 @@ const getInvoicingCatalogItemFormView = (state, id) => {
         isFormLoading: (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state) ||
             (0, invoicingFormDraft_1.isInvoicingFormDraftPending)(editDraftById, id),
         isQboPickerDataLoading: (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state),
-        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? [],
-        qboClassHierarchy: qboView?.nestedClassHierarchy ?? [],
+        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_HIERARCHY,
+        qboClassHierarchy: qboView?.nestedClassHierarchy ?? invoicingQboViewSelector_1.NO_INVOICING_CLASS_HIERARCHY,
+        qboIncomeAccountIds: getInvoicingCatalogIncomeAccountIds(state),
         applicabilityValues: invoicingCatalogItemFormHelper_1.INVOICING_CATALOG_APPLICABILITY_VALUES,
         applicableItemOptions,
         localData,

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.d.ts

@@ -82,8 +82,9 @@ export interface InvoicingCouponFormView extends EditInvoicingCouponDetailView {
     /**
      * The account tree the discounts-account picker renders, and the QuickBooks
      * ids within it the discounts slot accepts. Two values rather than a filtered
-     * tree: the picker groups by parent, and dropping a parent that is not itself
-     * an income account would take its income children with it.
+     * tree: the picker flattens the tree into options by walking each node's
+     * children, so dropping a parent that is not itself an income account would
+     * drop its income descendants with it.
      *
      * Empty until QBO is connected — the form must not offer a mapping that
      * cannot be pushed.

package/lib/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewSelector.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInvoicingCouponFormView = exports.getEditInvoicingCouponDetailViewState = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const couponSelector_1 = require("../../../entity/invoicing/coupon/couponSelector");
 const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
@@ -14,6 +15,21 @@ const editInvoicingCouponDetailViewState_1 = require("./editInvoicingCouponDetai
  * the id of the coupon last saved, and — when a `couponId` is passed (edit
  * mode) — the existing coupon entity to prefill the form.
  */
+/**
+ * The QuickBooks ids the discounts account may be picked from.
+ *
+ * Memoized, and collapsing to one shared empty array while QBO is disconnected:
+ * the form turns this into its picker options and re-seeds its defaults when
+ * those change, so a fresh array on every store change would reset the form
+ * under the user until their first edit.
+ */
+const getInvoicingCouponDiscountsAccountIds = (0, toolkit_1.createSelector)([
+    invoicingQboViewSelector_1.getInvoicingQboAccountOptions,
+    (state) => (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state).qboAccountMappingKindOptions,
+    invoicingQboViewSelector_1.isInvoicingQboConnected,
+], (accounts, qboAccountMappingKindOptions, isQboConnected) => isQboConnected
+    ? (0, invoicingQboViewSelector_1.invoicingQboAccountIdsForMappingSlot)(accounts, qboAccountMappingKindOptions, invoicingQboViewSelector_1.INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT, invoicingQboViewSelector_1.INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES)
+    : invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_IDS);
 const NOT_STARTED = {
     error: undefined,
     fetchState: 'Not-Started',
@@ -55,14 +71,6 @@ const getEditInvoicingCouponDetailViewState = (state, couponId) => {
     };
 };
 exports.getEditInvoicingCouponDetailViewState = getEditInvoicingCouponDetailViewState;
-/**
- * The account types the discounts slot falls back to when the config has no
- * `discounts_account` kind. A QuickBooks discount line posts to an income
- * account; offering every account instead would let a save be rejected.
- */
-const DEFAULT_DISCOUNTS_ACCOUNT_TYPES = 'Income';
-/** The account-mapping slot a coupon's discounts account shares with settings. */
-const DISCOUNTS_ACCOUNT_MAPPING_SLOT = 'discounts_account';
 /**
  * Bundled view for the discount form screen: the edit view (save state + the
  * coupon to prefill in edit mode), the draft `localData` (seeded from the
@@ -78,7 +86,7 @@ const getInvoicingCouponFormView = (state, couponId) => {
     const localData = couponId != null
         ? (0, invoicingFormDraft_1.getInvoicingFormDraftLocalData)(editDraftById, couponId, editInvoicingCouponDetailViewState_1.initialInvoicingCouponFormLocalData)
         : newCouponDraft;
-    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, qboAccountMappingKindOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
+    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     const isQboConnected = (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state);
     const qboView = isQboConnected ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state) : undefined;
     const isQboPickerDataLoading = (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state);
@@ -88,14 +96,6 @@ const getInvoicingCouponFormView = (state, couponId) => {
     const isCreateSeedPending = couponId == null &&
         (settingsFetchState === 'Not-Started' ||
             settingsFetchState === 'In-Progress');
-    // The account types the discounts slot accepts come from the same config the
-    // QBO settings page reads, so the two pickers offer the same accounts and
-    // widening the slot stays a config change. Matched on the slot rather than
-    // the code as written: a config that names the kind `discounts_account_id`
-    // is the same slot, and missing it here would quietly fall back to the
-    // default and offer a different set than the settings page does.
-    const discountsAccountTypes = qboAccountMappingKindOptions.find((kindOption) => (0, invoicingCommonPayload_1.toInvoicingQboAccountMappingSlot)(kindOption.code) ===
-        DISCOUNTS_ACCOUNT_MAPPING_SLOT)?.accountTypes ?? DEFAULT_DISCOUNTS_ACCOUNT_TYPES;
     return {
         ...base,
         applyOnOptions: discountApplyOnOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
@@ -134,8 +134,8 @@ const getInvoicingCouponFormView = (state, couponId) => {
             },
         mode: couponId != null ? 'edit' : 'create',
         periodUnitOptions: billingPeriodUnitOptions.map(invoicingCommonPayload_1.toInvoicingFormOption),
-        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? [],
-        qboIncomeAccountIds: (0, invoicingQboViewSelector_1.invoicingAccountsForQboAccountTypes)(qboView?.accounts ?? [], discountsAccountTypes).map((account) => account.id),
+        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? invoicingQboViewSelector_1.NO_INVOICING_ACCOUNT_HIERARCHY,
+        qboIncomeAccountIds: getInvoicingCouponDiscountsAccountIds(state),
     };
 };
 exports.getInvoicingCouponFormView = getInvoicingCouponFormView;

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.d.ts

@@ -3,6 +3,7 @@ import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classes
 import { FetchStateAndError } from '../../../commonStateTypes/common';
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
+import { InvoicingQboAccountMappingKindOption } from '../../../entity/invoicing/invoicingCommonPayload';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
 export declare const INVOICING_ACCOUNT_LIST_KEY: "accountList";
@@ -60,6 +61,17 @@ export interface InvoicingQboView {
     connection?: InvoicingQboConnection;
     syncHealth?: InvoicingQboSyncHealth;
 }
+/**
+ * Accounts as the invoicing pickers need them, from the shared
+ * accounting-service list, so whatever another screen already loaded is reused.
+ * `qboId` is the submitted value because that is what the invoicing API stores;
+ * an account without one cannot be posted, so it is dropped rather than offered.
+ *
+ * Memoized on the two slices it reads: the pickers and the lists derived from
+ * them are handed straight to forms, and a fresh array on every store change
+ * re-seeds a form the user is editing.
+ */
+export declare const getInvoicingQboAccountOptions: (state: RootState) => InvoicingAccountingOption[];
 /**
  * The accounts valid for one QBO mapping kind, whose `accountTypes` is a
  * comma-separated list of QuickBooks type names. An unrecognised list yields no
@@ -67,6 +79,43 @@ export interface InvoicingQboView {
  * required would post a mapping QuickBooks rejects.
  */
 export declare const invoicingAccountsForQboAccountTypes: (accounts: InvoicingAccountingOption[], accountTypes: string) => InvoicingAccountingOption[];
+/**
+ * The account-mapping slot a catalog price point's income account shares with
+ * the settings page, and the one a discount's account shares with it.
+ */
+export declare const INVOICING_INCOME_ACCOUNT_MAPPING_SLOT = "default_income_account";
+export declare const INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT = "discounts_account";
+/**
+ * The account types a slot falls back to when the config carries no kind for
+ * it. QuickBooks posts a product, a price and a discount line to an income
+ * account; offering every account instead would let a save be rejected.
+ */
+export declare const INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES = "Income";
+/**
+ * The QuickBooks ids a mapping slot's picker may offer, from the account types
+ * the config gives that slot — so every picker filling the same slot offers the
+ * same accounts, and widening one stays a config change.
+ *
+ * Ids rather than a filtered tree: the pickers flatten the tree into options by
+ * walking each node's children, so dropping a parent that is not itself of the
+ * wanted type would drop its matching descendants with it.
+ *
+ * Matched on the slot rather than the code as written, since a config naming
+ * the kind `discounts_account_id` means the same slot. A slot the config does
+ * not carry falls back to `defaultAccountTypes` rather than to every account.
+ */
+export declare const invoicingQboAccountIdsForMappingSlot: (accounts: InvoicingAccountingOption[], accountMappingKindOptions: InvoicingQboAccountMappingKindOption[], mappingSlot: string, defaultAccountTypes: string) => string[];
+/**
+ * Stable empties for a tenant with no QBO connection.
+ *
+ * `?? []` builds a fresh array per call, and the invoicing forms re-seed their
+ * fields whenever their option lists change identity — so a form open against a
+ * disconnected tenant would reset itself on every unrelated store change, until
+ * the first edit disarms the re-seed.
+ */
+export declare const NO_INVOICING_ACCOUNT_HIERARCHY: NestedAccountHierarchyForReport[];
+export declare const NO_INVOICING_CLASS_HIERARCHY: NestedClassHierarchyForReport[];
+export declare const NO_INVOICING_ACCOUNT_IDS: string[];
 /**
  * Single bundled view for the QBO integration settings screen — the
  * connection, the account and class options, sync health, and the fetch/action

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = exports.invoicingAccountsForQboAccountTypes = exports.getInvoicingCatalogAccountingLookup = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+exports.getInvoicingQboView = exports.NO_INVOICING_ACCOUNT_IDS = exports.NO_INVOICING_CLASS_HIERARCHY = exports.NO_INVOICING_ACCOUNT_HIERARCHY = exports.invoicingQboAccountIdsForMappingSlot = exports.INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES = exports.INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT = exports.INVOICING_INCOME_ACCOUNT_MAPPING_SLOT = exports.invoicingAccountsForQboAccountTypes = exports.getInvoicingQboAccountOptions = exports.getInvoicingCatalogAccountingLookup = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
+const invoicingCommonPayload_1 = require("../../../entity/invoicing/invoicingCommonPayload");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 // The shared bucket, fetched with the same arguments as the other consumers so
@@ -91,14 +93,20 @@ const getInvoicingCatalogAccountingLookup = (state) => ({
 });
 exports.getInvoicingCatalogAccountingLookup = getInvoicingCatalogAccountingLookup;
 /**
- * Accounts and classes as the invoicing pickers need them. Both come from the
- * shared accounting-service lists, so whatever another screen already loaded
- * is reused. `qboId` is the submitted value because that is what the invoicing
- * API stores; an account without one cannot be posted, so it is dropped rather
- * than offered.
+ * Accounts as the invoicing pickers need them, from the shared
+ * accounting-service list, so whatever another screen already loaded is reused.
+ * `qboId` is the submitted value because that is what the invoicing API stores;
+ * an account without one cannot be posted, so it is dropped rather than offered.
+ *
+ * Memoized on the two slices it reads: the pickers and the lists derived from
+ * them are handed straight to forms, and a fresh array on every store change
+ * re-seeds a form the user is editing.
  */
-const invoicingAccountingOptions = (state) => {
-    const { accounts } = (0, accountListSelector_1.getAccountList)(state.accountState, state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
+exports.getInvoicingQboAccountOptions = (0, toolkit_1.createSelector)([
+    (state) => state.accountState,
+    (state) => state.accountListState,
+], (accountState, accountListState) => {
+    const { accounts } = (0, accountListSelector_1.getAccountList)(accountState, accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
     return accounts.flatMap((account) => {
         if (account.qboId == null || account.isDeleted === true) {
             return [];
@@ -111,7 +119,7 @@ const invoicingAccountingOptions = (state) => {
             },
         ];
     });
-};
+});
 /**
  * Normalises an account-type name for comparison. The config's mapping kinds
  * name QuickBooks types the way QuickBooks displays them ("Other Current
@@ -148,6 +156,47 @@ const invoicingAccountsForQboAccountTypes = (accounts, accountTypes) => {
         wanted.has(normalizeAccountTypeName(account.accountType)));
 };
 exports.invoicingAccountsForQboAccountTypes = invoicingAccountsForQboAccountTypes;
+/**
+ * The account-mapping slot a catalog price point's income account shares with
+ * the settings page, and the one a discount's account shares with it.
+ */
+exports.INVOICING_INCOME_ACCOUNT_MAPPING_SLOT = 'default_income_account';
+exports.INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT = 'discounts_account';
+/**
+ * The account types a slot falls back to when the config carries no kind for
+ * it. QuickBooks posts a product, a price and a discount line to an income
+ * account; offering every account instead would let a save be rejected.
+ */
+exports.INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES = 'Income';
+/**
+ * The QuickBooks ids a mapping slot's picker may offer, from the account types
+ * the config gives that slot — so every picker filling the same slot offers the
+ * same accounts, and widening one stays a config change.
+ *
+ * Ids rather than a filtered tree: the pickers flatten the tree into options by
+ * walking each node's children, so dropping a parent that is not itself of the
+ * wanted type would drop its matching descendants with it.
+ *
+ * Matched on the slot rather than the code as written, since a config naming
+ * the kind `discounts_account_id` means the same slot. A slot the config does
+ * not carry falls back to `defaultAccountTypes` rather than to every account.
+ */
+const invoicingQboAccountIdsForMappingSlot = (accounts, accountMappingKindOptions, mappingSlot, defaultAccountTypes) => {
+    const accountTypes = accountMappingKindOptions.find((kindOption) => (0, invoicingCommonPayload_1.toInvoicingQboAccountMappingSlot)(kindOption.code) === mappingSlot)?.accountTypes ?? defaultAccountTypes;
+    return (0, exports.invoicingAccountsForQboAccountTypes)(accounts, accountTypes).map((account) => account.id);
+};
+exports.invoicingQboAccountIdsForMappingSlot = invoicingQboAccountIdsForMappingSlot;
+/**
+ * Stable empties for a tenant with no QBO connection.
+ *
+ * `?? []` builds a fresh array per call, and the invoicing forms re-seed their
+ * fields whenever their option lists change identity — so a form open against a
+ * disconnected tenant would reset itself on every unrelated store change, until
+ * the first edit disarms the re-seed.
+ */
+exports.NO_INVOICING_ACCOUNT_HIERARCHY = [];
+exports.NO_INVOICING_CLASS_HIERARCHY = [];
+exports.NO_INVOICING_ACCOUNT_IDS = [];
 /** Classes as the invoicing pickers need them, from the shared class list. */
 const invoicingAccountingClassOptions = (state) => {
     const { classes } = (0, classListSelector_1.getClassList)(state.classState, state.classListState);
@@ -169,7 +218,7 @@ const getInvoicingQboView = (state) => {
     const qboState = state.invoicingQboViewState;
     const accountList = state.accountListState.byReportId[exports.INVOICING_ACCOUNT_LIST_KEY];
     return {
-        accounts: invoicingAccountingOptions(state),
+        accounts: (0, exports.getInvoicingQboAccountOptions)(state),
         accountsFetchState: {
             fetchState: accountList.fetchState,
             error: accountList.error,

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;