@zeniai/client-epic-state 5.2.10-betaAK3 → 5.2.10-betaAK5

package/lib/entity/invoicing/invoicingCommonPayload.d.ts

@@ -95,50 +95,37 @@ export declare function toInvoicingQboCustomerMatchingMode(value: string): Invoi
  * plus hydrated fields the client only displays.
  */
 /**
- * Account mappings arrive in two shapes. The original sends a bare id per slot
- * (`deposit_account_id`); the newer one sends the account itself
- * (`deposit_account`). Both are declared because a tenant can be served either
- * depending on when its backend rolled, and a page that understands only one
- * renders an empty picker over data that exists. `Partial` because a read may
- * carry only the ids, while a write sends a whole `AccountBasePayload`.
- */
-export interface InvoicingQboAccountMappingsPayload {
-    default_income_account?: Partial<AccountBasePayload> | null;
-    default_income_account_id?: string | null;
-    deposit_account?: Partial<AccountBasePayload> | null;
-    deposit_account_id?: string | null;
-    discounts_account?: Partial<AccountBasePayload> | null;
-    discounts_account_id?: string | null;
-    rounding_account?: Partial<AccountBasePayload> | null;
-    rounding_account_id?: string | null;
-    write_off_account?: Partial<AccountBasePayload> | null;
-    write_off_account_id?: string | null;
-}
-/**
- * The id for one mapping slot, from whichever shape the backend sent. The object
- * form wins when present; a blank id in either is treated as unset so the picker
- * shows its placeholder rather than selecting nothing.
+ * Account mappings as the service stores them: one entry per mapping kind the
+ * config API defines, keyed by that kind's code (`deposit_account`,
+ * `default_income_account`, …). The value is the whole account, or just its id
+ * for a tenant whose backend has not rolled — both are read, and a save writes
+ * the record.
+ *
+ * An index signature rather than a field list, because the config owns which
+ * kinds exist: enumerating them here means a kind it adds gets dropped.
  */
+export type InvoicingQboAccountMappingsPayload = Record<string, Partial<AccountBasePayload> | string | null>;
 /**
  * The first id a picker can actually select. Callers list the QuickBooks id
- * first: the options are keyed on it, so an internal id selects nothing even
- * when it names the same record. Blank counts as absent, so a cleared field
- * falls through to the next candidate rather than selecting an empty option.
+ * first: the options are keyed on it, so a platform id selects nothing even when
+ * it names the same record. Blank counts as absent.
  */
 export declare const firstSelectableInvoicingId: (candidates: readonly (string | null | undefined)[]) => string | undefined;
 /**
- * Read one account-mapping dropdown value by its config `code` (the codes in
- * `qbo_account_mapping_kind_options` match the `account_mappings` field names).
+ * The slot a mapping code names. Codes arrive from the config API as the slot
+ * itself (`deposit_account`); a trailing `_id` is tolerated so a tenant sending
+ * the older `deposit_account_id` resolves to the same mapping.
  */
+export declare const toInvoicingQboAccountMappingSlot: (code: string) => string;
+/** Read one account-mapping dropdown value by its config `code`. */
 export declare function getInvoicingQboAccountMappingId(accountMappings: InvoicingQboAccountMappingsPayload | undefined, code: string): string | undefined;
 /**
- * Expand each mapping from the id the picker submitted to the whole account, the
- * shape the service stores. Written at the request boundary rather than in the
- * page's draft so the UI keeps working in ids, and an id that no longer resolves
- * is left out — a mapping the service cannot expand is worse than none.
+ * Build the `account_mappings` request body from the ids the pickers submitted.
+ * Each kind is sent as the whole account, which is what the service stores; an
+ * id that resolves to no account is sent as it stands rather than dropped, so a
+ * save never silently unsets a mapping it could not expand.
  */
