@zeniai/client-epic-state 5.1.7 → 5.1.8

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

@@ -1,32 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toOnboardingStepType = exports.ALL_ONBOARDING_STEPS = exports.ALL_CUSTOMER_ONBOARDING_STEPS_WITH_QBO = exports.ALL_ZENI_USER_ONBOARDING_STEPS = exports.ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT = exports.REQUIRED_ONBOARDING_STEPS = exports.CUSTOMER_REQUIRED_ONBOARDING_STEPS_WITH_QBO = exports.ZENI_USER_REQUIRED_ONBOARDING_STEPS = void 0;
+exports.emptyAiAgentsActivationSubview = exports.emptyAiAgentsActivationCounts = exports.toOnboardingSubStepType = exports.ALL_ONBOARDING_SUB_STEPS = exports.toOnboardingStepType = exports.ALL_ONBOARDING_STEPS = exports.ALL_CUSTOMER_ONBOARDING_STEPS_WITH_QBO = exports.ALL_ZENI_USER_BOOKKEEPING_ONBOARDING_STEPS = exports.ALL_ZENI_USER_ONBOARDING_STEPS = exports.ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT = exports.REQUIRED_ONBOARDING_STEPS = exports.CUSTOMER_REQUIRED_ONBOARDING_STEPS_WITH_QBO = exports.ZENI_USER_REQUIRED_ONBOARDING_STEPS = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
-exports.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.
+exports.ZENI_USER_REQUIRED_ONBOARDING_STEPS = ['setup_billing'];
 exports.CUSTOMER_REQUIRED_ONBOARDING_STEPS_WITH_QBO = [
-    'qbo_connection',
+    'connect_ledger',
 ];
 exports.REQUIRED_ONBOARDING_STEPS = [
     ...exports.ZENI_USER_REQUIRED_ONBOARDING_STEPS,
     ...exports.CUSTOMER_REQUIRED_ONBOARDING_STEPS_WITH_QBO,
 ];
 exports.ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT = [
-    'company_officer',
-    'company_details',
+    'verification',
 ];
 exports.ALL_ZENI_USER_ONBOARDING_STEPS = [
     ...exports.ZENI_USER_REQUIRED_ONBOARDING_STEPS,
     ...exports.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.).
+exports.ALL_ZENI_USER_BOOKKEEPING_ONBOARDING_STEPS = [
+    ...exports.ZENI_USER_REQUIRED_ONBOARDING_STEPS,
+    'connect_data_source',
+    ...exports.ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT,
+];
 exports.ALL_CUSTOMER_ONBOARDING_STEPS_WITH_QBO = [
     ...exports.CUSTOMER_REQUIRED_ONBOARDING_STEPS_WITH_QBO,
+    'connect_data_source',
     ...exports.ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT,
 ];
 exports.ALL_ONBOARDING_STEPS = [
     ...exports.REQUIRED_ONBOARDING_STEPS,
+    'connect_data_source',
     ...exports.ALL_ZENI_USER_ONBOARDING_STEPS_WITHOUT_ACCOUNT,
 ];
 const toOnboardingStepType = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.ALL_ONBOARDING_STEPS);
 exports.toOnboardingStepType = toOnboardingStepType;
+// 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.
+exports.ALL_ONBOARDING_SUB_STEPS = [
+    'default',
+    'ai-activating',
+    'unlock-stack',
+    'company_officer',
+    'company_details',
+];
+const toOnboardingSubStepType = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.ALL_ONBOARDING_SUB_STEPS);
+exports.toOnboardingSubStepType = toOnboardingSubStepType;
+exports.emptyAiAgentsActivationCounts = {
+    customerCount: 0,
+    glAccountCount: 0,
+    targetTransactionCount: 0,
+    transactionCount: 0,
+    vendorCount: 0,
+};
+exports.emptyAiAgentsActivationSubview = {
+    counts: exports.emptyAiAgentsActivationCounts,
+    fetchStatus: { fetchState: 'Not-Started', error: undefined },
+    phases: [],
+};

package/lib/view/people/peopleTypes.d.ts

@@ -1,3 +1,3 @@
-declare const toPeopleSortKeyType: (v: string) => "role" | "manager" | "name" | "department" | "lastSeen";
+declare const toPeopleSortKeyType: (v: string) => "department" | "name" | "role" | "manager" | "lastSeen";
 export type PeopleViewSortKey = ReturnType<typeof toPeopleSortKeyType>;
 export {};

