@zeniai/client-epic-state 5.1.68-betaDI2 → 5.1.69-betaAK0

package/lib/view/notificationPreferencesView/epics/saveNotificationPreferencesEpic.js

@@ -9,7 +9,12 @@ const notificationPreferencesEndpoint_1 = require("../notificationPreferencesEnd
 const notificationPreferencesViewPayload_1 = require("../notificationPreferencesViewPayload");
 const notificationPreferencesViewReducer_1 = require("../notificationPreferencesViewReducer");
 const notificationPreferencesViewSelector_1 = require("../notificationPreferencesViewSelector");
-const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => notificationPreferencesViewReducer_1.saveNotificationPreferences.match(action)), (0, operators_1.withLatestFrom)(state$), 
+const DEBOUNCE_MS = 300;
+const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)((action) => notificationPreferencesViewReducer_1.toggleEventChannel.match(action) || notificationPreferencesViewReducer_1.setGroupFrequency.match(action)), 
+// Coalesce bursts of toggles into a single PUT. Trade-off: rapid clickers
+// defer saves until they pause. Consider a max-wait wrapper if this
+// becomes a UX problem.
+(0, operators_1.debounceTime)(DEBOUNCE_MS), (0, operators_1.withLatestFrom)(state$), 
 // `switchMap` unsubscribes from any in-flight PUT observable when a new
 // debounced batch fires. The prior HTTP request has already left the
 // client — the network call is NOT cancelled — but its response is
@@ -108,10 +113,8 @@ const saveNotificationPreferencesEpic = (actions$, state$, zeniAPI) => actions$.
     // under patch-semantic LWW. Cursor Bugbot 3637969823 + 3641372002.
     (0, operators_1.takeUntil)(actions$.pipe((0, operators_1.filter)((action) => notificationPreferencesViewReducer_1.clearNotificationPreferencesLocalOverrides.match(action) ||
         notificationPreferencesViewReducer_1.clearAllNotificationPreferencesView.match(action)))));
-    // `saveNotificationPreferences` (the trigger) already flipped
-    // savePreferencesState to In-Progress via its reducer case, so the PUT
-    // observable is returned directly — re-emitting the trigger here would
-    // loop the epic on itself.
-    return request$;
+    // Flip savePreferencesState to In-Progress BEFORE the network call so
+    // any "saving…" UI can render.
+    return (0, rxjs_1.concat)((0, rxjs_1.of)((0, notificationPreferencesViewReducer_1.saveNotificationPreferences)()), request$);
 }));
 exports.saveNotificationPreferencesEpic = saveNotificationPreferencesEpic;

package/lib/view/notificationPreferencesView/notificationPreferencesViewPayload.d.ts

@@ -1,7 +1,6 @@
 import { NotificationPreferences } from './notificationPreferencesViewState';
 export interface NotificationPreferencesPayload {
     event_enabled_by_channel?: Record<string, Record<string, boolean>>;
-    group_channel_enabled_by_group_id?: Record<string, Record<string, boolean>>;
     group_frequency_by_group_id?: Record<string, string>;
 }
 export declare const mapPayloadToPreferences: (payload?: NotificationPreferencesPayload) => NotificationPreferences;

package/lib/view/notificationPreferencesView/notificationPreferencesViewPayload.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapPreferencesToPayload = exports.mapPayloadToPreferences = void 0;
 const notificationRegistryState_1 = require("../../entity/notificationRegistry/notificationRegistryState");
-const mapChannelEnabledMap = (raw) => {
+const mapEventEnabledByChannel = (raw) => {
     if (raw == null) {
         return {};
     }
@@ -23,8 +23,7 @@ const mapPayloadToPreferences = (payload) => {
         (0, notificationRegistryState_1.toNotificationFrequency)(frequency),
     ]));
     return {
-        eventEnabledByChannel: mapChannelEnabledMap(payload?.event_enabled_by_channel),
-        groupChannelEnabledByGroupId: mapChannelEnabledMap(payload?.group_channel_enabled_by_group_id),
+        eventEnabledByChannel: mapEventEnabledByChannel(payload?.event_enabled_by_channel),
         groupFrequencyByGroupId,
     };
 };
