@zeniai/client-epic-state 5.2.9 → 5.2.10

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

@@ -1,50 +1,39 @@
+import { ID } from '../../commonStateTypes/common';
 import { CategoryCombinationOperator, FilterCategoryType } from '../../commonStateTypes/filterPrimitives';
-import { TimePeriod } from '../../commonStateTypes/timePeriod';
 import { UserRoleType } from '../../entity/userRole/userRoleType';
-import { RootState } from '../../reducer';
 import { ZeniDate } from '../../zeniDayJS';
-import { TaskListFilterCategoryField, TaskListFilters } from '../taskManager/taskListView/taskList';
-import { TaskWithUserDetails } from '../taskManager/taskListView/taskListSelector';
-import { BillTransactionView } from './billPay/billList/billListSelector';
-import { BillListViewFilterCategoryField, BillPayFilters } from './billPay/billList/billListState';
-import { PaymentHistoryFilterCategoryDropdownOption, PaymentHistoryFilters } from './chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistory';
-import { ChargeCardRepaymentWithUser } from './chargeCards/chargeCardPaymentHistory/chargeCardPaymentHistorySelector';
-import { ReimbursementView } from './reimbursement/remiListView/remiListSelector';
-import { ReimbursementFilters, RemiListViewFilterCategoryField } from './reimbursement/remiListView/remiListState';
-export type SpendManagementFiltersType = BillPayFilters | ReimbursementFilters | TaskListFilters | PaymentHistoryFilters;
+import { TaskListFilterCategoryField } from '../taskManager/taskListView/taskList';
 export type SpendManagementFilterEntityType = 'bill_pay' | 'reimbursement' | 'task_management' | 'charge_card_payment_history';
-/**
- * Re-exported here so consumers of `spendManagementFilterHelpers` keep
- * their existing import path stable after the primitives moved to
- * `commonStateTypes/filterPrimitives`. Downstream files (`taskList`,
- * `remiListState`, `chargeCardPaymentHistory`, `billListState`) and the
- * CES barrel still pull `CategoryCombinationOperator` / `FilterCategoryType`
- * from this module — the source of truth is upstream but the surface is
- * unchanged.
- */
-export type { CategoryCombinationOperator, FilterCategoryType };
 export interface MatchingOperatorDropdownOption {
     label: 'is' | 'is not';
     value: 'equal' | 'not_equal';
 }