package/lib/view/scheduleView/scheduleListView/scheduleListTypes.d.ts

@@ -7,7 +7,7 @@ export declare const getScheduleListKey: (selectedCategory: ID, selectedTimefram
 export type ScheduleListKey = ReturnType<typeof getScheduleListKey>;
 export declare const toScheduleSubTabType: (v: string) => "completed" | "new" | "ongoing" | "all";
 export type ScheduleSubTabType = ReturnType<typeof toScheduleSubTabType>;
-declare const toScheduleSortKeyType: (v: string) => "months" | "amount" | "vendor" | "status" | "user" | "createTime" | "class" | "memo" | "balanceAsOfToday" | "transactionDate" | "transactionType" | "assetId" | "scheduleCategory" | "startMonth" | "accruedExpenseCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "endMonth";
+declare const toScheduleSortKeyType: (v: string) => "months" | "amount" | "vendor" | "status" | "class" | "user" | "createTime" | "memo" | "balanceAsOfToday" | "transactionDate" | "transactionType" | "assetId" | "scheduleCategory" | "startMonth" | "accruedExpenseCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "endMonth";
 export declare type ScheduleListSortKey = ReturnType<typeof toScheduleSortKeyType>;
 export interface DownloadJEScheduleTabOptions {
     categoryId: ID;

package/lib/view/spendManagement/autotransferRules/autoTransferRulesSelector.d.ts

@@ -6,7 +6,7 @@ import { FundingAccount } from '../commonSetup/setupViewSelector';
 import { TreasuryAccount } from '../treasury/treasuryTransferMoney/treasuryTransferMoneyState';
 import { ReviewTransferDetail } from '../zeniAccounts/transferDetail/transferDetailState';
 import { AutoTransferRuleLocalData } from './autoTransferRulesPayload';
-import { AutoTransferRule } from './autoTransferRulesState';
+import { AutoTransferRule, CashManagementRule } from './autoTransferRulesState';
 export interface AutoTransferRulesSelectorView extends SelectorView {
     autoTransferReviewDetail: ReviewTransferDetail;
     createRuleFetchState: FetchStateAndError;
@@ -17,6 +17,13 @@ export interface AutoTransferRulesSelectorView extends SelectorView {
     transferMoneyParties: FundingAccount[];
     transferMoneyPartiesFetchState: FetchState;
     treasuryAccount: TreasuryAccount;
+    /**
+     * The user's saved auto-sweep cash-management config, surfaced here so the
+     * rules list page can render it alongside the auto-transfer rules.
+     * `undefined` when the user hasn't saved auto-sweep settings yet
+     * (i.e. `autoSweepFlowState.settingsId == null`).
+     */
+    cashManagementRule?: CashManagementRule;
     ruleHistory?: Record<string, CommonHistoryView>;
 }
 export declare const getAutoTransferRules: (state: RootState) => AutoTransferRulesSelectorView;

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

@@ -6,11 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAutoTransferRuleHistory = exports.getAutoTransferRuleById = exports.getAutoTransferRules = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
+const depositAccountSelector_1 = require("../../../entity/depositAccount/depositAccountSelector");
 const setupViewSelector_1 = require("../commonSetup/setupViewSelector");
 const depositAccountListSelector_1 = require("../zeniAccounts/depositAccountList/depositAccountListSelector");
 const paymentAccountListSelector_1 = require("../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 = (0, depositAccountSelector_1.getDepositAccountByDepositAccountId)(depositAccountState, primaryFundingAccountId);
+    return {
+        bufferAmount,
+        frequency,
+        memo,
+        settingsId,
+        primaryFundingAccount: depositAccount != null
+            ? (0, setupViewSelector_1.mapDepositAccToFundingAccount)(depositAccount)
+            : undefined,
+        treasurySummary: treasuryDetailState.accountSummary,
+        nextTransferDate,
+    };
+};
 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 = (0, depositAccountListSelector_1.getAllDepositAccounts)(depositAccountState, depositAccountListState);
     const paymentAccountsView = (0, paymentAccountListSelector_1.getAllPaymentAccounts)(paymentAccountState, paymentAccountListState);
@@ -45,6 +64,7 @@ const getAutoTransferRules = (state) => {
         transferMoneyParties,
         transferMoneyPartiesFetchState,
         createRuleFetchState,
+        cashManagementRule: buildCashManagementRule(autoSweepFlowState, depositAccountState, treasuryDetailState),
         fetchState,
         error,
         version: 0,

package/lib/view/spendManagement/autotransferRules/autoTransferRulesState.d.ts

@@ -1,6 +1,10 @@
+import { Amount } from '../../../commonStateTypes/amount';
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { ZeniDate } from '../../../zeniDayJS';
+import { AutoSweepFrequency } from '../cashManagement/autoSweepFlow/autoSweepFlowState';
 import { CommonHistoryView } from '../commonHistoryView/commonHistory';
+import { FundingAccount } from '../commonSetup/setupViewSelector';
+import { TreasurySummaryWithBalance } from '../treasury/treasuryList/treasuryDetailState';
 import { ReviewTransferDetail } from '../zeniAccounts/transferDetail/transferDetailState';
 import { AutoTransferRuleFrequency, AutoTransferRuleLocalData, AutoTransferRuleType } from './autoTransferRulesPayload';
 export interface AutoTransferRule {
@@ -27,6 +31,24 @@ export interface DestinationBankAccountMetadata {
     accountType: string;
     percentage: number;
 }
+/**
+ * Render-ready view of the user's auto-sweep cash-management config,
+ * surfaced alongside `AutoTransferRule[]` in `AutoTransferRulesSelectorView`.
+ * Kept as a distinct shape (not folded into `AutoTransferRule`) so the rules
+ * list can special-case its rendering without polluting the rule type union.
+ *
+ * Present only when `autoSweepFlowState.settingsId` is set — i.e. the user
+ * has saved their auto-sweep settings at least once.
+ */
+export interface CashManagementRule {
+    bufferAmount: Amount;
+    frequency: AutoSweepFrequency;
+    memo: string;
+    settingsId: ID;
+    nextTransferDate?: ZeniDate;
+    primaryFundingAccount?: FundingAccount;
+    treasurySummary?: TreasurySummaryWithBalance;
+}
 export interface AutoTransferRulesState extends FetchedState {
     autoTransferReviewDetail: ReviewTransferDetail;
     createRuleFetchState: FetchStateAndError;

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.d.ts

@@ -24,6 +24,13 @@ export interface BillPayReviewSelectorView extends SelectorView {
     vendor: Vendor | undefined;
     zeniAssistRetryStatus: FetchStateAndError | undefined;
     billPayInfo?: BillPayInfo;
+    /**
+     * Bill-level accounting class id. Approval Rules 3.0 'department'
+     * criteria match against this — readers needing it (e.g. the
+     * creator-as-approver lookup) should read it off the view rather
+     * than digging through 'state.billTransactionState'.
+     */
+    classId?: ID;
     invoiceNumber?: string;
     isBillMarkedForRetry?: boolean;
     outsideZeniPaymentInfo?: OutsideZeniPaymentLocalData;

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

@@ -59,6 +59,12 @@ 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;
@@ -69,6 +75,13 @@ 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) {
@@ -185,6 +198,7 @@ const getReviewPageBillDetail = (state, billId) => {
         zeniAssistRetryStatus,
         billPayInfo,
         outsideZeniPaymentInfo,
+        classId,
     };
 };
 exports.getReviewPageBillDetail = getReviewPageBillDetail;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.d.ts

@@ -2,9 +2,10 @@ import { ZeniAPIStatus } from '../../../../responsePayload';
 import { BillPaySetupApproverViewState } from './billPaySetupApproverViewState';
 import { ApprovalRuleCreateData, ApprovalRuleUpdateData } from './types/commonState';
 export declare const initialState: BillPaySetupApproverViewState;
-export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, includeUserRoles?: any], {
+export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: any, includeUserRoles: any, useV3: boolean], {
     cacheOverride: any;
     includeUserRoles: any;
+    useV3: boolean;
 }, "billPaySetupApproverView/fetchBillPaySetupApproverView", never, never>, fetchBillPaySetupApproverViewSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[]], {
     approvalRuleIds: string[];
 }, "billPaySetupApproverView/fetchBillPaySetupApproverViewSuccess", never, never>, fetchBillPaySetupApproverViewFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "billPaySetupApproverView/fetchBillPaySetupApproverViewFailure", never, never>, fetchBillPayApproversDetails: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride?: any, includeUserRoles?: any], {
@@ -18,15 +19,25 @@ export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").A
     attributes: ("manager" | "vendor_owner" | "manager_of_manager")[];
 }, "billPaySetupApproverView/fetchBillPayApproversListSuccess", never, never>, fetchBillPayApproversListFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], {
     status: ZeniAPIStatus<Record<string, unknown>>;
-}, "billPaySetupApproverView/fetchBillPayApproversListFailure", never, never>, deleteBillPayApprovalRule: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string], {
+}, "billPaySetupApproverView/fetchBillPayApproversListFailure", never, never>, deleteBillPayApprovalRule: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string, useV3: boolean], {
     approvalRuleId: string;
+    useV3: boolean;
 }, "billPaySetupApproverView/deleteBillPayApprovalRule", never, never>, deleteBillPayApprovalRuleSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[deletedApprovalRuleId: string, approvalRuleIds: string[]], {
     deletedApprovalRuleId: string;
     approvalRuleIds: string[];
 }, "billPaySetupApproverView/deleteBillPayApprovalRuleSuccess", never, never>, deleteBillPayApprovalRuleFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleId: string, status: ZeniAPIStatus<Record<string, unknown>>], {
     approvalRuleId: string;
     status: ZeniAPIStatus<Record<string, unknown>>;
-}, "billPaySetupApproverView/deleteBillPayApprovalRuleFailure", never, never>, saveBillPaySetupApproverViewUpdates: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/saveBillPaySetupApproverViewUpdates">, saveBillPaySetupApproverViewUpdatesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], affectedEntityIds?: string[] | undefined, newApprovalRuleId?: string | undefined], {
+}, "billPaySetupApproverView/deleteBillPayApprovalRuleFailure", never, never>, reorderBillPayApprovalRules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], useV3: boolean], {
+    approvalRuleIds: string[];
+    useV3: boolean;
+}, "billPaySetupApproverView/reorderBillPayApprovalRules", never, never>, reorderBillPayApprovalRulesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[]], {
+    approvalRuleIds: string[];
+}, "billPaySetupApproverView/reorderBillPayApprovalRulesSuccess", never, never>, reorderBillPayApprovalRulesFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[status: ZeniAPIStatus<Record<string, unknown>>], {
+    status: ZeniAPIStatus<Record<string, unknown>>;
+}, "billPaySetupApproverView/reorderBillPayApprovalRulesFailure", never, never>, saveBillPaySetupApproverViewUpdates: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[useV3: boolean], {
+    useV3: boolean;
+}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdates", never, never>, saveBillPaySetupApproverViewUpdatesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[approvalRuleIds: string[], affectedEntityIds?: string[] | undefined, newApprovalRuleId?: string | undefined], {
     approvalRuleIds: string[];
     affectedEntityIds: string[] | undefined;
     newApprovalRuleId: string | undefined;

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearBillPaySetupApproverView = exports.setListeningToPusherEvent = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
+exports.clearBillPaySetupApproverView = exports.setListeningToPusherEvent = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.reorderBillPayApprovalRulesFailure = exports.reorderBillPayApprovalRulesSuccess = exports.reorderBillPayApprovalRules = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 exports.initialState = {
     fetchState: 'Not-Started',
@@ -17,6 +17,7 @@ exports.initialState = {
     newApprovalRuleId: undefined,
     approvalRulesDeleteStatusById: {},
     billPaySetupApproverViewUpdateData: undefined,
+    reorderStatus: { fetchState: 'Not-Started', error: undefined },
     hasValidState() {
         return this.fetchState === 'Completed';
     },
@@ -30,8 +31,13 @@ const billPaySetupApproverView = (0, toolkit_1.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: {
@@ -116,8 +122,12 @@ const billPaySetupApproverView = (0, toolkit_1.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: {
@@ -149,13 +159,100 @@ const billPaySetupApproverView = (0, toolkit_1.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) {
@@ -244,5 +341,5 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
+_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.reorderBillPayApprovalRules = _a.reorderBillPayApprovalRules, exports.reorderBillPayApprovalRulesSuccess = _a.reorderBillPayApprovalRulesSuccess, exports.reorderBillPayApprovalRulesFailure = _a.reorderBillPayApprovalRulesFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
 exports.default = billPaySetupApproverView.reducer;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewState.d.ts

@@ -9,8 +9,24 @@ export interface BillPaySetupApproverViewState extends FetchedState {
         attributes: AttributeType[];
         fetchStatus: FetchStateAndError;
     };
+    /**
+     * Tracks the in-flight status of the list-page reorder PUT
+     * (approval-rules-v2/reorder). The reducer optimistically updates
+     * 'approvalRuleIds' on the trigger action. On Failure the reducer
+     * restores the snapshot below before the epic's safety-net refetch
+     * fires, so the UI bounces back to the user's last good order
+     * without waiting for a network roundtrip.
+     */
+    reorderStatus: FetchStateAndError;
     affectedEntityIds?: ID[];
     billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
     listeningToPusherEvent?: boolean;
     newApprovalRuleId?: ID;
+    /**
+     * Pre-reorder snapshot of 'approvalRuleIds'. Stashed on the trigger
+     * reducer right before the optimistic mutation and consumed on
+     * Failure to restore the previous order. Cleared on Success so the
+     * next reorder starts from a clean slate.
+     */
+    reorderRollbackIds?: ID[];
 }

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

@@ -9,9 +9,17 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const deleteBillPayApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.deleteBillPayApprovalRule.match), (0, operators_1.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((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);

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

@@ -9,7 +9,7 @@ const userReducer_1 = require("../../../../../entity/user/userReducer");
 const responsePayload_1 = require("../../../../../responsePayload");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView.match), (0, operators_1.switchMap)((action) => {
-    const { cacheOverride } = action.payload;
+    const { cacheOverride, useV3 } = action.payload;
     const { billPaySetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, billPaySetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -17,9 +17,13 @@ const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions
             billPaySetupApproverViewState.approvalRuleIds.length ||
         (billPaySetupApproverViewState.hasValidState() === false &&
             billPaySetupApproverViewState.fetchState !== 'In-Progress')) {
-        return zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`)
-            .pipe((0, operators_1.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((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
                 const actions = [

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

@@ -11,16 +11,20 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
     if (approvalRuleId != null) {
         const approvalRule = (0, approvalRuleSelector_1.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: (0, approvalRuleSelector_1.getAmountCriteria)(approvalRule.criteria),
+                    vendor: (0, approvalRuleSelector_1.getVendorCriteria)(approvalRule.criteria),
+                    department: (0, approvalRuleSelector_1.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((0, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewUpdateData));
         }
@@ -28,7 +32,7 @@ const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state$) => a
     else {
         const billPaySetupApproverViewCreateData = {
             steps: [],
-            criteria: undefined,
+            criteria: {},
         };
         fetchActions.push((0, billPaySetupApproverViewReducer_1.clearBillPaySetupApproverViewUpdateData)(), (0, billPaySetupApproverViewReducer_1.saveBillPaySetupApproverViewUpdateData)(billPaySetupApproverViewCreateData));
     }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/reorderBillPayApprovalRulesEpic.d.ts

@@ -0,0 +1,23 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { Observable } from 'rxjs';
+import { updateApprovalRules } from '../../../../../entity/approvalRule/approvalRuleReducer';
+import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
+import { RootState } from '../../../../../reducer';
+import { ZeniAPI } from '../../../../../zeniAPI';
+import { fetchBillPaySetupApproverView, reorderBillPayApprovalRules, reorderBillPayApprovalRulesFailure, reorderBillPayApprovalRulesSuccess } from '../billPaySetupApproverViewReducer';
+/**
+ * Approval Rules 3.0 — list-page drag-and-drop reorder.
+ *
+ * PUT /bill-pay/approval-rules-v2/reorder with the new ID order in
+ * 'rule_ids'. Returns the updated 'approval_rules' (with refreshed
+ * priorities). The reducer optimistically updated 'approvalRuleIds'
+ * on the trigger action, so:
+ *   - on success: dispatch the updated approval rule payloads into
+ *     the entity slice, then 'Success' to normalise the slice's
+ *     ordered ID list to whatever the server returned.
+ *   - on failure: snackbar + dispatch 'fetchBillPaySetupApproverView'
+ *     with cacheOverride to roll the optimistic state back to server
+ *     truth.
+ */
+export type ActionType = ReturnType<typeof reorderBillPayApprovalRules> | ReturnType<typeof reorderBillPayApprovalRulesSuccess> | ReturnType<typeof reorderBillPayApprovalRulesFailure> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof fetchBillPaySetupApproverView> | ReturnType<typeof openSnackbar>;
+export declare const reorderBillPayApprovalRulesEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;