@@ -34,10 +33,6 @@ const mapPreferencesToPayload = (preferences) => {
     if (Object.keys(preferences.eventEnabledByChannel).length > 0) {
         payload.event_enabled_by_channel = preferences.eventEnabledByChannel;
     }
-    if (Object.keys(preferences.groupChannelEnabledByGroupId).length > 0) {
-        payload.group_channel_enabled_by_group_id =
-            preferences.groupChannelEnabledByGroupId;
-    }
     if (Object.keys(preferences.groupFrequencyByGroupId).length > 0) {
         payload.group_frequency_by_group_id = preferences.groupFrequencyByGroupId;
     }

package/lib/view/notificationPreferencesView/notificationPreferencesViewReducer.d.ts

@@ -12,11 +12,6 @@ export interface TogglePreferencePayload {
     enabled: boolean;
     eventId: string;
 }
-export interface SetGroupChannelMasterPayload {
-    channel: NotificationChannel;
-    enabled: boolean;
-    groupId: string;
-}
 export interface FetchNotificationPreferencesSuccessPayload {
     preferences: NotificationPreferencesPayload | undefined;
     saveEpochAtDispatch: number;
@@ -30,6 +25,6 @@ export interface SaveNotificationPreferencesFailurePayload {
     cancelEpochAtDispatch: number;
     error?: ZeniAPIStatus;
 }
-export declare const clearAllNotificationPreferencesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/clearAllNotificationPreferencesView">, clearNotificationPreferencesLocalOverrides: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/clearNotificationPreferencesLocalOverrides">, fetchNotificationPreferencesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<FetchNotificationPreferencesSuccessPayload, "notificationPreferencesView/fetchNotificationPreferencesSuccess">, saveNotificationPreferences: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/saveNotificationPreferences">, saveNotificationPreferencesFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveNotificationPreferencesFailurePayload, "notificationPreferencesView/saveNotificationPreferencesFailure">, saveNotificationPreferencesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveNotificationPreferencesSuccessPayload, "notificationPreferencesView/saveNotificationPreferencesSuccess">, setGroupChannelMaster: import("@reduxjs/toolkit").ActionCreatorWithPayload<SetGroupChannelMasterPayload, "notificationPreferencesView/setGroupChannelMaster">, setGroupFrequency: import("@reduxjs/toolkit").ActionCreatorWithPayload<SetFrequencyPayload, "notificationPreferencesView/setGroupFrequency">, toggleEventChannel: import("@reduxjs/toolkit").ActionCreatorWithPayload<TogglePreferencePayload, "notificationPreferencesView/toggleEventChannel">;
+export declare const clearAllNotificationPreferencesView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/clearAllNotificationPreferencesView">, clearNotificationPreferencesLocalOverrides: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/clearNotificationPreferencesLocalOverrides">, fetchNotificationPreferencesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<FetchNotificationPreferencesSuccessPayload, "notificationPreferencesView/fetchNotificationPreferencesSuccess">, saveNotificationPreferences: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationPreferencesView/saveNotificationPreferences">, saveNotificationPreferencesFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveNotificationPreferencesFailurePayload, "notificationPreferencesView/saveNotificationPreferencesFailure">, saveNotificationPreferencesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<SaveNotificationPreferencesSuccessPayload, "notificationPreferencesView/saveNotificationPreferencesSuccess">, setGroupFrequency: import("@reduxjs/toolkit").ActionCreatorWithPayload<SetFrequencyPayload, "notificationPreferencesView/setGroupFrequency">, toggleEventChannel: import("@reduxjs/toolkit").ActionCreatorWithPayload<TogglePreferencePayload, "notificationPreferencesView/toggleEventChannel">;
 declare const _default: import("redux").Reducer<NotificationPreferencesViewState>;
 export default _default;

package/lib/view/notificationPreferencesView/notificationPreferencesViewReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toggleEventChannel = exports.setGroupFrequency = exports.setGroupChannelMaster = exports.saveNotificationPreferencesSuccess = exports.saveNotificationPreferencesFailure = exports.saveNotificationPreferences = exports.fetchNotificationPreferencesSuccess = exports.clearNotificationPreferencesLocalOverrides = exports.clearAllNotificationPreferencesView = exports.initialState = void 0;
+exports.toggleEventChannel = exports.setGroupFrequency = exports.saveNotificationPreferencesSuccess = exports.saveNotificationPreferencesFailure = exports.saveNotificationPreferences = exports.fetchNotificationPreferencesSuccess = exports.clearNotificationPreferencesLocalOverrides = exports.clearAllNotificationPreferencesView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const notificationPreferencesViewPayload_1 = require("./notificationPreferencesViewPayload");
 const notificationPreferencesViewState_1 = require("./notificationPreferencesViewState");
@@ -22,18 +22,8 @@ const mergePreferences = (base, patch) => {
             ...channels,
         };
     });
