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

package/lib/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewState.d.ts

@@ -6,7 +6,6 @@ export interface InvoicingSubscriptionFilters {
     search?: string;
     startedFrom?: string;
     startedTo?: string;
-    status?: string;
 }
 export declare const ALL_INVOICING_SUBSCRIPTION_SORT_KEYS: readonly ["subscription", "customer", "plan", "product_code", "term_end", "next_billing", "auto_collect", "status", "mrr"];
 export declare const toInvoicingSubscriptionSortKey: (v: string) => "status" | "customer" | "mrr" | "plan" | "subscription" | "product_code" | "term_end" | "next_billing" | "auto_collect";
@@ -34,9 +33,12 @@ export type InvoicingSubscriptionTabId = ReturnType<typeof toInvoicingSubscripti
  */
 export declare const INVOICING_SUBSCRIPTION_TABS: InvoicingSubscriptionTabId[];
 export interface InvoicingSubscriptionListViewState extends FetchedState {
+    /** Selected status tab (CES-owned so it persists across page revisits). */
+    activeTab: InvoicingSubscriptionTabId;
     counts: InvoicingListCounts;
     countsFetchState: FetchStateAndError;
     filters: InvoicingSubscriptionFilters;
+    /** Full list ids (all statuses); the selector filters by `activeTab`. */
     ids: ID[];
     nextCursor: string | null;
     /** Active server-side sort (undefined = backend default order). */

package/lib/view/invoicing/invoicingTransactionListView/epics/fetchInvoicingTransactionListEpic.d.ts

@@ -5,4 +5,4 @@ import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchInvoicingTransactionList, updateInvoicingTransactionList, updateInvoicingTransactionListFailure } from '../invoicingTransactionListViewReducer';
 export type ActionType = ReturnType<typeof fetchInvoicingTransactionList> | ReturnType<typeof updateInvoicingTransactionList> | ReturnType<typeof updateInvoicingTransactionListFailure> | ReturnType<typeof updateInvoicingTransactions>;
-export declare const fetchInvoicingTransactionListEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+export declare const fetchInvoicingTransactionListEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/invoicing/invoicingTransactionListView/epics/fetchInvoicingTransactionListEpic.js

