@zeniai/client-epic-state 5.0.85-beta0ND → 5.0.85-betaAR1

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

@@ -1,6 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { date } from '../../../zeniDayJS';
-import { emptyAiAgentsActivationSubview, } from './onboardingCustomerViewState';
 const initialStatus = {
     fetchState: 'Not-Started',
     error: undefined,
@@ -11,29 +10,60 @@ export const initialState = {
     dashboardLoadedStatus: initialStatus,
     currentStep: 'link_payment_account',
     companyDetails: {
-        autoFilledFields: [],
         localData: undefined,
     },
-    companyOfficerUpdateStatus: (() => {
-        const emptyOfficerSlot = {
-            autoFilledFields: [],
+    companyOfficerUpdateStatus: {
+        Officer_1: {
             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 },
-        };
-    })(),
+        },
+        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,
+        },
+    },
     primaryContactDetails: {},
     paymentAccountDetails: {
         fetchStatus: initialStatus,
@@ -61,7 +91,6 @@ export const initialState = {
     },
     fetchState: 'Not-Started',
     error: undefined,
-    aiAgentsActivation: { ...emptyAiAgentsActivationSubview },
     uiState: {
         isQBOPopupOpen: false,
         isCardPaymentPopupOpen: false,
@@ -151,111 +180,6 @@ 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,
-                };
-            },
-        },
-        fetchAiAgentsActivationStatus(draft) {
-            draft.aiAgentsActivation.fetchStatus = {
-                fetchState: 'In-Progress',
-                error: undefined,
-            };
-        },
-        fetchAiAgentsActivationStatusSuccess: {
-            reducer(draft, action) {
-                draft.aiAgentsActivation.fetchStatus = {
-                    fetchState: 'Completed',
-                    error: undefined,
-                };
-                draft.aiAgentsActivation.ledgerPhases = action.payload.ledgerPhases;
-                draft.aiAgentsActivation.backgroundPhases =
-                    action.payload.backgroundPhases;
-                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 = action.payload.section === 'ledger'
-                    ? draft.aiAgentsActivation.ledgerPhases
-                    : draft.aiAgentsActivation.backgroundPhases;
-                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 };
-            },
-        },
-        aiAgentsActivationSectionReady: {
-            reducer(draft, action) {
-                const target = action.payload.section === 'ledger'
-                    ? draft.aiAgentsActivation.ledgerPhases
-                    : draft.aiAgentsActivation.backgroundPhases;
-                target.forEach((phase) => {
-                    phase.status = 'ready';
-                });
-            },
-            prepare(payload) {
-                return { payload };
-            },
-        },
         updateOnboardingCustomerViewDashboardLoaded: {
             reducer(draft) {
                 draft.dashboardLoadedStatus = {
@@ -668,49 +592,7 @@ 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 } = action.payload;
-                const slot = draft.companyOfficerUpdateStatus[officerType];
-                slot.localData = Object.assign({}, slot.localData, values);
-                slot.autoFilledFields = Array.from(new Set([...slot.autoFilledFields, ...autoFilledFieldNames]));
-            },
-            prepare(payload) {
-                return { payload };
-            },
-        },
-        /** Merge AI-parsed company fields into companyDetails onboarding localData. */
-        applyKybDocumentAutofillForOnboarding: {
-            reducer(draft, action) {
-                const { values, autoFilledFieldNames } = 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]));
-            },
-            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 };
-            },
-        },
     },
 });
-export const { fetchOnboardingCustomerView, fetchOnboardingCustomerSetupView, fetchOnboardingCustomerSetupViewSuccess, fetchOnboardingCustomerSetupViewFailure, updateOnboardingCustomerViewCompleteStatus, updateOnboardingCustomerViewCompleteStatusSuccess, updateOnboardingCustomerViewCompleteStatusFailure, acknowledgeOnboardingAiFinanceTeam, acknowledgeOnboardingAiFinanceTeamSuccess, acknowledgeOnboardingAiFinanceTeamFailure, fetchAiAgentsActivationStatus, fetchAiAgentsActivationStatusSuccess, fetchAiAgentsActivationStatusFailure, aiAgentsActivationCountsUpdated, aiAgentsActivationPhaseChanged, aiAgentsActivationSectionReady, 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 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 default onboardingCustomerView.reducer;

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

@@ -323,17 +323,3 @@ export const getProductSettingsString = (productSettings) => {
         .map((key) => productKeyMap[key])
         .join(',');
 };
-const fromActivationView = (state) => state.onboardingCustomerViewState.aiAgentsActivation;
-export const getAiAgentsActivationSubview = (state) => fromActivationView(state);
-export const getAiAgentsActivationLedgerPhases = (state) => fromActivationView(state).ledgerPhases;
-export const getAiAgentsActivationBackgroundPhases = (state) => fromActivationView(state).backgroundPhases;
-export const getAiAgentsActivationCounts = (state) => fromActivationView(state).counts;
-const SECTION_ROW_STATUS_FALLBACK = 'idle';
-const phaseStatusToRowStatus = (status) => {
-    if (status === 'ready') {
-        return 'building';
-    }
-    return status;
-};
-export const getAiAgentsActivationLedgerRowStatuses = (state) => fromActivationView(state).ledgerPhases.map((phase) => phaseStatusToRowStatus(phase.status ?? SECTION_ROW_STATUS_FALLBACK));
-export const getAiAgentsActivationBackgroundRowStatuses = (state) => fromActivationView(state).backgroundPhases.map((phase) => phaseStatusToRowStatus(phase.status ?? SECTION_ROW_STATUS_FALLBACK));

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

@@ -26,16 +26,3 @@ 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 = {
-    backgroundPhases: [],
-    counts: emptyAiAgentsActivationCounts,
-    fetchStatus: { fetchState: 'Not-Started', error: undefined },
-    ledgerPhases: [],
-};

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,11 @@ 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.
+            prepare(cacheOverride = false, includeUserRoles = true, useV3 = false) {
+                return { payload: { cacheOverride, includeUserRoles, useV3 } };
             },
         },
         fetchBillPaySetupApproverViewSuccess: {
@@ -112,8 +116,11 @@ 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.
+            prepare(approvalRuleId, useV3 = false) {
+                return { payload: { approvalRuleId, useV3 } };
             },
         },
         deleteBillPayApprovalRuleSuccess: {
@@ -145,13 +152,68 @@ 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;
+                draft.reorderStatus = { fetchState: 'In-Progress', error: undefined };
+                // Optimistic: render new order immediately. On failure, the
+                // epic dispatches fetchBillPaySetupApproverView to restore.
+                draft.approvalRuleIds = approvalRuleIds;
+            },
+            prepare(approvalRuleIds, useV3 = false) {
+                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;
+            },
+            prepare(approvalRuleIds) {
+                return { payload: { approvalRuleIds } };
+            },
+        },
+        reorderBillPayApprovalRulesFailure: {
+            reducer(draft, action) {
+                const { status } = action.payload;
+                draft.reorderStatus = { fetchState: 'Error', error: status };
+            },
+            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 +302,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));
     }

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

