@zeniai/client-epic-state 4.20.1 → 4.20.2-beta0ND

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

@@ -1,4 +1,5 @@
 import orderBy from 'lodash/orderBy';
+import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getSupportedTransactionById, getSupportedTransactionsByIds, } from '../../../entity/transaction/transactionSelector';
@@ -7,7 +8,7 @@ import { getCompletedTransactionsCacheKey } from '../reducers/missingReceiptsVie
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 import { isUnmatchedTabFileStatus, } from '../types/missingReceiptsViewState';
 export function getExpenseAutomationMissingReceiptsView(state) {
-    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
+    const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
     const currentTenant = getCurrentTenant(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -36,7 +37,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:
@@ -175,9 +176,16 @@ export 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 = reduceAnyFetchState([
+        { fetchState, error },
+        monthEndFetchState,
+    ]);
     return {
-        fetchState,
-        error,
+        fetchState: reducedFetchStatus.fetchState,
+        error: reducedFetchStatus.error,
         uploadReceiptStatusById,
         uiState,
         refreshStatus,

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, currentTenant, reconciliationViewState, expenseAutomationViewState, plaidAccountViewState, accountListState, accountState, classListState, classState, monthEndCloseChecksState, vendorState) => {
+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) => {
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const reconcileTabUiState = reconciliationViewState.reconTabsState.reconcile.uiState;
     const reviewTabUiState = reconciliationViewState.reconTabsState.review.uiState;
@@ -35,6 +35,13 @@ 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: [],
@@ -44,10 +51,13 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
             classListNestedAccountHierarchy: [],
             allAccountList: [],
             allClassList: [],
-            fetchStatus: {
-                fetchState: reconciliationViewState.fetchState,
-                error: reconciliationViewState.error,
-            },
+            fetchStatus: reduceAnyFetchState([
+                {
+                    fetchState: reconciliationViewState.fetchState,
+                    error: reconciliationViewState.error,
+                },
+                monthEndFetchState,
+            ]),
             plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
                 .plaidConnectionDetails,
             completionStatus: 'incomplete',
@@ -270,10 +280,13 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         bankAccounts: uniqueBankAccounts,
         creditCards: uniqueCreditCards,
         accountReconciliationsByAccountID: reconList,
-        fetchStatus: {
-            fetchState: reconciliationViewState.fetchState,
-            error: reconciliationViewState.error,
-        },
+        fetchStatus: reduceAnyFetchState([
+            {
+                fetchState: reconciliationViewState.fetchState,
+                error: reconciliationViewState.error,
+            },
+            monthEndFetchState,
+        ]),
         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 } from '../../../commonStateTypes/reduceFetchState';
+import { reduceAllFetchState, reduceAnyFetchState, } 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, } = state;
+    const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = 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,10 +41,16 @@ export function getExpenseAutomationTransactionView(state) {
         .filter((transaction) => transaction != null);
     const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
     const transactionsWithCOT = transactions.map((transaction) => getTransactionWithCOT(transaction));
-    const fetchStatus = reduceAllFetchState([
-        accountList,
-        classList,
-        expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
+    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 totalCountByReview = expenseAutomationTransactionsViewState.transactionCategorizationView.review
         .uiState.totalCount;

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

@@ -1 +1,18 @@
-export {};
+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);

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

@@ -0,0 +1,17 @@
+/**
+ * Empty `COABalancesSlice` for horizontal P&L-by-class section / calculated headers when
+ * enrichment has not produced balances yet, or for UI mapping fallbacks.
+ * Structure matches {@link enrichProfitAndLossByClassHorizontalReport} output.
+ */
+export function getEmptyHorizontalSectionBalancesSlice(firstMonthOfFY, timeframe = 'month') {
+    return {
+        balances: [],
+        additionalBalances: [],
+        filter: {
+            firstMonthOfFY,
+            timeframe,
+            balancesRange: { numberOfPeriods: 0, orderBy: 'ascending_date' },
+            additionalBalances: [],
+        },
+    };
+}

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

@@ -3,6 +3,7 @@ import { getSummationFreeRangeTotalBalance } from '../../commonStateTypes/coaBal
 import { defaultCustomerCurrency } from '../../commonStateTypes/currencyHelper';
 import { reduceFetchStateParallelTimeframes } from '../../commonStateTypes/reduceFetchState';
 import { getSectionClassesViewReport } from '../../entity/sectionClassesViewV2/sectionClassesViewSelector';
+import { HORIZONTAL_CLASS_TOTAL_BALANCE_ID, } from './profitAndLossClassesByClassHorizontalSelectorTypes';
 import { enrichProfitAndLossByClassHorizontalReport } from './profitAndLossHorizontalEnrichment';
 export const profitAndLossHorizontalIdsInOrder = [
     'income',
@@ -303,6 +304,7 @@ function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency)
         startDate,
         type: 'default',
         label: col.className,
+        id: col.classId,
     }));
     // Add a "Total" column
     balances.push({
@@ -312,6 +314,7 @@ function buildHeaderBalances(classColumns, timeframe, selectedPeriod, currency)
         startDate,
         type: 'default',
         label: 'Total',
+        id: HORIZONTAL_CLASS_TOTAL_BALANCE_ID,
     });
     return balances;
 }

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

