@zeniai/client-epic-state 5.1.7 → 5.1.8-betaML1

package/lib/esm/view/companyView/epic/companyPassport/{updateCapitalizationThresholdEpic.js → updateCapitalizationAccountThresholdEpic.js}

@@ -2,21 +2,35 @@ import { from } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { updateCompanies } from '../../../../entity/company/companyReducer';
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-import { updateTenantCapitalizationOnboardingDismissed, updateTenantCapitalizationThreshold, } from '../../../../entity/tenant/tenantReducer';
+import { updateTenantCapitalizationAccountOverride, updateTenantCapitalizationOnboardingDismissed, } from '../../../../entity/tenant/tenantReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { updateCapitalizationThreshold, updateCapitalizationThresholdFailure, updateCapitalizationThresholdSuccess, } from '../../companyViewReducer';
-export const updateCapitalizationThresholdEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateCapitalizationThreshold.match), switchMap((action) => {
-    const { companyId, capitalizationThreshold, capitalizationThresholdMaxCeiling, dismissOnboardingForPopupType, } = action.payload;
+import { updateCapitalizationAccountThreshold, updateCapitalizationAccountThresholdFailure, updateCapitalizationAccountThresholdSuccess, } from '../../companyViewReducer';
+export const updateCapitalizationAccountThresholdEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateCapitalizationAccountThreshold.match), switchMap((action) => {
+    const { companyId, accountId, threshold, dismissOnboardingForAccount, allOverrides, } = action.payload;
     const tenantId = Object.values(state$.value.tenantState.tenantsById).find((t) => t.companyId === companyId)?.tenantId;
+    let finalOverrides;
+    if (allOverrides !== undefined) {
+        finalOverrides = allOverrides ?? {};
+    }
+    else {
+        finalOverrides = {
+            ...(tenantId != null
+                ? state$.value.tenantState.tenantsById[tenantId]
+                    ?.capitalizableAccountOverrides
+                : {}),
+        };
+        if (threshold === null) {
+            delete finalOverrides[accountId];
+        }
+        else {
+            finalOverrides[accountId] = threshold;
+        }
+    }
     const body = {
-        capitalization_threshold: capitalizationThreshold,
-        capitalization_threshold_max_ceiling: capitalizationThresholdMaxCeiling,
+        capitalizable_account_overrides: Object.keys(finalOverrides).length > 0 ? finalOverrides : null,
     };
-    if (dismissOnboardingForPopupType === 'prepaid') {
-        body.capitalization_onboarding_shown_for_prepaid = true;
-    }
-    else if (dismissOnboardingForPopupType === 'fixed_asset') {
-        body.capitalization_onboarding_shown_for_fixed_asset = true;
+    if (dismissOnboardingForAccount === true) {
+        body.capitalization_onboarding_dismissed_accounts = { [accountId]: true };
     }
     return zeniAPI
         .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, body)
@@ -31,19 +45,24 @@ export const updateCapitalizationThresholdEpic = (actions$, state$, zeniAPI) =>
                 }));
             }
             if (tenantId != null) {
-                actions.push(updateTenantCapitalizationThreshold({
+                actions.push(updateTenantCapitalizationAccountOverride({
                     tenantId,
-                    capitalizationThreshold,
-                    capitalizationThresholdMaxCeiling,
+                    accountId,
+                    threshold,
+                    allOverrides: allOverrides !== undefined
+                        ? Object.keys(finalOverrides).length > 0
+                            ? finalOverrides
+                            : null
+                        : undefined,
                 }));
-                if (dismissOnboardingForPopupType != null) {
+                if (dismissOnboardingForAccount === true) {
                     actions.push(updateTenantCapitalizationOnboardingDismissed({
                         tenantId,
-                        popupType: dismissOnboardingForPopupType,
+                        accountId,
                     }));
                 }
             }
-            actions.push(updateCapitalizationThresholdSuccess());
+            actions.push(updateCapitalizationAccountThresholdSuccess());
             actions.push(openSnackbar({
                 messageSection: 'capitalization_threshold_update',
                 messageText: 'success',
@@ -53,7 +72,7 @@ export const updateCapitalizationThresholdEpic = (actions$, state$, zeniAPI) =>
         }
         else {
             return from([
-                updateCapitalizationThresholdFailure({
+                updateCapitalizationAccountThresholdFailure({
                     status: response.status,
                 }),
                 openSnackbar({
@@ -64,7 +83,7 @@ export const updateCapitalizationThresholdEpic = (actions$, state$, zeniAPI) =>
             ]);
         }
     }), catchError((error) => from([
-        updateCapitalizationThresholdFailure({
+        updateCapitalizationAccountThresholdFailure({
             status: createZeniAPIStatus('Unexpected error', 'Update Capitalization Threshold errored out' +
                 (error instanceof Error
                     ? error.message

package/lib/esm/view/companyView/epic/fetchAllCockpitViewsEpic.js

@@ -21,7 +21,7 @@ export const fetchAllCockpitViewsEpic = (actions$, state$) => actions$.pipe(filt
             fetchReviewCompanyView(),
             fetchCompanyHealthMetricView(),
             fetchCompanyMetaData(),
-            fetchCompanyTaskManagerView(null, 'dueDate', 'descending', false),
+            fetchCompanyTaskManagerView(0, 'dueDate', 'descending', false),
             fetchCompanyHealthMetricConfig(),
         ]);
     }
@@ -74,7 +74,7 @@ export const fetchAllCockpitViewsEpic = (actions$, state$) => actions$.pipe(filt
         }
         if (state.companyTaskManagerViewState.fetchState !== 'In-Progress' &&
             state.companyTaskManagerViewState.hasValidState() === false) {
-            fetchActions.push(fetchCompanyTaskManagerView(null, 'dueDate', 'descending', false));
+            fetchActions.push(fetchCompanyTaskManagerView(0, 'dueDate', 'descending', false));
         }
         return from(fetchActions);
     }

package/lib/esm/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js

@@ -81,6 +81,7 @@ export const toTransactionDetailLocalData = (transaction, selectedTab, lineItems
     };
     transactionLocal.description = transaction.description;
     transactionLocal.memo = transaction.memo;
+    transactionLocal.totalLinesCount = transaction.totalLinesCount ?? null;
     transactionLocal.transactionDate = transaction.date;
     transactionLocal.transactionType = transaction.type;
     transactionLocal.transactionTypeName = transaction.typeName;

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

@@ -5,12 +5,12 @@ import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, } from '../../../entity/tenant/tenantSelector';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
 import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
-import { applyTransactionFilters, } from '../transactionFilterHelpers';
 import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { getResolvedTransferAccounts } from '../../createTransferEntry/createTransferEntrySelector';
 import { getProjectList } from '../../projectList/projectListSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
+import { applyTransactionFilters, } from '../transactionFilterHelpers';
 // Walks the tab's transactionReviewLocalDataById map and returns
 // `{ [transactionId]: true }` for every transaction that has at least
 // one line whose targeted-fetch is In-Progress. Pulled out as a plain

package/lib/esm/view/fileView/epic/deleteFileEpic.js

@@ -1,9 +1,9 @@
 import { of } from 'rxjs';
-import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { removeFiles } from '../../../entity/file/fileReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { deleteFile, deleteFileFailure, deleteFileSuccess, } from '../fileViewReducer';
-export const deleteFileEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFile.match), switchMap((action) => {
+export const deleteFileEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFile.match), mergeMap((action) => {
     /**
      * tenantId is required for deleting onboarding files.
      */

package/lib/esm/view/fileView/epic/deleteFileListEpic.js

@@ -1,9 +1,9 @@
 import { of } from 'rxjs';
-import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { removeFiles } from '../../../entity/file/fileReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { deleteFileList, deleteFileListFailure, deleteFileListSuccess, } from '../fileViewReducer';
-export const deleteFileListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFileList.match), switchMap((action) => {
+export const deleteFileListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFileList.match), mergeMap((action) => {
     const { fileIds } = action.payload;
     return zeniAPI
         .deleteAndGetJSON(`${zeniAPI.apiEndPoints.fileMicroServiceBaseUrl}/1.0/files?query=${encodeURIComponent(JSON.stringify({ file_ids: fileIds }))}`)

package/lib/esm/view/onboardingView/customerView/epic/aiAgentsActivation/fetchAiAgentsActivationStatusEpic.js

@@ -0,0 +1,40 @@
+import { of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
+import { fetchAiAgentsActivationStatus, fetchAiAgentsActivationStatusFailure, fetchAiAgentsActivationStatusSuccess, } from '../../onboardingCustomerViewReducer';
+const toPhaseStatus = (raw) => {
+    if (raw === 'idle' ||
+        raw === 'starting' ||
+        raw === 'building' ||
+        raw === 'ready') {
+        return raw;
+    }
+    return 'idle';
+};
+const toPhase = (row) => ({
+    key: row.key,
+    status: toPhaseStatus(row.status),
+    startedAt: row.started_at,
+    completedAt: row.completed_at,
+});
+const toCounts = (payload) => ({
+    customerCount: payload?.customer_count ?? 0,
+    glAccountCount: payload?.gl_account_count ?? 0,
+    targetTransactionCount: payload?.target_transaction_count ?? 0,
+    transactionCount: payload?.transaction_count ?? 0,
+    vendorCount: payload?.vendor_count ?? 0,
+});
+export const fetchAiAgentsActivationStatusEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchAiAgentsActivationStatus.match), mergeMap(() => {
+    const url = `${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/ai-agents-activation/status`;
+    return zeniAPI.getJSON(url).pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const phases = (response.data.phases ?? []).map(toPhase);
+            return of(fetchAiAgentsActivationStatusSuccess({
+                phases,
+                counts: toCounts(response.data.counts),
+            }));
+        }
+        return of(fetchAiAgentsActivationStatusFailure(response.status));
+    }), catchError((error) => of(fetchAiAgentsActivationStatusFailure(createZeniAPIStatus('Unexpected Error', 'fetchAiAgentsActivationStatus errored out ' +
+        JSON.stringify(error))))));
+}));

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

@@ -0,0 +1,29 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateCompanies } from '../../../../../entity/company/companyReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
+import { acknowledgeOnboardingAiActivationViewed, acknowledgeOnboardingAiActivationViewedFailure, acknowledgeOnboardingAiActivationViewedSuccess, } from '../../onboardingCustomerViewReducer';
+export const acknowledgeOnboardingAiActivationViewedEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(acknowledgeOnboardingAiActivationViewed.match), mergeMap((action) => {
+    const { companyId } = action.payload;
+    const payload = {
+        is_onboarding_ai_activation_viewed: true,
+    };
+    return zeniAPI
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, payload)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const actions = [
+                updateCompanies({
+                    payload: response.data.companies,
+                    schema: {},
+                }),
+                acknowledgeOnboardingAiActivationViewedSuccess(),
+            ];
+            return from(actions);
+        }
+        return of(acknowledgeOnboardingAiActivationViewedFailure(response.status));
+    }), 
+    // Best-effort — failure is silent; cascade just runs again next visit.
+    catchError((error) => of(acknowledgeOnboardingAiActivationViewedFailure(createZeniAPIStatus('Unexpected Error', 'Acknowledge - Onboarding AI Activation Viewed errored out' +
+        JSON.stringify(error))))));
+}));

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

@@ -0,0 +1,40 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { updateCompanies } from '../../../../../entity/company/companyReducer';
+import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
+import { acknowledgeOnboardingAiFinanceTeam, acknowledgeOnboardingAiFinanceTeamFailure, acknowledgeOnboardingAiFinanceTeamSuccess, } from '../../onboardingCustomerViewReducer';
+export const acknowledgeOnboardingAiFinanceTeamEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(acknowledgeOnboardingAiFinanceTeam.match), mergeMap((action) => {
+    const { companyId } = action.payload;
+    const payload = {
+        is_onboarding_ai_finance_team_acknowledged: true,
+    };
+    return zeniAPI
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, payload)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const actions = [
+                updateCompanies({
+                    payload: response.data.companies,
+                    schema: {},
+                }),
+                acknowledgeOnboardingAiFinanceTeamSuccess(),
+            ];
+            return from(actions);
+        }
+        else {
+            return of(openSnackbar({
+                messageSection: 'onboarding_customer_view_complete',
+                messageText: 'failed',
+                type: 'error',
+                variables: [
+                    {
+                        variableName: '_api-error_',
+                        variableValue: response.status.message,
+                    },
+                ],
+            }), acknowledgeOnboardingAiFinanceTeamFailure(response.status));
+        }
+    }), catchError((error) => of(acknowledgeOnboardingAiFinanceTeamFailure(createZeniAPIStatus('Unexpected Error', 'Acknowledge - Onboarding AI Finance Team errored out' +
+        JSON.stringify(error))))));
+}));

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