-export declare const withInvoicingQboMappedAccounts: (accountMappings: InvoicingQboAccountMappingsPayload | undefined, accountByQboId: (qboId: string) => AccountBase | undefined) => InvoicingQboAccountMappingsPayload | undefined;
-export declare function withInvoicingQboAccountMappingId(accountMappings: InvoicingQboAccountMappingsPayload | undefined, code: string, accountId: string): InvoicingQboAccountMappingsPayload;
+export declare const toInvoicingQboAccountMappingsPayload: (accountIdByMappingCode: Record<string, string>, accountForId: (accountId: string) => AccountBase | undefined) => InvoicingQboAccountMappingsPayload;
 export interface InvoicingQboSettingsPayload {
     account_mappings?: InvoicingQboAccountMappingsPayload | null;
     auto_create_items?: boolean;

package/lib/entity/invoicing/invoicingCommonPayload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALL_INVOICING_FIELD_HELP_GROUPS = exports.withInvoicingQboMappedAccounts = exports.firstSelectableInvoicingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.INVOICING_DISCOUNT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_PRODUCT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_ITEM_LIFECYCLE_ACTIONS = exports.INVOICING_SUBSCRIPTION_LIFECYCLE_ACTIONS = exports.INVOICING_DUNNING_ACTIONS = void 0;
+exports.ALL_INVOICING_FIELD_HELP_GROUPS = exports.toInvoicingQboAccountMappingsPayload = exports.toInvoicingQboAccountMappingSlot = exports.firstSelectableInvoicingId = exports.INVOICING_QBO_CUSTOMER_MATCHING_MODES = exports.INVOICING_DISCOUNT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_PRODUCT_LIFECYCLE_ACTIONS = exports.INVOICING_CATALOG_ITEM_LIFECYCLE_ACTIONS = exports.INVOICING_SUBSCRIPTION_LIFECYCLE_ACTIONS = exports.INVOICING_DUNNING_ACTIONS = void 0;
 exports.toInvoicingDunningAction = toInvoicingDunningAction;
 exports.toInvoicingSubscriptionLifecycleAction = toInvoicingSubscriptionLifecycleAction;
 exports.toInvoicingSubscriptionLifecycleActionOption = toInvoicingSubscriptionLifecycleActionOption;
@@ -12,7 +12,6 @@ exports.toInvoicingDiscountLifecycleAction = toInvoicingDiscountLifecycleAction;
 exports.toInvoicingDiscountLifecycleActionOption = toInvoicingDiscountLifecycleActionOption;
 exports.toInvoicingQboCustomerMatchingMode = toInvoicingQboCustomerMatchingMode;
 exports.getInvoicingQboAccountMappingId = getInvoicingQboAccountMappingId;
-exports.withInvoicingQboAccountMappingId = withInvoicingQboAccountMappingId;
 exports.toInvoicingQboAccountMappingKindOption = toInvoicingQboAccountMappingKindOption;
 exports.toInvoicingNamedOption = toInvoicingNamedOption;
 exports.toInvoicingFormOption = toInvoicingFormOption;
@@ -154,84 +153,50 @@ function toInvoicingQboCustomerMatchingMode(value) {
             throw new Error(`Unknown InvoicingQboCustomerMatchingMode: ${value}`);
     }
 }
-/**
- * The id for one mapping slot, from whichever shape the backend sent. The object
- * form wins when present; a blank id in either is treated as unset so the picker
- * shows its placeholder rather than selecting nothing.
- */
 /**
  * The first id a picker can actually select. Callers list the QuickBooks id
- * first: the options are keyed on it, so an internal id selects nothing even
- * when it names the same record. Blank counts as absent, so a cleared field
- * falls through to the next candidate rather than selecting an empty option.
+ * first: the options are keyed on it, so a platform id selects nothing even when
+ * it names the same record. Blank counts as absent.
  */
 const firstSelectableInvoicingId = (candidates) => candidates.find((candidate) => candidate != null && candidate !== '');
 exports.firstSelectableInvoicingId = firstSelectableInvoicingId;
-function readInvoicingQboMappedAccountId(mappedAccount, legacyAccountId) {
-    // Both shapes are read: the mapping arrives either way depending on how it
-    // was saved.
-    return (0, exports.firstSelectableInvoicingId)([
-        mappedAccount?.qbo_id,
-        mappedAccount?.account_id,
-        legacyAccountId,
-    ]);
-}
-/**
- * The object key holding a mapped account, derived from its `*_account_id` code:
- * `deposit_account_id` arrives either as `deposit_account_id` or as a
- * `deposit_account` record. Derived rather than listed — the set of slots is the
- * config API's to grow, and a hardcoded list silently ignores any code it has
- * not heard of, which shows up as a mapping that will not save.
- */
-const mappedAccountKeyForCode = (code) => code.replace(/_id$/, '');
-/** Every mapping code a payload carries, in either shape. */
-const mappingCodesIn = (accountMappings) => [
-    ...new Set(Object.keys(accountMappings).map((key) => key.endsWith('_id') ? key : `${key}_id`)),
-];
 /**
- * Read one account-mapping dropdown value by its config `code` (the codes in
- * `qbo_account_mapping_kind_options` match the `account_mappings` field names).
+ * The slot a mapping code names. Codes arrive from the config API as the slot
+ * itself (`deposit_account`); a trailing `_id` is tolerated so a tenant sending
+ * the older `deposit_account_id` resolves to the same mapping.
  */
