@zeniai/client-epic-state 5.2.8 → 5.2.9

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.d.ts

@@ -5,18 +5,20 @@ import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAnd
 import { BankAccount } from '../../../../entity/bankAccount/bankAccount';
 import { BillStageCodeType, BillStatusCodeType } from '../../../../entity/billPay/billTransaction/billTransactionState';
 import { CountryWithCurrency } from '../../../../entity/currency/currency';
-import { ReimbursementInfo } from '../../../../entity/reimbursement/reimbursementState';
+import { ReimbursementInfo, ReimbursementLine } from '../../../../entity/reimbursement/reimbursementState';
+import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
 import { User } from '../../../../entity/user/userState';
-import { RootState } from '../../../../rootStateTypes';
+import { RootState } from '../../../../reducer';
 import { ZeniDate } from '../../../../zeniDayJS';
 import { AccountListSelectorView } from '../../../accountList/accountListSelector';
 import { BankAccountSelectorView } from '../../../bankAccountView/bankAccountViewSelector';
 import { ClassListSelectorView } from '../../../classList/classListSelector';
 import { ActivityHistorySelectorView } from '../../commonHistoryView/commonHistorySelector';
 import { MerchantListSelectorView } from '../../merchantList/merchantListSelector';
+import { RemiActivity } from '../remiDetailView/remiDetailViewSelector';
 import { DuplicateLine } from '../remiDetailView/remiDetailViewState';