-    const groupChannelEnabledByGroupId = {
-        ...base.groupChannelEnabledByGroupId,
-    };
-    Object.entries(patch.groupChannelEnabledByGroupId).forEach(([groupId, channels]) => {
-        groupChannelEnabledByGroupId[groupId] = {
-            ...(base.groupChannelEnabledByGroupId[groupId] ?? {}),
-            ...channels,
-        };
-    });
     return {
         eventEnabledByChannel,
-        groupChannelEnabledByGroupId,
         groupFrequencyByGroupId: {
             ...base.groupFrequencyByGroupId,
             ...patch.groupFrequencyByGroupId,
@@ -75,38 +65,13 @@ const subtractSavedOverrides = (current, saved) => {
             eventEnabledByChannel[eventId] = remainingChannels;
         }
     });
-    // Same value-equality subtraction as eventEnabledByChannel above — a
-    // group-channel master the user re-flipped while a PUT was in flight must
-    // survive so the next debounce cycle re-sends it.
-    const groupChannelEnabledByGroupId = {};
-    Object.entries(current.groupChannelEnabledByGroupId).forEach(([groupId, channels]) => {
-        const savedChannels = saved.groupChannelEnabledByGroupId[groupId];
-        if (savedChannels == null) {
-            groupChannelEnabledByGroupId[groupId] = channels;
-            return;
-        }
-        const remainingChannels = {};
-        Object.keys(channels).forEach((channel) => {
-            if (!(channel in savedChannels) ||
-                channels[channel] !== savedChannels[channel]) {
-                remainingChannels[channel] = channels[channel];
-            }
-        });
-        if (Object.keys(remainingChannels).length > 0) {
-            groupChannelEnabledByGroupId[groupId] = remainingChannels;
-        }
-    });
     const groupFrequencyByGroupId = {};
     Object.entries(current.groupFrequencyByGroupId).forEach(([groupId, frequency]) => {
         if (saved.groupFrequencyByGroupId[groupId] !== frequency) {
             groupFrequencyByGroupId[groupId] = frequency;
         }
     });
-    return {
-        eventEnabledByChannel,
-        groupChannelEnabledByGroupId,
-        groupFrequencyByGroupId,
-    };
+    return { eventEnabledByChannel, groupFrequencyByGroupId };
 };
 const notificationPreferencesView = (0, toolkit_1.createSlice)({
     name: 'notificationPreferencesView',
@@ -243,16 +208,6 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
             draft.preferences = mergePreferences(draft.preferences, patch);
             draft.localOverrides = subtractSavedOverrides(draft.localOverrides, action.payload.savedOverrides);
         },
-        setGroupChannelMaster(draft, action) {
-            // Mirror of `toggleEventChannel` but scoped to the group-channel master
-            // held under `groupChannelEnabledByGroupId[groupId][channel]`.
-            const { channel, enabled, groupId } = action.payload;
-            const groupMap = {
-                ...(draft.localOverrides.groupChannelEnabledByGroupId[groupId] ?? {}),
-            };
-            groupMap[channel] = enabled;
-            draft.localOverrides.groupChannelEnabledByGroupId[groupId] = groupMap;
-        },
         setGroupFrequency(draft, action) {
             draft.localOverrides.groupFrequencyByGroupId[action.payload.groupId] =
                 action.payload.frequency;
@@ -267,5 +222,5 @@ const notificationPreferencesView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = notificationPreferencesView.actions, exports.clearAllNotificationPreferencesView = _a.clearAllNotificationPreferencesView, exports.clearNotificationPreferencesLocalOverrides = _a.clearNotificationPreferencesLocalOverrides, exports.fetchNotificationPreferencesSuccess = _a.fetchNotificationPreferencesSuccess, exports.saveNotificationPreferences = _a.saveNotificationPreferences, exports.saveNotificationPreferencesFailure = _a.saveNotificationPreferencesFailure, exports.saveNotificationPreferencesSuccess = _a.saveNotificationPreferencesSuccess, exports.setGroupChannelMaster = _a.setGroupChannelMaster, exports.setGroupFrequency = _a.setGroupFrequency, exports.toggleEventChannel = _a.toggleEventChannel;
+_a = notificationPreferencesView.actions, exports.clearAllNotificationPreferencesView = _a.clearAllNotificationPreferencesView, exports.clearNotificationPreferencesLocalOverrides = _a.clearNotificationPreferencesLocalOverrides, exports.fetchNotificationPreferencesSuccess = _a.fetchNotificationPreferencesSuccess, exports.saveNotificationPreferences = _a.saveNotificationPreferences, exports.saveNotificationPreferencesFailure = _a.saveNotificationPreferencesFailure, exports.saveNotificationPreferencesSuccess = _a.saveNotificationPreferencesSuccess, exports.setGroupFrequency = _a.setGroupFrequency, exports.toggleEventChannel = _a.toggleEventChannel;
 exports.default = notificationPreferencesView.reducer;

package/lib/view/notificationPreferencesView/notificationPreferencesViewSelector.js

@@ -13,16 +13,8 @@ const getEffectiveNotificationPreferences = (state) => {
             ...channels,
         };
     });
