@zeniai/client-epic-state 5.2.72 → 5.2.73

package/lib/esm/entity/invoicing/product/productSelector.js

@@ -0,0 +1,10 @@
+import recordGet from 'lodash/get';
+export function getInvoicingProductsByIds(productState, ids) {
+    const products = ids
+        .map((id) => getInvoicingProductById(productState, id))
+        .filter((value) => value != null);
+    return products;
+}
+export function getInvoicingProductById(productState, id) {
+    return recordGet(productState.productByID, id);
+}

package/lib/esm/entity/invoicing/product/productState.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/entity/snackbar/snackbarTypes.js

@@ -237,7 +237,6 @@ const ALL_SNACKBAR_MESSAGE_SECTIONS = [
     'accounting_projects_qbo_reconnect_failed',
     'product_services_update',
     'qbo_realm_id_update',
-    'kyc_kyb_reset',
     'invoicing_dunning_case_resolved',
     'invoicing_dunning_retry',
     'invoicing_dunning_cancel',

package/lib/esm/epic.js

@@ -530,8 +530,8 @@ import { approveOrRejectBillsBulkActionEpic, } from './view/spendManagement/bill
 import { cancelOrDeleteBillsBulkActionEpic, } from './view/spendManagement/billPay/billsBulkActionView/epics/cancelOrDeleteBillsBulkActionEpic';
 import { submitDraftBillsBulkActionEpic, } from './view/spendManagement/billPay/billsBulkActionView/epics/submitDraftBillsBulkActionEpic';
 import { validateBillsBulkActionEpic, } from './view/spendManagement/billPay/billsBulkActionView/epics/validateBillsBulkActionEpic.ts';
-import { applyBillRecommendationsToLocalStoreEpic, } from './view/spendManagement/billPay/editBillView/epics/applyBillRecommendationsToLocalStoreEpic';
 import { convertAmountToHomeCurrencyEpic, } from './view/spendManagement/billPay/editBillView/epics/convertAmountToHomeCurrencyEpic';
+import { applyBillRecommendationsToLocalStoreEpic, } from './view/spendManagement/billPay/editBillView/epics/applyBillRecommendationsToLocalStoreEpic';
 import { fetchBillAndInitializeLocalStoreEpic, waitForBillDetailThenInitializeLocalStoreEpic, } from './view/spendManagement/billPay/editBillView/epics/fetchBillAndInitializeLocalStoreEpic';
 import { fetchEditBillDetailPageEpic, } from './view/spendManagement/billPay/editBillView/epics/fetchEditBillDetailPageEpic';
 import { fetchVendorAndUpdateBillLocalDataEpic, waitForVendorByIdThenSaveBillUpdatetoLocalStoreEpic, } from './view/spendManagement/billPay/editBillView/epics/fetchVendorAndUpdateBillLocalDataEpic';
@@ -611,7 +611,6 @@ import { fetchEntityHistoryEpic, } from './view/spendManagement/commonHistoryVie
 import { enableSetupEpic, } from './view/spendManagement/commonSetup/epic/setup/enableSetupEpic';
 import { parseUploadedKybDocumentEpic, } from './view/spendManagement/commonSetup/epic/setup/parseUploadedKybDocumentEpic';
 import { parseUploadedKycDocumentEpic, } from './view/spendManagement/commonSetup/epic/setup/parseUploadedKycDocumentEpic';
-import { resetKycKybEpic, } from './view/spendManagement/commonSetup/epic/setup/resetKycKybEpic';
 import { updateBusinessVerificationDetailsEpic, } from './view/spendManagement/commonSetup/epic/setup/updateBusinessVerificationDetailsEpic';
 import { updateSetupViewLocalStoreDataEpic, } from './view/spendManagement/commonSetup/epic/setup/updateSetupViewLocalStoreDataEpic';
 import { fetchMerchantListEpic, } from './view/spendManagement/merchantList/fetchMerchantListEpic';
@@ -1351,7 +1350,6 @@ const ALL_EPICS = [
     resendOtpEpic,
     resendReferralInviteEpic,
     resendVerifyDeviceOTPEpic,
-    resetKycKybEpic,
     resetTransactionVendorLocalDataEpic,
     resetVendorDetailLocalDataEpic,
     resetVendorsTabVendorDetailLocalDataEpic,

package/lib/esm/index.js

@@ -188,7 +188,7 @@ import { toExpenseAutomationViewType, toExpenseAutomationViewTypeStrict, } from
 import { computeNewScheduleJeDetails } from './view/expenseAutomationView/helpers/newScheduleLocalDataHelper';
 import { isReviewTransactionBankTransferType, isReviewTransactionBillPaymentType, isReviewTransactionCreditCardCreditType, isReviewTransactionCreditCardPaymentType, isReviewTransactionDepositType, isReviewTransactionExpenseType, } from './view/expenseAutomationView/helpers/reconciliationHelpers';
 import { MAX_SELECTION_LIMIT, checkIfAllLineItemsAreCategoryClassFilled, getLineItemsByTransactionIdsFromLocalData, isAnyItemWithUncategorizedExpenseAccount, } from './view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper';
-import { ackCloseMatchAfterIgnore, ackCloseMatchAfterUndo, clearActualMatchingView as clearExpenseAutomationActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatchingMatch, fetchActualMatching as fetchExpenseAutomationActualMatching, fetchActualMatchingPage as fetchExpenseAutomationActualMatchingPage, ignoreActualMatchingSuggestion, matchAndReverseAccruals, openMatchNewModal, searchMatchAccruals, searchMatchTransactions, undoReversalAccruals, updateActualMatchingUIState as updateExpenseAutomationActualMatchingUIState, } from './view/expenseAutomationView/reducers/actualMatchingViewReducer';
+import { ackCloseMatchAfterIgnore, ackCloseMatchAfterUndo, clearActualMatchingView as clearExpenseAutomationActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching as fetchExpenseAutomationActualMatching, fetchActualMatchingMatch, fetchActualMatchingPage as fetchExpenseAutomationActualMatchingPage, ignoreActualMatchingSuggestion, matchAndReverseAccruals, openMatchNewModal, searchMatchAccruals, searchMatchTransactions, undoReversalAccruals, updateActualMatchingUIState as updateExpenseAutomationActualMatchingUIState, } from './view/expenseAutomationView/reducers/actualMatchingViewReducer';
 import { clearExpenseAutomationFluxAnalysisView, fetchFluxAnalysisView, reviewFluxAnalysisView, updateFluxAnalysisViewPageMetaData, updateFluxAnalysisViewUIState, updateOperatingExpensesIdsForReview, updateSelectedSectionIdsForReview, } from './view/expenseAutomationView/reducers/fluxAnalysisViewReducer';
 import { clearJeScheduleLocalData as clearExpenseAutomationJEScheduleLocalData, clearExpenseAutomationJESchedulesView, clearSearchTransactionsForNewSchedule as clearJeSearchTransactionsForNewSchedule, createOneTimeAccrual, createOneTimeAccrualFailure, createOneTimeAccrualSuccess, fetchJeSchedulesPage as fetchExpenseAutomationJESchedulesPage, fetchOneTimeAccrual, ignoreRecommendedJeSchedule as ignoreExpenseAutomationJESchedule, ignoreOneTimeAccrual, initializeAccountSettingsView as initializeJeAccountSettingsView, initializeNewSchedule as initializeJeNewSchedule, initializeJeScheduleLocalData, promoteOneTimeAccrual, removeJeOneTimeAccrualLocalData, removeJeScheduleTransactionKey, resetNewScheduleLocalData as resetJeNewScheduleLocalData, retryJeSchedule as retryExpenseAutomationJESchedule, revertJeSchedule, revertOneTimeAccrual, saveAccountSettings as saveJeAccountSettings, saveAccountSettingsLocalData as saveJeAccountSettingsLocalData, saveNewSchedule as saveJeNewSchedule, saveNewScheduleFailure as saveJeNewScheduleFailure, saveNewScheduleSuccess as saveJeNewScheduleSuccess, searchTransactionsForNewSchedule as searchJeTransactionsForNewSchedule, searchTransactionsForNewScheduleFailure as searchJeTransactionsForNewScheduleFailure, searchTransactionsForNewScheduleSuccess as searchJeTransactionsForNewScheduleSuccess, toggleJECreatedGroupCollapsed, toggleJEFailedGroupCollapsed, toggleJEPendingGroupCollapsed, updateJESchedulesUIState as updateExpenseAutomationJESchedulesUIState, updateJEScheduleTypeFilter, updateNewScheduleLocalData as updateJeNewScheduleLocalData, updateJeOneTimeAccrualLocalData, updateJeScheduleLocalDataById, updateJeScheduleTransactionKeys, } from './view/expenseAutomationView/reducers/jeSchedulesViewReducer';
 import { acknowledgeBulkUploadConfirmMatchComplete, bulkUploadAutomatchingTimedOut, bulkUploadReceipts, bulkUploadReceiptsFailure, bulkUploadReceiptsSuccess, clearBulkUpload, clearBulkUploadBatchDetailsForScopeChange, clearManualSearchResults, clearMissingReceiptsTabNavigation, confirmBulkUploadMatch, confirmBulkUploadMatchFailure, confirmBulkUploadMatchSuccess, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsFailure, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatches, fetchBulkUploadBatchesFailure, fetchBulkUploadBatchesSuccess, fetchCompletedTransactions, fetchCompletedTransactionsFailure, fetchCompletedTransactionsSuccess, fetchMissingReceipts as fetchExpenseAutomationMissingReceipts, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, markBatchDetailRefreshAttempted, markMissingReceiptAsDone as markExpenseAutomationMissingReceiptAsDone, pusherBatchStatusUpdate, refreshBatchDetailsForBatchId, requestMissingReceiptsTabNavigation, restoreBulkUploadAutomatchingOnMount, restoreBulkUploadMatchingState, searchTransactionsForManualMatch, searchTransactionsForManualMatchFailure, searchTransactionsForManualMatchSuccess, setBulkUploadCompletedSubTab, setBulkUploadResultsTab, setBulkUploadSortConfig, setBulkUploadUploadedFileCount, storeBatchDetails, updateBulkUploadProgress, updateMissingReceiptUploadState as updateExpenseAutomationMissingReceiptUploadState, updateMissingReceiptsUIState as updateExpenseAutomationMissingReceiptsUIState, uploadMissingReceiptSuccess as uploadExpenseAutomationMissingReceiptSuccess, } from './view/expenseAutomationView/reducers/missingReceiptsViewReducer';
@@ -200,7 +200,7 @@ import { getExpenseAutomationReconciliationView, getLedgerAccountIdsWithStatemen
 import { getExpenseAutomationTransactionView, getLastTransferEntryReplacement, } from './view/expenseAutomationView/selectors/transactionCategorizationSelector';
 import { applyTransactionFilters } from './view/expenseAutomationView/transactionFilterHelpers';
 import { TRANSACTION_FILTER_CATEGORIES, } from './view/expenseAutomationView/transactionFilterTypes';
-import { ALL_ACTUAL_MATCHING_IGNORE_REASONS, MATCH_ACCRUAL_SEARCH_LIMIT, MATCH_SEARCH_DEBOUNCE_MS, MATCH_TRANSACTION_SEARCH_PAGE_SIZE, actualMatchingTransactionLineKey, toActualMatchingIgnoreReasonType, toActualMatchingSortKey as toExpenseAutomationActualMatchingSortKey, toActualMatchingStatusFilter as toExpenseAutomationActualMatchingStatusFilter, toMatchAndReverseResultStatus, toUndoReversalResultStatus, } from './view/expenseAutomationView/types/actualMatchingViewState';
+import { MATCH_ACCRUAL_SEARCH_LIMIT, MATCH_SEARCH_DEBOUNCE_MS, MATCH_TRANSACTION_SEARCH_PAGE_SIZE, ALL_ACTUAL_MATCHING_IGNORE_REASONS, actualMatchingTransactionLineKey, toActualMatchingIgnoreReasonType, toActualMatchingSortKey as toExpenseAutomationActualMatchingSortKey, toActualMatchingStatusFilter as toExpenseAutomationActualMatchingStatusFilter, toMatchAndReverseResultStatus, toUndoReversalResultStatus, } from './view/expenseAutomationView/types/actualMatchingViewState';
 import { DEFAULT_COMPLETED_SUB_TAB, toCompletedSubTab, } from './view/expenseAutomationView/types/completedSubTab';
 import { ALL_JE_PAGE_TABS, toJEScheduleSortKey as toExpenseAutomationJEScheduleSortKey, toJEPageTab, } from './view/expenseAutomationView/types/jeSchedulesViewState';
 import { BATCH_FILE_STATUSES, isUnmatchedTabFileStatus, toBatchFileStatus, toBatchStatusValue, toBulkUploadPhase, toBulkUploadResultsTab, toBulkUploadSortKey, toMatchSource, toMissingReceiptsTab, } from './view/expenseAutomationView/types/missingReceiptsViewState';
@@ -360,7 +360,7 @@ import { clearAiCardCreationFormDraft, fetchDepositAccountListForCards, fetchIss
 import { getAiCardCreationFormDraft, getInFlightIssueChargeCardsCount, getIssueChargeCardView, getIssueChargeCardsSaveStatus, getLastIssueChargeCardsSourceChatSessionId, getLastIssuedChargeCardIds, selectIssueChargeCardLocalDataFromDraft, } from './view/spendManagement/chargeCards/issueChargeCard/issueChargeCardSelector';
 import { toIssueChargeCardLocalDataFromDraft } from './view/spendManagement/chargeCards/issueChargeCard/toIssueChargeCardLocalDataFromDraft';
 import { parseUploadedKybDocument, parseUploadedKycDocument, } from './view/spendManagement/commonSetup/kycKybAutofillActions';
-import { applyKybDocumentAutofillForSetup, applyKycDocumentAutofillForSetup, clearKycKybAutofillForSetup, clearKycKybResetStatus, clearSetupViewDataInLocalStore, enableSetup, resetKycKyb, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveIndustryAndIncDateInLocalStore, saveSetupViewDataInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, updateBusinessVerificationDetails, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, } from './view/spendManagement/commonSetup/setupViewReducer';
+import { applyKybDocumentAutofillForSetup, applyKycDocumentAutofillForSetup, clearKycKybAutofillForSetup, clearSetupViewDataInLocalStore, enableSetup, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveIndustryAndIncDateInLocalStore, saveSetupViewDataInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, updateBusinessVerificationDetails, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, } from './view/spendManagement/commonSetup/setupViewReducer';
 import { getBusinessVerificationDetails, getCommonSetupViewDetails, } from './view/spendManagement/commonSetup/setupViewSelector';
 import { COMPANY_ONBOARDING_INDUSTRY_TYPE_CODES, COMPANY_ONBOARDING_SUB_INDUSTRY_CODES_BY_INDUSTRY, COMPANY_PURPOSE_OF_ACCOUNT_CODES, COMPANY_SOURCE_OF_FUNDS_CODES, COMPANY_TRANSACTION_VOLUME_CODES, COMPANY_US_NEXUS_TYPE_CODES, getCompanyOnboardingSubIndustryCodesForIndustry, } from './view/spendManagement/commonSetup/types/businessVerification';
 import { checkIfLowBalance, getBillListUniqueType, getBulkOperationSuffix, getRemiListUniqueType, getSelectedCompanyOfficer, getSpendManagementEffectiveListPeriod, isAwaitingMarkAsPaid, isBulkProcessing, isPaymentMethodOutsideZeni, isVerifiedPaymentAccountProviderStatusCode, isVerifiedStatusCode, showBillPayPromoPage, showReimbursementPromoPage, toAccountsPromoConfig, toSameDayAchDisablementConfig, } from './view/spendManagement/helpers';
@@ -613,7 +613,7 @@ export { hideCreatedByFilter, };
 // not Spend Management. Kept in a separate re-export block to make the
 // separation visible at the barrel level.
 export { TRANSACTION_FILTER_CATEGORIES, applyTransactionFilters, };
-export { fetchBillPaySetupView, fetchZeniAccountSetupView, enableSetup, getPaymentAccounts, getPlaidLinkToken, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, updateBusinessVerificationDetails, clearKycKybResetStatus, resetKycKyb, updatePaymentAccount, updatePaymentAccountLoginStatus, updatePaymentAccountStatus, establishPlaidConnection, updateMappedCashAccount, updatePrimaryFundingAccount, acceptBillPayTerms, acceptZeniAccountTerms, acceptBillPayUpdatedTerms, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, applyKycDocumentAutofillForSetup, applyKybDocumentAutofillForSetup, clearKycKybAutofillForSetup, parseUploadedKycDocument, parseUploadedKybDocument, sendOtp, resendOtp, verifyOtp, getBillPaySetupViewDetails, getPlaidAccountDetails, getPlaidPaymentAccounts, getZeniAccountSetupViewDetails, getBusinessVerificationDetails, getBillPayBusinessVerificationDetails, getZeniAccountBusinessVerificationDetails, getTreasuryBusinessVerificationDetails, getCommonSetupViewDetails, getTwoFactorAuthenticationView, getTwoFactorAuthenticationViewForCardUserOnboarding, getTwoFactorAuthenticationViewForChargeCardHolder, };
+export { fetchBillPaySetupView, fetchZeniAccountSetupView, enableSetup, getPaymentAccounts, getPlaidLinkToken, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, updateBusinessVerificationDetails, updatePaymentAccount, updatePaymentAccountLoginStatus, updatePaymentAccountStatus, establishPlaidConnection, updateMappedCashAccount, updatePrimaryFundingAccount, acceptBillPayTerms, acceptZeniAccountTerms, acceptBillPayUpdatedTerms, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, applyKycDocumentAutofillForSetup, applyKybDocumentAutofillForSetup, clearKycKybAutofillForSetup, parseUploadedKycDocument, parseUploadedKybDocument, sendOtp, resendOtp, verifyOtp, getBillPaySetupViewDetails, getPlaidAccountDetails, getPlaidPaymentAccounts, getZeniAccountSetupViewDetails, getBusinessVerificationDetails, getBillPayBusinessVerificationDetails, getZeniAccountBusinessVerificationDetails, getTreasuryBusinessVerificationDetails, getCommonSetupViewDetails, getTwoFactorAuthenticationView, getTwoFactorAuthenticationViewForCardUserOnboarding, getTwoFactorAuthenticationViewForChargeCardHolder, };
 export { getApprovalRuleViewDetails, getBankConnectionsSetupViewDetails, getIntegrationsView, };
 export { fetchUserFinancialAccount };
 export { getUserFinancialAccount };
@@ -841,11 +841,14 @@ export { getInvoicingDunningCaseListView } from './view/invoicing/invoicingDunni
 export { clearInvoicingDunningCaseDetailView, fetchInvoicingDunningCaseDetail, fetchInvoicingDunningCaseDetailPage, fetchInvoicingDunningEmailPreviewPage, invalidateInvoicingDunningEmailPreview, } from './view/invoicing/invoicingDunningCaseDetailView/invoicingDunningCaseDetailViewReducer';
 export { getInvoicingDunningCaseById, getInvoicingDunningCaseDetail, getInvoicingDunningEmailPreview, } from './view/invoicing/invoicingDunningCaseDetailView/invoicingDunningCaseDetailViewSelector';
 // ── Invoicing: catalog (plans + products) ─────────────────────────────────────
-export { mergeInvoicingCatalogPricePoint, removeInvoicingCatalogItem, updateInvoicingCatalogItems, } from './entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+export { mergeInvoicingPlanSubFamily, removeInvoicingPlan, updateInvoicingPlans, } from './entity/invoicing/plan/planReducer';
+export { removeInvoicingProduct, updateInvoicingProducts, } from './entity/invoicing/product/productReducer';
 export { fetchInvoicingCatalogCounts, fetchInvoicingCatalogListPage, fetchInvoicingCatalogPlanList, fetchInvoicingCatalogProductList, updateInvoicingCatalogPlanFilters, updateInvoicingCatalogProductFilters, } from './view/invoicing/invoicingCatalogListView/invoicingCatalogListViewReducer';
+export { ALL_INVOICING_PRODUCT_SORT_KEYS, INVOICING_PRODUCT_COLUMNS, } from './view/invoicing/invoicingCatalogListView/invoicingCatalogListViewState';
 export { getInvoicingCatalogListView } from './view/invoicing/invoicingCatalogListView/invoicingCatalogListViewSelector';
 export { fetchInvoicingCatalogItemDetail } from './view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewReducer';
-export { getInvoicingCatalogItemById, getLowestInvoicingCatalogPricePointAmount, } from './entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+export { getInvoicingPlanById, getLowestInvoicingPlanPricePointAmount, } from './entity/invoicing/plan/planSelector';
+export { getInvoicingProductById } from './entity/invoicing/product/productSelector';
 // ── Invoicing: settings ───────────────────────────────────────────────────────
 export { connectInvoicingStripe, disconnectInvoicingStripe, fetchInvoicingSettings, resetInvoicingBrandingFormDraft, resetInvoicingQboSettingsDraft, resetSaveInvoicingSettings, saveInvoicingSettings, submitInvoicingBrandingForm, submitInvoicingQboSettings, updateInvoicingBrandingFormDraft, updateInvoicingQboSettingsDraft, updateInvoicingSettings, } from './view/invoicing/settingsView/settingsViewReducer';
 export { getInvoicingBrandingFormView, getInvoicingQboSettingsFormView, getInvoicingSettings, getInvoicingSettingsFetchState, getInvoicingSettingsHubView, getInvoicingSettingsView, } from './view/invoicing/settingsView/settingsViewSelector';

package/lib/esm/reducer.js

@@ -2,7 +2,6 @@ import { combineReducers } from 'redux';
 import account, { initialState as initialAccountState, } from './entity/account/accountReducer';
 import accountGroup, { initialState as initialAccountGroupState, } from './entity/accountGroup/accountGroupReducer';
 import accountRecon, { initialState as initialAccountReconState, } from './entity/accountRecon/accountReconReducer';
-import actualMatching, { initialState as initialActualMatchingState, } from './entity/actualMatching/actualMatchingReducer';
 import address, { initialState as initialAddressState, } from './entity/address/addressReducer';
 import aiAccountantCustomer, { initialAiAccountantCustomerState, } from './entity/aiAccountantCustomer/aiAccountantCustomerReducer';
 import aiCfo, { initialAiCfoState } from './entity/aiCfo/aiCfoReducer';
@@ -41,7 +40,9 @@ import invoicingInvoice, { initialState as initialInvoicingInvoiceState, } from
 import invoicingCustomer, { initialState as initialInvoicingCustomerState, } from './entity/invoicing/invoicingCustomer/invoicingCustomerReducer';
 import invoicingSubscription, { initialState as initialInvoicingSubscriptionState, } from './entity/invoicing/invoicingSubscription/invoicingSubscriptionReducer';
 import invoicingTransaction, { initialState as initialInvoicingTransactionState, } from './entity/invoicing/invoicingTransaction/invoicingTransactionReducer';
-import invoicingCatalog, { initialState as initialInvoicingCatalogState, } from './entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import invoicingPlan, { initialState as initialInvoicingPlanState, } from './entity/invoicing/plan/planReducer';
+import invoicingProduct, { initialState as initialInvoicingProductState, } from './entity/invoicing/product/productReducer';
+import actualMatching, { initialState as initialActualMatchingState, } from './entity/actualMatching/actualMatchingReducer';
 import jeSchedules, { initialState as initialJESchedulesState, } from './entity/jeSchedules/jeSchedulesReducer';
 import merchant, { initialState as initialMerchantState, } from './entity/merchant/merchantReducer';
 import monthEndCloseChecks, { initialState as initialMonthEndCloseChecksState, } from './entity/monthEndCloseChecks/monthEndCloseChecksReducer';
@@ -315,7 +316,8 @@ const initialEntitiesState = {
     invoicingCustomerState: initialInvoicingCustomerState,
     invoicingDunningCaseState: initialInvoicingDunningCaseState,
     invoicingInvoiceState: initialInvoicingInvoiceState,
-    invoicingCatalogState: initialInvoicingCatalogState,
+    invoicingPlanState: initialInvoicingPlanState,
+    invoicingProductState: initialInvoicingProductState,
     invoicingSubscriptionState: initialInvoicingSubscriptionState,
     invoicingTransactionState: initialInvoicingTransactionState,
     jeSchedulesState: initialJESchedulesState,
@@ -601,7 +603,8 @@ const entityReducers = {
     invoicingCustomerState: invoicingCustomer,
     invoicingDunningCaseState: invoicingDunningCase,
     invoicingInvoiceState: invoicingInvoice,
-    invoicingCatalogState: invoicingCatalog,
+    invoicingPlanState: invoicingPlan,
+    invoicingProductState: invoicingProduct,
     invoicingSubscriptionState: invoicingSubscription,
     invoicingTransactionState: invoicingTransaction,
     jeSchedulesState: jeSchedules,

package/lib/esm/view/invoicing/createInvoice/createInvoiceEpic.js

@@ -6,8 +6,7 @@ import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer
 import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiError';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
-import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
-import { addInvoiceToList, invalidateInvoiceListForCustomer, } from '../invoiceList/invoiceListReducer';
+import { addInvoiceToList } from '../invoiceList/invoiceListReducer';
 import { createInvoice, createInvoiceFailure, createInvoiceSuccess, } from './createInvoiceReducer';
 export const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(createInvoice.match), mergeMap((action) => {
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/invoices`;
@@ -24,13 +23,6 @@ export const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe(f
                     id: response.data.id,
                     status: response.data.status,
                 }),
-                // The customer's page caches their invoices and totals.
-                invalidateInvoicingCustomerDetail({
-                    id: response.data.customer_id,
-                }),
-                invalidateInvoiceListForCustomer({
-                    customerId: response.data.customer_id,
-                }),
                 createInvoiceSuccess({ invoiceId: response.data.id }),
                 openSnackbar({
                     messageSection: 'invoicing_invoice_saved',

package/lib/esm/view/invoicing/createInvoice/createInvoiceSelector.js

@@ -1,5 +1,5 @@
 import { getAddressByAddressId } from '../../../entity/address/addressSelector';
-import { invoicingPricePointDisplayAmount } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+import { invoicingPricePointDisplayAmount } from '../../../entity/invoicing/plan/planSelector';
 import { getInvoicingCatalogListView, getInvoicingCatalogPrices, } from '../invoicingCatalogListView/invoicingCatalogListViewSelector';
 import { invoicingFieldHelpForGroup } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingCustomerListView } from '../invoicingCustomerListView/invoicingCustomerListViewSelector';

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

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
-import { getInvoicingCatalogItemById, getInvoicingCatalogItemsByIds, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+import { getInvoicingPlanById, getInvoicingPlansByIds, } from '../../../entity/invoicing/plan/planSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingFormDraftLocalData, isInvoicingFormDraftPending, } from '../invoicingFormDraft';
 import { INVOICING_DEFAULT_INCOME_ACCOUNT_TYPES, INVOICING_INCOME_ACCOUNT_MAPPING_SLOT, NO_INVOICING_ACCOUNT_HIERARCHY, NO_INVOICING_ACCOUNT_IDS, NO_INVOICING_CLASS_HIERARCHY, getInvoicingQboAccountOptions, getInvoicingQboView, invoicingQboAccountIdsForMappingSlot, isInvoicingAccountingPickerDataLoading, isInvoicingQboConnected, } from '../invoicingQboView/invoicingQboViewSelector';
@@ -36,7 +36,7 @@ const buildApplicableCatalogItemOptions = (plans) => {
  * Kept referentially stable across unrelated dispatches; the form view filters
  * out the item being edited (see `getInvoicingCatalogItemFormView`).
  */
-export const getInvoicingApplicableCatalogItemOptions = createSelector((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => buildApplicableCatalogItemOptions(getInvoicingCatalogItemsByIds(catalogState, [
+export const getInvoicingApplicableCatalogItemOptions = createSelector((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (planState, listViewState) => buildApplicableCatalogItemOptions(getInvoicingPlansByIds(planState, [
     ...listViewState.planIds,
     ...listViewState.productIds,
 ])));
@@ -61,9 +61,7 @@ const getInvoicingCatalogIncomeAccountIds = createSelector([
     : NO_INVOICING_ACCOUNT_IDS);
 export const getInvoicingCatalogItemFormView = (state, id) => {
     const { editDraftById, error, fetchState, newItemDraft, savedItemId, savedKind, } = state.editInvoicingCatalogItemDetailViewState;
-    const plan = id != null
-        ? getInvoicingCatalogItemById(state.invoicingCatalogState, id)
-        : undefined;
+    const plan = id != null ? getInvoicingPlanById(state.invoicingPlanState, id) : undefined;
     const kind = plan != null ? 'plan' : undefined;
     // No entity fallback: the draft is the one source of form values, seeded from
     // the record by `seedInvoicingCatalogItemFormDraftEpic` when the detail load

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

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
-import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { fetchInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetail, updateInvoicingCatalogItemDetailFailure, } from './editInvoicingCatalogItemDetailViewReducer';
 export const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingCatalogItemDetail.match), switchMap((action) => {
@@ -9,7 +9,7 @@ export const fetchInvoicingCatalogItemDetailEpic = (actions$, _state$, zeniAPI)
     return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
-                updateInvoicingCatalogItems([response.data], 'merge'),
+                updateInvoicingPlans([response.data], 'merge'),
                 updateInvoicingCatalogItemDetail({ id: response.data.id, kind }),
             ];
         }

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

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingCatalogPlanAction, runInvoicingCatalogPlanActionFailure, runInvoicingCatalogPlanActionSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 export const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(runInvoicingCatalogPlanAction.match), mergeMap((action) => {
@@ -12,7 +12,7 @@ export const runInvoicingCatalogPlanActionEpic = (actions$, _state$, zeniAPI) =>
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
-                updateInvoicingCatalogItems([response.data], 'merge'),
+                updateInvoicingPlans([response.data], 'merge'),
                 runInvoicingCatalogPlanActionSuccess({ id }),
             ];
         }

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

@@ -1,6 +1,7 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { mergeInvoicingCatalogPricePoint } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { mergeInvoicingPlanSubFamily } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingCatalogProductAction, runInvoicingCatalogProductActionFailure, runInvoicingCatalogProductActionSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
 export const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(runInvoicingCatalogProductAction.match), mergeMap((action) => {
@@ -15,10 +16,9 @@ export const runInvoicingCatalogProductActionEpic = (actions$, _state$, zeniAPI)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return [
+                updateInvoicingProducts([response.data], 'merge'),
                 ...(parentItemId != null
-                    ? [
-                        mergeInvoicingCatalogPricePoint(parentItemId, response.data),
-                    ]
+                    ? [mergeInvoicingPlanSubFamily(parentItemId, response.data)]
                     : []),
                 runInvoicingCatalogProductActionSuccess({ id: stateKey }),
             ];

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

@@ -1,6 +1,7 @@
 import { forkJoin, from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { mergeInvoicingCatalogPricePoint, updateInvoicingCatalogItems, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { mergeInvoicingPlanSubFamily, updateInvoicingPlans, } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
 import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiError';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
@@ -50,8 +51,11 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
                 }
                 const savedProducts = productResponses.flatMap((productResponse) => productResponse.data != null ? [productResponse.data] : []);
                 const resultActions = [
-                    updateInvoicingCatalogItems([savedItem], 'merge'),
-                    ...savedProducts.map((product) => mergeInvoicingCatalogPricePoint(savedItem.id, product)),
+                    updateInvoicingPlans([savedItem], 'merge'),
+                    ...(savedProducts.length > 0
+                        ? [updateInvoicingProducts(savedProducts, 'merge')]
+                        : []),
+                    ...savedProducts.map((product) => mergeInvoicingPlanSubFamily(savedItem.id, product)),
                     submitInvoicingCatalogItemFormSuccess({
                         itemId: savedItem.id,
                         kind: 'plan',

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

@@ -1,6 +1,6 @@
 import { EMPTY, of } from 'rxjs';
 import { filter, mergeMap, withLatestFrom } from 'rxjs/operators';
-import { getInvoicingCatalogItemById } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+import { getInvoicingPlanById } from '../../../entity/invoicing/plan/planSelector';
 import { fetchInvoicingCatalogItemDetailPage, seedInvoicingCatalogItemFormDraft, updateInvoicingCatalogItemDetail, } from './editInvoicingCatalogItemDetailViewReducer';
 import { entityToInvoicingCatalogItemFormLocalData } from './invoicingCatalogItemFormHelper';
 /**
@@ -34,7 +34,7 @@ export const seedInvoicingCatalogItemFormDraftEpic = (actions$, state$) => actio
     }
     // Nothing to seed from on a cold open; the detail response triggers this
     // again once it lands.
-    const plan = getInvoicingCatalogItemById(state.invoicingCatalogState, id);
+    const plan = getInvoicingPlanById(state.invoicingPlanState, id);
     if (plan == null) {
         return EMPTY;
     }

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

@@ -95,10 +95,6 @@ const editInvoicingCustomerDetailView = createSlice({
                 error: undefined,
             };
         },
-        // Makes the page epic refetch a record that changed server-side (e.g. a new subscription).
-        invalidateInvoicingCustomerDetail(draft, action) {
-            delete draft.recordStateById[action.payload.id];
-        },
         fetchInvoicingCustomerDetail(draft, action) {
             draft.recordStateById[action.payload.id] = {
                 fetchState: 'In-Progress',
@@ -202,5 +198,5 @@ const editInvoicingCustomerDetailView = createSlice({
         });
     },
 });
-export const { fetchInvoicingPaymentLinkEmailPreview, fetchInvoicingPaymentLinkEmailPreviewPage, updateInvoicingPaymentLinkEmailPreview, updateInvoicingPaymentLinkEmailPreviewFailure, addPromotionalCreditsFailure, addPromotionalCreditsSuccess, fetchInvoicingCustomerDetail, fetchInvoicingCustomerDetailPage, invalidateInvoicingCustomerDetail, seedInvoicingCustomerFormDraft, updateInvoicingCustomerDetail, resetPromotionalCreditAction, submitAddPromotionalCredits, updateInvoicingCustomerDetailFailure, updateInvoicingCustomerFormDraft, submitInvoicingCustomerForm, submitInvoicingCustomerFormSuccess, submitInvoicingCustomerFormFailure, resetEditInvoicingCustomerDetailView, initializeInvoicingCustomerAddress, claimInvoicingCustomerBillingAddress, } = 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/editInvoicingSubscriptionDetailView/saveInvoicingSubscriptionEpic.js

@@ -7,8 +7,6 @@ import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiE
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
-import { invalidateInvoicingCustomerDetail } from '../editInvoicingCustomerDetailView/editInvoicingCustomerDetailViewReducer';
-import { invalidateInvoiceListForCustomer } from '../invoiceList/invoiceListReducer';
 import { addInvoicingSubscriptionToList } from '../invoicingSubscriptionListView/invoicingSubscriptionListViewReducer';
 import { localDataToSaveInvoicingSubscriptionPayload, } from './editInvoicingSubscriptionDetailViewPayload';
 import { submitInvoicingSubscriptionForm, submitInvoicingSubscriptionFormFailure, submitInvoicingSubscriptionFormSuccess, syncInvoicingSubscriptionCoupons, } from './editInvoicingSubscriptionDetailViewReducer';
@@ -88,9 +86,7 @@ export const saveInvoicingSubscriptionEpic = (actions$, state$, zeniAPI) => acti
             resultActions.push(addInvoicingSubscriptionToList({
                 id: saved.id,
                 status: saved.status,
-            }), 
-            // The service may bill the first invoice on create.
-            invalidateInvoicingCustomerDetail({ id: saved.customer_id }), invalidateInvoiceListForCustomer({ customerId: saved.customer_id }));
+            }));
         }
         resultActions.push(openSnackbar({
             messageSection: 'invoicing_subscription_saved',

package/lib/esm/view/invoicing/invoiceList/invoiceListReducer.js

@@ -124,13 +124,6 @@ const invoiceList = createSlice({
             draft.kpisFetchState.fetchState = 'Error';
             draft.kpisFetchState.error = action.payload;
         },
-        // Counts are fetched under the same customer filter, so they go stale with the tabs.
-        invalidateInvoiceListForCustomer(draft, action) {
-            if (draft.filters.customerId === action.payload.customerId) {
-                draft.invoiceByTab = makeInvoiceByTab();
-                draft.countsFetchState = { fetchState: 'Not-Started', error: undefined };
-            }
-        },
         updateInvoiceListFilters(draft, action) {
             draft.filters = action.payload;
         },
@@ -173,5 +166,5 @@ const invoiceList = createSlice({
         });
     },
 });
-export const { fetchInvoiceList, fetchInvoiceListPage, updateInvoiceList, updateInvoiceListFailure, fetchInvoiceCounts, updateInvoiceCounts, updateInvoiceCountsFailure, fetchInvoiceKPIs, updateInvoiceKPIs, updateInvoiceKPIsFailure, updateInvoiceListFilters, setInvoiceActiveTab, addInvoiceToList, invalidateInvoiceListForCustomer, } = invoiceList.actions;
+export const { fetchInvoiceList, fetchInvoiceListPage, updateInvoiceList, updateInvoiceListFailure, fetchInvoiceCounts, updateInvoiceCounts, updateInvoiceCountsFailure, fetchInvoiceKPIs, updateInvoiceKPIs, updateInvoiceKPIsFailure, updateInvoiceListFilters, setInvoiceActiveTab, addInvoiceToList, } = invoiceList.actions;
 export default invoiceList.reducer;

package/lib/esm/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogPlanListEpic.js

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
-import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { INVOICING_LIST_PAGE_SIZE, applyListSortParams, withQuery, } from '../../invoicingApiHelper';
 import { fetchInvoicingCatalogPlanList, updateInvoicingCatalogPlanList, updateInvoicingCatalogPlanListFailure, } from '../invoicingCatalogListViewReducer';
@@ -29,7 +29,7 @@ export const fetchInvoicingCatalogPlanListEpic = (actions$, _state$, zeniAPI) =>
         if (isSuccessResponse(response)) {
             const items = response.data?.items ?? [];
             return [
-                updateInvoicingCatalogItems(items, 'merge'),
+                updateInvoicingPlans(items, 'merge'),
                 updateInvoicingCatalogPlanList({
                     ids: items.map((item) => item.id),
                     nextCursor: response.data?.next_cursor ?? null,

package/lib/esm/view/invoicing/invoicingCatalogListView/epics/fetchInvoicingCatalogProductListEpic.js

@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
-import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
+import { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { INVOICING_LIST_PAGE_SIZE, applyListSortParams, withQuery, } from '../../invoicingApiHelper';
 import { fetchInvoicingCatalogProductList, updateInvoicingCatalogProductList, updateInvoicingCatalogProductListFailure, } from '../invoicingCatalogListViewReducer';
@@ -29,7 +29,7 @@ export const fetchInvoicingCatalogProductListEpic = (actions$, _state$, zeniAPI)
         if (isSuccessResponse(response)) {
             const items = response.data?.items ?? [];
             return [
-                updateInvoicingCatalogItems(items, 'merge'),
+                updateInvoicingPlans(items, 'merge'),
                 updateInvoicingCatalogProductList({
                     ids: items.map((item) => item.id),
                     nextCursor: response.data?.next_cursor ?? null,

package/lib/esm/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewSelector.js

@@ -1,5 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { getInvoicingCatalogItemsByIds, invoicingPricePointDisplayAmount, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+import { getInvoicingPlansByIds } from '../../../entity/invoicing/plan/planSelector';
+import { runningInvoicingActionId } from '../runningInvoicingActionId';
+import { INVOICING_PRODUCT_COLUMNS, } from './invoicingCatalogListViewState';
 /**
  * Flatten catalog items into the price rows the pickers render.
  *
@@ -20,63 +22,28 @@ export const getInvoicingCatalogPrices = (items) => items.flatMap((item) => (ite
     priceCode: subFamily.priceCode,
     productCode: item.productCode,
 })));
-const lowestStartingTier = (tiers) => tiers.reduce((lowest, tier) => lowest == null || tier.startingUnit < lowest.startingUnit ? tier : lowest, undefined);
-export const getInvoicingCatalogPlanRows = (items) => items.flatMap((item) => {
-    const pricePoints = item.subFamilies ?? [];
-    if (pricePoints.length === 0) {
-        return [
-            {
-                id: item.id,
-                item,
-                period: item.period,
-                periodUnit: item.periodUnit,
-                price: item.price,
-                productFamily: item.name,
-                status: item.status,
-                tierCount: item.tiers?.length ?? 0,
-                firstTier: lowestStartingTier(item.tiers ?? []),
-            },
-        ];
-    }
-    return pricePoints.map((pricePoint) => ({
-        id: pricePoint.id,
-        item,
-        period: pricePoint.period,
-        periodUnit: pricePoint.periodUnit,
-        planName: pricePoint.name,
-        price: invoicingPricePointDisplayAmount(pricePoint),
-        pricingModel: pricePoint.pricingModel,
-        productFamily: item.name,
-        status: pricePoint.status,
-        tierCount: pricePoint.tiers?.length ?? 0,
-        firstTier: lowestStartingTier(pricePoint.tiers ?? []),
-    }));
-});
 /**
  * Bundled read view for the single catalog page (plans + products tabs).
  * Memoized over the plan + product entity slices and the list-view slice so the
  * denormalized arrays keep referential identity. The base `fetchState`/`error`
  * track the plan list; the product list has its own `productFetchState`.
  */
-export const getInvoicingCatalogListView = createSelector((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => {
-    const plans = getInvoicingCatalogItemsByIds(catalogState, listViewState.planIds);
-    const products = getInvoicingCatalogItemsByIds(catalogState, listViewState.productIds);
-    return {
-        planRows: getInvoicingCatalogPlanRows(plans),
-        plans,
-        planSort: listViewState.planSort,
-        productRows: getInvoicingCatalogPlanRows(products),
-        products,
-        productSort: listViewState.productSort,
-        count: listViewState.counts,
-        countsFetchState: listViewState.countsFetchState,
-        planFilters: listViewState.planFilters,
-        planNextCursor: listViewState.planNextCursor,
-        productFilters: listViewState.productFilters,
-        productNextCursor: listViewState.productNextCursor,
-        productFetchState: listViewState.productFetchState,
-        fetchState: listViewState.fetchState,
-        error: listViewState.error,
-        version: 1.0,
-    };
-});
+export const getInvoicingCatalogListView = createSelector((state) => state.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (state) => state.invoicingConfigViewState.catalogItemLifecycleActionOptions, (state) => state.editInvoicingCatalogItemDetailViewState.actionStateById, (planState, listViewState, catalogItemLifecycleActionOptions, actionStateById) => ({
+    catalogItemLifecycleActionOptions,
+    runningActionId: runningInvoicingActionId(actionStateById),
+    plans: getInvoicingPlansByIds(planState, listViewState.planIds),
+    planSort: listViewState.planSort,
+    productColumns: INVOICING_PRODUCT_COLUMNS,
+    products: getInvoicingPlansByIds(planState, listViewState.productIds),
+    productSort: listViewState.productSort,
+    count: listViewState.counts,
+    countsFetchState: listViewState.countsFetchState,
+    planFilters: listViewState.planFilters,
+    planNextCursor: listViewState.planNextCursor,
+    productFilters: listViewState.productFilters,
+    productNextCursor: listViewState.productNextCursor,
+    productFetchState: listViewState.productFetchState,
+    fetchState: listViewState.fetchState,
+    error: listViewState.error,
+    version: 1.0,
+}));

package/lib/esm/view/invoicing/invoicingCatalogListView/invoicingCatalogListViewState.js

@@ -1 +1,20 @@
-export {};
+import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
+export const ALL_INVOICING_PRODUCT_SORT_KEYS = [
+    'product_name',
+    'product_code',
+    'type',
+    'pricing',
+    'usage',
+    'updated',
+    'status',
+];
+export const toInvoicingProductSortKey = (v) => stringToUnion(v, ALL_INVOICING_PRODUCT_SORT_KEYS);
+export const INVOICING_PRODUCT_COLUMNS = [
+    { key: 'product_name', sortable: true },
+    { key: 'product_code', sortable: true },
+    { key: 'type', sortable: true },
+    { key: 'pricing', sortable: false },
+    { key: 'usage', sortable: true },
+    { key: 'updated', sortable: true },
+    { key: 'status', sortable: true },
+];

package/lib/esm/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewEpic.js

@@ -90,8 +90,8 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 save: 'onboarding_customer_business_verification_save',
             },
             setup_billing: {
-                save: 'billing_address_view',
-                sendForVerification: 'billing_address_view',
+                save: 'common',
+                sendForVerification: 'common',
             },
         };
         let messageSection;

package/lib/esm/view/spendManagement/commonSetup/setupViewReducer.js

@@ -13,7 +13,6 @@ const emptyOfficerSlot = {
 };
 export const initialState = {
     updateStatus: { fetchState: 'Not-Started', error: undefined },
-    kycKybResetStatus: { fetchState: 'Not-Started', error: undefined },
     parsingDocumentFileIds: [],
     companyDetails: { autoFilledFields: [] },
     companyOfficerUpdateStatus: {
@@ -85,25 +84,6 @@ const setupView = createSlice({
                 };
             },
         },
-        resetKycKyb(draft) {
-            draft.kycKybResetStatus = { fetchState: 'In-Progress', error: undefined };
-        },
-        resetKycKybSuccess(draft) {
-            draft.kycKybResetStatus = { fetchState: 'Completed', error: undefined };
-        },
-        resetKycKybFailure: {
-            reducer(draft, action) {
-                draft.kycKybResetStatus = { fetchState: 'Error', error: action.payload };
-            },
-            prepare(error) {
-                return {
-                    payload: error,
-                };
-            },
-        },
-        clearKycKybResetStatus(draft) {
-            draft.kycKybResetStatus = { fetchState: 'Not-Started', error: undefined };
-        },
         updateSelectedCompanyOfficer: {
             reducer(draft, action) {
                 const { selectedOfficerType } = action.payload;
@@ -379,5 +359,5 @@ const setupView = createSlice({
         });
     },
 });
-export const { enableSetup, enableSetupSuccess, enableSetupFailure, updateBusinessVerificationDetails, updateBusinessVerificationDetailsSuccess, updateBusinessVerificationDetailsFailure, resetKycKyb, resetKycKybSuccess, resetKycKybFailure, clearKycKybResetStatus, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, sendOtp: sendOtpSpendManagementSetUp, resendOtp: resendOtpSpendManagementSetUp, sendOtpSuccess: sendOtpSuccessSpendManagementSetUp, sendOtpFailure: sendOtpFailureSpendManagementSetUp, verifyOtp: verifyOtpSpendManagementSetUp, verifyOtpSuccess: verifyOtpSuccessSpendManagementSetUp, verifyOtpFailure: verifyOtpFailureSpendManagementSetUp, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, applyKycDocumentAutofillForSetup, applyKybDocumentAutofillForSetup, clearKycKybAutofillForSetup, } = setupView.actions;
+export const { enableSetup, enableSetupSuccess, enableSetupFailure, updateBusinessVerificationDetails, updateBusinessVerificationDetailsSuccess, updateBusinessVerificationDetailsFailure, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, sendOtp: sendOtpSpendManagementSetUp, resendOtp: resendOtpSpendManagementSetUp, sendOtpSuccess: sendOtpSuccessSpendManagementSetUp, sendOtpFailure: sendOtpFailureSpendManagementSetUp, verifyOtp: verifyOtpSpendManagementSetUp, verifyOtpSuccess: verifyOtpSuccessSpendManagementSetUp, verifyOtpFailure: verifyOtpFailureSpendManagementSetUp, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, applyKycDocumentAutofillForSetup, applyKybDocumentAutofillForSetup, clearKycKybAutofillForSetup, } = setupView.actions;
 export default setupView.reducer;