-import { RemiActivity, RemiSetupApproverView } from '../remiSetupApproverView/remiSetupApproverViewSelectorTypes';
-import { AutoFields, ReimbursementLineWithAttachment, ReimbursementLineWithAttachmentAndRecommendation, WhatForSection } from './editRemiViewState';
+import { RemiSetupApproverView } from '../remiSetupApproverView/remiSetupApproverViewSelectorTypes';
+import { AutoFields, SegregatedReimbursementLine, SegregatedReimbursementLineWithRecommendation, WhatForSection } from './editRemiViewState';
 export interface EditRemiDetailSelectorView extends BankAccountSelectorView, SelectorView {
     accountList: AccountListSelectorView;
     accountsHierarchyList: NestedAccountHierarchyForReport[];
@@ -57,5 +59,15 @@ interface EditRemiInitialDetails {
     paymentTo?: ID;
     whatForSection?: WhatForSection;
 }
+export type ReimbursementLineWithAttachment = ReimbursementLine & {
+    file?: Attachment;
+};
+export type SegregatedReimbursementLineWithAttachment = SegregatedReimbursementLine & {
+    file?: Attachment;
+};
+export type ReimbursementLineWithAttachmentAndRecommendation = SegregatedReimbursementLineWithRecommendation & {
+    recommendationFetchState: FetchState;
+    file?: Attachment;
+};
 export declare const getEditRemiDetail: (state: RootState, reimbursementId?: ID) => EditRemiDetailSelectorView;
 export {};

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewState.d.ts

@@ -3,7 +3,7 @@ import { FetchState, FetchStateAndError, ID } from '../../../../commonStateTypes
 import { Recommendation } from '../../../../commonStateTypes/recommendationBase';
 import { AccountBase, RecommendedAccountBase } from '../../../../entity/account/accountState';
 import { MerchantBase } from '../../../../entity/merchant/merchant';
-import { DistanceMilage, LineDetail, ReimbursementLine, ReimbursementTypeCode } from '../../../../entity/reimbursement/reimbursementState';
+import { DistanceMilage, LineDetail, ReimbursementTypeCode } from '../../../../entity/reimbursement/reimbursementState';
 import { Attachment } from '../../../../entity/transaction/stateTypes/attachment';
 import { ZeniDate } from '../../../../zeniDayJS';
 export interface EditRemiDetail {
@@ -35,16 +35,6 @@ export interface OutofPocketReimbursementLineWithRecommendation extends Partial<
     recommendedAccount?: RecommendedAccountBase;
     retainedAccount?: AccountBase;
 }
-export type ReimbursementLineWithAttachment = ReimbursementLine & {
-    file?: Attachment;
-};
-export type SegregatedReimbursementLineWithAttachment = SegregatedReimbursementLine & {
-    file?: Attachment;
-};
-export type ReimbursementLineWithAttachmentAndRecommendation = SegregatedReimbursementLineWithRecommendation & {
-    recommendationFetchState: FetchState;
-    file?: Attachment;
-};
 export interface OutofPocketLine extends ReimbursementBaseLineWithoutType {
     merchant: MerchantBase;
 }

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

@@ -1,6 +1,6 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { currencyConversionValueSuccessOrFailure, fetchCurrencyConversionValue, saveRemiUpdatesToLocalStore, updateHomeCurrencyConversion } from '../editRemiViewReducer';
 export type ActionType = ReturnType<typeof fetchCurrencyConversionValue> | ReturnType<typeof currencyConversionValueSuccessOrFailure> | ReturnType<typeof updateHomeCurrencyConversion> | ReturnType<typeof saveRemiUpdatesToLocalStore>;

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

@@ -1,6 +1,6 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { fetchAccountList } from '../../../../accountList/accountListReducer';
 import { fetchClassList } from '../../../../classList/classListReducer';
 import { fetchUserFinancialAccount } from '../../../../userFinancialAccount/userFinancialAccountReducer';

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

@@ -1,5 +1,5 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { fetchRecommendationByEntityId, fetchRecommendationByEntityName, indicateReadyToInitializeRecommendation } from '../../../../recommendation/recommendationReducer';
 import { fetchRecommendationsAndUpdateMerchantRecommendations, updateRecommendationInMerchant, waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant } from '../editRemiViewReducer';
 export type ActionType = ReturnType<typeof fetchRecommendationByEntityName> | ReturnType<typeof indicateReadyToInitializeRecommendation> | ReturnType<typeof fetchRecommendationByEntityId> | ReturnType<typeof updateRecommendationInMerchant> | ReturnType<typeof waitForMerchantRecommendationFetchThenUpdateRecommendationInMerchant> | ReturnType<typeof fetchRecommendationsAndUpdateMerchantRecommendations>;

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

@@ -1,5 +1,5 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { fetchRemiDetail, updateRemiDetail } from '../../remiDetailView/remiDetailViewReducer';
 import { fetchRemiAndInitializeLocalStore, initializeRemiToLocalStore, waitForRemiDetailThenInitializeLocalStore } from '../editRemiViewReducer';
 export type ActionType = ReturnType<typeof waitForRemiDetailThenInitializeLocalStore> | ReturnType<typeof fetchRemiDetail> | ReturnType<typeof updateRemiDetail> | ReturnType<typeof initializeRemiToLocalStore> | ReturnType<typeof fetchRemiAndInitializeLocalStore>;

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

@@ -1,6 +1,13 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { RootState } from '../../../../../rootStateTypes';
+import { Recommendation } from '../../../../../commonStateTypes/recommendationBase';
+import { AccountBase, RecommendedAccountBase } from '../../../../../entity/account/accountState';
+import { ClassBase, RecommendedClassBase } from '../../../../../entity/class/classState';
+import { RootState } from '../../../../../reducer';
 import { initializeRemiToLocalStore, saveRemiUpdatesToLocalStore } from '../editRemiViewReducer';
 export type ActionType = ReturnType<typeof initializeRemiToLocalStore> | ReturnType<typeof saveRemiUpdatesToLocalStore>;
 export declare const initializeRemiToLocalStoreEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;
+export declare const getRecommendedCategoryClass: (recommendation?: Recommendation[], account?: AccountBase, classObj?: ClassBase) => {
+    recommendedAccount: RecommendedAccountBase | undefined;
+    recommendedClass: RecommendedClassBase | undefined;
+};

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

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeRemiToLocalStoreEpic = void 0;
+exports.getRecommendedCategoryClass = exports.initializeRemiToLocalStoreEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const merchantSelector_1 = require("../../../../../entity/merchant/merchantSelector");
 const editRemiViewReducer_1 = require("../editRemiViewReducer");
-const getRecommendedCategoryClass_1 = require("../getRecommendedCategoryClass");
 const initializeRemiToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(editRemiViewReducer_1.initializeRemiToLocalStore.match), (0, operators_1.mergeMap)((action) => {
     const { reimbursementId } = action.payload;
     const state = state$.value;
@@ -23,7 +22,7 @@ const initializeRemiToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
                 const merchant = merchantId != null
                     ? (0, merchantSelector_1.getMerchantByMerchantId)(state.merchantState, merchantId)
                     : undefined;
-                const { recommendedAccount } = (0, getRecommendedCategoryClass_1.getRecommendedCategoryClass)(merchant?.recommendations, line.lineDetail.account, line.lineDetail.class);
+                const { recommendedAccount } = (0, exports.getRecommendedCategoryClass)(merchant?.recommendations, line.lineDetail.account, line.lineDetail.class);
                 updatesByLineId[line.lineId] = {
                     lineId: line.lineId,
                     type: line.type,
@@ -108,3 +107,26 @@ const initializeRemiToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
     return (0, rxjs_1.from)([]);
 }));
 exports.initializeRemiToLocalStoreEpic = initializeRemiToLocalStoreEpic;
+const getRecommendedCategoryClass = (recommendation, account, classObj) => {
+    let recommendedAccount;
+    let recommendedClass;
+    if (recommendation == null) {
+        return { recommendedAccount, recommendedClass };
+    }
+    // Note: Recommended account/class will always be the first recommended account/class value.
+    const firstrecommendedAccount = recommendation?.[0]?.account;
+    const firstrecommendedClass = recommendation?.[0]?.class;
+    if (firstrecommendedAccount?.qboId != null &&
+        firstrecommendedAccount.qboId !== account?.qboId) {
+        recommendedAccount = firstrecommendedAccount;
+    }
+    if (firstrecommendedClass?.qboId != null &&
+        firstrecommendedClass.qboId !== classObj?.qboId) {
+        recommendedClass = firstrecommendedClass;
+    }
+    return {
+        recommendedAccount,
+        recommendedClass,
+    };
+};
+exports.getRecommendedCategoryClass = getRecommendedCategoryClass;

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

@@ -2,7 +2,7 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { updateFiles } from '../../../../../entity/file/fileReducer';
 import { updateMerchants } from '../../../../../entity/merchant/merchantReducer';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { fetchClassList } from '../../../../classList/classListReducer';
 import { fetchRecommendationByEntityId, fetchRecommendationByEntityName } from '../../../../recommendation/recommendationReducer';
 import { fetchDuplicateReimbursement } from '../../remiDetailView/remiDetailViewReducer';

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

@@ -5,7 +5,7 @@ import { updateMerchants } from '../../../../../entity/merchant/merchantReducer'
 import { updateReimbursement } from '../../../../../entity/reimbursement/reimbursementReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { updateRecommendationForEntity } from '../../../../recommendation/recommendationReducer';
 import { updateMerchantListIds } from '../../../merchantList/merchantListReducer';

package/lib/view/spendManagement/reimbursement/reimbursementConfig/fetchReimbursementConfigEpic.d.ts

@@ -1,7 +1,7 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { updateCurrencies } from '../../../../entity/currency/currencyReducer';
-import { RootState } from '../../../../rootStateTypes';
+import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchReimbursementConfig, updateReimbursementConfig, updateReimbursementConfigFailure } from './reimbursementConfigReducer';
 export type ActionType = ReturnType<typeof fetchReimbursementConfig> | ReturnType<typeof updateCurrencies> | ReturnType<typeof updateReimbursementConfig> | ReturnType<typeof updateReimbursementConfigFailure>;

