@zeniai/client-epic-state 5.1.66 → 5.1.67

package/lib/entity/approvalRule/approvalRuleState.d.ts

@@ -109,5 +109,6 @@ export interface ApprovalRule {
 export interface Approvers {
     attributes: AttributeType[];
     users: User[];
+    displayPendingApproverAsAdmin?: boolean;
 }
 export {};

package/lib/entity/entityApprovalStatus/entityApprovalStatusPayload.d.ts

@@ -38,6 +38,7 @@ export interface EntityApprovalStatusPayload {
     approval_rule_id?: string | null;
     current_pending_step_index?: number;
     is_real_time_approval_enabled?: boolean;
+    sod_excluded_approver_user_id?: string | null;
 }
 /**
  * Helpers

package/lib/entity/entityApprovalStatus/entityApprovalStatusPayload.js

@@ -24,6 +24,7 @@ const toEntityApprovalStatus = (payload) => ({
     currentPendingStepIndex: payload.current_pending_step_index,
     isAdminFallbackApprover: payload.is_admin_fallback_approver_for_missing_user,
     isRealTimeApprovalEnabled: payload.is_real_time_approval_enabled ?? false,
+    sodExcludedApproverUserId: payload.sod_excluded_approver_user_id ?? undefined,
 });
 exports.toEntityApprovalStatus = toEntityApprovalStatus;
 const toEntityApprovalByUser = (payload) => {

package/lib/entity/entityApprovalStatus/entityApprovalStatusState.d.ts

@@ -55,6 +55,7 @@ export interface EntityApprovalStatus {
     approvalLastUpdateTime?: ZeniDate;
     approvalRuleId?: ID;
     currentPendingStepIndex?: number;
+    sodExcludedApproverUserId?: ID;
     status?: EntityApprovalStatusCode;
 }
 export {};

package/lib/esm/entity/entityApprovalStatus/entityApprovalStatusPayload.js

@@ -21,6 +21,7 @@ export const toEntityApprovalStatus = (payload) => ({
     currentPendingStepIndex: payload.current_pending_step_index,
     isAdminFallbackApprover: payload.is_admin_fallback_approver_for_missing_user,
     isRealTimeApprovalEnabled: payload.is_real_time_approval_enabled ?? false,
+    sodExcludedApproverUserId: payload.sod_excluded_approver_user_id ?? undefined,
 });
 const toEntityApprovalByUser = (payload) => {
     const res = {};

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

@@ -13,7 +13,7 @@ import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 import { getActivityHistory, } from '../../commonHistoryView/commonHistorySelector';
 import { getAllFundingAccounts, } from '../../commonSetup/setupViewSelector';
-import { getLatestApprovalDate, isAwaitingMarkAsPaid } from '../../helpers';
+import { getLatestApprovalDate, isAwaitingMarkAsPaid, isSodAdminFallbackEligibleForStep, isSodExcludedViewerBlocked, } from '../../helpers';
 import { getActivityRealTimeApproval, } from '../../realTimeApprovalView/realTimeApprovalSelector';
 import { getEntityRealTimeApprovalDetailKey } from '../../realTimeApprovalView/realTimeApprovalState';
 import { getBillPaymentSubConfigCodeKey, getInternationalSubConfigCodeKey, getInternationalWireMethodCodeKey, } from '../billPayConfig/billPayConfigPayload';
@@ -57,7 +57,7 @@ export const getBillActivities = (state, billId, billStageCode) => {
             const approvalRules = getApprovalRulesByIds(approvalRuleState, billDetail.approvalRuleIds);
             const entityApprovalStatusByIds = getEntityApprovalStatusByIds(entityApprovalStatusState, billDetail.entityApprovalIds);
             billActivities = entityApprovalStatusByIds.map((entityApprovalStatus) => {
-                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, isRealTimeApprovalEnabled, currentPendingStepIndex, } = entityApprovalStatus;
+                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, isRealTimeApprovalEnabled, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
                 const approvalRule = approvalRules.find((rule) => rule.approvalRuleId === approvalRuleId);
                 return {
                     approvalRuleId,
@@ -69,21 +69,22 @@ export const getBillActivities = (state, billId, billStageCode) => {
                     isAdminFallbackApprover,
                     isRealTimeApprovalEnabled,
                     currentPendingStepIndex,
+                    sodExcludedApproverUserId,
                     entityApprovalId: entityApprovalStatus.entityApprovalId,
                     stepsWithStatus: stepsApprovalStatus.map((step) => {
+                        const actorsActivity = step.actorsActivity.map((activity) => ({
+                            ...activity,
+                            actor: getUserByUserId(userState, activity.userId),
+                        }));
                         return {
                             ...step,
                             actors: step.actors
                                 .map((actor) => getUserByUserId(userState, actor.userId))
                                 .filter((user) => user != null),
                             nonUserActors: step.actors.filter((actor) => actor.userId == null && actor.type !== 'user'),
-                            actorsActivity: step.actorsActivity.map((activity) => {
-                                return {
-                                    ...activity,
-                                    actor: getUserByUserId(userState, activity.userId),
-                                };
-                            }),
+                            actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
+                            displayPendingApproverAsAdmin: isSodAdminFallbackEligibleForStep(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
                         };
                     }),
                 };
@@ -248,7 +249,7 @@ export const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInU
     let isMarkAsPaidBtnVisible = false;
     let rejectedId = -1;
     const stepsWithStatusData = billActivities[0].stepsWithStatus;
-    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = billActivities[0];
+    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = billActivities[0];
     for (const [index, stepWithStatus] of stepsWithStatusData.entries()) {
         if (stepWithStatus.action === 'require_approval') {
             for (const actorActivity of stepWithStatus.actorsActivity) {
@@ -289,23 +290,42 @@ export const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInU
                         break;
                     }
                 }
-                for (const actorActivity of pendingStep.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
-                        isAllActivitiesPending) {
-                        isApprovalorRejectBtnVisible = true;
-                        isMarkAsPaidBtnVisible = isLastApprovalStep;
+                const sodBlocked = 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;
+                        }
                     }
-                    // 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) {
+                    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 &&
+                            isUserAdmin &&
+                            signedInUser?.userId != null &&
+                            signedInUser.userId !== sodExcludedApproverUserId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = isLastApprovalStep;
+                            break;
+                        }
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    pendingStep.displayPendingApproverAsAdmin) {
+                    isApprovalorRejectBtnVisible = true;
+                    isMarkAsPaidBtnVisible = isLastApprovalStep;
+                }
             }
         }
     }
@@ -319,23 +339,42 @@ export const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInU
                         break;
                     }
                 }
-                for (const actorActivity of stepWithStatus.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
-                        isAllActivitiesPending) {
-                        isApprovalorRejectBtnVisible = true;
-                        isMarkAsPaidBtnVisible = true;
+                const sodBlocked = 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;
+                        }
                     }
-                    // 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) {
+                    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 &&
+                            isUserAdmin &&
+                            signedInUser?.userId != null &&
+                            signedInUser.userId !== sodExcludedApproverUserId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = true;
+                            break;
+                        }
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    stepWithStatus.displayPendingApproverAsAdmin) {
+                    isApprovalorRejectBtnVisible = true;
+                    isMarkAsPaidBtnVisible = true;
+                }
             }
             if (isApprovalorRejectBtnVisible) {
                 break;

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

@@ -4,7 +4,7 @@ import orderBy from 'lodash/orderBy';
 import { toAttributeTypeStrict, } from '../../../../entity/approvalRule/approvalRuleState';
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { dateNow } from '../../../../zeniDayJS';
-import { isAwaitingMarkAsPaid, isBulkProcessing, } from '../../helpers';
+import { isAwaitingMarkAsPaid, isBulkProcessing, isSodAdminFallbackEligibleForStep, } from '../../helpers';
 import { applyAdvancedFiltersOnList, isBillListDownloadable, } from '../../spendManagementFilterHelpers';
 import { getSelectedWithdrawFromAccount } from '../billDetailView/billDetailViewSelector';
 import { getBillPayConfigBotEmail } from '../billPayConfig/billPayConfigSelector';
@@ -290,7 +290,7 @@ export const getApproversOrRejectors = (billTransaction, entityApprovalStatusSta
     };
     if (billTransaction.entityApprovalId !== null) {
         const entityApprovalStatus = entityApprovalStatusState.entityApprovalStatusById[billTransaction.entityApprovalId];
-        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = entityApprovalStatus;
+        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
         const isBillSerailized = areApprovalsSerialized === true &&
             currentPendingStepIndex != null &&
             currentPendingStepIndex > -1;
@@ -318,23 +318,20 @@ export const getApproversOrRejectors = (billTransaction, entityApprovalStatusSta
                 if (isBillSerailized) {
                     requireApprovalInfo = [stepsApprovalStatus[currentPendingStepIndex]];
                 }
-                const pendingActivitiesList = [];
                 requireApprovalInfo.forEach((approvalStep) => {
-                    const pendingActivities = approvalStep.actorsActivity.filter((activity) => activity.activity === 'pending');
-                    //if isBillSerailized, we need to show all the approvers in currentPendingStepIndex
-                    if (isBillSerailized) {
-                        pendingActivitiesList.push(...pendingActivities);
+                    if (approvers.displayPendingApproverAsAdmin) {
+                        return;
                     }
-                    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);
-                        }
+                    const pendingActivities = approvalStep.actorsActivity.filter((activity) => activity.activity === 'pending');
+                    const sodDisplayAsAdmin = isSodAdminFallbackEligibleForStep(sodExcludedApproverUserId, isAdminFallbackApprover, approvalStep.actorsActivity);
+                    const activitiesToShow = isBillSerailized
+                        ? pendingActivities
+                        : pendingActivities.slice(0, 1);
+                    if (sodDisplayAsAdmin) {
+                        approvers.displayPendingApproverAsAdmin = true;
+                        return;
                     }
-                });
-                if (pendingActivitiesList.length > 0) {
-                    pendingActivitiesList.forEach((activity) => {
+                    activitiesToShow.forEach((activity) => {
                         const user = getUserByUserId(userState, activity.userId);
                         if (user != null) {
                             approvers.users.push(user);
@@ -346,7 +343,7 @@ export const getApproversOrRejectors = (billTransaction, entityApprovalStatusSta
                             }
                         }
                     });
-                }
+                });
             }
         }
     }

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

@@ -29,7 +29,7 @@ import { getDuplicateBills, } from '../billPayReview/billPayReviewSelector';
 import { getBillPaySetupApproverView } from '../billPaySetupApproverView/billPaySetupApproverViewSelector';
 import { getPreviousBills, } from '../previousBills/previousBillsSelector';
 export 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, billPaySetupApproverViewState, plaidAccountViewState, } = state;
+    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 transaction = recordGet(billTransactionState.transactionById, billId ?? '', undefined);
     let recommendations = {};
     if (billId != null) {
@@ -177,7 +177,6 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
                 const fetchStateList = [
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
-                    billPaySetupApproverViewState,
                 ];
                 if (getIsAccountingClassesEnabled(state)) {
                     fetchStateList.push(classListState);
@@ -198,7 +197,6 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
     else {
         const newBillFetchStateList = [
             accountListState.byReportId.billPayAccountList,
-            billPaySetupApproverViewState,
         ];
         if (getIsAccountingClassesEnabled(state)) {
             newBillFetchStateList.push(classListState);

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

@@ -8,7 +8,6 @@ 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 const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe(filter(fetchEditBillDetailPage.match), mergeMap((action) => {
     const { cacheOverride, billId, isShowDeletedBillsEnabled, hasZeniAssistAccess, isInternationalWireEnabled, } = action.payload;
@@ -38,10 +37,6 @@ export const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe(f
         else {
             billDetailActions.push(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(fetchBillPaySetupApproverView(true, true, false));
     }
     else {
         if (state.ownerListState.fetchState !== 'In-Progress' &&
@@ -80,15 +75,6 @@ export const fetchEditBillDetailPageEpic = (actions$, state$) => actions$.pipe(f
         if (billId != null) {
             billDetailActions.push(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(fetchBillPaySetupApproverView(true, true, false));
-        }
     }
     return concat(from(billDetailActions));
 }));

package/lib/esm/view/spendManagement/helpers.js

@@ -5,6 +5,20 @@ import { endDate, isHoliday, startDate, } from '../../commonStateTypes/workingDa
 import { VERIFIED_PAYMENT_ACCOUNT_PROVIDER_VERIFICATION_STATUS } from '../../entity/paymentAccount/paymentAccountState';
 import { hasBillPayAccess, hasBillPayAdminLevelAccess, hasReimbursementAccess, hasReimbursementAdminLevelAccess, } from '../../entity/userRole/userRoleType';
 import { date as zeniDate } from '../../zeniDayJS';
+const getUserActorId = (activity) => activity.actor?.userId ?? activity.userId;
+export const isUserActorOnApprovalStep = (userId, stepActorsActivity) => stepActorsActivity.some((activity) => getUserActorId(activity) === userId);
+export const isSodExcludedViewerBlocked = (sodExcludedApproverUserId, signedInUserId, stepActorsActivity = []) => sodExcludedApproverUserId != null &&
+    signedInUserId != null &&
+    signedInUserId === sodExcludedApproverUserId &&
+    isUserActorOnApprovalStep(sodExcludedApproverUserId, stepActorsActivity);
+export const isSodAdminFallbackEligibleForStep = (sodExcludedApproverUserId, isAdminFallbackApprover, stepActorsActivity = []) => {
+    if (sodExcludedApproverUserId == null || !isAdminFallbackApprover) {
+        return false;
+    }
+    const pendingResolvedApprovers = stepActorsActivity.filter((activity) => activity.activity === 'pending' && getUserActorId(activity) != null);
+    return (pendingResolvedApprovers.length > 0 &&
+        pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
+};
 export const getLatestApprovalDate = (allActivities) => {
     let allStepsWithStatus = [];
     let allApprovedActions = [];

package/lib/esm/view/spendManagement/reimbursement/remiDetailView/remiDetailViewSelector.js

@@ -7,7 +7,7 @@ import { getEntityApprovalStatusByIds } from '../../../../entity/entityApprovalS
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 import { getActivityHistory, } from '../../commonHistoryView/commonHistorySelector';
-import { getLatestApprovalDate } from '../../helpers';
+import { getLatestApprovalDate, isSodAdminFallbackEligibleForStep, isSodExcludedViewerBlocked, } from '../../helpers';
 import { getActivityRealTimeApproval, } from '../../realTimeApprovalView/realTimeApprovalSelector';
 import { getReimbursementConfigByKey } from '../reimbursementConfig/reimbursementConfigSelector';
 import { REIMBURSEMENT_PAYMENT_NUMBER_OF_DAYS } from '../reimbursementConfig/reimbursementConfigState';
@@ -144,7 +144,7 @@ export const getRemiActivities = (state, reimbursementId, billStageCode) => {
             const approvalRules = getApprovalRulesByIds(approvalRuleState, remiTransactionDetails.approvalRuleIds);
             const entityApprovalStatusByIds = getEntityApprovalStatusByIds(entityApprovalStatusState, remiTransactionDetails.entityApprovalIds);
             remiActivities = entityApprovalStatusByIds.map((entityApprovalStatus) => {
-                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, isRealTimeApprovalEnabled, } = entityApprovalStatus;
+                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, isRealTimeApprovalEnabled, sodExcludedApproverUserId, } = entityApprovalStatus;
                 const approvalRule = approvalRules.find((rule) => rule.approvalRuleId === approvalRuleId);
                 return {
                     approvalRuleId,
@@ -156,21 +156,22 @@ export const getRemiActivities = (state, reimbursementId, billStageCode) => {
                     isAdminFallbackApprover,
                     currentPendingStepIndex,
                     isRealTimeApprovalEnabled,
+                    sodExcludedApproverUserId,
                     entityApprovalId: entityApprovalStatus.entityApprovalId,
                     stepsWithStatus: stepsApprovalStatus.map((step) => {
+                        const actorsActivity = step.actorsActivity.map((activity) => ({
+                            ...activity,
+                            actor: getUserByUserId(userState, activity.userId),
+                        }));
                         return {
                             ...step,
                             actors: step.actors
                                 .map((actor) => getUserByUserId(userState, actor.userId))
                                 .filter((user) => user != null),
                             nonUserActors: step.actors.filter((actor) => actor.userId == null && actor.type !== 'user'),
-                            actorsActivity: step.actorsActivity.map((activity) => {
-                                return {
-                                    ...activity,
-                                    actor: getUserByUserId(userState, activity.userId),
-                                };
-                            }),
+                            actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
+                            displayPendingApproverAsAdmin: isSodAdminFallbackEligibleForStep(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
                         };
                     }),
                 };
@@ -183,7 +184,7 @@ export const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInU
     let isApprovalorRejectBtnVisible = false;
     let rejectedId = -1;
     const stepsWithStatusData = remiActivities[0].stepsWithStatus;
-    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = remiActivities[0];
+    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = remiActivities[0];
     for (const [index, stepWithStatus] of stepsWithStatusData.entries()) {
         if (stepWithStatus.action === 'require_approval') {
             for (const actorActivity of stepWithStatus.actorsActivity) {
@@ -219,27 +220,39 @@ export const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInU
                         break;
                     }
                 }
+                const sodBlocked = isSodExcludedViewerBlocked(sodExcludedApproverUserId, signedInUser?.userId, pendingStep.actorsActivity);
                 for (const actorActivity of pendingStep.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
+                    if (!sodBlocked &&
+                        actorActivity.actor?.userId === signedInUser?.userId &&
                         isAllActivitiesPending) {
                         isApprovalorRejectBtnVisible = true;
                     }
                     else if (actorActivity.subType === 'admin' &&
                         isUserAdmin &&
-                        isAllActivitiesPending) {
+                        isAllActivitiesPending &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
-                    // 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.subType === 'manager_of_manager') &&
                         actorActivity.userId === null &&
-                        isAdminFallbackApprover === true &&
-                        isUserAdmin === true) {
+                        isAdminFallbackApprover &&
+                        isUserAdmin &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    pendingStep.displayPendingApproverAsAdmin) {
+                    isApprovalorRejectBtnVisible = true;
+                }
             }
         }
     }
@@ -253,27 +266,39 @@ export const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInU
                         break;
                     }
                 }
+                const sodBlocked = isSodExcludedViewerBlocked(sodExcludedApproverUserId, signedInUser?.userId, stepWithStatus.actorsActivity);
                 for (const actorActivity of stepWithStatus.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
+                    if (!sodBlocked &&
+                        actorActivity.actor?.userId === signedInUser?.userId &&
                         isAllActivitiesPending) {
                         isApprovalorRejectBtnVisible = true;
                     }
                     else if (actorActivity.subType === 'admin' &&
                         isUserAdmin &&
-                        isAllActivitiesPending) {
+                        isAllActivitiesPending &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
-                    // 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.subType === 'manager_of_manager') &&
                         actorActivity.userId === null &&
-                        isAdminFallbackApprover === true &&
-                        isUserAdmin === true) {
+                        isAdminFallbackApprover &&
+                        isUserAdmin &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    stepWithStatus.displayPendingApproverAsAdmin) {
+                    isApprovalorRejectBtnVisible = true;
+                }
             }
             if (isApprovalorRejectBtnVisible) {
                 break;

package/lib/esm/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -7,7 +7,7 @@ import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { getUserByUserId, getUsersByUserIds, } from '../../../../entity/user/userSelector';
 import { hasAdminLevelAccess, hasReimbursementUserAccess, } from '../../../../entity/userRole/userRoleType';
 import { dateNow } from '../../../../zeniDayJS';
-import { isBulkProcessing } from '../../helpers';
+import { isBulkProcessing, isSodAdminFallbackEligibleForStep } from '../../helpers';
 import { getReimbursementConfigBotEmail } from '../../reimbursement/reimbursementConfig/reimbursementConfigSelector';
 import { applyAdvancedFiltersOnList, isRemiListDownloadable, } from '../../spendManagementFilterHelpers';
 import { ALL_REMI_TABS, getRemiListKey, } from './remiListState';
@@ -209,7 +209,7 @@ export const getApproversOrRejectors = (reimbursement, entityApprovalStatusState
     };
     if (reimbursement.entityApprovalId !== null) {
         const entityApprovalStatus = entityApprovalStatusState.entityApprovalStatusById[reimbursement.entityApprovalId];
-        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = entityApprovalStatus;
+        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
         const isReimbursementSerailized = areApprovalsSerialized === true &&
             currentPendingStepIndex != null &&
             currentPendingStepIndex > -1;
@@ -237,23 +237,20 @@ export const getApproversOrRejectors = (reimbursement, entityApprovalStatusState
                 if (isReimbursementSerailized) {
                     requireApprovalInfo = [stepsApprovalStatus[currentPendingStepIndex]];
                 }
-                const pendingActivitiesList = [];
                 requireApprovalInfo.forEach((approvalStep) => {
-                    const pendingActivities = approvalStep.actorsActivity.filter((activity) => activity.activity === 'pending');
-                    //if isReimbursementSerailized, we need to show all the approvers in currentPendingStepIndex
-                    if (isReimbursementSerailized) {
-                        pendingActivitiesList.push(...pendingActivities);
+                    if (approvers.displayPendingApproverAsAdmin) {
+                        return;
                     }
-                    else {
-                        //if not isReimbursementSerailized, we need to show all the first approvers in each steps_approval_status
-                        const pendingActivity = pendingActivities[0];
-                        if (pendingActivity != null) {
-                            pendingActivitiesList.push(pendingActivity);
-                        }
+                    const pendingActivities = approvalStep.actorsActivity.filter((activity) => activity.activity === 'pending');
+                    const sodDisplayAsAdmin = isSodAdminFallbackEligibleForStep(sodExcludedApproverUserId, isAdminFallbackApprover, approvalStep.actorsActivity);
+                    const activitiesToShow = isReimbursementSerailized
+                        ? pendingActivities
+                        : pendingActivities.slice(0, 1);
+                    if (sodDisplayAsAdmin) {
+                        approvers.displayPendingApproverAsAdmin = true;
+                        return;
                     }
-                });
-                if (pendingActivitiesList.length > 0) {
-                    pendingActivitiesList.forEach((activity) => {
+                    activitiesToShow.forEach((activity) => {
                         const user = getUserByUserId(userState, activity.userId);
                         if (user != null) {
                             approvers.users.push(user);
@@ -265,7 +262,7 @@ export const getApproversOrRejectors = (reimbursement, entityApprovalStatusState
                             }
                         }
                     });
-                }
+                });
             }
         }
     }

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

@@ -54,6 +54,7 @@ export interface BillDetailViewSelector extends SelectorView {
 export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
+    displayPendingApproverAsAdmin?: boolean;
 }
 export interface ActorActivityWithUser {
     activity: ActivityStatus;
@@ -77,6 +78,7 @@ 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

@@ -63,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, } = entityApprovalStatus;
+                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, isRealTimeApprovalEnabled, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
                 const approvalRule = approvalRules.find((rule) => rule.approvalRuleId === approvalRuleId);
                 return {
                     approvalRuleId,
@@ -75,21 +75,22 @@ 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: step.actorsActivity.map((activity) => {
-                                return {
-                                    ...activity,
-                                    actor: (0, userSelector_1.getUserByUserId)(userState, activity.userId),
-                                };
-                            }),
+                            actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
+                            displayPendingApproverAsAdmin: (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
                         };
                     }),
                 };
@@ -256,7 +257,7 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
     let isMarkAsPaidBtnVisible = false;
     let rejectedId = -1;
     const stepsWithStatusData = billActivities[0].stepsWithStatus;
-    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = billActivities[0];
+    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = billActivities[0];
     for (const [index, stepWithStatus] of stepsWithStatusData.entries()) {
         if (stepWithStatus.action === 'require_approval') {
             for (const actorActivity of stepWithStatus.actorsActivity) {
@@ -297,23 +298,42 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
-                for (const actorActivity of pendingStep.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
-                        isAllActivitiesPending) {
-                        isApprovalorRejectBtnVisible = true;
-                        isMarkAsPaidBtnVisible = isLastApprovalStep;
+                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;
+                        }
                     }
-                    // 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) {
+                    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 &&
+                            isUserAdmin &&
+                            signedInUser?.userId != null &&
+                            signedInUser.userId !== sodExcludedApproverUserId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = isLastApprovalStep;
+                            break;
+                        }
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    pendingStep.displayPendingApproverAsAdmin) {
+                    isApprovalorRejectBtnVisible = true;
+                    isMarkAsPaidBtnVisible = isLastApprovalStep;
+                }
             }
         }
     }
@@ -327,23 +347,42 @@ const checkApproveRejectBtnShow = (billActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
-                for (const actorActivity of stepWithStatus.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
-                        isAllActivitiesPending) {
-                        isApprovalorRejectBtnVisible = true;
-                        isMarkAsPaidBtnVisible = true;
+                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;
+                        }
                     }
-                    // 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) {
+                    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 &&
+                            isUserAdmin &&
+                            signedInUser?.userId != null &&
+                            signedInUser.userId !== sodExcludedApproverUserId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = true;
+                            break;
+                        }
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    stepWithStatus.displayPendingApproverAsAdmin) {
+                    isApprovalorRejectBtnVisible = true;
+                    isMarkAsPaidBtnVisible = true;
+                }
             }
             if (isApprovalorRejectBtnVisible) {
                 break;

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, } = entityApprovalStatus;
+        const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = entityApprovalStatus;
         const isBillSerailized = areApprovalsSerialized === true &&
             currentPendingStepIndex != null &&
             currentPendingStepIndex > -1;
@@ -325,23 +325,20 @@ const getApproversOrRejectors = (billTransaction, entityApprovalStatusState, use
                 if (isBillSerailized) {
                     requireApprovalInfo = [stepsApprovalStatus[currentPendingStepIndex]];
                 }
-                const pendingActivitiesList = [];
                 requireApprovalInfo.forEach((approvalStep) => {
-                    const pendingActivities = approvalStep.actorsActivity.filter((activity) => activity.activity === 'pending');
-                    //if isBillSerailized, we need to show all the approvers in currentPendingStepIndex
-                    if (isBillSerailized) {
-                        pendingActivitiesList.push(...pendingActivities);
+                    if (approvers.displayPendingApproverAsAdmin) {
+                        return;
                     }
-                    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);
-                        }
+                    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 (pendingActivitiesList.length > 0) {
-                    pendingActivitiesList.forEach((activity) => {
+                    activitiesToShow.forEach((activity) => {
                         const user = (0, userSelector_1.getUserByUserId)(userState, activity.userId);
                         if (user != null) {
                             approvers.users.push(user);
@@ -353,7 +350,7 @@ const getApproversOrRejectors = (billTransaction, entityApprovalStatusState, use
                             }
                         }
                     });
-                }
+                });
             }
         }
     }

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, billPaySetupApproverViewState, plaidAccountViewState, } = state;
+    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 transaction = (0, get_1.default)(billTransactionState.transactionById, billId ?? '', undefined);
     let recommendations = {};
     if (billId != null) {
@@ -186,7 +186,6 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
                 const fetchStateList = [
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
-                    billPaySetupApproverViewState,
                 ];
                 if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
                     fetchStateList.push(classListState);
@@ -207,7 +206,6 @@ 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,7 +8,6 @@ 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 fetchBillPaySetupApproverView> | 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 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,7 +11,6 @@ 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;
@@ -41,10 +40,6 @@ 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' &&
@@ -83,15 +78,6 @@ 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/helpers.d.ts

@@ -1,4 +1,5 @@
 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';
@@ -6,13 +7,16 @@ import { ReimbursementTypeCode } from '../../entity/reimbursement/reimbursementS
 import { CurrentTenant } from '../../entity/tenant/tenantSelector';
 import { RoleMap } from '../../entity/userRole/userRoleType';
 import { ZeniDate } from '../../zeniDayJS';
-import { BillActivity } from './billPay/billDetailView/billDetailViewSelector';
+import { ActorActivityWithUser, 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 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 = 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 = exports.isSodAdminFallbackEligibleForStep = exports.isSodExcludedViewerBlocked = exports.isUserActorOnApprovalStep = void 0;
 exports.getSpendManagementEffectiveListPeriod = getSpendManagementEffectiveListPeriod;
 exports.showReimbursementPromoPage = showReimbursementPromoPage;
 exports.showBillPayPromoPage = showBillPayPromoPage;
@@ -16,6 +16,23 @@ 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) {
+        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 getLatestApprovalDate = (allActivities) => {
     let allStepsWithStatus = [];
     let allApprovedActions = [];

package/lib/view/spendManagement/reimbursement/remiDetailView/remiDetailViewSelector.d.ts

@@ -43,6 +43,7 @@ export interface RemiDetails extends Reimbursement {
 export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
+    displayPendingApproverAsAdmin?: boolean;
 }
 export interface ActorActivityWithUser extends Actor {
     activity: ActivityStatus;
@@ -66,6 +67,7 @@ export interface RemiActivity {
     currentPendingStepIndex?: number;
     entityApprovalId?: ID;
     isAdminFallbackApprover?: boolean;
+    sodExcludedApproverUserId?: ID;
 }
 export declare const getRemiDetailView: (state: RootState, reimbursementId: ID) => RemiDetailViewSelector;
 export declare const getRemiActivities: (state: RootState, reimbursementId: ID, billStageCode?: BillStageCodeType) => RemiActivity[];

package/lib/view/spendManagement/reimbursement/remiDetailView/remiDetailViewSelector.js

@@ -151,7 +151,7 @@ const getRemiActivities = (state, reimbursementId, billStageCode) => {
             const approvalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, remiTransactionDetails.approvalRuleIds);
             const entityApprovalStatusByIds = (0, entityApprovalStatusSelector_1.getEntityApprovalStatusByIds)(entityApprovalStatusState, remiTransactionDetails.entityApprovalIds);
             remiActivities = entityApprovalStatusByIds.map((entityApprovalStatus) => {
-                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, isRealTimeApprovalEnabled, } = entityApprovalStatus;
+                const { approvalRuleId, entityType, createTime, updateTime, stepsApprovalStatus, areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, isRealTimeApprovalEnabled, sodExcludedApproverUserId, } = entityApprovalStatus;
                 const approvalRule = approvalRules.find((rule) => rule.approvalRuleId === approvalRuleId);
                 return {
                     approvalRuleId,
@@ -163,21 +163,22 @@ const getRemiActivities = (state, reimbursementId, billStageCode) => {
                     isAdminFallbackApprover,
                     currentPendingStepIndex,
                     isRealTimeApprovalEnabled,
+                    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: step.actorsActivity.map((activity) => {
-                                return {
-                                    ...activity,
-                                    actor: (0, userSelector_1.getUserByUserId)(userState, activity.userId),
-                                };
-                            }),
+                            actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
+                            displayPendingApproverAsAdmin: (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
                         };
                     }),
                 };
@@ -191,7 +192,7 @@ const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInUser) =>
     let isApprovalorRejectBtnVisible = false;
     let rejectedId = -1;
     const stepsWithStatusData = remiActivities[0].stepsWithStatus;
-    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, } = remiActivities[0];
+    const { areApprovalsSerialized, isAdminFallbackApprover, currentPendingStepIndex, sodExcludedApproverUserId, } = remiActivities[0];
     for (const [index, stepWithStatus] of stepsWithStatusData.entries()) {
         if (stepWithStatus.action === 'require_approval') {
             for (const actorActivity of stepWithStatus.actorsActivity) {
@@ -227,27 +228,39 @@ const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
+                const sodBlocked = (0, helpers_1.isSodExcludedViewerBlocked)(sodExcludedApproverUserId, signedInUser?.userId, pendingStep.actorsActivity);
                 for (const actorActivity of pendingStep.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
+                    if (!sodBlocked &&
+                        actorActivity.actor?.userId === signedInUser?.userId &&
                         isAllActivitiesPending) {
                         isApprovalorRejectBtnVisible = true;
                     }
                     else if (actorActivity.subType === 'admin' &&
                         isUserAdmin &&
-                        isAllActivitiesPending) {
+                        isAllActivitiesPending &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
-                    // 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.subType === 'manager_of_manager') &&
                         actorActivity.userId === null &&
-                        isAdminFallbackApprover === true &&
-                        isUserAdmin === true) {
+                        isAdminFallbackApprover &&
+                        isUserAdmin &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    pendingStep.displayPendingApproverAsAdmin) {
+                    isApprovalorRejectBtnVisible = true;
+                }
             }
         }
     }
@@ -261,27 +274,39 @@ const checkApproveRejectBtnShow = (remiActivities, isUserAdmin, signedInUser) =>
                         break;
                     }
                 }
+                const sodBlocked = (0, helpers_1.isSodExcludedViewerBlocked)(sodExcludedApproverUserId, signedInUser?.userId, stepWithStatus.actorsActivity);
                 for (const actorActivity of stepWithStatus.actorsActivity) {
-                    if (actorActivity.actor?.userId === signedInUser?.userId &&
+                    if (!sodBlocked &&
+                        actorActivity.actor?.userId === signedInUser?.userId &&
                         isAllActivitiesPending) {
                         isApprovalorRejectBtnVisible = true;
                     }
                     else if (actorActivity.subType === 'admin' &&
                         isUserAdmin &&
-                        isAllActivitiesPending) {
+                        isAllActivitiesPending &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
-                    // 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.subType === 'manager_of_manager') &&
                         actorActivity.userId === null &&
-                        isAdminFallbackApprover === true &&
-                        isUserAdmin === true) {
+                        isAdminFallbackApprover &&
+                        isUserAdmin &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    stepWithStatus.displayPendingApproverAsAdmin) {
+                    isApprovalorRejectBtnVisible = true;
+                }
             }
             if (isApprovalorRejectBtnVisible) {
                 break;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.1.66",
+  "version": "5.1.67",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",