@zeniai/client-epic-state 5.2.69 → 5.2.70

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,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { getInvoicingCatalogItemsByIds } from '../../../entity/invoicing/invoicingCatalog/invoicingCatalogSelector';
+import { getInvoicingPlansByIds } from '../../../entity/invoicing/plan/planSelector';
 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.invoicingCatalogState, (state) => state.invoicingCatalogListViewState, (state) => state.invoicingConfigViewState.catalogItemLifecycleActionOptions, (state) => state.editInvoicingCatalogItemDetailViewState.actionStateById, (catalogState, listViewState, catalogItemLifecycleActionOptions, actionStateById) => ({
+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: getInvoicingCatalogItemsByIds(catalogState, listViewState.planIds),
+    plans: getInvoicingPlansByIds(planState, listViewState.planIds),
     planSort: listViewState.planSort,
     productColumns: INVOICING_PRODUCT_COLUMNS,
-    products: getInvoicingCatalogItemsByIds(catalogState, listViewState.productIds),
+    products: getInvoicingPlansByIds(planState, listViewState.productIds),
     productSort: listViewState.productSort,
     count: listViewState.counts,
     countsFetchState: listViewState.countsFetchState,

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

@@ -1,11 +1,10 @@
 import { getInvoicingQboAccountMappingId, } from '../../../entity/invoicing/invoicingCommonPayload';
-import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getFileByFileId } from '../../../entity/file/fileSelector';
 import { getFormattedAddress } from '../../addressView/addressViewSelector';
 import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingQboView, isInvoicingAccountingPickerDataLoading, } from '../invoicingQboView/invoicingQboViewSelector';
 import { INVOICING_BUSINESS_ADDRESS_TYPE, entityToInvoicingBrandingFormLocalData, } from './invoicingBrandingFormConfig';
-import { entityToInvoicingQboSettingsLocalData, initialInvoicingQboSettingsLocalData, } from './invoicingQboSettingsFormConfig';
+import { initialInvoicingQboSettingsLocalData, } from './invoicingQboSettingsFormConfig';
 /**
  * Shared primitive: the raw invoicing settings. Consumed internally by other
  * CES selectors (create-invoice, customer-detail, overview) and by non-settings
@@ -119,7 +118,6 @@ export const getInvoicingQboSettingsFormView = (state) => {
         fieldHelp: invoicingFieldHelpForGroup(state, 'settings'),
         accountMappingKindOptions: qboAccountMappingKindOptions,
         accounts: qboView.accounts,
-        savedLocalData: entityToInvoicingQboSettingsLocalData(settings?.qbo),
         backfillState: qboView.backfillState,
         connection: qboView.connection,
         configFetchState,
@@ -145,27 +143,20 @@ export const getInvoicingQboSettingsFormView = (state) => {
 };
 /**
  * Bundled view for the branding settings form: the draft `localData` (seeded
- * from the existing settings until the user edits), the business address, the
- * raw settings (for the logo/preview), the backend date-format choices and the
+ * from the existing settings until the user edits), the business-address label
+ * (from the shared Address screen, seeded on load from `address_id`), the raw
+ * settings (for the logo/preview), the backend date-format choices and the
  * save fetch state.
- *
- * The address is resolved here rather than read from the Address screen's
- * staging store alone: that store is only seeded when settings are fetched, and
- * returning to this page does not refetch, so a saved address would otherwise
- * have no way to reach the screen.
  */
 export const getInvoicingBrandingFormView = (state) => {
     const { brandingDraft, saveFetchState, settings } = state.invoicingSettingsViewState;
-    const savedAddressId = settings?.address?.address_id;
-    const address = state.addressViewState.newAddressState?.[INVOICING_BUSINESS_ADDRESS_TYPE]
-        ?.addressToCreate ??
-        (savedAddressId != null
-            ? getAddressByAddressId(state.addressState, savedAddressId)
-            : undefined);
+    const newAddress = state.addressViewState.newAddressState?.[INVOICING_BUSINESS_ADDRESS_TYPE];
+    const addressLabel = newAddress?.addressToCreate != null
+        ? getFormattedAddress(newAddress.addressToCreate)
+        : undefined;
     return {
         fieldHelp: invoicingFieldHelpForGroup(state, 'settings'),
-        address,
-        addressLabel: address != null ? getFormattedAddress(address) : undefined,
+        addressLabel,
         dateFormatOptions: getInvoicingConfigView(state).dateFormatOptions,
         localData: brandingDraft ?? entityToInvoicingBrandingFormLocalData(settings),
         saveState: saveFetchState,

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

@@ -1,7 +1,6 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateAddresses } from '../../../entity/address/addressReducer';
-import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { updateFiles } from '../../../entity/file/fileReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { resetNewAddressDataInLocalStore } from '../../addressView/addressViewReducer';
@@ -17,11 +16,7 @@ export const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => ac
     const state = state$.value;
     const { brandingDraft, settings } = state.invoicingSettingsViewState;
     const localData = brandingDraft ?? entityToInvoicingBrandingFormLocalData(settings);
-    const savedAddressId = settings?.address?.address_id;
-    const address = state.addressViewState.newAddressState?.[INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate ??
-        (savedAddressId != null
-            ? getAddressByAddressId(state.addressState, savedAddressId)
-            : undefined);
+    const address = state.addressViewState.newAddressState?.[INVOICING_BUSINESS_ADDRESS_TYPE]?.addressToCreate;
     const data = brandingLocalDataToSettingsPayload(localData, address);
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
     return zeniAPI
@@ -42,11 +37,7 @@ export const submitInvoicingBrandingFormEpic = (actions$, state$, zeniAPI) => ac
                     ? [updateFiles({ files: [savedLogoFile] })]
                     : []),
                 saveInvoicingSettingsSuccess(response.data),
-                ...(savedAddress == null
-                    ? [
-                        resetNewAddressDataInLocalStore(INVOICING_BUSINESS_ADDRESS_TYPE),
-                    ]
-                    : []),
+                resetNewAddressDataInLocalStore(INVOICING_BUSINESS_ADDRESS_TYPE),
             ];
         }
         return of(saveInvoicingSettingsFailure(response.status));

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, businessProfile, } = action.payload;
+    const { companyId, officerType, sendForVerification, reCalculateCurrentStep = false, isBillingAddressUpdate, } = action.payload;
     const { onboardingCustomerViewState } = state$.value;
     const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, currentSubStep, } = onboardingCustomerViewState;
     const companyLocalData = companyDetails.localData;
