@zeniai/client-epic-state 5.2.67 → 5.2.69-beta0MM

package/lib/esm/entity/invoicing/{plan/planReducer.js → invoicingCatalog/invoicingCatalogReducer.js}

@@ -1,44 +1,43 @@
 import { createSlice } from '@reduxjs/toolkit';
 import assignWith from 'lodash/assignWith';
 import { clearAll } from '../../../rootActions';
-import { mapInvoicingProductPayloadToState, } from '../product/productPayload';
-import { mapInvoicingPlanPayloadToState, } from './planPayload';
-export const initialState = { planByID: {} };
-const plan = createSlice({
-    name: 'invoicingPlan',
+import { mapInvoicingCatalogItemPayloadToState, mapInvoicingCatalogPricePointPayloadToState, } from './invoicingCatalogPayload';
+export const initialState = { itemByID: {} };
+const invoicingCatalog = createSlice({
+    name: 'invoicingCatalog',
     initialState,
     reducers: {
-        updateInvoicingPlans: {
+        updateInvoicingCatalogItems: {
             reducer(draft, action) {
-                doUpdateInvoicingPlans(draft.planByID, action.payload, action.meta.updateType);
+                doUpdateInvoicingPlans(draft.itemByID, action.payload, action.meta.updateType);
             },
             prepare(payload, updateType = 'replace') {
                 return { payload, meta: { updateType } };
             },
         },
-        removeInvoicingPlan(draft, action) {
-            delete draft.planByID[action.payload];
+        removeInvoicingCatalogItem(draft, action) {
+            delete draft.itemByID[action.payload];
         },
-        mergeInvoicingPlanSubFamily: {
+        mergeInvoicingCatalogPricePoint: {
             reducer(draft, action) {
-                const plan = draft.planByID[action.payload.planId];
-                if (plan == null) {
+                const item = draft.itemByID[action.payload.itemId];
+                if (item == null) {
                     return;
                 }
-                const existing = plan.subFamilies ?? [];
+                const existing = item.subFamilies ?? [];
                 const index = existing.findIndex((subFamily) => subFamily.id === action.payload.subFamily.id);
-                plan.subFamilies =
+                item.subFamilies =
                     index >= 0
                         ? existing.map((subFamily, subFamilyIndex) => subFamilyIndex === index
                             ? { ...subFamily, ...action.payload.subFamily }
                             : subFamily)
                         : [...existing, action.payload.subFamily];
             },
-            prepare(planId, subFamilyPayload) {
+            prepare(itemId, subFamilyPayload) {
                 return {
                     payload: {
-                        planId,
-                        subFamily: mapInvoicingProductPayloadToState(subFamilyPayload),
+                        itemId,
+                        subFamily: mapInvoicingCatalogPricePointPayloadToState(subFamilyPayload),
                     },
                 };
             },
@@ -50,14 +49,14 @@ const plan = createSlice({
         });
     },
 });
-export const { updateInvoicingPlans, mergeInvoicingPlanSubFamily, removeInvoicingPlan, } = plan.actions;
-export default plan.reducer;
+export const { updateInvoicingCatalogItems, mergeInvoicingCatalogPricePoint, removeInvoicingCatalogItem, } = invoicingCatalog.actions;
+export default invoicingCatalog.reducer;
 /**
  * Helper functions.
  */
 function doUpdateInvoicingPlans(draft, payload, updateType) {
     payload.forEach((planPayload) => {
-        const latestPlan = mapInvoicingPlanPayloadToState(planPayload);
+        const latestPlan = mapInvoicingCatalogItemPayloadToState(planPayload);
         if (latestPlan.id in draft && updateType === 'merge') {
             assignWith(draft[latestPlan.id], latestPlan, (objValue, srcValue) => srcValue == null ? objValue : srcValue);
         }

package/lib/esm/entity/invoicing/{plan/planSelector.js → invoicingCatalog/invoicingCatalogSelector.js}

@@ -1,12 +1,12 @@
 import recordGet from 'lodash/get';
-export function getInvoicingPlansByIds(planState, ids) {
-    const plans = ids
-        .map((id) => getInvoicingPlanById(planState, id))
+export function getInvoicingCatalogItemsByIds(catalogState, ids) {
+    const items = ids
+        .map((id) => getInvoicingCatalogItemById(catalogState, id))
         .filter((value) => value != null);
-    return plans;
+    return items;
 }
-export function getInvoicingPlanById(planState, id) {
-    return recordGet(planState.planByID, id);
+export function getInvoicingCatalogItemById(catalogState, id) {
+    return recordGet(catalogState.itemByID, id);
 }
 /**
  * A price point counts while it is active. A missing status is treated as
@@ -30,8 +30,8 @@ export const invoicingPricePointDisplayAmount = (pricePoint) => pricePoint.displ
  * points are priced in different currencies, where the smallest number is not
  * the lowest price. A zero is a real price and wins on its merits.
  */
-export const getLowestInvoicingPlanPricePointAmount = (plan) => {
-    const amounts = (plan?.subFamilies ?? [])
+export const getLowestInvoicingCatalogPricePointAmount = (item) => {
+    const amounts = (item?.subFamilies ?? [])
         .filter(isActiveInvoicingPricePoint)
         .map(invoicingPricePointDisplayAmount)
         .filter((amount) => amount != null);

package/lib/esm/entity/jeSchedules/jeSchedulesPayload.js

@@ -539,6 +539,7 @@ export function toJEOneTimeAccrual(payload) {
         transactionId: payload.transaction_id ?? undefined,
         transactionIntegrationId: payload.transaction_integration_id ?? undefined,
         reversalTransactionId: payload.reversal_transaction_id ?? undefined,
+        reversalTransactionIntegrationId: payload.reversal_transaction_integration_id ?? undefined,
         createdBy: toJEOneTimeAccrualCreator(payload.created_by_user),
         reversedBy: toJEOneTimeAccrualCreator(payload.reversed_by_user),
     };

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, fetchActualMatching as fetchExpenseAutomationActualMatching, fetchActualMatchingMatch, 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, fetchActualMatchingMatch, fetchActualMatching as fetchExpenseAutomationActualMatching, 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 { 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 { 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 { 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, clearSetupViewDataInLocalStore, enableSetup, clearKycKybResetStatus, resetKycKyb, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveIndustryAndIncDateInLocalStore, saveSetupViewDataInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, updateBusinessVerificationDetails, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, } from './view/spendManagement/commonSetup/setupViewReducer';
+import { applyKybDocumentAutofillForSetup, applyKycDocumentAutofillForSetup, clearKycKybAutofillForSetup, clearKycKybResetStatus, clearSetupViewDataInLocalStore, enableSetup, resetKycKyb, 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';
@@ -841,14 +841,12 @@ 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 { mergeInvoicingPlanSubFamily, removeInvoicingPlan, updateInvoicingPlans, } from './entity/invoicing/plan/planReducer';
-export { removeInvoicingProduct, updateInvoicingProducts, } from './entity/invoicing/product/productReducer';
+export { mergeInvoicingCatalogPricePoint, removeInvoicingCatalogItem, updateInvoicingCatalogItems, } from './entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 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 { getInvoicingPlanById, getLowestInvoicingPlanPricePointAmount, } from './entity/invoicing/plan/planSelector';
-export { getInvoicingProductById } from './entity/invoicing/product/productSelector';
+export { getInvoicingCatalogItemById, getLowestInvoicingCatalogPricePointAmount, } from './entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
 // ── 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,6 +2,7 @@ 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';
@@ -40,9 +41,7 @@ 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 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 invoicingCatalog, { initialState as initialInvoicingCatalogState, } from './entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 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';
@@ -316,8 +315,7 @@ const initialEntitiesState = {
     invoicingCustomerState: initialInvoicingCustomerState,
     invoicingDunningCaseState: initialInvoicingDunningCaseState,
     invoicingInvoiceState: initialInvoicingInvoiceState,
-    invoicingPlanState: initialInvoicingPlanState,
-    invoicingProductState: initialInvoicingProductState,
+    invoicingCatalogState: initialInvoicingCatalogState,
     invoicingSubscriptionState: initialInvoicingSubscriptionState,
     invoicingTransactionState: initialInvoicingTransactionState,
     jeSchedulesState: initialJESchedulesState,
@@ -603,8 +601,7 @@ const entityReducers = {
     invoicingCustomerState: invoicingCustomer,
     invoicingDunningCaseState: invoicingDunningCase,
     invoicingInvoiceState: invoicingInvoice,
-    invoicingPlanState: invoicingPlan,
-    invoicingProductState: invoicingProduct,
+    invoicingCatalogState: invoicingCatalog,
     invoicingSubscriptionState: invoicingSubscription,
     invoicingTransactionState: invoicingTransaction,
     jeSchedulesState: jeSchedules,

package/lib/esm/view/expenseAutomationView/selectors/actualMatchingViewSelector.js

@@ -1,5 +1,5 @@
-import orderBy from 'lodash/orderBy';
 import { createSelector } from '@reduxjs/toolkit';
+import orderBy from 'lodash/orderBy';
 import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { getActualMatchingMatchById } from '../../../entity/actualMatching/actualMatchingSelector';
 import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
@@ -94,7 +94,11 @@ function collectGroupedMembers(members) {
         estimatedAmount: member.estimatedAmount,
         jeDebitAccountName: member.jeDebitAccountName,
         memo: member.memo,
+        reversalTransactionId: member.reversalTransactionId,
+        reversalTransactionIntegrationId: member.reversalTransactionIntegrationId,
         serviceMonth: member.serviceMonth,
+        transactionId: member.transactionId,
+        transactionIntegrationId: member.transactionIntegrationId,
     }));
 }
 function collectLeftoverMembers(leftovers) {
@@ -312,18 +316,22 @@ function toActualMatchingMatchView(match) {
             : match.leftovers.map(toMatchModalAccrual),
     };
 }
-const EMPTY_ACTUAL_MATCHING_ROWS = [];
 const matchViewSelectorById = new Map();
 export function getExpenseAutomationActualMatchingMatchView(state, matchId) {
     let selector = matchViewSelectorById.get(matchId);
     if (selector == null) {
         selector = createSelector([
-            (root) => root.expenseAutomationActualMatchingViewState.detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .detailFetchStateByMatchId[matchId] ?? NOT_STARTED,
             (root) => root.expenseAutomationActualMatchingViewState.ignoreStatusByMatchId[matchId] ?? NOT_STARTED,
-            (root) => root.expenseAutomationActualMatchingViewState.lastMatchResultsByMatchId?.[matchId],
-            (root) => root.expenseAutomationActualMatchingViewState.lastUndoResultsByMatchId?.[matchId],
-            (root) => root.expenseAutomationActualMatchingViewState.detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
-            (root) => root.expenseAutomationActualMatchingViewState.undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .lastMatchResultsByMatchId?.[matchId],
+            (root) => root.expenseAutomationActualMatchingViewState
+                .lastUndoResultsByMatchId?.[matchId],
+            (root) => root.expenseAutomationActualMatchingViewState
+                .detailRefreshStatusByMatchId[matchId] ?? NOT_STARTED,
+            (root) => root.expenseAutomationActualMatchingViewState
+                .undoReversalStatusByMatchId[matchId] ?? NOT_STARTED,
             (root) => getActualMatchingMatchById(root.actualMatchingState, matchId),
         ], (detailFetchState, ignoreStatus, lastMatchResults, lastUndoResults, refreshStatus, undoReversalStatus, match) => ({
             detailFetchState,
@@ -353,7 +361,8 @@ export function getActualMatchingMatchModalConfirmStatus(state, matchId) {
     if (matchId != null && matchId !== '') {
         return (state.expenseAutomationActualMatchingViewState.confirmStatusByMatchId[matchId] ?? NOT_STARTED);
     }
-    return state.expenseAutomationActualMatchingViewState.matchModal.confirmStatus;
+    return state.expenseAutomationActualMatchingViewState.matchModal
+        .confirmStatus;
 }
 export function getExpenseAutomationActualMatchingView(state) {
     const { expenseAutomationActualMatchingViewState } = state;
@@ -367,14 +376,8 @@ export function getExpenseAutomationActualMatchingView(state) {
         .filter((match) => match.members.length > 0)
         .map(toActualMatchingRow);
     const rows = allRows.filter((row) => matchesSearch(row, uiState.searchString));
-    const includePendingReview = uiState.statusFilter !== 'reversed';
-    const includeReversed = uiState.statusFilter !== 'pending_review';
-    const reversed = includeReversed
-        ? sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState)
-        : EMPTY_ACTUAL_MATCHING_ROWS;
-    const pendingReview = includePendingReview
-        ? sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState)
-        : EMPTY_ACTUAL_MATCHING_ROWS;
+    const reversed = sortActualMatchingRows(rows.filter((row) => isReversedMatchKind(row.kind)), uiState);
+    const pendingReview = sortActualMatchingRows(rows.filter((row) => row.kind === 'pending_review'), uiState);
     const kpiSummary = buildActualMatchingKpiSummary(allRows, getTenantDisplayCurrency(state)?.currencyCode);
     const searchedAccruals = matchModal.accrualSearch.results
         .map((key) => getJEOneTimeAccrualByKey(key, state.jeSchedulesState))

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

@@ -1,5 +1,5 @@
 import { getAddressByAddressId } from '../../../entity/address/addressSelector';
-import { invoicingPricePointDisplayAmount } from '../../../entity/invoicing/plan/planSelector';
+import { invoicingPricePointDisplayAmount } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
 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 { getInvoicingPlanById, getInvoicingPlansByIds, } from '../../../entity/invoicing/plan/planSelector';
+import { getInvoicingCatalogItemById, getInvoicingCatalogItemsByIds, } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
 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.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (planState, listViewState) => buildApplicableCatalogItemOptions(getInvoicingPlansByIds(planState, [
+export const getInvoicingApplicableCatalogItemOptions = createSelector((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (catalogState, listViewState) => buildApplicableCatalogItemOptions(getInvoicingCatalogItemsByIds(catalogState, [
     ...listViewState.planIds,
     ...listViewState.productIds,
 ])));
@@ -61,7 +61,9 @@ 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 ? getInvoicingPlanById(state.invoicingPlanState, id) : undefined;
+    const plan = id != null
+        ? getInvoicingCatalogItemById(state.invoicingCatalogState, 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 { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 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 [
-                updateInvoicingPlans([response.data], 'merge'),
+                updateInvoicingCatalogItems([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 { updateInvoicingPlans } from '../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 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 [
-                updateInvoicingPlans([response.data], 'merge'),
+                updateInvoicingCatalogItems([response.data], 'merge'),
                 runInvoicingCatalogPlanActionSuccess({ id }),
             ];
         }

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

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

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

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

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 { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 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 [
-                updateInvoicingPlans(items, 'merge'),
+                updateInvoicingCatalogItems(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 { updateInvoicingPlans } from '../../../../entity/invoicing/plan/planReducer';
+import { updateInvoicingCatalogItems } from '../../../../entity/invoicing/invoicingCatalog/invoicingCatalogReducer';
 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 [
-                updateInvoicingPlans(items, 'merge'),
+                updateInvoicingCatalogItems(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,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { getInvoicingPlansByIds } from '../../../entity/invoicing/plan/planSelector';
+import { getInvoicingCatalogItemsByIds } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
 import { runningInvoicingActionId } from '../runningInvoicingActionId';
 import { INVOICING_PRODUCT_COLUMNS, } from './invoicingCatalogListViewState';
 /**
@@ -28,13 +28,13 @@ export const getInvoicingCatalogPrices = (items) => items.flatMap((item) => (ite
  * 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.invoicingPlanState, (state) => state.invoicingCatalogListViewState, (state) => state.invoicingConfigViewState.catalogItemLifecycleActionOptions, (state) => state.editInvoicingCatalogItemDetailViewState.actionStateById, (planState, listViewState, catalogItemLifecycleActionOptions, actionStateById) => ({
+export const getInvoicingCatalogListView = createSelector((state) => state.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (state) => state.invoicingConfigViewState.catalogItemLifecycleActionOptions, (state) => state.editInvoicingCatalogItemDetailViewState.actionStateById, (catalogState, listViewState, catalogItemLifecycleActionOptions, actionStateById) => ({
     catalogItemLifecycleActionOptions,
     runningActionId: runningInvoicingActionId(actionStateById),
-    plans: getInvoicingPlansByIds(planState, listViewState.planIds),
+    plans: getInvoicingCatalogItemsByIds(catalogState, listViewState.planIds),
     planSort: listViewState.planSort,
     productColumns: INVOICING_PRODUCT_COLUMNS,
-    products: getInvoicingPlansByIds(planState, listViewState.productIds),
+    products: getInvoicingCatalogItemsByIds(catalogState, listViewState.productIds),
     productSort: listViewState.productSort,
     count: listViewState.counts,
     countsFetchState: listViewState.countsFetchState,

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

@@ -16,7 +16,7 @@ import { toBusinessVerificationCompanyDataPayload, toBusinessVerificationOfficer
 import { updateCurrentStep, updateOnboardingCustomerView, updateOnboardingCustomerViewFailure, updateOnboardingCustomerViewLocalStoreData, updateOnboardingCustomerViewSuccess, } from '../../onboardingCustomerViewReducer';
 import { getOnboardingCustomerView } from '../../onboardingCustomerViewSelector';
 export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateOnboardingCustomerView.match), mergeMap((action) => {
-    const { companyId, officerType, sendForVerification, reCalculateCurrentStep = false, isBillingAddressUpdate, } = action.payload;
+    const { companyId, officerType, sendForVerification, reCalculateCurrentStep = false, isBillingAddressUpdate, businessProfile, } = action.payload;
     const { onboardingCustomerViewState } = state$.value;
     const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, currentSubStep, } = onboardingCustomerViewState;
     const companyLocalData = companyDetails.localData;
@@ -28,12 +28,17 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
     }
     const { newAddressState } = state$.value.addressViewState;
     let payload = {};
+    const isSetupBillingSave = isBillingAddressUpdate === true || businessProfile != null;
     if (companyLocalData != null) {
-        if (isBillingAddressUpdate === true &&
-            newAddressState?.subscription_billing_address.addressToCreate != null) {
-            payload = prepareEditBillingAddressPayload(companyLocalData, newAddressState.subscription_billing_address.addressToCreate);
-        }
         const companyView = getCompanyView(state$.value, companyId, []);
+        const billingAddressToCreate = isBillingAddressUpdate === true
+            ? newAddressState?.subscription_billing_address.addressToCreate
+            : undefined;
+        if (billingAddressToCreate != null || businessProfile != null) {
+            payload = prepareEditBillingAddressPayload(companyLocalData, billingAddressToCreate, businessProfile != null
+                ? toBusinessProfilePayload(businessProfile, companyView?.company.company.incInfo)
+                : {});
+        }
         const companyAddressToCreate = newAddressState?.company_address?.addressToCreate;
         const registeredAddressToCreate = newAddressState?.company_registered_address?.addressToCreate;
         const addressType = officerType
@@ -56,7 +61,7 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
         // different payloads — currentSubStep is the source of truth here.
         const isOfficerSave = currentStep === 'verification' &&
             currentSubStep === 'company_officer';
-        if (isBillingAddressUpdate === false) {
+        if (isBillingAddressUpdate === false && businessProfile == null) {
             if (isOfficerSave) {
                 payload = {
                     company: toBusinessVerificationMinimalCompanyDataPayload(companyLocalData),
@@ -70,7 +75,7 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 };
             }
         }
-        const section = isBillingAddressUpdate === true
+        const section = isSetupBillingSave
             ? 'setup_billing'
             : isOfficerSave
                 ? 'company_officer'
@@ -90,7 +95,7 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
             },
         };
         let messageSection;
-        if (isBillingAddressUpdate === true) {
+        if (isSetupBillingSave) {
             messageSection = messageSectionMapper[section].save;
         }
         else if (sendForVerification === true) {
@@ -173,13 +178,28 @@ const toBusinessVerificationMinimalCompanyDataPayload = (companyLocalData) => {
     }
     return company;
 };
-const prepareEditBillingAddressPayload = (companyDetailsLocalData, address) => {
+const toBusinessProfilePayload = (businessProfile, persistedIncInfo) => {
+    const isIndustryTypeChanged = businessProfile.companyIndustryType !==
+        persistedIncInfo?.companyIndustryType;
+    return {
+        company_business_model: businessProfile.companyBusinessModel,
+        company_industry_type: businessProfile.companyIndustryType,
+        // A sub-industry kept from the old industry would fail the backend subtype check on the next KYB save.
+        ...(isIndustryTypeChanged &&
+            persistedIncInfo?.companySubIndustry != null && {
+            company_industry_sub_type: null,
+        }),
+    };
+};
+const prepareEditBillingAddressPayload = (companyDetailsLocalData, address, businessProfilePayload) => {
     const { syncToken } = companyDetailsLocalData;
-    const addressPayload = toAddressUpdatableInfoPayload(address);
     return {
         company: {
             sync_token: syncToken,
-            subscription_billing_address: addressPayload,
+            ...(address != null && {
+                subscription_billing_address: toAddressUpdatableInfoPayload(address),
+            }),
+            ...businessProfilePayload,
         },
     };
 };

package/lib/esm/view/onboardingView/customerView/onboardingCustomerViewReducer.js

@@ -523,7 +523,7 @@ const onboardingCustomerView = createSlice({
             reducer(draft) {
                 draft.saveStatus = { fetchState: 'In-Progress', error: undefined };
             },
-            prepare(companyId, sendForVerification, reCalculateCurrentStep, isBillingAddressUpdate, officerType) {
+            prepare(companyId, sendForVerification, reCalculateCurrentStep, isBillingAddressUpdate, officerType, businessProfile) {
                 return {
                     payload: {
                         companyId,
@@ -531,6 +531,7 @@ const onboardingCustomerView = createSlice({
                         reCalculateCurrentStep,
                         isBillingAddressUpdate,
                         officerType,
+                        businessProfile,
                     },
                 };
             },