+const toInvoicingQboAccountMappingSlot = (code) => code.replace(/_id$/, '');
+exports.toInvoicingQboAccountMappingSlot = toInvoicingQboAccountMappingSlot;
+/** Read one account-mapping dropdown value by its config `code`. */
 function getInvoicingQboAccountMappingId(accountMappings, code) {
-    const slots = accountMappings;
-    const legacyId = slots?.[code];
-    return readInvoicingQboMappedAccountId(slots?.[mappedAccountKeyForCode(code)], typeof legacyId === 'string' ? legacyId : undefined);
+    const slotKey = (0, exports.toInvoicingQboAccountMappingSlot)(code);
+    // Either key: the service sends `deposit_account`, but an older payload put
+    // the id under `deposit_account_id`.
+    const slot = accountMappings?.[slotKey] ?? accountMappings?.[`${slotKey}_id`];
+    if (typeof slot === 'string') {
+        return slot !== '' ? slot : undefined;
+    }
+    return (0, exports.firstSelectableInvoicingId)([slot?.qbo_id, slot?.account_id]);
 }
 /**
- * Expand each mapping from the id the picker submitted to the whole account, the
- * shape the service stores. Written at the request boundary rather than in the
- * page's draft so the UI keeps working in ids, and an id that no longer resolves
- * is left out — a mapping the service cannot expand is worse than none.
+ * Build the `account_mappings` request body from the ids the pickers submitted.
+ * Each kind is sent as the whole account, which is what the service stores; an
+ * id that resolves to no account is sent as it stands rather than dropped, so a
+ * save never silently unsets a mapping it could not expand.
  */
