@zeniai/client-epic-state 5.1.0-betaSS3 → 5.1.1-beta0ND

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

@@ -1,5 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { date } from '../../../zeniDayJS';
+import { parseUploadedKybDocument, parseUploadedKybDocumentFailure, parseUploadedKycDocument, parseUploadedKycDocumentFailure, } from '../../spendManagement/commonSetup/kycKybAutofillActions';
+import { emptyAiAgentsActivationSubview, } from './onboardingCustomerViewState';
 const initialStatus = {
     fetchState: 'Not-Started',
     error: undefined,
@@ -9,61 +11,31 @@ export const initialState = {
     saveStatus: initialStatus,
     dashboardLoadedStatus: initialStatus,
     currentStep: 'link_payment_account',
+    parsingDocumentFileIds: [],
     companyDetails: {
+        autoFilledFields: [],
         localData: undefined,
     },
-    companyOfficerUpdateStatus: {
-        Officer_1: {
+    companyOfficerUpdateStatus: (() => {
+        const emptyOfficerSlot = {
+            autoFilledFields: [],
             localData: undefined,
             sendOtpStatus: initialStatus,
             otpverificationStatus: initialStatus,
-        },
-        Officer_2: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-        Officer_3: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-        Officer_4: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-        Officer_5: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-        Officer_6: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-        Officer_7: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-        Officer_8: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-        Officer_9: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-        Officer_10: {
-            localData: undefined,
-            sendOtpStatus: initialStatus,
-            otpverificationStatus: initialStatus,
-        },
-    },
+        };
+        return {
+            Officer_1: { ...emptyOfficerSlot },
+            Officer_2: { ...emptyOfficerSlot },
+            Officer_3: { ...emptyOfficerSlot },
+            Officer_4: { ...emptyOfficerSlot },
+            Officer_5: { ...emptyOfficerSlot },
+            Officer_6: { ...emptyOfficerSlot },
+            Officer_7: { ...emptyOfficerSlot },
+            Officer_8: { ...emptyOfficerSlot },
+            Officer_9: { ...emptyOfficerSlot },
+            Officer_10: { ...emptyOfficerSlot },
+        };
+    })(),
     primaryContactDetails: {},
     paymentAccountDetails: {
         fetchStatus: initialStatus,
@@ -91,6 +63,7 @@ export const initialState = {
     },
     fetchState: 'Not-Started',
     error: undefined,
+    aiAgentsActivation: { ...emptyAiAgentsActivationSubview },
     uiState: {
         isQBOPopupOpen: false,
         isCardPaymentPopupOpen: false,
@@ -180,6 +153,126 @@ const onboardingCustomerView = createSlice({
                 };
             },
         },
+        acknowledgeOnboardingAiFinanceTeam: {
+            reducer(draft) {
+                draft.aiFinanceTeamAcknowledgementStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(companyId) {
+                return {
+                    payload: { companyId },
+                };
+            },
+        },
+        acknowledgeOnboardingAiFinanceTeamSuccess(draft) {
+            draft.aiFinanceTeamAcknowledgementStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        acknowledgeOnboardingAiFinanceTeamFailure: {
+            reducer(draft, action) {
+                draft.aiFinanceTeamAcknowledgementStatus = {
+                    fetchState: 'Error',
+                    error: action.payload,
+                };
+            },
+            prepare(error) {
+                return {
+                    payload: error,
+                };
+            },
+        },
+        acknowledgeOnboardingAiActivationViewed: {
+            reducer(draft) {
+                draft.aiActivationViewedAcknowledgementStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(companyId) {
+                return {
+                    payload: { companyId },
+                };
+            },
+        },
+        acknowledgeOnboardingAiActivationViewedSuccess(draft) {
+            draft.aiActivationViewedAcknowledgementStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        acknowledgeOnboardingAiActivationViewedFailure: {
+            reducer(draft, action) {
+                draft.aiActivationViewedAcknowledgementStatus = {
+                    fetchState: 'Error',
+                    error: action.payload,
+                };
+            },
+            prepare(error) {
+                return {
+                    payload: error,
+                };
+            },
+        },
+        fetchAiAgentsActivationStatus(draft) {
+            draft.aiAgentsActivation.fetchStatus = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+        },
+        fetchAiAgentsActivationStatusSuccess: {
+            reducer(draft, action) {
+                draft.aiAgentsActivation.fetchStatus = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+                draft.aiAgentsActivation.phases = action.payload.phases;
+                draft.aiAgentsActivation.counts = action.payload.counts;
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
+        fetchAiAgentsActivationStatusFailure: {
+            reducer(draft, action) {
+                draft.aiAgentsActivation.fetchStatus = {
+                    fetchState: 'Error',
+                    error: action.payload,
+                };
+            },
+            prepare(error) {
+                return { payload: error };
+            },
+        },
+        aiAgentsActivationCountsUpdated: {
+            reducer(draft, action) {
+                draft.aiAgentsActivation.counts = {
+                    ...draft.aiAgentsActivation.counts,
+                    ...action.payload,
+                };
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
+        aiAgentsActivationPhaseChanged: {
+            reducer(draft, action) {
+                const target = draft.aiAgentsActivation.phases;
+                const index = target.findIndex((phase) => phase.key === action.payload.key);
+                if (index === -1) {
+                    target.push(action.payload);
+                }
+                else {
+                    target[index] = { ...target[index], ...action.payload };
+                }
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
         updateOnboardingCustomerViewDashboardLoaded: {
             reducer(draft) {
                 draft.dashboardLoadedStatus = {
@@ -592,7 +685,82 @@ const onboardingCustomerView = createSlice({
         clearOnboardingCustomerView(draft) {
             Object.assign(draft, initialState);
         },
+        /** Merge AI-parsed officer fields into the officer's onboarding localData. */
+        applyKycDocumentAutofillForOnboarding: {
+            reducer(draft, action) {
+                const { officerType, values, autoFilledFieldNames, fileId } = action.payload;
+                const slot = draft.companyOfficerUpdateStatus[officerType];
+                slot.localData = Object.assign({}, slot.localData, values);
+                slot.autoFilledFields = Array.from(new Set([...(slot.autoFilledFields ?? []), ...autoFilledFieldNames]));
+                draft.parsingDocumentFileIds = (draft.parsingDocumentFileIds ?? []).filter((id) => id !== fileId);
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
+        /** Merge AI-parsed company fields into companyDetails onboarding localData. */
+        applyKybDocumentAutofillForOnboarding: {
+            reducer(draft, action) {
+                const { values, autoFilledFieldNames, fileId } = action.payload;
+                draft.companyDetails.localData = Object.assign({}, draft.companyDetails.localData, values);
+                const prev = draft.companyDetails.autoFilledFields ?? [];
+                draft.companyDetails.autoFilledFields = Array.from(new Set([...prev, ...autoFilledFieldNames]));
+                draft.parsingDocumentFileIds = (draft.parsingDocumentFileIds ?? []).filter((id) => id !== fileId);
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
+        /** Wipe AI-autofill badges during onboarding. */
+        clearKycKybAutofillForOnboarding: {
+            reducer(draft, action) {
+                const { officerType } = action.payload;
+                if (officerType != null) {
+                    draft.companyOfficerUpdateStatus[officerType].autoFilledFields = [];
+                }
+                else {
+                    draft.companyDetails.autoFilledFields = [];
+                    Object.keys(draft.companyOfficerUpdateStatus).forEach((key) => {
+                        draft.companyOfficerUpdateStatus[key].autoFilledFields = [];
+                    });
+                }
+            },
+            prepare(payload = {}) {
+                return { payload };
+            },
+        },
+    },
+    extraReducers: (builder) => {
+        const addParsingFileId = (draft, fileId) => {
+            draft.parsingDocumentFileIds = draft.parsingDocumentFileIds ?? [];
+            if (!draft.parsingDocumentFileIds.includes(fileId)) {
+                draft.parsingDocumentFileIds.push(fileId);
+            }
+        };
+        const removeParsingFileId = (draft, fileId) => {
+            draft.parsingDocumentFileIds = (draft.parsingDocumentFileIds ?? []).filter((id) => id !== fileId);
+        };
+        builder.addCase(parseUploadedKycDocument, (draft, action) => {
+            if (action.payload.target === 'onboarding') {
+                addParsingFileId(draft, action.payload.fileId);
+            }
+        });
+        builder.addCase(parseUploadedKybDocument, (draft, action) => {
+            if (action.payload.target === 'onboarding') {
+                addParsingFileId(draft, action.payload.fileId);
+            }
+        });
+        builder.addCase(parseUploadedKycDocumentFailure, (draft, action) => {
+            if (action.payload.target === 'onboarding') {
+                removeParsingFileId(draft, action.payload.fileId);
+            }
+        });
+        builder.addCase(parseUploadedKybDocumentFailure, (draft, action) => {
+            if (action.payload.target === 'onboarding') {
+                removeParsingFileId(draft, action.payload.fileId);
+            }
+        });
     },
 });
-export const { fetchOnboardingCustomerView, fetchOnboardingCustomerSetupView, fetchOnboardingCustomerSetupViewSuccess, fetchOnboardingCustomerSetupViewFailure, updateOnboardingCustomerViewCompleteStatus, updateOnboardingCustomerViewCompleteStatusSuccess, updateOnboardingCustomerViewCompleteStatusFailure, updateOnboardingCustomerViewDashboardLoaded, updateOnboardingCustomerViewDashboardLoadedSuccess, updateOnboardingCustomerViewDashboardLoadedFailure, updateOnboardingCustomerView, updateOnboardingCustomerViewSuccess, updateOnboardingCustomerViewFailure, updateOnboardingPaymentAccountStatus, updateOnboardingPaymentAccountStatusSuccess, updateOnboardingPaymentAccountStatusFailure, updateOnboardingPaymentAccountLoginStatus, updateOnboardingPaymentAccountLoginStatusSuccess, updateOnboardingPaymentAccountLoginStatusFailure, establishOnboardingPlaidConnection, establishOnboardingPlaidConnectionSuccess, establishOnboardingPlaidConnectionFailure, getOnboardingPlaidLinkToken, getOnboardingPlaidLinkTokenSuccess, getOnboardingPlaidLinkTokenFailure, updateCurrentStep, updateOnboardingCustomerViewAccountDetails, updateOnboardingCustomerViewLocalStoreData, saveOnboardingCustomerViewDataInLocalStore, saveOnboardingCompnayOfficerPhoneInLocalStore, updateOnboardingCustomerViewUIState, sendOnboardingOfficerOtp, sendOnboardingOfficerOtpSuccess, sendOnboardingOfficerOtpFailure, resendOnboardingOfficerOtp, verifyOnboardingOfficerOtp, verifyOnboardingOfficerOtpSuccess, verifyOnboardingOfficerOtpFailure, clearOnboardingCustomerViewDataInLocalStore, clearOnboardingCustomerView, } = onboardingCustomerView.actions;
+export const { fetchOnboardingCustomerView, fetchOnboardingCustomerSetupView, fetchOnboardingCustomerSetupViewSuccess, fetchOnboardingCustomerSetupViewFailure, updateOnboardingCustomerViewCompleteStatus, updateOnboardingCustomerViewCompleteStatusSuccess, updateOnboardingCustomerViewCompleteStatusFailure, acknowledgeOnboardingAiFinanceTeam, acknowledgeOnboardingAiFinanceTeamSuccess, acknowledgeOnboardingAiFinanceTeamFailure, acknowledgeOnboardingAiActivationViewed, acknowledgeOnboardingAiActivationViewedSuccess, acknowledgeOnboardingAiActivationViewedFailure, fetchAiAgentsActivationStatus, fetchAiAgentsActivationStatusSuccess, fetchAiAgentsActivationStatusFailure, aiAgentsActivationCountsUpdated, aiAgentsActivationPhaseChanged, updateOnboardingCustomerViewDashboardLoaded, updateOnboardingCustomerViewDashboardLoadedSuccess, updateOnboardingCustomerViewDashboardLoadedFailure, updateOnboardingCustomerView, updateOnboardingCustomerViewSuccess, updateOnboardingCustomerViewFailure, updateOnboardingPaymentAccountStatus, updateOnboardingPaymentAccountStatusSuccess, updateOnboardingPaymentAccountStatusFailure, updateOnboardingPaymentAccountLoginStatus, updateOnboardingPaymentAccountLoginStatusSuccess, updateOnboardingPaymentAccountLoginStatusFailure, establishOnboardingPlaidConnection, establishOnboardingPlaidConnectionSuccess, establishOnboardingPlaidConnectionFailure, getOnboardingPlaidLinkToken, getOnboardingPlaidLinkTokenSuccess, getOnboardingPlaidLinkTokenFailure, updateCurrentStep, updateOnboardingCustomerViewAccountDetails, updateOnboardingCustomerViewLocalStoreData, saveOnboardingCustomerViewDataInLocalStore, saveOnboardingCompnayOfficerPhoneInLocalStore, updateOnboardingCustomerViewUIState, sendOnboardingOfficerOtp, sendOnboardingOfficerOtpSuccess, sendOnboardingOfficerOtpFailure, resendOnboardingOfficerOtp, verifyOnboardingOfficerOtp, verifyOnboardingOfficerOtpSuccess, verifyOnboardingOfficerOtpFailure, clearOnboardingCustomerViewDataInLocalStore, clearOnboardingCustomerView, applyKycDocumentAutofillForOnboarding, applyKybDocumentAutofillForOnboarding, clearKycKybAutofillForOnboarding, } = onboardingCustomerView.actions;
 export default onboardingCustomerView.reducer;

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_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, 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 &&
@@ -119,6 +120,7 @@ export function getOnboardingCustomerView(state, companyId) {
     return {
         companyDetailsLocalData,
         companyOfficerLocalData,
+        parsingDocumentFileIds,
         subscriptionBillingAddress: subscriptionBillingAddress?.addressToCreate,
         companyView,
         allNationalityCountries,
@@ -323,3 +325,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

@@ -26,3 +26,15 @@ export const ALL_ONBOARDING_STEPS = [
     ...ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT,
 ];
 export const toOnboardingStepType = (v) => stringToUnion(v, ALL_ONBOARDING_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/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 = [