package/lib/view/spendManagement/reimbursement/reimbursementConfig/reimbursementConfigReducer.d.ts

@@ -2,6 +2,6 @@ import { ZeniAPIStatus } from '../../../../responsePayload';
 import { ReimbursementConfigPayload } from './reimbursementConfigPayload';
 import { ReimbursementConfigState } from './reimbursementConfigState';
 export declare const initialState: ReimbursementConfigState;
-export declare const fetchReimbursementConfig: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"reimbursementConfig/fetchReimbursementConfig">, updateReimbursementConfig: import("@reduxjs/toolkit").ActionCreatorWithPayload<ReimbursementConfigPayload, "reimbursementConfig/updateReimbursementConfig">, updateReimbursementConfigFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "reimbursementConfig/updateReimbursementConfigFailure">;
+export declare const fetchReimbursementConfig: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"reimbursementConfig/fetchReimbursementConfig">, updateReimbursementConfig: import("@reduxjs/toolkit").ActionCreatorWithPayload<ReimbursementConfigPayload, "reimbursementConfig/updateReimbursementConfig">, updateReimbursementConfigFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "reimbursementConfig/updateReimbursementConfigFailure">, clearReimbursementConfig: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"reimbursementConfig/clearReimbursementConfig">;
 declare const _default: import("redux").Reducer<ReimbursementConfigState>;
 export default _default;

package/lib/view/spendManagement/reimbursement/reimbursementConfig/reimbursementConfigReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateReimbursementConfigFailure = exports.updateReimbursementConfig = exports.fetchReimbursementConfig = exports.initialState = void 0;
+exports.clearReimbursementConfig = exports.updateReimbursementConfigFailure = exports.updateReimbursementConfig = exports.fetchReimbursementConfig = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const rootActions_1 = require("../../../../rootActions");
 const billPayConfigState_1 = require("../../billPay/billPayConfig/billPayConfigState");
