@zeniai/client-epic-state 5.2.7 → 5.2.8-betaAK0

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

@@ -17,6 +17,7 @@ import { UncategorizedAccounts } from '../../accountList/accountListSelector';
 import { UpdateTransactionCategorizationResponsePayload } from '../payload/transactionCategorizationPayload';
 import { TransactionFilters } from '../transactionFilterTypes';
 import { SupportedTransactionCategorization, TransactionSaveUpdates, TransactionsTab, TransactionsTabViewState, TransactionsViewState, TransactionsViewUIState } from '../types/transactionsViewState';
+export declare const initialUIState: TransactionsViewUIState;
 export declare const initialTransactionTabViewState: TransactionsTabViewState;
 export declare const initialState: TransactionsViewState;
 export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any, resetListItems?: boolean | undefined], {
@@ -69,7 +70,9 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
     newSelectedTab: "review" | "autoCategorized";
 }, "expenseAutomationTransactionsView/updateCurrentSelectedTransactionCategorizationTab", never, never>, updateTransactionCategorizationCompletedSubTab: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[newSubTab: "all" | "ai_accountant" | "manual"], {
     newSubTab: "all" | "ai_accountant" | "manual";
-}, "expenseAutomationTransactionsView/updateTransactionCategorizationCompletedSubTab", never, never>, updateTransactionCategorizationSaveStatus: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", fetchState: FetchState, error?: ZeniAPIStatus<Record<string, unknown>> | undefined], {
+}, "expenseAutomationTransactionsView/updateTransactionCategorizationCompletedSubTab", never, never>, updateTransactionGroup: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[newGroup: "income" | "expense" | "all"], {
+    newGroup: "income" | "expense" | "all";
+}, "expenseAutomationTransactionsView/updateTransactionGroup", never, never>, updateTransactionCategorizationSaveStatus: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", fetchState: FetchState, error?: ZeniAPIStatus<Record<string, unknown>> | undefined], {
     selectedTab: "review" | "autoCategorized";
     fetchState: FetchState;
     error: ZeniAPIStatus<Record<string, unknown>> | undefined;

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadTransactionCategorizationReceiptSuccess = exports.updateTransactionCategorizationUploadReceiptState = exports.removeTransactionFromAllTabs = exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.markCategoryClassRecommendationsFailureForCategorization = exports.markCategoryClassRecommendationsCompletedForCategorization = exports.markCategoryClassRecommendationsInProgressForCategorization = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateParentTotalCountForTab = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateTransactionCategorizationCompletedSubTab = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionFilters = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
+exports.uploadTransactionCategorizationReceiptSuccess = exports.updateTransactionCategorizationUploadReceiptState = exports.removeTransactionFromAllTabs = exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.markCategoryClassRecommendationsFailureForCategorization = exports.markCategoryClassRecommendationsCompletedForCategorization = exports.markCategoryClassRecommendationsInProgressForCategorization = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateParentTotalCountForTab = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateTransactionGroup = exports.updateTransactionCategorizationCompletedSubTab = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionFilters = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = exports.initialUIState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -13,7 +13,18 @@ const vendorTransaction_1 = require("../../../entity/transaction/stateTypes/vend
 const rootActions_1 = require("../../../rootActions");
 const transactionCategorizationLocalDataHelper_1 = require("../helpers/transactionCategorizationLocalDataHelper");
 const completedSubTab_1 = require("../types/completedSubTab");
+const transactionGroup_1 = require("../types/transactionGroup");
 const transactionsViewState_1 = require("../types/transactionsViewState");
+exports.initialUIState = {
+    sortKey: 'date',
+    sortOrder: 'descending',
+    searchString: '',
+    nodeCollapseState: {},
+    scrollPosition: { scrollTop: 0, scrollLeft: undefined },
+    pageToken: null,
+    totalCount: {},
+    limit: 10,
+};
 exports.initialTransactionTabViewState = {
     saveStatus: {
         fetchState: 'Not-Started',
@@ -27,16 +38,7 @@ exports.initialTransactionTabViewState = {
         fetchState: 'Not-Started',
         error: undefined,
     },
-    uiState: {
-        sortKey: 'date',
-        sortOrder: 'descending',
-        searchString: '',
-        nodeCollapseState: {},
-        scrollPosition: { scrollTop: 0, scrollLeft: undefined },
-        pageToken: null,
-        totalCount: {},
-        limit: 10,
-    },
+    uiState: { ...exports.initialUIState },
     filters: {
         categoryCombinationOperator: 'AND',
         categories: [],
@@ -62,6 +64,7 @@ exports.initialState = {
     },
     selectedTransactionCategorizationTab: 'review',
     selectedTransactionCategorizationCompletedSubTab: completedSubTab_1.DEFAULT_COMPLETED_SUB_TAB,
+    selectedTransactionGroup: transactionGroup_1.DEFAULT_TRANSACTION_GROUP,
     transactionCategorizationView: {
         review: { ...exports.initialTransactionTabViewState },
         autoCategorized: { ...exports.initialTransactionTabViewState },
@@ -407,6 +410,48 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                 return { payload: { newSubTab } };
             },
         },
+        updateTransactionGroup: {
+            reducer(draft, action) {
+                const { newGroup } = action.payload;
+                if (draft.selectedTransactionGroup === newGroup) {
+                    return;
+                }
+                draft.selectedTransactionGroup = newGroup;
+                // A group change re-scopes the entire dataset on the backend (by
+                // account_type), so every parent tab, sub-tab snapshot and count is now
+                // stale. Drop the sub-tab cache and parent counts, and reset each tab's
+                // paginated data slots so the view epic's cache check falls through to a
+                // fresh page-1 fetch. User preferences (search, sort, limit, collapse
+                // state) are intentionally preserved, mirroring the sub-tab switch.
+                draft.autoCategorizedSubTabCache = {};
+                draft.parentTotalCountByTab = { review: {}, autoCategorized: {} };
+                transactionsViewState_1.TRANSACTIONS_TABS.forEach((tab) => {
+                    const view = draft.transactionCategorizationView[tab];
+                    // Reset uiState to its initial values but keep the user prefs (search,
+                    // sort, limit, collapse) in place -- mirroring the sub-tab switch. Then
+                    // drop the loaded rows and any stale selection pointing at a now-absent
+                    // row to avoid transient invalid state.
+                    const { searchString, sortKey, sortOrder, nodeCollapseState, limit } = view.uiState;
+                    view.uiState = {
+                        ...exports.initialUIState,
+                        searchString,
+                        sortKey,
+                        sortOrder,
+                        nodeCollapseState,
+                        limit,
+                    };
+                    view.transactionIdsBySelectedPeriod = {};
+                    view.fetchState = 'Not-Started';
+                    view.error = undefined;
+                    view.selectedTransactionId = undefined;
+                    view.selectedTransactionLineId = undefined;
+                    view.selectedCheckBoxTransactionIds = [];
+                });
+            },
+            prepare(newGroup) {
+                return { payload: { newGroup } };
+            },
+        },
         updateTransactionCategorization: {
             reducer(draft, action) {
                 const selectedTab = action.payload.selectedTab;
@@ -1082,5 +1127,5 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.updateTransactionFilters = _a.updateTransactionFilters, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationCompletedSubTab = _a.updateTransactionCategorizationCompletedSubTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.updateParentTotalCountForTab = _a.updateParentTotalCountForTab, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.markCategoryClassRecommendationsInProgressForCategorization = _a.markCategoryClassRecommendationsInProgressForCategorization, exports.markCategoryClassRecommendationsCompletedForCategorization = _a.markCategoryClassRecommendationsCompletedForCategorization, exports.markCategoryClassRecommendationsFailureForCategorization = _a.markCategoryClassRecommendationsFailureForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab, exports.removeTransactionFromAllTabs = _a.removeTransactionFromAllTabs, exports.updateTransactionCategorizationUploadReceiptState = _a.updateTransactionCategorizationUploadReceiptState, exports.uploadTransactionCategorizationReceiptSuccess = _a.uploadTransactionCategorizationReceiptSuccess;
+_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.updateTransactionFilters = _a.updateTransactionFilters, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationCompletedSubTab = _a.updateTransactionCategorizationCompletedSubTab, exports.updateTransactionGroup = _a.updateTransactionGroup, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.updateParentTotalCountForTab = _a.updateParentTotalCountForTab, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.markCategoryClassRecommendationsInProgressForCategorization = _a.markCategoryClassRecommendationsInProgressForCategorization, exports.markCategoryClassRecommendationsCompletedForCategorization = _a.markCategoryClassRecommendationsCompletedForCategorization, exports.markCategoryClassRecommendationsFailureForCategorization = _a.markCategoryClassRecommendationsFailureForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab, exports.removeTransactionFromAllTabs = _a.removeTransactionFromAllTabs, exports.updateTransactionCategorizationUploadReceiptState = _a.updateTransactionCategorizationUploadReceiptState, exports.uploadTransactionCategorizationReceiptSuccess = _a.uploadTransactionCategorizationReceiptSuccess;
 exports.default = expenseAutomationTransactionsView.reducer;

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

@@ -8,6 +8,7 @@ import { SupportedTransactionWithCOT } from '../../../entity/transaction/transac
 import { UncategorizedAccounts } from '../../accountList/accountListSelector';
 import { ProjectListSelectorView } from '../../projectList/projectListSelector';
 import { CompletedSubTab } from '../types/completedSubTab';
+import { TransactionGroup } from '../types/transactionGroup';
 import { TransactionReviewLocalData, TransactionsTab, TransactionsViewUIState } from '../types/transactionsViewState';
 export interface TransactionReviewLocalDataSelectorView {
     transactionId: ID;
@@ -38,6 +39,7 @@ export interface ExpenseAutomationTransactionViewSelector extends SelectorView {
     saveStatus: FetchStateAndError;
     selectedCheckBoxTransactionIds: ID[];
     selectedTransactionCategorizationCompletedSubTab: CompletedSubTab;
+    selectedTransactionGroup: TransactionGroup;
     /**
      * Per-(sub-)tab counts mirroring `total_count` from the listing response.
      * Powers pagination via `InfiniteLoader.itemCount`, in-list count copy,

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

@@ -96,7 +96,7 @@ var createTransferEntrySelector_2 = require("../../createTransferEntry/createTra
 Object.defineProperty(exports, "getLastTransferEntryReplacement", { enumerable: true, get: function () { return createTransferEntrySelector_2.getLastTransferEntryReplacement; } });
 function getExpenseAutomationTransactionView(state) {
     const { accountState, classState, classListState, accountListState, createTransferEntryState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, } = state;
-    const { selectedTransactionCategorizationCompletedSubTab, selectedTransactionCategorizationTab, } = expenseAutomationTransactionsViewState;
+    const { selectedTransactionCategorizationCompletedSubTab, selectedTransactionCategorizationTab, selectedTransactionGroup, } = expenseAutomationTransactionsViewState;
     const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
     const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
@@ -250,5 +250,6 @@ function getExpenseAutomationTransactionView(state) {
         creditCardTransferAccountsList,
         transferAccounts: transferAccountsList,
         selectedTransactionCategorizationCompletedSubTab,
+        selectedTransactionGroup,
     };
 }

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

@@ -0,0 +1,21 @@
+/**
+ * Statement-level grouping for the Transaction Categorization listing, forwarded
+ * verbatim to the listing API as `transaction_group`. When revenue automation is
+ * enabled for the tenant the backend scopes the whole view by the line
+ * account_type: `'expense'` -> expense accounts, `'income'` -> income accounts,
+ * `'all'` -> both. When off, every value falls back to the legacy expense scope
+ * on the backend, so the group is only sent when the gate is on.
+ *
+ * The wire value for expenses is the singular `'expense'` (matches the backend
+ * `TransactionGroup` enum) even though the picker labels it "Expenses".
+ * Balance-sheet groups (assets, liability) are reserved for later and are not
+ * part of this union yet.
+ */
+export declare const TRANSACTION_GROUPS: readonly ["all", "income", "expense"];
+export declare const toTransactionGroup: (v: string | null | undefined) => "income" | "expense" | "all";
+export type TransactionGroup = ReturnType<typeof toTransactionGroup>;
+/**
+ * Default group for the listing — matches the picker's default selection ("All").
+ * Single source of truth for initial slice state and any fall-back call site.
+ */
+export declare const DEFAULT_TRANSACTION_GROUP: TransactionGroup;

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

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_TRANSACTION_GROUP = exports.toTransactionGroup = exports.TRANSACTION_GROUPS = void 0;
+const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
+/**
+ * Statement-level grouping for the Transaction Categorization listing, forwarded
+ * verbatim to the listing API as `transaction_group`. When revenue automation is
+ * enabled for the tenant the backend scopes the whole view by the line
+ * account_type: `'expense'` -> expense accounts, `'income'` -> income accounts,
+ * `'all'` -> both. When off, every value falls back to the legacy expense scope
+ * on the backend, so the group is only sent when the gate is on.
+ *
+ * The wire value for expenses is the singular `'expense'` (matches the backend
+ * `TransactionGroup` enum) even though the picker labels it "Expenses".
+ * Balance-sheet groups (assets, liability) are reserved for later and are not
+ * part of this union yet.
+ */
+exports.TRANSACTION_GROUPS = ['all', 'income', 'expense'];
+const toTransactionGroup = (v) => (0, stringToUnion_1.stringToUnion)(v != null ? v.trim().toLowerCase() : '', exports.TRANSACTION_GROUPS);
+exports.toTransactionGroup = toTransactionGroup;
+/**
+ * Default group for the listing — matches the picker's default selection ("All").
+ * Single source of truth for initial slice state and any fall-back call site.
+ */
+exports.DEFAULT_TRANSACTION_GROUP = 'all';

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

@@ -19,6 +19,7 @@ import { EntityRecommendationKey } from '../../recommendation/recommendationStat
 import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
 import { TransactionFilters } from '../transactionFilterTypes';
 import { CompletedSubTab } from './completedSubTab';
+import { TransactionGroup } from './transactionGroup';
 export declare const toTransactionsSortKey: (v: string) => "project" | "date" | "vendor" | "category" | "class" | "amount" | "payment_account" | "transaction_type" | "memo_and_receipt";
 export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
 export declare const TRANSACTIONS_TABS: readonly ["review", "autoCategorized"];
@@ -147,6 +148,16 @@ export type TransactionsViewState = {
     parentTotalCountByTab: Record<TransactionsTab, Record<MonthYearPeriodId, number>>;
     selectedTransactionCategorizationCompletedSubTab: CompletedSubTab;
     selectedTransactionCategorizationTab: TransactionsTab;
+    /**
+     * Statement-level scope (`'expense' | 'income' | 'all'`) forwarded to the
+     * listing API as `transaction_group`. Unlike the in-memory {@link
+     * TransactionsTabViewState.filters}, a change here invalidates every tab /
+     * sub-tab / count and drives a server refetch (the backend re-scopes the
+     * whole dataset by account_type). Only surfaced in the UI when the
+     * `is_revenue_automation_enabled` gate is on; the backend gate is
+     * authoritative regardless of what is sent.
+     */
+    selectedTransactionGroup: TransactionGroup;
     transactionCategorizationView: Record<TransactionsTab, TransactionsTabViewState>;
 };
 export interface TransactionLineUpdates {

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

@@ -1,9 +1,20 @@
+import { AccountBase } from '../../../entity/account/accountState';
+import { ClassBase } from '../../../entity/class/classState';
 import { InvoicingPlanPayload } from '../../../entity/invoicing/plan/planPayload';
 import { ZeniAPIResponse } from '../../../responsePayload';
 import { InvoicingCatalogItemFormLocalData } from './editInvoicingCatalogItemDetailViewState';
 export type SaveInvoicingCatalogItemResponse = ZeniAPIResponse<InvoicingPlanPayload>;
+/**
+ * Resolves the QuickBooks ids the pickers submit back to the entities they name.
+ * The payload carries the whole account and class, so the ids alone are not
+ * enough; `saveInvoicingCatalogItemEpic` builds this from the shared lists.
+ */
+export interface InvoicingCatalogAccountingLookup {
+    accountByQboId: (qboId: string) => AccountBase | undefined;
+    classByQboId: (qboId: string) => ClassBase | undefined;
+}
 /**
  * Build the parent catalog-item request body from the form draft. Creates omit
  * both parent and sub-family IDs; edits retain returned sub-family IDs.
  */
-export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: InvoicingCatalogItemFormLocalData, isCreate: boolean) => Record<string, unknown>;
+export declare const localDataToSaveInvoicingCatalogItemPayload: (localData: InvoicingCatalogItemFormLocalData, isCreate: boolean, lookup: InvoicingCatalogAccountingLookup) => Record<string, unknown>;

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.localDataToSaveInvoicingCatalogItemPayload = void 0;
+const accountPayload_1 = require("../../../entity/account/accountPayload");
+const classPayload_1 = require("../../../entity/class/classPayload");
 const invoicingCatalogItemFormConfig_1 = require("./invoicingCatalogItemFormConfig");
 const CURRENCY_CODE = 'USD';
 const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
@@ -10,20 +12,26 @@ const toProductCode = (value) => value
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, '-')
     .replace(/^-|-$/g, '');
-const buildAccountingDetail = (subFamily) => {
+const buildAccountingDetail = (subFamily, lookup) => {
     const detail = {};
     if (subFamily.sku.trim() !== '') {
         detail.sku = subFamily.sku.trim();
     }
-    if (subFamily.accountingCode.trim() !== '') {
-        detail.accounting_code = subFamily.accountingCode.trim();
+    // The account and class travel as whole objects rather than bare codes, built
+    // by the same helpers the transaction and vendor payloads use. An id that no
+    // longer resolves is dropped: sending a code the service cannot expand is how
+    // a mapping silently lands on the wrong account.
+    const account = lookup.accountByQboId(subFamily.accountingCode.trim());
+    if (account != null) {
+        detail.account = (0, accountPayload_1.toAccountPayload)(account);
     }
-    if (subFamily.accountingCategory.trim() !== '') {
-        detail.accounting_category_1 = subFamily.accountingCategory.trim();
+    const accountingClass = lookup.classByQboId(subFamily.accountingCategory.trim());
+    if (accountingClass != null) {
+        detail.accounting_class = (0, classPayload_1.toClassBasePayload)(accountingClass);
     }
     return Object.keys(detail).length > 0 ? detail : undefined;
 };
-const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
+const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) => {
     const isAddon = localData.catalogType === 'addon';
     const tiered = (0, invoicingCatalogItemFormConfig_1.isTieredCatalogPricingModel)(subFamily.pricingModel);
     const name = subFamily.name.trim();
@@ -77,7 +85,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
             starting_unit: Number(tier.startingUnit) || 1,
         }));
     }
-    const accountingDetail = buildAccountingDetail(subFamily);
+    const accountingDetail = buildAccountingDetail(subFamily, lookup);
     if (accountingDetail != null) {
         payload.accounting_detail = accountingDetail;
     }
@@ -89,7 +97,7 @@ const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
  * Build the parent catalog-item request body from the form draft. Creates omit
  * both parent and sub-family IDs; edits retain returned sub-family IDs.
  */
-const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
+const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
     const description = trimOrUndefined(localData.description);
     const productCode = trimOrUndefined(localData.productCode) ?? toProductCode(localData.name);
     const itemPayload = {
@@ -117,7 +125,7 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
         ? localData.subFamilies
         : [(0, invoicingCatalogItemFormConfig_1.blankInvoicingCatalogSubFamily)()];
     itemPayload.sub_family_details = isCreate
-        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false))
+        ? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
         : subFamilies.map((subFamily) => {
             const priceCode = trimOrUndefined(subFamily.priceCode) ?? toProductCode(subFamily.name);
             const detail = {
@@ -127,6 +135,13 @@ const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
                 price_code: priceCode,
                 show_description_in_invoices: subFamily.showDescriptionInInvoices,
             };
+            // Edits send a narrower body than creates, but the accounting mapping
+            // is editable on this form, so leaving it out dropped the account and
+            // class the user had just picked.
+            const accountingDetail = buildAccountingDetail(subFamily, lookup);
+            if (accountingDetail != null) {
+                detail.accounting_detail = accountingDetail;
+            }
             const id = trimOrUndefined(subFamily.id);
             return id != null ? { ...detail, id } : detail;
         });

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

@@ -37,6 +37,11 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
      * Folded in here so the screen never reaches for the config view itself.
      */
     fieldHelp: InvoicingFieldHelpByCode;
+    /**
+     * True while the accounting lists are still loading, so the form can wait
+     * instead of mounting pickers whose options are not there yet.
+     */
+    isQboPickerDataLoading: boolean;
     localData: InvoicingCatalogItemFormLocalData;
     mode: 'create' | 'edit';
     periodUnitOptions: InvoicingNamedOption[];

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

@@ -59,6 +59,7 @@ const getInvoicingCatalogItemFormView = (state, id) => {
     const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'catalog'),
+        isQboPickerDataLoading: (0, invoicingQboViewSelector_1.isInvoicingAccountingPickerDataLoading)(state),
         qboClassHierarchy: isQboConnected
             ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state).nestedClassHierarchy
             : [],

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

@@ -9,6 +9,7 @@ const snackbarApiError_1 = require("../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
 const invoicingCatalogListViewReducer_1 = require("../invoicingCatalogListView/invoicingCatalogListViewReducer");
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
 const editInvoicingCatalogItemDetailViewPayload_1 = require("./editInvoicingCatalogItemDetailViewPayload");
 const editInvoicingCatalogItemDetailViewReducer_1 = require("./editInvoicingCatalogItemDetailViewReducer");
 const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => editInvoicingCatalogItemDetailViewReducer_1.submitInvoicingCatalogItemForm.match(action) ||
@@ -23,7 +24,11 @@ const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pip
         const viewState = state$.value.editInvoicingCatalogItemDetailViewState;
         const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
             viewState.newItemDraft;
-        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null);
+        const state = state$.value;
+        data = (0, editInvoicingCatalogItemDetailViewPayload_1.localDataToSaveInvoicingCatalogItemPayload)(localData, id == null, {
+            accountByQboId: (qboId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state, qboId),
+            classByQboId: (qboId) => (0, invoicingQboViewSelector_1.invoicingQboClassByQboId)(state, qboId),
+        });
     }
     const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
     const path = id != null

package/lib/view/invoicing/invoicingConfigView/invoicingConfigViewSelector.d.ts

@@ -32,6 +32,7 @@ export interface InvoicingOnboardingGateView {
     acceptTermsState: FetchStateAndError;
     enableState: FetchStateAndError;
     fetchState: FetchState;
+    isQboConnected: boolean;
     status?: InvoicingOnboardingStatus;
 }
 export declare const getInvoicingOnboardingGateView: (state: RootState) => InvoicingOnboardingGateView;

package/lib/view/invoicing/invoicingConfigView/invoicingConfigViewSelector.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.invoicingFieldHelpForGroup = exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = void 0;
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
 const invoicingConfigViewPayload_1 = require("./invoicingConfigViewPayload");
 const getInvoicingConfigView = (state) => {
     const { acceptTermsFetchState, enableFetchState, ...configState } = state.invoicingConfigViewState;
@@ -18,6 +19,7 @@ const getInvoicingOnboardingGateView = (state) => {
         acceptTermsState: acceptTermsFetchState,
         enableState: enableFetchState,
         fetchState,
+        isQboConnected: (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state),
         status: (0, invoicingConfigViewPayload_1.deriveInvoicingOnboardingStatus)(state.invoicingConfigViewState.isInvoicingTosAccepted, state.invoicingConfigViewState.isInvoicingEnabled),
     };
 };

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingAccountingPickersEpic.js

@@ -12,12 +12,17 @@ const invoicingQboViewSelector_1 = require("../invoicingQboViewSelector");
 const fetchInvoicingAccountingPickersEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(invoicingQboViewReducer_1.fetchInvoicingAccountingPickers.match), (0, operators_1.withLatestFrom)(state$), (0, operators_1.mergeMap)(([, state]) => {
     const actions = [];
     const accountList = state.accountListState.byReportId[invoicingQboViewSelector_1.INVOICING_ACCOUNT_LIST_KEY];
-    if (accountList.hasValidState() === false &&
+    // `hasValidState` only reports that a fetch finished, not that it
+    // returned anything usable. The shared bucket can be Completed and empty
+    // because a screen that needs fewer accounts filled it first, which would
+    // leave the invoicing pickers empty with no request in flight to fix it.
+    const isAccountListUsable = accountList.hasValidState() && accountList.accountIds.length > 0;
+    if (isAccountListUsable === false &&
         accountList.fetchState !== 'In-Progress') {
-        // AP/AR accounts cannot back an invoicing mapping, so they are excluded
-        // here — which is why this uses invoicing's own bucket rather than the
-        // general `accountList` other screens fill without those exclusions.
-        actions.push((0, accountListReducer_1.fetchAccountList)(invoicingQboViewSelector_1.INVOICING_ACCOUNT_LIST_KEY, true, true, true));
+        // Same arguments the vendor and categorization screens pass, so this
+        // shares their cached list rather than replacing it with a narrower one.
+        // Invoicing narrows to income accounts when it builds its options.
+        actions.push((0, accountListReducer_1.fetchAccountList)(invoicingQboViewSelector_1.INVOICING_ACCOUNT_LIST_KEY, true));
     }
     const classList = state.classListState;
     if (classList.hasValidState() === false &&

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

@@ -1,17 +1,34 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError } from '../../../commonStateTypes/common';
-import { AccountType } from '../../../entity/account/accountState';
+import { AccountBase, AccountType } from '../../../entity/account/accountState';
+import { ClassBase } from '../../../entity/class/classState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
-export declare const INVOICING_ACCOUNT_LIST_KEY: "invoicingAccountList";
+export declare const INVOICING_ACCOUNT_LIST_KEY: "accountList";
 /** Whether QBO is connected, without building the option lists to find out. */
 export declare const isInvoicingQboConnected: (state: RootState) => boolean;
+/**
+ * Whether the accounting pickers are still waiting on their data. Only true when
+ * QBO is connected: a tenant without it has no pickers to populate, so the form
+ * must not sit behind a skeleton waiting for lists it will never show.
+ */
+export declare const isInvoicingAccountingPickerDataLoading: (state: RootState) => boolean;
+/** The QBO connection fetch on its own, without building the bundled view. */
+export declare const getInvoicingQboConnectionFetchState: (state: RootState) => FetchStateAndError;
 /**
  * Account types that can back invoicing revenue. Named here so screens ask for
  * "income accounts" rather than repeating the accounting service's vocabulary.
  */
 export declare const INVOICING_INCOME_ACCOUNT_TYPES: readonly AccountType[];
+/**
+ * The account behind a picker value. The pickers submit the QuickBooks id, so
+ * that is what callers hold; the payload builders need the whole entity to send
+ * `toAccountPayload`, which is why the lookup lives here next to the options.
+ */
+export declare const invoicingQboAccountByQboId: (state: RootState, qboId: string | undefined) => AccountBase | undefined;
+/** The class behind a picker value, for the same reason as the account above. */
+export declare const invoicingQboClassByQboId: (state: RootState, qboId: string | undefined) => ClassBase | undefined;
 /** An account or class as the invoicing pickers render and submit it. */
 export interface InvoicingAccountingOption {
     id: string;

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

@@ -1,14 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
-// Its own bucket: invoicing needs the AP/AR exclusions that the vendor and
-// transaction screens sharing `accountList` do not pass.
-exports.INVOICING_ACCOUNT_LIST_KEY = 'invoicingAccountList';
+// The shared bucket, fetched with the same arguments as the other consumers so
+// whichever screen loads first satisfies the rest. Invoicing narrows to income
+// accounts when it builds its options, so it does not need its own copy.
+exports.INVOICING_ACCOUNT_LIST_KEY = 'accountList';
 /** Whether QBO is connected, without building the option lists to find out. */
 const isInvoicingQboConnected = (state) => state.invoicingQboViewState.connection?.connected === true;
 exports.isInvoicingQboConnected = isInvoicingQboConnected;
+/**
+ * Whether the accounting pickers are still waiting on their data. Only true when
+ * QBO is connected: a tenant without it has no pickers to populate, so the form
+ * must not sit behind a skeleton waiting for lists it will never show.
+ */
+const isInvoicingAccountingPickerDataLoading = (state) => {
+    const isPending = (fetchState) => fetchState === 'Not-Started' || fetchState === 'In-Progress';
+    // The connection settles first and decides whether the lists are fetched at
+    // all, so it counts as loading too. Reporting "not loading" while it is in
+    // flight renders the form, then takes it away again the moment the tenant
+    // turns out to be connected.
+    if (isPending((0, exports.getInvoicingQboConnectionFetchState)(state).fetchState)) {
+        return true;
+    }
+    if (!(0, exports.isInvoicingQboConnected)(state)) {
+        return false;
+    }
+    const accountList = state.accountListState.byReportId[exports.INVOICING_ACCOUNT_LIST_KEY];
+    return (isPending(accountList.fetchState) ||
+        isPending(state.classListState.fetchState));
+};
+exports.isInvoicingAccountingPickerDataLoading = isInvoicingAccountingPickerDataLoading;
+/** The QBO connection fetch on its own, without building the bundled view. */
+const getInvoicingQboConnectionFetchState = (state) => state.invoicingQboViewState.connectionFetchState;
+exports.getInvoicingQboConnectionFetchState = getInvoicingQboConnectionFetchState;
 /**
  * Account types that can back invoicing revenue. Named here so screens ask for
  * "income accounts" rather than repeating the accounting service's vocabulary.
@@ -17,6 +43,28 @@ exports.INVOICING_INCOME_ACCOUNT_TYPES = [
     'income',
     'other_income',
 ];
+/**
+ * The account behind a picker value. The pickers submit the QuickBooks id, so
+ * that is what callers hold; the payload builders need the whole entity to send
+ * `toAccountPayload`, which is why the lookup lives here next to the options.
+ */
+const invoicingQboAccountByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { accounts } = (0, accountListSelector_1.getAccountList)(state.accountState, state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
+    return accounts.find((account) => String(account.qboId) === qboId);
+};
+exports.invoicingQboAccountByQboId = invoicingQboAccountByQboId;
+/** The class behind a picker value, for the same reason as the account above. */
+const invoicingQboClassByQboId = (state, qboId) => {
+    if (qboId == null || qboId === '') {
+        return undefined;
+    }
+    const { classes } = (0, classListSelector_1.getClassList)(state.classState, state.classListState);
+    return classes.find((accountingClass) => String(accountingClass.qboId) === qboId);
+};
+exports.invoicingQboClassByQboId = invoicingQboClassByQboId;
 /**
  * Accounts and classes as the invoicing pickers need them. Both come from the
  * shared accounting-service lists, so whatever another screen already loaded

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

@@ -9,4 +9,4 @@ export type ActionType = ReturnType<typeof fetchInvoicingSettings> | ReturnType<
 export declare const fetchInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const connectInvoicingStripeEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const disconnectInvoicingStripeEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
-export declare const saveInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export declare const saveInvoicingSettingsEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;