-    const mergedGroupChannelEnabledByGroupId = { ...view.preferences.groupChannelEnabledByGroupId };
-    Object.entries(view.localOverrides.groupChannelEnabledByGroupId).forEach(([groupId, channels]) => {
-        mergedGroupChannelEnabledByGroupId[groupId] = {
-            ...(view.preferences.groupChannelEnabledByGroupId[groupId] ?? {}),
-            ...channels,
-        };
-    });
     return {
         eventEnabledByChannel: mergedEventEnabledByChannel,
-        groupChannelEnabledByGroupId: mergedGroupChannelEnabledByGroupId,
         groupFrequencyByGroupId: {
             ...view.preferences.groupFrequencyByGroupId,
             ...view.localOverrides.groupFrequencyByGroupId,
@@ -35,7 +27,6 @@ exports.getNotificationLocalOverrides = getNotificationLocalOverrides;
 const hasUnsavedNotificationPreferences = (state) => {
     const overrides = getView(state).localOverrides;
     return (Object.keys(overrides.eventEnabledByChannel).length > 0 ||
-        Object.keys(overrides.groupChannelEnabledByGroupId).length > 0 ||
         Object.keys(overrides.groupFrequencyByGroupId).length > 0);
 };
 exports.hasUnsavedNotificationPreferences = hasUnsavedNotificationPreferences;

package/lib/view/notificationPreferencesView/notificationPreferencesViewState.d.ts

@@ -2,7 +2,6 @@ import { FetchStateAndError } from '../../commonStateTypes/common';
 import { NotificationChannel, NotificationFrequency } from '../../entity/notificationRegistry/notificationRegistryState';
 export interface NotificationPreferences {
     eventEnabledByChannel: Record<string, Partial<Record<NotificationChannel, boolean>>>;
-    groupChannelEnabledByGroupId: Record<string, Partial<Record<NotificationChannel, boolean>>>;
     groupFrequencyByGroupId: Record<string, NotificationFrequency>;
 }
 export interface NotificationPreferencesViewState {

package/lib/view/notificationPreferencesView/notificationPreferencesViewState.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.emptyNotificationPreferences = void 0;
 const emptyNotificationPreferences = () => ({
     eventEnabledByChannel: {},
-    groupChannelEnabledByGroupId: {},
     groupFrequencyByGroupId: {},
 });
 exports.emptyNotificationPreferences = emptyNotificationPreferences;

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

@@ -55,6 +55,7 @@ export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
     displayPendingApproverAsAdmin?: boolean;
+    showSodAdminLabel?: boolean;
 }
 export interface ActorActivityWithUser {
     activity: ActivityStatus;

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

@@ -28,7 +28,12 @@ const billPayConfigState_1 = require("../billPayConfig/billPayConfigState");
 const previousBillsSelector_1 = require("../previousBills/previousBillsSelector");
 const billDetailViewState_1 = require("./billDetailViewState");
 const getBillActivities = (state, billId, billStageCode) => {
-    const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, } = state;
+    const { billDetailViewState, approvalRuleState, entityApprovalStatusState, userState, billTransactionState, } = state;
+    // Note: createdBy is undefined until billTransactionState is populated.
+    // getBillActivities is called from getBillDetailView which runs after the
+    // bill entity epic completes — this assumption must hold for showSodAdminLabel
+    // to render on first paint.
+    const createdBy = billTransactionState.transactionById[billId]?.createdBy;
     const key = (0, billDetailViewState_1.getBillTransactionDetailKey)(billId);
     const billDetail = (0, get_1.default)(billDetailViewState.billDetailById, key, undefined);
     let billActivities = [];
@@ -91,6 +96,7 @@ const getBillActivities = (state, billId, billStageCode) => {
                             actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
                             displayPendingApproverAsAdmin: (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
+                            showSodAdminLabel: (0, helpers_1.shouldShowSodAdminLabel)(sodExcludedApproverUserId, actorsActivity, createdBy),
                         };
                     }),
                 };

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

@@ -17,6 +17,7 @@ import { RemiActivity } from './reimbursement/remiDetailView/remiDetailViewSelec
 export declare const isUserActorOnApprovalStep: (userId: ID, stepActorsActivity: ActorActivityWithUser[]) => boolean;
 export declare const isSodExcludedViewerBlocked: (sodExcludedApproverUserId?: ID, signedInUserId?: ID, stepActorsActivity?: ActorActivityWithUser[]) => boolean;
 export declare const isSodAdminFallbackEligibleForStep: (sodExcludedApproverUserId?: ID, isAdminFallbackApprover?: boolean, stepActorsActivity?: ActorActivityWithUser[]) => boolean;
+export declare const shouldShowSodAdminLabel: (sodExcludedApproverUserId?: ID, stepActorsActivity?: ActorActivityWithUser[], entitySubjectUserId?: ID) => boolean;
 export declare const getLatestApprovalDate: (allActivities: BillActivity[] | RemiActivity[]) => ZeniDate | undefined;
 export declare function getSpendManagementEffectiveListPeriod(): import("../..").TimePeriod;
 export declare const getSelectedCompanyOfficer: (verificationDetails: BusinessVerificationDetails) => CompanyOfficersDetails | undefined;

package/lib/view/spendManagement/helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSameDayAchDisablementConfig = exports.checkIfLowBalance = exports.getReportIDPlusForecastIDFromSetupViewType = exports.isAwaitingMarkAsPaid = exports.isPaymentMethodOutsideZeni = exports.toAccountsPromoConfig = exports.getBulkOperationSuffix = exports.getRemiListUniqueType = exports.getBillListUniqueType = exports.isBulkProcessing = exports.getActualPaymentDate = exports.accountTypeSubConfigCodeToAccType = exports.isRecurringConfigChanged = exports.updateRecurringBillDetails = exports.getPaymentDateFromVendorReceiveDate = exports.getSelectedCompanyOfficer = exports.getLatestApprovalDate = exports.isSodAdminFallbackEligibleForStep = exports.isSodExcludedViewerBlocked = exports.isUserActorOnApprovalStep = void 0;
+exports.toSameDayAchDisablementConfig = exports.checkIfLowBalance = exports.getReportIDPlusForecastIDFromSetupViewType = exports.isAwaitingMarkAsPaid = exports.isPaymentMethodOutsideZeni = exports.toAccountsPromoConfig = exports.getBulkOperationSuffix = exports.getRemiListUniqueType = exports.getBillListUniqueType = exports.isBulkProcessing = exports.getActualPaymentDate = exports.accountTypeSubConfigCodeToAccType = exports.isRecurringConfigChanged = exports.updateRecurringBillDetails = exports.getPaymentDateFromVendorReceiveDate = exports.getSelectedCompanyOfficer = exports.getLatestApprovalDate = exports.shouldShowSodAdminLabel = exports.isSodAdminFallbackEligibleForStep = exports.isSodExcludedViewerBlocked = exports.isUserActorOnApprovalStep = void 0;
 exports.getSpendManagementEffectiveListPeriod = getSpendManagementEffectiveListPeriod;
 exports.showReimbursementPromoPage = showReimbursementPromoPage;
 exports.showBillPayPromoPage = showBillPayPromoPage;
@@ -33,6 +33,19 @@ const isSodAdminFallbackEligibleForStep = (sodExcludedApproverUserId, isAdminFal
         pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
 };
 exports.isSodAdminFallbackEligibleForStep = isSodAdminFallbackEligibleForStep;
+const isSodExcludedUserSolePendingApproverOnStep = (sodExcludedApproverUserId, stepActorsActivity = []) => {
+    if (sodExcludedApproverUserId == null) {
+        return false;
+    }
+    const pendingResolvedApprovers = stepActorsActivity.filter((activity) => activity.activity === 'pending' && getUserActorId(activity) != null);
+    return (pendingResolvedApprovers.length > 0 &&
+        pendingResolvedApprovers.every((activity) => getUserActorId(activity) === sodExcludedApproverUserId));
+};
+const shouldShowSodAdminLabel = (sodExcludedApproverUserId, stepActorsActivity = [], entitySubjectUserId) => sodExcludedApproverUserId != null &&
+    entitySubjectUserId != null &&
+    sodExcludedApproverUserId === entitySubjectUserId &&
+    isSodExcludedUserSolePendingApproverOnStep(sodExcludedApproverUserId, stepActorsActivity);
+exports.shouldShowSodAdminLabel = shouldShowSodAdminLabel;
 const getLatestApprovalDate = (allActivities) => {
     let allStepsWithStatus = [];
     let allApprovedActions = [];

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

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

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

@@ -9,7 +9,6 @@ const userFinancialAccountReducer_1 = require("../../../../userFinancialAccount/
 const userFinancialAccountSelector_1 = require("../../../../userFinancialAccount/userFinancialAccountSelector");
 const merchantListReducer_1 = require("../../../merchantList/merchantListReducer");
 const reimbursementConfigReducer_1 = require("../../reimbursementConfig/reimbursementConfigReducer");
-const remiSetupApproverViewReducer_1 = require("../../remiSetupApproverView/remiSetupApproverViewReducer");
 const editRemiViewReducer_1 = require("../editRemiViewReducer");
 const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.fetchEditRemiDetailPage.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, isLimitedCategoryEnabled, reimbursementId, isShowDeletedReimbursementEnabled, } = action.payload;
@@ -62,17 +61,6 @@ const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
         if (reimbursementId != null) {
             remiDetailActions.push((0, editRemiViewReducer_1.fetchRemiAndInitializeLocalStore)(reimbursementId, false, isShowDeletedReimbursementEnabled));
         }
-        else {
-            const approvalRules = state.remiSetupApproverViewState;
-            if (approvalRules.fetchState !== 'Completed' &&
-                approvalRules.fetchState !== 'In-Progress') {
-                // Side-fetch from the edit-reim page bootstrap. The
-                // triggering action doesn't carry the V3 flag, so we
-                // explicitly target v1; v3 tenants re-fetch via their
-                // own screen connector.
-                remiDetailActions.push((0, remiSetupApproverViewReducer_1.fetchRemiSetupApproverView)(true, false, false, false));
-            }
-        }
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(remiDetailActions));
 }));

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