@@ -7,13 +7,13 @@ const invoicingTransactionReducer_1 = require("../../../../entity/invoicing/invo
 const responsePayload_1 = require("../../../../responsePayload");
 const invoicingApiHelper_1 = require("../../invoicingApiHelper");
 const invoicingTransactionListViewReducer_1 = require("../invoicingTransactionListViewReducer");
-const buildQuery = (filters, cursor, sort) => {
+const buildQuery = (filters, type, cursor, sort) => {
     const params = new URLSearchParams();
     if (filters.status != null && filters.status.length > 0) {
         params.set('status', filters.status);
     }
-    if (filters.type != null && filters.type.length > 0) {
-        params.set('type', filters.type);
+    if (type != null && type.length > 0) {
+        params.set('type', type);
     }
     if (filters.customerId != null) {
         params.set('customer_id', filters.customerId);
@@ -28,9 +28,11 @@ const buildQuery = (filters, cursor, sort) => {
     (0, invoicingApiHelper_1.applyListSortParams)(params, sort);
     return params;
 };
-const fetchInvoicingTransactionListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(invoicingTransactionListViewReducer_1.fetchInvoicingTransactionList.match), (0, operators_1.switchMap)((action) => {
+const fetchInvoicingTransactionListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(invoicingTransactionListViewReducer_1.fetchInvoicingTransactionList.match), (0, operators_1.switchMap)((action) => {
     const { filters, cursor, keepExistingListItems, sort } = action.payload;
-    const apiUrl = (0, invoicingApiHelper_1.withQuery)(`${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/payments`, buildQuery(filters, cursor, sort));
+    const { activeTab } = state$.value.invoicingTransactionListViewState;
+    const type = activeTab !== 'all' ? activeTab : undefined;
+    const apiUrl = (0, invoicingApiHelper_1.withQuery)(`${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/payments`, buildQuery(filters, type, cursor, sort));
     return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.switchMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
             const items = response.data?.items ?? [];

package/lib/view/invoicing/invoicingTransactionListView/epics/fetchInvoicingTransactionListPageEpic.js

@@ -19,8 +19,9 @@ const shouldFetch = (fetchStateAndError, cacheOverride) => cacheOverride ||
 const fetchInvoicingTransactionListPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(invoicingTransactionListViewReducer_1.fetchInvoicingTransactionListPage.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, filters, sort } = action.payload;
     const state = state$.value.invoicingTransactionListViewState;
+    const activeTabState = state.byTab[state.activeTab];
     const pageActions = [];
-    if (shouldFetch({ fetchState: state.fetchState, error: state.error }, cacheOverride)) {
+    if (shouldFetch({ fetchState: activeTabState.fetchState, error: activeTabState.error }, cacheOverride)) {
         pageActions.push((0, invoicingTransactionListViewReducer_1.fetchInvoicingTransactionList)({ filters, sort }));
     }
     return (0, rxjs_1.concat)((0, rxjs_1.from)(pageActions));

package/lib/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewReducer.d.ts

@@ -25,6 +25,6 @@ export declare const fetchInvoicingTransactionList: import("@reduxjs/toolkit").A
     ids: ID[];
     keepExistingListItems: boolean;
     nextCursor: string | null;
-}, "invoicingTransactionListView/updateInvoicingTransactionList">, updateInvoicingTransactionListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingTransactionListView/updateInvoicingTransactionListFailure">, updateInvoicingTransactionFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingTransactionFilters, "invoicingTransactionListView/updateInvoicingTransactionFilters">, addInvoicingTransactionToList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "invoicingTransactionListView/addInvoicingTransactionToList">, clearInvoicingTransactionListView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingTransactionListView/clearInvoicingTransactionListView">;
+}, "invoicingTransactionListView/updateInvoicingTransactionList">, updateInvoicingTransactionListFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "invoicingTransactionListView/updateInvoicingTransactionListFailure">, updateInvoicingTransactionFilters: import("@reduxjs/toolkit").ActionCreatorWithPayload<InvoicingTransactionFilters, "invoicingTransactionListView/updateInvoicingTransactionFilters">, setInvoicingTransactionActiveTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"refund" | "payment" | "all" | "authorization" | "payment_reversal", "invoicingTransactionListView/setInvoicingTransactionActiveTab">, addInvoicingTransactionToList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "invoicingTransactionListView/addInvoicingTransactionToList">, clearInvoicingTransactionListView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"invoicingTransactionListView/clearInvoicingTransactionListView">;
 declare const _default: import("redux").Reducer<InvoicingTransactionListViewState>;
 export default _default;

package/lib/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewReducer.js

@@ -1,17 +1,23 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearInvoicingTransactionListView = exports.addInvoicingTransactionToList = exports.updateInvoicingTransactionFilters = exports.updateInvoicingTransactionListFailure = exports.updateInvoicingTransactionList = exports.fetchInvoicingTransactionListPage = exports.fetchInvoicingTransactionList = exports.initialState = void 0;
+exports.clearInvoicingTransactionListView = exports.addInvoicingTransactionToList = exports.setInvoicingTransactionActiveTab = exports.updateInvoicingTransactionFilters = exports.updateInvoicingTransactionListFailure = exports.updateInvoicingTransactionList = exports.fetchInvoicingTransactionListPage = exports.fetchInvoicingTransactionList = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const invoicingTransactionListViewState_1 = require("./invoicingTransactionListViewState");
+/**
+ * Whether two transaction-list queries share the same base (tab-independent)
+ * query. When the base query changes (search / customer / status / sort) every
+ * per-tab cache is stale, so the reducer resets them all.
+ */
+const sameTransactionBaseQuery = (a, b) => a.filters.customerId === b.filters.customerId &&
+    a.filters.status === b.filters.status &&
+    a.filters.search === b.filters.search &&
+    a.sort?.field === b.sort?.field &&
+    a.sort?.dir === b.sort?.dir;
 exports.initialState = {
-    fetchState: 'Not-Started',
-    error: undefined,
-    ids: [],
-    nextCursor: null,
+    activeTab: 'all',
+    byTab: (0, invoicingTransactionListViewState_1.makeInvoicingTransactionIdsByTab)(),
     filters: {},
-    hasValidState() {
-        return this.fetchState === 'Completed';
-    },
 };
 const invoicingTransactionListView = (0, toolkit_1.createSlice)({
     name: 'invoicingTransactionListView',
@@ -19,14 +25,15 @@ const invoicingTransactionListView = (0, toolkit_1.createSlice)({
     reducers: {
         fetchInvoicingTransactionList: {
             reducer(draft, action) {
+                const tab = draft.byTab[draft.activeTab];
                 if (!action.payload.keepExistingListItems) {
-                    draft.ids = [];
-                    draft.nextCursor = null;
+                    tab.ids = [];
+                    tab.nextCursor = null;
                 }
                 draft.filters = action.payload.filters;
                 draft.sort = action.payload.sort;
-                draft.fetchState = 'In-Progress';
-                draft.error = undefined;
+                tab.fetchState = 'In-Progress';
+                tab.error = undefined;
             },
             prepare(payload) {
                 return {
@@ -41,6 +48,12 @@ const invoicingTransactionListView = (0, toolkit_1.createSlice)({
         },
         fetchInvoicingTransactionListPage: {
             reducer(draft, action) {
+                // A different base query invalidates every tab's cache — reset so the
+                // page epic's shouldFetch refetches the active tab instead of showing
+                // rows fetched under a stale search/customer/status/sort.
+                if (!sameTransactionBaseQuery(draft, action.payload)) {
+                    draft.byTab = (0, invoicingTransactionListViewState_1.makeInvoicingTransactionIdsByTab)();
+                }
                 draft.filters = action.payload.filters;
                 draft.sort = action.payload.sort;
             },
@@ -55,34 +68,52 @@ const invoicingTransactionListView = (0, toolkit_1.createSlice)({
             },
         },
         updateInvoicingTransactionList(draft, action) {
-            draft.ids = action.payload.keepExistingListItems
-                ? [...new Set([...draft.ids, ...action.payload.ids])]
+            const tab = draft.byTab[draft.activeTab];
+            tab.ids = action.payload.keepExistingListItems
+                ? [...new Set([...tab.ids, ...action.payload.ids])]
                 : action.payload.ids;
-            draft.nextCursor = action.payload.nextCursor;
-            draft.fetchState = 'Completed';
-            draft.error = undefined;
+            tab.nextCursor = action.payload.nextCursor;
+            tab.fetchState = 'Completed';
+            tab.error = undefined;
         },
         updateInvoicingTransactionListFailure(draft, action) {
-            draft.fetchState = 'Error';
-            draft.error = action.payload;
+            const tab = draft.byTab[draft.activeTab];
+            tab.fetchState = 'Error';
+            tab.error = action.payload;
         },
         updateInvoicingTransactionFilters(draft, action) {
             draft.filters = action.payload;
         },
+        // Select a type tab. The view dispatches the follow-up
+        // fetchInvoicingTransactionListPage so the page epic fetches the tab when
+        // its cache is empty and reuses it when already loaded.
+        setInvoicingTransactionActiveTab(draft, action) {
+            draft.activeTab = action.payload;
+        },
         // Reflect a newly recorded payment's transaction in the cached list so the
-        // payments page shows it without refetching. The list view has no counts
-        // slice, so we only prepend the id (dedup/no-op if already present).
+        // payments page shows it without refetching. The payload carries no type,
+        // so prepend to the 'all' tab and the tab currently in view (dedup/no-op if
+        // already present); other tabs refetch fresh on their next visit.
         addInvoicingTransactionToList(draft, action) {
             const id = action.payload;
-            if (draft.ids.includes(id)) {
-                return;
+            const prependTo = (tabId) => {
+                const tab = draft.byTab[tabId];
+                if (!tab.ids.includes(id)) {
+                    tab.ids = [id, ...tab.ids];
+                }
+            };
+            prependTo('all');
+            if (draft.activeTab !== 'all') {
+                prependTo(draft.activeTab);
             }
-            draft.ids = [id, ...draft.ids];
         },
         clearInvoicingTransactionListView(draft) {
-            Object.assign(draft, exports.initialState);
+            draft.activeTab = 'all';
+            draft.byTab = (0, invoicingTransactionListViewState_1.makeInvoicingTransactionIdsByTab)();
+            draft.filters = {};
+            draft.sort = undefined;
         },
     },
 });
-_a = invoicingTransactionListView.actions, exports.fetchInvoicingTransactionList = _a.fetchInvoicingTransactionList, exports.fetchInvoicingTransactionListPage = _a.fetchInvoicingTransactionListPage, exports.updateInvoicingTransactionList = _a.updateInvoicingTransactionList, exports.updateInvoicingTransactionListFailure = _a.updateInvoicingTransactionListFailure, exports.updateInvoicingTransactionFilters = _a.updateInvoicingTransactionFilters, exports.addInvoicingTransactionToList = _a.addInvoicingTransactionToList, exports.clearInvoicingTransactionListView = _a.clearInvoicingTransactionListView;
+_a = invoicingTransactionListView.actions, exports.fetchInvoicingTransactionList = _a.fetchInvoicingTransactionList, exports.fetchInvoicingTransactionListPage = _a.fetchInvoicingTransactionListPage, exports.updateInvoicingTransactionList = _a.updateInvoicingTransactionList, exports.updateInvoicingTransactionListFailure = _a.updateInvoicingTransactionListFailure, exports.updateInvoicingTransactionFilters = _a.updateInvoicingTransactionFilters, exports.setInvoicingTransactionActiveTab = _a.setInvoicingTransactionActiveTab, exports.addInvoicingTransactionToList = _a.addInvoicingTransactionToList, exports.clearInvoicingTransactionListView = _a.clearInvoicingTransactionListView;
 exports.default = invoicingTransactionListView.reducer;

package/lib/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewSelector.d.ts

@@ -4,6 +4,7 @@ import { RootState } from '../../../reducer';
 import { InvoicingListSort } from '../invoicingApiHelper';
 import { InvoicingTransactionColumnConfig, InvoicingTransactionFilters, InvoicingTransactionTabId } from './invoicingTransactionListViewState';
 export interface InvoicingTransactionListView extends SelectorView {
+    activeTab: InvoicingTransactionTabId;
     columns: InvoicingTransactionColumnConfig[];
     filters: InvoicingTransactionFilters;
     nextCursor: string | null;

package/lib/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewSelector.js

@@ -9,14 +9,18 @@ const invoicingTransactionListViewState_1 = require("./invoicingTransactionListV
  * object) keep referential identity until the transaction entity slice or the
  * list-view slice actually change.
  */
-exports.getInvoicingTransactionListView = (0, toolkit_1.createSelector)((state) => state.invoicingTransactionState, (state) => state.invoicingTransactionListViewState, (transactionState, listViewState) => ({
-    columns: invoicingTransactionListViewState_1.INVOICING_TRANSACTION_COLUMNS,
-    transactions: (0, invoicingTransactionSelector_1.getInvoicingTransactionsByIds)(transactionState, listViewState.ids),
-    filters: listViewState.filters,
-    nextCursor: listViewState.nextCursor,
-    fetchState: listViewState.fetchState,
-    error: listViewState.error,
-    tabIds: invoicingTransactionListViewState_1.INVOICING_TRANSACTION_TABS,
-    sort: listViewState.sort,
-    version: 1.0,
-}));
+exports.getInvoicingTransactionListView = (0, toolkit_1.createSelector)((state) => state.invoicingTransactionState, (state) => state.invoicingTransactionListViewState, (transactionState, listViewState) => {
+    const activeTabState = listViewState.byTab[listViewState.activeTab];
+    return {
+        activeTab: listViewState.activeTab,
+        columns: invoicingTransactionListViewState_1.INVOICING_TRANSACTION_COLUMNS,
+        transactions: (0, invoicingTransactionSelector_1.getInvoicingTransactionsByIds)(transactionState, activeTabState.ids),
+        filters: listViewState.filters,
+        nextCursor: activeTabState.nextCursor,
+        fetchState: activeTabState.fetchState,
+        error: activeTabState.error,
+        tabIds: invoicingTransactionListViewState_1.INVOICING_TRANSACTION_TABS,
+        sort: listViewState.sort,
+        version: 1.0,
+    };
+});

package/lib/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewState.d.ts

@@ -1,10 +1,9 @@
-import { FetchedState, ID } from '../../../commonStateTypes/common';
+import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { InvoicingListSort } from '../invoicingApiHelper';
 export interface InvoicingTransactionFilters {
     customerId?: ID;
     search?: string;
     status?: string;
-    type?: string;
 }
 export declare const ALL_INVOICING_TRANSACTION_SORT_KEYS: readonly ["transaction", "customer", "method", "date", "type", "gateway", "status", "amount"];
 export declare const toInvoicingTransactionSortKey: (v: string) => "date" | "amount" | "status" | "type" | "transaction" | "customer" | "gateway" | "method";
@@ -31,10 +30,25 @@ export type InvoicingTransactionTabId = ReturnType<typeof toInvoicingTransaction
  * display order.
  */
 export declare const INVOICING_TRANSACTION_TABS: InvoicingTransactionTabId[];
-export interface InvoicingTransactionListViewState extends FetchedState {
-    filters: InvoicingTransactionFilters;
+/**
+ * Per-tab cache slice. Each `type` tab is a separate server query (the backend
+ * filters by `type`), so its loaded ids, pagination cursor and fetch state are
+ * cached independently. Mirrors the `userListByType` per-key cache pattern.
+ */
+export interface InvoicingTransactionTabState extends FetchStateAndError {
     ids: ID[];
     nextCursor: string | null;
+}
+export type InvoicingTransactionIdsByTab = Record<InvoicingTransactionTabId, InvoicingTransactionTabState>;
+export interface InvoicingTransactionListViewState {
+    /** Selected type tab (CES-owned so it persists across page revisits). */
+    activeTab: InvoicingTransactionTabId;
+    /** Per-tab cached ids + cursor + fetch state. */
+    byTab: InvoicingTransactionIdsByTab;
+    /** Base query shared across tabs (search / customer / status). */
+    filters: InvoicingTransactionFilters;
     /** Active server-side sort (undefined = backend default order). */
     sort?: InvoicingListSort;
 }
+export declare const makeInvoicingTransactionTabState: () => InvoicingTransactionTabState;
+export declare const makeInvoicingTransactionIdsByTab: () => InvoicingTransactionIdsByTab;

package/lib/view/invoicing/invoicingTransactionListView/invoicingTransactionListViewState.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.INVOICING_TRANSACTION_TABS = exports.toInvoicingTransactionTabId = exports.ALL_INVOICING_TRANSACTION_TAB_IDS = exports.INVOICING_TRANSACTION_COLUMNS = exports.toInvoicingTransactionSortKey = exports.ALL_INVOICING_TRANSACTION_SORT_KEYS = void 0;
+exports.makeInvoicingTransactionIdsByTab = exports.makeInvoicingTransactionTabState = exports.INVOICING_TRANSACTION_TABS = exports.toInvoicingTransactionTabId = exports.ALL_INVOICING_TRANSACTION_TAB_IDS = exports.INVOICING_TRANSACTION_COLUMNS = exports.toInvoicingTransactionSortKey = exports.ALL_INVOICING_TRANSACTION_SORT_KEYS = void 0;
 const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
 exports.ALL_INVOICING_TRANSACTION_SORT_KEYS = [
     'transaction',
@@ -42,3 +42,15 @@ exports.toInvoicingTransactionTabId = toInvoicingTransactionTabId;
 exports.INVOICING_TRANSACTION_TABS = [
     ...exports.ALL_INVOICING_TRANSACTION_TAB_IDS,
 ];
+const makeInvoicingTransactionTabState = () => ({
+    ids: [],
+    nextCursor: null,
+    fetchState: 'Not-Started',
+    error: undefined,
+});
+exports.makeInvoicingTransactionTabState = makeInvoicingTransactionTabState;
+const makeInvoicingTransactionIdsByTab = () => exports.ALL_INVOICING_TRANSACTION_TAB_IDS.reduce((acc, tabId) => {
+    acc[tabId] = (0, exports.makeInvoicingTransactionTabState)();
+    return acc;
+}, {});
+exports.makeInvoicingTransactionIdsByTab = makeInvoicingTransactionIdsByTab;

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",
+  "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",