@@ -0,0 +1,54 @@
+import { from } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { updateApprovalRules } from '../../../../../entity/approvalRule/approvalRuleReducer';
+import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
+import { fetchBillPaySetupApproverView, reorderBillPayApprovalRules, reorderBillPayApprovalRulesFailure, reorderBillPayApprovalRulesSuccess, } from '../billPaySetupApproverViewReducer';
+export const reorderBillPayApprovalRulesEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(reorderBillPayApprovalRules.match), switchMap((action) => {
+    const { approvalRuleIds, useV3 } = action.payload;
+    // Approval Rules 3.0 — flag-gated endpoint selection. Mirrors
+    // the pattern used by delete + fetch epics: the v3 dev host
+    // until the production base URL ships the v2 reorder route.
+    const endpoint = `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2/reorder`;
+    return zeniAPI
+        .putAndGetJSON(endpoint, {
+        rule_ids: approvalRuleIds,
+    })
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const serverOrderedIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);
+            const actions = [
+                updateApprovalRules(response.data.approval_rules),
+                reorderBillPayApprovalRulesSuccess(serverOrderedIds),
+                openSnackbar({
+                    messageSection: `bill_pay_approval_reorder`,
+                    messageText: 'success',
+                    type: 'success',
+                }),
+            ];
+            return from(actions);
+        }
+        else {
+            const recovery = [
+                reorderBillPayApprovalRulesFailure(response.status),
+                openSnackbar({
+                    messageSection: `bill_pay_approval_reorder`,
+                    messageText: 'failed',
+                    type: 'error',
+                }),
+                // Refetch to revert the optimistic order to server truth.
+                fetchBillPaySetupApproverView(true, true, useV3),
+            ];
+            return from(recovery);
+        }
+    }), catchError((error) => from([
+        reorderBillPayApprovalRulesFailure(createZeniAPIStatus('Unexpected Error', 'Reorder Bill Pay Approval Rules errored out' +
+            JSON.stringify(error))),
+        openSnackbar({
+            messageSection: `bill_pay_approval_reorder`,
+            messageText: 'failed',
+            type: 'error',
+        }),
+        fetchBillPaySetupApproverView(true, true, useV3),
+    ])));
+}));

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

@@ -5,15 +5,24 @@ import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesFailure, saveBillPaySetupApproverViewUpdatesSuccess, } from '../billPaySetupApproverViewReducer';
-import { toApprovalChangableInfoPayload } from '../types/commonPayload';
-export const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveBillPaySetupApproverViewUpdates.match), switchMap(() => {
+import { toApprovalChangableInfoPayload, toApprovalChangableInfoPayloadV1, } from '../types/commonPayload';
+export const saveBillPaySetupApproverViewUpdatesEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(saveBillPaySetupApproverViewUpdates.match), switchMap((action) => {
     const { billPaySetupApproverViewState } = state$.value;
     const billPaySetupApproverViewUpdateData = billPaySetupApproverViewState.billPaySetupApproverViewUpdateData;
     if (billPaySetupApproverViewUpdateData != null &&
         billPaySetupApproverViewUpdateData.data != null) {
-        const payload = toApprovalChangableInfoPayload(billPaySetupApproverViewUpdateData.data);
+        // Approval Rules 3.0 — gate URL + write-side payload mapper on
+        // the `approval_rule_v3_config` dynamic config. `useV3` arrives
+        // on the action payload from the screen connector.
+        const { useV3 } = action.payload;
+        const payload = useV3
+            ? toApprovalChangableInfoPayload(billPaySetupApproverViewUpdateData.data)
+            : toApprovalChangableInfoPayloadV1(billPaySetupApproverViewUpdateData.data);
+        const endpoint = useV3
+            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules-v2`
+            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`;
         return zeniAPI
-            .postAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/bill-pay/approval-rules`, payload)
+            .postAndGetJSON(endpoint, payload)
             .pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const approvalRuleIds = response.data.approval_rules.map((approvalRule) => approvalRule.approval_rule_id);