@@ -44,6 +44,7 @@ export interface StepWithStatus extends StepWithUser {
     actorsActivity: ActorActivityWithUser[];
     isOriginalApprovalStep: boolean;
     displayPendingApproverAsAdmin?: boolean;
+    showSodAdminLabel?: boolean;
 }
 export interface ActorActivityWithUser extends Actor {
     activity: ActivityStatus;

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

@@ -117,7 +117,8 @@ const getRemiDetailView = (state, reimbursementId) => {
 };
 exports.getRemiDetailView = getRemiDetailView;
 const getRemiActivities = (state, reimbursementId, billStageCode) => {
-    const { remiDetailViewState, approvalRuleState, entityApprovalStatusState, userState, } = state;
+    const { remiDetailViewState, approvalRuleState, entityApprovalStatusState, userState, reimbursementState, } = state;
+    const reimburseeUserId = reimbursementState.reimbursementById[reimbursementId]?.reimburseeUserId;
     const remiTransactionDetails = (0, get_1.default)(remiDetailViewState.remiDetailById, reimbursementId, undefined);
     let remiActivities = [];
     if (remiTransactionDetails != null) {
@@ -179,6 +180,7 @@ const getRemiActivities = (state, reimbursementId, billStageCode) => {
                             actorsActivity,
                             isOriginalApprovalStep: step.isOriginalApprovalStep,
                             displayPendingApproverAsAdmin: (0, helpers_1.isSodAdminFallbackEligibleForStep)(sodExcludedApproverUserId, isAdminFallbackApprover, actorsActivity),
+                            showSodAdminLabel: (0, helpers_1.shouldShowSodAdminLabel)(sodExcludedApproverUserId, actorsActivity, reimburseeUserId),
                         };
                     }),
                 };

package/package.json

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