@zeniai/client-epic-state 4.19.96-betaJK20 → 4.19.96-betaJK21

package/lib/esm/view/expenseAutomationView/reducers/reconciliationViewReducer.js

@@ -37,15 +37,7 @@ export const initialReconciliationTabsState = {
     },
 };
 export const initialActionFetchState = {
-    excludeAccountFetch: {
-        fetchState: 'Not-Started',
-        error: undefined,
-    },
     excludeFetchById: {},
-    includeAccountFetch: {
-        fetchState: 'Not-Started',
-        error: undefined,
-    },
     reconcileFetch: {
         fetchState: 'Not-Started',
         error: undefined,
@@ -59,7 +51,6 @@ export const initialActionFetchState = {
 export const initialState = {
     accountReconciliationRecordsBySelectedPeriod: {},
     accountConnectionStatusByAccountID: {},
-    excludedAccountExclusionInfo: {},
     fetchState: 'Not-Started',
     error: undefined,
     selectedTab: 'review',
@@ -73,7 +64,6 @@ export const initialState = {
             scrollTop: 0,
         },
     },
-    excludedAccountIDs: [],
 };
 // Create slice with reducers
 const expenseAutomationReconciliationView = createSlice({
@@ -142,7 +132,7 @@ const expenseAutomationReconciliationView = createSlice({
         fetchReconciliationSuccess: {
             reducer(draft, action) {
                 if (action.payload.accountId == null) {
-                    updateAllReconciliation(draft, action.payload.reconciliation.accounts, action.payload.selectedPeriod, action.payload.reconciliation.reconciliation, action.payload.refreshViewInBackground, action.payload.reconciliation.excluded_accounts);
+                    updateAllReconciliation(draft, action.payload.reconciliation.accounts, action.payload.selectedPeriod, action.payload.reconciliation.reconciliation, action.payload.refreshViewInBackground);
                 }
                 else if (action.payload.reconciliation.reconciliation.length > 0 &&
                     action.payload.reconciliation.accounts.length > 0) {
@@ -431,113 +421,6 @@ const expenseAutomationReconciliationView = createSlice({
                 ...localData,
             };
         },
-        excludeAccountFromReconciliation: {
-            reducer(draft) {
-                draft.actionFetchState.excludeAccountFetch = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(payload) {
-                return { payload };
-            },
-        },
-        excludeAccountFromReconciliationSuccess: (draft, action) => {
-            draft.actionFetchState.excludeAccountFetch = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-            const { account, selectedPeriod } = action.payload;
-            if (account != null) {
-                if (!draft.excludedAccountIDs.includes(account.account_id)) {
-                    draft.excludedAccountIDs.push(account.account_id);
-                }
-                draft.excludedAccountExclusionInfo[account.account_id] = {
-                    bankBalance: account.bank_balance != null
-                        ? {
-                            amount: account.bank_balance,
-                            currencyCode: account.currency_code ?? 'USD',
-                            currencySymbol: account.currency_symbol ?? '$',
-                        }
-                        : undefined,
-                    clearedBalance: account.cleared_balance != null
-                        ? {
-                            amount: account.cleared_balance,
-                            currencyCode: account.currency_code ?? 'USD',
-                            currencySymbol: account.currency_symbol ?? '$',
-                        }
-                        : undefined,
-                    variance: account.variance != null
-                        ? {
-                            amount: account.variance,
-                            currencyCode: account.currency_code ?? 'USD',
-                            currencySymbol: account.currency_symbol ?? '$',
-                        }
-                        : undefined,
-                };
-                const monthYearPeriodId = toMonthYearPeriodId(selectedPeriod);
-                draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].accountIDs = draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].accountIDs.filter((id) => id !== account.account_id);
-            }
-        },
-        excludeAccountFromReconciliationFailure: (draft, action) => {
-            draft.actionFetchState.excludeAccountFetch = {
-                fetchState: 'Error',
-                error: action.payload.error,
-            };
-        },
-        includeAccountInReconciliation: {
-            reducer(draft) {
-                draft.actionFetchState.includeAccountFetch = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(payload) {
-                return { payload };
-            },
-        },
-        includeAccountInReconciliationSuccess: (draft, action) => {
-            draft.actionFetchState.includeAccountFetch = {
-                fetchState: 'Completed',
-                error: undefined,
-            };
-            const { reconciliation, selectedPeriod } = action.payload;
-            if (reconciliation == null) {
-                return;
-            }
-            const accountId = reconciliation.account_id;
-            draft.excludedAccountIDs = draft.excludedAccountIDs.filter((id) => id !== accountId);
-            delete draft.excludedAccountExclusionInfo[accountId];
-            const monthYearPeriodId = toMonthYearPeriodId(selectedPeriod);
-            const accountReconciliationRecords = draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId];
-            if (accountReconciliationRecords != null) {
-                if (!accountReconciliationRecords.accountIDs.includes(accountId)) {
-                    accountReconciliationRecords.accountIDs.push(accountId);
-                }
-                accountReconciliationRecords.reconciliationByAccountID[accountId] = {
-                    accountId,
-                    reconciliationId: reconciliation.reconciliation_id ?? undefined,
-                    transactionFetchState: { fetchState: 'Not-Started', error: undefined },
-                    refreshStatus: { fetchState: 'Not-Started', error: undefined },
-                    statementDeleteStatus: { fetchState: 'Not-Started', error: undefined },
-                    statementUploadStatus: { fetchState: 'Not-Started', error: undefined },
-                    statementUpdateStatus: { fetchState: 'Not-Started', error: undefined },
-                    statementParseInProgress: reconciliation.bank_status.code === 'parsing',
-                    localData: {},
-                };
-            }
-            draft.accountConnectionStatusByAccountID[accountId] = {
-                status: toBankStatusCodeType(reconciliation.bank_status.code),
-                connectionInProgress: false,
-                paymentAccountId: undefined,
-            };
-        },
-        includeAccountInReconciliationFailure: (draft, action) => {
-            draft.actionFetchState.includeAccountFetch = {
-                fetchState: 'Error',
-                error: action.payload.error,
-            };
-        },
         updateStatementUploadChosen: (draft, action) => {
             draft.statementUploadChosen = action.payload.statementUploadChosen;
         },
@@ -547,38 +430,10 @@ const expenseAutomationReconciliationView = createSlice({
     },
 });
 // Export actions
-export const { fetchReconciliation, fetchReconciliationFailure, fetchReconciliationSuccess, saveReconciliationDetail, saveReconciliationDetailFailure, updateSelectedAccountId, setConnectionInProgressForAccount, setStatementParseInProgress, updateReconcileTabLocalData, updateReconcileTabListSortState, updateReconcileTabListScrollState, saveReconciliationDetailSuccess, updateSelectedTab, updateBalancesLocalData, initialiseLocalDataForSelectedAccountId, clearExpenseAutomationReconciliationView, updateSelectedDrawerAccountId, updateReviewTabSortState, initializeReconciliationReviewTabLocalData, updateReviewTabLocalData, saveReconciliationReview, updateSaveReconciliationReviewFetchStatus, updateReconListScrollPosition, updateAccountReconciliationLocalData, deleteAccountStatement, deleteAccountStatementSuccess, deleteAccountStatementFailure, excludeAccountFromReconciliation, excludeAccountFromReconciliationSuccess, excludeAccountFromReconciliationFailure, includeAccountInReconciliation, includeAccountInReconciliationSuccess, includeAccountInReconciliationFailure, uploadAccountStatement, uploadAccountStatementSuccess, uploadAccountStatementFailure, updateStatementUploadChosen, } = expenseAutomationReconciliationView.actions;
+export const { fetchReconciliation, fetchReconciliationFailure, fetchReconciliationSuccess, saveReconciliationDetail, saveReconciliationDetailFailure, updateSelectedAccountId, setConnectionInProgressForAccount, setStatementParseInProgress, updateReconcileTabLocalData, updateReconcileTabListSortState, updateReconcileTabListScrollState, saveReconciliationDetailSuccess, updateSelectedTab, updateBalancesLocalData, initialiseLocalDataForSelectedAccountId, clearExpenseAutomationReconciliationView, updateSelectedDrawerAccountId, updateReviewTabSortState, initializeReconciliationReviewTabLocalData, updateReviewTabLocalData, saveReconciliationReview, updateSaveReconciliationReviewFetchStatus, updateReconListScrollPosition, updateAccountReconciliationLocalData, deleteAccountStatement, deleteAccountStatementSuccess, deleteAccountStatementFailure, uploadAccountStatement, uploadAccountStatementSuccess, uploadAccountStatementFailure, updateStatementUploadChosen, } = expenseAutomationReconciliationView.actions;
 // Export reducer
 export default expenseAutomationReconciliationView.reducer;
-function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliationData, refreshViewInBackground, excludedAccounts) {
-    draft.excludedAccountIDs = excludedAccounts.map((ea) => ea.account_id);
-    draft.excludedAccountExclusionInfo = {};
-    excludedAccounts.forEach((ea) => {
-        const { exclusion_info } = ea;
-        draft.excludedAccountExclusionInfo[ea.account_id] = {
-            bankBalance: exclusion_info.bank_balance != null
-                ? {
-                    amount: exclusion_info.bank_balance,
-                    currencyCode: ea.currency_code ?? 'USD',
-                    currencySymbol: ea.currency_symbol ?? '$',
-                }
-                : undefined,
-            clearedBalance: exclusion_info.cleared_balance != null
-                ? {
-                    amount: exclusion_info.cleared_balance,
-                    currencyCode: ea.currency_code ?? 'USD',
-                    currencySymbol: ea.currency_symbol ?? '$',
-                }
-                : undefined,
-            variance: exclusion_info.variance != null
-                ? {
-                    amount: exclusion_info.variance,
-                    currencyCode: ea.currency_code ?? 'USD',
-                    currencySymbol: ea.currency_symbol ?? '$',
-                }
-                : undefined,
-        };
-    });
+function updateAllReconciliation(draft, accounts, selectedPeriod, reconciliationData, refreshViewInBackground) {
     draft.accountReconciliationRecordsBySelectedPeriod[toMonthYearPeriodId(selectedPeriod)] = {
         accountIDs: [],
         reconciliationByAccountID: {},

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

@@ -1,5 +1,4 @@
 import omit from 'lodash/omit';
-import orderBy from 'lodash/orderBy';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
 import { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
@@ -11,42 +10,6 @@ import { filterNestedAccountHierarchyById } from '../../scheduleView/scheduleDet
 import { getAccountLabelForScheduleType, getAccountsTypesForScheduleList, } from '../../scheduleView/scheduleListView/scheduleListHelper';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 import { getJEAccountSettingsView } from './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 orderBy(transactions, [accessor], [sortOrder === 'ascending' ? 'asc' : 'desc']);
-}
 export function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
@@ -96,21 +59,13 @@ export function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = 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
         ? getAllSteps(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -124,9 +79,7 @@ export function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        completedSchedules,
         draftSchedules,
-        ongoingSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

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

@@ -36,7 +36,7 @@ export 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:

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

@@ -5,7 +5,7 @@ import omit from 'lodash/omit';
 import orderBy from 'lodash/orderBy';
 import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
-import { getAccountByAccountId, getAccountsByType, } from '../../../entity/account/accountSelector';
+import { getAccountsByType } from '../../../entity/account/accountSelector';
 import { getAccountReconByAccountIdAndSelectedPeriod } from '../../../entity/accountRecon/accountReconSelector';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getVendorByVendorId } from '../../../entity/vendor/vendorSelector';
@@ -80,30 +80,6 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
                     totalVariancePercentage: undefined,
                 },
             },
-            excludedAccountReconciliationByAccountID: {},
-            excludedAccountReconciliationBySectionID: {
-                assets: {
-                    sectionId: 'assets',
-                    accountIDs: [],
-                    totalBankBalance: undefined,
-                    totalClearedBalance: undefined,
-                    totalReconciledBalance: undefined,
-                    totalVariance: undefined,
-                    totalVariancePercentage: undefined,
-                },
-                liabilities: {
-                    sectionId: 'liabilities',
-                    accountIDs: [],
-                    totalBankBalance: undefined,
-                    totalClearedBalance: undefined,
-                    totalReconciledBalance: undefined,
-                    totalVariance: undefined,
-                    totalVariancePercentage: undefined,
-                },
-            },
-            excludeAccountFetchState: reconciliationViewState.actionFetchState.excludeAccountFetch,
-            includeAccountFetchState: reconciliationViewState.actionFetchState.includeAccountFetch,
-            excludedAccountIDs: reconciliationViewState.excludedAccountIDs,
         };
     }
     const allAccountIDs = accountReconForMonthYearPeriod.accountIDs;
@@ -263,44 +239,6 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
             totalVariancePercentage: liabilityTotals.variancePercentage,
         },
     };
-    const bankAccountIdSet = new Set(uniqueBankAccounts.map((a) => a.accountId));
-    const creditCardIdSet = new Set(uniqueCreditCards.map((a) => a.accountId));
-    const excludedAssetAccountIDs = [];
-    const excludedLiabilityAccountIDs = [];
-    reconciliationViewState.excludedAccountIDs.forEach((accountID) => {
-        const isAsset = bankAccountIdSet.has(accountID);
-        const isLiability = creditCardIdSet.has(accountID);
-        if (!isAsset && !isLiability) {
-            return;
-        }
-        if (isAsset) {
-            excludedAssetAccountIDs.push(accountID);
-        }
-        else {
-            excludedLiabilityAccountIDs.push(accountID);
-        }
-    });
-    const excludedAccountReconciliationBySectionID = {
-        assets: {
-            sectionId: 'assets',
-            accountIDs: excludedAssetAccountIDs,
-        },
-        liabilities: {
-            sectionId: 'liabilities',
-            accountIDs: excludedLiabilityAccountIDs,
-        },
-    };
-    const excludedAccountReconciliationByAccountID = {};
-    reconciliationViewState.excludedAccountIDs.forEach((excludedAccountID) => {
-        const account = getAccountByAccountId(accountState, excludedAccountID);
-        const exclusionInfo = reconciliationViewState.excludedAccountExclusionInfo[excludedAccountID];
-        if (account != null) {
-            excludedAccountReconciliationByAccountID[excludedAccountID] = {
-                ...account,
-                ...exclusionInfo,
-            };
-        }
-    });
     const accountListNestedAccountHierarchy = getNestedAccountListHierarchy(accountListState, 'accountList');
     const classListNestedAccountHierarchy = getNestedClassListHierarchy(classListState);
     const accountsList = getAccountList(accountState, accountListState, 'accountList');
@@ -358,11 +296,6 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         allClassList: allClasses,
         reviewTabSelectedVendorByTransactionId,
         reconListUIState: reconciliationViewState.reconListUIState,
-        excludedAccountReconciliationBySectionID,
-        excludedAccountReconciliationByAccountID,
-        excludeAccountFetchState: reconciliationViewState.actionFetchState.excludeAccountFetch,
-        includeAccountFetchState: reconciliationViewState.actionFetchState.includeAccountFetch,
-        excludedAccountIDs: reconciliationViewState.excludedAccountIDs,
     };
 });
 export const isAccountReconReport = (reportId) => {

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

@@ -1,17 +1 @@
-import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
-const JE_SCHEDULE_SORT_KEYS = [
-    'vendor',
-    'category',
-    'class',
-    '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/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

@@ -3,7 +3,6 @@ import { reduceFetchState } from '../../../../commonStateTypes/reduceFetchState'
 import { getContactsByIds } from '../../../../entity/billPay/contact/contactSelector';
 import { getPaymentAccountsByPaymentAccountIds } from '../../../../entity/paymentAccount/paymentAccountSelector';
 import { getVendorByVendorId } from '../../../../entity/vendor/vendorSelector';
-import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getAccountList } from '../../../accountList/accountListSelector';
 import { getAllFundingAccounts, } from '../../commonSetup/setupViewSelector';
 import { getAllDepositAccounts } from '../../zeniAccounts/depositAccountList/depositAccountListSelector';
@@ -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

@@ -24,7 +24,6 @@ import { getAccountTypeSubConfigCodeKey, getBillPaymentSubConfigCodeKey, getBill
 import { getBillPayConfigByKey, getBillPayConfigByKeys, getInternationalMethodCode, } from '../billPayConfig/billPayConfigSelector';
 import { ACCOUNT_TYPE_CODES, BILL_PAYMENT_METHOD_CODE, BILL_PAYMENT_OUTSIDE_ZENI_SUB_CODES, BILL_PAYMENT_WIRE_SUB_CODES, INTERNATIONAL_CODES, INTERNATIONAL_SUB_CODES, PAYMENT_ACH_SUB_CODES, getBillPayConfigMethodKey, toBillPaymentSubConfigCodeKeyType, } from '../billPayConfig/billPayConfigState';
 import { getDuplicateBills, } from '../billPayReview/billPayReviewSelector';
-import { getIsAccountingClassesEnabled } from '../../../../entity/tenant/tenantSelector';
 import { getBillPaySetupApproverView } from '../billPaySetupApproverView/billPaySetupApproverViewSelector';
 import { getPreviousBills, } from '../previousBills/previousBillsSelector';
 export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, isZeniAccountsEnabled, billId) => {
@@ -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;