@zeniai/client-epic-state 5.1.12 → 5.1.13-beta0ND

package/lib/esm/view/spendManagement/commonSetup/kycKybParseMapper.js

@@ -0,0 +1,221 @@
+/**
+ * Pure mappers from ExtendAI parser payloads to our form-side local-data shapes.
+ *
+ * Each mapper filters out fields below KYC_KYB_AUTOFILL_MIN_CONFIDENCE and returns
+ * both the merged values and the list of field names that were autofilled so the
+ * UI can show the ✦ AI badge next to each.
+ */
+import { date } from '../../../zeniDayJS';
+import { toZeniUrl } from '../../../zeniUrl';
+import { KYC_KYB_AUTOFILL_MIN_CONFIDENCE, } from './types/kycKybAutofill';
+export const OFFICER_ADDRESS_AUTOFILL_FIELD = 'officerAddress';
+// US driving licenses carry a US state in `address_state` but no country field;
+// default the composed address to the US.
+// Extend's driving-license parser is US-focused — its response shape
+// (`ExtendDrivingLicenseParsed`) only returns `issuing_state`, no
+// `issuing_country` / `country_of_issue`. So we default the address country
+// to US for autofill purposes.
+//
+// `country` is the alpha-3 ISO code (matches the rest of the codebase's
+// address payloads — e.g. `subscriptionBillingAddress.country = 'USA'`).
+// The Edit Address form's country dropdown looks up the option by alpha-3,
+// so using the country name here would leave the dropdown blank.
+//
+// To support non-US driving licenses later: (1) extend the document-service
+// Extend workflow to return an issuing-country field, (2) add it to
+// `ExtendDrivingLicenseParsed`, (3) read it here with this US value as the
+// fallback when the parser couldn't determine the country.
+const DRIVING_LICENSE_DEFAULT_COUNTRY = 'USA';
+const DRIVING_LICENSE_DEFAULT_COUNTRY_CODE = 'US';
+const emptyResult = () => ({
+    values: {},
+    autoFilledFieldNames: [],
+});
+const isConfident = (field) => {
+    if (field == null) {
+        return false;
+    }
+    if (field.value == null) {
+        return false;
+    }
+    return field.confidence >= KYC_KYB_AUTOFILL_MIN_CONFIDENCE;
+};
+const assignAutofilledValue = (result, key, value) => {
+    if (value == null) {
+        return;
+    }
+    if (typeof value === 'string' && value.trim() === '') {
+        return;
+    }
+    result.values[key] = value;
+    result.autoFilledFieldNames.push(key);
+};
+const tryParseDate = (rawDate) => {
+    const parsedDate = date(rawDate);
+    if (parsedDate.isValid()) {
+        return parsedDate;
+    }
+    return undefined;
+};
+const splitFullName = (fullName) => {
+    const parts = fullName.trim().split(/\s+/);
+    if (parts.length === 1) {
+        return { firstName: parts[0], lastName: '' };
+    }
+    const lastName = parts[parts.length - 1];
+    const firstName = parts.slice(0, -1).join(' ');
+    return { firstName, lastName };
+};
+/** Passport → Company Officer. */
+export const mapPassportToOfficer = (parsed) => {
+    const result = emptyResult();
+    if (isConfident(parsed.first_name)) {
+        assignAutofilledValue(result, 'firstName', parsed.first_name.value);
+    }
+    if (isConfident(parsed.last_name)) {
+        assignAutofilledValue(result, 'lastName', parsed.last_name.value);
+    }
+    if (isConfident(parsed.date_of_birth)) {
+        const parsedDate = tryParseDate(parsed.date_of_birth.value);
+        if (parsedDate != null) {
+            assignAutofilledValue(result, 'birthday', parsedDate);
+        }
+    }
+    // The raw nationality string (e.g. "USA", "UNITED STATES OF AMERICA") is
+    // passed through unresolved; the consuming form section normalizes it to an
+    // ISO-2 code via the `countries-list` dataset before `setValue`. The form
+    // value (not this localData seed) is what gets submitted.
+    if (isConfident(parsed.nationality)) {
+        assignAutofilledValue(result, 'nationalityCountryCode', parsed.nationality.value);
+    }
+    return result;
+};
+/** Driving License → Company Officer (name, DOB, and home address). */
+export const mapDrivingLicenseToOfficer = (parsed) => {
+    const result = emptyResult();
+    if (isConfident(parsed.first_name)) {
+        assignAutofilledValue(result, 'firstName', parsed.first_name.value);
+    }
+    if (isConfident(parsed.last_name)) {
+        assignAutofilledValue(result, 'lastName', parsed.last_name.value);
+    }
+    if (isConfident(parsed.date_of_birth)) {
+        const parsedDate = tryParseDate(parsed.date_of_birth.value);
+        if (parsedDate != null) {
+            assignAutofilledValue(result, 'birthday', parsedDate);
+        }
+    }
+    // The officer address lives in the addressView slice rather than
+    // CompanyOfficerLocalData, so it's returned separately for the epic to
+    // dispatch via newAddressInLocalStore.
+    const street = isConfident(parsed.address_street)
+        ? parsed.address_street.value.trim()
+        : undefined;
+    const city = isConfident(parsed.address_city)
+        ? parsed.address_city.value.trim()
+        : undefined;
+    const state = isConfident(parsed.address_state)
+        ? parsed.address_state.value.trim()
+        : undefined;
+    const postalCode = isConfident(parsed.address_zip)
+        ? parsed.address_zip.value.trim()
+        : undefined;
+    if (street != null || city != null || state != null || postalCode != null) {
+        result.address = {
+            street: street != null ? [street] : [],
+            city: city ?? '',
+            state: state ?? '',
+            postalCode: postalCode ?? '',
+            country: DRIVING_LICENSE_DEFAULT_COUNTRY,
+            countryCode: DRIVING_LICENSE_DEFAULT_COUNTRY_CODE,
+        };
+        result.autoFilledFieldNames.push(OFFICER_ADDRESS_AUTOFILL_FIELD);
+    }
+    return result;
+};
+/** SSN Card → Company Officer (name only — SSN value not yet returned by parser). */
+export const mapSsnCardToOfficer = (parsed) => {
+    const result = emptyResult();
+    if (isConfident(parsed.full_name)) {
+        const { firstName, lastName } = splitFullName(parsed.full_name.value);
+        if (firstName !== '') {
+            assignAutofilledValue(result, 'firstName', firstName);
+        }
+        if (lastName !== '') {
+            assignAutofilledValue(result, 'lastName', lastName);
+        }
+    }
+    return result;
+};
+/** Certificate of Incorporation → Company Details. */
+export const mapCoiToCompanyDetails = (parsed) => {
+    const result = emptyResult();
+    if (isConfident(parsed.company_legal_name)) {
+        assignAutofilledValue(result, 'companyLegalName', parsed.company_legal_name.value);
+    }
+    if (isConfident(parsed.ein)) {
+        assignAutofilledValue(result, 'taxIdOrEIN', parsed.ein.value);
+    }
+    if (isConfident(parsed.phone_number)) {
+        assignAutofilledValue(result, 'phone', parsed.phone_number.value);
+    }
+    if (isConfident(parsed.product_description)) {
+        assignAutofilledValue(result, 'companyDescription', parsed.product_description.value);
+    }
+    if (isConfident(parsed.website)) {
+        try {
+            assignAutofilledValue(result, 'website', toZeniUrl(parsed.website.value));
+        }
+        catch {
+            // ignore — malformed URL string from OCR
+        }
+    }
+    if (isConfident(parsed.industry)) {
+        assignAutofilledValue(result, 'companyIndustryType', parsed.industry.value);
+    }
+    if (isConfident(parsed.sub_industry)) {
+        assignAutofilledValue(result, 'companySubIndustry', parsed.sub_industry.value);
+    }
+    if (isConfident(parsed.type_of_incorporation)) {
+        assignAutofilledValue(result, 'typeOfIncorporation', parsed.type_of_incorporation.value);
+    }
+    if (isConfident(parsed.date_of_incorporation)) {
+        const parsedDate = tryParseDate(parsed.date_of_incorporation.value);
+        if (parsedDate != null) {
+            assignAutofilledValue(result, 'incDate', parsedDate);
+        }
+    }
+    if (isConfident(parsed.state_of_incorporation)) {
+        assignAutofilledValue(result, 'stateOfIncorporation', parsed.state_of_incorporation.value);
+    }
+    if (isConfident(parsed.countries_of_operations)) {
+        assignAutofilledValue(result, 'countriesOfOperations', parsed.countries_of_operations.value);
+    }
+    if (isConfident(parsed.source_of_funds)) {
+        assignAutofilledValue(result, 'sourceOfFunds', parsed.source_of_funds.value);
+    }
+    if (isConfident(parsed.transaction_volume_expectations)) {
+        assignAutofilledValue(result, 'transactionVolume', parsed.transaction_volume_expectations.value);
+    }
+    if (isConfident(parsed.purpose_of_account)) {
+        assignAutofilledValue(result, 'purposeOfAccount', parsed.purpose_of_account.value);
+    }
+    if (isConfident(parsed.regulated_status)) {
+        assignAutofilledValue(result, 'regulatedStatus', parsed.regulated_status.value);
+    }
+    if (isConfident(parsed.us_nexus)) {
+        assignAutofilledValue(result, 'usNexus', parsed.us_nexus.value);
+    }
+    return result;
+};
+/** Tax EIN letter → Company Details. */
+export const mapTaxEinToCompanyDetails = (parsed) => {
+    const result = emptyResult();
+    if (isConfident(parsed.legal_business_name)) {
+        assignAutofilledValue(result, 'companyLegalName', parsed.legal_business_name.value);
+    }
+    if (isConfident(parsed.ein)) {
+        assignAutofilledValue(result, 'taxIdOrEIN', parsed.ein.value);
+    }
+    return result;
+};

