@zeniai/client-epic-state 4.20.3-betaSS12 → 4.20.3-betaSS13

package/lib/esm/view/spendManagement/billPay/billDetailView/epics/fetchBillDetailEpic.js

@@ -53,7 +53,7 @@ export const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                 response.data?.transaction?.transaction_id != null) {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 const transcationId = response.data.transaction.transaction_id;
-                const vendorInResponse = response.data?.vendors[0];
+                const vendorInResponse = response.data?.vendors?.[0];
                 const flattenedContacts = vendorInResponse?.contacts ?? [];
                 const flattenedAddresses = getFlattenedAddress(response.data?.vendors ?? []);
                 const flattenedBankAccounts = vendorInResponse?.bank_accounts ?? [];
@@ -85,7 +85,7 @@ export const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                         ...response.data.bank_accounts,
                     ]),
                     updatePaymentInstruments(flattenedPaymentInstruments),
-                    updateVendors(response.data.vendors),
+                    updateVendors(response.data.vendors ?? []),
                     // end: save all vendor related entities
                 ];
                 if (vendorInResponse == null &&
@@ -94,15 +94,15 @@ export const fetchBillDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                     fetchActions.push(fetchVendorsList({
                         searchString: response.data?.transaction.candidate_vendor_name,
                     }));
-                    fetchActions.push(waitForVendorByNameThenUpdateBillDetail(billId, response.data, response.data.vendors[0]?.vendor_id));
+                    fetchActions.push(waitForVendorByNameThenUpdateBillDetail(billId, response.data, undefined));
                 }
                 else {
                     fetchActions.push(updateBillDetail({ billId, billDetail: response.data }));
-                    fetchActions.push(updateBillDetailFetchState(transcationId, 'Completed', undefined, response.data.vendors[0]?.vendor_id));
+                    fetchActions.push(updateBillDetailFetchState(transcationId, 'Completed', undefined, vendorInResponse?.vendor_id));
                     const transactionInResponse = response.data?.transaction;
                     if (transactionInResponse != null &&
                         transactionInResponse.total_amount != null &&
-                        Boolean(vendorInResponse) === true) {
+                        vendorInResponse != null) {
                         fetchActions.push(fetchDuplicateBill(vendorInResponse.vendor_name, vendorInResponse.vendor_id, transactionInResponse.total_amount, transactionInResponse.recipient_total_amount, transactionInResponse.document_id, billId));
                     }
                     const billHasPaymentError = [

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/spendManagement/treasury/treasuryList/epics/fetchTreasuryDetailEpic.js

@@ -6,7 +6,7 @@ import { fetchTreasuryStatementList } from '../../treasuryStatementList/treasury
 import { fetchTreasuryTaxLetterList } from '../../treasuryTaxLetterList/treasuryTaxLetterListReducer';
 import { fetchTreasuryHistory, fetchTreasuryOverviewDetail, fetchTreasurySummaryFailure, fetchTreasurySummarySuccess, fetchTreasuryTransactionList, } from '../treasuryDetailReducer';
 export const fetchTreasuryDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchTreasuryOverviewDetail.match), switchMap((action) => {
-    const { cacheOverride } = action.payload;
+    const { cacheOverride, fetchOnlySummary } = action.payload;
     const state = state$.value;
     const treasuryActions = [];
     if (cacheOverride === true) {
@@ -17,7 +17,7 @@ export const fetchTreasuryDetailEpic = (actions$, state$, zeniAPI) => actions$.p
         treasuryActions.push(fetchTreasuryHistory());
         treasuryActions.push(fetchTreasuryTransactionList(true));
     }
-    else {
+    else if (fetchOnlySummary !== true) {
         // Check treasury statement list state
         const treasuryStatementListState = state.treasuryStatementListState;
         if (treasuryStatementListState.hasValidState() === false &&

package/lib/esm/view/spendManagement/treasury/treasuryList/treasuryDetailReducer.js

@@ -30,10 +30,11 @@ const treasuryDetail = createSlice({
             reducer(draft) {
                 draft.fetchState = 'In-Progress';
             },
-            prepare(cacheOverride) {
+            prepare(cacheOverride, fetchOnlySummary) {
                 return {
                     payload: {
                         cacheOverride,
+                        fetchOnlySummary,
                     },
                 };
             },

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;

package/lib/esm/view/transactionDetail/transactionDetailLocalDataHelper.js

@@ -140,13 +140,13 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                     record.isRetainedCategorySelected = false;
                 }
                 if (Boolean(recommendedClass?.qboId) &&
-                    recommendedClass?.qboId !== accountLine.class.qboId) {
+                    recommendedClass?.qboId !== accountLine.class?.qboId) {
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
                 }
                 if (accountLine.isClassMiscategorized &&
-                    Boolean(accountLine.class.qboId) &&
+                    Boolean(accountLine.class?.qboId) &&
                     Boolean(isVendorOrCustomerPresent)) {
                     record.retainedClass = accountLine.class;
                     record.isRetainedClassSelected = false;
@@ -336,14 +336,14 @@ export const toUpdateLineItemsOriginalCategoryClass = (transaction, transactionD
                         }
                     };
                     const updateClass = () => {
-                        if (recommendedClass?.qboId !== accountLine.class.qboId &&
+                        if (recommendedClass?.qboId !== accountLine.class?.qboId &&
                             Boolean(recommendedClass?.qboId)) {
                             record.class = accountLine.class;
                             record.isRecommendedClassSelected = false;
                             record.recommendedClass = recommendedClass;
                             record.isClassUpdateSelected = false;
                             if (accountLine.isClassMiscategorized &&
-                                Boolean(accountLine.class.qboId) &&
+                                Boolean(accountLine.class?.qboId) &&
                                 Boolean(isVendorOrCustomerPresent)) {
                                 record.retainedClass = accountLine.class;
                                 record.isRetainedClassSelected = false;
@@ -356,7 +356,7 @@ export const toUpdateLineItemsOriginalCategoryClass = (transaction, transactionD
                             record.recommendedClass = recommendedClass;
                             record.isClassUpdateSelected = false;
                             if (accountLine.isClassMiscategorized &&
-                                Boolean(accountLine.class.qboId) &&
+                                Boolean(accountLine.class?.qboId) &&
                                 Boolean(isVendorOrCustomerPresent)) {
                                 record.retainedClass = recommendedClass;
                                 record.isRetainedClassSelected = false;
@@ -650,13 +650,13 @@ export const setEntityRecommendationForLineIdInLocalData = (transaction, transac
                             record.isRetainedCategorySelected = false;
                         }
                     }
-                    if (recommendedClass?.qboId !== accountLine.class.qboId &&
+                    if (recommendedClass?.qboId !== accountLine.class?.qboId &&
                         Boolean(recommendedClass?.qboId)) {
                         record.isRecommendedClassSelected = false;
                         record.recommendedClass = recommendedClass;
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class.qboId)) {
+                            Boolean(accountLine.class?.qboId)) {
                             record.retainedClass = accountLine.class;
                             record.isRetainedClassSelected = false;
                         }
@@ -664,12 +664,12 @@ export const setEntityRecommendationForLineIdInLocalData = (transaction, transac
                     else {
                         record.isRecommendedClassSelected = false;
                         record.recommendedClass = recommendedClass;
-                        if (recommendedClass?.qboId === accountLine.class.qboId) {
+                        if (recommendedClass?.qboId === accountLine.class?.qboId) {
                             record.recommendedClass = undefined;
                         }
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class.qboId)) {
+                            Boolean(accountLine.class?.qboId)) {
                             record.retainedClass = recommendedClass;
                             record.isRetainedClassSelected = false;
                         }
@@ -685,7 +685,7 @@ export const setEntityRecommendationForLineIdInLocalData = (transaction, transac
                         Boolean(recommendedAccount?.qboId) !== false) {
                         record.account = recommendedAccount;
                     }
-                    if (Boolean(record.class.qboId) === false &&
+                    if (Boolean(record.class?.qboId) === false &&
                         Boolean(recommendedClass?.qboId) !== false) {
                         record.class = recommendedClass;
                     }
@@ -806,7 +806,9 @@ export const getChangedLineItemCountFromLocalData = (transaction, transactionLoc
                     accountLineLocal.account?.qboId !== accountLine.account.qboId &&
                         accountLineLocal.account?.accountId !== accountLine.account.accountId;
                 hasClassChanged =
-                    accountLineLocal.class?.qboId !== accountLine.class.qboId;
+                    (accountLineLocal.class?.qboId != null ||
+                        accountLine.class?.qboId != null) &&
+                        accountLineLocal.class?.qboId !== accountLine.class?.qboId;
             }
             hasDescriptionChanged =
                 transactionLocalData.lineItemById[lineId] != null
@@ -944,10 +946,10 @@ export const toUpdateLineItemsToOriginalVendor = (transaction, transactionDetail
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
-                    if (recommendedClass?.qboId !== accountLine.class.qboId &&
+                    if (recommendedClass?.qboId !== accountLine.class?.qboId &&
                         Boolean(recommendedClass?.qboId)) {
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class.qboId) &&
+                            Boolean(accountLine.class?.qboId) &&
                             Boolean(isVendorOrCustomerPresent)) {
                             record.retainedClass = accountLine.class;
                             record.isRetainedClassSelected = false;
@@ -960,7 +962,7 @@ export const toUpdateLineItemsToOriginalVendor = (transaction, transactionDetail
                         record.recommendedClass = recommendedClass;
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class.qboId) &&
+                            Boolean(accountLine.class?.qboId) &&
                             Boolean(isVendorOrCustomerPresent)) {
                             record.retainedClass = recommendedClass;
                             record.isRetainedClassSelected = false;

package/lib/esm/view/transactionDetail/transactionDetailSelector.js

@@ -1,5 +1,6 @@
 import recordGet from 'lodash/get';
 import { reduceFetchState } from '../../commonStateTypes/reduceFetchState';
+import { getIsAccountingClassesEnabled } from '../../entity/tenant/tenantSelector';
 import { toTransactionTypeStrict } from '../../entity/transaction/stateTypes/transactionType';
 import { getTransactionWithCOT } from '../../entity/transaction/transactionHelper';
 import { getSupportedTransactionById } from '../../entity/transaction/transactionSelector';
@@ -51,9 +52,14 @@ export const getTransactionDetail = (state, transactionId, fetchLinkedTransactio
         }
     }
     const accountsList = getAccountList(accountState, accountListState, 'accountList');
-    const classList = getClassList(classState, classListState);
+    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state);
+    const classList = isAccountingClassesEnabled
+        ? getClassList(classState, classListState)
+        : { classes: [], nestedClassHierarchy: [], fetchState: 'Completed', error: undefined, version: 0 };
     const accountsHierarchyList = getNestedAccountListHierarchy(accountListState, 'accountList');
-    const classHierarchyList = getNestedClassListHierarchy(classListState);
+    const classHierarchyList = isAccountingClassesEnabled
+        ? getNestedClassListHierarchy(classListState)
+        : [];
     const transactionDetailAnyUpdateStatus = reduceUpdateFetchStates(transactionDetail);
     const vendors = getVendorsByVendorIds(vendorState, vendorListState.vendorIds);
     return {
@@ -71,6 +77,7 @@ export const getTransactionDetail = (state, transactionId, fetchLinkedTransactio
         classHierarchyList,
         accountsHierarchyList,
         classList: classList,
+        isAccountingClassesEnabled,
         isUpdateNotAllowed: transactionDetail?.isUpdateNotAllowed,
         transactionDetailLocalData: transactionDetail?.transactionDetailLocalData ??
             initialSupportedTransactionDetail.transactionDetailLocalData,

package/lib/esm/view/twoFactorAuthentication/resendOtpEpic.js

@@ -5,14 +5,23 @@ import { resendOtpVendorView, sendOtpVendorViewFailure, sendOtpVendorViewSuccess
 import { resendOnboardingOfficerOtp, sendOnboardingOfficerOtpFailure, sendOnboardingOfficerOtpSuccess, } from '../onboardingView/customerView/onboardingCustomerViewReducer';
 import { resendOtpMyProfile, sendOtpMyProfileFailure, sendOtpMyProfileSuccess, } from '../settingsView/settingsViewReducer';
 import { resendOtpCardUserOnboarding, sendOtpCardUserOnboardingFailure, sendOtpCardUserOnboardingSuccess, } from '../spendManagement/chargeCards/cardUserOnboarding/cardUserOnboardingReducer';
-import { sendOtpCardHolderFailure, sendOtpCardHolderSuccess, } from '../spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer';
+import { resendOtpCardHolder, sendOtpCardHolderFailure, sendOtpCardHolderSuccess, } from '../spendManagement/chargeCards/chargeCardDetail/chargeCardDetailReducer';
 import { resendOtpSpendManagementSetUp, sendOtpFailureSpendManagementSetUp, sendOtpSuccessSpendManagementSetUp, } from '../spendManagement/commonSetup/setupViewReducer';
 import { resendOtp, sendOtpFailure, sendOtpSuccess, } from './twoFactorAuthenticationReducer';
-export const resendOtpEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(resendOtp.match), mergeMap((action) => {
+export const resendOtpEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(resendOtp.match), mergeMap((action) => {
     const resendOtpActions = [];
     const { otpChallenge, twoFASource, entityId } = action.payload;
+    const chargeCard = twoFASource === 'ChargeCardHolder' && entityId != null
+        ? state$.value.chargeCardState.chargeCardByID[entityId]
+        : null;
     const payload = {
         otp_challenge: otpChallenge,
+        ...(chargeCard != null
+            ? {
+                provider_card_id: chargeCard.cardProviderID,
+                is_for_charge_cards: true,
+            }
+            : {}),
     };
     switch (twoFASource) {
         case 'SpendManagementSetup':
@@ -30,6 +39,11 @@ export const resendOtpEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filte
         case 'CardUserOnboarding':
             resendOtpActions.push(resendOtpCardUserOnboarding());
             break;
+        case 'ChargeCardHolder':
+            if (entityId != null) {
+                resendOtpActions.push(resendOtpCardHolder({ chargeCardId: entityId }));
+            }
+            break;
     }
     const resendOtp$ = zeniAPI
         .putAndGetJSON(`${zeniAPI.apiEndPoints.authMicroServiceBaseUrl}/1.0/otp/resend`, payload)