@zeniai/client-epic-state 5.1.12 → 5.1.13

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

@@ -8,10 +8,10 @@ import { getUserRoleByUserIds } from '../../../entity/userRole/userRoleSelector'
 import { getCompanyConfig } from '../../companyConfigView/companyConfigSelector';
 import { getCompanyView } from '../../companyView/selectorHelpers/getCompanyView';
 import { getCompanyAndIdentityDetails, } from '../../spendManagement/commonSetup/setupViewSelector';
-import { ALL_ONBOARDING_STEPS, ALL_ZENI_USER_ONBOARDING_STEPS, REQUIRED_ONBOARDING_STEPS, ZENI_USER_REQUIRED_ONBOARDING_STEPS, toOnboardingStepType, } from './onboardingCustomerViewState';
+import { ALL_ONBOARDING_STEPS, ALL_ZENI_USER_BOOKKEEPING_ONBOARDING_STEPS, ALL_ZENI_USER_ONBOARDING_STEPS, REQUIRED_ONBOARDING_STEPS, ZENI_USER_REQUIRED_ONBOARDING_STEPS, emptyAiAgentsActivationSubview, toOnboardingStepType, } from './onboardingCustomerViewState';
 export function getOnboardingCustomerView(state, companyId) {
     const { fileState, paymentAccountState, onboardingCustomerViewState, userState, userRoleState, subscriptionPaymentAccountState, companyConfigState, cardPaymentViewState, countryListState, addressViewState, } = state;
-    const { companyDetails, companyOfficerUpdateStatus, primaryContactDetails, subscriptionPaymentAccountIds, paymentAccountDetails, plaidConnectionDetails, updateStatus, saveStatus, currentStep, uiState, fetchState, error, } = onboardingCustomerViewState;
+    const { companyDetails, companyOfficerUpdateStatus, primaryContactDetails, subscriptionPaymentAccountIds, paymentAccountDetails, plaidConnectionDetails, parsingDocumentFileIds, updateStatus, saveStatus, currentStep, currentSubStep, uiState, fetchState, error, } = onboardingCustomerViewState;
     const { paymentAccountIds } = paymentAccountDetails;
     let subscriptionPaymentAccount;
     let paymentAccount;
@@ -54,6 +54,7 @@ export function getOnboardingCustomerView(state, companyId) {
         companyDetails,
         companyOfficerUpdateStatus,
         primaryContactDetails,
+        parsingDocumentFileIds,
     });
     const companyAddress = addressViewState.newAddressState?.company_address;
     if (companyAddress == null &&
@@ -73,7 +74,7 @@ export function getOnboardingCustomerView(state, companyId) {
         cardPaymentViewState.cardPaymentsIds.length > 0) &&
         companyView?.company.company.companyOnboardingInfo
             .subscriptionBillingAddressId != null) {
-        completedSteps.push('link_payment_account');
+        completedSteps.push('setup_billing');
     }
     const isPaymentVerified = (paymentAccount?.providerVerificationStatus?.code?.includes('verified') ===
         true &&
@@ -84,24 +85,25 @@ export function getOnboardingCustomerView(state, companyId) {
         .subscriptionBillingAddressId != null;
     if ((isPaymentVerified || hasSubscriptionBillingAddress) &&
         !(isPaymentVerified && hasSubscriptionBillingAddress)) {
-        halfCompletedSteps.push('link_payment_account');
+        halfCompletedSteps.push('setup_billing');
     }
     const isValidConnection = externalConnections?.accounting[0]?.isValid ?? false;
     if (isValidConnection) {
-        completedSteps.push('qbo_connection');
+        completedSteps.push('connect_ledger');
     }
-    if (companyDetails.localData != null &&
+    const isCompanyDetailsDone = companyDetails.localData != null &&
         primaryContactDetails.localData != null &&
-        isCompanyDetailsCompleted(fileState, companyView, primaryContact)) {
-        completedSteps.push('company_details');
-    }
+        isCompanyDetailsCompleted(fileState, companyView, primaryContact);
     const officerIndex = companyOfficers.length > 0
         ? Object.values(companyOfficerLocalData).findIndex((officer) => officer?.isSelectedForVerification === true)
         : 0;
     const selectedOfficerType = `Officer_${officerIndex < 0 ? 1 : officerIndex + 1}`;
-    if (companyOfficerLocalData[selectedOfficerType] != null &&
-        isOfficerDetailsCompleted(companyOfficers, companyOfficerRoles, companyOfficerLocalData[selectedOfficerType], fileState)) {
-        completedSteps.push('company_officer');
+    const isOfficerDone = companyOfficerLocalData[selectedOfficerType] != null &&
+        isOfficerDetailsCompleted(companyOfficers, companyOfficerRoles, companyOfficerLocalData[selectedOfficerType], fileState);
+    // The verification step (single sidebar step) is only "complete" once both
+    // the company-officer and company-details sub-steps are fully filled in.
+    if (isCompanyDetailsDone && isOfficerDone) {
+        completedSteps.push('verification');
     }
     const { allStepsData, requiredStepsData } = onboardingStepsData(isValidConnection, currentTenant?.productSettings ?? [], accountingConnectionCreationMode);
     const allRequiredStepsCompleted = requiredStepsData.every((step) => {
@@ -119,6 +121,7 @@ export function getOnboardingCustomerView(state, companyId) {
     return {
         companyDetailsLocalData,
         companyOfficerLocalData,
+        parsingDocumentFileIds,
         subscriptionBillingAddress: subscriptionBillingAddress?.addressToCreate,
         companyView,
         allNationalityCountries,
@@ -127,6 +130,7 @@ export function getOnboardingCustomerView(state, companyId) {
             officer: isOfficerDetailsSavePending(companyOfficers, companyOfficerRoles, fileState, companyOfficerLocalData[selectedOfficerType]),
         },
         currentStep,
+        currentSubStep,
         completedSteps,
         halfCompletedSteps,
         allRequiredStepsCompleted,
@@ -203,14 +207,20 @@ export function isOfficerDetailsCompleted(companyOfficers, companyOfficerRoles,
         isPhoneVerified === true);
 }
 export const onboardingStepsData = (isValidConnection, productSettings, accountingConnectionCreationMode) => {
-    const allStepsData = accountingConnectionCreationMode === 'zeni_user' ||
-        ((productSettings.isBankingEnabled || productSettings.isCardsEnabled) &&
-            !productSettings.isBookkeepingEnabled)
+    // 3 cohorts:
+    //   - Core-only (banking/cards, no bookkeeping): no ledger, no integrations.
+    //   - Zeni-team-connects-QBO bookkeeping: skip ledger but keep integrations
+    //     so the customer can still wire up Plaid / Stripe / HubSpot / email.
+    //   - Customer-connects-QBO bookkeeping: full 4-step flow.
+    const isCoreOnlyTenant = (productSettings.isBankingEnabled || productSettings.isCardsEnabled) &&
+        !productSettings.isBookkeepingEnabled;
+    const allStepsData = isCoreOnlyTenant
         ? ALL_ZENI_USER_ONBOARDING_STEPS
-        : ALL_ONBOARDING_STEPS;
+        : accountingConnectionCreationMode === 'zeni_user'
+            ? ALL_ZENI_USER_BOOKKEEPING_ONBOARDING_STEPS
+            : ALL_ONBOARDING_STEPS;
     const requiredStepsData = (accountingConnectionCreationMode === 'zeni_user' && isValidConnection) ||
-        ((productSettings.isBankingEnabled || productSettings.isCardsEnabled) &&
-            !productSettings.isBookkeepingEnabled)
+        isCoreOnlyTenant
         ? ZENI_USER_REQUIRED_ONBOARDING_STEPS
         : REQUIRED_ONBOARDING_STEPS;
     return {
@@ -323,3 +333,11 @@ export const getProductSettingsString = (productSettings) => {
         .map((key) => productKeyMap[key])
         .join(',');
 };
+const fromActivationView = (state) => 
+// Fall back to the empty subview so state hydrated from an older persisted
+// version (before aiAgentsActivation existed) doesn't crash on .phases/.counts.
+state.onboardingCustomerViewState.aiAgentsActivation ??
+    emptyAiAgentsActivationSubview;
+export const getAiAgentsActivationSubview = (state) => fromActivationView(state);
+export const getAiAgentsActivationPhases = (state) => fromActivationView(state).phases;
+export const getAiAgentsActivationCounts = (state) => fromActivationView(state).counts;

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

@@ -1,28 +1,67 @@
 import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
-export const ZENI_USER_REQUIRED_ONBOARDING_STEPS = [
-    'link_payment_account',
-];
+// Onboarding steps are the 4 top-level surfaces. Officer + details verification
+// live as sub-steps under `verification` (state machine in CustomerOnboardingPage).
+// The optional data-source step is its own surface; the legacy connect-data-source
+// sub-step under the old `qbo_connection` no longer exists.
+export const ZENI_USER_REQUIRED_ONBOARDING_STEPS = ['setup_billing'];
 export const CUSTOMER_REQUIRED_ONBOARDING_STEPS_WITH_QBO = [
-    'qbo_connection',
+    'connect_ledger',
 ];
 export const REQUIRED_ONBOARDING_STEPS = [
     ...ZENI_USER_REQUIRED_ONBOARDING_STEPS,
     ...CUSTOMER_REQUIRED_ONBOARDING_STEPS_WITH_QBO,
 ];
 export const ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT = [
-    'company_officer',
-    'company_details',
+    'verification',
 ];
 export const ALL_ZENI_USER_ONBOARDING_STEPS = [
     ...ZENI_USER_REQUIRED_ONBOARDING_STEPS,
     ...ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT,
 ];
+// Zeni-team-connects-QBO bookkeeping tenants: skip the `connect_ledger` step
+// (Zeni already did it) but keep `connect_data_source` so the customer can
+// still wire up non-QBO integrations (Plaid, Stripe, HubSpot, email, etc.).
+export const ALL_ZENI_USER_BOOKKEEPING_ONBOARDING_STEPS = [
+    ...ZENI_USER_REQUIRED_ONBOARDING_STEPS,
+    'connect_data_source',
+    ...ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT,
+];
 export const ALL_CUSTOMER_ONBOARDING_STEPS_WITH_QBO = [
     ...CUSTOMER_REQUIRED_ONBOARDING_STEPS_WITH_QBO,
+    'connect_data_source',
     ...ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT,
 ];
 export const ALL_ONBOARDING_STEPS = [
     ...REQUIRED_ONBOARDING_STEPS,
+    'connect_data_source',
     ...ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT,
 ];
 export const toOnboardingStepType = (v) => stringToUnion(v, ALL_ONBOARDING_STEPS);
+// Per-step sub-state. Lives in Redux so the save epic can tell, for example,
+// an officer-form save from a company-details save while both share
+// currentStep = 'verification'.
+//   - 'default'           generic landing sub-state.
+//   - 'ai-activating'     connect_ledger interstitial during AI activation.
+//   - 'unlock-stack'      verification landing — VerifyUnlockFinancialStackPage.
+//   - 'company_officer'   verification → officer form.
+//   - 'company_details'   verification → company details form.
+export const ALL_ONBOARDING_SUB_STEPS = [
+    'default',
+    'ai-activating',
+    'unlock-stack',
+    'company_officer',
+    'company_details',
+];
+export const toOnboardingSubStepType = (v) => stringToUnion(v, ALL_ONBOARDING_SUB_STEPS);
+export const emptyAiAgentsActivationCounts = {
+    customerCount: 0,
+    glAccountCount: 0,
+    targetTransactionCount: 0,
+    transactionCount: 0,
+    vendorCount: 0,
+};
+export const emptyAiAgentsActivationSubview = {
+    counts: emptyAiAgentsActivationCounts,
+    fetchStatus: { fetchState: 'Not-Started', error: undefined },
+    phases: [],
+};

package/lib/esm/view/people/initializeEditPersonEpic.js

@@ -1,5 +1,7 @@
 import { from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
+import { filterChargeCardRolesWhenProductDisabled } from '../../entity/company/cardsVisibilityHelpers';
+import { getCurrentTenant } from '../../entity/tenant/tenantSelector';
 import { getUserByUserId } from '../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../entity/userRole/userRoleSelector';
 import { initializeEditPerson, peopleSaveDataInLocalStore, } from './peopleReducer';
@@ -18,11 +20,13 @@ export const initializeEditPersonEpic = (actions$, state$) => actions$.pipe(filt
         };
         const email = person.user?.email;
         const { userRoles, managerUserId: managerId, accountingClassIDs, } = person.userRole;
+        const currentTenant = getCurrentTenant(state$.value);
+        const rolesForLocalStore = filterChargeCardRolesWhenProductDisabled(userRoles, currentTenant.company);
         fetchActions.push(peopleSaveDataInLocalStore({
             peopleLocalData: [
                 {
                     email: email != null ? [email] : [],
-                    role: userRoles,
+                    role: rolesForLocalStore,
                     managerId,
                     departmentId: accountingClassIDs[0],
                 },

package/lib/esm/view/people/invitePeopleEpic.js

@@ -1,6 +1,8 @@
 import { of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { filterChargeCardRolesWhenProductDisabled } from '../../entity/company/cardsVisibilityHelpers';
 import { openSnackbar } from '../../entity/snackbar/snackbarReducer';
+import { getCurrentTenant } from '../../entity/tenant/tenantSelector';
 import { updateAllUsers } from '../../entity/user/userReducer';
 import { updateUserRoles } from '../../entity/userRole/userRoleReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
@@ -8,7 +10,8 @@ import { updateManagersListOnRoleChange, } from './helpers/updateManagersListOnR
 import { invitePeople, invitePeopleFailure, invitePeopleSuccess, } from './peopleReducer';
 export const invitePeopleEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(invitePeople.match), switchMap(() => {
     const peopleLocalData = state$.value.peopleState.personDetails.localData;
-    const invitePayload = toInvitePayloadFromLocalData(peopleLocalData);
+    const currentTenant = getCurrentTenant(state$.value);
+    const invitePayload = toInvitePayloadFromLocalData(peopleLocalData, currentTenant.company);
     return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/invites`, invitePayload)
         .pipe(mergeMap((response) => {
@@ -31,11 +34,11 @@ export const invitePeopleEpic = (actions$, state$, zeniAPI) => actions$.pipe(fil
         }
     }), catchError((error) => of(invitePeopleFailure(createZeniAPIStatus('Unexpected error', 'User Roles REST API call errored out' + JSON.stringify(error))))));
 }));
-const toInvitePayloadFromLocalData = (peopleLocalData) => {
+const toInvitePayloadFromLocalData = (peopleLocalData, company) => {
     const invitedPeople = peopleLocalData
         .map((local) => {
         const rolesPayload = {};
-        local.role.forEach((role) => {
+        filterChargeCardRolesWhenProductDisabled(local.role, company).forEach((role) => {
             rolesPayload[`is_${role}`] = true;
         });
         return local.email.map((mail) => {

package/lib/esm/view/people/peopleSaveUpdatesEpic.js

@@ -1,6 +1,8 @@
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { filterChargeCardRolesWhenProductDisabled } from '../../entity/company/cardsVisibilityHelpers';
 import { openSnackbar } from '../../entity/snackbar/snackbarReducer';
+import { getCurrentTenant } from '../../entity/tenant/tenantSelector';
 import { updateUserRoles } from '../../entity/userRole/userRoleReducer';
 import { hasZeniRoleOrCompanyOfficerAccess } from '../../entity/userRole/userRoleType';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
@@ -10,7 +12,8 @@ export const peopleSaveUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pip
     const { localData, person } = state$.value.peopleState.personDetails;
     const { userRole } = person;
     const { isZeniTenant } = action.payload;
-    const updatesPayload = toPersonUpdatableInfoPayload(localData[0], isZeniTenant, person);
+    const currentTenant = getCurrentTenant(state$.value);
+    const updatesPayload = toPersonUpdatableInfoPayload(localData[0], isZeniTenant, person, currentTenant.company);
     return zeniAPI
         .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/user-roles/${userRole.userRoleId}`, updatesPayload)
         .pipe(mergeMap((response) => {
@@ -37,7 +40,7 @@ export const peopleSaveUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pip
         }
     }), catchError((error) => of(peopleSaveUpdatesFailure(createZeniAPIStatus('Unexpected error', 'User Roles save updates errored out' + JSON.stringify(error))))));
 }));
-const toPersonUpdatableInfoPayload = (info, isZeniTenant, person) => {
+const toPersonUpdatableInfoPayload = (info, isZeniTenant, person, company) => {
     const payload = {};
     const { accountingClassIDs, managerUserId, userRoles } = person.userRole;
     if (info.departmentId != null &&
@@ -52,6 +55,7 @@ const toPersonUpdatableInfoPayload = (info, isZeniTenant, person) => {
             info.managerId !== 'no_manager' ? info.managerId : null;
     }
     if (info.role != null) {
+        const rolesForUpdate = filterChargeCardRolesWhenProductDisabled(info.role, company);
         /**
          * Mark previously selected roles as false and new roles true
          */
@@ -62,7 +66,7 @@ const toPersonUpdatableInfoPayload = (info, isZeniTenant, person) => {
             }
             rolesPayload[`is_${role}`] = false;
         });
-        info.role.forEach((role) => {
+        rolesForUpdate.forEach((role) => {
             rolesPayload[`is_${role}`] = true;
         });
         Object.assign(payload, rolesPayload);

package/lib/esm/view/settingsView/settingsViewHelpers.js

@@ -1,3 +1,4 @@
+import { isCardsProductEnabledOnCompany } from '../../entity/company/cardsVisibilityHelpers';
 import { isTenantAccountingServicesEnabled, isTenantBankingOnly, isTenantCardsOnly, } from '../../entity/tenant/tenantSelector';
 import { hasAnyAdminLevelAccess, hasBillPayAccessible, hasBookKeepingAdminLevelAccess, hasBookKeepingUserLevelAccess, hasChargeCardAccessible, hasFullOrAdminLevelAccess, hasInvestorBankerLevelAccess, hasReimbursementAccess, hasReimbursementAccessible, hasSuperAdminLevelAccess, hasZeniAccountsAccessible, isZeniSignedInUser, } from '../../entity/userRole/userRoleType';
 import { isVendorsTabVisible } from '../vendorList/vendorListSelector';
@@ -57,7 +58,8 @@ export const isBankConnectionsTabVisible = (currentTenant, userRoleMap) => {
         return (hasBillPayAccessible(currentTenant, userRoleMap) ||
             hasReimbursementAccessible(currentTenant, userRoleMap) ||
             hasZeniAccountsAccessible(currentTenant, userRoleMap) ||
-            hasChargeCardAccessible(currentTenant, userRoleMap));
+            (hasChargeCardAccessible(currentTenant, userRoleMap) &&
+                isCardsProductEnabledOnCompany(currentTenant.company)));
     }
     else {
         return false;
@@ -71,7 +73,8 @@ export const isBusinessVerificationTabVisible = (currentTenant, userRoleMap) =>
         return (hasBillPayAccessible(currentTenant, userRoleMap) ||
             hasReimbursementAccessible(currentTenant, userRoleMap) ||
             hasZeniAccountsAccessible(currentTenant, userRoleMap) ||
-            hasChargeCardAccessible(currentTenant, userRoleMap));
+            (hasChargeCardAccessible(currentTenant, userRoleMap) &&
+                isCardsProductEnabledOnCompany(currentTenant.company)));
     }
     else {
         return false;

package/lib/esm/view/spendManagement/autotransferRules/autoTransferRulesSelector.js

@@ -1,10 +1,29 @@
 import recordGet from 'lodash/get';
 import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
-import { getAllFundingAccounts, } from '../commonSetup/setupViewSelector';
+import { getDepositAccountByDepositAccountId } from '../../../entity/depositAccount/depositAccountSelector';
+import { getAllFundingAccounts, mapDepositAccToFundingAccount, } from '../commonSetup/setupViewSelector';
 import { getAllDepositAccounts } from '../zeniAccounts/depositAccountList/depositAccountListSelector';
 import { getAllPaymentAccounts } from '../zeniAccounts/paymentAccountList/paymentAccountListSelector';
+const buildCashManagementRule = (autoSweepFlowState, depositAccountState, treasuryDetailState) => {
+    const { settingsId, bufferAmount, frequency, memo, primaryFundingAccountId, nextTransferDate, } = autoSweepFlowState;
+    if (settingsId == null || primaryFundingAccountId == null) {
+        return undefined;
+    }
+    const depositAccount = getDepositAccountByDepositAccountId(depositAccountState, primaryFundingAccountId);
+    return {
+        bufferAmount,
+        frequency,
+        memo,
+        settingsId,
+        primaryFundingAccount: depositAccount != null
+            ? mapDepositAccToFundingAccount(depositAccount)
+            : undefined,
+        treasurySummary: treasuryDetailState.accountSummary,
+        nextTransferDate,
+    };
+};
 export const getAutoTransferRules = (state) => {
-    const { autotransferRulesState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, treasuryDetailState, } = state;
+    const { autotransferRulesState, autoSweepFlowState, depositAccountState, paymentAccountState, depositAccountListState, paymentAccountListState, treasuryDetailState, } = state;
     const { rules, error, historyByRuleId, ruleUpdateLocalData, ruleUpdateStatusById, ruleDeleteStatusById, createRuleFetchState, autoTransferReviewDetail, } = autotransferRulesState;
     const depositAccountsView = getAllDepositAccounts(depositAccountState, depositAccountListState);
     const paymentAccountsView = getAllPaymentAccounts(paymentAccountState, paymentAccountListState);
@@ -39,6 +58,7 @@ export const getAutoTransferRules = (state) => {
         transferMoneyParties,
         transferMoneyPartiesFetchState,
         createRuleFetchState,
+        cashManagementRule: buildCashManagementRule(autoSweepFlowState, depositAccountState, treasuryDetailState),
         fetchState,
         error,
         version: 0,

package/lib/esm/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -52,6 +52,12 @@ export const getReviewPageBillDetail = (state, billId) => {
     let recurringConfig;
     let billPayInfo;
     let isBillMarkedForRetry = false;
+    // Bill-level accounting class id. Approval Rules 3.0 'department'
+    // criteria match against this. Sourced from BillTransaction so
+    // any selector that needs it (e.g. creator-as-approver lookup)
+    // can read it off the view rather than reaching into
+    // 'state.billTransactionState' itself.
+    let classId;
     const zeniAssistRetryStatus = billId != null
         ? billDetailViewState.billDetailById[key].zeniAssist.retryStatus
         : undefined;
@@ -62,6 +68,13 @@ export const getReviewPageBillDetail = (state, billId) => {
             transaction?.billPayInfo.isCollectToAccountInfoFromVendorContact ?? false;
         isRecurring = transaction?.isRecurring ?? false;
         billPayInfo = transaction?.billPayInfo;
+        // Normalise empty-string to undefined so downstream readers
+        // treat "no class" uniformly regardless of whether the wire
+        // used '' or omitted the field.
+        classId =
+            transaction?.classId != null && transaction.classId !== ''
+                ? transaction.classId
+                : undefined;
         if (isRecurring &&
             transaction?.recurringBillConfigId != null &&
             transaction.recurringBillInstance != null) {
@@ -178,5 +191,6 @@ export const getReviewPageBillDetail = (state, billId) => {
         zeniAssistRetryStatus,
         billPayInfo,
         outsideZeniPaymentInfo,
+        classId,
     };
 };

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js

@@ -13,6 +13,7 @@ export const initialState = {
     newApprovalRuleId: undefined,
     approvalRulesDeleteStatusById: {},
     billPaySetupApproverViewUpdateData: undefined,
+    reorderStatus: { fetchState: 'Not-Started', error: undefined },
     hasValidState() {
         return this.fetchState === 'Completed';
     },
@@ -26,8 +27,13 @@ const billPaySetupApproverView = createSlice({
                 draft.fetchState = 'In-Progress';
                 draft.error = undefined;
             },
-            prepare(cacheOverride = false, includeUserRoles = true) {
-                return { payload: { cacheOverride, includeUserRoles } };
+            // Approval Rules 3.0 — `useV3` arrives from the screen connector
+            // ('approval_rule_v3_config' dynamic config) and picks the v1
+            // vs v2 endpoint in the fetch epic. Required (no default) so a
+            // missing screen-connector wire surfaces at compile time rather
+            // than silently falling back to v1 on a v3 tenant.
+            prepare(cacheOverride = false, includeUserRoles = true, useV3) {
+                return { payload: { cacheOverride, includeUserRoles, useV3 } };
             },
         },
         fetchBillPaySetupApproverViewSuccess: {
@@ -112,8 +118,12 @@ const billPaySetupApproverView = createSlice({
                     error: undefined,
                 };
             },
-            prepare(approvalRuleId) {
-                return { payload: { approvalRuleId } };
+            // Approval Rules 3.0 — `useV3` flows from the screen connector
+            // ('approval_rule_v3_config' dynamic config) so the delete epic
+            // can pick the v1 vs v2 endpoint. Required (no default) so a
+            // missing connector wire surfaces at compile time.
+            prepare(approvalRuleId, useV3) {
+                return { payload: { approvalRuleId, useV3 } };
             },
         },
         deleteBillPayApprovalRuleSuccess: {
@@ -145,13 +155,100 @@ const billPaySetupApproverView = createSlice({
                 };
             },
         },
-        saveBillPaySetupApproverViewUpdates(draft) {
-            if (draft.billPaySetupApproverViewUpdateData != null) {
-                draft.billPaySetupApproverViewUpdateData.updateStatus = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            }
+        /**
+         * Approval Rules 3.0 — list-page drag-and-drop reorder.
+         *
+         * The trigger action carries the desired ordering as an ID list.
+         * The reducer optimistically replaces 'approvalRuleIds' so the
+         * list page renders the new order immediately; the epic then
+         * fires the PUT and either confirms (success — pulls updated
+         * priorities from the response) or recovers (failure — refetches
+         * the view so we don't strand a stale local order).
+         */
+        reorderBillPayApprovalRules: {
+            reducer(draft, action) {
+                const { approvalRuleIds } = action.payload;
+                const wasReorderInFlight = draft.reorderStatus.fetchState === 'In-Progress';
+                draft.reorderStatus = { fetchState: 'In-Progress', error: undefined };
+                // Stash the pre-reorder order so 'Failure' can restore it
+                // synchronously. The epic's refetch on failure remains as a
+                // safety net (covers cases where the server's truth has
+                // drifted from the local snapshot), but the snappy UX path
+                // is the in-memory rollback.
+                //
+                // Only capture a fresh snapshot when no reorder is already in
+                // flight. If a second drag fires before the first PUT lands,
+                // the existing snapshot already holds the last server-backed
+                // order; overwriting it with the first reorder's optimistic
+                // result would mean a Failure rolls back to an uncommitted
+                // intermediate order instead of the last good list.
+                if (!wasReorderInFlight) {
+                    draft.reorderRollbackIds = draft.approvalRuleIds;
+                }
+                // Optimistic: render new order immediately. On failure, the
+                // reducer restores 'reorderRollbackIds' and the epic refetch
+                // reconciles any drift.
+                draft.approvalRuleIds = approvalRuleIds;
+            },
+            // Approval Rules 3.0 — `useV3` required so a missing wire
+            // surfaces at compile time. The reorder epic always hits the
+            // v2 endpoint (v1 has no reorder route), but the payload still
+            // carries the flag for the failure-path refetch which needs it.
+            prepare(approvalRuleIds, useV3) {
+                return { payload: { approvalRuleIds, useV3 } };
+            },
+        },
+        reorderBillPayApprovalRulesSuccess: {
+            reducer(draft, action) {
+                const { approvalRuleIds } = action.payload;
+                draft.reorderStatus = { fetchState: 'Completed', error: undefined };
+                // The API response is authoritative — overwrite with the
+                // server's reported order in case it normalised anything.
+                draft.approvalRuleIds = approvalRuleIds;
+                // Reorder succeeded — discard the snapshot so the next
+                // reorder starts from this committed order.
+                draft.reorderRollbackIds = undefined;
+            },
+            prepare(approvalRuleIds) {
+                return { payload: { approvalRuleIds } };
+            },
+        },
+        reorderBillPayApprovalRulesFailure: {
+            reducer(draft, action) {
+                const { status } = action.payload;
+                draft.reorderStatus = { fetchState: 'Error', error: status };
+                // Restore the snapshot taken on the trigger reducer before
+                // the optimistic mutation. The epic still fires a refetch
+                // alongside the failure action for cross-tab drift recovery,
+                // but locally the user sees their last good order instantly.
+                if (draft.reorderRollbackIds != null) {
+                    draft.approvalRuleIds = draft.reorderRollbackIds;
+                    draft.reorderRollbackIds = undefined;
+                }
+            },
+            prepare(status) {
+                return { payload: { status } };
+            },
+        },
+        saveBillPaySetupApproverViewUpdates: {
+            // Approval Rules 3.0 — `useV3` is sourced from the
+            // `approval_rule_v3_config` dynamic config in the screen
+            // connector. The reducer doesn't read it (the field only
+            // matters in the save epic), but it must be declared so the
+            // action's payload type is correctly inferred for downstream
+            // consumers.
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            reducer(draft, _action) {
+                if (draft.billPaySetupApproverViewUpdateData != null) {
+                    draft.billPaySetupApproverViewUpdateData.updateStatus = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                }
+            },
+            prepare(useV3) {
+                return { payload: { useV3 } };
+            },
         },
         saveBillPaySetupApproverViewUpdatesSuccess: {
             reducer(draft, action) {
@@ -240,5 +337,5 @@ const billPaySetupApproverView = createSlice({
         },
     },
 });
-export const { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewSuccess, fetchBillPaySetupApproverViewFailure, fetchBillPayApproversDetails, fetchBillPayApproversList, fetchBillPayApproversListSuccess, fetchBillPayApproversListFailure, deleteBillPayApprovalRule, deleteBillPayApprovalRuleSuccess, deleteBillPayApprovalRuleFailure, saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesSuccess, saveBillPaySetupApproverViewUpdatesFailure, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, setListeningToPusherEvent, clearBillPaySetupApproverView, } = billPaySetupApproverView.actions;
+export const { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewSuccess, fetchBillPaySetupApproverViewFailure, fetchBillPayApproversDetails, fetchBillPayApproversList, fetchBillPayApproversListSuccess, fetchBillPayApproversListFailure, deleteBillPayApprovalRule, deleteBillPayApprovalRuleSuccess, deleteBillPayApprovalRuleFailure, reorderBillPayApprovalRules, reorderBillPayApprovalRulesSuccess, reorderBillPayApprovalRulesFailure, saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesSuccess, saveBillPaySetupApproverViewUpdatesFailure, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, setListeningToPusherEvent, clearBillPaySetupApproverView, } = billPaySetupApproverView.actions;
 export default billPaySetupApproverView.reducer;

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/deleteBillPayApprovalRuleEpic.js

@@ -6,9 +6,17 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { deleteBillPayApprovalRule, deleteBillPayApprovalRuleFailure, deleteBillPayApprovalRuleSuccess, } from '../billPaySetupApproverViewReducer';
 export const deleteBillPayApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteBillPayApprovalRule.match), switchMap((action) => {
-    const { approvalRuleId } = action.payload;
+    const { approvalRuleId, useV3 } = action.payload;
+    // Approval Rules 3.0 — flag-gated endpoint selection.
+    // Explicit `=== true` keeps `strict-boolean-expressions` happy
+    // when RTK's payload type widens to `any` in some configs.
+    const endpoint = useV3 === true
+        ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
+        : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
     return zeniAPI
-        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, { approval_rule_id: approvalRuleId })
+        .deleteAndGetJSON(endpoint, {
+        approval_rule_id: approvalRuleId,
+    })
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.js

@@ -6,7 +6,7 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewFailure, fetchBillPaySetupApproverViewSuccess, } from '../billPaySetupApproverViewReducer';
 export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBillPaySetupApproverView.match), switchMap((action) => {
-    const { cacheOverride } = action.payload;
+    const { cacheOverride, useV3 } = action.payload;
     const { billPaySetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = getApprovalRulesByIds(approvalRuleState, billPaySetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -14,9 +14,13 @@ export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) =>
             billPaySetupApproverViewState.approvalRuleIds.length ||
         (billPaySetupApproverViewState.hasValidState() === false &&
             billPaySetupApproverViewState.fetchState !== 'In-Progress')) {
-        return zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`)
-            .pipe(mergeMap((response) => {
+        // Approval Rules 3.0 — flag-gated endpoint selection.
+        // Explicit `=== true` keeps `strict-boolean-expressions` happy
+        // when RTK's payload type widens to `any` in some configs.
+        const endpoint = useV3 === true
+            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
+            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
+        return zeniAPI.getJSON(endpoint).pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
                 const actions = [

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/initializeBillPaySetupApproverViewUpdateDataEpic.js

@@ -1,6 +1,6 @@
 import { from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
-import { getApprovalRuleById } from '../../../../../entity/approvalRule/approvalRuleSelector';
+import { getAmountCriteria, getApprovalRuleById, getDepartmentCriteria, getVendorCriteria, } from '../../../../../entity/approvalRule/approvalRuleSelector';
 import { clearBillPaySetupApproverViewUpdateData, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, } from '../billPaySetupApproverViewReducer';
 export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => actions$.pipe(filter(initializeBillPaySetupApproverViewUpdateData.match), mergeMap((action) => {
     const { approvalRuleId } = action.payload;
@@ -8,16 +8,20 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state
     if (approvalRuleId != null) {
         const approvalRule = getApprovalRuleById(state$.value.approvalRuleState, approvalRuleId);
         if (approvalRule != null) {
-            const criteria = approvalRule.criteria[0];
-            const range = criteria?.range;
             const billPaySetupApproverViewUpdateData = {
                 approvalRuleId,
                 steps: approvalRule.steps,
                 criteria: {
-                    rangeType: criteria?.rangeType,
-                    rangeEntity: criteria?.rangeEntity,
-                    range,
+                    amount: getAmountCriteria(approvalRule.criteria),
+                    vendor: getVendorCriteria(approvalRule.criteria),
+                    department: getDepartmentCriteria(approvalRule.criteria),
                 },
+                // Approval Rules 3.0 — seed rule-level fields so the form can
+                // round-trip them on edit. Each may be undefined on legacy rules.
+                name: approvalRule.name,
+                description: approvalRule.description,
+                separationOfDuties: approvalRule.separationOfDuties,
+                isFallback: approvalRule.isFallback,
             };
             fetchActions.push(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewUpdateData));
         }
@@ -25,7 +29,7 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state
     else {
         const billPaySetupApproverViewCreateData = {
             steps: [],
-            criteria: undefined,
+            criteria: {},
         };
         fetchActions.push(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewCreateData));
     }