@zeniai/client-epic-state 4.19.96-betaSS2 → 4.19.96

package/lib/view/expenseAutomationView/selectors/fluxAnalysisViewSelector.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationFluxAnalysisView = getExpenseAutomationFluxAnalysisView;
-const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const classSelector_1 = require("../../../entity/class/classSelector");
@@ -10,7 +9,7 @@ const userSelector_1 = require("../../../entity/user/userSelector");
 const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 function getExpenseAutomationFluxAnalysisView(state) {
-    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
+    const { expenseAutomationFluxAnalysisViewState, monthEndCloseChecksState } = state;
     const { fetchState, error, refreshStatus, uiState, reviewOperatingExpenseIdsByPeriod, selectedSectionIdsByPeriod, groupsBySelectedPeriod, fluxAnalysisEntities, bulkReviewStatus, currency, totalBalancesAndVariance, } = expenseAutomationFluxAnalysisViewState;
     const fetchStateAndError = {
         fetchState,
@@ -95,17 +94,10 @@ function getExpenseAutomationFluxAnalysisView(state) {
         },
     };
     const completionStatus = fluxCompletionStatus != null ? fluxCompletionStatus : 'incomplete';
-    const monthEndFetchState = monthYearPeriodId != null
-        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
-        : { fetchState: 'Not-Started', error: undefined };
-    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
-        fetchStateAndError,
-        monthEndFetchState,
-    ]);
     return {
         sections,
         totalBalancesAndVariance,
-        fetchStatus: reducedFetchStatus,
+        fetchStatus: fetchStateAndError,
         bulkReviewStatus,
         reviewOperatingExpensesIds,
         selectedSectionIds,

package/lib/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationJESchedulesView = getExpenseAutomationJESchedulesView;
 const omit_1 = __importDefault(require("lodash/omit"));
-const orderBy_1 = __importDefault(require("lodash/orderBy"));
-const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const jeSchedulesSelector_1 = require("../../../entity/jeSchedules/jeSchedulesSelector");
@@ -18,46 +16,10 @@ const scheduleDetailSelector_1 = require("../../scheduleView/scheduleDetailView/
 const scheduleListHelper_1 = require("../../scheduleView/scheduleListView/scheduleListHelper");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const jeAccountSettingsViewSelector_1 = require("./jeAccountSettingsViewSelector");
-function getJEScheduleSortAccessor(sortKey) {
-    switch (sortKey) {
-        case 'vendor':
-            return (s) => s.vendor.name?.toLowerCase();
-        case 'category':
-            return (s) => s.jeDebit.account?.accountName?.toLowerCase();
-        case 'class':
-            return (s) => s.jeDebit.accountingClass?.className?.toLowerCase();
-        case 'scheduleCategory':
-            return (s) => s.jeScheduleType;
-        case 'startMonth':
-            return (s) => s.startDate?.valueOf();
-        case 'type':
-            return (s) => s.baseTransaction.typeOfTransaction;
-        case 'amortizationPeriod':
-            return (s) => s.period;
-        case 'jePostingDate':
-            return (s) => s.dayOfPostingDate;
-        case 'remainingMonths':
-            return (s) => s.period;
-        case 'runningBalance':
-            return (s) => s.balanceAsOfToday?.amount;
-        case 'totalAmount':
-            return (s) => s.baseTransaction.amount.amount;
-        case 'transactionDate':
-            return (s) => s.baseTransaction.date.valueOf();
-        case 'memo':
-            return (s) => s.baseTransaction.memo?.toLowerCase();
-        default:
-            return (s) => s.startDate?.valueOf();
-    }
-}
-function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
-    const accessor = getJEScheduleSortAccessor(sortKey);
-    return (0, orderBy_1.default)(transactions, [accessor], [sortOrder === 'ascending' ? 'asc' : 'desc']);
-}
 function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
-    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
+    const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, } = state;
     const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = (0, jeAccountSettingsViewSelector_1.getJEAccountSettingsView)(state);
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -103,33 +65,18 @@ function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleTransactionKey)(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const { sortKey, sortOrder } = uiState;
-    const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
-    const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
-    const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
-        schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
-    const unsortedResolveSchedules = [];
+    const draftSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft');
+    const resolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
-            unsortedResolveSchedules.push({
-                ...schedule,
-                scheduledJournalEntry: journalEntry,
-            });
+            resolveSchedules.push({ ...schedule, scheduledJournalEntry: journalEntry });
         });
     });