-export interface BillPayFilterCategoryDropdownOption {
-    value: BillListViewFilterCategoryField;
+export interface TaskFilterCategoryDropdownOption {
+    value: TaskListFilterCategoryField;
     multiple?: boolean;
     type?: FilterCategoryType;
 }
-export interface ReimbursementFilterCategoryDropdownOption {
-    value: RemiListViewFilterCategoryField;
+export type SpendManagementFilterCategoryDropdownOption = TaskFilterCategoryDropdownOption | {
+    value: string;
     multiple?: boolean;
     type?: FilterCategoryType;
+};
+export type FilterCategoryValueType = string | number | ZeniDate;
+export interface FilterCategory {
+    field: string;
+    matchingOperator: 'equal' | 'not_equal';
+    values: (string | ZeniDate)[];
+    valuesCombinationOperator: 'ANY';
 }
-export interface TaskFilterCategoryDropdownOption {
-    value: TaskListFilterCategoryField;
-    multiple?: boolean;
-    type?: FilterCategoryType;
+export interface SpendManagementFiltersType {
+    categories: FilterCategory[];
+    categoryCombinationOperator: CategoryCombinationOperator;
 }
-export type SpendManagementFilterCategoryDropdownOption = BillPayFilterCategoryDropdownOption | ReimbursementFilterCategoryDropdownOption | TaskFilterCategoryDropdownOption | PaymentHistoryFilterCategoryDropdownOption;
-export type FilterCategoryValueType = string | number | ZeniDate;
-export declare const applyAdvancedFiltersOnList: (entity: SpendManagementFilterEntityType, allItems: BillTransactionView[] | ReimbursementView[] | TaskWithUserDetails[] | ChargeCardRepaymentWithUser[], filters?: BillPayFilters | ReimbursementFilters | TaskListFilters | PaymentHistoryFilters, filteredItems?: (BillTransactionView | ReimbursementView | TaskWithUserDetails | ChargeCardRepaymentWithUser)[], index?: number) => (BillTransactionView | ReimbursementView | TaskWithUserDetails | ChargeCardRepaymentWithUser)[];
-export declare const isBillListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
-export declare const isRemiListDownloadable: (state: RootState, currentTimePeriod: TimePeriod) => boolean;
+type FilterableItem = {
+    id: ID;
+} | {
+    cardRepaymentId: ID;
+};
+export declare const applyAdvancedFiltersOnList: <T extends FilterableItem>(getCategoryValue: (key: string, item: T) => FilterCategoryValueType | (string | undefined)[] | undefined, allItems: T[], filters?: SpendManagementFiltersType, filteredItems?: T[], index?: number) => T[];
 export declare const hideCreatedByFilter: (userRole: UserRoleType[]) => boolean;
+export {};

package/lib/view/spendManagement/spendManagementFilterHelpers.js

@@ -1,18 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hideCreatedByFilter = exports.isRemiListDownloadable = exports.isBillListDownloadable = exports.applyAdvancedFiltersOnList = void 0;
-const get_1 = __importDefault(require("lodash/get"));
-const userSelector_1 = require("../../entity/user/userSelector");
+exports.hideCreatedByFilter = exports.applyAdvancedFiltersOnList = void 0;
 const userRoleType_1 = require("../../entity/userRole/userRoleType");
-const zeniDayJS_1 = require("../../zeniDayJS");
-const billListSelector_1 = require("./billPay/billList/billListSelector");
-const billListState_1 = require("./billPay/billList/billListState");
-const helpers_1 = require("./helpers");
-const remiListSelector_1 = require("./reimbursement/remiListView/remiListSelector");
-const remiListState_1 = require("./reimbursement/remiListView/remiListState");
 //filters items against filter values representing a range. ex: date (from-to), amount(1k<-->5k)
 // Spend Management uses only equal/not_equal — TC amount operators
 // (inBetween, lessThan, greaterThan) live in the TC filter pipeline.
@@ -78,8 +67,7 @@ const getItemId = (item) => {
     if ('cardRepaymentId' in item) {
         return item.cardRepaymentId;
     }
-    return item
-        .id;
+    return item.id;
 };
 const removeDuplicatesFromList = (list) => {
     const foundIds = [];
@@ -93,7 +81,7 @@ const removeDuplicatesFromList = (list) => {
     });
 };
 //filters against all filter categories for the respective list (allItems) recursively
-const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [], index = 0) => {
+const applyAdvancedFiltersOnList = (getCategoryValue, allItems, filters, filteredItems = [], index = 0) => {
     // if there are no filters we will return allBills
     if (filters?.categories == null || filters?.categories.length === 0) {
         return allItems;
@@ -109,19 +97,13 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
     const currentFilter = filters.categories[index];
     // it is possible some filter may not have field or values set in that case we will just move ahead with the next step of recursion
     if (currentFilter.field == null || currentFilter.values.length === 0) {
-        return (0, exports.applyAdvancedFiltersOnList)(entity, allItems, filters, filteredItems, index + 1);
+        return (0, exports.applyAdvancedFiltersOnList)(getCategoryValue, allItems, filters, filteredItems, index + 1);
     }
     // if categoryCombinationOperator is AND then we will filter only already filtered items else we will filter all the items in the list and take union
     const itemsToBeFiltered = filters.categoryCombinationOperator === 'AND' ? filteredItems : allItems;
     const itemsWithCurrentFilter = itemsToBeFiltered.filter((item) => {
         const key = currentFilter.field;
-        const categoryValue = entity === 'bill_pay'
-            ? getCategoryValueForBill(key, item)
-            : entity === 'reimbursement'
-                ? getCategoryValueForReimbursement(key, item)
-                : entity === 'task_management'
-                    ? getCategoryValueForTaskList(key, item)
-                    : getCategoryValueForPaymentHistory(key, item);
+        const categoryValue = getCategoryValue(key, item);
         if (categoryValue == null) {
             if (currentFilter.matchingOperator === 'not_equal') {
                 return true;
@@ -153,198 +135,11 @@ const applyAdvancedFiltersOnList = (entity, allItems, filters, filteredItems = [
         ]);
     }
     // recursively apply next filter
-    return (0, exports.applyAdvancedFiltersOnList)(entity, allItems, filters, filters.categoryCombinationOperator === 'AND'
+    return (0, exports.applyAdvancedFiltersOnList)(getCategoryValue, allItems, filters, filters.categoryCombinationOperator === 'AND'
         ? itemsWithCurrentFilter
         : filteredItems, index + 1);
 };
 exports.applyAdvancedFiltersOnList = applyAdvancedFiltersOnList;
-const getCategoryValueForBill = (key, bill) => {
-    switch (key) {
-        case 'dueDate':
-            return bill.dueDate;
-        case 'amount':
-            return bill.amount.amount;
-        case 'paymentMethod': {
-            const paymentMethodCode = bill.billPayInfo.billPaymentMethodType.code;
-            const paymentMethodSubCode = bill.billPayInfo.billPaymentMethodType.subCode;
-            return `${paymentMethodCode}_${paymentMethodSubCode}`;
-        }
-        case 'status':
-            return getAllBillStatus(bill);
-        case 'vendorName':
-            return bill.vendor?.name ?? bill.candidateVendorName;
-        case 'creationDate':
-            return bill.createTime;
-        case 'invoiceDate':
-            return bill.date;
-        case 'paymentDate':
-            return (0, helpers_1.getActualPaymentDate)(bill.billPayInfo);
-        case 'paymentType':
-            return bill.isRecurring ? 'recurring' : 'one-time';
-        default:
-            return undefined;
-    }
-};
-const getCategoryValueForTaskList = (key, task) => {
-    switch (key) {
-        case 'dueDate':
-            return task.dueDate;
-        case 'priority':
-            return task.priority.code;
-        case 'tag':
-            return task.tagIds;
-        case 'status':
-            return task.status.code;
-        case 'creationDate':
-            return task.createTime;
-        case 'assignee':
-            return task.assignees;
-        default:
-            return undefined;
-    }
-};
-const getAllBillStatus = (bill) => {
-    const billStatus = bill.billPayInfo.billStatus.code;
-    if (billStatus === 'rejected') {
-        return [billStatus];
-    }
-    const billPaymentStatus = bill.billPayInfo.billPaymentStatus.code;
-    const billStage = bill.billPayInfo.stage.code;
-    const isOverDue = (billStage === 'pending_approval' || billStage === 'draft') &&
-        bill.dueDate?.isBefore((0, zeniDayJS_1.dateNow)(), 'date') === true;
-    const allPossibleStatus = [billStatus, billPaymentStatus, billStage];
-    return isOverDue ? [...allPossibleStatus, 'overdue'] : allPossibleStatus;
-};
-const getCategoryValueForReimbursement = (key, reimbursement) => {
-    switch (key) {
-        case 'creationDate':
-            return reimbursement.createTime;
-        case 'receiptDate':
-            return reimbursement.remiDate;
-        case 'amount':
-            return reimbursement.amount.amount;
-        case 'paymentMethod': {
-            const paymentMethodCode = reimbursement.reimbursementInfo.billPaymentMethodType.code;
-            const paymentMethodSubCode = reimbursement.reimbursementInfo.billPaymentMethodType.subCode;
-            return `${paymentMethodCode}_${paymentMethodSubCode}`;
-        }
-        case 'status': {
-            const remiStatus = reimbursement.reimbursementInfo.billStatus.code;
-            if (remiStatus === 'rejected') {
-                return [remiStatus];
-            }
-            const remiPaymentStatus = reimbursement.reimbursementInfo.billPaymentStatus.code;
-            const remiStage = reimbursement.reimbursementInfo.stage.code;
-            return [remiStatus, remiPaymentStatus, remiStage];
-        }
-        case 'createdBy':
-            return reimbursement.createdBy;
-        default:
-            return undefined;
-    }
-};
-const getCategoryValueForPaymentHistory = (key, repayment) => {
-    switch (key) {
-        case 'repaymentDate':
-            return repayment.repaymentDate;
-        case 'sourceAccount': {
-            return repayment.paymentAccountId;
-        }
-        case 'status':
-            return repayment.status;
-        case 'initiatedBy':
-            return repayment.repaymentType === 'scheduled'
-                ? 'autopay'
-                : repayment.paidById;
-        default:
-            return undefined;
-    }
-};
-const isBillListDownloadable = (state, currentTimePeriod) => {
-    const { billListState, billTransactionState, entityApprovalStatusState, userState, } = state;
-    const keys = billListState_1.ALL_BILL_TABS.filter((tab) => tab !== 'draft').map((tab) => (0, billListState_1.getBillListKey)(currentTimePeriod, tab));
-    let billIds = [];
-    keys.forEach((key) => (billIds = [
-        ...billIds,
-        ...((0, get_1.default)(billListState.byBillListKey, key, undefined)
-            ?.transactionIDs ?? []),
-    ]));
-    const billTransactionsUnsorted = billIds
-        .map((transactionId) => billTransactionState.transactionById[transactionId])
-        .filter((value) => {
-        if (value == null) {
-            console.error("Can't have null transaction at this stage!");
-        }
-        return value != null;
-    });
-    let transactionsView = billTransactionsUnsorted.map((transaction) => {
-        let approvers = {
-            users: [],
-            attributes: [],
-        };
-        if (entityApprovalStatusState.entityApprovalStatusById[transaction.entityApprovalId] != null) {
-            approvers = (0, billListSelector_1.getApproversOrRejectors)(transaction, entityApprovalStatusState, userState);
-        }
-        return {
-            ...transaction,
-            approvers,
-        };
-    });
-    transactionsView = (0, exports.applyAdvancedFiltersOnList)('bill_pay', transactionsView, billListState.filters);
-    const loweredSearchText = billListState.searchText.trim().toLowerCase();
-    transactionsView = transactionsView.filter((transaction) => {
-        return (transaction.vendor?.name?.toLowerCase().includes(loweredSearchText) ===
-            true ||
-            transaction.documentId?.toLowerCase().includes(loweredSearchText) === true);
-    });
-    return transactionsView.length > 0;
-};
-exports.isBillListDownloadable = isBillListDownloadable;
-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, remiListSelector_1.getApproversOrRejectors)(reimbursement, entityApprovalStatusState, userState);
-        }
-        return {
-            ...reimbursement,
-            submittedBy: (0, userSelector_1.getUserByUserId)(userState, reimbursement.reimburseeUserId),
-            approvers: approvers,
-        };
-    });
-    reimbursementsDetailed = (0, exports.applyAdvancedFiltersOnList)('reimbursement', 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;
 const hideCreatedByFilter = (userRole) => {
     return !((0, userRoleType_1.hasSuperAdminLevelAccess)(userRole) ||
         (0, userRoleType_1.hasBookKeepingAdminLevelAccess)(userRole));

package/lib/view/spendManagement/treasury/treasuryList/epics/fetchTreasuryDetailEpic.d.ts

@@ -1,6 +1,6 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { RootState } from '../../../../../reducer';
+import { RootState } from '../../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { fetchPortfolioAllocation, fetchTreasuryFunds } from '../../treasurySetUp/treasurySetupViewReducer';
 import { fetchTreasuryStatementList } from '../../treasuryStatementList/treasuryStatementListReducer';

package/lib/view/spendManagement/treasury/treasuryList/epics/fetchTreasuryHistoryEpic.d.ts

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

package/lib/view/spendManagement/treasury/treasuryList/epics/fetchTreasuryTransactionListEpic.d.ts

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

package/lib/view/spendManagement/treasury/treasuryList/treasuryDetailPayload.d.ts

@@ -1,5 +1,5 @@
 import { ZeniAPIResponse } from '../../../../responsePayload';
-import { AccountHistoryWithBalance } from './treasuryDetailState';
+import { AccountHistoryWithBalance, TreasuryTransactionStatus } from './treasuryDetailState';
 interface AmountPayload {
     amount: number;
     currency_code: string;
@@ -17,10 +17,6 @@ interface TreasuryDetailPayload {
     };
 }
 export type FetchTreasuryDetailResponse = ZeniAPIResponse<TreasuryDetailPayload>;
-export interface TreasuryTransactionStatus {
-    code: string;
-    name: string;
-}
 export interface TreasuryTransactionPayload {
     amount: number;
     currency_code: string;

package/lib/view/spendManagement/treasury/treasuryList/treasuryDetailReducer.d.ts

@@ -12,7 +12,7 @@ export declare const fetchTreasuryOverviewDetail: import("@reduxjs/toolkit").Act
 }, "treasuryDetail/fetchTreasuryHistorySuccess">, fetchTreasuryHistoryFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
     fetchState: FetchState;
-}, "treasuryDetail/fetchTreasuryHistoryFailure">, clearTreasuryOverviewDetail: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasuryDetail/clearTreasuryOverviewDetail">, fetchTreasuryTransactionList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean, count?: number | undefined], {
+}, "treasuryDetail/fetchTreasuryHistoryFailure">, fetchTreasuryTransactionList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean, count?: number | undefined], {
     cacheOverride: boolean;
     count: number | undefined;
 }, "treasuryDetail/fetchTreasuryTransactionList", never, never>, fetchTreasuryTransactionListSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/spendManagement/treasury/treasuryList/treasuryDetailReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTreasuryTransactionListUIState = exports.fetchTreasurySummaryFailure = exports.fetchTreasurySummarySuccess = exports.updateTreasuryTransactionList = exports.fetchTreasuryTransactionListFailure = exports.fetchTreasuryTransactionListSuccess = exports.fetchTreasuryTransactionList = exports.clearTreasuryOverviewDetail = exports.fetchTreasuryHistoryFailure = exports.fetchTreasuryHistorySuccess = exports.fetchTreasuryHistory = exports.fetchTreasuryOverviewDetail = exports.initialState = void 0;
+exports.updateTreasuryTransactionListUIState = exports.fetchTreasurySummaryFailure = exports.fetchTreasurySummarySuccess = exports.updateTreasuryTransactionList = exports.fetchTreasuryTransactionListFailure = exports.fetchTreasuryTransactionListSuccess = exports.fetchTreasuryTransactionList = exports.fetchTreasuryHistoryFailure = exports.fetchTreasuryHistorySuccess = exports.fetchTreasuryHistory = exports.fetchTreasuryOverviewDetail = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const amount_1 = require("../../../../commonStateTypes/amount");
 const rootActions_1 = require("../../../../rootActions");
@@ -170,9 +170,6 @@ const treasuryDetail = (0, toolkit_1.createSlice)({
                     action.payload.uiState.scrollYOffset;
             }
         },
-        clearTreasuryOverviewDetail(draft) {
-            Object.assign(draft, exports.initialState);
-        },
     },
     extraReducers: (builder) => {
         builder.addCase(rootActions_1.clearAll, (draft) => {
@@ -180,5 +177,5 @@ const treasuryDetail = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = treasuryDetail.actions, exports.fetchTreasuryOverviewDetail = _a.fetchTreasuryOverviewDetail, exports.fetchTreasuryHistory = _a.fetchTreasuryHistory, exports.fetchTreasuryHistorySuccess = _a.fetchTreasuryHistorySuccess, exports.fetchTreasuryHistoryFailure = _a.fetchTreasuryHistoryFailure, exports.clearTreasuryOverviewDetail = _a.clearTreasuryOverviewDetail, exports.fetchTreasuryTransactionList = _a.fetchTreasuryTransactionList, exports.fetchTreasuryTransactionListSuccess = _a.fetchTreasuryTransactionListSuccess, exports.fetchTreasuryTransactionListFailure = _a.fetchTreasuryTransactionListFailure, exports.updateTreasuryTransactionList = _a.updateTreasuryTransactionList, exports.fetchTreasurySummarySuccess = _a.fetchTreasurySummarySuccess, exports.fetchTreasurySummaryFailure = _a.fetchTreasurySummaryFailure, exports.updateTreasuryTransactionListUIState = _a.updateTreasuryTransactionListUIState;
+_a = treasuryDetail.actions, exports.fetchTreasuryOverviewDetail = _a.fetchTreasuryOverviewDetail, exports.fetchTreasuryHistory = _a.fetchTreasuryHistory, exports.fetchTreasuryHistorySuccess = _a.fetchTreasuryHistorySuccess, exports.fetchTreasuryHistoryFailure = _a.fetchTreasuryHistoryFailure, exports.fetchTreasuryTransactionList = _a.fetchTreasuryTransactionList, exports.fetchTreasuryTransactionListSuccess = _a.fetchTreasuryTransactionListSuccess, exports.fetchTreasuryTransactionListFailure = _a.fetchTreasuryTransactionListFailure, exports.updateTreasuryTransactionList = _a.updateTreasuryTransactionList, exports.fetchTreasurySummarySuccess = _a.fetchTreasurySummarySuccess, exports.fetchTreasurySummaryFailure = _a.fetchTreasurySummaryFailure, exports.updateTreasuryTransactionListUIState = _a.updateTreasuryTransactionListUIState;
 exports.default = treasuryDetail.reducer;

package/lib/view/spendManagement/treasury/treasuryList/treasuryDetailSelector.d.ts

@@ -1,6 +1,6 @@
 import { FetchStateAndError } from '../../../../commonStateTypes/common';
 import { SelectorView } from '../../../../commonStateTypes/viewAndReport/viewAndReport';
-import { RootState } from '../../../../reducer';
+import { RootState } from '../../../../rootStateTypes';
 import { AccountHistoryWithBalances, TreasuryListUIState, TreasurySummaryWithBalance, TreasuryTransaction } from './treasuryDetailState';
 export interface TreasuryDetailSelectorView extends SelectorView {
     accountHistory: AccountHistoryWithBalances;

package/lib/view/spendManagement/treasury/treasuryList/treasuryDetailState.d.ts

@@ -3,7 +3,10 @@ import { Balance } from '../../../../commonStateTypes/balance';
 import { FetchStateAndError, FetchedState, ID } from '../../../../commonStateTypes/common';
 import { ZeniDate } from '../../../../zeniDayJS';
 import { SpendManagementUIState } from '../../billPay/billList/billListState';
-import { TreasuryTransactionStatus } from './treasuryDetailPayload';
+export interface TreasuryTransactionStatus {
+    code: string;
+    name: string;
+}
 export interface TreasuryDetailState extends FetchedState {
     accountHistory: AccountHistoryWithBalances;
     transactionsState: TreasuryListState;
@@ -40,7 +43,7 @@ export interface AccountHistoryWithBalance {
     date: ZeniDate;
 }
 export declare const initialAccountHistoryWithBalances: AccountHistoryWithBalances;
-export declare const toTreasurySortKeyType: (v: string) => "date" | "amount" | "description";
+export declare const toTreasurySortKeyType: (v: string) => "date" | "description" | "amount";
 export declare type TreasuryViewSortKey = ReturnType<typeof toTreasurySortKeyType>;
 export interface TreasuryListUIState extends SpendManagementUIState {
     sortKey: TreasuryViewSortKey;

package/lib/view/spendManagement/treasury/treasurySetUp/epic/acceptTreasuryTermsEpic.d.ts

@@ -4,7 +4,7 @@ import { updateCompanies } from '../../../../../entity/company/companyReducer';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { updateUserRoles } from '../../../../../entity/userRole/userRoleReducer';
-import { RootState } from '../../../../../reducer';
+import { RootState } from '../../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { acceptTreasuryTerms, acceptTreasuryTermsFailure, acceptTreasuryTermsSuccess } from '../treasurySetupViewReducer';
 export type ActionType = ReturnType<typeof acceptTreasuryTerms> | ReturnType<typeof updateAllUsers> | ReturnType<typeof updateUserRoles> | ReturnType<typeof updateCompanies> | ReturnType<typeof acceptTreasuryTermsSuccess> | ReturnType<typeof openSnackbar> | ReturnType<typeof acceptTreasuryTermsFailure>;

package/lib/view/spendManagement/treasury/treasurySetUp/epic/fetchPortfolioAllocationEpic.d.ts

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

package/lib/view/spendManagement/treasury/treasurySetUp/epic/fetchTreasuryFundsEpic.d.ts

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

package/lib/view/spendManagement/treasury/treasurySetUp/epic/fetchTreasurySetupViewEpic.d.ts

@@ -9,7 +9,7 @@ import { updatePaymentAccounts } from '../../../../../entity/paymentAccount/paym
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { updateUserRoles } from '../../../../../entity/userRole/userRoleReducer';
-import { RootState } from '../../../../../reducer';
+import { RootState } from '../../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { updateSetupViewLocalStoreData } from '../../../commonSetup/setupViewReducer';
 import { updatePlaidAccountViewAccountDetails } from '../../../plaidAccount/plaidAccountViewReducer';

package/lib/view/spendManagement/treasury/treasurySetUp/epic/updatePortfolioAllocationEpic.d.ts

@@ -1,7 +1,7 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { openSnackbar } from '../../../../../entity/snackbar/snackbarReducer';
-import { RootState } from '../../../../../reducer';
+import { RootState } from '../../../../../rootStateTypes';
 import { ZeniAPI } from '../../../../../zeniAPI';
 import { updatePortfolioAllocation, updatePortfolioAllocationFailure, updatePortfolioAllocationSuccess } from '../treasurySetupViewReducer';
 export type ActionType = ReturnType<typeof updatePortfolioAllocation> | ReturnType<typeof updatePortfolioAllocationSuccess> | ReturnType<typeof updatePortfolioAllocationFailure> | ReturnType<typeof openSnackbar>;

package/lib/view/spendManagement/treasury/treasurySetUp/treasurySetupViewReducer.d.ts

@@ -8,13 +8,13 @@ export declare const fetchTreasuryFunds: import("@reduxjs/toolkit").ActionCreato
     refreshViewInBackground: any;
 }, "treasurySetupView/fetchTreasurySetupView", never, never>, fetchTreasurySetupViewSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/fetchTreasurySetupViewSuccess">, fetchTreasurySetupViewFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/fetchTreasurySetupViewFailure", never, never>, acceptTreasuryTerms: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[companyId: string], {
     companyId: string;
-}, "treasurySetupView/acceptTreasuryTerms", never, never>, acceptTreasuryTermsSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/acceptTreasuryTermsSuccess">, acceptTreasuryTermsFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/acceptTreasuryTermsFailure", never, never>, clearTreasurySetupView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/clearTreasurySetupView">, updateTreasuryFundsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<TreasuryFundsPayload, "treasurySetupView/updateTreasuryFundsSuccess">, updateTreasuryFundsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "treasurySetupView/acceptTreasuryTerms", never, never>, acceptTreasuryTermsSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/acceptTreasuryTermsSuccess">, acceptTreasuryTermsFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/acceptTreasuryTermsFailure", never, never>, updateTreasuryFundsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<TreasuryFundsPayload, "treasurySetupView/updateTreasuryFundsSuccess">, updateTreasuryFundsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
 }, "treasurySetupView/updateTreasuryFundsFailure">, updatePortfolioAllocation: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[isEdit: boolean], {
     isEdit: boolean;
 }, "treasurySetupView/updatePortfolioAllocation", never, never>, updatePortfolioAllocationSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<UpdatePortfolioAllocationPayload, "treasurySetupView/updatePortfolioAllocationSuccess">, updatePortfolioAllocationFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[error: ZeniAPIStatus<Record<string, unknown>>], ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updatePortfolioAllocationFailure", never, never>, fetchPortfolioAllocation: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/fetchPortfolioAllocation">, fetchPortfolioAllocationSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     allocation_percentages: Record<string, number>;
     custom_corporate_id: string | null;
-}, "treasurySetupView/fetchPortfolioAllocationSuccess">, fetchPortfolioAllocationFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/fetchPortfolioAllocationFailure">, updateFundAllocationLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<FundAllocationOption, "treasurySetupView/updateFundAllocationLocalData">, updateTreasuryPromoIntroClosedByOutsideClick: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryPromoIntroClosedByOutsideClick">, updateTreasuryPromoIntroClosedByOutsideClickFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updateTreasuryPromoIntroClosedByOutsideClickFailure">, updateTreasuryPromoIntroClosedByOutsideClickSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryPromoIntroClosedByOutsideClickSuccess">, updateTreasuryPromoRemindMeLaterClicked: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryPromoRemindMeLaterClicked">, updateTreasuryPromoRemindMeLaterClickedFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updateTreasuryPromoRemindMeLaterClickedFailure">, updateTreasuryPromoRemindMeLaterClickedSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryPromoRemindMeLaterClickedSuccess">, updateTreasuryVideoViewed: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryVideoViewed">, updateTreasuryVideoViewedFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/updateTreasuryVideoViewedFailure">, updateTreasuryVideoViewedSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasurySetupView/updateTreasuryVideoViewedSuccess">;
+}, "treasurySetupView/fetchPortfolioAllocationSuccess">, fetchPortfolioAllocationFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "treasurySetupView/fetchPortfolioAllocationFailure">, updateFundAllocationLocalData: import("@reduxjs/toolkit").ActionCreatorWithPayload<FundAllocationOption, "treasurySetupView/updateFundAllocationLocalData">;
 declare const _default: import("redux").Reducer<TreasurySetupViewState>;
 export default _default;

package/lib/view/spendManagement/treasury/treasurySetUp/treasurySetupViewReducer.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTreasuryVideoViewedSuccess = exports.updateTreasuryVideoViewedFailure = exports.updateTreasuryVideoViewed = exports.updateTreasuryPromoRemindMeLaterClickedSuccess = exports.updateTreasuryPromoRemindMeLaterClickedFailure = exports.updateTreasuryPromoRemindMeLaterClicked = exports.updateTreasuryPromoIntroClosedByOutsideClickSuccess = exports.updateTreasuryPromoIntroClosedByOutsideClickFailure = exports.updateTreasuryPromoIntroClosedByOutsideClick = exports.updateFundAllocationLocalData = exports.fetchPortfolioAllocationFailure = exports.fetchPortfolioAllocationSuccess = exports.fetchPortfolioAllocation = exports.updatePortfolioAllocationFailure = exports.updatePortfolioAllocationSuccess = exports.updatePortfolioAllocation = exports.updateTreasuryFundsFailure = exports.updateTreasuryFundsSuccess = exports.clearTreasurySetupView = exports.acceptTreasuryTermsFailure = exports.acceptTreasuryTermsSuccess = exports.acceptTreasuryTerms = exports.fetchTreasurySetupViewFailure = exports.fetchTreasurySetupViewSuccess = exports.fetchTreasurySetupView = exports.fetchTreasuryFunds = exports.initialState = void 0;
+exports.updateFundAllocationLocalData = exports.fetchPortfolioAllocationFailure = exports.fetchPortfolioAllocationSuccess = exports.fetchPortfolioAllocation = exports.updatePortfolioAllocationFailure = exports.updatePortfolioAllocationSuccess = exports.updatePortfolioAllocation = exports.updateTreasuryFundsFailure = exports.updateTreasuryFundsSuccess = exports.acceptTreasuryTermsFailure = exports.acceptTreasuryTermsSuccess = exports.acceptTreasuryTerms = exports.fetchTreasurySetupViewFailure = exports.fetchTreasurySetupViewSuccess = exports.fetchTreasurySetupView = exports.fetchTreasuryFunds = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const rootActions_1 = require("../../../../rootActions");
@@ -41,18 +41,6 @@ exports.initialState = {
         fetchState: 'Not-Started',
         error: undefined,
     },
-    updateTreasuryPromoIntroClosedByOutsideClickStatus: {
-        fetchState: 'Not-Started',
-        error: undefined,
-    },
-    updateTreasuryPromoRemindMeLaterClickedStatus: {
-        fetchState: 'Not-Started',
-        error: undefined,
-    },
-    updateTreasuryVideoViewedStatus: {
-        fetchState: 'Not-Started',
-        error: undefined,
-    },
     hasValidState() {
         return this.fetchState === 'Completed';
     },
@@ -288,63 +276,6 @@ const treasurySetupView = (0, toolkit_1.createSlice)({
         updateFundAllocationLocalData(draft, action) {
             draft.fundAllocationLocalData = action.payload;
         },
-        updateTreasuryVideoViewed(draft) {
-            draft.updateTreasuryVideoViewedStatus = {
-                fetchState: 'In-Progress',
-                error: undefined,
-            };
-        },
-        updateTreasuryVideoViewedSuccess(draft) {
-            draft.updateTreasuryVideoViewedStatus = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-        },
-        updateTreasuryVideoViewedFailure(draft, action) {
-            draft.updateTreasuryVideoViewedStatus = {
-                fetchState: 'Error',
-                error: action.payload,
-            };
-        },
-        updateTreasuryPromoRemindMeLaterClicked(draft) {
-            draft.updateTreasuryPromoRemindMeLaterClickedStatus = {
-                fetchState: 'In-Progress',
-                error: undefined,
-            };
-        },
-        updateTreasuryPromoRemindMeLaterClickedSuccess(draft) {
-            draft.updateTreasuryPromoRemindMeLaterClickedStatus = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-        },
-        updateTreasuryPromoRemindMeLaterClickedFailure(draft, action) {
-            draft.updateTreasuryPromoRemindMeLaterClickedStatus = {
-                fetchState: 'Error',
-                error: action.payload,
-            };
-        },
-        updateTreasuryPromoIntroClosedByOutsideClick(draft) {
-            draft.updateTreasuryPromoIntroClosedByOutsideClickStatus = {
-                fetchState: 'In-Progress',
-                error: undefined,
-            };
-        },
-        updateTreasuryPromoIntroClosedByOutsideClickSuccess(draft) {
-            draft.updateTreasuryPromoIntroClosedByOutsideClickStatus = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-        },
-        updateTreasuryPromoIntroClosedByOutsideClickFailure(draft, action) {
-            draft.updateTreasuryPromoIntroClosedByOutsideClickStatus = {
-                fetchState: 'Error',
-                error: action.payload,
-            };
-        },
-        clearTreasurySetupView(draft) {
-            Object.assign(draft, exports.initialState);
-        },
     },
     extraReducers: (builder) => {
         builder.addCase(rootActions_1.clearAll, (draft) => {
@@ -352,7 +283,7 @@ const treasurySetupView = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = treasurySetupView.actions, exports.fetchTreasuryFunds = _a.fetchTreasuryFunds, exports.fetchTreasurySetupView = _a.fetchTreasurySetupView, exports.fetchTreasurySetupViewSuccess = _a.fetchTreasurySetupViewSuccess, exports.fetchTreasurySetupViewFailure = _a.fetchTreasurySetupViewFailure, exports.acceptTreasuryTerms = _a.acceptTreasuryTerms, exports.acceptTreasuryTermsSuccess = _a.acceptTreasuryTermsSuccess, exports.acceptTreasuryTermsFailure = _a.acceptTreasuryTermsFailure, exports.clearTreasurySetupView = _a.clearTreasurySetupView, exports.updateTreasuryFundsSuccess = _a.updateTreasuryFundsSuccess, exports.updateTreasuryFundsFailure = _a.updateTreasuryFundsFailure, exports.updatePortfolioAllocation = _a.updatePortfolioAllocation, exports.updatePortfolioAllocationSuccess = _a.updatePortfolioAllocationSuccess, exports.updatePortfolioAllocationFailure = _a.updatePortfolioAllocationFailure, exports.fetchPortfolioAllocation = _a.fetchPortfolioAllocation, exports.fetchPortfolioAllocationSuccess = _a.fetchPortfolioAllocationSuccess, exports.fetchPortfolioAllocationFailure = _a.fetchPortfolioAllocationFailure, exports.updateFundAllocationLocalData = _a.updateFundAllocationLocalData, exports.updateTreasuryPromoIntroClosedByOutsideClick = _a.updateTreasuryPromoIntroClosedByOutsideClick, exports.updateTreasuryPromoIntroClosedByOutsideClickFailure = _a.updateTreasuryPromoIntroClosedByOutsideClickFailure, exports.updateTreasuryPromoIntroClosedByOutsideClickSuccess = _a.updateTreasuryPromoIntroClosedByOutsideClickSuccess, exports.updateTreasuryPromoRemindMeLaterClicked = _a.updateTreasuryPromoRemindMeLaterClicked, exports.updateTreasuryPromoRemindMeLaterClickedFailure = _a.updateTreasuryPromoRemindMeLaterClickedFailure, exports.updateTreasuryPromoRemindMeLaterClickedSuccess = _a.updateTreasuryPromoRemindMeLaterClickedSuccess, exports.updateTreasuryVideoViewed = _a.updateTreasuryVideoViewed, exports.updateTreasuryVideoViewedFailure = _a.updateTreasuryVideoViewedFailure, exports.updateTreasuryVideoViewedSuccess = _a.updateTreasuryVideoViewedSuccess;
+_a = treasurySetupView.actions, exports.fetchTreasuryFunds = _a.fetchTreasuryFunds, exports.fetchTreasurySetupView = _a.fetchTreasurySetupView, exports.fetchTreasurySetupViewSuccess = _a.fetchTreasurySetupViewSuccess, exports.fetchTreasurySetupViewFailure = _a.fetchTreasurySetupViewFailure, exports.acceptTreasuryTerms = _a.acceptTreasuryTerms, exports.acceptTreasuryTermsSuccess = _a.acceptTreasuryTermsSuccess, exports.acceptTreasuryTermsFailure = _a.acceptTreasuryTermsFailure, exports.updateTreasuryFundsSuccess = _a.updateTreasuryFundsSuccess, exports.updateTreasuryFundsFailure = _a.updateTreasuryFundsFailure, exports.updatePortfolioAllocation = _a.updatePortfolioAllocation, exports.updatePortfolioAllocationSuccess = _a.updatePortfolioAllocationSuccess, exports.updatePortfolioAllocationFailure = _a.updatePortfolioAllocationFailure, exports.fetchPortfolioAllocation = _a.fetchPortfolioAllocation, exports.fetchPortfolioAllocationSuccess = _a.fetchPortfolioAllocationSuccess, exports.fetchPortfolioAllocationFailure = _a.fetchPortfolioAllocationFailure, exports.updateFundAllocationLocalData = _a.updateFundAllocationLocalData;
 exports.default = treasurySetupView.reducer;
 function mapTreasuryFundsPayloadToFundData(fundsPayload) {
     return fundsPayload.funds.map((fund) => ({