@@ -18,7 +18,7 @@ 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 { onboardingCustomerViewState } = state$.value;
-    const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, } = onboardingCustomerViewState;
+    const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, currentSubStep, } = onboardingCustomerViewState;
     const companyLocalData = companyDetails.localData;
     const primaryContactLocalData = primaryContactDetails.localData;
     let companyOfficerLocalData;
@@ -52,8 +52,12 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
             Boolean(companyOfficerLocalData.email) === true // Don't save Empty Company Officer details
             ? toBusinessVerificationOfficerDataPayload(companyOfficerLocalData, false, companyOfficerAddressToCreate)
             : {};
+        // Verification step has two sub-steps that share currentStep but save
+        // different payloads — currentSubStep is the source of truth here.
+        const isOfficerSave = currentStep === 'verification' &&
+            currentSubStep === 'company_officer';
         if (isBillingAddressUpdate === false) {
-            if (currentStep === 'company_officer') {
+            if (isOfficerSave) {
                 payload = {
                     company: toBusinessVerificationMinimalCompanyDataPayload(companyLocalData),
                     company_officer,
@@ -66,6 +70,11 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 };
             }
         }
+        const section = isBillingAddressUpdate === true
+            ? 'setup_billing'
+            : isOfficerSave
+                ? 'company_officer'
+                : 'company_details';
         const messageSectionMapper = {
             company_officer: {
                 sendForVerification: 'onboarding_customer_identity_verification_submit',
@@ -75,23 +84,20 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 sendForVerification: 'onboarding_customer_business_verification_submit',
                 save: 'onboarding_customer_business_verification_save',
             },
-            link_payment_account: {
+            setup_billing: {
                 save: 'billing_address_view',
                 sendForVerification: 'billing_address_view',
             },
         };
         let messageSection;
         if (isBillingAddressUpdate === true) {
-            messageSection = messageSectionMapper[currentStep].save;
+            messageSection = messageSectionMapper[section].save;
+        }
+        else if (sendForVerification === true) {
+            messageSection = messageSectionMapper[section].sendForVerification;
         }
         else {
-            if (sendForVerification === true) {
-                messageSection =
-                    messageSectionMapper[currentStep].sendForVerification;
-            }
-            else {
-                messageSection = messageSectionMapper[currentStep].save;
-            }
+            messageSection = messageSectionMapper[section].save;
         }
         return zeniAPI
             .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, payload)
@@ -114,18 +120,18 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 const externalConnections = currentTenant.externalConnections;
                 const isQBOConnection = externalConnections?.accounting?.some((connection) => connection.connectionName.match(/quickbooks/i)) ?? false;
                 const { allSteps } = getOnboardingCustomerView(state$.value, companyId);
-                if (currentStep === 'link_payment_account') {
+                if (currentStep === 'setup_billing') {
                     if (isQBOConnection === true &&
-                        allSteps.includes('qbo_connection')) {
-                        actions.push(updateCurrentStep({ step: 'qbo_connection' }));
+                        allSteps.includes('connect_ledger')) {
+                        actions.push(updateCurrentStep({ step: 'connect_ledger' }));
                     }
                     else {
-                        actions.push(updateCurrentStep({ step: 'company_officer' }));
+                        actions.push(updateCurrentStep({ step: 'verification' }));
                     }
                 }
-                if (currentStep === 'company_officer') {
-                    actions.push(updateCurrentStep({ step: 'company_details' }));
-                }
+                // The officer→details transition is now a sub-step change
+                // handled by the page (currentSubStep dispatch). No
+                // currentStep update needed for that traversal anymore.
                 actions.push(updateOnboardingCustomerViewLocalStoreData({
                     companyId: response.data.companies[0].company_id,
                     currentStep,

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

@@ -12,11 +12,11 @@ import { newAddressInLocalStore, resetNewAddressesInLocalStore, } from '../../..
 import { toAddressViewLocalData } from '../../../../addressView/toAddressViewLocalData';
 import { getCompanyView } from '../../../../companyView/selectorHelpers/getCompanyView';
 import { toSetupViewLocalData } from '../../../../spendManagement/commonSetup/epic/setup/updateSetupViewLocalStoreDataEpic';
-import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateOnboardingCustomerViewLocalStoreData, } from '../../onboardingCustomerViewReducer';
-import { isOfficerDetailsCompleted, onboardingStepsData, } from '../../onboardingCustomerViewSelector';
+import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateCurrentSubStep, updateOnboardingCustomerViewLocalStoreData, } from '../../onboardingCustomerViewReducer';
+import { onboardingStepsData } from '../../onboardingCustomerViewSelector';
 export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$) => actions$.pipe(filter(updateOnboardingCustomerViewLocalStoreData.match), mergeMap((action) => {
     const { companyId, currentStep, reCalculateCurrentStep } = action.payload;
-    const { companyState, companyViewState, fileState, userState, userRoleState, onboardingCustomerViewState, subscriptionPaymentAccountState, paymentAccountState, addressState, } = state$.value;
+    const { companyState, companyViewState, userState, userRoleState, onboardingCustomerViewState, subscriptionPaymentAccountState, paymentAccountState, addressState, } = state$.value;
     const { subscriptionPaymentAccountIds } = onboardingCustomerViewState;
     const subscriptionIDs = recordGet(companyViewState.passportView.subscriptionIDsByCompanyID, companyId, undefined);
     const companyView = getCompanyView(state$.value, companyId, subscriptionIDs ?? []);
@@ -36,7 +36,12 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
         const onboardingCustomerViewLocalData = toOnboardingCustomerViewLocalData(company, companyOfficers, companyOfficerRoles, primaryContact);
         const { companyDetails, officers, primaryContactDetails } = onboardingCustomerViewLocalData;
         let updatedCompanyDetails = companyDetails;
-        if (currentStep === 'company_officer' &&
+        // After an officer sub-step save inside the verification step, propagate
+        // the latest syncToken into the cached company-details local data so the
+        // user's next details-save doesn't 409.
+        const isOfficerSave = currentStep === 'verification' &&
+            onboardingCustomerViewState.currentSubStep === 'company_officer';
+        if (isOfficerSave &&
             onboardingCustomerViewState.companyDetails.localData != null) {
             const { companyInfo } = company;
             const { syncToken } = companyInfo;
@@ -45,7 +50,7 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
                 syncToken,
             };
         }
-        let updatedCurrentStep = 'link_payment_account';
+        let updatedCurrentStep = 'setup_billing';
         let subscriptionPaymentAccount;
         const { companyOnboardingInfo } = company;
         const accountingConnectionCreationMode = companyOnboardingInfo?.onboardingInfo
@@ -72,18 +77,17 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
                 cardPaymentViewState.cardPaymentsIds.length > 0) &&
                 companyView?.company.company.companyOnboardingInfo
                     .subscriptionBillingAddressId != null) {
-                updatedCurrentStep = 'qbo_connection';
-                if (isValidConnection) {
-                    updatedCurrentStep = 'company_officer';
-                    let officerIndex = companyOfficers.length > 0
-                        ? officers.findIndex((officer) => officer?.isSelectedForVerification === true)
-                        : 0;
-                    if (officerIndex === -1) {
-                        officerIndex = 0;
-                    }
-                    if (isOfficerDetailsCompleted(companyOfficers, companyOfficerRoles, officers[officerIndex], fileState)) {
-                        updatedCurrentStep = 'company_details';
-                    }
+                updatedCurrentStep = 'connect_ledger';
+                const isOnboardingAiActivationViewed = companyOnboardingInfo?.onboardingInfo
+                    ?.onboardingAiActivationInfo?.isOnboardingAiActivationViewed ??
+                    false;
+                // Past the ledger step we always sit on connect_data_source —
+                // it has many integrations, so we treat it as never auto-complete
+                // and only advance to verification on an explicit user dispatch.
+                // While the AI activation interstitial hasn't been viewed yet,
+                // stay on connect_ledger so the interstitial gets its chance.
+                if (isValidConnection && isOnboardingAiActivationViewed) {
+                    updatedCurrentStep = 'connect_data_source';
                 }
             }
         }
@@ -105,6 +109,14 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
         }
         if (reCalculateCurrentStep === true) {
             fetchActions.push(updateCurrentStep({ step: updatedCurrentStep }));
+            // Whenever the recalc lands the user on a different step, reset
+            // the sub-step to the step's landing sub-state — otherwise a
+            // stale subStep (e.g. 'default' carried over from another step)
+            // leaves verification rendering an empty form.
+            if (updatedCurrentStep !== onboardingCustomerViewState.currentStep) {
+                const targetSubStep = updatedCurrentStep === 'verification' ? 'unlock-stack' : 'default';
+                fetchActions.push(updateCurrentSubStep({ subStep: targetSubStep }));
+            }
         }
     }
     if (companyView != null) {