package/lib/esm/view/spendManagement/commonSetup/setupViewReducer.js

@@ -1,62 +1,30 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { parseUploadedKybDocument, parseUploadedKybDocumentFailure, parseUploadedKycDocument, parseUploadedKycDocumentFailure, } from './kycKybAutofillActions';
 const initialFetchStatus = {
     fetchState: 'Not-Started',
     error: undefined,
 };
+const emptyOfficerSlot = {
+    autoFilledFields: [],
+    localData: undefined,
+    sendOtpStatus: initialFetchStatus,
+    otpverificationStatus: initialFetchStatus,
+};
 export const initialState = {
     updateStatus: { fetchState: 'Not-Started', error: undefined },
-    companyDetails: {},
+    parsingDocumentFileIds: [],
+    companyDetails: { autoFilledFields: [] },
     companyOfficerUpdateStatus: {
-        Officer_1: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_2: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_3: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_4: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_5: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_6: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_7: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_8: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_9: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
-        Officer_10: {
-            localData: undefined,
-            sendOtpStatus: initialFetchStatus,
-            otpverificationStatus: initialFetchStatus,
-        },
+        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: {},
 };
@@ -297,7 +265,93 @@ const setupView = createSlice({
         clearSetupView(draft) {
             Object.assign(draft, initialState);
         },
+        /**
+         * Merge AI-parsed officer fields into the selected officer's localData and
+         * track which field names were autofilled so the form can show the ✦ badge.
+         */
+        applyKycDocumentAutofillForSetup: {
+            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.localData and track
+         * which field names were autofilled.
+         */
+        applyKybDocumentAutofillForSetup: {
+            reducer(draft, action) {
+                const { values, autoFilledFieldNames, fileId } = action.payload;
+                draft.companyDetails.localData = Object.assign({}, draft.companyDetails.localData, values);
+                draft.companyDetails.autoFilledFields = Array.from(new Set([
+                    ...(draft.companyDetails.autoFilledFields ?? []),
+                    ...autoFilledFieldNames,
+                ]));
+                draft.parsingDocumentFileIds = (draft.parsingDocumentFileIds ?? []).filter((id) => id !== fileId);
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
+        /**
+         * Wipe AI-autofill badges. If `officerType` is provided, clears only that
+         * officer; otherwise clears company details too.
+         */
+        clearKycKybAutofillForSetup: {
+            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 === 'setup') {
+                addParsingFileId(draft, action.payload.fileId);
+            }
+        });
+        builder.addCase(parseUploadedKybDocument, (draft, action) => {
+            if (action.payload.target === 'setup') {
+                addParsingFileId(draft, action.payload.fileId);
+            }
+        });
+        builder.addCase(parseUploadedKycDocumentFailure, (draft, action) => {
+            if (action.payload.target === 'setup') {
+                removeParsingFileId(draft, action.payload.fileId);
+            }
+        });
+        builder.addCase(parseUploadedKybDocumentFailure, (draft, action) => {
+            if (action.payload.target === 'setup') {
+                removeParsingFileId(draft, action.payload.fileId);
+            }
+        });
     },
 });
-export const { enableSetup, enableSetupSuccess, enableSetupFailure, updateBusinessVerificationDetails, updateBusinessVerificationDetailsSuccess, updateBusinessVerificationDetailsFailure, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, sendOtp: sendOtpSpendManagementSetUp, resendOtp: resendOtpSpendManagementSetUp, sendOtpSuccess: sendOtpSuccessSpendManagementSetUp, sendOtpFailure: sendOtpFailureSpendManagementSetUp, verifyOtp: verifyOtpSpendManagementSetUp, verifyOtpSuccess: verifyOtpSuccessSpendManagementSetUp, verifyOtpFailure: verifyOtpFailureSpendManagementSetUp, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, clearSetupView, } = setupView.actions;
+export const { enableSetup, enableSetupSuccess, enableSetupFailure, updateBusinessVerificationDetails, updateBusinessVerificationDetailsSuccess, updateBusinessVerificationDetailsFailure, updateSelectedCompanyOfficer, updateSetupViewLocalStoreData, saveSetupViewDataInLocalStore, saveCompnayOfficerPhoneInLocalStore, saveCompnayOfficerAdditionalDocumentsInLocalStore, saveTreasuryAdditionalDocumentsInLocalStore, sendOtp: sendOtpSpendManagementSetUp, resendOtp: resendOtpSpendManagementSetUp, sendOtpSuccess: sendOtpSuccessSpendManagementSetUp, sendOtpFailure: sendOtpFailureSpendManagementSetUp, verifyOtp: verifyOtpSpendManagementSetUp, verifyOtpSuccess: verifyOtpSuccessSpendManagementSetUp, verifyOtpFailure: verifyOtpFailureSpendManagementSetUp, saveIndustryAndIncDateInLocalStore, clearSetupViewDataInLocalStore, clearSetupView, applyKycDocumentAutofillForSetup, applyKybDocumentAutofillForSetup, clearKycKybAutofillForSetup, } = setupView.actions;
 export default setupView.reducer;

package/lib/esm/view/spendManagement/commonSetup/setupViewSelector.js

@@ -87,15 +87,17 @@ export function getBusinessVerificationDetails(state, companyId) {
     const { setupViewState, countryListState } = state;
     const { companyDetails, companyOfficerUpdateStatus, primaryContactDetails, updateStatus, } = setupViewState;
     const companyView = getCompanyView(state, companyId, []);
-    const { companyDetailsLocalData, companyOfficerLocalData } = getCompanyAndIdentityDetails(state, companyId, {
+    const { companyDetailsLocalData, companyOfficerLocalData, parsingDocumentFileIds, } = getCompanyAndIdentityDetails(state, companyId, {
         companyDetails,
         companyOfficerUpdateStatus,
         primaryContactDetails,
+        parsingDocumentFileIds: setupViewState.parsingDocumentFileIds,
     });
     const allNationalityCountries = countryListState.byCountryListCode.nationalityCountryList.countries;
     return {
         companyDetailsLocalData,
         companyOfficerLocalData,
+        parsingDocumentFileIds,
         companyView,
         updateStatus,
         allNationalityCountries,
@@ -119,6 +121,7 @@ export const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentit
         const companyAddress = addressViewState.newAddressState?.company_address;
         const registeredCompanyAddress = addressViewState.newAddressState?.company_registered_address;
         companyDetailsLocalData = {
+            autoFilledFields: companyDetails.autoFilledFields,
             companyId,
             companyDescription,
             companyLegalName,
@@ -191,6 +194,7 @@ export const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentit
             const companyOfficerAddress = addressViewState.newAddressState?.[addressType];
             companyOfficerLocalData[officerType] = {
                 ...companyOfficer.localData,
+                autoFilledFields: companyOfficer.autoFilledFields,
                 userFiles: getFilesByFileIds(fileState, fileIds),
                 additionalFiles: getFilesByFileIds(fileState, additionalSubmittedDocumentsForVerificationFileIds),
                 deleteFileStatusById,
@@ -204,6 +208,7 @@ export const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentit
     return {
         companyDetailsLocalData,
         companyOfficerLocalData,
+        parsingDocumentFileIds: companyAndIdentityDetails.parsingDocumentFileIds,
     };
 };
 /* This helper function takes deposit accounts and payment accounts

package/lib/esm/view/spendManagement/commonSetup/types/kycKybAutofill.js

@@ -0,0 +1,41 @@
+/** Confidence floor below which we drop an autofill candidate. */
+export const KYC_KYB_AUTOFILL_MIN_CONFIDENCE = 0.5;
+/**
+ * Maps the form-side {@link KycSelectDocumentType} (camelCase) to the
+ * parser-side {@link KycProvidedDocumentType} (snake_case). Returns `null` for
+ * `stateId`, which has no parser today.
+ */
+export const toKycProvidedDocumentType = (selectType) => {
+    switch (selectType) {
+        case 'driverLicense':
+            return 'driving_license';
+        case 'passport':
+            return 'passport';
+        case 'ssnCard':
+            return 'social_security_card';
+        case 'stateId':
+            return null;
+    }
+};
+/**
+ * Maps a persisted {@link AllowedDocumentType} (snake_case — the value stored on
+ * an officer's `documentTypeSelectedForVerification`) to the parser-side
+ * {@link KycProvidedDocumentType}. Returns `null` for document types with no KYC
+ * parser today (e.g. `id_document` / state ID, and any non-identity doc).
+ *
+ * The officer's stored selection is an `AllowedDocumentType`, not a
+ * {@link KycSelectDocumentType}; use this — not {@link toKycProvidedDocumentType}
+ * — when triggering autofill off that field.
+ */
+export const toKycProvidedDocumentTypeFromAllowed = (allowedType) => {
+    switch (allowedType) {
+        case 'passport':
+            return 'passport';
+        case 'driving_license':
+            return 'driving_license';
+        case 'social_security_card':
+            return 'social_security_card';
+        default:
+            return null;
+    }
+};

package/lib/esm/view/spendManagement/reimbursement/editRemiView/epics/fetchEditRemiDetailPageEpic.js

@@ -63,7 +63,11 @@ export const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe(f
             const approvalRules = state.remiSetupApproverViewState;
             if (approvalRules.fetchState !== 'Completed' &&
                 approvalRules.fetchState !== 'In-Progress') {
-                remiDetailActions.push(fetchRemiSetupApproverView(true));
+                // Side-fetch from the edit-reim page bootstrap. The
+                // triggering action doesn't carry the V3 flag, so we
+                // explicitly target v1; v3 tenants re-fetch via their
+                // own screen connector.
+                remiDetailActions.push(fetchRemiSetupApproverView(true, false, false, false));
             }
         }
     }

package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/epic/deleteRemiApprovalRuleEpic.js

@@ -6,9 +6,17 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { deleteRemiApprovalRule, deleteRemiApprovalRuleFailure, deleteRemiApprovalRuleSuccess, } from '../remiSetupApproverViewReducer';
 export const deleteRemiApprovalRuleEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteRemiApprovalRule.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/reimbursements/approval-rules-v2`
+        : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
     return zeniAPI
-        .deleteAndGetJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/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/reimbursement/remiSetupApproverView/epic/fetchRemiSetupApproverViewEpic.js

@@ -6,7 +6,7 @@ import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
 import { fetchRemiSetupApproverView, fetchRemiSetupApproverViewFailure, fetchRemiSetupApproverViewSuccess, } from '../remiSetupApproverViewReducer';
 export const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchRemiSetupApproverView.match), switchMap((action) => {
-    const { cacheOverride, resolveAttributeToUser, includeImplicitActors } = action.payload;
+    const { cacheOverride, resolveAttributeToUser, includeImplicitActors, useV3, } = action.payload;
     const { remiSetupApproverViewState, approvalRuleState } = state$.value;
     const approvalRules = getApprovalRulesByIds(approvalRuleState, remiSetupApproverViewState.approvalRuleIds);
     if (cacheOverride === true ||
@@ -14,8 +14,14 @@ export const fetchRemiSetupApproverViewEpic = (actions$, state$, zeniAPI) => act
             remiSetupApproverViewState.approvalRuleIds.length ||
         (remiSetupApproverViewState.hasValidState() === false &&
             remiSetupApproverViewState.fetchState !== 'In-Progress')) {
+        // 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 basePath = useV3 === true
+            ? `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules-v2`
+            : `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules`;
         return zeniAPI
-            .getJSON(`${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/approval-rules?query={"is_include_implicit_actors": ${includeImplicitActors}, "is_resolve_attribute_to_user":${resolveAttributeToUser}}`)
+            .getJSON(`${basePath}?query={"is_include_implicit_actors": ${includeImplicitActors}, "is_resolve_attribute_to_user":${resolveAttributeToUser}}`)
             .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/reimbursement/remiSetupApproverView/epic/initializeRemiSetupApproverViewUpdateDataEpic.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 { clearRemiSetupApproverViewUpdateData, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, } from '../remiSetupApproverViewReducer';
 export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$) => actions$.pipe(filter(initializeRemiSetupApproverViewUpdateData.match), mergeMap((action) => {
     const { approvalRuleId } = action.payload;
@@ -8,16 +8,20 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (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 remiSetupApproverViewUpdateData = {
                 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(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewUpdateData));
         }
@@ -25,7 +29,7 @@ export const initializeRemiSetupApproverViewUpdateDataEpic = (actions$, state$)
     else {
         const remiSetupApproverViewCreateData = {
             steps: [],
-            criteria: undefined,
+            criteria: {},
         };
         fetchActions.push(clearRemiSetupApproverViewUpdateData(), saveRemiSetupApproverViewUpdateData(remiSetupApproverViewCreateData));
     }

package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/epic/reorderRemiApprovalRulesEpic.js

@@ -0,0 +1,61 @@
+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 { fetchRemiSetupApproverView, reorderRemiApprovalRules, reorderRemiApprovalRulesFailure, reorderRemiApprovalRulesSuccess, } from '../remiSetupApproverViewReducer';
+export const reorderRemiApprovalRulesEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(reorderRemiApprovalRules.match), switchMap((action) => {
+    const { approvalRuleIds, useV3 } = action.payload;
+    const endpoint = `${zeniAPI.apiEndPoints.approvalMicroServiceBaseUrl}/1.0/reimbursements/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),
+                reorderRemiApprovalRulesSuccess(serverOrderedIds),
+                openSnackbar({
+                    messageSection: `reimbursement_approval_reorder`,
+                    messageText: 'success',
+                    type: 'success',
+                }),
+            ];
+            return from(actions);
+        }
+        else {
+            return from([
+                reorderRemiApprovalRulesFailure(response.status),
+                openSnackbar({
+                    messageSection: `reimbursement_approval_reorder`,
+                    messageText: 'failed',
+                    type: 'error',
+                }),
+                // Failure-recovery refetch — match the screen connector
+                // convention '(cacheOverride, resolveAttributeToUser,
+                // includeImplicitActors, useV3)' rather than copying BillPay's
+                // 3-arg shape. With the previous useV3-as-default-false the
+                // V3 flag was being smuggled in as 'includeImplicitActors',
+                // which silently broke V3 recovery refetches.
+                fetchRemiSetupApproverView(true, false, false, useV3),
+            ]);
+        }
+    }), catchError((error) => from([
+        reorderRemiApprovalRulesFailure(createZeniAPIStatus('Unexpected Error', 'Reorder Reimbursement Approval Rules errored out' +
+            JSON.stringify(error))),
+        openSnackbar({
+            messageSection: `reimbursement_approval_reorder`,
+            messageText: 'failed',
+            type: 'error',
+        }),
+        // Failure-recovery refetch — match the screen connector
+        // convention '(cacheOverride, resolveAttributeToUser,
+        // includeImplicitActors, useV3)' rather than copying BillPay's
+        // 3-arg shape. With the previous useV3-as-default-false the
+        // V3 flag was being smuggled in as 'includeImplicitActors',
+        // which silently broke V3 recovery refetches.
+        fetchRemiSetupApproverView(true, false, false, useV3),
+    ])));
+}));