@zeniai/client-epic-state 4.19.99-betaSS4 → 4.19.99

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

@@ -13,7 +13,7 @@ import { getAccountList, getNestedAccountListHierarchy, } from '../../accountLis
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { initialActionFetchState, initialReconciliationTabsState, initialState, } from '../reducers/reconciliationViewReducer';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
-export const getExpenseAutomationReconciliationView = createSelector((state) => state, (state) => 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) => {
+export const getExpenseAutomationReconciliationView = createSelector((state) => state, (state) => 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;
@@ -35,13 +35,6 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         }
         return acc;
     }, []);
-    const monthYearPeriodId = selectedPeriod != null ? 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: [],
@@ -51,13 +44,10 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
             classListNestedAccountHierarchy: [],
             allAccountList: [],
             allClassList: [],
-            fetchStatus: reduceAnyFetchState([
-                {
-                    fetchState: reconciliationViewState.fetchState,
-                    error: reconciliationViewState.error,
-                },
-                monthEndFetchState,
-            ]),
+            fetchStatus: {
+                fetchState: reconciliationViewState.fetchState,
+                error: reconciliationViewState.error,
+            },
             plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
                 .plaidConnectionDetails,
             completionStatus: 'incomplete',
@@ -280,13 +270,10 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         bankAccounts: uniqueBankAccounts,
         creditCards: uniqueCreditCards,
         accountReconciliationsByAccountID: reconList,
-        fetchStatus: 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/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -1,5 +1,5 @@
 import omit from 'lodash/omit';