@@ -1,4 +1,5 @@
 import { defaultCustomerCurrency } from '../../commonStateTypes/currencyHelper';
+import { getEmptyHorizontalSectionBalancesSlice } from './horizontalSectionEmptyBalancesSlice';
 import { HORIZONTAL_CLASS_TOTAL_BALANCE_ID, } from './profitAndLossClassesByClassHorizontalSelectorTypes';
 /**
  * Populates `sectionHeaderBalancesSlice`, and per-account `accountReportData`, so the
@@ -39,17 +40,17 @@ function enrichHorizontalSection(report, section) {
     };
     const siblingsPerRow = buildSiblingIndicesPerRow(section.accounts, parentIndices);
     const hasChildFlags = computeHorizontalHasChildFlags(parentIndices);
-    for (let i = 0; i < section.accounts.length; i++) {
-        const row = section.accounts[i];
+    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((b) => b.balance.amount);
+        const classRowAmounts = row.classBalances.map((classBalance) => classBalance.balance.amount);
         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, i, parentIndices, siblingsPerRow, hasChildFlags),
+            horizontalTreeView: buildHorizontalTreeViewFromPrecomputed(section.accounts, accountIndex, parentIndices, siblingsPerRow, hasChildFlags),
         };
     }
 }
@@ -67,23 +68,13 @@ function buildHorizontalClassColumnBalancesSlice(report, classAmounts, totalAmou
     const currencyCode = firstHeader?.balance.currencyCode ?? fallback.currencyCode;
     const currencySymbol = firstHeader?.balance.currencySymbol ?? fallback.currencySymbol;
     const timeframe = firstHeader?.balanceTimeFrame ?? 'month';
-    const emptySlice = {
-        balances: [],
-        additionalBalances: [],
-        filter: {
-            firstMonthOfFY: report.firstMonthOfFY,
-            timeframe,
-            balancesRange: { numberOfPeriods: 0, orderBy: 'ascending_date' },
-            additionalBalances: [],
-        },
-    };
     if (report.selectedPeriod == null) {
-        return emptySlice;
+        return getEmptyHorizontalSectionBalancesSlice(report.firstMonthOfFY, timeframe);
     }
     const { startDate, endDate } = report.selectedPeriod;
-    const balances = report.classColumns.map((col, i) => ({
+    const balances = report.classColumns.map((col, columnIndex) => ({
         balance: {
-            amount: classAmounts[i] ?? 0,
+            amount: classAmounts[columnIndex] ?? 0,
             currencyCode,
             currencySymbol,
         },
@@ -134,22 +125,22 @@ function computeHorizontalAccountParentIndices(rows) {
         if (accountRow == null) {
             continue;
         }
-        const d = accountRow.depth;
+        const depth = accountRow.depth;
         while (stack.length > 0) {
             const topRow = rows[stack[stack.length - 1]];
             if (topRow == null) {
                 stack.pop();
                 continue;
             }
-            if (topRow.depth < d) {
+            if (topRow.depth < depth) {
                 break;
             }
             stack.pop();
         }
-        if (d > 2 && stack.length > 0) {
+        if (depth > 2 && stack.length > 0) {
             const peek = stack[stack.length - 1];
             const parentRow = rows[peek];
-            if (parentRow != null && parentRow.depth === d - 1) {
+            if (parentRow != null && parentRow.depth === depth - 1) {
                 parentIndex[rowIndex] = peek;
             }
         }
@@ -168,12 +159,12 @@ function buildSiblingIndicesPerRow(rows, parentIndices) {
             continue;
         }
         const key = `${parentRowIndex}:${accountRow.depth}`;
-        let g = keyToIndices.get(key);
-        if (g == null) {
-            g = [];
-            keyToIndices.set(key, g);
+        let siblingGroup = keyToIndices.get(key);
+        if (siblingGroup == null) {
+            siblingGroup = [];
+            keyToIndices.set(key, siblingGroup);
         }
-        g.push(rowIndex);
+        siblingGroup.push(rowIndex);
     }
     const siblingsPerRow = new Array(accountRowCount);
     for (let rowIndex = 0; rowIndex < accountRowCount; rowIndex++) {
@@ -241,14 +232,14 @@ function buildHorizontalTreeViewFromPrecomputed(dfsOrderedAccountRows, currentRo
     const hasChildrenFlag = hasChildFlags[currentRowIndex];
     const treeDepth = accountRow != null ? Math.max(0, accountRow.depth - 2) : 0;
     const hasChildren = hasChildrenFlag === true;
-    const sibs = siblingIndices ?? [currentRowIndex];
+    const siblings = siblingIndices ?? [currentRowIndex];
     return {
         subAccountAncestorMetadata: buildHorizontalSubAccountAncestorMetadataFromPrecomputed(dfsOrderedAccountRows, currentRowIndex, parentIndices, siblingsPerRow, hasChildFlags),
         treeDepth,
         hasChildren,
-        hasSiblings: sibs.length > 1,
+        hasSiblings: siblings.length > 1,
         isLeaf: !hasChildren,
-        isLastNode: currentRowIndex === sibs[sibs.length - 1],
+        isLastNode: currentRowIndex === siblings[siblings.length - 1],
     };
 }
 function buildHorizontalAccountChildIndicesByParent(parentIndices) {

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

@@ -416,6 +416,14 @@ 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) {
@@ -518,6 +526,8 @@ 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,6 +43,7 @@ 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,6 +2,7 @@ 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';
@@ -73,11 +74,14 @@ export const getReviewPageBillDetail = (state, billId) => {
             }
         }
         if (sourceBillDetail != null) {
-            sourceBillDetailFetchState = reduceFetchState([
+            const fetchStateList = [
                 sourceBillDetail.fetchStatus,
                 accountListState.byReportId['billPayAccountList'],
-                classListState,
-            ]).fetchState;
+            ];
+            if (getIsAccountingClassesEnabled(state)) {
+                fetchStateList.push(classListState);
+            }
+            sourceBillDetailFetchState = reduceFetchState(fetchStateList).fetchState;
         }
     }
     else {

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

@@ -3,6 +3,7 @@ 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) => {
@@ -44,7 +45,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, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
+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) => {
     const { affectedEntityIds, approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
@@ -92,10 +93,9 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         allAttributes,
         filteredAttributes,
         billPaySetupApproverViewUpdateData,
-        approverListFetchStatus: reduceAllFetchState([
-            approverListState.fetchStatus,
-            classListState,
-        ]),
+        approverListFetchStatus: isAccountingClassesEnabled
+            ? reduceAllFetchState([approverListState.fetchStatus, classListState])
+            : approverListState.fetchStatus,
         fetchState,
         allAccountingClasses,
         error,

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

@@ -1,22 +1,27 @@
 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));
-        actions.push(fetchClassList());
+        if (isAccountingClassesEnabled) {
+            actions.push(fetchClassList());
+        }
     }
     else {
         if (billPaySetupApproverViewState.hasValidState() === false &&
             approverListState.fetchStatus.fetchState !== 'In-Progress') {
             actions.push(fetchBillPayApproversList(true, includeUserRoles));
         }
-        if (classListState.hasValidState() === false &&
+        if (isAccountingClassesEnabled &&
+            classListState.hasValidState() === false &&
             classListState.fetchState !== 'In-Progress') {
             actions.push(fetchClassList());
         }

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

@@ -7,6 +7,7 @@ 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';
@@ -172,12 +173,15 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
             isCancelled = sourceBillDetail.billDetailLocalData.isCancelled;
             billStage = billPayInfo?.stage.code ?? 'draft';
             if (billViewState != null) {
-                fetchState = reduceFetchState([
+                const fetchStateList = [
                     sourceBillDetail.fetchStatus,
                     accountListState.byReportId.billPayAccountList,
-                    classListState,
                     billPaySetupApproverViewState,
-                ]).fetchState;
+                ];
+                if (getIsAccountingClassesEnabled(state)) {
+                    fetchStateList.push(classListState);
+                }
+                fetchState = reduceFetchState(fetchStateList).fetchState;
                 deleteStatus = billViewState.deleteStatus;
                 billActivities = getBillActivities(state, billId, billPayInfo?.stage.code);
             }
@@ -191,11 +195,14 @@ export const getEditBillDetail = (state, isVendorRecommendationFeatureEnabled, i
         }
     }
     else {
-        fetchState = reduceFetchState([
+        const newBillFetchStateList = [
             accountListState.byReportId.billPayAccountList,
-            classListState,
             billPaySetupApproverViewState,
-        ]).fetchState;
+        ];
+        if (getIsAccountingClassesEnabled(state)) {
+            newBillFetchStateList.push(classListState);
+        }
+        fetchState = reduceFetchState(newBillFetchStateList).fetchState;
     }
     if (sourceBillDetail != null && fetchState == 'Completed') {
         const updatedRecord = sourceBillDetail.billDetailLocalData;

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

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

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

@@ -219,6 +219,8 @@ 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 } from '../../../../entity/tenant/tenantSelector';
+import { getCurrentTenant, getIsAccountingClassesEnabled, } from '../../../../entity/tenant/tenantSelector';
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getAccountList, getNestedAccountListHierarchy, } from '../../../accountList/accountListSelector';
 import { getBankAccount, } from '../../../bankAccountView/bankAccountViewSelector';
@@ -63,13 +63,16 @@ export const getEditRemiDetail = (state, reimbursementId) => {
             paymentTo: reimbursementInfo?.toAccount.billAccountId,
         };
         if (sourceRemiDetail != null) {
-            fetchState = reduceFetchState([
+            const fetchStateList = [
                 sourceRemiDetail.fetchStatus,
                 accountListState.byReportId.reimbursementAccountList,
-                classListState,
                 merchantListState,
                 reimbursementConfigState,
-            ]).fetchState;
+            ];
+            if (getIsAccountingClassesEnabled(state)) {
+                fetchStateList.push(classListState);
+            }
+            fetchState = reduceFetchState(fetchStateList).fetchState;
             remiStage = reimbursementInfo?.stage.code ?? 'draft';
             createdBy = getUserByUserId(userState, reimbursement?.createdBy ?? '');
             createTime = reimbursement?.createTime;

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

@@ -45,6 +45,7 @@ export const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled
         return {
             ...reimbursement,
             submittedBy: getUserByUserId(userState, reimbursement.reimburseeUserId),
+            createdByUser: getUserByUserId(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -415,6 +416,14 @@ export 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) => {
@@ -422,6 +431,7 @@ export 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';
@@ -441,6 +451,8 @@ export 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 [

package/lib/esm/view/spendManagement/reimbursement/remiListView/remiListState.js

@@ -55,6 +55,7 @@ export const toRemiSubTabUnderScoreType = (v) => stringToUnion(v, REMI_SUB_TAB_U
 const ALL_REIMBURSEMENT_SORT_KEYS = [
     'reportName',
     'submittedOn',
+    'createdBy',
     'type',
     'status',
     'amount',

package/lib/esm/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -91,11 +91,11 @@ export const allTaskStatus = [
     },
     {
         code: 'done',
-        name: 'Done',
+        name: 'In Review',
     },
     {
         code: 'resolved',
-        name: 'Resolved',
+        name: 'Complete',
     },
 ];
 export const allTaskPriority = [

package/lib/esm/view/transactionDetail/epics/saveTransactionHelper.js

@@ -75,8 +75,8 @@ export const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDe
                 lineItem.account?.qboId !== accountLine.account.qboId &&
                     Boolean(lineItem.account?.qboId);
             hasClassChanged =
-                Boolean(lineItem.class?.qboId) &&
-                    lineItem.class?.qboId !== accountLine.class.qboId;
+                (lineItem.class?.qboId != null || accountLine.class?.qboId != null) &&
+                    lineItem.class?.qboId !== accountLine.class?.qboId;
             const recommendedAccountBase = toRecommendedAccountBase(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = toRecommendedClassBase(lineItem.amount.amount, lineItem.class);
             const latestRecommendedCategory = lineItem.recommendedAccount;