-    const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const allSteps = monthYearPeriodId != null
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
     const jeCompletionStatus = allSteps.find((step) => step.step === 'je_schedules')?.completionStatus;
     const completionStatus = jeCompletionStatus != null ? jeCompletionStatus : 'incomplete';
-    const monthEndFetchState = monthYearPeriodId != null
-        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
-        : { fetchState: 'Not-Started', error: undefined };
-    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
-        { fetchState, error },
-        monthEndFetchState,
-    ]);
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -138,17 +85,15 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        completedSchedules,
         draftSchedules,
-        ongoingSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
-        fetchState: reducedFetchStatus.fetchState,
+        fetchState: fetchState,
         jeScheduleLocalDataById: jeScheduleLocalDataById,
         uiState: uiState,
-        error: reducedFetchStatus.error,
+        error: error,
         refreshStatus,
         completionStatus,
     };

package/lib/view/expenseAutomationView/selectors/missingReceiptsSelector.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpenseAutomationMissingReceiptsView = getExpenseAutomationMissingReceiptsView;
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
-const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
@@ -14,7 +13,7 @@ const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewRed
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 const missingReceiptsViewState_1 = require("../types/missingReceiptsViewState");
 function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -43,7 +42,7 @@ function getExpenseAutomationMissingReceiptsView(state) {
                     transaction.lines.length > 0 &&
                     transaction.lines[0]
                         ?.class != null
-                    ? transaction.lines[0].class?.className.toLowerCase()
+                    ? transaction.lines[0].class.className.toLowerCase()
                     : null;
             case 'vendor':
             default:
@@ -182,16 +181,9 @@ function getExpenseAutomationMissingReceiptsView(state) {
             vendorLogo: result.vendorLogo ?? transaction?.logo?.href,
         };
     });
