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

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

@@ -1,9 +1,10 @@
+import { createSelector } from '@reduxjs/toolkit';
 import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { getInvoicingCouponById } from '../../../entity/invoicing/coupon/couponSelector';
-import { toInvoicingFormOption, toInvoicingQboAccountMappingSlot, } from '../../../entity/invoicing/invoicingCommonPayload';
+import { toInvoicingFormOption, } from '../../../entity/invoicing/invoicingCommonPayload';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingFormDraftLocalData, isInvoicingFormDraftPending, } from '../invoicingFormDraft';
-import { getInvoicingQboView, invoicingAccountsForQboAccountTypes, invoicingQboAccountByQboId, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
+import { INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES, INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT, NO_INVOICING_ACCOUNT_HIERARCHY, NO_INVOICING_ACCOUNT_IDS, getInvoicingQboAccountOptions, getInvoicingQboView, invoicingQboAccountByQboId, invoicingQboAccountIdsForMappingSlot, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
 import { getInvoicingSettings, getInvoicingSettingsFetchState, } from '../settingsView/settingsViewSelector';
 import { initialInvoicingCouponFormLocalData, invoicingCouponDiscountsAccountIdForCreate, } from './editInvoicingCouponDetailViewState';
 /**
@@ -11,6 +12,21 @@ import { initialInvoicingCouponFormLocalData, invoicingCouponDiscountsAccountIdF
  * the id of the coupon last saved, and — when a `couponId` is passed (edit
  * mode) — the existing coupon entity to prefill the form.
  */
+/**
+ * The QuickBooks ids the discounts account may be picked from.
+ *
+ * Memoized, and collapsing to one shared empty array while QBO is disconnected:
+ * the form turns this into its picker options and re-seeds its defaults when
+ * those change, so a fresh array on every store change would reset the form
+ * under the user until their first edit.
+ */
+const getInvoicingCouponDiscountsAccountIds = createSelector([
+    getInvoicingQboAccountOptions,
+    (state) => getInvoicingConfigView(state).qboAccountMappingKindOptions,
+    isInvoicingQboConnected,
+], (accounts, qboAccountMappingKindOptions, isQboConnected) => isQboConnected
+    ? invoicingQboAccountIdsForMappingSlot(accounts, qboAccountMappingKindOptions, INVOICING_DISCOUNTS_ACCOUNT_MAPPING_SLOT, INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES)
+    : NO_INVOICING_ACCOUNT_IDS);
 const NOT_STARTED = {
     error: undefined,
     fetchState: 'Not-Started',
@@ -51,14 +67,6 @@ export const getEditInvoicingCouponDetailViewState = (state, couponId) => {
         version: 1.0,
     };
 };
-/**
- * The account types the discounts slot falls back to when the config has no
- * `discounts_account` kind. A QuickBooks discount line posts to an income
- * account; offering every account instead would let a save be rejected.
- */
-const DEFAULT_DISCOUNTS_ACCOUNT_TYPES = 'Income';
-/** The account-mapping slot a coupon's discounts account shares with settings. */
-const DISCOUNTS_ACCOUNT_MAPPING_SLOT = 'discounts_account';
 /**
  * Bundled view for the discount form screen: the edit view (save state + the
  * coupon to prefill in edit mode), the draft `localData` (seeded from the
@@ -74,7 +82,7 @@ export const getInvoicingCouponFormView = (state, couponId) => {
     const localData = couponId != null
         ? getInvoicingFormDraftLocalData(editDraftById, couponId, initialInvoicingCouponFormLocalData)
         : newCouponDraft;
-    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, qboAccountMappingKindOptions, } = getInvoicingConfigView(state);
+    const { billingPeriodUnitOptions, discountApplyOnOptions, discountDurationTypeOptions, discountTypeOptions, } = getInvoicingConfigView(state);
     const isQboConnected = isInvoicingQboConnected(state);
     const qboView = isQboConnected ? getInvoicingQboView(state) : undefined;
     const isQboPickerDataLoading = isInvoicingAccountingPickerDataLoading(state);
@@ -84,14 +92,6 @@ export const getInvoicingCouponFormView = (state, couponId) => {
     const isCreateSeedPending = couponId == null &&
         (settingsFetchState === 'Not-Started' ||
             settingsFetchState === 'In-Progress');
-    // The account types the discounts slot accepts come from the same config the
-    // QBO settings page reads, so the two pickers offer the same accounts and
-    // widening the slot stays a config change. Matched on the slot rather than
-    // the code as written: a config that names the kind `discounts_account_id`
-    // is the same slot, and missing it here would quietly fall back to the
-    // default and offer a different set than the settings page does.
-    const discountsAccountTypes = qboAccountMappingKindOptions.find((kindOption) => toInvoicingQboAccountMappingSlot(kindOption.code) ===
-        DISCOUNTS_ACCOUNT_MAPPING_SLOT)?.accountTypes ?? DEFAULT_DISCOUNTS_ACCOUNT_TYPES;
     return {
         ...base,
         applyOnOptions: discountApplyOnOptions.map(toInvoicingFormOption),
@@ -130,7 +130,7 @@ export const getInvoicingCouponFormView = (state, couponId) => {
             },
         mode: couponId != null ? 'edit' : 'create',
         periodUnitOptions: billingPeriodUnitOptions.map(toInvoicingFormOption),
-        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? [],
-        qboIncomeAccountIds: invoicingAccountsForQboAccountTypes(qboView?.accounts ?? [], discountsAccountTypes).map((account) => account.id),
+        qboAccountHierarchy: qboView?.nestedAccountHierarchy ?? NO_INVOICING_ACCOUNT_HIERARCHY,
+        qboIncomeAccountIds: getInvoicingCouponDiscountsAccountIds(state),
     };
 };

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/seedInvoicingCouponFormDraftEpic.js

@@ -23,9 +23,13 @@ export const seedInvoicingCouponFormDraftEpic = (actions$, state$) => actions$.p
     // endpoints merge their own list-shaped rows into the same store. Only a
     // completed detail load does, which is also exactly when the page's
     // cache-guarded fetch issues no request and this is the sole seed.
+    // A forced refetch is the caller asking for fresh data: the response will
+    // seed, and seeding first from the entity as it stands would mark the
+    // draft loaded and lock that response out.
     if (fetchInvoicingCouponDetailPage.match(action) &&
-        state.editInvoicingCouponDetailViewState.recordStateById[id]
-            ?.fetchState !== 'Completed') {
+        (action.payload.cacheOverride === true ||
+            state.editInvoicingCouponDetailViewState.recordStateById[id]
+                ?.fetchState !== 'Completed')) {
         return EMPTY;
     }
     // Nothing to seed from on a cold open; the detail response triggers this

package/lib/esm/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer.js

@@ -1,6 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { clearAll } from '../../../rootActions';
-import { applyInvoicingFormDraftEdit, applyInvoicingFormDraftFailure, applyInvoicingFormDraftSeed, } from '../invoicingFormDraft';
+import { applyInvoicingFormDraftEdit, applyInvoicingFormDraftFailure, applyInvoicingFormDraftSaved, applyInvoicingFormDraftSeed, } from '../invoicingFormDraft';
 import { initialInvoicingCustomerFormLocalData } from './invoicingCustomerFormConfig';
 export const initialState = {
     emailPreviewFetchState: { fetchState: 'Not-Started', error: undefined },
@@ -8,6 +8,7 @@ export const initialState = {
     emailPreviewCustomerId: undefined,
     promotionalCreditSubmitState: { fetchState: 'Not-Started', error: undefined },
     recordStateById: {},
+    billingAddressOwnerId: undefined,
     fetchState: 'Not-Started',
     error: undefined,
     editDraftById: {},
@@ -154,6 +155,9 @@ const editInvoicingCustomerDetailView = createSlice({
             draft.fetchState = 'Completed';
             draft.error = undefined;
             draft.savedCustomerId = action.payload.customerId;
+            // An edit is refetched on success; keep the saved values on screen until
+            // that lands, and let it replace them.
+            applyInvoicingFormDraftSaved(draft.editDraftById, action.payload.customerId);
         },
         submitInvoicingCustomerFormFailure(draft, action) {
             draft.fetchState = 'Error';
@@ -183,6 +187,10 @@ const editInvoicingCustomerDetailView = createSlice({
                 return { payload };
             },
         },
+        /** Record which customer the shared billing-address slot now belongs to. */
+        claimInvoicingCustomerBillingAddress(draft, action) {
+            draft.billingAddressOwnerId = action.payload.id;
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(clearAll, (draft) => {
@@ -190,5 +198,5 @@ const editInvoicingCustomerDetailView = createSlice({
         });
     },
 });
-export const { fetchInvoicingPaymentLinkEmailPreview, fetchInvoicingPaymentLinkEmailPreviewPage, updateInvoicingPaymentLinkEmailPreview, updateInvoicingPaymentLinkEmailPreviewFailure, addPromotionalCreditsFailure, addPromotionalCreditsSuccess, fetchInvoicingCustomerDetail, fetchInvoicingCustomerDetailPage, seedInvoicingCustomerFormDraft, updateInvoicingCustomerDetail, resetPromotionalCreditAction, submitAddPromotionalCredits, updateInvoicingCustomerDetailFailure, updateInvoicingCustomerFormDraft, submitInvoicingCustomerForm, submitInvoicingCustomerFormSuccess, submitInvoicingCustomerFormFailure, resetEditInvoicingCustomerDetailView, initializeInvoicingCustomerAddress, } = editInvoicingCustomerDetailView.actions;
+export const { fetchInvoicingPaymentLinkEmailPreview, fetchInvoicingPaymentLinkEmailPreviewPage, updateInvoicingPaymentLinkEmailPreview, updateInvoicingPaymentLinkEmailPreviewFailure, addPromotionalCreditsFailure, addPromotionalCreditsSuccess, fetchInvoicingCustomerDetail, fetchInvoicingCustomerDetailPage, seedInvoicingCustomerFormDraft, updateInvoicingCustomerDetail, resetPromotionalCreditAction, submitAddPromotionalCredits, updateInvoicingCustomerDetailFailure, updateInvoicingCustomerFormDraft, submitInvoicingCustomerForm, submitInvoicingCustomerFormSuccess, submitInvoicingCustomerFormFailure, resetEditInvoicingCustomerDetailView, initializeInvoicingCustomerAddress, claimInvoicingCustomerBillingAddress, } = editInvoicingCustomerDetailView.actions;
 export default editInvoicingCustomerDetailView.reducer;

package/lib/esm/view/invoicing/editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewSelector.js

@@ -1,4 +1,5 @@
 import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
+import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getInvoicesByIds } from '../../../entity/invoicing/invoice/invoiceSelector';
 import { getInvoicingCustomerById } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector';
 import { invoicingCustomerPaymentMethods } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector';
@@ -50,6 +51,37 @@ export const getInvoicingCustomerRecord = (state, invoicingCustomerID) => {
  * fetch state/error, and the id of the customer last saved — so the form screen
  * depends on this single selector.
  */
+/**
+ * Whether the billing address entered on the Address screen is a change the
+ * customer has not saved. Presence alone cannot say so: the detail page seeds
+ * the address store with the saved address on load so the Address screen opens
+ * prefilled. Only a pending address that differs from the saved one — or one
+ * where nothing is saved yet — is an unsaved change. Compared on what the user
+ * enters; a saved address's coordinates and timestamps are left out.
+ */
+const isBillingAddressUnsaved = (state, id, savedBillingAddressId) => {
+    // The slot is keyed by address type alone; only a draft this customer owns counts.
+    if (id == null ||
+        state.editInvoicingCustomerDetailViewState.billingAddressOwnerId !== id) {
+        return false;
+    }
+    const pending = state.addressViewState.newAddressState?.[INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE]?.addressToCreate;
+    if (pending == null) {
+        return false;
+    }
+    const saved = savedBillingAddressId != null
+        ? getAddressByAddressId(state.addressState, savedBillingAddressId)
+        : undefined;
+    if (saved == null) {
+        return true;
+    }
+    return !(pending.street.join('\u0000') === saved.street.join('\u0000') &&
+        pending.city === saved.city &&
+        pending.state === saved.state &&
+        pending.postalCode === saved.postalCode &&
+        pending.country === saved.country &&
+        (pending.countryCode ?? '') === (saved.countryCode ?? ''));
+};
 export const getInvoicingCustomerFormView = (state, invoicingCustomerID) => {
     const { editDraftById, error, fetchState, newCustomerDraft, savedCustomerId } = state.editInvoicingCustomerDetailViewState;
     const mode = invoicingCustomerID != null ? 'edit' : 'create';
@@ -101,6 +133,7 @@ export const getInvoicingCustomerFormView = (state, invoicingCustomerID) => {
         taxabilityOptions,
         billingAddressId,
         billingAddressLabel,
+        hasUnsavedBillingAddress: isBillingAddressUnsaved(state, invoicingCustomerID, customer?.billingAddressId),
         savedCustomerId,
         fetchState,
         error,

package/lib/esm/view/invoicing/editInvoicingCustomerDetailView/initializeInvoicingCustomerAddressEpic.js

@@ -1,35 +1,61 @@
-import { EMPTY, of } from 'rxjs';
+import { EMPTY, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getInvoicingCustomerById } from '../../../entity/invoicing/invoicingCustomer/invoicingCustomerSelector';
-import { newAddressInLocalStore } from '../../addressView/addressViewReducer';
-import { updateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
-import { initializeInvoicingCustomerAddress } from './editInvoicingCustomerDetailViewReducer';
+import { newAddressInLocalStore, removeNewAddressDataInLocalStore, } from '../../addressView/addressViewReducer';
+import { claimInvoicingCustomerBillingAddress, fetchInvoicingCustomerDetail, fetchInvoicingCustomerDetailPage, initializeInvoicingCustomerAddress, updateInvoicingCustomerDetail, } from './editInvoicingCustomerDetailViewReducer';
 import { INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE } from './invoicingCustomerFormConfig';
 /**
- * Seed the shared Address screen with an existing customer's saved billing
- * address (looked up in the address entity store by `billingAddressId`). Runs
- * both when the customer detail loads and on an explicit initialize trigger.
- * Skips when an in-progress draft already exists, so an address the user just
- * entered survives navigating between the form and the Address screen. Mirrors
- * `initializeVendorAddressEpic`.
+ * Seed the shared Address screen with the customer's saved billing address, and
+ * record that the slot is this customer's. Runs when a detail request is issued
+ * (every path that loads a record issues one — the detail page when not cached,
+ * the create/edit form always), when the page opens, when the detail load
+ * lands, and on an explicit initialize trigger.
+ *
+ * The address store slot is keyed by address type alone, so it can still hold
+ * another customer's draft. Only a draft this customer owns is left alone —
+ * that is what lets an address the user just entered survive a trip to the
+ * Address screen. Anything else is replaced by this customer's saved address,
+ * or cleared when it has none. Opening the page counts as a trigger because a
+ * record already loaded this session issues no detail request at all.
  */
 export const initializeInvoicingCustomerAddressEpic = (actions$, state$) => actions$.pipe(filter((action) => initializeInvoicingCustomerAddress.match(action) ||
-    updateInvoicingCustomerDetail.match(action)), mergeMap((action) => {
+    updateInvoicingCustomerDetail.match(action) ||
+    fetchInvoicingCustomerDetailPage.match(action) ||
+    fetchInvoicingCustomerDetail.match(action)), mergeMap((action) => {
     const { id } = action.payload;
+    if (id == null) {
+        return EMPTY;
+    }
     const rootState = state$.value;
-    const existingDraft = rootState.addressViewState.newAddressState?.[INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE]?.addressToCreate;
-    if (existingDraft != null || id == null) {
+    const pending = rootState.addressViewState.newAddressState?.[INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE]?.addressToCreate;
+    const ownerId = rootState.editInvoicingCustomerDetailViewState.billingAddressOwnerId;
+    // A detail response speaks for the record it loaded, which may no longer
+    // be the one on screen: its request keeps running when the user moves on
+    // to a cached record, which issues no request of its own to cancel it.
+    // Only the page-open and explicit triggers define the current record.
+    if (updateInvoicingCustomerDetail.match(action) &&
+        ownerId != null &&
+        ownerId !== id) {
+        return EMPTY;
+    }
+    if (pending != null && ownerId === id) {
         return EMPTY;
     }
     const customer = getInvoicingCustomerById(rootState.invoicingCustomerState, id);
     const address = customer?.billingAddressId != null
         ? getAddressByAddressId(rootState.addressState, customer.billingAddressId)
         : undefined;
-    return address != null
-        ? of(newAddressInLocalStore({
+    const actions = [];
+    if (address != null) {
+        actions.push(newAddressInLocalStore({
             addressType: INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE,
             addressToCreate: address,
-        }))
-        : EMPTY;
+        }));
+    }
+    else if (pending != null) {
+        actions.push(removeNewAddressDataInLocalStore(INVOICING_CUSTOMER_BILLING_ADDRESS_TYPE));
+    }
+    actions.push(claimInvoicingCustomerBillingAddress({ id }));
+    return from(actions);
 }));

package/lib/esm/view/invoicing/editInvoicingCustomerDetailView/seedInvoicingCustomerFormDraftEpic.js

@@ -23,9 +23,13 @@ export const seedInvoicingCustomerFormDraftEpic = (actions$, state$) => actions$
     // endpoints merge their own list-shaped rows into the same store. Only a
     // completed detail load does, which is also exactly when the page's
     // cache-guarded fetch issues no request and this is the sole seed.
+    // A forced refetch is the caller asking for fresh data: the response will
+    // seed, and seeding first from the entity as it stands would mark the
+    // draft loaded and lock that response out.
     if (fetchInvoicingCustomerDetailPage.match(action) &&
-        state.editInvoicingCustomerDetailViewState.recordStateById[id]
-            ?.fetchState !== 'Completed') {
+        (action.payload.cacheOverride === true ||
+            state.editInvoicingCustomerDetailViewState.recordStateById[id]
+                ?.fetchState !== 'Completed')) {
         return EMPTY;
     }
     // Nothing to seed from on a cold open; the detail response triggers this

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewReducer.js

@@ -1,6 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { clearAll } from '../../../rootActions';
-import { applyInvoicingFormDraftEdit, applyInvoicingFormDraftFailure, applyInvoicingFormDraftSeed, } from '../invoicingFormDraft';
+import { applyInvoicingFormDraftEdit, applyInvoicingFormDraftFailure, applyInvoicingFormDraftSaved, applyInvoicingFormDraftSeed, } from '../invoicingFormDraft';
 import { initialInvoicingSubscriptionFormLocalData } from './invoicingSubscriptionFormConfig';
 export const initialState = {
     fetchState: 'Not-Started',
@@ -8,6 +8,7 @@ export const initialState = {
     editDraftById: {},
     actionStateById: {},
     recordStateById: {},
+    shippingAddressOwnerId: undefined,
     newSubscriptionDraft: { ...initialInvoicingSubscriptionFormLocalData },
     savedSubscriptionId: undefined,
     hasValidState() {
@@ -105,6 +106,9 @@ const editInvoicingSubscriptionDetailView = createSlice({
             draft.fetchState = 'Completed';
             draft.error = undefined;
             draft.savedSubscriptionId = action.payload.subscriptionId;
+            // An edit is refetched on success; keep the saved values on screen until
+            // that lands, and let it replace them.
+            applyInvoicingFormDraftSaved(draft.editDraftById, action.payload.subscriptionId);
         },
         submitInvoicingSubscriptionFormFailure(draft, action) {
             draft.fetchState = 'Error';
@@ -136,6 +140,10 @@ const editInvoicingSubscriptionDetailView = createSlice({
                 return { payload };
             },
         },
+        /** Record which subscription the shared shipping-address slot now belongs to. */
+        claimInvoicingSubscriptionShippingAddress(draft, action) {
+            draft.shippingAddressOwnerId = action.payload.id;
+        },
         // Trigger only — handled by syncInvoicingSubscriptionCouponsEpic.
         syncInvoicingSubscriptionCoupons: {
             reducer() { },
@@ -150,5 +158,5 @@ const editInvoicingSubscriptionDetailView = createSlice({
         });
     },
 });
-export const { runInvoicingSubscriptionAction, runInvoicingSubscriptionActionFailure, runInvoicingSubscriptionActionSuccess, fetchInvoicingSubscriptionDetail, fetchInvoicingSubscriptionDetailPage, fetchInvoicingSubscriptionFormPage, seedInvoicingSubscriptionFormDraft, updateInvoicingSubscriptionDetail, updateInvoicingSubscriptionDetailFailure, updateInvoicingSubscriptionFormDraft, submitInvoicingSubscriptionForm, submitInvoicingSubscriptionFormSuccess, submitInvoicingSubscriptionFormFailure, resetEditInvoicingSubscriptionDetailView, initializeInvoicingSubscriptionAddress, syncInvoicingSubscriptionCoupons, } = editInvoicingSubscriptionDetailView.actions;
+export const { runInvoicingSubscriptionAction, runInvoicingSubscriptionActionFailure, runInvoicingSubscriptionActionSuccess, fetchInvoicingSubscriptionDetail, fetchInvoicingSubscriptionDetailPage, fetchInvoicingSubscriptionFormPage, seedInvoicingSubscriptionFormDraft, updateInvoicingSubscriptionDetail, updateInvoicingSubscriptionDetailFailure, updateInvoicingSubscriptionFormDraft, submitInvoicingSubscriptionForm, submitInvoicingSubscriptionFormSuccess, submitInvoicingSubscriptionFormFailure, resetEditInvoicingSubscriptionDetailView, initializeInvoicingSubscriptionAddress, claimInvoicingSubscriptionShippingAddress, syncInvoicingSubscriptionCoupons, } = editInvoicingSubscriptionDetailView.actions;
 export default editInvoicingSubscriptionDetailView.reducer;

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/editInvoicingSubscriptionDetailViewSelector.js

@@ -1,4 +1,5 @@
 import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
+import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getInvoicingSubscriptionById } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionSelector';
 import { getFormattedAddress } from '../../addressView/addressViewSelector';
 import { getInvoicingCouponListItems } from '../couponView/couponViewSelector';
@@ -24,6 +25,37 @@ export const getEditInvoicingSubscriptionDetailViewState = (state, invoicingSubs
         version: 1.0,
     };
 };
+/**
+ * Whether the shipping address entered on the Address screen is a change the
+ * subscription has not saved. Presence alone cannot say so: the detail page seeds
+ * the address store with the saved address on load so the Address screen opens
+ * prefilled. Only a pending address that differs from the saved one — or one
+ * where nothing is saved yet — is an unsaved change. Compared on what the user
+ * enters; a saved address's coordinates and timestamps are left out.
+ */
+const isShippingAddressUnsaved = (state, id, savedShippingAddressId) => {
+    // The slot is keyed by address type alone; only a draft this subscription owns counts.
+    if (id == null ||
+        state.editInvoicingSubscriptionDetailViewState.shippingAddressOwnerId !== id) {
+        return false;
+    }
+    const pending = state.addressViewState.newAddressState?.[INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE]?.addressToCreate;
+    if (pending == null) {
+        return false;
+    }
+    const saved = savedShippingAddressId != null
+        ? getAddressByAddressId(state.addressState, savedShippingAddressId)
+        : undefined;
+    if (saved == null) {
+        return true;
+    }
+    return !(pending.street.join('\u0000') === saved.street.join('\u0000') &&
+        pending.city === saved.city &&
+        pending.state === saved.state &&
+        pending.postalCode === saved.postalCode &&
+        pending.country === saved.country &&
+        (pending.countryCode ?? '') === (saved.countryCode ?? ''));
+};
 export const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID) => {
     const { editDraftById, error, fetchState, newSubscriptionDraft, savedSubscriptionId, } = state.editInvoicingSubscriptionDetailViewState;
     const mode = invoicingSubscriptionID != null ? 'edit' : 'create';
@@ -43,6 +75,7 @@ export const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID)
     const shippingAddressLabel = newAddress?.addressToCreate != null
         ? getFormattedAddress(newAddress.addressToCreate)
         : undefined;
+    const hasUnsavedShippingAddress = isShippingAddressUnsaved(state, invoicingSubscriptionID, subscription?.shippingAddressId);
     const catalogListView = getInvoicingCatalogListView(state);
     const planPrices = getInvoicingCatalogPrices(catalogListView.plans);
     const addonAndChargePrices = getInvoicingCatalogPrices(catalogListView.products);
@@ -75,6 +108,7 @@ export const getInvoicingSubscriptionFormView = (state, invoicingSubscriptionID)
         products: addonAndChargePrices,
         savedSubscriptionId,
         shippingAddressLabel,
+        hasUnsavedShippingAddress,
         subscription,
         fetchState,
         error,

package/lib/esm/view/invoicing/editInvoicingSubscriptionDetailView/initializeInvoicingSubscriptionAddressEpic.js

@@ -1,36 +1,62 @@
-import { EMPTY, of } from 'rxjs';
+import { EMPTY, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getInvoicingSubscriptionById } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionSelector';
-import { newAddressInLocalStore } from '../../addressView/addressViewReducer';
-import { updateInvoicingSubscriptionDetail } from './editInvoicingSubscriptionDetailViewReducer';
-import { initializeInvoicingSubscriptionAddress } from './editInvoicingSubscriptionDetailViewReducer';
+import { newAddressInLocalStore, removeNewAddressDataInLocalStore, } from '../../addressView/addressViewReducer';
+import { claimInvoicingSubscriptionShippingAddress, fetchInvoicingSubscriptionDetail, fetchInvoicingSubscriptionDetailPage, initializeInvoicingSubscriptionAddress, updateInvoicingSubscriptionDetail, } from './editInvoicingSubscriptionDetailViewReducer';
 import { INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE } from './invoicingSubscriptionFormConfig';
 /**
- * Seed the shared Address screen with an existing subscription's saved shipping
- * address (looked up in the shared address store by `shippingAddressId`, same as
- * the customer billing-address flow).
- * Runs both when the subscription detail loads and on an explicit initialize
- * trigger. Skips when an in-progress draft already exists, so an address the
- * user just entered survives navigating between the form and the Address screen.
- * Mirrors `initializeInvoicingCustomerAddressEpic`.
+ * Seed the shared Address screen with the subscription's saved shipping address, and
+ * record that the slot is this subscription's. Runs when a detail request is issued
+ * (every path that loads a record issues one — the detail page when not cached,
+ * the create/edit form always), when the page opens, when the detail load
+ * lands, and on an explicit initialize trigger.
+ *
+ * The address store slot is keyed by address type alone, so it can still hold
+ * another subscription's draft. Only a draft this subscription owns is left alone —
+ * that is what lets an address the user just entered survive a trip to the
+ * Address screen. Anything else is replaced by this subscription's saved address,
+ * or cleared when it has none. Opening the page counts as a trigger because a
+ * record already loaded this session issues no detail request at all.
  */
 export const initializeInvoicingSubscriptionAddressEpic = (actions$, state$) => actions$.pipe(filter((action) => initializeInvoicingSubscriptionAddress.match(action) ||
-    updateInvoicingSubscriptionDetail.match(action)), mergeMap((action) => {
+    updateInvoicingSubscriptionDetail.match(action) ||
+    fetchInvoicingSubscriptionDetailPage.match(action) ||
+    fetchInvoicingSubscriptionDetail.match(action)), mergeMap((action) => {
     const { id } = action.payload;
+    if (id == null) {
+        return EMPTY;
+    }
     const rootState = state$.value;
-    const existingDraft = rootState.addressViewState.newAddressState?.[INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE]?.addressToCreate;
-    if (existingDraft != null || id == null) {
+    const pending = rootState.addressViewState.newAddressState?.[INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE]?.addressToCreate;
+    const ownerId = rootState.editInvoicingSubscriptionDetailViewState
+        .shippingAddressOwnerId;
+    // A detail response speaks for the record it loaded, which may no longer
+    // be the one on screen: its request keeps running when the user moves on
+    // to a cached record, which issues no request of its own to cancel it.
+    // Only the page-open and explicit triggers define the current record.
+    if (updateInvoicingSubscriptionDetail.match(action) &&
+        ownerId != null &&
+        ownerId !== id) {
+        return EMPTY;
+    }
+    if (pending != null && ownerId === id) {
         return EMPTY;
     }
     const subscription = getInvoicingSubscriptionById(rootState.invoicingSubscriptionState, id);
     const address = subscription?.shippingAddressId != null
         ? getAddressByAddressId(rootState.addressState, subscription.shippingAddressId)
         : undefined;
-    return address != null
-        ? of(newAddressInLocalStore({
+    const actions = [];
+    if (address != null) {
+        actions.push(newAddressInLocalStore({
             addressType: INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE,
             addressToCreate: address,
-        }))
-        : EMPTY;
+        }));
+    }
+    else if (pending != null) {
+        actions.push(removeNewAddressDataInLocalStore(INVOICING_SUBSCRIPTION_SHIPPING_ADDRESS_TYPE));
+    }
+    actions.push(claimInvoicingSubscriptionShippingAddress({ id }));
+    return from(actions);
 }));

package/lib/esm/view/invoicing/invoicingFormDraft.js

@@ -41,6 +41,19 @@ export function applyInvoicingFormDraftFailure(draftById, id, blankLocalData) {
     }
     existing.fetchState = 'Error';
 }
+/**
+ * The record behind this draft was just saved and is about to be refetched.
+ * Keep the values on screen — dropping them would blank the form for the round
+ * trip, and the form remounts on the response anyway — but stop counting them
+ * as the loaded record's, so that response is allowed to replace them.
+ */
+export function applyInvoicingFormDraftSaved(draftById, id) {
+    const existing = draftById[id];
+    if (existing == null) {
+        return;
+    }
+    existing.fetchState = 'Not-Started';
+}
 /** The draft's values, or the blank form when nothing is drafted yet. */
 export function getInvoicingFormDraftLocalData(draftById, id, blankLocalData) {
     if (id == null) {

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

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