@zeniai/client-epic-state 5.2.5 → 5.2.6

package/lib/epic.js

@@ -297,8 +297,7 @@ const fetchInvoicingOverviewKPIsEpic_1 = require("./view/invoicing/invoicingOver
 const fetchInvoicingOverviewMRREpic_1 = require("./view/invoicing/invoicingOverview/epics/fetchInvoicingOverviewMRREpic");
 const fetchInvoicingOverviewPlanRevenueEpic_1 = require("./view/invoicing/invoicingOverview/epics/fetchInvoicingOverviewPlanRevenueEpic");
 const fetchInvoicingOverviewRevenueEpic_1 = require("./view/invoicing/invoicingOverview/epics/fetchInvoicingOverviewRevenueEpic");
-const fetchInvoicingQboAccountsEpic_1 = require("./view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic");
-const fetchInvoicingQboClassesEpic_1 = require("./view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic");
+const fetchInvoicingAccountingPickersEpic_1 = require("./view/invoicing/invoicingQboView/epics/fetchInvoicingAccountingPickersEpic");
 const fetchInvoicingQboConnectionEpic_1 = require("./view/invoicing/invoicingQboView/epics/fetchInvoicingQboConnectionEpic");
 const fetchInvoicingQboSyncHealthEpic_1 = require("./view/invoicing/invoicingQboView/epics/fetchInvoicingQboSyncHealthEpic");
 const retryInvoicingQboSyncTaskEpic_1 = require("./view/invoicing/invoicingQboView/epics/retryInvoicingQboSyncTaskEpic");
@@ -983,6 +982,7 @@ const ALL_EPICS = [
     fetchInvoiceKPIsEpic_1.fetchInvoiceKPIsEpic,
     fetchInvoiceListEpic_1.fetchInvoiceListEpic,
     fetchInvoiceListPageEpic_1.fetchInvoiceListPageEpic,
+    fetchInvoicingAccountingPickersEpic_1.fetchInvoicingAccountingPickersEpic,
     auditViewEpics_1.fetchInvoicingAuditLogEpic,
     fetchInvoicingCatalogCountsEpic_1.fetchInvoicingCatalogCountsEpic,
     invoicingCatalogItemDetailViewEpics_1.fetchInvoicingCatalogItemDetailEpic,
@@ -1021,8 +1021,6 @@ const ALL_EPICS = [
     fetchInvoicingOverviewPlanRevenueEpic_1.fetchInvoicingOverviewPlanRevenueEpic,
     fetchInvoicingOverviewRevenueEpic_1.fetchInvoicingOverviewRevenueEpic,
     customerPaymentMethodEpic_1.fetchInvoicingPlaidLinkTokenEpic,
-    fetchInvoicingQboAccountsEpic_1.fetchInvoicingQboAccountsEpic,
-    fetchInvoicingQboClassesEpic_1.fetchInvoicingQboClassesEpic,
     fetchInvoicingQboConnectionEpic_1.fetchInvoicingQboConnectionEpic,
     fetchInvoicingQboSyncHealthEpic_1.fetchInvoicingQboSyncHealthEpic,
     settingsViewEpics_1.fetchInvoicingSettingsEpic,

package/lib/esm/epic.js

@@ -294,8 +294,7 @@ import { fetchInvoicingOverviewKPIsEpic } from './view/invoicing/invoicingOvervi
 import { fetchInvoicingOverviewMRREpic } from './view/invoicing/invoicingOverview/epics/fetchInvoicingOverviewMRREpic';
 import { fetchInvoicingOverviewPlanRevenueEpic } from './view/invoicing/invoicingOverview/epics/fetchInvoicingOverviewPlanRevenueEpic';
 import { fetchInvoicingOverviewRevenueEpic } from './view/invoicing/invoicingOverview/epics/fetchInvoicingOverviewRevenueEpic';
-import { fetchInvoicingQboAccountsEpic } from './view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic';
-import { fetchInvoicingQboClassesEpic } from './view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic';
+import { fetchInvoicingAccountingPickersEpic } from './view/invoicing/invoicingQboView/epics/fetchInvoicingAccountingPickersEpic';
 import { fetchInvoicingQboConnectionEpic } from './view/invoicing/invoicingQboView/epics/fetchInvoicingQboConnectionEpic';
 import { fetchInvoicingQboSyncHealthEpic } from './view/invoicing/invoicingQboView/epics/fetchInvoicingQboSyncHealthEpic';
 import { retryInvoicingQboSyncTaskEpic } from './view/invoicing/invoicingQboView/epics/retryInvoicingQboSyncTaskEpic';
@@ -980,6 +979,7 @@ const ALL_EPICS = [
     fetchInvoiceKPIsEpic,
     fetchInvoiceListEpic,
     fetchInvoiceListPageEpic,
+    fetchInvoicingAccountingPickersEpic,
     fetchInvoicingAuditLogEpic,
     fetchInvoicingCatalogCountsEpic,
     fetchInvoicingCatalogItemDetailEpic,
@@ -1018,8 +1018,6 @@ const ALL_EPICS = [
     fetchInvoicingOverviewPlanRevenueEpic,
     fetchInvoicingOverviewRevenueEpic,
     fetchInvoicingPlaidLinkTokenEpic,
-    fetchInvoicingQboAccountsEpic,
-    fetchInvoicingQboClassesEpic,
     fetchInvoicingQboConnectionEpic,
     fetchInvoicingQboSyncHealthEpic,
     fetchInvoicingSettingsEpic,

package/lib/esm/index.js

@@ -853,7 +853,8 @@ export { getInvoicingBrandingFormView, getInvoicingSettings, getInvoicingSetting
 export { INVOICING_BUSINESS_ADDRESS_TYPE, entityToInvoicingBrandingFormLocalData, initialInvoicingBrandingFormLocalData, } from './view/invoicing/settingsView/invoicingBrandingFormConfig';
 export { isStripeConnectedFromSettings } from './view/invoicing/settingsView/invoicingSettingsHelpers';
 // ── Invoicing: QBO integration ────────────────────────────────────────────────
-export { fetchInvoicingQboAccounts, fetchInvoicingQboClasses, fetchInvoicingQboConnection, fetchInvoicingQboSyncHealth, retryInvoicingQboSyncTask, startInvoicingQboBackfill, } from './view/invoicing/invoicingQboView/invoicingQboViewReducer';
+export { fetchInvoicingAccountingPickers, fetchInvoicingQboConnection, fetchInvoicingQboSyncHealth, retryInvoicingQboSyncTask, startInvoicingQboBackfill, } from './view/invoicing/invoicingQboView/invoicingQboViewReducer';
+export { INVOICING_INCOME_ACCOUNT_TYPES, invoicingAccountsForQboAccountTypes, } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
 export { getInvoicingQboView } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
 export { INVOICING_QBO_CUSTOMER_MATCHING_MODES, getInvoicingQboAccountMappingId, toInvoicingNamedOptionsByKey, toInvoicingQboCustomerMatchingMode, withInvoicingQboAccountMappingId, } from './entity/invoicing/invoicingCommonPayload';
 // ── Invoicing: config ─────────────────────────────────────────────────────────

package/lib/esm/view/accountList/accountListReducer.js

@@ -28,6 +28,7 @@ export const initialState = {
         reimbursementAccountList: initialAccountList,
         schedulesAccountList: initialAccountList,
         billPayAccountList: initialAccountList,
+        invoicingAccountList: initialAccountList,
     },
 };
 const accountList = createSlice({

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

@@ -1,6 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { getInvoicingPlanById, getInvoicingPlansByIds, } from '../../../entity/invoicing/plan/planSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
+import { INVOICING_INCOME_ACCOUNT_TYPES, getInvoicingQboView, invoicingAccountHierarchyForTypes, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
 import { INVOICING_CATALOG_APPLICABILITY_VALUES, INVOICING_CATALOG_PRICING_MODEL_VALUES, INVOICING_CATALOG_PRORATION_VALUES, INVOICING_CATALOG_TIER_TYPE_VALUES, entityToInvoicingCatalogItemFormLocalData, } from './invoicingCatalogItemFormConfig';
 export const getEditInvoicingCatalogItemDetailViewState = (state) => ({
     fetchState: state.editInvoicingCatalogItemDetailViewState.fetchState,
@@ -48,9 +49,16 @@ export const getInvoicingCatalogItemFormView = (state, id) => {
     const applicableItemOptions = id != null
         ? allApplicableItemOptions.filter((option) => option.id !== id)
         : allApplicableItemOptions;
+    const isQboConnected = isInvoicingQboConnected(state);
     const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = getInvoicingConfigView(state);
     return {
         fieldHelp: invoicingFieldHelpForGroup(state, 'catalog'),
+        qboClassHierarchy: isQboConnected
+            ? getInvoicingQboView(state).nestedClassHierarchy
+            : [],
+        qboIncomeAccountHierarchy: isQboConnected
+            ? invoicingAccountHierarchyForTypes(state, INVOICING_INCOME_ACCOUNT_TYPES)
+            : [],
         applicabilityValues: INVOICING_CATALOG_APPLICABILITY_VALUES,
         applicableItemOptions,
         localData,

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

@@ -0,0 +1,29 @@
+import { EMPTY, from } from 'rxjs';
+import { filter, mergeMap, withLatestFrom } from 'rxjs/operators';
+import { fetchAccountList } from '../../../accountList/accountListReducer';
+import { fetchClassList } from '../../../classList/classListReducer';
+import { fetchInvoicingAccountingPickers } from '../invoicingQboViewReducer';
+import { INVOICING_ACCOUNT_LIST_KEY } from '../invoicingQboViewSelector';
+// Tops up the shared account and class lists, skipping either when the store
+// already holds it or has it in flight.
+export const fetchInvoicingAccountingPickersEpic = (actions$, state$) => actions$.pipe(filter(fetchInvoicingAccountingPickers.match), withLatestFrom(state$), mergeMap(([, state]) => {
+    const actions = [];
+    const accountList = state.accountListState.byReportId[INVOICING_ACCOUNT_LIST_KEY];
+    if (accountList.hasValidState() === 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(fetchAccountList(INVOICING_ACCOUNT_LIST_KEY, true, true, true));
+    }
+    const classList = state.classListState;
+    if (classList.hasValidState() === false &&
+        classList.fetchState !== 'In-Progress') {
+        // Without deleted classes, matching almost every other caller of this
+        // single global slice. Asking for deleted rows here would have handed
+        // them to the vendor and transaction screens too — and the picker
+        // filters deleted classes out anyway, so there is nothing to gain.
+        actions.push(fetchClassList());
+    }
+    return actions.length > 0 ? from(actions) : EMPTY;
+}));

package/lib/esm/view/invoicing/invoicingQboView/invoicingQboViewPayload.js

@@ -6,29 +6,6 @@ export function mapInvoicingQboConnection(payload) {
         realmId: payload.realm_id ?? undefined,
     };
 }
-export function mapInvoicingQboAccountOptions(rows) {
-    return rows.flatMap((row) => {
-        // Only qbo_id is a valid QBO AccountRef/ClassRef value — platform-internal
-        // ids (account_id / id) are display metadata and must never be submitted.
-        const accountId = row.qbo_id ?? row.id ?? row.account_id ?? '';
-        if (accountId === '') {
-            return [];
-        }
-        const accountName = row.name ??
-            row.account_name ??
-            row.accounting_class_name ??
-            row.qbo_accounting_class_name ??
-            row.fully_qualified_name ??
-            accountId;
-        return [
-            {
-                id: accountId,
-                name: accountName,
-                accountType: row.account_type ?? undefined,
-            },
-        ];
-    });
-}
 export function mapInvoicingQboSyncHealth(payload) {
     return {
         connection: payload.connection != null

package/lib/esm/view/invoicing/invoicingQboView/invoicingQboViewReducer.js

@@ -1,11 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { clearAll } from '../../../rootActions';
 export const initialState = {
-    accountsByAccountTypes: {},
-    accountsFetchStateByAccountTypes: {},
     backfillFetchState: { fetchState: 'Not-Started', error: undefined },
-    classes: [],
-    classesFetchState: { fetchState: 'Not-Started', error: undefined },
     connection: undefined,
     connectionFetchState: { fetchState: 'Not-Started', error: undefined },
     retryFetchStateByTaskId: {},
@@ -29,41 +25,8 @@ const invoicingQboView = createSlice({
         updateInvoicingQboConnectionFailure(draft, action) {
             draft.connectionFetchState = { fetchState: 'Error', error: action.payload };
         },
-        fetchInvoicingQboAccounts: {
-            reducer(draft, action) {
-                draft.accountsFetchStateByAccountTypes[action.payload.accountTypes] = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(accountTypes) {
-                return { payload: { accountTypes } };
-            },
-        },
-        updateInvoicingQboAccounts(draft, action) {
-            draft.accountsByAccountTypes[action.payload.accountTypes] =
-                action.payload.accounts;
-            draft.accountsFetchStateByAccountTypes[action.payload.accountTypes] = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-        },
-        updateInvoicingQboAccountsFailure(draft, action) {
-            draft.accountsFetchStateByAccountTypes[action.payload.accountTypes] = {
-                fetchState: 'Error',
-                error: action.payload.status,
-            };
-        },
-        fetchInvoicingQboClasses(draft) {
-            draft.classesFetchState = { fetchState: 'In-Progress', error: undefined };
-        },
-        updateInvoicingQboClasses(draft, action) {
-            draft.classes = action.payload;
-            draft.classesFetchState = { fetchState: 'Completed', error: undefined };
-        },
-        updateInvoicingQboClassesFailure(draft, action) {
-            draft.classesFetchState = { fetchState: 'Error', error: action.payload };
-        },
+        // No state of its own: the epic decides which shared lists to load.
+        fetchInvoicingAccountingPickers() { },
         fetchInvoicingQboSyncHealth(draft) {
             draft.syncHealthFetchState = {
                 fetchState: 'In-Progress',
@@ -127,5 +90,5 @@ const invoicingQboView = createSlice({
         });
     },
 });
-export const { fetchInvoicingQboConnection, updateInvoicingQboConnection, updateInvoicingQboConnectionFailure, fetchInvoicingQboAccounts, updateInvoicingQboAccounts, updateInvoicingQboAccountsFailure, fetchInvoicingQboClasses, updateInvoicingQboClasses, updateInvoicingQboClassesFailure, fetchInvoicingQboSyncHealth, updateInvoicingQboSyncHealth, updateInvoicingQboSyncHealthFailure, retryInvoicingQboSyncTask, retryInvoicingQboSyncTaskSuccess, retryInvoicingQboSyncTaskFailure, startInvoicingQboBackfill, startInvoicingQboBackfillSuccess, startInvoicingQboBackfillFailure, } = invoicingQboView.actions;
+export const { fetchInvoicingQboConnection, updateInvoicingQboConnection, updateInvoicingQboConnectionFailure, fetchInvoicingAccountingPickers, fetchInvoicingQboSyncHealth, updateInvoicingQboSyncHealth, updateInvoicingQboSyncHealthFailure, retryInvoicingQboSyncTask, retryInvoicingQboSyncTaskSuccess, retryInvoicingQboSyncTaskFailure, startInvoicingQboBackfill, startInvoicingQboBackfillSuccess, startInvoicingQboBackfillFailure, } = invoicingQboView.actions;
 export default invoicingQboView.reducer;

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

@@ -1,16 +1,134 @@
+import { getAccountList, getNestedAccountListHierarchy, } from '../../accountList/accountListSelector';
+import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
+// Its own bucket: invoicing needs the AP/AR exclusions that the vendor and
+// transaction screens sharing `accountList` do not pass.
+export const INVOICING_ACCOUNT_LIST_KEY = 'invoicingAccountList';
+/** Whether QBO is connected, without building the option lists to find out. */
+export const isInvoicingQboConnected = (state) => state.invoicingQboViewState.connection?.connected === true;
+/**
+ * Account types that can back invoicing revenue. Named here so screens ask for
+ * "income accounts" rather than repeating the accounting service's vocabulary.
+ */
+export const INVOICING_INCOME_ACCOUNT_TYPES = [
+    'income',
+    'other_income',
+];
+/**
+ * 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.
+ */
+const invoicingAccountingOptions = (state, accountTypes) => {
+    const { accounts } = getAccountList(state.accountState, state.accountListState, INVOICING_ACCOUNT_LIST_KEY);
+    return accounts.flatMap((account) => {
+        if (account.qboId == null || account.isDeleted === true) {
+            return [];
+        }
+        if (accountTypes != null &&
+            (account.accountType == null ||
+                !accountTypes.includes(account.accountType))) {
+            return [];
+        }
+        return [
+            {
+                id: String(account.qboId),
+                name: account.accountName,
+                accountType: account.accountType,
+            },
+        ];
+    });
+};
+/**
+ * Normalises an account-type name for comparison. The config's mapping kinds
+ * name QuickBooks types the way QuickBooks displays them ("Other Current
+ * Asset", "Expense"), while the accounting service uses snake_case and
+ * sometimes pluralises ("other_current_assets", "expenses"). Comparing the
+ * normalised, de-pluralised forms keeps a picker from silently emptying because
+ * of a trailing "s".
+ */
+const normalizeAccountTypeName = (value) => {
+    const normalized = value
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '_');
+    // Singularise so "Other Current Liability" meets `other_current_liabilities`
+    // and "Expense" meets `expenses`. `-ies` needs its own case: stripping the
+    // trailing "s" alone would leave "liabilitie", matching nothing.
+    return normalized.replace(/ies$/, 'y').replace(/([^s])s$/, '$1');
+};
+/**
+ * The accounts valid for one QBO mapping kind, whose `accountTypes` is a
+ * comma-separated list of QuickBooks type names. An unrecognised list yields no
+ * accounts rather than every account: offering a bank account where income is
+ * required would post a mapping QuickBooks rejects.
+ */
+export const invoicingAccountsForQboAccountTypes = (accounts, accountTypes) => {
+    const wanted = new Set(accountTypes
+        .split(',')
+        .map(normalizeAccountTypeName)
+        .filter((accountType) => accountType !== ''));
+    if (wanted.size === 0) {
+        return accounts;
+    }
+    return accounts.filter((account) => account.accountType != null &&
+        wanted.has(normalizeAccountTypeName(account.accountType)));
+};
+/** Classes as the invoicing pickers need them, from the shared class list. */
+const invoicingAccountingClassOptions = (state) => {
+    const { classes } = getClassList(state.classState, state.classListState);
+    return classes.flatMap((accountingClass) => accountingClass.qboId == null || accountingClass.isDeleted === true
+        ? []
+        : [
+            {
+                id: String(accountingClass.qboId),
+                name: accountingClass.className,
+            },
+        ]);
+};
+/**
+ * The account tree narrowed to the given account types. The tree itself carries
+ * no account type, so the flat account list supplies that and the matching
+ * `qboId`s are kept — which is why callers that only need "income accounts, as a
+ * tree" do not have to hold a second flat list to filter with.
+ */
+export const invoicingAccountHierarchyForTypes = (state, accountTypes) => {
+    const allowedQboIds = new Set(invoicingAccountingOptions(state, accountTypes).map((account) => account.id));
+    const keepMatching = (nodes) => nodes.flatMap((node) => {
+        const children = keepMatching(node.children);
+        const isMatch = node.qboId != null && allowedQboIds.has(String(node.qboId));
+        // A parent that is not itself a match is still kept when it holds one, so
+        // the tree's shape survives the filter.
+        if (!isMatch && children.length === 0) {
+            return [];
+        }
+        return [{ ...node, children }];
+    });
+    return keepMatching(getNestedAccountListHierarchy(state.accountListState, INVOICING_ACCOUNT_LIST_KEY));
+};
 /**
  * Single bundled view for the QBO integration settings screen — the
- * connection, per-account-types account options, classes, sync health, and the
- * fetch/action states for each of them.
+ * connection, the account and class options, sync health, and the fetch/action
+ * states for each of them.
  */
 export const getInvoicingQboView = (state) => {
     const qboState = state.invoicingQboViewState;
+    const accountList = state.accountListState.byReportId[INVOICING_ACCOUNT_LIST_KEY];
     return {
-        accountsByAccountTypes: qboState.accountsByAccountTypes,
-        accountsFetchStateByAccountTypes: qboState.accountsFetchStateByAccountTypes,
+        accounts: invoicingAccountingOptions(state),
+        accountsFetchState: {
+            fetchState: accountList.fetchState,
+            error: accountList.error,
+        },
+        nestedAccountHierarchy: getNestedAccountListHierarchy(state.accountListState, INVOICING_ACCOUNT_LIST_KEY),
+        nestedClassHierarchy: getNestedClassListHierarchy(state.classListState),
         backfillState: qboState.backfillFetchState,
-        classes: qboState.classes,
-        classesFetchState: qboState.classesFetchState,
+        classes: invoicingAccountingClassOptions(state),
+        classesFetchState: {
+            fetchState: state.classListState.fetchState,
+            error: state.classListState.error,
+        },
         connection: qboState.connection,
         connectionFetchState: qboState.connectionFetchState,
         retryFetchStateByTaskId: qboState.retryFetchStateByTaskId,

package/lib/index.d.ts

@@ -1240,10 +1240,12 @@ export type { InvoicingBrandingFormView, InvoicingSettingsHubView, InvoicingSett
 export type { InvoicingBrandingFormLocalData } from './view/invoicing/settingsView/invoicingBrandingFormConfig';
 export { INVOICING_BUSINESS_ADDRESS_TYPE, entityToInvoicingBrandingFormLocalData, initialInvoicingBrandingFormLocalData, } from './view/invoicing/settingsView/invoicingBrandingFormConfig';
 export { isStripeConnectedFromSettings } from './view/invoicing/settingsView/invoicingSettingsHelpers';
-export { fetchInvoicingQboAccounts, fetchInvoicingQboClasses, fetchInvoicingQboConnection, fetchInvoicingQboSyncHealth, retryInvoicingQboSyncTask, startInvoicingQboBackfill, } from './view/invoicing/invoicingQboView/invoicingQboViewReducer';
+export { fetchInvoicingAccountingPickers, fetchInvoicingQboConnection, fetchInvoicingQboSyncHealth, retryInvoicingQboSyncTask, startInvoicingQboBackfill, } from './view/invoicing/invoicingQboView/invoicingQboViewReducer';
+export { INVOICING_INCOME_ACCOUNT_TYPES, invoicingAccountsForQboAccountTypes, } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
+export type { InvoicingAccountingOption } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
 export { getInvoicingQboView } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
 export type { InvoicingQboView } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
-export type { InvoicingQboAccountOption, InvoicingQboConnection, InvoicingQboFailedTask, InvoicingQboSyncHealth, } from './view/invoicing/invoicingQboView/invoicingQboViewPayload';
+export type { InvoicingQboConnection, InvoicingQboFailedTask, InvoicingQboSyncHealth, } from './view/invoicing/invoicingQboView/invoicingQboViewPayload';
 export { INVOICING_QBO_CUSTOMER_MATCHING_MODES, getInvoicingQboAccountMappingId, toInvoicingNamedOptionsByKey, toInvoicingQboCustomerMatchingMode, withInvoicingQboAccountMappingId, } from './entity/invoicing/invoicingCommonPayload';
 export type { InvoicingNamedOption, InvoicingFieldHelp, InvoicingFieldHelpByCode, InvoicingFieldHelpGroup, InvoicingNamedOptionsByKey, InvoicingQboAccountMappingKindOption, InvoicingQboAccountMappingsPayload, InvoicingQboCustomerMatchingMode, InvoicingQboSettingsPayload, } from './entity/invoicing/invoicingCommonPayload';
 export { acceptInvoicingTerms, enableInvoicing, fetchInvoicingConfig, resetInvoicingConfigActionStates, updateInvoicingConfig, } from './view/invoicing/invoicingConfigView/invoicingConfigViewReducer';

package/lib/index.js

@@ -83,7 +83,7 @@ exports.getInvoicingDiscountActionState = exports.runInvoicingDiscountAction = e
 exports.updateInvoicingSubscriptions = exports.removeInvoicingSubscription = exports.resetPromotionalCreditAction = exports.submitAddPromotionalCredits = exports.getInvoicingSetupIntentFetchState = exports.getInvoicingSetupIntent = exports.getInvoicingSentPaymentLinkMagicUrl = exports.getInvoicingSentPaymentLinkEmail = exports.getInvoicingPlaidLinkTokenFetchState = exports.getInvoicingPlaidLinkToken = exports.getInvoicingPaymentMethodSaveState = exports.getInvoicingPaymentLinkSendState = exports.sendInvoicingPaymentLink = exports.saveInvoicingPaymentMethod = exports.resetInvoicingCustomerPaymentMethod = exports.fetchInvoicingPlaidLinkToken = exports.createInvoicingSetupIntent = exports.getInvoicingCustomerDetail = exports.fetchInvoicingCustomerDetailPage = exports.fetchInvoicingCustomerDetail = exports.getInvoicingCustomerListView = exports.INVOICING_CUSTOMER_COLUMNS = exports.ALL_INVOICING_CUSTOMER_TAB_IDS = exports.ALL_INVOICING_CUSTOMER_SORT_KEYS = exports.updateInvoicingCustomerFilters = exports.setInvoicingCustomerActiveTab = exports.fetchInvoicingCustomerListPage = exports.fetchInvoicingCustomerList = exports.fetchInvoicingCustomerCounts = exports.updateInvoicingCustomers = exports.removeInvoicingCustomer = exports.INVOICING_LIST_PAGE_SIZE = exports.getInvoicingDataImportActionState = exports.uploadInvoicingMigrationFiles = exports.startInvoicingMigration = exports.rollbackInvoicingMigration = exports.retryInvoicingMigration = exports.connectInvoicingChargebee = exports.getInvoicingDataImportView = exports.setInvoicingActiveMigrationSessionId = exports.fetchInvoicingMigrationSessions = exports.fetchInvoicingMigrationSession = exports.fetchInvoicingMigrationDiagnostics = exports.fetchInvoicingDataImportStatus = exports.getInvoicingPaymentActionState = exports.runInvoicingPaymentAction = exports.getInvoicingDunningActionState = exports.runInvoicingDunningAction = exports.getInvoicingSubscriptionActionState = exports.runInvoicingSubscriptionAction = void 0;
 exports.getInvoicingCouponCounts = exports.INVOICING_COUPON_COLUMNS = exports.ALL_INVOICING_COUPON_TAB_IDS = exports.ALL_INVOICING_COUPON_SORT_KEYS = exports.updateInvoicingCouponFilters = exports.setInvoicingCouponActiveTab = exports.fetchInvoicingCouponListPage = exports.fetchInvoicingCouponList = exports.fetchInvoicingCouponCounts = exports.updateInvoicingCoupons = exports.removeInvoicingCoupon = exports.getInvoicingCreditNoteDetail = exports.getInvoicingCreditNoteById = exports.fetchInvoicingCreditNoteDetail = exports.getInvoicingCreditNoteListView = exports.INVOICING_CREDIT_NOTE_COLUMNS = exports.ALL_INVOICING_CREDIT_NOTE_TAB_IDS = exports.ALL_INVOICING_CREDIT_NOTE_SORT_KEYS = exports.updateInvoicingCreditNoteFilters = exports.setInvoicingCreditNoteActiveTab = exports.fetchInvoicingCreditNoteListPage = exports.fetchInvoicingCreditNoteList = exports.fetchInvoicingCreditNoteCounts = exports.updateInvoicingCreditNotes = exports.removeInvoicingCreditNote = exports.getInvoicingTransactionDetail = exports.getInvoicingTransactionById = exports.fetchInvoicingTransactionDetail = exports.getInvoicingTransactionListView = exports.INVOICING_TRANSACTION_COLUMNS = exports.ALL_INVOICING_TRANSACTION_TAB_IDS = exports.ALL_INVOICING_TRANSACTION_SORT_KEYS = exports.updateInvoicingTransactionFilters = exports.setInvoicingTransactionActiveTab = exports.fetchInvoicingTransactionListPage = exports.fetchInvoicingTransactionList = exports.updateInvoicingTransactions = exports.removeInvoicingTransaction = exports.getInvoicingSubscriptionDetail = exports.getInvoicingSubscriptionById = exports.fetchInvoicingSubscriptionDetail = exports.getInvoicingSubscriptionListView = exports.INVOICING_SUBSCRIPTION_COLUMNS = exports.ALL_INVOICING_SUBSCRIPTION_TAB_IDS = exports.ALL_INVOICING_SUBSCRIPTION_SORT_KEYS = exports.updateInvoicingSubscriptionFilters = exports.setInvoicingSubscriptionActiveTab = exports.fetchInvoicingSubscriptionListPage = exports.fetchInvoicingSubscriptionList = exports.fetchInvoicingSubscriptionCounts = void 0;
 exports.resetSaveInvoicingSettings = exports.resetInvoicingBrandingFormDraft = exports.fetchInvoicingSettings = exports.disconnectInvoicingStripe = exports.connectInvoicingStripe = exports.getInvoicingProductById = exports.getInvoicingPlanById = exports.getInvoicingCatalogItemDetail = exports.fetchInvoicingCatalogItemDetail = exports.getInvoicingCatalogListView = exports.INVOICING_PRODUCT_COLUMNS = exports.ALL_INVOICING_PRODUCT_SORT_KEYS = exports.updateInvoicingCatalogProductFilters = exports.updateInvoicingCatalogPlanFilters = exports.fetchInvoicingCatalogProductList = exports.fetchInvoicingCatalogPlanList = exports.fetchInvoicingCatalogListPage = exports.fetchInvoicingCatalogCounts = exports.updateInvoicingProducts = exports.removeInvoicingProduct = exports.updateInvoicingPlans = exports.removeInvoicingPlan = exports.mergeInvoicingPlanSubFamily = exports.getInvoicingDunningEmailPreview = exports.getInvoicingDunningCaseDetail = exports.getInvoicingDunningCaseById = exports.invalidateInvoicingDunningEmailPreview = exports.fetchInvoicingDunningEmailPreviewPage = exports.fetchInvoicingDunningCaseDetail = exports.clearInvoicingDunningCaseDetailView = exports.getInvoicingDunningCaseListView = exports.INVOICING_DUNNING_CASE_COLUMNS = exports.ALL_INVOICING_DUNNING_CASE_TAB_IDS = exports.ALL_INVOICING_DUNNING_CASE_SORT_KEYS = exports.updateInvoicingDunningCaseFilters = exports.setInvoicingDunningCaseActiveTab = exports.fetchInvoicingDunningCaseListPage = exports.fetchInvoicingDunningCaseList = exports.fetchInvoicingDunningCaseCounts = exports.updateInvoicingDunningCases = exports.removeInvoicingDunningCase = exports.getInvoicingCouponDetail = exports.fetchInvoicingCouponDetail = exports.getInvoicingCouponById = exports.getInvoicingCouponListView = exports.getInvoicingCouponListNextCursor = exports.getInvoicingCouponListItems = exports.getInvoicingCouponListHasMore = exports.getInvoicingCouponListFilters = exports.getInvoicingCouponListFetchState = void 0;
-exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = exports.updateInvoicingConfig = exports.resetInvoicingConfigActionStates = exports.fetchInvoicingConfig = exports.enableInvoicing = exports.acceptInvoicingTerms = exports.withInvoicingQboAccountMappingId = exports.toInvoicingQboCustomerMatchingMode = exports.toInvoicingNamedOptionsByKey = exports.getInvoicingQboAccountMappingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.getInvoicingQboView = exports.startInvoicingQboBackfill = exports.retryInvoicingQboSyncTask = exports.fetchInvoicingQboSyncHealth = exports.fetchInvoicingQboConnection = exports.fetchInvoicingQboClasses = exports.fetchInvoicingQboAccounts = exports.isStripeConnectedFromSettings = exports.initialInvoicingBrandingFormLocalData = exports.entityToInvoicingBrandingFormLocalData = exports.INVOICING_BUSINESS_ADDRESS_TYPE = exports.getInvoicingSettingsView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = exports.getInvoicingBrandingFormView = exports.updateInvoicingSettings = exports.updateInvoicingBrandingFormDraft = exports.submitInvoicingBrandingForm = exports.saveInvoicingSettings = void 0;
+exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = exports.updateInvoicingConfig = exports.resetInvoicingConfigActionStates = exports.fetchInvoicingConfig = exports.enableInvoicing = exports.acceptInvoicingTerms = exports.withInvoicingQboAccountMappingId = exports.toInvoicingQboCustomerMatchingMode = exports.toInvoicingNamedOptionsByKey = exports.getInvoicingQboAccountMappingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.getInvoicingQboView = exports.invoicingAccountsForQboAccountTypes = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.startInvoicingQboBackfill = exports.retryInvoicingQboSyncTask = exports.fetchInvoicingQboSyncHealth = exports.fetchInvoicingQboConnection = exports.fetchInvoicingAccountingPickers = exports.isStripeConnectedFromSettings = exports.initialInvoicingBrandingFormLocalData = exports.entityToInvoicingBrandingFormLocalData = exports.INVOICING_BUSINESS_ADDRESS_TYPE = exports.getInvoicingSettingsView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = exports.getInvoicingBrandingFormView = exports.updateInvoicingSettings = exports.updateInvoicingBrandingFormDraft = exports.submitInvoicingBrandingForm = exports.saveInvoicingSettings = void 0;
 const allowedValue_1 = require("./commonStateTypes/allowedValue");
 Object.defineProperty(exports, "isAllowedValueWithCode", { enumerable: true, get: function () { return allowedValue_1.isAllowedValueWithCode; } });
 Object.defineProperty(exports, "isAllowedValueWithID", { enumerable: true, get: function () { return allowedValue_1.isAllowedValueWithID; } });
@@ -3105,14 +3105,16 @@ var invoicingSettingsHelpers_1 = require("./view/invoicing/settingsView/invoicin
 Object.defineProperty(exports, "isStripeConnectedFromSettings", { enumerable: true, get: function () { return invoicingSettingsHelpers_1.isStripeConnectedFromSettings; } });
 // ── Invoicing: QBO integration ────────────────────────────────────────────────
 var invoicingQboViewReducer_1 = require("./view/invoicing/invoicingQboView/invoicingQboViewReducer");
-Object.defineProperty(exports, "fetchInvoicingQboAccounts", { enumerable: true, get: function () { return invoicingQboViewReducer_1.fetchInvoicingQboAccounts; } });
-Object.defineProperty(exports, "fetchInvoicingQboClasses", { enumerable: true, get: function () { return invoicingQboViewReducer_1.fetchInvoicingQboClasses; } });
+Object.defineProperty(exports, "fetchInvoicingAccountingPickers", { enumerable: true, get: function () { return invoicingQboViewReducer_1.fetchInvoicingAccountingPickers; } });
 Object.defineProperty(exports, "fetchInvoicingQboConnection", { enumerable: true, get: function () { return invoicingQboViewReducer_1.fetchInvoicingQboConnection; } });
 Object.defineProperty(exports, "fetchInvoicingQboSyncHealth", { enumerable: true, get: function () { return invoicingQboViewReducer_1.fetchInvoicingQboSyncHealth; } });
 Object.defineProperty(exports, "retryInvoicingQboSyncTask", { enumerable: true, get: function () { return invoicingQboViewReducer_1.retryInvoicingQboSyncTask; } });
 Object.defineProperty(exports, "startInvoicingQboBackfill", { enumerable: true, get: function () { return invoicingQboViewReducer_1.startInvoicingQboBackfill; } });
 var invoicingQboViewSelector_1 = require("./view/invoicing/invoicingQboView/invoicingQboViewSelector");
-Object.defineProperty(exports, "getInvoicingQboView", { enumerable: true, get: function () { return invoicingQboViewSelector_1.getInvoicingQboView; } });
+Object.defineProperty(exports, "INVOICING_INCOME_ACCOUNT_TYPES", { enumerable: true, get: function () { return invoicingQboViewSelector_1.INVOICING_INCOME_ACCOUNT_TYPES; } });
+Object.defineProperty(exports, "invoicingAccountsForQboAccountTypes", { enumerable: true, get: function () { return invoicingQboViewSelector_1.invoicingAccountsForQboAccountTypes; } });
+var invoicingQboViewSelector_2 = require("./view/invoicing/invoicingQboView/invoicingQboViewSelector");
+Object.defineProperty(exports, "getInvoicingQboView", { enumerable: true, get: function () { return invoicingQboViewSelector_2.getInvoicingQboView; } });
 var invoicingCommonPayload_2 = require("./entity/invoicing/invoicingCommonPayload");
 Object.defineProperty(exports, "INVOICING_QBO_CUSTOMER_MATCHING_MODES", { enumerable: true, get: function () { return invoicingCommonPayload_2.INVOICING_QBO_CUSTOMER_MATCHING_MODES; } });
 Object.defineProperty(exports, "getInvoicingQboAccountMappingId", { enumerable: true, get: function () { return invoicingCommonPayload_2.getInvoicingQboAccountMappingId; } });

package/lib/view/accountList/accountListReducer.js

@@ -35,6 +35,7 @@ exports.initialState = {
         reimbursementAccountList: exports.initialAccountList,
         schedulesAccountList: exports.initialAccountList,
         billPayAccountList: exports.initialAccountList,
+        invoicingAccountList: exports.initialAccountList,
     },
 };
 const accountList = (0, toolkit_1.createSlice)({

package/lib/view/accountList/accountListState.d.ts

@@ -1,7 +1,7 @@
 import { NestedAccountHierarchyForReport } from '../../commonStateTypes/accountView/nestedAccountID';
 import { FetchedState, ID } from '../../commonStateTypes/common';
 import { AccountLabel } from '../../entity/account/accountState';
-export type AccountListKeyType = 'accountList' | 'reimbursementAccountList' | 'schedulesAccountList' | 'billPayAccountList';
+export type AccountListKeyType = 'accountList' | 'reimbursementAccountList' | 'schedulesAccountList' | 'billPayAccountList' | 'invoicingAccountList';
 export interface AccountList extends FetchedState {
     accountIds: ID[];
     accountIdsByLabel: Record<AccountLabel, ID[]>;

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

@@ -1,3 +1,5 @@
+import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
+import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { InvoicingFieldHelpByCode, InvoicingNamedOption, InvoicingNamedOptionsByKey } from '../../../entity/invoicing/invoicingCommonPayload';
@@ -40,6 +42,13 @@ export interface InvoicingCatalogItemFormView extends SelectorView {
     periodUnitOptions: InvoicingNamedOption[];
     pricingModelValues: readonly string[];
     prorationValues: readonly string[];
+    /**
+     * Account and class trees for the price-point pickers, already narrowed to the
+     * income accounts a price may post to. Empty until QBO is connected — the form
+     * must not offer a mapping that cannot be pushed.
+     */
+    qboClassHierarchy: NestedClassHierarchyForReport[];
+    qboIncomeAccountHierarchy: NestedAccountHierarchyForReport[];
     tierTypeValues: readonly string[];
     trialEndActionOptions: InvoicingNamedOption[];
     trialUnitOptions: InvoicingNamedOption[];

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

@@ -4,6 +4,7 @@ exports.getInvoicingCatalogItemFormView = exports.getInvoicingApplicableCatalogI
 const toolkit_1 = require("@reduxjs/toolkit");
 const planSelector_1 = require("../../../entity/invoicing/plan/planSelector");
 const invoicingConfigViewSelector_1 = require("../invoicingConfigView/invoicingConfigViewSelector");
+const invoicingQboViewSelector_1 = require("../invoicingQboView/invoicingQboViewSelector");
 const invoicingCatalogItemFormConfig_1 = require("./invoicingCatalogItemFormConfig");
 const getEditInvoicingCatalogItemDetailViewState = (state) => ({
     fetchState: state.editInvoicingCatalogItemDetailViewState.fetchState,
@@ -54,9 +55,16 @@ const getInvoicingCatalogItemFormView = (state, id) => {
     const applicableItemOptions = id != null
         ? allApplicableItemOptions.filter((option) => option.id !== id)
         : allApplicableItemOptions;
+    const isQboConnected = (0, invoicingQboViewSelector_1.isInvoicingQboConnected)(state);
     const { billingPeriodUnitOptions, catalogItemTypeOptions, catalogTierTypeOptionsByPricingModel, catalogTrialEndActionOptions, catalogTrialUnitOptions, } = (0, invoicingConfigViewSelector_1.getInvoicingConfigView)(state);
     return {
         fieldHelp: (0, invoicingConfigViewSelector_1.invoicingFieldHelpForGroup)(state, 'catalog'),
+        qboClassHierarchy: isQboConnected
+            ? (0, invoicingQboViewSelector_1.getInvoicingQboView)(state).nestedClassHierarchy
+            : [],
+        qboIncomeAccountHierarchy: isQboConnected
+            ? (0, invoicingQboViewSelector_1.invoicingAccountHierarchyForTypes)(state, invoicingQboViewSelector_1.INVOICING_INCOME_ACCOUNT_TYPES)
+            : [],
         applicabilityValues: invoicingCatalogItemFormConfig_1.INVOICING_CATALOG_APPLICABILITY_VALUES,
         applicableItemOptions,
         localData,

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingAccountingPickersEpic.d.ts

@@ -0,0 +1,5 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { RootState } from '../../../../rootStateTypes';
+import { InvoicingQboViewActionType } from './invoicingQboViewActionType';
+export declare const fetchInvoicingAccountingPickersEpic: (actions$: ActionsObservable<InvoicingQboViewActionType>, state$: StateObservable<RootState>) => Observable<InvoicingQboViewActionType>;

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchInvoicingAccountingPickersEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const accountListReducer_1 = require("../../../accountList/accountListReducer");
+const classListReducer_1 = require("../../../classList/classListReducer");
+const invoicingQboViewReducer_1 = require("../invoicingQboViewReducer");
+const invoicingQboViewSelector_1 = require("../invoicingQboViewSelector");
+// Tops up the shared account and class lists, skipping either when the store
+// already holds it or has it in flight.
+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 &&
+        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));
+    }
+    const classList = state.classListState;
+    if (classList.hasValidState() === false &&
+        classList.fetchState !== 'In-Progress') {
+        // Without deleted classes, matching almost every other caller of this
+        // single global slice. Asking for deleted rows here would have handed
+        // them to the vendor and transaction screens too — and the picker
+        // filters deleted classes out anyway, so there is nothing to gain.
+        actions.push((0, classListReducer_1.fetchClassList)());
+    }
+    return actions.length > 0 ? (0, rxjs_1.from)(actions) : rxjs_1.EMPTY;
+}));
+exports.fetchInvoicingAccountingPickersEpic = fetchInvoicingAccountingPickersEpic;

package/lib/view/invoicing/invoicingQboView/epics/invoicingQboViewActionType.d.ts

@@ -1,3 +1,5 @@
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-import { fetchInvoicingQboAccounts, fetchInvoicingQboClasses, fetchInvoicingQboConnection, fetchInvoicingQboSyncHealth, retryInvoicingQboSyncTask, retryInvoicingQboSyncTaskFailure, retryInvoicingQboSyncTaskSuccess, startInvoicingQboBackfill, startInvoicingQboBackfillFailure, startInvoicingQboBackfillSuccess, updateInvoicingQboAccounts, updateInvoicingQboAccountsFailure, updateInvoicingQboClasses, updateInvoicingQboClassesFailure, updateInvoicingQboConnection, updateInvoicingQboConnectionFailure, updateInvoicingQboSyncHealth, updateInvoicingQboSyncHealthFailure } from '../invoicingQboViewReducer';
-export type InvoicingQboViewActionType = ReturnType<typeof openSnackbar> | ReturnType<typeof fetchInvoicingQboConnection> | ReturnType<typeof updateInvoicingQboConnection> | ReturnType<typeof updateInvoicingQboConnectionFailure> | ReturnType<typeof fetchInvoicingQboAccounts> | ReturnType<typeof updateInvoicingQboAccounts> | ReturnType<typeof updateInvoicingQboAccountsFailure> | ReturnType<typeof fetchInvoicingQboClasses> | ReturnType<typeof updateInvoicingQboClasses> | ReturnType<typeof updateInvoicingQboClassesFailure> | ReturnType<typeof fetchInvoicingQboSyncHealth> | ReturnType<typeof updateInvoicingQboSyncHealth> | ReturnType<typeof updateInvoicingQboSyncHealthFailure> | ReturnType<typeof retryInvoicingQboSyncTask> | ReturnType<typeof retryInvoicingQboSyncTaskSuccess> | ReturnType<typeof retryInvoicingQboSyncTaskFailure> | ReturnType<typeof startInvoicingQboBackfill> | ReturnType<typeof startInvoicingQboBackfillSuccess> | ReturnType<typeof startInvoicingQboBackfillFailure>;
+import { fetchAccountList } from '../../../accountList/accountListReducer';
+import { fetchClassList } from '../../../classList/classListReducer';
+import { fetchInvoicingAccountingPickers, fetchInvoicingQboConnection, fetchInvoicingQboSyncHealth, retryInvoicingQboSyncTask, retryInvoicingQboSyncTaskFailure, retryInvoicingQboSyncTaskSuccess, startInvoicingQboBackfill, startInvoicingQboBackfillFailure, startInvoicingQboBackfillSuccess, updateInvoicingQboConnection, updateInvoicingQboConnectionFailure, updateInvoicingQboSyncHealth, updateInvoicingQboSyncHealthFailure } from '../invoicingQboViewReducer';
+export type InvoicingQboViewActionType = ReturnType<typeof openSnackbar> | ReturnType<typeof fetchInvoicingQboConnection> | ReturnType<typeof updateInvoicingQboConnection> | ReturnType<typeof updateInvoicingQboConnectionFailure> | ReturnType<typeof fetchInvoicingAccountingPickers> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchInvoicingQboSyncHealth> | ReturnType<typeof updateInvoicingQboSyncHealth> | ReturnType<typeof updateInvoicingQboSyncHealthFailure> | ReturnType<typeof retryInvoicingQboSyncTask> | ReturnType<typeof retryInvoicingQboSyncTaskSuccess> | ReturnType<typeof retryInvoicingQboSyncTaskFailure> | ReturnType<typeof startInvoicingQboBackfill> | ReturnType<typeof startInvoicingQboBackfillSuccess> | ReturnType<typeof startInvoicingQboBackfillFailure>;

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

@@ -12,31 +12,6 @@ export interface InvoicingQboConnection {
     realmId?: string;
 }
 export declare function mapInvoicingQboConnection(payload: InvoicingQboConnectionPayload): InvoicingQboConnection;
-/**
- * A single row from the QBO accounts / classes endpoints. The rows carry the
- * QBO id plus one or more name fields depending on the entity — inspect
- * loosely, render the name, submit the id.
- */
-export interface InvoicingQboAccountRowPayload {
-    account_id?: string | null;
-    account_name?: string | null;
-    account_type?: string | null;
-    accounting_class_name?: string | null;
-    fully_qualified_name?: string | null;
-    id?: string | null;
-    name?: string | null;
-    qbo_accounting_class_name?: string | null;
-    qbo_id?: string | null;
-}
-export interface InvoicingQboAccountOption {
-    id: string;
-    name: string;
-    accountType?: string;
-}
-export declare function mapInvoicingQboAccountOptions(rows: InvoicingQboAccountRowPayload[]): InvoicingQboAccountOption[];
-export interface InvoicingQboAccountsPayload {
-    accounts: InvoicingQboAccountRowPayload[];
-}
 export interface InvoicingQboFailedTaskPayload {
     attempts: number;
     entity_id: string;
@@ -73,7 +48,6 @@ export interface InvoicingQboBackfillPayload {
     start_date?: string | null;
 }
 export type InvoicingQboConnectionResponse = ZeniAPIResponse<InvoicingQboConnectionPayload>;
-export type InvoicingQboAccountsResponse = ZeniAPIResponse<InvoicingQboAccountsPayload>;
 export type InvoicingQboSyncHealthResponse = ZeniAPIResponse<InvoicingQboSyncHealthPayload>;
 export type InvoicingQboRetryTaskResponse = ZeniAPIResponse<InvoicingQboRetryTaskPayload>;
 export type InvoicingQboBackfillResponse = ZeniAPIResponse<InvoicingQboBackfillPayload>;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapInvoicingQboConnection = mapInvoicingQboConnection;
-exports.mapInvoicingQboAccountOptions = mapInvoicingQboAccountOptions;
 exports.mapInvoicingQboSyncHealth = mapInvoicingQboSyncHealth;
 function mapInvoicingQboConnection(payload) {
     return {
@@ -11,29 +10,6 @@ function mapInvoicingQboConnection(payload) {
         realmId: payload.realm_id ?? undefined,
     };
 }
-function mapInvoicingQboAccountOptions(rows) {
-    return rows.flatMap((row) => {
-        // Only qbo_id is a valid QBO AccountRef/ClassRef value — platform-internal
-        // ids (account_id / id) are display metadata and must never be submitted.
-        const accountId = row.qbo_id ?? row.id ?? row.account_id ?? '';
-        if (accountId === '') {
-            return [];
-        }
-        const accountName = row.name ??
-            row.account_name ??
-            row.accounting_class_name ??
-            row.qbo_accounting_class_name ??
-            row.fully_qualified_name ??
-            accountId;
-        return [
-            {
-                id: accountId,
-                name: accountName,
-                accountType: row.account_type ?? undefined,
-            },
-        ];
-    });
-}
 function mapInvoicingQboSyncHealth(payload) {
     return {
         connection: payload.connection != null

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

@@ -1,16 +1,8 @@
 import { ZeniAPIStatus } from '../../../responsePayload';
-import { InvoicingQboAccountOption, InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
+import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
 import { InvoicingQboViewState } from './invoicingQboViewState';
 export declare const initialState: InvoicingQboViewState;
-export declare const fetchInvoicingQboConnection: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingQboView/fetchInvoicingQboConnection">, updateInvoicingQboConnection: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingQboConnection, "invoicingQboView/updateInvoicingQboConnection">, updateInvoicingQboConnectionFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingQboView/updateInvoicingQboConnectionFailure">, fetchInvoicingQboAccounts: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accountTypes: string], {
-    accountTypes: string;
-}, "invoicingQboView/fetchInvoicingQboAccounts", never, never>, updateInvoicingQboAccounts: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    accounts: InvoicingQboAccountOption[];
-    accountTypes: string;
-}, "invoicingQboView/updateInvoicingQboAccounts">, updateInvoicingQboAccountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    accountTypes: string;
-    status: ZeniAPIStatus;
-}, "invoicingQboView/updateInvoicingQboAccountsFailure">, fetchInvoicingQboClasses: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingQboView/fetchInvoicingQboClasses">, updateInvoicingQboClasses: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingQboAccountOption[], "invoicingQboView/updateInvoicingQboClasses">, updateInvoicingQboClassesFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingQboView/updateInvoicingQboClassesFailure">, fetchInvoicingQboSyncHealth: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingQboView/fetchInvoicingQboSyncHealth">, updateInvoicingQboSyncHealth: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingQboSyncHealth, "invoicingQboView/updateInvoicingQboSyncHealth">, updateInvoicingQboSyncHealthFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingQboView/updateInvoicingQboSyncHealthFailure">, retryInvoicingQboSyncTask: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskId: string], {
+export declare const fetchInvoicingQboConnection: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingQboView/fetchInvoicingQboConnection">, updateInvoicingQboConnection: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingQboConnection, "invoicingQboView/updateInvoicingQboConnection">, updateInvoicingQboConnectionFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingQboView/updateInvoicingQboConnectionFailure">, fetchInvoicingAccountingPickers: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingQboView/fetchInvoicingAccountingPickers">, fetchInvoicingQboSyncHealth: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingQboView/fetchInvoicingQboSyncHealth">, updateInvoicingQboSyncHealth: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingQboSyncHealth, "invoicingQboView/updateInvoicingQboSyncHealth">, updateInvoicingQboSyncHealthFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingQboView/updateInvoicingQboSyncHealthFailure">, retryInvoicingQboSyncTask: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskId: string], {
     taskId: string;
 }, "invoicingQboView/retryInvoicingQboSyncTask", never, never>, retryInvoicingQboSyncTaskSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     status: string;

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

@@ -1,15 +1,11 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startInvoicingQboBackfillFailure = exports.startInvoicingQboBackfillSuccess = exports.startInvoicingQboBackfill = exports.retryInvoicingQboSyncTaskFailure = exports.retryInvoicingQboSyncTaskSuccess = exports.retryInvoicingQboSyncTask = exports.updateInvoicingQboSyncHealthFailure = exports.updateInvoicingQboSyncHealth = exports.fetchInvoicingQboSyncHealth = exports.updateInvoicingQboClassesFailure = exports.updateInvoicingQboClasses = exports.fetchInvoicingQboClasses = exports.updateInvoicingQboAccountsFailure = exports.updateInvoicingQboAccounts = exports.fetchInvoicingQboAccounts = exports.updateInvoicingQboConnectionFailure = exports.updateInvoicingQboConnection = exports.fetchInvoicingQboConnection = exports.initialState = void 0;
+exports.startInvoicingQboBackfillFailure = exports.startInvoicingQboBackfillSuccess = exports.startInvoicingQboBackfill = exports.retryInvoicingQboSyncTaskFailure = exports.retryInvoicingQboSyncTaskSuccess = exports.retryInvoicingQboSyncTask = exports.updateInvoicingQboSyncHealthFailure = exports.updateInvoicingQboSyncHealth = exports.fetchInvoicingQboSyncHealth = exports.fetchInvoicingAccountingPickers = exports.updateInvoicingQboConnectionFailure = exports.updateInvoicingQboConnection = exports.fetchInvoicingQboConnection = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../../rootActions");
 exports.initialState = {
-    accountsByAccountTypes: {},
-    accountsFetchStateByAccountTypes: {},
     backfillFetchState: { fetchState: 'Not-Started', error: undefined },
-    classes: [],
-    classesFetchState: { fetchState: 'Not-Started', error: undefined },
     connection: undefined,
     connectionFetchState: { fetchState: 'Not-Started', error: undefined },
     retryFetchStateByTaskId: {},
@@ -33,41 +29,8 @@ const invoicingQboView = (0, toolkit_1.createSlice)({
         updateInvoicingQboConnectionFailure(draft, action) {
             draft.connectionFetchState = { fetchState: 'Error', error: action.payload };
         },
-        fetchInvoicingQboAccounts: {
-            reducer(draft, action) {
-                draft.accountsFetchStateByAccountTypes[action.payload.accountTypes] = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(accountTypes) {
-                return { payload: { accountTypes } };
-            },
-        },
-        updateInvoicingQboAccounts(draft, action) {
-            draft.accountsByAccountTypes[action.payload.accountTypes] =
-                action.payload.accounts;
-            draft.accountsFetchStateByAccountTypes[action.payload.accountTypes] = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-        },
-        updateInvoicingQboAccountsFailure(draft, action) {
-            draft.accountsFetchStateByAccountTypes[action.payload.accountTypes] = {
-                fetchState: 'Error',
-                error: action.payload.status,
-            };
-        },
-        fetchInvoicingQboClasses(draft) {
-            draft.classesFetchState = { fetchState: 'In-Progress', error: undefined };
-        },
-        updateInvoicingQboClasses(draft, action) {
-            draft.classes = action.payload;
-            draft.classesFetchState = { fetchState: 'Completed', error: undefined };
-        },
-        updateInvoicingQboClassesFailure(draft, action) {
-            draft.classesFetchState = { fetchState: 'Error', error: action.payload };
-        },
+        // No state of its own: the epic decides which shared lists to load.
+        fetchInvoicingAccountingPickers() { },
         fetchInvoicingQboSyncHealth(draft) {
             draft.syncHealthFetchState = {
                 fetchState: 'In-Progress',
@@ -131,5 +94,5 @@ const invoicingQboView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = invoicingQboView.actions, exports.fetchInvoicingQboConnection = _a.fetchInvoicingQboConnection, exports.updateInvoicingQboConnection = _a.updateInvoicingQboConnection, exports.updateInvoicingQboConnectionFailure = _a.updateInvoicingQboConnectionFailure, exports.fetchInvoicingQboAccounts = _a.fetchInvoicingQboAccounts, exports.updateInvoicingQboAccounts = _a.updateInvoicingQboAccounts, exports.updateInvoicingQboAccountsFailure = _a.updateInvoicingQboAccountsFailure, exports.fetchInvoicingQboClasses = _a.fetchInvoicingQboClasses, exports.updateInvoicingQboClasses = _a.updateInvoicingQboClasses, exports.updateInvoicingQboClassesFailure = _a.updateInvoicingQboClassesFailure, exports.fetchInvoicingQboSyncHealth = _a.fetchInvoicingQboSyncHealth, exports.updateInvoicingQboSyncHealth = _a.updateInvoicingQboSyncHealth, exports.updateInvoicingQboSyncHealthFailure = _a.updateInvoicingQboSyncHealthFailure, exports.retryInvoicingQboSyncTask = _a.retryInvoicingQboSyncTask, exports.retryInvoicingQboSyncTaskSuccess = _a.retryInvoicingQboSyncTaskSuccess, exports.retryInvoicingQboSyncTaskFailure = _a.retryInvoicingQboSyncTaskFailure, exports.startInvoicingQboBackfill = _a.startInvoicingQboBackfill, exports.startInvoicingQboBackfillSuccess = _a.startInvoicingQboBackfillSuccess, exports.startInvoicingQboBackfillFailure = _a.startInvoicingQboBackfillFailure;
+_a = invoicingQboView.actions, exports.fetchInvoicingQboConnection = _a.fetchInvoicingQboConnection, exports.updateInvoicingQboConnection = _a.updateInvoicingQboConnection, exports.updateInvoicingQboConnectionFailure = _a.updateInvoicingQboConnectionFailure, exports.fetchInvoicingAccountingPickers = _a.fetchInvoicingAccountingPickers, exports.fetchInvoicingQboSyncHealth = _a.fetchInvoicingQboSyncHealth, exports.updateInvoicingQboSyncHealth = _a.updateInvoicingQboSyncHealth, exports.updateInvoicingQboSyncHealthFailure = _a.updateInvoicingQboSyncHealthFailure, exports.retryInvoicingQboSyncTask = _a.retryInvoicingQboSyncTask, exports.retryInvoicingQboSyncTaskSuccess = _a.retryInvoicingQboSyncTaskSuccess, exports.retryInvoicingQboSyncTaskFailure = _a.retryInvoicingQboSyncTaskFailure, exports.startInvoicingQboBackfill = _a.startInvoicingQboBackfill, exports.startInvoicingQboBackfillSuccess = _a.startInvoicingQboBackfillSuccess, exports.startInvoicingQboBackfillFailure = _a.startInvoicingQboBackfillFailure;
 exports.default = invoicingQboView.reducer;

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

@@ -1,21 +1,58 @@
+import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
+import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError } from '../../../commonStateTypes/common';
+import { AccountType } from '../../../entity/account/accountState';
 import { RootState } from '../../../rootStateTypes';
-import { InvoicingQboAccountOption, InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
+import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
+export declare const INVOICING_ACCOUNT_LIST_KEY: "invoicingAccountList";
+/** Whether QBO is connected, without building the option lists to find out. */
+export declare const isInvoicingQboConnected: (state: RootState) => boolean;
+/**
+ * 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[];
+/** An account or class as the invoicing pickers render and submit it. */
+export interface InvoicingAccountingOption {
+    id: string;
+    name: string;
+    accountType?: string;
+}
 export interface InvoicingQboView {
-    accountsByAccountTypes: Record<string, InvoicingQboAccountOption[]>;
-    accountsFetchStateByAccountTypes: Record<string, FetchStateAndError>;
+    accounts: InvoicingAccountingOption[];
+    accountsFetchState: FetchStateAndError;
     backfillState: FetchStateAndError;
-    classes: InvoicingQboAccountOption[];
+    classes: InvoicingAccountingOption[];
     classesFetchState: FetchStateAndError;
     connectionFetchState: FetchStateAndError;
+    /**
+     * The account and class trees the grouped pickers render. The flat option
+     * lists above stay for callers that only need id and name.
+     */
+    nestedAccountHierarchy: NestedAccountHierarchyForReport[];
+    nestedClassHierarchy: NestedClassHierarchyForReport[];
     retryFetchStateByTaskId: Record<string, FetchStateAndError>;
     syncHealthFetchState: FetchStateAndError;
     connection?: InvoicingQboConnection;
     syncHealth?: InvoicingQboSyncHealth;
 }
+/**
+ * The accounts valid for one QBO mapping kind, whose `accountTypes` is a
+ * comma-separated list of QuickBooks type names. An unrecognised list yields no
+ * accounts rather than every account: offering a bank account where income is
+ * required would post a mapping QuickBooks rejects.
+ */
+export declare const invoicingAccountsForQboAccountTypes: (accounts: InvoicingAccountingOption[], accountTypes: string) => InvoicingAccountingOption[];
+/**
+ * The account tree narrowed to the given account types. The tree itself carries
+ * no account type, so the flat account list supplies that and the matching
+ * `qboId`s are kept — which is why callers that only need "income accounts, as a
+ * tree" do not have to hold a second flat list to filter with.
+ */
+export declare const invoicingAccountHierarchyForTypes: (state: RootState, accountTypes: readonly AccountType[]) => NestedAccountHierarchyForReport[];
 /**
  * Single bundled view for the QBO integration settings screen — the
- * connection, per-account-types account options, classes, sync health, and the
- * fetch/action states for each of them.
+ * connection, the account and class options, sync health, and the fetch/action
+ * states for each of them.
  */
 export declare const getInvoicingQboView: (state: RootState) => InvoicingQboView;

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

@@ -1,19 +1,140 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = void 0;
+exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.INVOICING_INCOME_ACCOUNT_TYPES = 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';
+/** Whether QBO is connected, without building the option lists to find out. */
+const isInvoicingQboConnected = (state) => state.invoicingQboViewState.connection?.connected === true;
+exports.isInvoicingQboConnected = isInvoicingQboConnected;
+/**
+ * Account types that can back invoicing revenue. Named here so screens ask for
+ * "income accounts" rather than repeating the accounting service's vocabulary.
+ */
+exports.INVOICING_INCOME_ACCOUNT_TYPES = [
+    'income',
+    'other_income',
+];
+/**
+ * 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.
+ */
+const invoicingAccountingOptions = (state, accountTypes) => {
+    const { accounts } = (0, accountListSelector_1.getAccountList)(state.accountState, state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
+    return accounts.flatMap((account) => {
+        if (account.qboId == null || account.isDeleted === true) {
+            return [];
+        }
+        if (accountTypes != null &&
+            (account.accountType == null ||
+                !accountTypes.includes(account.accountType))) {
+            return [];
+        }
+        return [
+            {
+                id: String(account.qboId),
+                name: account.accountName,
+                accountType: account.accountType,
+            },
+        ];
+    });
+};
+/**
+ * Normalises an account-type name for comparison. The config's mapping kinds
+ * name QuickBooks types the way QuickBooks displays them ("Other Current
+ * Asset", "Expense"), while the accounting service uses snake_case and
+ * sometimes pluralises ("other_current_assets", "expenses"). Comparing the
+ * normalised, de-pluralised forms keeps a picker from silently emptying because
+ * of a trailing "s".
+ */
+const normalizeAccountTypeName = (value) => {
+    const normalized = value
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '_');
+    // Singularise so "Other Current Liability" meets `other_current_liabilities`
+    // and "Expense" meets `expenses`. `-ies` needs its own case: stripping the
+    // trailing "s" alone would leave "liabilitie", matching nothing.
+    return normalized.replace(/ies$/, 'y').replace(/([^s])s$/, '$1');
+};
+/**
+ * The accounts valid for one QBO mapping kind, whose `accountTypes` is a
+ * comma-separated list of QuickBooks type names. An unrecognised list yields no
+ * accounts rather than every account: offering a bank account where income is
+ * required would post a mapping QuickBooks rejects.
+ */
+const invoicingAccountsForQboAccountTypes = (accounts, accountTypes) => {
+    const wanted = new Set(accountTypes
+        .split(',')
+        .map(normalizeAccountTypeName)
+        .filter((accountType) => accountType !== ''));
+    if (wanted.size === 0) {
+        return accounts;
+    }
+    return accounts.filter((account) => account.accountType != null &&
+        wanted.has(normalizeAccountTypeName(account.accountType)));
+};
+exports.invoicingAccountsForQboAccountTypes = invoicingAccountsForQboAccountTypes;
+/** 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);
+    return classes.flatMap((accountingClass) => accountingClass.qboId == null || accountingClass.isDeleted === true
+        ? []
+        : [
+            {
+                id: String(accountingClass.qboId),
+                name: accountingClass.className,
+            },
+        ]);
+};
+/**
+ * The account tree narrowed to the given account types. The tree itself carries
+ * no account type, so the flat account list supplies that and the matching
+ * `qboId`s are kept — which is why callers that only need "income accounts, as a
+ * tree" do not have to hold a second flat list to filter with.
+ */
+const invoicingAccountHierarchyForTypes = (state, accountTypes) => {
+    const allowedQboIds = new Set(invoicingAccountingOptions(state, accountTypes).map((account) => account.id));
+    const keepMatching = (nodes) => nodes.flatMap((node) => {
+        const children = keepMatching(node.children);
+        const isMatch = node.qboId != null && allowedQboIds.has(String(node.qboId));
+        // A parent that is not itself a match is still kept when it holds one, so
+        // the tree's shape survives the filter.
+        if (!isMatch && children.length === 0) {
+            return [];
+        }
+        return [{ ...node, children }];
+    });
+    return keepMatching((0, accountListSelector_1.getNestedAccountListHierarchy)(state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY));
+};
+exports.invoicingAccountHierarchyForTypes = invoicingAccountHierarchyForTypes;
 /**
  * Single bundled view for the QBO integration settings screen — the
- * connection, per-account-types account options, classes, sync health, and the
- * fetch/action states for each of them.
+ * connection, the account and class options, sync health, and the fetch/action
+ * states for each of them.
  */
 const getInvoicingQboView = (state) => {
     const qboState = state.invoicingQboViewState;
+    const accountList = state.accountListState.byReportId[exports.INVOICING_ACCOUNT_LIST_KEY];
     return {
-        accountsByAccountTypes: qboState.accountsByAccountTypes,
-        accountsFetchStateByAccountTypes: qboState.accountsFetchStateByAccountTypes,
+        accounts: invoicingAccountingOptions(state),
+        accountsFetchState: {
+            fetchState: accountList.fetchState,
+            error: accountList.error,
+        },
+        nestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY),
+        nestedClassHierarchy: (0, classListSelector_1.getNestedClassListHierarchy)(state.classListState),
         backfillState: qboState.backfillFetchState,
-        classes: qboState.classes,
-        classesFetchState: qboState.classesFetchState,
+        classes: invoicingAccountingClassOptions(state),
+        classesFetchState: {
+            fetchState: state.classListState.fetchState,
+            error: state.classListState.error,
+        },
         connection: qboState.connection,
         connectionFetchState: qboState.connectionFetchState,
         retryFetchStateByTaskId: qboState.retryFetchStateByTaskId,

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

@@ -1,11 +1,7 @@
 import { FetchStateAndError } from '../../../commonStateTypes/common';
-import { InvoicingQboAccountOption, InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
+import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
 export interface InvoicingQboViewState {
-    accountsByAccountTypes: Record<string, InvoicingQboAccountOption[]>;
-    accountsFetchStateByAccountTypes: Record<string, FetchStateAndError>;
     backfillFetchState: FetchStateAndError;
-    classes: InvoicingQboAccountOption[];
-    classesFetchState: FetchStateAndError;
     connectionFetchState: FetchStateAndError;
     retryFetchStateByTaskId: Record<string, FetchStateAndError>;
     syncHealthFetchState: FetchStateAndError;

package/package.json

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

package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic.js

@@ -1,25 +0,0 @@
-import { of } from 'rxjs';
-import { catchError, filter, map, mergeMap } from 'rxjs/operators';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { mapInvoicingQboAccountOptions, } from '../invoicingQboViewPayload';
-import { fetchInvoicingQboAccounts, updateInvoicingQboAccounts, updateInvoicingQboAccountsFailure, } from '../invoicingQboViewReducer';
-export const fetchInvoicingQboAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingQboAccounts.match), mergeMap((action) => {
-    const { accountTypes } = action.payload;
-    const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/accounts?account_types=${encodeURIComponent(accountTypes)}`;
-    return zeniAPI.getJSON(apiUrl).pipe(map((response) => {
-        if (isSuccessResponse(response)) {
-            return updateInvoicingQboAccounts({
-                accountTypes,
-                accounts: mapInvoicingQboAccountOptions(response.data?.accounts ?? []),
-            });
-        }
-        return updateInvoicingQboAccountsFailure({
-            accountTypes,
-            status: response.status,
-        });
-    }), catchError((error) => of(updateInvoicingQboAccountsFailure({
-        accountTypes,
-        status: createZeniAPIStatus('Unexpected Error', 'Fetch QBO accounts REST API call errored out ' +
-            JSON.stringify(error)),
-    }))));
-}));

package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic.js

@@ -1,15 +0,0 @@
-import { of } from 'rxjs';
-import { catchError, filter, map, switchMap } from 'rxjs/operators';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { mapInvoicingQboAccountOptions, } from '../invoicingQboViewPayload';
-import { fetchInvoicingQboClasses, updateInvoicingQboClasses, updateInvoicingQboClassesFailure, } from '../invoicingQboViewReducer';
-export const fetchInvoicingQboClassesEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingQboClasses.match), switchMap(() => {
-    const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/classes`;
-    return zeniAPI.getJSON(apiUrl).pipe(map((response) => {
-        if (isSuccessResponse(response)) {
-            return updateInvoicingQboClasses(mapInvoicingQboAccountOptions(response.data?.accounts ?? []));
-        }
-        return updateInvoicingQboClassesFailure(response.status);
-    }), catchError((error) => of(updateInvoicingQboClassesFailure(createZeniAPIStatus('Unexpected Error', 'Fetch QBO classes REST API call errored out ' +
-        JSON.stringify(error))))));
-}));

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic.d.ts

@@ -1,6 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { RootState } from '../../../../rootStateTypes';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { InvoicingQboViewActionType } from './invoicingQboViewActionType';
-export declare const fetchInvoicingQboAccountsEpic: (actions$: ActionsObservable<InvoicingQboViewActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<InvoicingQboViewActionType>;

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

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchInvoicingQboAccountsEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const responsePayload_1 = require("../../../../responsePayload");
-const invoicingQboViewPayload_1 = require("../invoicingQboViewPayload");
-const invoicingQboViewReducer_1 = require("../invoicingQboViewReducer");
-const fetchInvoicingQboAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(invoicingQboViewReducer_1.fetchInvoicingQboAccounts.match), (0, operators_1.mergeMap)((action) => {
-    const { accountTypes } = action.payload;
-    const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/accounts?account_types=${encodeURIComponent(accountTypes)}`;
-    return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.map)((response) => {
-        if ((0, responsePayload_1.isSuccessResponse)(response)) {
-            return (0, invoicingQboViewReducer_1.updateInvoicingQboAccounts)({
-                accountTypes,
-                accounts: (0, invoicingQboViewPayload_1.mapInvoicingQboAccountOptions)(response.data?.accounts ?? []),
-            });
-        }
-        return (0, invoicingQboViewReducer_1.updateInvoicingQboAccountsFailure)({
-            accountTypes,
-            status: response.status,
-        });
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, invoicingQboViewReducer_1.updateInvoicingQboAccountsFailure)({
-        accountTypes,
-        status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch QBO accounts REST API call errored out ' +
-            JSON.stringify(error)),
-    }))));
-}));
-exports.fetchInvoicingQboAccountsEpic = fetchInvoicingQboAccountsEpic;

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic.d.ts

@@ -1,6 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { RootState } from '../../../../rootStateTypes';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { InvoicingQboViewActionType } from './invoicingQboViewActionType';
-export declare const fetchInvoicingQboClassesEpic: (actions$: ActionsObservable<InvoicingQboViewActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<InvoicingQboViewActionType>;

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

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchInvoicingQboClassesEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const responsePayload_1 = require("../../../../responsePayload");
-const invoicingQboViewPayload_1 = require("../invoicingQboViewPayload");
-const invoicingQboViewReducer_1 = require("../invoicingQboViewReducer");
-const fetchInvoicingQboClassesEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(invoicingQboViewReducer_1.fetchInvoicingQboClasses.match), (0, operators_1.switchMap)(() => {
-    const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/classes`;
-    return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.map)((response) => {
-        if ((0, responsePayload_1.isSuccessResponse)(response)) {
-            return (0, invoicingQboViewReducer_1.updateInvoicingQboClasses)((0, invoicingQboViewPayload_1.mapInvoicingQboAccountOptions)(response.data?.accounts ?? []));
-        }
-        return (0, invoicingQboViewReducer_1.updateInvoicingQboClassesFailure)(response.status);
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, invoicingQboViewReducer_1.updateInvoicingQboClassesFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch QBO classes REST API call errored out ' +
-        JSON.stringify(error))))));
-}));
-exports.fetchInvoicingQboClassesEpic = fetchInvoicingQboClassesEpic;