@zeniai/client-epic-state 5.1.83 → 5.1.84-beta1ND

package/lib/view/settingsView/epic/fetchNotificationSettingsEpic.js

@@ -3,52 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchNotificationSettingsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const notificationRegistryReducer_1 = require("../../../entity/notificationRegistry/notificationRegistryReducer");
 const responsePayload_1 = require("../../../responsePayload");
-const notificationPreferencesEndpoint_1 = require("../../notificationPreferencesView/notificationPreferencesEndpoint");
-const notificationPreferencesViewReducer_1 = require("../../notificationPreferencesView/notificationPreferencesViewReducer");
 const settingsViewReducer_1 = require("../settingsViewReducer");
 const fetchNotificationSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.fetchNotificationSettings.match), (0, operators_1.switchMap)(() => {
     const state = state$.value;
+    const URL = `${zeniAPI.apiEndPoints.notificationMicroServiceBaseUrl}/1.0/notification-preferences`;
     const userEmail = state.tenantState.loggedInUser?.userEmail;
     if (userEmail == null) {
         return (0, rxjs_1.from)([]);
     }
-    // Snapshot the save epoch at GET-dispatch time. The reducer compares
-    // the captured value against the current `saveEpoch` on response and
-    // skips the `preferences` replace when a save has landed in the
-    // meantime — the GET is carrying the pre-PUT snapshot and would
-    // otherwise clobber the fresh save. Cursor Bugbot 3632510237.
-    const saveEpochAtDispatch = state.notificationPreferencesViewState.saveEpoch;
-    // Snapshot the registry clear epoch at GET-dispatch time (same idiom as
-    // `saveEpochAtDispatch` above). The registry reducer compares it against
-    // the current `registryEpoch` and skips its write when a
-    // `clearAllNotificationRegistry` (tenant switch) has landed since — the
-    // GET is carrying the prior tenant's snapshot. Cursor Bugbot 67d6918e.
-    const registryEpochAtDispatch = state.notificationRegistryState.registryEpoch;
-    return zeniAPI
-        .getJSON((0, notificationPreferencesEndpoint_1.notificationPreferencesUrl)(zeniAPI))
-        .pipe((0, operators_1.mergeMap)((response) => {
+    return zeniAPI.getJSON(URL).pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const updateActions = [
                 (0, settingsViewReducer_1.updateNotificationSettingsOnSuccess)(response.data, userEmail),
             ];
-            // Always dispatch — an absent `task_checklist_registry` (gate
-            // off) must CLEAR the prior tenant's registry, not leave it in
-            // place. The reducer clears on `undefined` and full-replaces
-            // otherwise, both guarded by the registry epoch so a stale GET
-            // that lands after a tenant switch is skipped. Cursor Bugbot
-            // 67d6918e.
-            updateActions.push((0, notificationRegistryReducer_1.updateNotificationRegistry)({
-                registry: response.data.task_checklist_registry ?? undefined,
-                registryEpochAtDispatch,
-            }));
-            if (response.data.task_checklist_preferences != null) {
-                updateActions.push((0, notificationPreferencesViewReducer_1.fetchNotificationPreferencesSuccess)({
-                    preferences: response.data.task_checklist_preferences,
-                    saveEpochAtDispatch,
-                }));
-            }
             return (0, rxjs_1.of)(...updateActions);
         }
         else {

package/lib/view/settingsView/epic/saveNotificationSettingsEpic.js

@@ -5,10 +5,9 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
 const responsePayload_1 = require("../../../responsePayload");
-const notificationPreferencesEndpoint_1 = require("../../notificationPreferencesView/notificationPreferencesEndpoint");
 const settingsViewReducer_1 = require("../settingsViewReducer");
 const saveNotificationSettingsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.saveNotificationSettings.match), (0, operators_1.switchMap)(() => {
-    const URL = (0, notificationPreferencesEndpoint_1.notificationPreferencesUrl)(zeniAPI);
+    const URL = `${zeniAPI.apiEndPoints.notificationMicroServiceBaseUrl}/1.0/notification-preferences`;
     const { notificationSettings, notificationSettingsLocalData } = state$.value.settingsViewState.notification;
     const payload = toSaveNotificationSettingsPayload(notificationSettingsLocalData, notificationSettings);
     return zeniAPI

package/lib/view/settingsView/settingsViewHelpers.d.ts

@@ -14,4 +14,4 @@ export declare const isMyBankConnectionsTabVisible: (currentTenant: CurrentTenan
 export declare const isPerformanceTabVisible: (userRole: UserRoleType[], loggedInUser?: LoggedInUser) => boolean;
 export declare const isRemindersSectionVisibleOnSettingsPage: (reminderNotificationSettings: ReminderNotificationSettingsData) => boolean;
 export declare const isMonthEndNotificationsSectionVisibleOnSettingsPage: (monthEndInsightsNotificationSettings: MonthEndInsightsNotificationSettingsData, signedInUseEmail: string) => boolean;
-export declare const isNotificationsTabVisible: (notificationSettings: NotificationSettingsData, signedInUseEmail: string, isDebitCardFlagEnabled: boolean, currentTenant: CurrentTenant | undefined, hasTaskChecklistAccess: boolean) => boolean;
+export declare const isNotificationsTabVisible: (notificationSettings: NotificationSettingsData, signedInUseEmail: string, isDebitCardFlagEnabled: boolean, currentTenant: CurrentTenant | undefined) => boolean;

package/lib/view/settingsView/settingsViewHelpers.js

@@ -160,14 +160,13 @@ const isMonthEndNotificationsSectionVisibleOnSettingsPage = (monthEndInsightsNot
         monthEndInsightsNotificationSettings.recipientEmailIds.includes(signedInUseEmail));
 };
 exports.isMonthEndNotificationsSectionVisibleOnSettingsPage = isMonthEndNotificationsSectionVisibleOnSettingsPage;
-const isNotificationsTabVisible = (notificationSettings, signedInUseEmail, isDebitCardFlagEnabled, currentTenant, hasTaskChecklistAccess) => {
+const isNotificationsTabVisible = (notificationSettings, signedInUseEmail, isDebitCardFlagEnabled, currentTenant) => {
     if (currentTenant == null) {
         return false;
     }
     const { reminderNotificationSettings, monthEndInsightsNotificationSettings } = notificationSettings;
     return (((0, exports.isRemindersSectionVisibleOnSettingsPage)(reminderNotificationSettings) ||
-        (0, exports.isMonthEndNotificationsSectionVisibleOnSettingsPage)(monthEndInsightsNotificationSettings, signedInUseEmail) ||
-        hasTaskChecklistAccess) &&
+        (0, exports.isMonthEndNotificationsSectionVisibleOnSettingsPage)(monthEndInsightsNotificationSettings, signedInUseEmail)) &&
         ((0, tenantSelector_1.isTenantAccountingServicesEnabled)(currentTenant) ||
             ((0, tenantSelector_1.isTenantBankingOnly)(isDebitCardFlagEnabled, currentTenant) === false &&
                 (0, tenantSelector_1.isTenantCardsOnly)(currentTenant) === false)));

package/lib/view/settingsView/settingsViewPayload.d.ts

@@ -1,11 +1,9 @@
 import { AddressPayload } from '../../entity/address/addressPayload';
 import { CompanyPayload } from '../../entity/company/companyPayload';
-import { NotificationRegistryPayload } from '../../entity/notificationRegistry/notificationRegistryPayload';
 import { UserPayload } from '../../entity/user/userPayload';
 import { UserRolePayload } from '../../entity/userRole/userRolePayload';
 import { ZeniAPIResponse } from '../../responsePayload';
 import { AddressUpdatableInfoPayload } from '../addressView/addressViewPayload';
-import { NotificationPreferencesPayload } from '../notificationPreferencesView/notificationPreferencesViewPayload';
 interface MyProfilePeoplePayload {
     user_roles: UserRolePayload[];
     users: UserPayload[];
@@ -38,8 +36,6 @@ export interface NotificationSettingsPayload {
     pending_reimbursement_approval_notification: RemindersPayload | null;
     uncategorized_transaction_notification: RemindersPayload | null;
     month_end_email_recipient_email_ids?: string[];
-    task_checklist_preferences?: NotificationPreferencesPayload;
-    task_checklist_registry?: NotificationRegistryPayload;
 }
 export type NotificationSettingsResponse = ZeniAPIResponse<NotificationSettingsPayload>;
 interface RefreshQBOPayload {

package/lib/view/settingsView/settingsViewState.d.ts

@@ -12,7 +12,7 @@ export interface IntegrationsSettings {
 export declare const REMINDER_NOTIFICATION_TYPES: readonly ["missingReceiptNotification", "uncategorizedTransactionNotification", "pendingBillApprovalNotification", "pendingReimbursementApprovalNotification"];
 declare const toReminderTypeKey: (v: string) => "missingReceiptNotification" | "uncategorizedTransactionNotification" | "pendingBillApprovalNotification" | "pendingReimbursementApprovalNotification";
 export type ReminderTypeKey = ReturnType<typeof toReminderTypeKey>;
-export declare const toRemindersFrequencyType: (v: string) => "daily" | "weekly" | "monthly" | "bi-weekly";
+export declare const toRemindersFrequencyType: (v: string) => "weekly" | "monthly" | "daily" | "bi-weekly";
 export type FrequencyTypeKey = ReturnType<typeof toRemindersFrequencyType>;
 export declare const NOTIFICATION_MODES: readonly ["email", "dashboard"];
 export declare const toNotificationMode: (v: string) => "dashboard" | "email";

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.d.ts

@@ -54,8 +54,6 @@ export interface BillDetailViewSelector extends SelectorView {
 export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
-    displayPendingApproverAsAdmin?: boolean;
-    showSodAdminLabel?: boolean;
 }
 export interface ActorActivityWithUser {
     activity: ActivityStatus;
@@ -64,7 +62,6 @@ export interface ActorActivityWithUser {
     type: string;
     userId: ID;
     actor?: User;
-    isImplicitActor?: boolean;
     lastUpdateTime?: ZeniDate;
     subType?: string;
 }
@@ -80,7 +77,6 @@ export interface BillActivity {
     currentPendingStepIndex?: number;
     entityApprovalId?: ID;
     isAdminFallbackApprover?: boolean;
-    sodExcludedApproverUserId?: ID;
 }
 export declare const getBillActivities: (state: RootState, billId: ID, billStageCode?: BillStageCodeType) => BillActivity[];
 export declare const getBillDetailView: (state: RootState, billId: ID) => BillDetailViewSelector;

package/lib/view/spendManagement/billPay/billDetailView/billDetailViewSelector.js

@@ -28,12 +28,7 @@ const billPayConfigState_1 = require("../billPayConfig/billPayConfigState");
 const previousBillsSelector_1 = require("../previousBills/previousBillsSelector");
 const billDetailViewState_1 = require("./billDetailViewState");
 const getBillActivities = (state, billId, billStageCode) => {
-    const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, billTransactionState, } = state;
-    // Note: createdBy is undefined until billTransactionState is populated.
-    // getBillActivities is called from getBillDetailView which runs after the
-    // bill entity epic completes — this assumption must hold for showSodAdminLabel
-    // to render on first paint.
-    const createdBy = billTransactionState.transactionById[billId]?.createdBy;
+    const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, } = state;
     const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
     const billDetail = (0, get_1.default)(billDetailViewState.billDetailById, key, undefined);
     let billActivities = [];
@@ -68,7 +63,7 @@ const getBillActivities = (state, billId, billStageCode) => {
             const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, billDetail.approvalRuleIds);
             const entityApprovalStatusByIds = (0, entityApprovalStatusSelector_1.getEntityApprovalStatusByIds)(entityApprovalStatusState, billDetail.entityApprovalIds);
             billActivities = entityApprovalStatusByIds.map((entityApprovalStatus) => {
-                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, isRealTimeApprovalEnabled, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
+                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, isRealTimeApprovalEnabled, currentPendingStepIndex, } = entityApprovalStatus;
                 const approvalRule = approvalRules.find((rule) => rule.approvalRuleId === approvalRuleId);
                 return {
                     approvalRuleId,
@@ -80,23 +75,21 @@ const getBillActivities = (state, billId, billStageCode) => {
                     isAdminFallbackApprover,
                     isRealTimeApprovalEnabled,
                     currentPendingStepIndex,
-                    sodExcludedApproverUserId,
                     entityApprovalId: entityApprovalStatus.entityApprovalId,
                     stepsWithStatus: stepsApprovalStatus.map((step) => {
-                        const actorsActivity = step.actorsActivity.map((activity) => ({
-                            ...activity,
-                            actor: (0, userSelector_1.getUserByUserId)(userState, activity.userId),
-                        }));
                         return {
                             ...step,
                             actors: step.actors
                                 .map((actor) => (0, userSelector_1.getUserByUserId)(userState, actor.userId))
                                 .filter((user) => user != null),
                             nonUserActors: step.actors.filter((actor) => actor.userId == null && actor.type !== 'user'),
-                            actorsActivity,
+                            actorsActivity: step.actorsActivity.map((activity) => {
+                                return {
+                                    ...activity,
+                                    actor: (0, userSelector_1.getUserByUserId)(userState, activity.userId),
+                                };
+                            }),
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
-                            displayPendingApproverAsAdmin: (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
-                            showSodAdminLabel: (0, helpers_1.shouldShowSodAdminLabel)(sodExcludedApproverUserId, actorsActivity, createdBy),
                         };
                     }),
                 };
@@ -263,7 +256,7 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
     let isMarkAsPaidBtnVisible = false;
     let rejectedId = -1;
     const stepsWithStatusData = billActivities[0].stepsWithStatus;
-    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = billActivities[0];
+    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = billActivities[0];
     for (const [index, stepWithStatus] of stepsWithStatusData.entries()) {
         if (stepWithStatus.action === 'require_approval') {
             for (const actorActivity of stepWithStatus.actorsActivity) {
@@ -304,42 +297,23 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
-                const sodBlocked = (0, helpers_1.isSodExcludedViewerBlocked)(sodExcludedApproverUserId, signedInUser?.userId, pendingStep.actorsActivity);
-                if (isAllActivitiesPending) {
-                    for (const actorActivity of pendingStep.actorsActivity) {
-                        if (!sodBlocked &&
-                            actorActivity.actor?.userId === signedInUser?.userId) {
-                            isApprovalorRejectBtnVisible = true;
-                            isMarkAsPaidBtnVisible = isLastApprovalStep;
-                            break;
-                        }
+                for (const actorActivity of pendingStep.actorsActivity) {
+                    if (actorActivity.actor?.userId === signedInUser?.userId &&
+                        isAllActivitiesPending) {
+                        isApprovalorRejectBtnVisible = true;
+                        isMarkAsPaidBtnVisible = isLastApprovalStep;
                     }
-                }
-                if (!isApprovalorRejectBtnVisible) {
-                    for (const actorActivity of pendingStep.actorsActivity) {
-                        // admin will be fallback approver if vendor-owner/manager are not assigned any user id
-                        if (actorActivity.type === 'attribute' &&
-                            (actorActivity.subType === 'manager' ||
-                                actorActivity.subType === 'vendor_owner') &&
-                            actorActivity.userId === null &&
-                            isAdminFallbackApprover === true &&
-                            isUserAdmin &&
-                            signedInUser?.userId != null &&
-                            signedInUser.userId !== sodExcludedApproverUserId) {
-                            isApprovalorRejectBtnVisible = true;
-                            isMarkAsPaidBtnVisible = isLastApprovalStep;
-                            break;
-                        }
+                    // admin will be fallback approver if vendor-owner/manager are not assigned any user id
+                    if (actorActivity.type === 'attribute' &&
+                        (actorActivity.subType === 'manager' ||
+                            actorActivity.subType === 'vendor_owner') &&
+                        actorActivity.userId === null &&
+                        isAdminFallbackApprover === true &&
+                        isUserAdmin === true) {
+                        isApprovalorRejectBtnVisible = true;
+                        isMarkAsPaidBtnVisible = isLastApprovalStep;
                     }
                 }
-                if (!isApprovalorRejectBtnVisible &&
-                    isUserAdmin &&
-                    signedInUser?.userId != null &&
-                    signedInUser.userId !== sodExcludedApproverUserId &&
-                    pendingStep.displayPendingApproverAsAdmin === true) {
-                    isApprovalorRejectBtnVisible = true;
-                    isMarkAsPaidBtnVisible = isLastApprovalStep;
-                }
             }
         }
     }
@@ -353,42 +327,23 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
-                const sodBlocked = (0, helpers_1.isSodExcludedViewerBlocked)(sodExcludedApproverUserId, signedInUser?.userId, stepWithStatus.actorsActivity);
-                if (isAllActivitiesPending) {
-                    for (const actorActivity of stepWithStatus.actorsActivity) {
-                        if (!sodBlocked &&
-                            actorActivity.actor?.userId === signedInUser?.userId) {
-                            isApprovalorRejectBtnVisible = true;
-                            isMarkAsPaidBtnVisible = true;
-                            break;
-                        }
+                for (const actorActivity of stepWithStatus.actorsActivity) {
+                    if (actorActivity.actor?.userId === signedInUser?.userId &&
+                        isAllActivitiesPending) {
+                        isApprovalorRejectBtnVisible = true;
+                        isMarkAsPaidBtnVisible = true;
                     }
-                }
-                if (!isApprovalorRejectBtnVisible) {
-                    for (const actorActivity of stepWithStatus.actorsActivity) {
-                        // admin will be fallback approver if vendor-owner/manager are not assigned any user id
-                        if (actorActivity.type === 'attribute' &&
-                            (actorActivity.subType === 'manager' ||
-                                actorActivity.subType === 'vendor_owner') &&
-                            actorActivity.userId === null &&
-                            isAdminFallbackApprover === true &&
-                            isUserAdmin &&
-                            signedInUser?.userId != null &&
-                            signedInUser.userId !== sodExcludedApproverUserId) {
-                            isApprovalorRejectBtnVisible = true;
-                            isMarkAsPaidBtnVisible = true;
-                            break;
-                        }
+                    // admin will be fallback approver if vendor-owner/manager are not assigned any user id
+                    else if (actorActivity.type === 'attribute' &&
+                        (actorActivity.subType === 'manager' ||
+                            actorActivity.subType === 'vendor_owner') &&
+                        actorActivity.userId === null &&
+                        isAdminFallbackApprover === true &&
+                        isUserAdmin === true) {
+                        isApprovalorRejectBtnVisible = true;
+                        isMarkAsPaidBtnVisible = true;
                     }
                 }
-                if (!isApprovalorRejectBtnVisible &&
-                    isUserAdmin &&
-                    signedInUser?.userId != null &&
-                    signedInUser.userId !== sodExcludedApproverUserId &&
-                    stepWithStatus.displayPendingApproverAsAdmin === true) {
-                    isApprovalorRejectBtnVisible = true;
-                    isMarkAsPaidBtnVisible = true;
-                }
             }
             if (isApprovalorRejectBtnVisible) {
                 break;

package/lib/view/spendManagement/billPay/billList/billListReducer.d.ts

@@ -21,7 +21,7 @@ export declare const fetchBillList: import("@reduxjs/toolkit").ActionCreatorWith
     period: TimePeriod;
     tab: "paid" | "pending_approval" | "scheduled" | "draft";
     error: ZeniAPIStatus<Record<string, unknown>>;
-}, "billList/updateBillListFailure", never, never>, updateTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"paid" | "pending_approval" | "scheduled" | "draft", "billList/updateTab">, updateSubTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"failed" | "cancelled" | "rejected" | "ach" | "wire" | "deleted" | "all" | "overdue" | "awaiting_approval" | "awaiting_my_approval" | "offline", "billList/updateSubTab">, updateSelectedBillId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "billList/updateSelectedBillId">, clearBillList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billList/clearBillList">, updateBillDetailSaveBillCode: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<SaveBillStageCode, "billList/updateBillDetailSaveBillCode">, updateBillListUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "billList/updateBillListFailure", never, never>, updateTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"paid" | "pending_approval" | "scheduled" | "draft", "billList/updateTab">, updateSubTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"failed" | "cancelled" | "rejected" | "ach" | "wire" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "offline", "billList/updateSubTab">, updateSelectedBillId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "billList/updateSelectedBillId">, clearBillList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billList/clearBillList">, updateBillDetailSaveBillCode: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<SaveBillStageCode, "billList/updateBillDetailSaveBillCode">, updateBillListUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     period: TimePeriod;
     uiState: Partial<BillListUIState>;
 }, "billList/updateBillListUIState">, updateSearchResult: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "billList/updateSearchResult">, updateFilterResult: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -297,7 +297,7 @@ const getApproversOrRejectors = (billTransaction, entityApprovalStatusState, use
     };
     if (billTransaction.entityApprovalId !== null) {
         const entityApprovalStatus = entityApprovalStatusState.entityApprovalStatusById[billTransaction.entityApprovalId];
-        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
+        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = entityApprovalStatus;
         const isBillSerailized = areApprovalsSerialized === true &&
             currentPendingStepIndex != null &&
             currentPendingStepIndex > -1;
@@ -325,20 +325,23 @@ const getApproversOrRejectors = (billTransaction, entityApprovalStatusState, use
                 if (isBillSerailized) {
                     requireApprovalInfo = [stepsApprovalStatus[currentPendingStepIndex]];
                 }
+                const pendingActivitiesList = [];
                 requireApprovalInfo.forEach((approvalStep) => {
-                    if (approvers.displayPendingApproverAsAdmin === true) {
-                        return;
-                    }
                     const pendingActivities = approvalStep.actorsActivity.filter((activity) => activity.activity === 'pending');
-                    const sodDisplayAsAdmin = (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, approvalStep.actorsActivity);
-                    const activitiesToShow = isBillSerailized
-                        ? pendingActivities
-                        : pendingActivities.slice(0, 1);
-                    if (sodDisplayAsAdmin) {
-                        approvers.displayPendingApproverAsAdmin = true;
-                        return;
+                    //if isBillSerailized, we need to show all the approvers in currentPendingStepIndex
+                    if (isBillSerailized) {
+                        pendingActivitiesList.push(...pendingActivities);
+                    }
+                    else {
+                        //if not isBillSerailized, we need to show all the first approvers in each steps_approval_status
+                        const pendingActivity = pendingActivities[0];
+                        if (pendingActivity != null) {
+                            pendingActivitiesList.push(pendingActivity);
+                        }
                     }
-                    activitiesToShow.forEach((activity) => {
+                });
+                if (pendingActivitiesList.length > 0) {
+                    pendingActivitiesList.forEach((activity) => {
                         const user = (0, userSelector_1.getUserByUserId)(userState, activity.userId);
                         if (user != null) {
                             approvers.users.push(user);
@@ -350,7 +353,7 @@ const getApproversOrRejectors = (billTransaction, entityApprovalStatusState, use
                             }
                         }
                     });
-                });
+                }
             }
         }
     }

package/lib/view/spendManagement/billPay/billList/billListState.d.ts

@@ -35,7 +35,7 @@ export type SaveBillStageCode = 'draft' | 'pending_approval' | undefined;
 export declare const ALL_BILL_TABS: readonly ["paid", "pending_approval", "scheduled", "draft"];
 declare const toBillTabType: (v: string) => "paid" | "pending_approval" | "scheduled" | "draft";
 export type BillTab = ReturnType<typeof toBillTabType>;
-declare const toBillsSubTabType: (v: string) => "failed" | "cancelled" | "rejected" | "ach" | "wire" | "deleted" | "all" | "overdue" | "awaiting_approval" | "awaiting_my_approval" | "offline";
+declare const toBillsSubTabType: (v: string) => "failed" | "cancelled" | "rejected" | "ach" | "wire" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "offline";
 export type BillsSubTabType = ReturnType<typeof toBillsSubTabType>;
 declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceNumber" | "invoiceDate";
 export declare type BillPayViewSortKey = ReturnType<typeof toBillPaySortKeyType>;

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -38,7 +38,7 @@ const billPayReviewSelector_1 = require("../billPayReview/billPayReviewSelector"
 const billPaySetupApproverViewSelector_1 = require("../billPaySetupApproverView/billPaySetupApproverViewSelector");
 const previousBillsSelector_1 = require("../previousBills/previousBillsSelector");
 const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAccountsEnabled, billId) => {
-    const { accountListState, accountState, bankAccountState, billDetailViewState, paymentAccountListState, billTransactionState, billPayConfigState, classListState, classState, editBillDetailViewState, paymentAccountState, vendorState, tenantState, companyState, userState, commonHistoryState, contactState, paymentInstrumentState, recurringBillState, depositAccountListState, depositAccountState, plaidAccountViewState, } = state;
+    const { accountListState, accountState, bankAccountState, billDetailViewState, paymentAccountListState, billTransactionState, billPayConfigState, classListState, classState, editBillDetailViewState, paymentAccountState, vendorState, tenantState, companyState, userState, commonHistoryState, contactState, paymentInstrumentState, recurringBillState, depositAccountListState, depositAccountState, billPaySetupApproverViewState, plaidAccountViewState, } = state;
     const transaction = (0, get_1.default)(billTransactionState.transactionById, billId ?? '', undefined);
     let recommendations = {};
     if (billId != null) {
@@ -186,6 +186,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
                 const fetchStateList = [
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
+                    billPaySetupApproverViewState,
                 ];
                 if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
                     fetchStateList.push(classListState);
@@ -206,6 +207,7 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
     else {
         const newBillFetchStateList = [
             accountListState.byReportId.billPayAccountList,
+            billPaySetupApproverViewState,
         ];
         if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
             newBillFetchStateList.push(classListState);

package/lib/view/spendManagement/billPay/editBillView/epics/fetchEditBillDetailPageEpic.d.ts

@@ -8,6 +8,7 @@ import { fetchVendorTypeList } from '../../../../vendorTypeList/vendorTypeListRe
 import { fetchDepositAccountList } from '../../../zeniAccounts/depositAccountList/depositAccountListReducer';
 import { fetchPaymentAccountList } from '../../../zeniAccounts/paymentAccountList/paymentAccountListReducer';
 import { fetchBillPayConfig } from '../../billPayConfig/billPayConfigReducer';
+import { fetchBillPaySetupApproverView } from '../../billPaySetupApproverView/billPaySetupApproverViewReducer';
 import { fetchBillAndInitializeLocalStore, fetchEditBillDetailPage, updateShowAutofill } from '../editBillViewReducer';
-export type ActionType = ReturnType<typeof fetchEditBillDetailPage> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchVendorTypeList> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchPaymentAccountList> | ReturnType<typeof fetchDepositAccountList> | ReturnType<typeof fetchBillPayConfig> | ReturnType<typeof updateShowAutofill> | ReturnType<typeof fetchOwnerList> | ReturnType<typeof fetchBillAndInitializeLocalStore>;
+export type ActionType = ReturnType<typeof fetchEditBillDetailPage> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchVendorTypeList> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchPaymentAccountList> | ReturnType<typeof fetchDepositAccountList> | ReturnType<typeof fetchBillPayConfig> | ReturnType<typeof updateShowAutofill> | ReturnType<typeof fetchBillPaySetupApproverView> | ReturnType<typeof fetchOwnerList> | ReturnType<typeof fetchBillAndInitializeLocalStore>;
 export declare const fetchEditBillDetailPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/spendManagement/billPay/editBillView/epics/fetchEditBillDetailPageEpic.js

@@ -11,6 +11,7 @@ const vendorTypeListReducer_1 = require("../../../../vendorTypeList/vendorTypeLi
 const depositAccountListReducer_1 = require("../../../zeniAccounts/depositAccountList/depositAccountListReducer");
 const paymentAccountListReducer_1 = require("../../../zeniAccounts/paymentAccountList/paymentAccountListReducer");
 const billPayConfigReducer_1 = require("../../billPayConfig/billPayConfigReducer");
+const billPaySetupApproverViewReducer_1 = require("../../billPaySetupApproverView/billPaySetupApproverViewReducer");
 const editBillViewReducer_1 = require("../editBillViewReducer");
 const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editBillViewReducer_1.fetchEditBillDetailPage.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, billId, isShowDeletedBillsEnabled, hasZeniAssistAccess, isInternationalWireEnabled, } = action.payload;
@@ -40,6 +41,10 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         else {
             billDetailActions.push((0, editBillViewReducer_1.updateShowAutofill)(true));
         }
+        // Side-fetch from the edit-bill page bootstrap. The triggering
+        // action doesn't carry the V3 flag, so we explicitly target v1
+        // here; tenants on v3 re-fetch through their own screen connector.
+        billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, false));
     }
     else {
         if (state.ownerListState.fetchState !== 'In-Progress' &&
@@ -78,6 +83,15 @@ const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         if (billId != null) {
             billDetailActions.push((0, editBillViewReducer_1.fetchBillAndInitializeLocalStore)(billId, false, isShowDeletedBillsEnabled, hasZeniAssistAccess));
         }
+        const approvalViewFetchState = state.billPaySetupApproverViewState.fetchState;
+        // While opening New Bill Refresh Approval Rules and Payment Accounts
+        if (approvalViewFetchState !== 'In-Progress' &&
+            approvalViewFetchState !== 'Completed') {
+            // Side-fetch from the edit-bill page bootstrap. The triggering
+            // action doesn't carry the V3 flag, so we explicitly target v1
+            // here; tenants on v3 re-fetch through their own screen connector.
+            billDetailActions.push((0, billPaySetupApproverViewReducer_1.fetchBillPaySetupApproverView)(true, true, false));
+        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(billDetailActions));
 }));

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

@@ -115,8 +115,7 @@ const setupView = (0, toolkit_1.createSlice)({
         saveSetupViewDataInLocalStore(draft, action) {
             const setupViewLocalData = action.payload;
             if (setupViewLocalData.companyDetails != null) {
-                const syncToken = setupViewLocalData.companyDetails.syncToken ??
-                    draft.companyDetails.localData?.syncToken;
+                const syncToken = setupViewLocalData.companyDetails.syncToken ?? draft.companyDetails.localData?.syncToken;
                 draft.companyDetails.localData = {
                     ...setupViewLocalData.companyDetails,
                     ...(syncToken != null ? { syncToken } : {}),

package/lib/view/spendManagement/helpers.d.ts

@@ -1,5 +1,4 @@
 import { Amount } from '../../commonStateTypes/amount';
-import { ID } from '../../commonStateTypes/common';
 import { ReportIDPlusForecastID } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { BillPayInfo, BulkProcessingStateType } from '../../entity/billPay/billTransaction/billTransactionState';
 import { RecurringBillConfig } from '../../entity/billPay/recurringBills/recurringBillsState';
@@ -7,17 +6,13 @@ import { ReimbursementTypeCode } from '../../entity/reimbursement/reimbursementS
 import { CurrentTenant } from '../../entity/tenant/tenantSelector';
 import { RoleMap } from '../../entity/userRole/userRoleType';
 import { ZeniDate } from '../../zeniDayJS';
-import { ActorActivityWithUser, BillActivity } from './billPay/billDetailView/billDetailViewSelector';
+import { BillActivity } from './billPay/billDetailView/billDetailViewSelector';
 import { BillTransactionView } from './billPay/billList/billListSelector';
 import { AccType, AccountTypeSubConfigCodeKeyType } from './billPay/billPayConfig/billPayConfigState';
 import { RecurringBillConfigLocalData, RecurringBillInstance } from './billPay/editBillView/editBillViewState';
 import { BusinessVerificationDetails, CompanyOfficersDetails } from './commonSetup/setupViewSelector';
 import { SetupViewType } from './commonSetup/setupViewState';
 import { RemiActivity } from './reimbursement/remiDetailView/remiDetailViewSelector';
-export declare const isUserActorOnApprovalStep: (userId: ID, stepActorsActivity: ActorActivityWithUser[]) => boolean;
-export declare const isSodExcludedViewerBlocked: (sodExcludedApproverUserId?: ID, signedInUserId?: ID, stepActorsActivity?: ActorActivityWithUser[]) => boolean;
-export declare const isSodAdminFallbackEligibleForStep: (sodExcludedApproverUserId?: ID, isAdminFallbackApprover?: boolean, stepActorsActivity?: ActorActivityWithUser[]) => boolean;
-export declare const shouldShowSodAdminLabel: (sodExcludedApproverUserId?: ID, stepActorsActivity?: ActorActivityWithUser[], entitySubjectUserId?: ID) => boolean;
 export declare const getLatestApprovalDate: (allActivities: BillActivity[] | RemiActivity[]) => ZeniDate | undefined;
 export declare function getSpendManagementEffectiveListPeriod(): import("../..").TimePeriod;
 export declare const getSelectedCompanyOfficer: (verificationDetails: BusinessVerificationDetails) => CompanyOfficersDetails | undefined;

package/lib/view/spendManagement/helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSameDayAchDisablementConfig = exports.checkIfLowBalance = exports.getReportIDPlusForecastIDFromSetupViewType = exports.isAwaitingMarkAsPaid = exports.isPaymentMethodOutsideZeni = exports.toAccountsPromoConfig = exports.getBulkOperationSuffix = exports.getRemiListUniqueType = exports.getBillListUniqueType = exports.isBulkProcessing = exports.getActualPaymentDate = exports.accountTypeSubConfigCodeToAccType = exports.isRecurringConfigChanged = exports.updateRecurringBillDetails = exports.getPaymentDateFromVendorReceiveDate = exports.getSelectedCompanyOfficer = exports.getLatestApprovalDate = exports.shouldShowSodAdminLabel = exports.isSodAdminFallbackEligibleForStep = exports.isSodExcludedViewerBlocked = exports.isUserActorOnApprovalStep = void 0;
+exports.toSameDayAchDisablementConfig = exports.checkIfLowBalance = exports.getReportIDPlusForecastIDFromSetupViewType = exports.isAwaitingMarkAsPaid = exports.isPaymentMethodOutsideZeni = exports.toAccountsPromoConfig = exports.getBulkOperationSuffix = exports.getRemiListUniqueType = exports.getBillListUniqueType = exports.isBulkProcessing = exports.getActualPaymentDate = exports.accountTypeSubConfigCodeToAccType = exports.isRecurringConfigChanged = exports.updateRecurringBillDetails = exports.getPaymentDateFromVendorReceiveDate = exports.getSelectedCompanyOfficer = exports.getLatestApprovalDate = void 0;
 exports.getSpendManagementEffectiveListPeriod = getSpendManagementEffectiveListPeriod;
 exports.showReimbursementPromoPage = showReimbursementPromoPage;
 exports.showBillPayPromoPage = showBillPayPromoPage;
@@ -16,36 +16,6 @@ const workingDayHelper_1 = require("../../commonStateTypes/workingDayHelper");
 const paymentAccountState_1 = require("../../entity/paymentAccount/paymentAccountState");
 const userRoleType_1 = require("../../entity/userRole/userRoleType");
 const zeniDayJS_1 = require("../../zeniDayJS");
-const getUserActorId = (activity) => activity.actor?.userId ?? activity.userId;
-const isUserActorOnApprovalStep = (userId, stepActorsActivity) => stepActorsActivity.some((activity) => getUserActorId(activity) === userId);
-exports.isUserActorOnApprovalStep = isUserActorOnApprovalStep;
-const isSodExcludedViewerBlocked = (sodExcludedApproverUserId, signedInUserId, stepActorsActivity = []) => sodExcludedApproverUserId != null &&
-    signedInUserId != null &&
-    signedInUserId === sodExcludedApproverUserId &&
-    (0, exports.isUserActorOnApprovalStep)(sodExcludedApproverUserId, stepActorsActivity);
-exports.isSodExcludedViewerBlocked = isSodExcludedViewerBlocked;
-const isSodAdminFallbackEligibleForStep = (sodExcludedApproverUserId, isAdminFallbackApprover, stepActorsActivity = []) => {
-    if (sodExcludedApproverUserId == null || isAdminFallbackApprover !== true) {
-        return false;
-    }
-    const pendingResolvedApprovers = stepActorsActivity.filter((activity) => activity.activity === 'pending' && getUserActorId(activity) != null);
-    return (pendingResolvedApprovers.length > 0 &&
-        pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
-};
-exports.isSodAdminFallbackEligibleForStep = isSodAdminFallbackEligibleForStep;
-const isSodExcludedUserSolePendingApproverOnStep = (sodExcludedApproverUserId, stepActorsActivity = []) => {
-    if (sodExcludedApproverUserId == null) {
-        return false;
-    }
-    const pendingResolvedApprovers = stepActorsActivity.filter((activity) => activity.activity === 'pending' && getUserActorId(activity) != null);
-    return (pendingResolvedApprovers.length > 0 &&
-        pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
-};
-const shouldShowSodAdminLabel = (sodExcludedApproverUserId, stepActorsActivity = [], entitySubjectUserId) => sodExcludedApproverUserId != null &&
-    entitySubjectUserId != null &&
-    sodExcludedApproverUserId === entitySubjectUserId &&
-    isSodExcludedUserSolePendingApproverOnStep(sodExcludedApproverUserId, stepActorsActivity);
-exports.shouldShowSodAdminLabel = shouldShowSodAdminLabel;
 const getLatestApprovalDate = (allActivities) => {
     let allStepsWithStatus = [];
     let allApprovedActions = [];

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchEditRemiDetailPageEpic.d.ts

@@ -7,6 +7,7 @@ import { fetchUserFinancialAccount } from '../../../../userFinancialAccount/user
 import { fetchMerchantList } from '../../../merchantList/merchantListReducer';
 import { fetchReimbursementConfig } from '../../reimbursementConfig/reimbursementConfigReducer';
 import { fetchRemiDetail } from '../../remiDetailView/remiDetailViewReducer';
+import { fetchRemiSetupApproverView } from '../../remiSetupApproverView/remiSetupApproverViewReducer';
 import { fetchEditRemiDetailPage, fetchRemiAndInitializeLocalStore, updatesPaymentToInLocalStore } from '../editRemiViewReducer';
-export type ActionType = ReturnType<typeof fetchEditRemiDetailPage> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchMerchantList> | ReturnType<typeof fetchUserFinancialAccount> | ReturnType<typeof updatesPaymentToInLocalStore> | ReturnType<typeof fetchReimbursementConfig> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchRemiAndInitializeLocalStore>;
+export type ActionType = ReturnType<typeof fetchEditRemiDetailPage> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof fetchClassList> | ReturnType<typeof fetchMerchantList> | ReturnType<typeof fetchUserFinancialAccount> | ReturnType<typeof updatesPaymentToInLocalStore> | ReturnType<typeof fetchReimbursementConfig> | ReturnType<typeof fetchAccountList> | ReturnType<typeof fetchRemiAndInitializeLocalStore> | ReturnType<typeof fetchRemiSetupApproverView>;
 export declare const fetchEditRemiDetailPageEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;

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

@@ -9,6 +9,7 @@ const userFinancialAccountReducer_1 = require("../../../../userFinancialAccount/
 const userFinancialAccountSelector_1 = require("../../../../userFinancialAccount/userFinancialAccountSelector");
 const merchantListReducer_1 = require("../../../merchantList/merchantListReducer");
 const reimbursementConfigReducer_1 = require("../../reimbursementConfig/reimbursementConfigReducer");
+const remiSetupApproverViewReducer_1 = require("../../remiSetupApproverView/remiSetupApproverViewReducer");
 const editRemiViewReducer_1 = require("../editRemiViewReducer");
 const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.fetchEditRemiDetailPage.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, isLimitedCategoryEnabled, reimbursementId, isShowDeletedReimbursementEnabled, } = action.payload;
@@ -61,6 +62,17 @@ const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         if (reimbursementId != null) {
             remiDetailActions.push((0, editRemiViewReducer_1.fetchRemiAndInitializeLocalStore)(reimbursementId, false, isShowDeletedReimbursementEnabled));
         }
+        else {
+            const approvalRules = state.remiSetupApproverViewState;
+            if (approvalRules.fetchState !== 'Completed' &&
+                approvalRules.fetchState !== 'In-Progress') {
+                // 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((0, remiSetupApproverViewReducer_1.fetchRemiSetupApproverView)(true, false, false, false));
+            }
+        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(remiDetailActions));
 }));