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

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

@@ -1,4 +1,5 @@
 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';
@@ -10,6 +11,42 @@ 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 = [];
@@ -59,13 +96,21 @@ export function getExpenseAutomationJESchedulesView(state) {
         const jeScheduleDetails = getJEScheduledTransactionByJEScheduleTransactionKey(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const draftSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft');
-    const resolveSchedules = [];
+    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 = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
-            resolveSchedules.push({ ...schedule, scheduledJournalEntry: journalEntry });
+            unsortedResolveSchedules.push({
+                ...schedule,
+                scheduledJournalEntry: journalEntry,
+            });
         });
     });
+    const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const allSteps = monthYearPeriodId != null
         ? getAllSteps(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -79,7 +124,9 @@ 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

@@ -80,6 +80,26 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
                     totalVariancePercentage: undefined,
                 },
             },
+            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,
+                },
+            },
         };
     }
     const allAccountIDs = accountReconForMonthYearPeriod.accountIDs;
@@ -239,6 +259,137 @@ 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 = [];
+    const excludedAssetTotals = {};
+    const excludedLiabilityTotals = {};
+    reconciliationViewState.excludedAccounts
+        .filter((ea) => !ea.isDeleted)
+        .forEach((excludedAccount) => {
+        const accountID = excludedAccount.accountId;
+        const accountRecon = getAccountReconByAccountIdAndSelectedPeriod(state, accountID, selectedPeriod);
+        const isAsset = bankAccountIdSet.has(accountID);
+        const isLiability = creditCardIdSet.has(accountID);
+        if (!isAsset && !isLiability) {
+            return;
+        }
+        let balanceTotal = undefined;
+        let clearedTotal = undefined;
+        let varianceTotal = undefined;
+        const total = {};
+        if (isAsset) {
+            balanceTotal =
+                excludedAssetTotals.balanceTotal != null
+                    ? Big(excludedAssetTotals.balanceTotal.amount)
+                    : undefined;
+            clearedTotal =
+                excludedAssetTotals.clearedTotal != null
+                    ? Big(excludedAssetTotals.clearedTotal.amount)
+                    : undefined;
+            varianceTotal =
+                excludedAssetTotals.varianceTotal != null
+                    ? Big(excludedAssetTotals.varianceTotal.amount)
+                    : undefined;
+        }
+        else {
+            balanceTotal =
+                excludedLiabilityTotals.balanceTotal != null
+                    ? Big(excludedLiabilityTotals.balanceTotal.amount)
+                    : undefined;
+            clearedTotal =
+                excludedLiabilityTotals.clearedTotal != null
+                    ? Big(excludedLiabilityTotals.clearedTotal.amount)
+                    : undefined;
+            varianceTotal =
+                excludedLiabilityTotals.varianceTotal != null
+                    ? Big(excludedLiabilityTotals.varianceTotal.amount)
+                    : undefined;
+        }
+        if (accountRecon?.balance != null && balanceTotal != null) {
+            balanceTotal = balanceTotal.plus(accountRecon.balance.amount);
+        }
+        else if (accountRecon?.balance != null && balanceTotal == null) {
+            balanceTotal = Big(accountRecon.balance.amount);
+        }
+        if (accountRecon?.clearedBalance != null && clearedTotal != null) {
+            clearedTotal = clearedTotal.plus(accountRecon.clearedBalance.amount);
+        }
+        else if (accountRecon?.clearedBalance != null &&
+            clearedTotal == null) {
+            clearedTotal = Big(accountRecon.clearedBalance.amount);
+        }
+        const currency = accountRecon?.currency;
+        if (balanceTotal != null && currency != null) {
+            total.balanceTotal = {
+                ...currency,
+                amount: parseFloat(balanceTotal.toFixed(2)),
+            };
+        }
+        if (clearedTotal != null && currency != null) {
+            total.clearedTotal = {
+                ...currency,
+                amount: parseFloat(clearedTotal.toFixed(2)),
+            };
+        }
+        if (clearedTotal != null && balanceTotal != null) {
+            varianceTotal = clearedTotal.minus(balanceTotal).abs();
+        }
+        else if (clearedTotal != null) {
+            varianceTotal = clearedTotal.abs();
+        }
+        else if (balanceTotal != null) {
+            varianceTotal = Big(0).minus(balanceTotal).abs();
+        }
+        if (varianceTotal != null && currency != null) {
+            total.varianceTotal = {
+                ...currency,
+                amount: parseFloat(varianceTotal.toFixed(2)),
+            };
+        }
+        total.variancePercentage =
+            total.varianceTotal != null &&
+                total.balanceTotal != null &&
+                total.balanceTotal.amount !== 0
+                ? Math.abs((total.varianceTotal.amount / total.balanceTotal.amount) * 100)
+                : undefined;
+        if (isAsset) {
+            excludedAssetAccountIDs.push(accountID);
+            excludedAssetTotals.balanceTotal = total.balanceTotal;
+            excludedAssetTotals.clearedTotal = total.clearedTotal;
+            excludedAssetTotals.varianceTotal = total.varianceTotal;
+            excludedAssetTotals.variancePercentage = total.variancePercentage;
+        }
+        else {
+            excludedLiabilityAccountIDs.push(accountID);
+            excludedLiabilityTotals.balanceTotal = total.balanceTotal;
+            excludedLiabilityTotals.clearedTotal = total.clearedTotal;
+            excludedLiabilityTotals.varianceTotal = total.varianceTotal;
+            excludedLiabilityTotals.variancePercentage =
+                total.variancePercentage;
+        }
+    });
+    const excludedAccountReconciliationBySectionID = {
+        assets: {
+            sectionId: 'assets',
+            accountIDs: excludedAssetAccountIDs,
+            totalBankBalance: excludedAssetTotals.balanceTotal,
+            totalClearedBalance: excludedAssetTotals.clearedTotal,
+            totalReconciledBalance: excludedAssetTotals.varianceTotal,
+            totalVariance: excludedAssetTotals.varianceTotal,
+            totalVariancePercentage: excludedAssetTotals.variancePercentage,
+        },
+        liabilities: {
+            sectionId: 'liabilities',
+            accountIDs: excludedLiabilityAccountIDs,
+            totalBankBalance: excludedLiabilityTotals.balanceTotal,
+            totalClearedBalance: excludedLiabilityTotals.clearedTotal,
+            totalReconciledBalance: excludedLiabilityTotals.varianceTotal,
+            totalVariance: excludedLiabilityTotals.varianceTotal,
+            totalVariancePercentage: excludedLiabilityTotals.variancePercentage,
+        },
+    };
     const accountListNestedAccountHierarchy = getNestedAccountListHierarchy(accountListState, 'accountList');
     const classListNestedAccountHierarchy = getNestedClassListHierarchy(classListState);
     const accountsList = getAccountList(accountState, accountListState, 'accountList');
@@ -284,6 +435,7 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         statementUploadChosen: reconciliationViewState.statementUploadChosen,
         monthYearPeriod: selectedPeriod,
         accountReconciliationBySectionID,
+        excludedAccountReconciliationBySectionID,
         selectedAccountId: reconciliationViewState.selectedAccountId,
         selectedReconAccount: reconciliationViewState.selectedAccountId != null &&
             reconList[reconciliationViewState.selectedAccountId] != null

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

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

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

@@ -3,6 +3,7 @@ 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';
@@ -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

@@ -24,6 +24,7 @@ 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) => {
@@ -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;