@@ -28,17 +28,12 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
     }
     const { newAddressState } = state$.value.addressViewState;
     let payload = {};
-    const isSetupBillingSave = isBillingAddressUpdate === true || businessProfile != null;
     if (companyLocalData != null) {
-        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)
-                : {});
+        if (isBillingAddressUpdate === true &&
+            newAddressState?.subscription_billing_address.addressToCreate != null) {
+            payload = prepareEditBillingAddressPayload(companyLocalData, newAddressState.subscription_billing_address.addressToCreate);
         }
+        const companyView = getCompanyView(state$.value, companyId, []);
         const companyAddressToCreate = newAddressState?.company_address?.addressToCreate;
         const registeredAddressToCreate = newAddressState?.company_registered_address?.addressToCreate;
         const addressType = officerType
@@ -61,7 +56,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 && businessProfile == null) {
+        if (isBillingAddressUpdate === false) {
             if (isOfficerSave) {
                 payload = {
                     company: toBusinessVerificationMinimalCompanyDataPayload(companyLocalData),
@@ -75,7 +70,7 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 };
             }
         }
-        const section = isSetupBillingSave
+        const section = isBillingAddressUpdate === true
             ? 'setup_billing'
             : isOfficerSave
                 ? 'company_officer'
@@ -95,7 +90,7 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
             },
         };
         let messageSection;