-    const monthEndFetchState = monthYearPeriodId != null
-        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
-        : { fetchState: 'Not-Started', error: undefined };
-    const reducedFetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
-        { fetchState, error },
-        monthEndFetchState,
-    ]);
     return {
-        fetchState: reducedFetchStatus.fetchState,
-        error: reducedFetchStatus.error,
+        fetchState,
+        error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,

package/lib/view/expenseAutomationView/selectors/reconciliationViewSelector.js

@@ -19,7 +19,7 @@ const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const reconciliationViewReducer_1 = require("../reducers/reconciliationViewReducer");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
-exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((state) => state, (state) => (0, tenantSelector_1.getCurrentTenant)(state), (state) => state.expenseAutomationReconciliationViewState, (state) => state.expenseAutomationViewState, (state) => state.plaidAccountViewState, (state) => state.accountListState, (state) => state.accountState, (state) => state.classListState, (state) => state.classState, (state) => state.monthEndCloseChecksState, (state) => state.vendorState, (state) => state.monthEndCloseChecksViewState, (state, currentTenant, reconciliationViewState, expenseAutomationViewState, plaidAccountViewState, accountListState, accountState, classListState, classState, monthEndCloseChecksState, vendorState, monthEndCloseChecksViewState) => {
+exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((state) => state, (state) => (0, tenantSelector_1.getCurrentTenant)(state), (state) => state.expenseAutomationReconciliationViewState, (state) => state.expenseAutomationViewState, (state) => state.plaidAccountViewState, (state) => state.accountListState, (state) => state.accountState, (state) => state.classListState, (state) => state.classState, (state) => state.monthEndCloseChecksState, (state) => state.vendorState, (state, currentTenant, reconciliationViewState, expenseAutomationViewState, plaidAccountViewState, accountListState, accountState, classListState, classState, monthEndCloseChecksState, vendorState) => {
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const reconcileTabUiState = reconciliationViewState.reconTabsState.reconcile.uiState;
     const reviewTabUiState = reconciliationViewState.reconTabsState.review.uiState;
@@ -41,13 +41,6 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         }
         return acc;
     }, []);
-    const monthYearPeriodId = selectedPeriod != null ? (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod) : null;
-    const monthEndFetchState = monthYearPeriodId != null
-        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? {
-            fetchState: 'Not-Started',
-            error: undefined,
-        })
-        : { fetchState: 'Not-Started', error: undefined };
     if (accountReconForMonthYearPeriod == null) {
         return {
             bankAccounts: [],
@@ -57,13 +50,10 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
             classListNestedAccountHierarchy: [],
             allAccountList: [],
             allClassList: [],
-            fetchStatus: (0, reduceFetchState_1.reduceAnyFetchState)([
-                {
-                    fetchState: reconciliationViewState.fetchState,
-                    error: reconciliationViewState.error,
-                },
-                monthEndFetchState,
-            ]),
+            fetchStatus: {
+                fetchState: reconciliationViewState.fetchState,
+                error: reconciliationViewState.error,
+            },
             plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
                 .plaidConnectionDetails,
             completionStatus: 'incomplete',
@@ -286,13 +276,10 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         bankAccounts: uniqueBankAccounts,
         creditCards: uniqueCreditCards,
         accountReconciliationsByAccountID: reconList,
-        fetchStatus: (0, reduceFetchState_1.reduceAnyFetchState)([
-            {
-                fetchState: reconciliationViewState.fetchState,
-                error: reconciliationViewState.error,
-            },
-            monthEndFetchState,
-        ]),
+        fetchStatus: {
+            fetchState: reconciliationViewState.fetchState,
+            error: reconciliationViewState.error,
+        },
         plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
             .plaidConnectionDetails,
         reconciliationTabsState: reconciliationViewState.reconTabsState,

package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -14,7 +14,7 @@ const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
 function getExpenseAutomationTransactionView(state) {
-    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
+    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
     const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
@@ -47,16 +47,10 @@ function getExpenseAutomationTransactionView(state) {
         .filter((transaction) => transaction != null);
     const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
     const transactionsWithCOT = transactions.map((transaction) => (0, transactionHelper_1.getTransactionWithCOT)(transaction));
-    const monthEndFetchState = monthYearPeriodId != null
-        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
-        : { fetchState: 'Not-Started', error: undefined };
-    const fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
-        (0, reduceFetchState_1.reduceAllFetchState)([
-            accountList,
-            classList,
-            expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
-        ]),
-        monthEndFetchState,
+    const fetchStatus = (0, reduceFetchState_1.reduceAllFetchState)([
+        accountList,
+        classList,
+        expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
     ]);
     const totalCountByReview = expenseAutomationTransactionsViewState.transactionCategorizationView.review
         .uiState.totalCount;

package/lib/view/expenseAutomationView/types/jeSchedulesViewState.d.ts

@@ -1,21 +1,16 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { FetchStateAndError, FetchedState, ID } from '../../../commonStateTypes/common';
 import { Recommendation } from '../../../commonStateTypes/recommendationBase';
-import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { AccountBase } from '../../../entity/account/accountState';
 import { JEScheduleTransactionKey, ScheduleTypes } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { VendorBase } from '../../../entity/vendor/vendorState';
-export declare const toJEScheduleSortKey: (v: string) => "vendor" | "type" | "category" | "class" | "memo" | "transactionDate" | "totalAmount" | "runningBalance" | "scheduleCategory" | "startMonth" | "amortizationPeriod" | "jePostingDate" | "remainingMonths";
-export type JEScheduleSortKey = ReturnType<typeof toJEScheduleSortKey>;
 export interface JESchedulesViewUIState {
     scrollPosition: {
         scrollTop: number;
         scrollLeft?: number;
     } | undefined;
     searchString: string;
-    sortKey: JEScheduleSortKey;
-    sortOrder: SortOrder;
     totalCount: number;
     limit?: number;
 }

package/lib/view/expenseAutomationView/types/jeSchedulesViewState.js

@@ -1,21 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toJEScheduleSortKey = void 0;
-const stringToUnion_1 = require("../../../commonStateTypes/stringToUnion");
-const JE_SCHEDULE_SORT_KEYS = [
-    'vendor',
-    'category',
-    'class',
-    'scheduleCategory',
-    'startMonth',
-    'type',
-    'amortizationPeriod',
-    'jePostingDate',
-    'remainingMonths',
-    'runningBalance',
-    'totalAmount',
-    'transactionDate',
-    'memo',
-];
-const toJEScheduleSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, JE_SCHEDULE_SORT_KEYS);
-exports.toJEScheduleSortKey = toJEScheduleSortKey;

package/lib/view/scheduleView/scheduleListView/scheduleListTypes.d.ts

@@ -7,7 +7,7 @@ export declare const getScheduleListKey: (selectedCategory: ID, selectedTimefram
 export type ScheduleListKey = ReturnType<typeof getScheduleListKey>;
 export declare const toScheduleSubTabType: (v: string) => "completed" | "new" | "ongoing" | "all";
 export type ScheduleSubTabType = ReturnType<typeof toScheduleSubTabType>;
-declare const toScheduleSortKeyType: (v: string) => "months" | "amount" | "vendor" | "status" | "user" | "createTime" | "class" | "memo" | "balanceAsOfToday" | "transactionDate" | "transactionType" | "assetId" | "scheduleCategory" | "startMonth" | "accruedExpenseCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "endMonth";
+declare const toScheduleSortKeyType: (v: string) => "months" | "amount" | "vendor" | "status" | "user" | "createTime" | "class" | "memo" | "balanceAsOfToday" | "transactionDate" | "transactionType" | "assetId" | "accruedExpenseCategory" | "scheduleCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "startMonth" | "endMonth";
 export declare type ScheduleListSortKey = ReturnType<typeof toScheduleSortKeyType>;
 export interface DownloadJEScheduleTabOptions {
     categoryId: ID;

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -424,14 +424,6 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                     transactionsWithNoSortKeyValue.push(transaction);
                 }
                 break;
-            case 'invoiceNumber':
-                if (transaction.documentId != null) {
-                    transactionsWithSortKeyValue.push(transaction);
-                }
-                else {
-                    transactionsWithNoSortKeyValue.push(transaction);
-                }
-                break;
             case 'dueDate':
                 if (currentTab === 'draft') {
                     if (Boolean(transaction.dueDate) === true) {
@@ -534,8 +526,6 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                 return transaction.totalAmountInUSD?.amount ?? 0;
             case 'paymentMethod':
                 return transaction.billPayInfo.billPaymentMethodType.name;
-            case 'invoiceNumber':
-                return transaction.documentId;
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/view/spendManagement/billPay/billList/billListState.d.ts

@@ -37,7 +37,7 @@ declare const toBillTabType: (v: string) => "paid" | "pending_approval" | "sched
 export type BillTab = ReturnType<typeof toBillTabType>;
 declare const toBillsSubTabType: (v: string) => "rejected" | "failed" | "ach" | "wire" | "cancelled" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "offline";
 export type BillsSubTabType = ReturnType<typeof toBillsSubTabType>;
-declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceNumber" | "invoiceDate";
+declare const toBillPaySortKeyType: (v: string) => "amount" | "status" | "name" | "dueDate" | "paymentMethod" | "invoiceDate";
 export declare type BillPayViewSortKey = ReturnType<typeof toBillPaySortKeyType>;
 export interface BillPayFilters {
     categories: BillPayFilterCategory[];

package/lib/view/spendManagement/billPay/billList/billListState.js

@@ -47,7 +47,6 @@ const ALL_BILL_PAY_SORT_KEYS = [
     'invoiceDate',
     'name',
     'paymentMethod',
-    'invoiceNumber',
 ];
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const toBillPaySortKeyType = (v) => (0, stringToUnion_1.stringToUnion)(v, ALL_BILL_PAY_SORT_KEYS);

package/lib/view/spendManagement/billPay/billPayReview/billPayReviewSelector.js

@@ -9,7 +9,6 @@ const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchStat
 const contactSelector_1 = require("../../../../entity/billPay/contact/contactSelector");
 const paymentAccountSelector_1 = require("../../../../entity/paymentAccount/paymentAccountSelector");
 const vendorSelector_1 = require("../../../../entity/vendor/vendorSelector");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const accountListSelector_1 = require("../../../accountList/accountListSelector");
 const setupViewSelector_1 = require("../../commonSetup/setupViewSelector");
 const depositAccountListSelector_1 = require("../../zeniAccounts/depositAccountList/depositAccountListSelector");
@@ -81,14 +80,11 @@ const getReviewPageBillDetail = (state, billId) => {
             }
         }
         if (sourceBillDetail != null) {
-            const fetchStateList = [
+            sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)([
                 sourceBillDetail.fetchStatus,
                 accountListState.byReportId['billPayAccountList'],
-            ];
-            if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-                fetchStateList.push(classListState);
-            }
-            sourceBillDetailFetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
+                classListState,
+            ]).fetchState;
         }
     }
     else {

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -9,7 +9,6 @@ const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const reduceFetchState_1 = require("../../../../commonStateTypes/reduceFetchState");
 const approvalRuleSelector_1 = require("../../../../entity/approvalRule/approvalRuleSelector");
 const classSelector_1 = require("../../../../entity/class/classSelector");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
@@ -51,7 +50,7 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
         newApprovalRuleId,
     };
 });
-exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (state) => (0, tenantSelector_1.getIsAccountingClassesEnabled)(state), (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState, isAccountingClassesEnabled) => {
+exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
     const { affectedEntityIds, approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
@@ -99,9 +98,10 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: isAccountingClassesEnabled
-            ? (0, reduceFetchState_1.reduceAllFetchState)([approverListState.fetchStatus, classListState])
-            : approverListState.fetchStatus,
+        approverListFetchStatus: (0, reduceFetchState_1.reduceAllFetchState)([
+            approverListState.fetchStatus,
+            classListState,
+        ]),
         fetchState,
         allAccountingClasses,
         error,

package/lib/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPayApproversDetailsEpic.js

@@ -3,28 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchBillPayApproversDetailsEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const tenantSelector_1 = require("../../../../../entity/tenant/tenantSelector");
 const classListReducer_1 = require("../../../../classList/classListReducer");
 const billPaySetupApproverViewReducer_1 = require("../billPaySetupApproverViewReducer");
 const fetchBillPayApproversDetailsEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(billPaySetupApproverViewReducer_1.fetchBillPayApproversDetails.match), (0, operators_1.mergeMap)((action) => {
     const { cacheOverride, includeUserRoles } = action.payload;
     const { billPaySetupApproverViewState, classListState } = state$.value;
     const { approverListState } = billPaySetupApproverViewState;
-    const isAccountingClassesEnabled = (0, tenantSelector_1.getIsAccountingClassesEnabled)(state$.value);
     const actions = [];
     if (cacheOverride === true) {
         actions.push((0, billPaySetupApproverViewReducer_1.fetchBillPayApproversList)(cacheOverride, includeUserRoles));
-        if (isAccountingClassesEnabled) {
-            actions.push((0, classListReducer_1.fetchClassList)());
-        }
+        actions.push((0, classListReducer_1.fetchClassList)());
     }
     else {
         if (billPaySetupApproverViewState.hasValidState() === false &&
             approverListState.fetchStatus.fetchState !== 'In-Progress') {
             actions.push((0, billPaySetupApproverViewReducer_1.fetchBillPayApproversList)(true, includeUserRoles));
         }
-        if (isAccountingClassesEnabled &&
-            classListState.hasValidState() === false &&
+        if (classListState.hasValidState() === false &&
             classListState.fetchState !== 'In-Progress') {
             actions.push((0, classListReducer_1.fetchClassList)());
         }

package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js

@@ -33,7 +33,6 @@ const billPayConfigPayload_1 = require("../billPayConfig/billPayConfigPayload");
 const billPayConfigSelector_1 = require("../billPayConfig/billPayConfigSelector");
 const billPayConfigState_1 = require("../billPayConfig/billPayConfigState");
 const billPayReviewSelector_1 = require("../billPayReview/billPayReviewSelector");
-const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
 const billPaySetupApproverViewSelector_1 = require("../billPaySetupApproverView/billPaySetupApproverViewSelector");
 const previousBillsSelector_1 = require("../previousBills/previousBillsSelector");
 const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAccountsEnabled, billId) => {
@@ -182,15 +181,12 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
             isCancelled = sourceBillDetail.billDetailLocalData.isCancelled;
             billStage = billPayInfo?.stage.code ?? 'draft';
             if (billViewState != null) {
-                const fetchStateList = [
+                fetchState = (0, reduceFetchState_1.reduceFetchState)([
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
+                    classListState,
                     billPaySetupApproverViewState,
-                ];
-                if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-                    fetchStateList.push(classListState);
-                }
-                fetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
+                ]).fetchState;
                 deleteStatus = billViewState.deleteStatus;
                 billActivities = (0, billDetailViewSelector_1.getBillActivities)(state, billId, billPayInfo?.stage.code);
             }
@@ -204,14 +200,11 @@ const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAc
         }
     }
     else {
-        const newBillFetchStateList = [
+        fetchState = (0, reduceFetchState_1.reduceFetchState)([
             accountListState.byReportId.billPayAccountList,
+            classListState,
             billPaySetupApproverViewState,
-        ];
-        if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-            newBillFetchStateList.push(classListState);
-        }
-        fetchState = (0, reduceFetchState_1.reduceFetchState)(newBillFetchStateList).fetchState;
+        ]).fetchState;
     }
     if (sourceBillDetail != null && fetchState == 'Completed') {
         const updatedRecord = sourceBillDetail.billDetailLocalData;

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.d.ts

@@ -61,7 +61,7 @@ export declare const initialCreditAcc: CreditAccount;
 export declare const initialDebitCardSummaries: DebitCardSummaries;
 export declare const initialResendRevokeCardInvite: ResendRevokeCardInvite;
 export declare const initialCreditAccountRepayment: CreditAccountRepayment;
-export declare const toChargeCardSortKeyType: (v: string) => "status" | "accountType" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
+export declare const toChargeCardSortKeyType: (v: string) => "status" | "owner" | "cardName" | "limit" | "department" | "cardType" | "utilisation";
 export declare type ChargeCardViewSortKey = ReturnType<typeof toChargeCardSortKeyType>;
 export declare const ALL_CASHBACK_SORT_KEYS: readonly ["month", "cashback"];
 export declare const toCashbackSortKeyType: (v: string) => "month" | "cashback";

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.js

@@ -78,7 +78,6 @@ const ALL_CHARGE_CARD_SORT_KEYS = [
     'cardName',
     'department',
     'cardType',
-    'accountType',
     'status',
     'utilisation',
     'limit',

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListSelector.js

@@ -233,8 +233,6 @@ const getCardsBySortKey = (card, sortKey) => {
             return card.cardName.toLowerCase();
         case 'cardType':
             return card.type.code;
-        case 'accountType':
-            return card.type.code.includes('credit') ? 'credit' : 'debit';
         case 'status':
             return card.status.code;
         case 'utilisation':

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.js

@@ -69,16 +69,13 @@ const getEditRemiDetail = (state, reimbursementId) => {
             paymentTo: reimbursementInfo?.toAccount.billAccountId,
         };
         if (sourceRemiDetail != null) {
-            const fetchStateList = [
+            fetchState = (0, reduceFetchState_1.reduceFetchState)([
                 sourceRemiDetail.fetchStatus,
                 accountListState.byReportId.reimbursementAccountList,
+                classListState,
                 merchantListState,
                 reimbursementConfigState,
-            ];
-            if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
-                fetchStateList.push(classListState);
-            }
-            fetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
+            ]).fetchState;
             remiStage = reimbursementInfo?.stage.code ?? 'draft';
             createdBy = (0, userSelector_1.getUserByUserId)(userState, reimbursement?.createdBy ?? '');
             createTime = reimbursement?.createTime;

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

@@ -42,7 +42,6 @@ export interface ReimbursementView extends Reimbursement {
     approvers: Approvers;
     submittedBy: User | undefined;
     bulkSelectInfo?: RemiBulkSelectInfo;
-    createdByUser?: User;
 }
 export declare const getRemiList: (state: RootState, currentTimePeriod: TimePeriod, isBulkActionFeatureEnabled: boolean) => RemiListReport;
 export declare const getApproversOrRejectors: (reimbursement: Reimbursement, entityApprovalStatusState: EntityApprovalStatusState, userState: UserState) => Approvers;

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

@@ -51,7 +51,6 @@ const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
         return {
             ...reimbursement,
             submittedBy: (0, userSelector_1.getUserByUserId)(userState, reimbursement.reimburseeUserId),
-            createdByUser: (0, userSelector_1.getUserByUserId)(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -424,14 +423,6 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                     reimbursementsWithNoSortKeyValue.push(reimbursement);
                 }
                 break;
-            case 'createdBy':
-                if (reimbursement.createdByUser != null) {
-                    reimbursementsWithSortKeyValue.push(reimbursement);
-                }
-                else {
-                    reimbursementsWithNoSortKeyValue.push(reimbursement);
-                }
-                break;
         }
     });
     const getColumnWiseSortOrder = (sortOrder) => {
@@ -439,7 +430,6 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
             case 'reportName':
             case 'type':
             case 'status':
-            case 'createdBy':
                 return sortOrder === 'ascending' ? 'asc' : 'desc';
             default:
                 return sortOrder === 'ascending' ? 'desc' : 'asc';
@@ -459,8 +449,6 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                 return getStatusPerTab(reimbursement);
             case 'amount':
                 return reimbursement.amount.amount ?? 0;
-            case 'createdBy':
-                return `${reimbursement.createdByUser?.firstName ?? ''} ${reimbursement.createdByUser?.lastName ?? ''}`.toLowerCase();
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [