@zeniai/client-epic-state 4.19.96-betaSS2 → 4.19.97-betaRR0

package/lib/esm/view/spendManagement/chargeCards/cardsOnboarding/cardsOnboardingSelector.js

@@ -0,0 +1,63 @@
+import { getUserByUserId, getUserName, } from '../../../../entity/user/userSelector';
+function collectOwnerIds(rec) {
+    const ids = new Set();
+    for (const c of rec.vendor_cards) {
+        ids.add(c.owner_id);
+    }
+    for (const c of rec.dept_cards) {
+        ids.add(c.owner_id);
+    }
+    return [...ids];
+}
+function enrichCard(card, userState) {
+    const user = getUserByUserId(userState, card.owner_id);
+    const hasOwnerDetails = user != null;
+    return {
+        ...card,
+        hasOwnerDetails,
+        ownerDisplayName: hasOwnerDetails
+            ? getUserName(user) || card.owner_id
+            : card.owner_id,
+        ownerProfilePhoto: user?.photo,
+    };
+}
+/**
+ * Layout hints when using `startAiCardAgentDrawerDataLoad` (parallel CoT + recommendation GETs).
+ * - Run phased CoT after `hasChainOfThoughtContent`; end with `setChainOfThoughtsRevealPhase('complete')`.
+ * - Show sparkle when `showRecommendationSparkle` (AI still loading).
+ * - Render tables / pre text / coverage only when `showRecommendationSection`.
+ */
+export function getAiCardAgentDrawerDisplayState(state) {
+    const c = state.cardsOnboardingState;
+    const cotDone = c.chainOfThoughtsRevealPhase === 'complete';
+    const aiDone = c.aiCardRecommendationFetchState === 'Completed' &&
+        c.aiCardRecommendationResponse != null;
+    return {
+        showChainOfThoughtShimmer: c.chainOfThoughtsFetchState === 'In-Progress',
+        hasChainOfThoughtContent: c.chainOfThoughtsFetchState === 'Completed' &&
+            c.chainOfThoughtsResponse != null,
+        showRecommendationSparkle: c.aiCardRecommendationFetchState === 'In-Progress',
+        showRecommendationSection: cotDone && aiDone,
+    };
+}
+/**
+ * Enriches `aiCardRecommendationResponse` with owner display name and photo from `userState`.
+ * `ownerIdsMissingFromStore` lists `owner_id`s not in `userState` after the **single** people load
+ * (e.g. `fetchCardsOnboardingPageEpic` → `fetchPeople()`). Do not refetch people from this package;
+ * show a fallback label or rely on the owner dropdown sourced from the same store.
+ */
+export function getAiCardRecommendationDisplayView(state) {
+    const rec = state.cardsOnboardingState.aiCardRecommendationResponse;
+    if (rec == null) {
+        return undefined;
+    }
+    const { userState } = state;
+    const ownerIdsMissingFromStore = collectOwnerIds(rec).filter((id) => userState.userByUserId[id] == null);
+    return {
+        card_recommendation_pre_text: rec.card_recommendation_pre_text,
+        projected_coverage: rec.projected_coverage,
+        vendor_cards: rec.vendor_cards.map((c) => enrichCard(c, userState)),
+        dept_cards: rec.dept_cards.map((c) => enrichCard(c, userState)),
+        ownerIdsMissingFromStore,
+    };
+}

package/lib/esm/view/spendManagement/chargeCards/cardsOnboarding/cardsOnboardingState.js

@@ -0,0 +1,5 @@
+/**
+ * In-app path to open after a successful “Create All Cards” from AI recommendations
+ * (e.g. `https://qa.app.zeni.ai` + this path). Routing is handled by the host app.
+ */
+export const CREATE_ALL_AI_RECOMMENDED_CARDS_SUCCESS_APP_PATH = '/zeni.ai/cards';

package/lib/esm/view/spendManagement/chargeCards/cardsOnboarding/createAllAiRecommendedCardsEpic.js

@@ -0,0 +1,62 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
+import { updateAddresses } from '../../../../entity/address/addressReducer';
+import { updateChargeCards } from '../../../../entity/chargeCard/chargeCardReducer';
+import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
+import { updateAllUsers } from '../../../../entity/user/userReducer';
+import { updateUserRoles } from '../../../../entity/userRole/userRoleReducer';
+import { createZeniAPIStatus, isSuccessStatus, } from '../../../../responsePayload';
+import { updateChargeCardList } from '../chargeCardList/chargeCardListReducer';
+import { updateChargeCardCount, updateDebitCardCount, } from '../issueChargeCard/issueChargeCardReducer';
+import { createAllAiRecommendedCards, createAllAiRecommendedCardsFailed, createAllAiRecommendedCardsSucceeded, } from './cardsOnboardingReducer';
+function draftsToApiCards(drafts) {
+    return drafts.map((d) => ({
+        card_holder_user_ids: [d.owner_id],
+        card_name: d.card_name,
+        card_type: d.card_type ?? 'business_virtual_credit_card',
+        currency_code: d.currency_code ?? 'USD',
+        purchase_limit: d.purchase_limit,
+        purchase_limit_frequency: d.purchase_limit_frequency ?? { code: 'monthly' },
+    }));
+}
+/**
+ * POST `${cardMicroServiceBaseUrl}/1.0/cards` with edited AI recommendation rows.
+ * On success, merges issued cards into entity + list state (same pattern as issue charge card).
+ * Host app: when `createAllAiRecommendedCardsFetchState === 'Completed'`, navigate to
+ * `CREATE_ALL_AI_RECOMMENDED_CARDS_SUCCESS_APP_PATH`.
+ */
+export const createAllAiRecommendedCardsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(createAllAiRecommendedCards.match), switchMap((action) => {
+    if (action.payload.length === 0) {
+        return of(createAllAiRecommendedCardsFailed(createZeniAPIStatus('Validation', 'No cards to create')));
+    }
+    const cards = draftsToApiCards(action.payload);
+    return zeniAPI
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.cardMicroServiceBaseUrl}/1.0/cards`, { cards })
+        .pipe(mergeMap((response) => {
+        if (isSuccessStatus(response) && response.data != null) {
+            const actions = [
+                updateChargeCards(response.data.cards),
+                updateAllUsers({ users: response.data.users }),
+                updateUserRoles(response.data.user_roles),
+                updateChargeCardList({
+                    chargeCardListPayload: response.data,
+                    keepExistingListItems: true,
+                }),
+                updateAddresses(response.data.addresses),
+                updateChargeCardCount(response.data?.cards_count_by_user_id ?? []),
+                updateDebitCardCount(response.data?.debit_cards_count_by_deposit_account_id ?? {}),
+                createAllAiRecommendedCardsSucceeded(),
+                openSnackbar({
+                    messageSection: 'issue_charge_cards',
+                    messageText: 'success',
+                    type: 'success',
+                }),
+            ];
+            return from(actions);
+        }
+        return of(createAllAiRecommendedCardsFailed(response.status));
+    }), catchError((error) => {
+        return of(createAllAiRecommendedCardsFailed(createZeniAPIStatus('Unexpected Error', 'Create all AI recommended cards REST API call errored out' +
+            JSON.stringify(error))));
+    }));
+}));

package/lib/esm/view/spendManagement/chargeCards/cardsOnboarding/fetchAiCardRecommendationEpic.js

@@ -0,0 +1,4 @@
+import { filter, switchMap } from 'rxjs/operators';
+import { requestAiCardRecommendation$, } from './cardsOnboardingDataRequests';
+import { fetchAiCardRecommendation } from './cardsOnboardingReducer';
+export const fetchAiCardRecommendationEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchAiCardRecommendation.match), switchMap(() => requestAiCardRecommendation$(zeniAPI)));

package/lib/esm/view/spendManagement/chargeCards/cardsOnboarding/fetchChainOfThoughtsForAiCardRecommendationEpic.js

@@ -0,0 +1,4 @@
+import { filter, switchMap } from 'rxjs/operators';
+import { requestChainOfThoughtsForAiCardRecommendation$, } from './cardsOnboardingDataRequests';
+import { fetchChainOfThoughtsForAiCardRecommendation } from './cardsOnboardingReducer';
+export const fetchChainOfThoughtsForAiCardRecommendationEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchChainOfThoughtsForAiCardRecommendation.match), switchMap(() => requestChainOfThoughtsForAiCardRecommendation$(zeniAPI)));

package/lib/esm/view/spendManagement/chargeCards/cardsOnboarding/startAiCardAgentDrawerDataLoadEpic.js

@@ -0,0 +1,10 @@
+import { merge } from 'rxjs';
+import { filter, switchMap } from 'rxjs/operators';
+import { requestAiCardRecommendation$, requestChainOfThoughtsForAiCardRecommendation$, } from './cardsOnboardingDataRequests';
+import { startAiCardAgentDrawerDataLoad } from './cardsOnboardingReducer';
+/**
+ * On "Let's get started": runs chain-of-thoughts GET and AI card recommendation GET **in parallel**.
+ * Reducer (`startAiCardAgentDrawerDataLoad`) resets both slices; use `getAiCardAgentDrawerDisplayState`
+ * for phased CoT UI, sparkle while recommendations load, and gated recommendation content.
+ */
+export const startAiCardAgentDrawerDataLoadEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(startAiCardAgentDrawerDataLoad.match), switchMap(() => merge(requestChainOfThoughtsForAiCardRecommendation$(zeniAPI), requestAiCardRecommendation$(zeniAPI))));

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

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

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

@@ -62,6 +62,19 @@ const chargeCardList = createSlice({
                 };
             },
         },
+        fetchCardsOnboardingPage: {
+            reducer() {
+                //do nothing
+            },
+            prepare(isCreditCardEnabled, cacheOverride = false) {
+                return {
+                    payload: {
+                        isCreditCardEnabled,
+                        cacheOverride,
+                    },
+                };
+            },
+        },
         fetchCreditAccountRepayment(draft) {
             draft.creditAccountRepayment.fetchState = 'In-Progress';
             draft.creditAccountRepayment.error = undefined;
@@ -307,7 +320,7 @@ const chargeCardList = createSlice({
         },
     },
 });
-export const { fetchChargeCardListPage, fetchCreditAccountRepayment, updateCreditAccountRepayment, updateCreditAccountRepaymentFailure, updateCreditAccountRepaymentAmountAndDate, updateRowActionCardId, fetchCreditAccount, updateCreditAccount, updateCreditAccountFailure, fetchDebitCardSummary, updateDebitCardSummary, updateDebitCardSummaryFailure, fetchChargeCardList, updateChargeCardList, updateChargeCardListFailure, updateSearchText, updateBulkActionCardIds, updateChargeCardListUIState, clearChargeCardList, resendCardInvite, resendCardInviteSuccess, resendCardInviteFailure, revokeCardInvite, revokeCardInviteSuccess, revokeCardInviteFailure, updateChargeCardsSpendLimit, updateChargeCardsSpendLimitSuccessOrFailure, lockChargeCards, lockChargeCardsSuccessOrFailure, unlockChargeCards, unlockChargeCardsSuccessOrFailure, closeChargeCards, closeChargeCardsSuccessOrFailure, revokeChargeCardsInvite, revokeChargeCardsInviteSuccessOrFailure, } = chargeCardList.actions;
+export const { fetchChargeCardListPage, fetchCardsOnboardingPage, fetchCreditAccountRepayment, updateCreditAccountRepayment, updateCreditAccountRepaymentFailure, updateCreditAccountRepaymentAmountAndDate, updateRowActionCardId, fetchCreditAccount, updateCreditAccount, updateCreditAccountFailure, fetchDebitCardSummary, updateDebitCardSummary, updateDebitCardSummaryFailure, fetchChargeCardList, updateChargeCardList, updateChargeCardListFailure, updateSearchText, updateBulkActionCardIds, updateChargeCardListUIState, clearChargeCardList, resendCardInvite, resendCardInviteSuccess, resendCardInviteFailure, revokeCardInvite, revokeCardInviteSuccess, revokeCardInviteFailure, updateChargeCardsSpendLimit, updateChargeCardsSpendLimitSuccessOrFailure, lockChargeCards, lockChargeCardsSuccessOrFailure, unlockChargeCards, unlockChargeCardsSuccessOrFailure, closeChargeCards, closeChargeCardsSuccessOrFailure, revokeChargeCardsInvite, revokeChargeCardsInviteSuccessOrFailure, } = chargeCardList.actions;
 export default chargeCardList.reducer;
 // helper
 const toCreditAccount = (payload) => ({

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

@@ -219,8 +219,6 @@ const getCardsBySortKey = (card, sortKey) => {
             return card.cardName.toLowerCase();
         case 'cardType':
             return card.type.code;
-        case 'accountType':
-            return card.type.code.includes('credit') ? 'credit' : 'debit';
         case 'status':
             return card.status.code;
         case 'utilisation':

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

@@ -0,0 +1,36 @@
+import { concat, from } from 'rxjs';
+import { filter, mergeMap } from 'rxjs/operators';
+import { fetchPeople } from '../../../people/peopleReducer';
+import { fetchCashbackDetail } from '../cashbackDetail/cashbackDetailReducer';
+import { fetchCardsOnboardingPage, fetchCreditAccount, } from './chargeCardListReducer';
+export const fetchCardsOnboardingPageEpic = (actions$, state$) => actions$.pipe(filter(fetchCardsOnboardingPage.match), mergeMap((action) => {
+    const { isCreditCardEnabled, cacheOverride } = action.payload;
+    const actions = [];
+    const state = state$.value;
+    if (cacheOverride === true) {
+        if (isCreditCardEnabled) {
+            actions.push(fetchCreditAccount());
+        }
+        actions.push(fetchCashbackDetail());
+        actions.push(fetchPeople());
+    }
+    else {
+        const chargeCardList = state.chargeCardListState;
+        if (isCreditCardEnabled &&
+            chargeCardList.creditAccount.fetchState !== 'Completed' &&
+            chargeCardList.creditAccount.fetchState !== 'In-Progress') {
+            actions.push(fetchCreditAccount());
+        }
+        const cashbackDetailState = state.cashbackDetailState;
+        if (cashbackDetailState.fetchState !== 'In-Progress' &&
+            cashbackDetailState.hasValidState() === false) {
+            actions.push(fetchCashbackDetail());
+        }
+        const peopleState = state.peopleState;
+        if (peopleState.fetchState !== 'In-Progress' &&
+            peopleState.hasValidState() === false) {
+            actions.push(fetchPeople());
+        }
+    }
+    return concat(from(actions));
+}));

package/lib/esm/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.js

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

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

@@ -45,7 +45,6 @@ export const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled
         return {
             ...reimbursement,
             submittedBy: getUserByUserId(userState, reimbursement.reimburseeUserId),
-            createdByUser: getUserByUserId(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -416,14 +415,6 @@ 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) => {
@@ -431,7 +422,6 @@ 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';
@@ -451,8 +441,6 @@ 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,7 +55,6 @@ 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: 'In Review',
+        name: 'Done',
     },
     {
         code: 'resolved',
-        name: 'Complete',
+        name: 'Resolved',
     },
 ];
 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 =
-                (lineItem.class?.qboId != null || accountLine.class?.qboId != null) &&
-                    lineItem.class?.qboId !== accountLine.class?.qboId;
+                Boolean(lineItem.class?.qboId) &&
+                    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,9 +806,7 @@ export const getChangedLineItemCountFromLocalData = (transaction, transactionLoc
                     accountLineLocal.account?.qboId !== accountLine.account.qboId &&
                         accountLineLocal.account?.accountId !== accountLine.account.accountId;
                 hasClassChanged =
-                    (accountLineLocal.class?.qboId != null ||
-                        accountLine.class?.qboId != null) &&
-                        accountLineLocal.class?.qboId !== accountLine.class?.qboId;
+                    accountLineLocal.class?.qboId !== accountLine.class.qboId;
             }
             hasDescriptionChanged =
                 transactionLocalData.lineItemById[lineId] != null
@@ -946,10 +944,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;
@@ -962,7 +960,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;