@@ -48,6 +48,9 @@ const reimbursementConfig = (0, toolkit_1.createSlice)({
             draft.fetchState = 'Error';
             draft.error = action.payload;
         },
+        clearReimbursementConfig(draft) {
+            Object.assign(draft, exports.initialState);
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(rootActions_1.clearAll, (draft) => {
@@ -55,5 +58,5 @@ const reimbursementConfig = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = reimbursementConfig.actions, exports.fetchReimbursementConfig = _a.fetchReimbursementConfig, exports.updateReimbursementConfig = _a.updateReimbursementConfig, exports.updateReimbursementConfigFailure = _a.updateReimbursementConfigFailure;
+_a = reimbursementConfig.actions, exports.fetchReimbursementConfig = _a.fetchReimbursementConfig, exports.updateReimbursementConfig = _a.updateReimbursementConfig, exports.updateReimbursementConfigFailure = _a.updateReimbursementConfigFailure, exports.clearReimbursementConfig = _a.clearReimbursementConfig;
 exports.default = reimbursementConfig.reducer;

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/approveOrRejectRemiEpic.d.ts

@@ -4,7 +4,7 @@ import { updateApprovalRules } from '../../../../../entity/approvalRule/approval
 import { updateEntityApprovalStatus } from '../../../../../entity/entityApprovalStatus/entityApprovalStatusReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { approveOrRejectRemiFailure, approveOrRejectRemiSuccess } from '../remiDetailViewReducer';
 export type ActionType = ReturnType<typeof updateAllUsers> | ReturnType<typeof updateApprovalRules> | ReturnType<typeof updateEntityApprovalStatus> | ReturnType<typeof openSnackbar> | ReturnType<typeof openSnackbar> | ReturnType<typeof approveOrRejectRemiSuccess> | ReturnType<typeof approveOrRejectRemiFailure>;

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/cancelAndDeleteRemiEpic.d.ts

@@ -1,7 +1,7 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { removeReimbursement, updateReimbursement } from '../../../../../entity/reimbursement/reimbursementReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { removeReimbursementIdfromRemiTabList } from '../../remiListView/remiListReducer';
 import { cancelAndDeleteRemi, cancelAndDeleteRemiSuccessOrFailure } from '../remiDetailViewReducer';

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/deleteRemiEpic.d.ts

@@ -1,7 +1,7 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { removeReimbursement } from '../../../../../entity/reimbursement/reimbursementReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { removeReimbursementIdfromRemiTabList } from '../../remiListView/remiListReducer';
 import { deleteRemi, deleteRemiSuccessOrFailure } from '../remiDetailViewReducer';

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/fetchDuplicateReimbursementEpic.d.ts

@@ -1,6 +1,6 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { fetchDuplicateReimbursement, updateDuplicateReimbursementFailure, updateDuplicateReimbursementSuccess } from '../remiDetailViewReducer';
 export type ActionType = ReturnType<typeof fetchDuplicateReimbursement> | ReturnType<typeof updateDuplicateReimbursementSuccess> | ReturnType<typeof updateDuplicateReimbursementFailure>;

package/lib/view/spendManagement/reimbursement/remiDetailView/epics/fetchRemiDetailEpic.d.ts

@@ -7,7 +7,7 @@ import { updateMerchants } from '../../../../../entity/merchant/merchantReducer'
 import { updatePaymentAccounts } from '../../../../../entity/paymentAccount/paymentAccountReducer';
 import { removeReimbursement, updateReimbursement } from '../../../../../entity/reimbursement/reimbursementReducer';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
-import { RootState } from '../../../../../rootStateTypes';
+import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { updateRecommendationForEntity } from '../../../../recommendation/recommendationReducer';
 import { fetchEntityHistory } from '../../../commonHistoryView/commonHistoryReducer';

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

@@ -1,18 +1,19 @@
 import { FetchStateAndError, ID } from '../../../../commonStateTypes/common';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
-import { AttributeType } from '../../../../entity/approvalRule/approvalRuleState';
+import { AttributeType, Criteria } from '../../../../entity/approvalRule/approvalRuleState';
 import { BillStageCodeType } from '../../../../entity/billPay/billTransaction/billTransactionState';
 import { Class } from '../../../../entity/class/classState';
+import { ActivityStatus, Actor, EntityType } from '../../../../entity/entityApprovalStatus/entityApprovalStatusState';
 import { Reimbursement } from '../../../../entity/reimbursement/reimbursementState';
 import { LoggedInUser } from '../../../../entity/tenant/tenantState';
 import { User } from '../../../../entity/user/userState';
-import { RootState } from '../../../../rootStateTypes';
+import { RootState } from '../../../../reducer';
 import { ZeniDate } from '../../../../zeniDayJS';
 import { UserAndRole } from '../../../companyView/types/userAndRole';
 import { ActivityHistorySelectorView } from '../../commonHistoryView/commonHistorySelector';
 import { ActivityRealTimeApprovalSelectorView } from '../../realTimeApprovalView/realTimeApprovalSelector';
-import { ReimbursementLineWithAttachment } from '../editRemiView/editRemiViewState';
-import { RemiActivity } from '../remiSetupApproverView/remiSetupApproverViewSelectorTypes';
+import { ReimbursementLineWithAttachment } from '../editRemiView/editRemiViewSelector';
+import { StepWithUser } from '../remiSetupApproverView/remiSetupApproverViewSelectorTypes';
 import { DuplicateLine } from './remiDetailViewState';
 export interface RemiDetailViewSelector extends SelectorView {
     achSameDayMaxDays: number;
@@ -39,6 +40,36 @@ export interface RemiDetailViewSelector extends SelectorView {
 export interface RemiDetails extends Reimbursement {
     lines: ReimbursementLineWithAttachment[];
 }
+export interface StepWithStatus extends StepWithUser {
+    actorsActivity: ActorActivityWithUser[];
+    isOriginalApprovalStep: boolean;
+    displayPendingApproverAsAdmin?: boolean;
+    showSodAdminLabel?: boolean;
+}
+export interface ActorActivityWithUser extends Actor {
+    activity: ActivityStatus;
+    description: string;
+    isRecurringAutoApprove: boolean;
+    type: string;
+    userId: ID;
+    actor?: User;
+    lastUpdateTime?: ZeniDate;
+    subType?: string;
+}
+export interface RemiActivity {
+    createTime: ZeniDate;
+    entityType: EntityType;
+    isRealTimeApprovalEnabled: boolean;
+    stepsWithStatus: StepWithStatus[];
+    updateTime: ZeniDate;
+    approvalRuleId?: ID;
+    areApprovalsSerialized?: boolean;
+    criteria?: Criteria[];
+    currentPendingStepIndex?: number;
+    entityApprovalId?: ID;
+    isAdminFallbackApprover?: boolean;
+    sodExcludedApproverUserId?: ID;
+}
 export declare const getRemiDetailView: (state: RootState, reimbursementId: ID) => RemiDetailViewSelector;
 export declare const getRemiActivities: (state: RootState, reimbursementId: ID, billStageCode?: BillStageCodeType) => RemiActivity[];
 export declare const checkApproveRejectBtnShow: (remiActivities: RemiActivity[], isUserAdmin: boolean, signedInUser?: LoggedInUser) => boolean;

package/lib/view/spendManagement/reimbursement/remiListView/fetchRemiListEpic.d.ts

@@ -1,6 +1,6 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { RootState } from '../../../../rootStateTypes';
+import { RootState } from '../../../../reducer';
 import { fetchReimbursementConfig } from '../reimbursementConfig/reimbursementConfigReducer';
 import { fetchRemiList, fetchRemiListPerTab } from './remiListReducer';
 export type ActionType = ReturnType<typeof fetchRemiList> | ReturnType<typeof fetchReimbursementConfig> | ReturnType<typeof fetchRemiListPerTab>;

package/lib/view/spendManagement/reimbursement/remiListView/fetchRemiListPerTabEpic.d.ts

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { updateEntityApprovalStatus } from '../../../../entity/entityApprovalStatus/entityApprovalStatusReducer';
 import { updateReimbursements } from '../../../../entity/reimbursement/reimbursementReducer';
 import { updateAllUsers } from '../../../../entity/user/userReducer';
-import { RootState } from '../../../../rootStateTypes';
+import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
 import { fetchRemiListPerTab, updateRemiListByStatus, updateRemiListFailure } from './remiListReducer';
 export type ActionType = ReturnType<typeof fetchRemiListPerTab> | ReturnType<typeof updateReimbursements> | ReturnType<typeof updateRemiListByStatus> | ReturnType<typeof updateRemiListFailure> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateEntityApprovalStatus>;

package/lib/view/spendManagement/reimbursement/remiListView/remiListDownloadSelector.d.ts

@@ -3,7 +3,7 @@ import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAnd
 import { Approvers } from '../../../../entity/approvalRule/approvalRuleState';
 import { Reimbursement } from '../../../../entity/reimbursement/reimbursementState';
 import { User } from '../../../../entity/user/userState';
-import { RootState } from '../../../../rootStateTypes';
+import { RootState } from '../../../../reducer';
 export interface RemiListDownloadReport extends SelectorView {
     reimbursements: ReimbursementView[];
 }

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

@@ -8,7 +8,6 @@ const get_1 = __importDefault(require("lodash/get"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const spendManagementFilterHelpers_1 = require("../../spendManagementFilterHelpers");
-const remiListFilterHelpers_1 = require("./remiListFilterHelpers");
 const remiListSelector_1 = require("./remiListSelector");
 const remiListState_1 = require("./remiListState");
 const getRemiDownloadList = (state, currentTimePeriod) => {
@@ -40,7 +39,7 @@ const getRemiDownloadList = (state, currentTimePeriod) => {
             approvers: approvers,
         };
     });
-    reimbursementsDetailed = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)(remiListFilterHelpers_1.getCategoryValueForReimbursement, reimbursementsDetailed, remiListState.filters);
+    reimbursementsDetailed = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('reimbursement', reimbursementsDetailed, remiListState.filters);
     const fetchState = (0, reduceFetchState_1.reduceAllFetchState)(keys.map((key) => ({
         fetchState: remiListState.byRemiListKey[key]?.fetchState,
         error: remiListState.byRemiListKey[key]?.error,

package/lib/view/spendManagement/reimbursement/remiListView/remiListReducer.d.ts

@@ -27,7 +27,7 @@ export declare const fetchRemiList: import("@reduxjs/toolkit").ActionCreatorWith
 }, "remiList/updateRemiListFailure", never, never>, updateRemiListUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     period: TimePeriod;
     uiState: Partial<RemiListUIState>;
-}, "remiList/updateRemiListUIState">, updateTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"paid" | "pending_approval" | "scheduled" | "draft", "remiList/updateTab">, updateSubTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"failed" | "deleted" | "cancelled" | "rejected" | "ach" | "wire" | "all" | "overdue" | "myDrafts" | "awaitingApproval" | "awaitingMyApproval" | "awaitingAllApproval", "remiList/updateSubTab">, updateSelectedRemiId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "remiList/updateSelectedRemiId">, updateRemiDetailSaveRemiCode: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<SaveRemiStageCode, "remiList/updateRemiDetailSaveRemiCode">, updateSearchResult: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "remiList/updateSearchResult">, updateFilterResult: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "remiList/updateRemiListUIState">, updateTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"paid" | "pending_approval" | "scheduled" | "draft", "remiList/updateTab">, updateSubTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"rejected" | "ach" | "wire" | "failed" | "cancelled" | "deleted" | "all" | "overdue" | "myDrafts" | "awaitingApproval" | "awaitingMyApproval" | "awaitingAllApproval", "remiList/updateSubTab">, updateSelectedRemiId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "remiList/updateSelectedRemiId">, clearRemiList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiList/clearRemiList">, updateRemiDetailSaveRemiCode: import("@reduxjs/toolkit").ActionCreatorWithOptionalPayload<SaveRemiStageCode, "remiList/updateRemiDetailSaveRemiCode">, updateSearchResult: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "remiList/updateSearchResult">, updateFilterResult: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     filters: ReimbursementFilters;
 }, "remiList/updateFilterResult">, updateRemiListDownloadUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     uiState: Partial<RemiListDownloadUIState>;

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeReimbursementIdfromRemiTabList = exports.updateRemiListDownloadUIState = exports.updateFilterResult = exports.updateSearchResult = exports.updateRemiDetailSaveRemiCode = exports.updateSelectedRemiId = exports.updateSubTab = exports.updateTab = exports.updateRemiListUIState = exports.updateRemiListFailure = exports.updateRemiListByStatus = exports.fetchRemiListPerTab = exports.fetchRemiList = exports.initialState = void 0;
+exports.removeReimbursementIdfromRemiTabList = exports.updateRemiListDownloadUIState = exports.updateFilterResult = exports.updateSearchResult = exports.updateRemiDetailSaveRemiCode = exports.clearRemiList = exports.updateSelectedRemiId = exports.updateSubTab = exports.updateTab = exports.updateRemiListUIState = exports.updateRemiListFailure = exports.updateRemiListByStatus = exports.fetchRemiListPerTab = exports.fetchRemiList = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const uniq_1 = __importDefault(require("lodash/uniq"));
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
@@ -172,6 +172,9 @@ const remiList = (0, toolkit_1.createSlice)({
         updateRemiDetailSaveRemiCode(draft, action) {
             draft.remiDetailSaveCode = action.payload;
         },
+        clearRemiList(draft) {
+            Object.assign(draft, exports.initialState);
+        },
     },
     extraReducers: (builder) => {
         builder.addCase(rootActions_1.clearAll, (draft) => {
@@ -179,7 +182,7 @@ const remiList = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = remiList.actions, exports.fetchRemiList = _a.fetchRemiList, exports.fetchRemiListPerTab = _a.fetchRemiListPerTab, exports.updateRemiListByStatus = _a.updateRemiListByStatus, exports.updateRemiListFailure = _a.updateRemiListFailure, exports.updateRemiListUIState = _a.updateRemiListUIState, exports.updateTab = _a.updateTab, exports.updateSubTab = _a.updateSubTab, exports.updateSelectedRemiId = _a.updateSelectedRemiId, exports.updateRemiDetailSaveRemiCode = _a.updateRemiDetailSaveRemiCode, exports.updateSearchResult = _a.updateSearchResult, exports.updateFilterResult = _a.updateFilterResult, exports.updateRemiListDownloadUIState = _a.updateRemiListDownloadUIState, exports.removeReimbursementIdfromRemiTabList = _a.removeReimbursementIdfromRemiTabList;
+_a = remiList.actions, exports.fetchRemiList = _a.fetchRemiList, exports.fetchRemiListPerTab = _a.fetchRemiListPerTab, exports.updateRemiListByStatus = _a.updateRemiListByStatus, exports.updateRemiListFailure = _a.updateRemiListFailure, exports.updateRemiListUIState = _a.updateRemiListUIState, exports.updateTab = _a.updateTab, exports.updateSubTab = _a.updateSubTab, exports.updateSelectedRemiId = _a.updateSelectedRemiId, exports.clearRemiList = _a.clearRemiList, exports.updateRemiDetailSaveRemiCode = _a.updateRemiDetailSaveRemiCode, exports.updateSearchResult = _a.updateSearchResult, exports.updateFilterResult = _a.updateFilterResult, exports.updateRemiListDownloadUIState = _a.updateRemiListDownloadUIState, exports.removeReimbursementIdfromRemiTabList = _a.removeReimbursementIdfromRemiTabList;
 exports.default = remiList.reducer;
 /**
  * Helper functions

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.d.ts

@@ -1,4 +1,3 @@
-import { BulkOperationType } from '../../../../commonStateTypes/bulkOperationType';
 import { FetchState, ID } from '../../../../commonStateTypes/common';
 import { SortOrder } from '../../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { TimePeriod } from '../../../../commonStateTypes/timePeriod';
@@ -7,7 +6,8 @@ import { Approvers } from '../../../../entity/approvalRule/approvalRuleState';
 import { EntityApprovalStatusState } from '../../../../entity/entityApprovalStatus/entityApprovalStatusState';
 import { Reimbursement } from '../../../../entity/reimbursement/reimbursementState';
 import { User, UserState } from '../../../../entity/user/userState';
-import { RootState } from '../../../../rootStateTypes';
+import { RootState } from '../../../../reducer';
+import { BulkOperationType } from '../../helpers';
 import { ReimbursementFilters, ReimbursementViewSortKey, RemiBulkSelectExceptionInfoType, RemiListUIState, RemiSubTabType, RemiTabType, SaveRemiStageCode } from './remiListState';
 export interface RemiBulkSelectInfo {
     isSelectableForBulkAction: boolean;
@@ -48,4 +48,3 @@ export declare const getRemiList: (state: RootState, currentTimePeriod: TimePeri
 export declare const getApproversOrRejectors: (reimbursement: Reimbursement, entityApprovalStatusState: EntityApprovalStatusState, userState: UserState) => Approvers;
 export declare const getRemiListOnSort: (sortKey: ReimbursementViewSortKey, sortOrder: SortOrder, currentTab: RemiTabType, reimbursements: ReimbursementView[]) => ReimbursementView[];
 export declare const getAllowedBulkActions: (selectedTab: RemiTabType, selectedSubTab: RemiSubTabType, isAllAwaitingMyApproval: boolean, isFirstBillProcessing: boolean, hasReimbursementFromOthersInBulkList: boolean) => BulkOperationType[];
-export declare const isRemiListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.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.isRemiListDownloadable = exports.getAllowedBulkActions = exports.getRemiListOnSort = exports.getApproversOrRejectors = exports.getRemiList = void 0;
+exports.getAllowedBulkActions = exports.getRemiListOnSort = exports.getApproversOrRejectors = exports.getRemiList = void 0;
 const difference_1 = __importDefault(require("lodash/difference"));
 const get_1 = __importDefault(require("lodash/get"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
@@ -11,13 +11,11 @@ const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchStat
 const approvalRuleState_1 = require("../../../../entity/approvalRule/approvalRuleState");
 const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
-const userRoleTenantAccess_1 = require("../../../../entity/userRole/userRoleTenantAccess");
 const userRoleType_1 = require("../../../../entity/userRole/userRoleType");
 const zeniDayJS_1 = require("../../../../zeniDayJS");
 const helpers_1 = require("../../helpers");
 const reimbursementConfigSelector_1 = require("../../reimbursement/reimbursementConfig/reimbursementConfigSelector");
 const spendManagementFilterHelpers_1 = require("../../spendManagementFilterHelpers");
-const remiListFilterHelpers_1 = require("./remiListFilterHelpers");
 const remiListState_1 = require("./remiListState");
 const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
     const { remiListState, reimbursementState, userState, entityApprovalStatusState, tenantState, reimbursementConfigState, remisBulkActionViewState, } = state;
@@ -57,7 +55,7 @@ const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
             approvers: approvers,
         };
     });
-    reimbursementsDetailed = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)(remiListFilterHelpers_1.getCategoryValueForReimbursement, reimbursementsDetailed, remiListState.filters);
+    reimbursementsDetailed = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('reimbursement', reimbursementsDetailed, remiListState.filters);
     const fetchState = remiListState.byRemiListKey[key]?.fetchState ?? 'Not-Started';
     const error = remiListState.byRemiListKey[key]?.error ?? undefined;
     const uiState = remiListState.byRemiListKey[key]?.uiState ?? undefined;
@@ -140,13 +138,13 @@ const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
     }
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const isReimbursementUser = Boolean(currentTenant?.userRole) === true
-        ? (0, userRoleTenantAccess_1.hasReimbursementUserAccess)(currentTenant)
+        ? (0, userRoleType_1.hasReimbursementUserAccess)(currentTenant)
         : false;
     const isAdmin = Boolean(currentTenant?.userRole) === true
         ? (0, userRoleType_1.hasAdminLevelAccess)(currentTenant.userRole)
         : false;
     const allSubTabs = getAllSubTabs(remiListState.currentTab, isReimbursementUser, isAdmin, false, true);
-    const isDownloadEnabled = (0, exports.isRemiListDownloadable)(state, currentTimePeriod);
+    const isDownloadEnabled = (0, spendManagementFilterHelpers_1.isRemiListDownloadable)(state, currentTimePeriod);
     const createdByUserList = (0, userSelector_1.getUsersByUserIds)(userState, remiListState.userIDs);
     const createdByUserListFetchState = (0, reduceFetchState_1.reduceAllFetchState)(remiListState_1.ALL_REMI_TABS.map((tab) => (0, remiListState_1.getRemiListKey)(currentTimePeriod, tab)).map((key) => ({
         fetchState: remiListState.byRemiListKey[key]?.fetchState,
@@ -569,48 +567,3 @@ const getAllowedBulkActions = (selectedTab, selectedSubTab, isAllAwaitingMyAppro
     }
 };
 exports.getAllowedBulkActions = getAllowedBulkActions;
-const isRemiListDownloadable = (state, currentTimePeriod) => {
-    const { remiListState, reimbursementState, userState, entityApprovalStatusState, } = state;
-    const keys = remiListState_1.ALL_REMI_TABS.filter((tab) => tab !== 'draft').map((tab) => (0, remiListState_1.getRemiListKey)(currentTimePeriod, tab));
-    let remiIds = [];
-    keys.forEach((key) => (remiIds = [
-        ...remiIds,
-        ...((0, get_1.default)(remiListState.byRemiListKey, key, undefined)
-            ?.transactionIDs ?? []),
-    ]));
-    const reimbursementsUnsorted = remiIds
-        .map((reimbursementId) => reimbursementState.reimbursementById[reimbursementId])
-        .filter((value) => {
-        if (value == null) {
-            console.error("Can't have null transaction at this stage!");
-        }
-        return value != null;
-    });
-    // get approvers and submittedBy values
-    let reimbursementsDetailed = reimbursementsUnsorted.map((reimbursement) => {
-        let approvers = { users: [], attributes: [] };
-        if (entityApprovalStatusState.entityApprovalStatusById[reimbursement.entityApprovalId] != null) {
-            approvers = (0, exports.getApproversOrRejectors)(reimbursement, entityApprovalStatusState, userState);
-        }
-        return {
-            ...reimbursement,
-            submittedBy: (0, userSelector_1.getUserByUserId)(userState, reimbursement.reimburseeUserId),
-            approvers: approvers,
-        };
-    });
-    reimbursementsDetailed = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)(remiListFilterHelpers_1.getCategoryValueForReimbursement, reimbursementsDetailed, remiListState.filters);
-    const loweredSearchText = remiListState.searchText.trim().toLowerCase();
-    reimbursementsDetailed = reimbursementsDetailed.filter((remi) => {
-        const { firstName, lastName, email } = {
-            firstName: remi.submittedBy?.firstName?.toLowerCase() ?? '',
-            lastName: remi.submittedBy?.lastName?.toLowerCase() ?? '',
-            email: remi.submittedBy?.email?.toLowerCase() ?? '',
-        };
-        return (remi.reportTitle?.toLowerCase().includes(loweredSearchText) ||
-            firstName.includes(loweredSearchText) ||
-            lastName.includes(loweredSearchText) ||
-            email.includes(loweredSearchText));
-    });
-    return reimbursementsDetailed.length > 0;
-};
-exports.isRemiListDownloadable = isRemiListDownloadable;