@zeniai/client-epic-state 5.1.66 → 5.1.68

package/lib/esm/view/invoicing/createInvoice/createInvoiceReducer.js

@@ -14,6 +14,20 @@ const createInvoiceSlice = createSlice({
     name: 'invoicingCreateInvoice',
     initialState,
     reducers: {
+        /**
+         * Trigger-only action for {@link fetchCreateInvoiceFormPageEpic}: fans out to
+         * the customer/plan/product/settings fetches, skipping any already cached
+         * unless `cacheOverride` is set. Holds no state of its own.
+         */
+        fetchCreateInvoiceFormPage: {
+            reducer() {
+                // No state mutation; fetchCreateInvoiceFormPageEpic fans out to the
+                // customer/plan/product/settings fetches in response to this action.
+            },
+            prepare(payload) {
+                return { payload };
+            },
+        },
         updateInvoicingCreateInvoiceFormDraft(draft, action) {
             draft.formDraft = action.payload;
         },
@@ -37,5 +51,5 @@ const createInvoiceSlice = createSlice({
         },
     },
 });
-export const { createInvoice, createInvoiceSuccess, createInvoiceFailure, resetCreateInvoice, updateInvoicingCreateInvoiceFormDraft, } = createInvoiceSlice.actions;
+export const { createInvoice, createInvoiceSuccess, createInvoiceFailure, fetchCreateInvoiceFormPage, resetCreateInvoice, updateInvoicingCreateInvoiceFormDraft, } = createInvoiceSlice.actions;
 export default createInvoiceSlice.reducer;

package/lib/esm/view/invoicing/createInvoice/createInvoiceSelector.js

@@ -12,10 +12,14 @@ import { getInvoicingSettings } from '../settingsView/settingsViewSelector';
 export const getCreateInvoiceFormView = (state) => {
     const createInvoiceState = state.invoicingCreateInvoiceState;
     const catalogListView = getInvoicingCatalogListView(state);
+    const plans = getInvoicingCatalogPrices(catalogListView.plans);
     return {
         customers: getInvoicingCustomerListView(state).customers,
         localData: createInvoiceState.formDraft,
-        plans: getInvoicingCatalogPrices(catalogListView.plans),
+        planNames: plans
+            .map((plan) => plan.name ?? '')
+            .filter((name) => name !== ''),
+        plans,
         products: getInvoicingCatalogPrices(catalogListView.products),
         savedInvoiceId: createInvoiceState.createdInvoiceId,
         settings: getInvoicingSettings(state),

package/lib/esm/view/invoicing/createInvoice/epics/fetchCreateInvoiceFormPageEpic.js

@@ -0,0 +1,50 @@
+import { from } from 'rxjs';
+import { filter, mergeMap } from 'rxjs/operators';
+import { fetchInvoicingCatalogPlanList, fetchInvoicingCatalogProductList, } from '../../invoicingCatalogListView/invoicingCatalogListViewReducer';
+import { fetchInvoicingCustomerList } from '../../invoicingCustomerListView/invoicingCustomerListViewReducer';
+import { fetchInvoicingSettings } from '../../settingsView/settingsViewReducer';
+import { fetchCreateInvoiceFormPage } from '../createInvoiceReducer';
+/**
+ * Fetch unless the resource is already loaded or in flight — or always when the
+ * caller forces a refresh via `cacheOverride` (false on a plain page open, true
+ * to force a reload).
+ */
+const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
+    (fetchStateAndError.fetchState !== 'Completed' &&
+        fetchStateAndError.fetchState !== 'In-Progress');
+/**
+ * Orchestrates the create-invoice form's option sources: on
+ * `fetchCreateInvoiceFormPage`, fans out to the customer, catalog plan, catalog
+ * product and settings fetches, skipping any already cached unless
+ * `cacheOverride` is set.
+ */
+export const fetchCreateInvoiceFormPageEpic = (actions$, state$) => actions$.pipe(filter(fetchCreateInvoiceFormPage.match), mergeMap((action) => {
+    const { cacheOverride } = action.payload;
+    const state = state$.value;
+    const customerState = state.invoicingCustomerListViewState;
+    const catalogState = state.invoicingCatalogListViewState;
+    const settingsState = state.invoicingSettingsViewState;
+    const pageActions = [];
+    if (shouldFetch({ fetchState: customerState.fetchState, error: customerState.error }, cacheOverride)) {
+        pageActions.push(fetchInvoicingCustomerList({
+            filters: {},
+            keepExistingListItems: false,
+        }));
+    }
+    if (shouldFetch({ fetchState: catalogState.fetchState, error: catalogState.error }, cacheOverride)) {
+        pageActions.push(fetchInvoicingCatalogPlanList({
+            filters: { type: 'plan' },
+            keepExistingListItems: false,
+        }));
+    }
+    if (shouldFetch(catalogState.productFetchState, cacheOverride)) {
+        pageActions.push(fetchInvoicingCatalogProductList({
+            filters: { type: 'addon|charge' },
+            keepExistingListItems: false,
+        }));
+    }
+    if (shouldFetch({ fetchState: settingsState.fetchState, error: settingsState.error }, cacheOverride)) {
+        pageActions.push(fetchInvoicingSettings());
+    }
+    return from(pageActions);
+}));

package/lib/esm/view/invoicing/editInvoicingCouponDetailView/editInvoicingCouponDetailViewPayload.js

@@ -9,7 +9,6 @@ export const localDataToSaveInvoicingCouponPayload = (localData, isCreate) => {
         discount_type: localData.discountType,
         duration_type: localData.durationType,
         name: localData.name.trim(),
-        status: 'active',
     };
     if (isCreate) {
         data.id = localData.couponId.trim();

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 === true &&
+                            isUserAdmin &&
+                            signedInUser?.userId != null &&
+                            signedInUser.userId !== sodExcludedApproverUserId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = isLastApprovalStep;
+                            break;
+                        }
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    pendingStep.displayPendingApproverAsAdmin === true) {
+                    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 === true &&
+                            isUserAdmin &&
+                            signedInUser?.userId != null &&
+                            signedInUser.userId !== sodExcludedApproverUserId) {
+                            isApprovalorRejectBtnVisible = true;
+                            isMarkAsPaidBtnVisible = true;
+                            break;
+                        }
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    stepWithStatus.displayPendingApproverAsAdmin === true) {
+                    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 === true) {
+                        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 !== true) {
+        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) {
+                        isUserAdmin &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    pendingStep.displayPendingApproverAsAdmin === true) {
+                    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) {
+                        isUserAdmin &&
+                        signedInUser?.userId != null &&
+                        signedInUser.userId !== sodExcludedApproverUserId) {
                         isApprovalorRejectBtnVisible = true;
                     }
                 }
+                if (!isApprovalorRejectBtnVisible &&
+                    isUserAdmin &&
+                    signedInUser?.userId != null &&
+                    signedInUser.userId !== sodExcludedApproverUserId &&
+                    stepWithStatus.displayPendingApproverAsAdmin === true) {
+                    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 === true) {
+                        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
                             }
                         }
                     });
-                }
+                });
             }
         }
     }