-const withInvoicingQboMappedAccounts = (accountMappings, accountByQboId) => {
-    if (accountMappings == null) {
-        return undefined;
-    }
-    const expanded = { ...accountMappings };
-    mappingCodesIn(accountMappings).forEach((code) => {
-        const objectKey = mappedAccountKeyForCode(code);
-        const accountId = getInvoicingQboAccountMappingId(accountMappings, code);
-        if (accountId == null) {
+const toInvoicingQboAccountMappingsPayload = (accountIdByMappingCode, accountForId) => {
+    const mappings = {};
+    Object.entries(accountIdByMappingCode).forEach(([code, accountId]) => {
+        if (accountId === '') {
             return;
         }
-        const account = accountByQboId(accountId);
-        expanded[objectKey] =
-            account != null ? (0, accountPayload_1.toAccountPayload)(account) : undefined;
-        expanded[code] = undefined;
+        const account = accountForId(accountId);
+        mappings[(0, exports.toInvoicingQboAccountMappingSlot)(code)] =
+            account != null ? (0, accountPayload_1.toAccountPayload)(account) : accountId;
     });
-    return expanded;
+    return mappings;
 };
-exports.withInvoicingQboMappedAccounts = withInvoicingQboMappedAccounts;
-function withInvoicingQboAccountMappingId(accountMappings, code, accountId) {
-    // Both slots are written together: setting only the bare id would leave the
-    // record shape behind, and the reader prefers it — so the selection just made
-    // would read back as whatever was mapped before.
-    return {
-        ...(accountMappings ?? {}),
-        [mappedAccountKeyForCode(code)]: undefined,
-        [code]: accountId,
-    };
-}
+exports.toInvoicingQboAccountMappingsPayload = toInvoicingQboAccountMappingsPayload;
 function toInvoicingQboAccountMappingKindOption(option) {
     return {
         accountTypes: option.account_types,

package/lib/esm/entity/invoicing/invoicingCommonPayload.js

@@ -129,82 +129,47 @@ export function toInvoicingQboCustomerMatchingMode(value) {
             throw new Error(`Unknown InvoicingQboCustomerMatchingMode: ${value}`);
     }
 }
-/**
- * The id for one mapping slot, from whichever shape the backend sent. The object
- * form wins when present; a blank id in either is treated as unset so the picker
- * shows its placeholder rather than selecting nothing.
- */
 /**
  * The first id a picker can actually select. Callers list the QuickBooks id
- * first: the options are keyed on it, so an internal id selects nothing even
- * when it names the same record. Blank counts as absent, so a cleared field
- * falls through to the next candidate rather than selecting an empty option.
+ * first: the options are keyed on it, so a platform id selects nothing even when
+ * it names the same record. Blank counts as absent.
  */
 export const firstSelectableInvoicingId = (candidates) => candidates.find((candidate) => candidate != null && candidate !== '');
-function readInvoicingQboMappedAccountId(mappedAccount, legacyAccountId) {
-    // Both shapes are read: the mapping arrives either way depending on how it
-    // was saved.
-    return firstSelectableInvoicingId([
-        mappedAccount?.qbo_id,
-        mappedAccount?.account_id,
-        legacyAccountId,
-    ]);
-}
-/**
- * The object key holding a mapped account, derived from its `*_account_id` code:
- * `deposit_account_id` arrives either as `deposit_account_id` or as a
- * `deposit_account` record. Derived rather than listed — the set of slots is the
- * config API's to grow, and a hardcoded list silently ignores any code it has
- * not heard of, which shows up as a mapping that will not save.
- */
-const mappedAccountKeyForCode = (code) => code.replace(/_id$/, '');
-/** Every mapping code a payload carries, in either shape. */
-const mappingCodesIn = (accountMappings) => [
-    ...new Set(Object.keys(accountMappings).map((key) => key.endsWith('_id') ? key : `${key}_id`)),
-];
 /**
- * Read one account-mapping dropdown value by its config `code` (the codes in
- * `qbo_account_mapping_kind_options` match the `account_mappings` field names).
+ * The slot a mapping code names. Codes arrive from the config API as the slot
+ * itself (`deposit_account`); a trailing `_id` is tolerated so a tenant sending
+ * the older `deposit_account_id` resolves to the same mapping.
  */
+export const toInvoicingQboAccountMappingSlot = (code) => code.replace(/_id$/, '');
+/** Read one account-mapping dropdown value by its config `code`. */
 export function getInvoicingQboAccountMappingId(accountMappings, code) {
-    const slots = accountMappings;
-    const legacyId = slots?.[code];
-    return readInvoicingQboMappedAccountId(slots?.[mappedAccountKeyForCode(code)], typeof legacyId === 'string' ? legacyId : undefined);
+    const slotKey = toInvoicingQboAccountMappingSlot(code);
+    // Either key: the service sends `deposit_account`, but an older payload put
+    // the id under `deposit_account_id`.
+    const slot = accountMappings?.[slotKey] ?? accountMappings?.[`${slotKey}_id`];
+    if (typeof slot === 'string') {
+        return slot !== '' ? slot : undefined;
+    }
+    return firstSelectableInvoicingId([slot?.qbo_id, slot?.account_id]);
 }
 /**
- * Expand each mapping from the id the picker submitted to the whole account, the
- * shape the service stores. Written at the request boundary rather than in the
- * page's draft so the UI keeps working in ids, and an id that no longer resolves
- * is left out — a mapping the service cannot expand is worse than none.
+ * Build the `account_mappings` request body from the ids the pickers submitted.
+ * Each kind is sent as the whole account, which is what the service stores; an
+ * id that resolves to no account is sent as it stands rather than dropped, so a
+ * save never silently unsets a mapping it could not expand.
  */
-export const withInvoicingQboMappedAccounts = (accountMappings, accountByQboId) => {
-    if (accountMappings == null) {
-        return undefined;
-    }
-    const expanded = { ...accountMappings };
-    mappingCodesIn(accountMappings).forEach((code) => {
-        const objectKey = mappedAccountKeyForCode(code);
-        const accountId = getInvoicingQboAccountMappingId(accountMappings, code);
-        if (accountId == null) {
+export const toInvoicingQboAccountMappingsPayload = (accountIdByMappingCode, accountForId) => {
+    const mappings = {};
+    Object.entries(accountIdByMappingCode).forEach(([code, accountId]) => {
+        if (accountId === '') {
             return;
         }
-        const account = accountByQboId(accountId);
-        expanded[objectKey] =
-            account != null ? toAccountPayload(account) : undefined;
-        expanded[code] = undefined;
+        const account = accountForId(accountId);
+        mappings[toInvoicingQboAccountMappingSlot(code)] =
+            account != null ? toAccountPayload(account) : accountId;
     });
-    return expanded;
+    return mappings;
 };
-export function withInvoicingQboAccountMappingId(accountMappings, code, accountId) {
-    // Both slots are written together: setting only the bare id would leave the
-    // record shape behind, and the reader prefers it — so the selection just made
-    // would read back as whatever was mapped before.
-    return {
-        ...(accountMappings ?? {}),
-        [mappedAccountKeyForCode(code)]: undefined,
-        [code]: accountId,
-    };
-}
 export function toInvoicingQboAccountMappingKindOption(option) {
     return {
         accountTypes: option.account_types,

package/lib/esm/index.js

@@ -858,7 +858,7 @@ export { isStripeConnectedFromSettings } from './view/invoicing/settingsView/inv
 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';
+export { INVOICING_QBO_CUSTOMER_MATCHING_MODES, getInvoicingQboAccountMappingId, toInvoicingNamedOptionsByKey, toInvoicingQboCustomerMatchingMode, } from './entity/invoicing/invoicingCommonPayload';
 // ── Invoicing: config ─────────────────────────────────────────────────────────
 export { acceptInvoicingTerms, enableInvoicing, fetchInvoicingConfig, resetInvoicingConfigActionStates, updateInvoicingConfig, } from './view/invoicing/invoicingConfigView/invoicingConfigViewReducer';
 export { getInvoicingConfigView } from './view/invoicing/invoicingConfigView/invoicingConfigViewSelector';

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

@@ -52,7 +52,13 @@ export const invoicingQboAccountByQboId = (state, qboId) => {
     // throw would take the whole request with it.
     try {
         const { accounts } = getAccountList(state.accountState, state.accountListState, INVOICING_ACCOUNT_LIST_KEY);
-        return accounts.find((account) => String(account.qboId) === qboId);
+        // Matched on any id the account is known by. The pickers submit `qboId`,
+        // but a mapping that arrived from the service can name the account by its
+        // platform id instead, and an account we cannot resolve is a mapping that
+        // cannot be sent as a record.
+        return accounts.find((account) => String(account.qboId) === qboId ||
+            String(account.accountId) === qboId ||
+            String(account.coaId) === qboId);
     }
     catch {
         return undefined;

package/lib/esm/view/invoicing/settingsView/epics/saveInvoicingSettingsEpic.js

@@ -1,27 +1,12 @@
 import { from } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
-import { withInvoicingQboMappedAccounts, } from '../../../../entity/invoicing/invoicingCommonPayload';
 import { apiErrorSnackbarVariables } from '../../../../entity/snackbar/snackbarApiError';
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { invoicingQboAccountByQboId } from '../../invoicingQboView/invoicingQboViewSelector';
 import { saveInvoicingSettings, saveInvoicingSettingsFailure, saveInvoicingSettingsSuccess, } from '../settingsViewReducer';
-export const saveInvoicingSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveInvoicingSettings.match), mergeMap((action) => {
+export const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(saveInvoicingSettings.match), mergeMap((action) => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     const { settings, snackbarSection } = action.payload;
-    // The QBO page edits mappings as picker ids; the service stores whole
-    // accounts. Expanded here, at the request boundary, so the page does not
-    // have to hold entities it only needs in order to save.
-    const qboSettings = settings.qbo;
-    const body = qboSettings?.account_mappings != null
-        ? {
-            ...settings,
-            qbo: {
-                ...qboSettings,
-                account_mappings: withInvoicingQboMappedAccounts(qboSettings.account_mappings, (qboId) => invoicingQboAccountByQboId(state$.value, qboId)),
-            },
-        }
-        : settings;
     /** `status` surfaces the platform's error text; omit it to keep the generic copy. */
     const snackbar = (messageText, status) => snackbarSection == null
         ? []
@@ -34,7 +19,7 @@ export const saveInvoicingSettingsEpic = (actions$, state$, zeniAPI) => actions$
             }),
         ];
     return zeniAPI
-        .putAndGetJSON(apiUrl, { ...body })
+        .putAndGetJSON(apiUrl, { ...settings })
         .pipe(switchMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return from([

package/lib/esm/view/invoicing/settingsView/epics/submitInvoicingQboSettingsEpic.js

@@ -1,5 +1,6 @@
 import { EMPTY, of } from 'rxjs';
 import { filter, mergeMap, withLatestFrom } from 'rxjs/operators';
+import { invoicingQboAccountByQboId } from '../../invoicingQboView/invoicingQboViewSelector';
 import { invoicingQboSettingsLocalDataToPayload } from '../invoicingQboSettingsFormConfig';
 import { saveInvoicingSettings, submitInvoicingQboSettings, } from '../settingsViewReducer';
 /**
@@ -16,7 +17,9 @@ export const submitInvoicingQboSettingsEpic = (actions$, state$) => actions$.pip
         return EMPTY;
     }
     return of(saveInvoicingSettings({
-        settings: { qbo: invoicingQboSettingsLocalDataToPayload(qboDraft) },
+        settings: {
+            qbo: invoicingQboSettingsLocalDataToPayload(qboDraft, (accountId) => invoicingQboAccountByQboId(state, accountId)),
+        },
         snackbarSection: 'invoicing_qbo_settings_save',
     }));
 }));

package/lib/esm/view/invoicing/settingsView/invoicingQboSettingsFormConfig.js

@@ -1,4 +1,4 @@
-import { getInvoicingQboAccountMappingId, withInvoicingQboAccountMappingId, } from '../../../entity/invoicing/invoicingCommonPayload';
+import { getInvoicingQboAccountMappingId, toInvoicingQboAccountMappingSlot, toInvoicingQboAccountMappingsPayload, } from '../../../entity/invoicing/invoicingCommonPayload';
 export const initialInvoicingQboSettingsLocalData = {
     accountIdByMappingCode: {},
     autoCreateItems: false,
@@ -12,13 +12,12 @@ export const initialInvoicingQboSettingsLocalData = {
 export const entityToInvoicingQboSettingsLocalData = (qbo) => {
     const accountMappings = qbo?.account_mappings ?? {};
     const accountIdByMappingCode = {};
-    // Whatever slots the payload carries, in either shape — `deposit_account` and
-    // `deposit_account_id` are the same mapping under one code.
+    // Keyed by the slot the payload used, which is the config code the page will
+    // ask for — the reader tolerates the older `_id` form on the way in.
     Object.keys(accountMappings).forEach((key) => {
-        const code = key.endsWith('_id') ? key : `${key}_id`;
-        const accountId = getInvoicingQboAccountMappingId(accountMappings, code);
+        const accountId = getInvoicingQboAccountMappingId(accountMappings, key);
         if (accountId != null) {
-            accountIdByMappingCode[code] = accountId;
+            accountIdByMappingCode[toInvoicingQboAccountMappingSlot(key)] = accountId;
         }
     });
     return {
@@ -32,19 +31,13 @@ export const entityToInvoicingQboSettingsLocalData = (qbo) => {
     };
 };
 /**
- * The local data as the request body. Only the mappings the page holds are sent;
- * an empty id means the slot was never set, so it is left out rather than sent
- * blank.
+ * The local data as the request body. `accountForId` turns each picked id into
+ * the whole account the service stores; it comes from the epic, which is where
+ * the account list is in reach.
  */
-export const invoicingQboSettingsLocalDataToPayload = (localData) => {
-    let accountMappings = {};
-    Object.entries(localData.accountIdByMappingCode).forEach(([code, accountId]) => {
-        if (accountId !== '') {
-            accountMappings = withInvoicingQboAccountMappingId(accountMappings, code, accountId);
-        }
-    });
+export const invoicingQboSettingsLocalDataToPayload = (localData, accountForId) => {
     return {
-        account_mappings: accountMappings,
+        account_mappings: toInvoicingQboAccountMappingsPayload(localData.accountIdByMappingCode, accountForId),
         auto_create_items: localData.autoCreateItems,
         closed_period_void_as_credit_memo: localData.closedPeriodVoidAsCreditMemo,
         customer_matching: localData.customerMatching,

package/lib/index.d.ts

@@ -1249,7 +1249,7 @@ export type { InvoicingAccountingOption } from './view/invoicing/invoicingQboVie
 export { getInvoicingQboView } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
 export type { InvoicingQboView } from './view/invoicing/invoicingQboView/invoicingQboViewSelector';
 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 { INVOICING_QBO_CUSTOMER_MATCHING_MODES, getInvoicingQboAccountMappingId, toInvoicingNamedOptionsByKey, toInvoicingQboCustomerMatchingMode, } 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';
 export { getInvoicingConfigView } from './view/invoicing/invoicingConfigView/invoicingConfigViewSelector';

package/lib/index.js

@@ -83,7 +83,7 @@ exports.runInvoicingCatalogPlanAction = exports.getInvoicingInvoiceActionState =
 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 = exports.getInvoicingDiscountActionState = exports.runInvoicingDiscountAction = exports.getInvoicingCatalogActionState = exports.runInvoicingCatalogProductAction = void 0;
 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 = exports.updateInvoicingSubscriptions = exports.removeInvoicingSubscription = exports.resetPromotionalCreditAction = exports.submitAddPromotionalCredits = void 0;
 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 = exports.getInvoicingCouponCounts = exports.INVOICING_COUPON_COLUMNS = exports.ALL_INVOICING_COUPON_TAB_IDS = exports.ALL_INVOICING_COUPON_SORT_KEYS = 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.invoicingQboSettingsLocalDataToPayload = exports.initialInvoicingQboSettingsLocalData = exports.entityToInvoicingQboSettingsLocalData = exports.getInvoicingSettingsView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = exports.getInvoicingQboSettingsFormView = exports.getInvoicingBrandingFormView = exports.updateInvoicingSettings = exports.updateInvoicingQboSettingsDraft = exports.updateInvoicingBrandingFormDraft = exports.submitInvoicingQboSettings = exports.submitInvoicingBrandingForm = exports.saveInvoicingSettings = exports.resetSaveInvoicingSettings = exports.resetInvoicingQboSettingsDraft = exports.resetInvoicingBrandingFormDraft = exports.fetchInvoicingSettings = exports.disconnectInvoicingStripe = void 0;
+exports.getInvoicingOnboardingGateView = exports.getInvoicingConfigView = exports.updateInvoicingConfig = exports.resetInvoicingConfigActionStates = exports.fetchInvoicingConfig = exports.enableInvoicing = exports.acceptInvoicingTerms = 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.invoicingQboSettingsLocalDataToPayload = exports.initialInvoicingQboSettingsLocalData = exports.entityToInvoicingQboSettingsLocalData = exports.getInvoicingSettingsView = exports.getInvoicingSettingsHubView = exports.getInvoicingSettingsFetchState = exports.getInvoicingSettings = exports.getInvoicingQboSettingsFormView = exports.getInvoicingBrandingFormView = exports.updateInvoicingSettings = exports.updateInvoicingQboSettingsDraft = exports.updateInvoicingBrandingFormDraft = exports.submitInvoicingQboSettings = exports.submitInvoicingBrandingForm = exports.saveInvoicingSettings = exports.resetSaveInvoicingSettings = exports.resetInvoicingQboSettingsDraft = exports.resetInvoicingBrandingFormDraft = exports.fetchInvoicingSettings = exports.disconnectInvoicingStripe = 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; } });
@@ -3133,7 +3133,6 @@ Object.defineProperty(exports, "INVOICING_QBO_CUSTOMER_MATCHING_MODES", { enumer
 Object.defineProperty(exports, "getInvoicingQboAccountMappingId", { enumerable: true, get: function () { return invoicingCommonPayload_2.getInvoicingQboAccountMappingId; } });
 Object.defineProperty(exports, "toInvoicingNamedOptionsByKey", { enumerable: true, get: function () { return invoicingCommonPayload_2.toInvoicingNamedOptionsByKey; } });
 Object.defineProperty(exports, "toInvoicingQboCustomerMatchingMode", { enumerable: true, get: function () { return invoicingCommonPayload_2.toInvoicingQboCustomerMatchingMode; } });
-Object.defineProperty(exports, "withInvoicingQboAccountMappingId", { enumerable: true, get: function () { return invoicingCommonPayload_2.withInvoicingQboAccountMappingId; } });
 // ── Invoicing: config ─────────────────────────────────────────────────────────
 var invoicingConfigViewReducer_1 = require("./view/invoicing/invoicingConfigView/invoicingConfigViewReducer");
 Object.defineProperty(exports, "acceptInvoicingTerms", { enumerable: true, get: function () { return invoicingConfigViewReducer_1.acceptInvoicingTerms; } });

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

@@ -232,7 +232,7 @@ export interface ReconciliationTabsState {
         uiState: ReconciliationReviewTabViewUiState;
     };
 }
-declare const toReconReviewSortKey: (v: string) => "date" | "amount" | "memo" | "payee" | "direction" | "match";
+declare const toReconReviewSortKey: (v: string) => "date" | "amount" | "memo" | "match" | "payee" | "direction";
 export type ReconReviewSortKey = ReturnType<typeof toReconReviewSortKey>;
 export interface ReconciliationReviewTabViewUiState {
     scrollPosition: {

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

@@ -58,7 +58,13 @@ const invoicingQboAccountByQboId = (state, qboId) => {
     // throw would take the whole request with it.
     try {
         const { accounts } = (0, accountListSelector_1.getAccountList)(state.accountState, state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
-        return accounts.find((account) => String(account.qboId) === qboId);
+        // Matched on any id the account is known by. The pickers submit `qboId`,
+        // but a mapping that arrived from the service can name the account by its
+        // platform id instead, and an account we cannot resolve is a mapping that
+        // cannot be sent as a record.
+        return accounts.find((account) => String(account.qboId) === qboId ||
+            String(account.accountId) === qboId ||
+            String(account.coaId) === qboId);
     }
     catch {
         return undefined;

package/lib/view/invoicing/settingsView/epics/saveInvoicingSettingsEpic.d.ts

@@ -3,4 +3,4 @@ import { Observable } from 'rxjs';
 import { RootState } from '../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { InvoicingSettingsViewActionType } from './settingsViewActionType';
-export declare const saveInvoicingSettingsEpic: (actions$: ActionsObservable<InvoicingSettingsViewActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<InvoicingSettingsViewActionType>;
+export declare const saveInvoicingSettingsEpic: (actions$: ActionsObservable<InvoicingSettingsViewActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<InvoicingSettingsViewActionType>;

package/lib/view/invoicing/settingsView/epics/saveInvoicingSettingsEpic.js

@@ -3,28 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveInvoicingSettingsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const invoicingCommonPayload_1 = require("../../../../entity/invoicing/invoicingCommonPayload");
 const snackbarApiError_1 = require("../../../../entity/snackbar/snackbarApiError");
 const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../../responsePayload");
-const invoicingQboViewSelector_1 = require("../../invoicingQboView/invoicingQboViewSelector");
 const settingsViewReducer_1 = require("../settingsViewReducer");
-const saveInvoicingSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.saveInvoicingSettings.match), (0, operators_1.mergeMap)((action) => {
+const saveInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.saveInvoicingSettings.match), (0, operators_1.mergeMap)((action) => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     const { settings, snackbarSection } = action.payload;
-    // The QBO page edits mappings as picker ids; the service stores whole
-    // accounts. Expanded here, at the request boundary, so the page does not
-    // have to hold entities it only needs in order to save.
-    const qboSettings = settings.qbo;
-    const body = qboSettings?.account_mappings != null
-        ? {
-            ...settings,
-            qbo: {
-                ...qboSettings,
-                account_mappings: (0, invoicingCommonPayload_1.withInvoicingQboMappedAccounts)(qboSettings.account_mappings, (qboId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state$.value, qboId)),
-            },
-        }
-        : settings;
     /** `status` surfaces the platform's error text; omit it to keep the generic copy. */
     const snackbar = (messageText, status) => snackbarSection == null
         ? []
@@ -37,7 +22,7 @@ const saveInvoicingSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((
             }),
         ];
     return zeniAPI
-        .putAndGetJSON(apiUrl, { ...body })
+        .putAndGetJSON(apiUrl, { ...settings })
         .pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.from)([

package/lib/view/invoicing/settingsView/epics/submitInvoicingQboSettingsEpic.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.submitInvoicingQboSettingsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const invoicingQboViewSelector_1 = require("../../invoicingQboView/invoicingQboViewSelector");
 const invoicingQboSettingsFormConfig_1 = require("../invoicingQboSettingsFormConfig");
 const settingsViewReducer_1 = require("../settingsViewReducer");
 /**
@@ -19,7 +20,9 @@ const submitInvoicingQboSettingsEpic = (actions$, state$) => actions$.pipe((0, o
         return rxjs_1.EMPTY;
     }
     return (0, rxjs_1.of)((0, settingsViewReducer_1.saveInvoicingSettings)({
-        settings: { qbo: (0, invoicingQboSettingsFormConfig_1.invoicingQboSettingsLocalDataToPayload)(qboDraft) },
+        settings: {
+            qbo: (0, invoicingQboSettingsFormConfig_1.invoicingQboSettingsLocalDataToPayload)(qboDraft, (accountId) => (0, invoicingQboViewSelector_1.invoicingQboAccountByQboId)(state, accountId)),
+        },
         snackbarSection: 'invoicing_qbo_settings_save',
     }));
 }));

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

@@ -1,3 +1,4 @@
+import { AccountBase } from '../../../entity/account/accountState';
 import { InvoicingQboSettingsPayload } from '../../../entity/invoicing/invoicingCommonPayload';
 /**
  * The QBO configuration page's local data. A client shape, not the wire one: the
@@ -26,8 +27,8 @@ export declare const initialInvoicingQboSettingsLocalData: InvoicingQboSettingsL
 /** The settings response as the page edits it. */
 export declare const entityToInvoicingQboSettingsLocalData: (qbo: InvoicingQboSettingsPayload | null | undefined) => InvoicingQboSettingsLocalData;
 /**
- * The local data as the request body. Only the mappings the page holds are sent;
- * an empty id means the slot was never set, so it is left out rather than sent
- * blank.
+ * The local data as the request body. `accountForId` turns each picked id into
+ * the whole account the service stores; it comes from the epic, which is where
+ * the account list is in reach.
  */
-export declare const invoicingQboSettingsLocalDataToPayload: (localData: InvoicingQboSettingsLocalData) => InvoicingQboSettingsPayload;
+export declare const invoicingQboSettingsLocalDataToPayload: (localData: InvoicingQboSettingsLocalData, accountForId: (accountId: string) => AccountBase | undefined) => InvoicingQboSettingsPayload;