-import { reduceAllFetchState, reduceAnyFetchState, } from '../../../commonStateTypes/reduceFetchState';
+import { reduceAllFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
@@ -8,7 +8,7 @@ import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 export 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 = getUncategorizedAccounts(accountState, accountListState, 'accountList');
@@ -41,16 +41,10 @@ export function getExpenseAutomationTransactionView(state) {
         .filter((transaction) => transaction != null);
     const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
     const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
-    const monthEndFetchState = monthYearPeriodId != null
-        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
-        : { fetchState: 'Not-Started', error: undefined };
-    const fetchStatus = reduceAnyFetchState([
-        reduceAllFetchState([
-            accountList,
-            classList,
-            expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
-        ]),
-        monthEndFetchState,
+    const fetchStatus = reduceAllFetchState([
+        accountList,
+        classList,
+        expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
     ]);
     const totalCountByReview = expenseAutomationTransactionsViewState.transactionCategorizationView.review
         .uiState.totalCount;

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

@@ -1,18 +1 @@
-import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
-const JE_SCHEDULE_SORT_KEYS = [
-    'vendor',
-    'category',
-    'class',
-    'depCategory',
-    'scheduleCategory',
-    'startMonth',
-    'type',
-    'amortizationPeriod',
-    'jePostingDate',
-    'remainingMonths',
-    'runningBalance',
-    'totalAmount',
-    'transactionDate',
-    'memo',
-];
-export const toJEScheduleSortKey = (v) => stringToUnion(v, JE_SCHEDULE_SORT_KEYS);
+export {};

package/lib/esm/view/profitAndLossClassesView/profitAndLossClassesByClassHorizontalSelector.js

@@ -49,11 +49,16 @@ export const getProfitAndLossClassesHorizontalView = (filter, accountState, clas
     const calculatedSections = {};
     let reportCurrency = defaultCustomerCurrency;
     if (fetchState.fetchState === 'Completed' && selectedPeriod != null) {
+        // Get section reports using existing selector infrastructure
+        const sectionReports = {};
+        HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
+            sectionReports[sectionId] = getSectionClassesViewReport(accountState, classState, sectionsState, { reportId, sectionId }, filter);
+        });
         reportCurrency =
             profitAndLossClassesViewState.currency ?? defaultCustomerCurrency;
-        // Fetch each section and pivot class→account to account→class in one pass
+        // Pivot each section from class→account to account→class
         HORIZONTAL_PANDL_SECTION_IDS.forEach((sectionId) => {
-            const sectionReport = getSectionClassesViewReport(accountState, classState, sectionsState, { reportId, sectionId }, filter);
+            const sectionReport = sectionReports[sectionId];
             if (sectionReport != null) {
                 sections[sectionId] = pivotSectionToHorizontal(sectionReport, classColumns, SECTION_TITLES[sectionId] ?? sectionId, reportCurrency);
             }
@@ -256,7 +261,7 @@ function sumBalancesInSlice(balances) {
     if (balances.length === 0) {
         return 0;
     }
-    const summed = getSummationFreeRangeTotalBalance(balances);
+    const summed = getSummationFreeRangeTotalBalance([...balances]);
     return summed?.balance.amount ?? 0;
 }
 /**

package/lib/esm/view/profitAndLossClassesView/profitAndLossHorizontalEnrichment.js

@@ -25,31 +25,30 @@ function enrichHorizontalSection(report, section) {
         return total?.balance.amount ?? 0;
     });
     section.sectionHeaderBalancesSlice = buildHorizontalClassColumnBalancesSlice(report, classAmounts, section.sectionTotal.amount);
-    const parentIndices = computeHorizontalAccountParentIndices(section.accounts);
-    const childrenRowIndicesByParent = buildHorizontalAccountChildIndicesByParent(parentIndices);
+    const childrenRowIndicesByParent = buildHorizontalAccountChildIndicesByParent(section.accounts);
     const childrenRecord = {};
     childrenRowIndicesByParent.forEach((childIndices, parentIndex) => {
         childrenRecord[parentIndex] = childIndices;
     });
     section.treeLayout = {
         rootAccountRowIndices: section.accounts
-            .map((_, i) => (parentIndices[i] === -1 ? i : -1))
+            .map((_, i) => findHorizontalAccountParentIndex(section.accounts, i) === -1 ? i : -1)
             .filter((i) => i >= 0),
         childrenRowIndicesByParent: childrenRecord,
     };
-    const siblingsPerRow = buildSiblingIndicesPerRow(section.accounts, parentIndices);
-    const hasChildFlags = computeHorizontalHasChildFlags(parentIndices);
-    for (let accountIndex = 0; accountIndex < section.accounts.length; accountIndex++) {
-        const row = section.accounts[accountIndex];
-        // Same column order as `report.classColumns` (see `pivotSectionToHorizontal`).
-        const classRowAmounts = row.classBalances.map((classBalance) => classBalance.balance.amount);
+    for (let i = 0; i < section.accounts.length; i++) {
+        const row = section.accounts[i];
+        const classRowAmounts = report.classColumns.map((col) => {
+            const cb = row.classBalances.find((b) => b.classId === col.classId);
+            return cb?.balance.amount ?? 0;
+        });
         row.accountReportData = {
             accountId: row.accountId,
             accountName: row.accountName,
             accountType: row.accountType,
             depth: row.depth,
             balancesInTimeframe: buildHorizontalClassColumnBalancesSlice(report, classRowAmounts, row.rowTotal.amount),
-            horizontalTreeView: buildHorizontalTreeViewFromPrecomputed(section.accounts, accountIndex, parentIndices, siblingsPerRow, hasChildFlags),
+            horizontalTreeView: buildHorizontalTreeView(section.accounts, i),
         };
     }
 }
@@ -81,9 +80,9 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
         return emptySlice;
     }
     const { startDate, endDate } = report.selectedPeriod;
-    const balances = report.classColumns.map((col, columnIndex) => ({
+    const balances = report.classColumns.map((col, i) => ({
         balance: {
-            amount: classAmounts[columnIndex] ?? 0,
+            amount: classAmounts[i] ?? 0,
             currencyCode,
             currencySymbol,
         },
@@ -121,157 +120,64 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
         },
     };
 }
-/**
- * Parent index per DFS row — O(n). Matches the scan in the former
- * `findHorizontalAccountParentIndex` (depth &lt;= 2 rows have no parent).
- */
-function computeHorizontalAccountParentIndices(rows) {
-    const accountRowCount = rows.length;
-    const parentIndex = new Array(accountRowCount).fill(-1);
-    const stack = [];
-    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
-        const accountRow = rows[rowIndex];
-        if (accountRow == null) {
-            continue;
-        }
-        const depth = accountRow.depth;
-        while (stack.length > 0) {
-            const topIndex = stack[stack.length - 1];
-            if (topIndex == null) {
-                break;
-            }
-            const topRow = rows[topIndex];
-            if (topRow == null) {
-                stack.pop();
-                continue;
-            }
-            if (topRow.depth < depth) {
-                break;
-            }
-            stack.pop();
-        }
-        if (depth <= 2) {
-            parentIndex[rowIndex] = -1;
-        }
-        else if (stack.length === 0) {
-            parentIndex[rowIndex] = -1;
-        }
-        else {
-            const peek = stack[stack.length - 1];
-            if (peek == null) {
-                parentIndex[rowIndex] = -1;
-            }
-            else {
-                const parentRow = rows[peek];
-                parentIndex[rowIndex] =
-                    parentRow != null && parentRow.depth === depth - 1 ? peek : -1;
+function findHorizontalAccountParentIndex(dfsOrderedAccountRows, childRowIndex) {
+    const childDepth = dfsOrderedAccountRows[childRowIndex].depth;
+    if (childDepth <= 2) {
+        return -1;
+    }
+    for (let earlierRowIndex = childRowIndex - 1; earlierRowIndex >= 0; earlierRowIndex--) {
+        const earlierDepth = dfsOrderedAccountRows[earlierRowIndex].depth;
+        if (earlierDepth < childDepth) {
+            if (earlierDepth === childDepth - 1) {
+                return earlierRowIndex;
             }
+            return -1;
         }
-        stack.push(rowIndex);
     }
-    return parentIndex;
+    return -1;
 }
-/** Sibling row indices (same parent + depth), in traversal order — O(n). */
-function buildSiblingIndicesPerRow(rows, parentIndices) {
-    const accountRowCount = rows.length;
-    const keyToIndices = new Map();
-    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
-        const parentRowIndex = parentIndices[rowIndex];
-        const accountRow = rows[rowIndex];
-        if (parentRowIndex == null || accountRow == null) {
-            continue;
-        }
-        const key = `${parentRowIndex}:${accountRow.depth}`;
-        let siblingGroup = keyToIndices.get(key);
-        if (siblingGroup == null) {
-            siblingGroup = [];
-            keyToIndices.set(key, siblingGroup);
+function getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, rowIndex) {
+    const parentRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex);
+    const rowDepth = dfsOrderedAccountRows[rowIndex].depth;
+    const siblings = [];
+    for (let i = 0; i < dfsOrderedAccountRows.length; i++) {
+        if (dfsOrderedAccountRows[i].depth === rowDepth &&
+            findHorizontalAccountParentIndex(dfsOrderedAccountRows, i) ===
+                parentRowIndex) {
+            siblings.push(i);
         }
-        siblingGroup.push(rowIndex);
     }
-    const siblingsPerRow = new Array(accountRowCount);
-    for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
-        const parentRowIndex = parentIndices[rowIndex];
-        const accountRow = rows[rowIndex];
-        if (parentRowIndex == null || accountRow == null) {
-            siblingsPerRow[rowIndex] = [rowIndex];
-            continue;
-        }
-        const key = `${parentRowIndex}:${accountRow.depth}`;
-        const group = keyToIndices.get(key);
-        siblingsPerRow[rowIndex] = group != null ? group : [rowIndex];
-    }
-    return siblingsPerRow;
+    return siblings;
 }
-function computeHorizontalHasChildFlags(parentIndices) {
-    const rowCount = parentIndices.length;
-    const flags = new Array(rowCount).fill(false);
-    for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-        const parentRowIndex = parentIndices[rowIndex];
-        if (parentRowIndex != null &&
-            parentRowIndex >= 0 &&
-            parentRowIndex < rowCount) {
-            flags[parentRowIndex] = true;
-        }
-    }
-    return flags;
+function horizontalAccountHasChildRows(dfsOrderedAccountRows, parentRowIndex) {
+    return dfsOrderedAccountRows.some((_, rowIndex) => findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex) ===
+        parentRowIndex);
 }
-function buildHorizontalSubAccountAncestorMetadataFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags) {
-    const chain = [];
+function buildHorizontalSubAccountAncestorMetadata(dfsOrderedAccountRows, currentRowIndex) {
+    const ancestorRowIndicesRootToLeaf = [];
     let walkRowIndex = currentRowIndex;
     while (walkRowIndex >= 0) {
-        chain.unshift(walkRowIndex);
-        const parentRowIndex = parentIndices[walkRowIndex];
-        if (parentRowIndex == null) {
-            break;
-        }
-        walkRowIndex = parentRowIndex;
+        ancestorRowIndicesRootToLeaf.unshift(walkRowIndex);
+        walkRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, walkRowIndex);
     }
-    return chain.map((rowIndex) => {
-        const accountRow = dfsOrderedAccountRows[rowIndex];
-        const siblingIndices = siblingsPerRow[rowIndex];
-        const hasChild = hasChildFlags[rowIndex];
-        if (accountRow == null || siblingIndices == null) {
-            return {
-                depth: 0,
-                hasSibling: false,
-                hasChildren: hasChild === true,
-                isLastNode: true,
-                name: '',
-            };
-        }
+    return ancestorRowIndicesRootToLeaf.map((rowIndex) => {
+        const siblingIndices = getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, rowIndex);
         return {
-            depth: accountRow.depth - 2,
+            depth: dfsOrderedAccountRows[rowIndex].depth - 2,
             hasSibling: siblingIndices.length > 1,
-            hasChildren: hasChild === true,
+            hasChildren: horizontalAccountHasChildRows(dfsOrderedAccountRows, rowIndex),
             isLastNode: rowIndex === siblingIndices[siblingIndices.length - 1],
-            name: accountRow.accountName,
+            name: dfsOrderedAccountRows[rowIndex].accountName,
         };
     });
 }
-function buildHorizontalTreeViewFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags) {
-    const siblingIndices = siblingsPerRow[currentRowIndex];
-    const accountRow = dfsOrderedAccountRows[currentRowIndex];
-    const hasChildrenFlag = hasChildFlags[currentRowIndex];
-    const treeDepth = accountRow != null ? Math.max(0, accountRow.depth - 2) : 0;
-    const hasChildren = hasChildrenFlag === true;
-    const siblings = siblingIndices ?? [currentRowIndex];
-    return {
-        subAccountAncestorMetadata: buildHorizontalSubAccountAncestorMetadataFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags),
-        treeDepth,
-        hasChildren,
-        hasSiblings: siblings.length > 1,
-        isLeaf: !hasChildren,
-        isLastNode: currentRowIndex === siblings[siblings.length - 1],
-    };
-}
-function buildHorizontalAccountChildIndicesByParent(parentIndices) {
+function buildHorizontalAccountChildIndicesByParent(dfsOrderedAccountRows) {
     const childIndicesByParentRowIndex = new Map();
-    for (let rowIndex = 0; rowIndex < parentIndices.length; rowIndex++) {
-        const parentRowIndex = parentIndices[rowIndex];
-        if (parentRowIndex != null && parentRowIndex >= 0) {
+    for (let rowIndex = 0; rowIndex < dfsOrderedAccountRows.length; rowIndex++) {
+        const parentRowIndex = findHorizontalAccountParentIndex(dfsOrderedAccountRows, rowIndex);
+        if (parentRowIndex >= 0) {
             let childRowIndices = childIndicesByParentRowIndex.get(parentRowIndex);
-            if (childRowIndices == null) {
+            if (childRowIndices === undefined) {
                 childRowIndices = [];
                 childIndicesByParentRowIndex.set(parentRowIndex, childRowIndices);
             }
@@ -280,3 +186,16 @@ function buildHorizontalAccountChildIndicesByParent(parentIndices) {
     }
     return childIndicesByParentRowIndex;
 }
+function buildHorizontalTreeView(dfsOrderedAccountRows, currentRowIndex) {
+    const treeDepth = Math.max(0, dfsOrderedAccountRows[currentRowIndex].depth - 2);
+    const siblingIndices = getHorizontalAccountSiblingIndices(dfsOrderedAccountRows, currentRowIndex);
+    const hasChildren = horizontalAccountHasChildRows(dfsOrderedAccountRows, currentRowIndex);
+    return {
+        subAccountAncestorMetadata: buildHorizontalSubAccountAncestorMetadata(dfsOrderedAccountRows, currentRowIndex),
+        treeDepth,
+        hasChildren,
+        hasSiblings: siblingIndices.length > 1,
+        isLeaf: !hasChildren,
+        isLastNode: currentRowIndex === siblingIndices[siblingIndices.length - 1],
+    };
+}

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

@@ -416,14 +416,6 @@ export 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) {
@@ -526,8 +518,6 @@ export 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/esm/view/spendManagement/billPay/billList/billListState.js

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

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

@@ -2,7 +2,6 @@ import recordGet from 'lodash/get';
 import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
 import { getContactsByIds } from '../../../../entity/billPay/contact/contactSelector';
 import { getPaymentAccountsByPaymentAccountIds } from '../../../../entity/paymentAccount/paymentAccountSelector';
-import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getVendorByVendorId } from '../../../../entity/vendor/vendorSelector';
 import { getAccountList } from '../../../accountList/accountListSelector';
 import { getAllFundingAccounts, } from '../../commonSetup/setupViewSelector';
@@ -74,14 +73,11 @@ export const getReviewPageBillDetail = (state, billId) => {
             }
         }
         if (sourceBillDetail != null) {
-            const fetchStateList = [
+            sourceBillDetailFetchState = reduceFetchState([
                 sourceBillDetail.fetchStatus,
                 accountListState.byReportId['billPayAccountList'],
-            ];
-            if (getIsAccountingClassesEnabled(state)) {
-                fetchStateList.push(classListState);
-            }
-            sourceBillDetailFetchState = reduceFetchState(fetchStateList).fetchState;
+                classListState,
+            ]).fetchState;
         }
     }
     else {

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

@@ -3,7 +3,6 @@ import cloneDeep from 'lodash/cloneDeep';
 import { reduceAllFetchState, reduceAnyFetchState, } from '../../../../commonStateTypes/reduceFetchState';
 import { getApprovalRulesByIds } from '../../../../entity/approvalRule/approvalRuleSelector';
 import { getClassesByIds } from '../../../../entity/class/classSelector';
-import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 export const getBillPaySetupApproverView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
@@ -45,7 +44,7 @@ export const getBillPaySetupApproverView = createSelector((state) => state.billP
         newApprovalRuleId,
     };
 });
-export const getBillPaySetupApproverUpdateDataView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (state) => getIsAccountingClassesEnabled(state), (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState, isAccountingClassesEnabled) => {
+export const getBillPaySetupApproverUpdateDataView = 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 = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
@@ -93,9 +92,10 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: isAccountingClassesEnabled
-            ? reduceAllFetchState([approverListState.fetchStatus, classListState])
-            : approverListState.fetchStatus,
+        approverListFetchStatus: reduceAllFetchState([
+            approverListState.fetchStatus,
+            classListState,
+        ]),
         fetchState,
         allAccountingClasses,
         error,

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

@@ -1,27 +1,22 @@
 import { concat, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
-import { getIsAccountingClassesEnabled } from '../../../../../entity/tenant/tenantSelector';
 import { fetchClassList } from '../../../../classList/classListReducer';
 import { fetchBillPayApproversDetails, fetchBillPayApproversList, } from '../billPaySetupApproverViewReducer';
 export const fetchBillPayApproversDetailsEpic = (actions$, state$) => actions$.pipe(filter(fetchBillPayApproversDetails.match), mergeMap((action) => {
     const { cacheOverride, includeUserRoles } = action.payload;
     const { billPaySetupApproverViewState, classListState } = state$.value;
     const { approverListState } = billPaySetupApproverViewState;
-    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state$.value);
     const actions = [];
     if (cacheOverride === true) {
         actions.push(fetchBillPayApproversList(cacheOverride, includeUserRoles));
-        if (isAccountingClassesEnabled) {
-            actions.push(fetchClassList());
-        }
+        actions.push(fetchClassList());
     }
     else {
         if (billPaySetupApproverViewState.hasValidState() === false &&
             approverListState.fetchStatus.fetchState !== 'In-Progress') {
             actions.push(fetchBillPayApproversList(true, includeUserRoles));
         }
-        if (isAccountingClassesEnabled &&
-            classListState.hasValidState() === false &&
+        if (classListState.hasValidState() === false &&
             classListState.fetchState !== 'In-Progress') {
             actions.push(fetchClassList());
         }

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

@@ -7,7 +7,6 @@ import { getCompanyByCompanyId } from '../../../../entity/company/companySelecto
 import { getDepositAccountByDepositAccountId } from '../../../../entity/depositAccount/depositAccountSelector';
 import { getPaymentAccountByPaymentAccountId, getPaymentAccountsByPaymentAccountIds, } from '../../../../entity/paymentAccount/paymentAccountSelector';
 import { getPaymentInstrumentById, getPaymentInstrumentsByIds, } from '../../../../entity/paymentInstrument/paymentInstrumentSelector';
-import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getVendorByQboId, getVendorByVendorId, } from '../../../../entity/vendor/vendorSelector';
 import { dateNow } from '../../../../zeniDayJS';
@@ -173,15 +172,12 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
             isCancelled = sourceBillDetail.billDetailLocalData.isCancelled;
             billStage = billPayInfo?.stage.code ?? 'draft';
             if (billViewState != null) {
-                const fetchStateList = [
+                fetchState = reduceFetchState([
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
+                    classListState,
                     billPaySetupApproverViewState,
-                ];
-                if (getIsAccountingClassesEnabled(state)) {
-                    fetchStateList.push(classListState);
-                }
-                fetchState = reduceFetchState(fetchStateList).fetchState;
+                ]).fetchState;
                 deleteStatus = billViewState.deleteStatus;
                 billActivities = getBillActivities(state, billId, billPayInfo?.stage.code);
             }
@@ -195,14 +191,11 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
         }
     }
     else {
-        const newBillFetchStateList = [
+        fetchState = reduceFetchState([
             accountListState.byReportId.billPayAccountList,
+            classListState,
             billPaySetupApproverViewState,
-        ];
-        if (getIsAccountingClassesEnabled(state)) {
-            newBillFetchStateList.push(classListState);
-        }
-        fetchState = reduceFetchState(newBillFetchStateList).fetchState;
+        ]).fetchState;
     }
     if (sourceBillDetail != null && fetchState == 'Completed') {
         const updatedRecord = sourceBillDetail.billDetailLocalData;

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

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

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

@@ -219,8 +219,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/esm/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.js

@@ -2,7 +2,7 @@ import recordGet from 'lodash/get';
 import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState';
 import { getBankAccountByBankAccountId } from '../../../../entity/bankAccount/bankAccountSelector';
 import { getAllCurrencies } from '../../../../entity/currency/currencySelector';
-import { getCurrentTenant, getIsAccountingClassesEnabled, } from '../../../../entity/tenant/tenantSelector';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getAccountList, getNestedAccountListHierarchy, } from '../../../accountList/accountListSelector';
 import { getBankAccount, } from '../../../bankAccountView/bankAccountViewSelector';
@@ -63,16 +63,13 @@ export const getEditRemiDetail = (state, reimbursementId) => {
             paymentTo: reimbursementInfo?.toAccount.billAccountId,
         };
         if (sourceRemiDetail != null) {
-            const fetchStateList = [
+            fetchState = reduceFetchState([
                 sourceRemiDetail.fetchStatus,
                 accountListState.byReportId.reimbursementAccountList,
+                classListState,
                 merchantListState,
                 reimbursementConfigState,
-            ];
-            if (getIsAccountingClassesEnabled(state)) {
-                fetchStateList.push(classListState);
-            }
-            fetchState = reduceFetchState(fetchStateList).fetchState;
+            ]).fetchState;
             remiStage = reimbursementInfo?.stage.code ?? 'draft';
             createdBy = getUserByUserId(userState, reimbursement?.createdBy ?? '');
             createTime = reimbursement?.createTime;