-        if (isSetupBillingSave) {
+        if (isBillingAddressUpdate === true) {
             messageSection = messageSectionMapper[section].save;
         }
         else if (sendForVerification === true) {
@@ -178,28 +173,13 @@ const toBusinessVerificationMinimalCompanyDataPayload = (companyLocalData) => {
     }
     return company;
 };
-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 prepareEditBillingAddressPayload = (companyDetailsLocalData, address) => {
     const { syncToken } = companyDetailsLocalData;
+    const addressPayload = toAddressUpdatableInfoPayload(address);
     return {
         company: {
             sync_token: syncToken,
-            ...(address != null && {
-                subscription_billing_address: toAddressUpdatableInfoPayload(address),
-            }),
-            ...businessProfilePayload,
+            subscription_billing_address: addressPayload,
         },
     };
 };

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, businessProfile) {
+            prepare(companyId, sendForVerification, reCalculateCurrentStep, isBillingAddressUpdate, officerType) {
                 return {
                     payload: {
                         companyId,
@@ -531,7 +531,6 @@ const onboardingCustomerView = createSlice({
                         reCalculateCurrentStep,
                         isBillingAddressUpdate,
                         officerType,
-                        businessProfile,
                     },
                 };
             },

package/lib/esm/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -625,7 +625,7 @@ export const getDueDate = (billStageCode, dueDate, invoiceDate, bookCloseDate) =
     }
 };
 export const getWithdrawFrom = (state, fromAccountId, fromAccountType, companyId, lastSelectedFromAccount) => {
-    const { paymentAccountState, depositAccountState, paymentAccountListState } = state;
+    const { paymentAccountState, depositAccountState, depositAccountListState, paymentAccountListState, } = state;
     if (fromAccountId != null) {
         const withdrawFromAsDepositAcc = getDepositAccountByDepositAccountId(depositAccountState, fromAccountId);
         const withdrawFromAsPaymentAcc = getPaymentAccountByPaymentAccountId(paymentAccountState, fromAccountId);
@@ -639,15 +639,41 @@ export const getWithdrawFrom = (state, fromAccountId, fromAccountType, companyId
         }
     }
     else {
-        return getDefaultWithdrawFromAccount(state, companyId ?? '', lastSelectedFromAccount);
+        return getDefaultWithdrawFromAccount(state, depositAccountListState.accountIds, companyId ?? '', lastSelectedFromAccount);
     }
     return undefined;
 };
-export const getDefaultWithdrawFromAccount = (state, companyId, lastSelectedFromAccount) => {
+export const getDefaultWithdrawFromAccount = (state, depositAccounts, companyId, lastSelectedFromAccount) => {
     const { depositAccountState, paymentAccountState, paymentAccountListState } = state;
     const companyView = getCompanyView(state, companyId, []);
     const primaryAccount = companyView?.company.company.companyBillPayInfo.primaryFundingAccount;
-    const defaultAccount = primaryAccount ?? lastSelectedFromAccount;
+    let defaultAccount = undefined;
+    // User paying bill for first time or previously paid with external account
+    if (lastSelectedFromAccount == null ||
+        lastSelectedFromAccount?.accountType === 'paymentAccount') {
+        if (depositAccounts.length === 0) {
+            defaultAccount = primaryAccount;
+        }
+        else {
+            if (primaryAccount?.accountType === 'depositAccount') {
+                defaultAccount = primaryAccount;
+            }
+        }
+    }
+    else {
+        // User paid with Zeni account previously
+        if (depositAccounts.length === 1) {
+            defaultAccount = lastSelectedFromAccount;
+        }
+        else {
+            if (primaryAccount?.accountType === 'depositAccount') {
+                defaultAccount = primaryAccount;
+            }
+            else {
+                defaultAccount = lastSelectedFromAccount;
+            }
+        }
+    }
     if (defaultAccount != null) {
         const defaultAccAsDepositAcc = getDepositAccountByDepositAccountId(depositAccountState, defaultAccount?.accountId);
         const defaultAccAsPaymentAcc = getPaymentAccountByPaymentAccountId(paymentAccountState, defaultAccount?.accountId);

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;

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

@@ -85,7 +85,7 @@ function getPrimaryAccountForTheProduct(state, companyId, setupViewType) {
 }
 export function getBusinessVerificationDetails(state, companyId) {
     const { setupViewState, countryListState } = state;
-    const { companyDetails, companyOfficerUpdateStatus, kycKybResetStatus, primaryContactDetails, updateStatus, } = setupViewState;
+    const { companyDetails, companyOfficerUpdateStatus, primaryContactDetails, updateStatus, } = setupViewState;
     const companyView = getCompanyView(state, companyId, []);
     const { companyDetailsLocalData, companyOfficerLocalData, parsingDocumentFileIds, } = getCompanyAndIdentityDetails(state, companyId, {
         companyDetails,
@@ -100,7 +100,6 @@ export function getBusinessVerificationDetails(state, companyId) {
         parsingDocumentFileIds,
         companyView,
         updateStatus,
-        kycKybResetStatus,
         allNationalityCountries,
     };
 }