@zeniai/client-epic-state 5.1.59 → 5.1.60

package/lib/esm/view/commonVendorView/transactionVendorView/epics/saveTransactionVendorEpic.js

@@ -107,7 +107,6 @@ export const saveTransactionVendorEpic = (actions$, state$, zeniAPI) => actions$
                     transactionId: action.payload.transactionId,
                     isExpenseAutomationEnabled: action.payload.isExpenseAutomationEnabled,
                     cotTransactionTracking: [], // We don't need to pass COT tracking for vendor save
-                    isUncategorizedExpenseCategoryEnabled: action.payload.isUncategorizedExpenseCategoryEnabled,
                 }));
             }
             return from(actions);

package/lib/esm/view/commonVendorView/transactionVendorView/transactionVendorViewReducer.js

@@ -44,14 +44,13 @@ const transactionVendorView = createSlice({
                     draft.newVendorState.saveStatus.error = undefined;
                 }
             },
-            prepare(transactionId, vendorId, saveTransaction, isExpenseAutomationEnabled = false, isUncategorizedExpenseCategoryEnabled) {
+            prepare(transactionId, vendorId, saveTransaction, isExpenseAutomationEnabled = false) {
                 return {
                     payload: {
                         vendorId,
                         transactionId,
                         saveTransaction,
                         isExpenseAutomationEnabled,
-                        isUncategorizedExpenseCategoryEnabled,
                     },
                 };
             },

package/lib/esm/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.js

@@ -9,7 +9,7 @@ import { fetchMissingReceipts } from '../../reducers/missingReceiptsViewReducer'
 import { fetchReconciliation } from '../../reducers/reconciliationViewReducer';
 import { fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
 export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.pipe(filter(fetchAllExpenseAutomationTabs.match), switchMap((action) => {
-    const { cacheOverride, refreshViewInBackground, isUncategorizedExpenseCategoryEnabled, } = action.payload;
+    const { cacheOverride, refreshViewInBackground, } = action.payload;
     const state = state$.value;
     const { monthEndCloseChecksState } = state;
     const { monthEndCloseChecksByTenantId } = monthEndCloseChecksState;
@@ -30,7 +30,7 @@ export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.
     }
     if (cacheOverride === true) {
         const actions = [];
-        actions.push(fetchTransactionCategorizationView(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground, false, isUncategorizedExpenseCategoryEnabled), fetchMissingReceipts({ start: timePeriodStart, end: timePeriodEnd }, {
+        actions.push(fetchTransactionCategorizationView(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground, false), fetchMissingReceipts({ start: timePeriodStart, end: timePeriodEnd }, {
             amount: 75.0,
             currencyCode: 'USD',
             currencySymbol: '$',
@@ -83,7 +83,7 @@ export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.
             (state.expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab].hasValidState() === false ||
                 state.expenseAutomationTransactionsViewState
                     .transactionCategorizationView[selectedTransactionCategorizationTab].transactionIdsBySelectedPeriod[monthYearPeriodId] == null)) {
-            fetchActions.push(fetchTransactionCategorizationView(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground, false, isUncategorizedExpenseCategoryEnabled));
+            fetchActions.push(fetchTransactionCategorizationView(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, cacheOverride, false, undefined, undefined, refreshViewInBackground, false));
         }
         return from(fetchActions);
     }

package/lib/esm/view/expenseAutomationView/epics/common/refreshExpenseAutomationCurrentTabEpic.js

@@ -9,8 +9,7 @@ import { fetchJeSchedulesPage } from '../../reducers/jeSchedulesViewReducer';
 import { fetchMissingReceipts } from '../../reducers/missingReceiptsViewReducer';
 import { fetchReconciliation } from '../../reducers/reconciliationViewReducer';
 import { fetchTransactionCategorizationView } from '../../reducers/transactionsViewReducer';
-export const refreshExpenseAutomationCurrentTabEpic = (actions$, state$) => actions$.pipe(filter(refreshExpenseAutomationCurrentTab.match), switchMap((action) => {
-    const { isUncategorizedExpenseCategoryEnabled } = action.payload;
+export const refreshExpenseAutomationCurrentTabEpic = (actions$, state$) => actions$.pipe(filter(refreshExpenseAutomationCurrentTab.match), switchMap(() => {
     const state = state$.value;
     const currentTenant = getCurrentTenant(state);
     const companyId = currentTenant.companyId;
@@ -63,7 +62,7 @@ export const refreshExpenseAutomationCurrentTabEpic = (actions$, state$) => acti
         case 'transaction_categorization':
         default:
             return from([
-                fetchTransactionCategorizationView(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, true, false, undefined, undefined, true, undefined, isUncategorizedExpenseCategoryEnabled),
+                fetchTransactionCategorizationView(selectedTransactionCategorizationTab, { start: timePeriodStart, end: timePeriodEnd }, true, false, undefined, undefined, true, undefined),
             ]);
     }
 }));

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/backgroundRefetchReviewTabEpic.js

@@ -10,7 +10,7 @@ import { toTransactionsSortKey } from '../../types/transactionsViewState';
 const SELECTED_TAB = 'review';
 const PAGE_SIZE = 25;
 export const backgroundRefetchReviewTabEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(backgroundRefetchReviewTab.match), switchMap((action) => {
-    const { period, isUncategorizedExpenseCategoryEnabled } = action.payload;
+    const { period } = action.payload;
     const state = state$.value;
     const currentTenant = getCurrentTenant(state);
     const selectedPeriod = state.expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
@@ -80,7 +80,7 @@ export const backgroundRefetchReviewTabEpic = (actions$, state$, zeniAPI) => act
                     pageToken: accumulated.finalPageToken,
                 },
             }),
-            initializeTransactionCategorizationViewLocalData(SELECTED_TAB, transactionIds, selectedPeriod, false, accumulated.finalPageToken, accumulated.totalCount, lineItemsByTransactionIds, true, isUncategorizedExpenseCategoryEnabled),
+            initializeTransactionCategorizationViewLocalData(SELECTED_TAB, transactionIds, selectedPeriod, false, accumulated.finalPageToken, accumulated.totalCount, lineItemsByTransactionIds, true),
             updateTotalCountForTransactionCategorization({
                 selectedPeriod,
                 selectedTab: SELECTED_TAB,

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationEpic.js

@@ -73,7 +73,7 @@ groupBy((action) => action.payload.selectedTab), mergeMap((group$) => group$.pip
                     pageToken: response.data.next_page_token ?? null,
                 },
             }));
-            updateActions.push(initializeTransactionCategorizationViewLocalData(selectedTab, transactionIds, selectedPeriod, keepExistingListItems, response.data.next_page_token ?? null, response.data.total_count, lineItemsByTransactionIds, refreshViewInBackground, action.payload.isUncategorizedExpenseCategoryEnabled));
+            updateActions.push(initializeTransactionCategorizationViewLocalData(selectedTab, transactionIds, selectedPeriod, keepExistingListItems, response.data.next_page_token ?? null, response.data.total_count, lineItemsByTransactionIds, refreshViewInBackground));
             updateActions.push(updateTotalCountForTransactionCategorization({
                 selectedPeriod,
                 selectedTab,

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.js

@@ -9,7 +9,7 @@ import { fetchProjectList } from '../../../projectList/projectListReducer';
 import { fetchTransactionCategorization, fetchTransactionCategorizationView, } from '../../reducers/transactionsViewReducer';
 import { TRANSACTIONS_TABS } from '../../types/transactionsViewState';
 export const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pipe(filter(fetchTransactionCategorizationView.match), mergeMap((action) => {
-    const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, isUncategorizedExpenseCategoryEnabled, } = action.payload;
+    const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, } = action.payload;
     const updateActions = [];
     const { expenseAutomationTransactionsViewState } = state$.value;
     const { fetchState, transactionIdsBySelectedPeriod, uiState } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab];
@@ -45,7 +45,7 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
         fetchState === 'Not-Started' ||
         transactionIds.length === 0 ||
         uiState.searchString !== '') {
-        updateActions.push(fetchTransactionCategorization(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems, isUncategorizedExpenseCategoryEnabled));
+        updateActions.push(fetchTransactionCategorization(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems));
     }
     // On the initial load of a tab (searchString undefined = non-search fetch),
     // preload every other tab that hasn't been fetched yet for this period.
@@ -55,7 +55,7 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
         TRANSACTIONS_TABS.filter((tab) => tab !== selectedTab).forEach((otherTab) => {
             const otherTabFetchState = expenseAutomationTransactionsViewState.transactionCategorizationView[otherTab].fetchState;
             if (otherTabFetchState === 'Not-Started') {
-                updateActions.push(fetchTransactionCategorization(otherTab, period, false, false, undefined, undefined, true, undefined, isUncategorizedExpenseCategoryEnabled));
+                updateActions.push(fetchTransactionCategorization(otherTab, period, false, false, undefined, undefined, true, undefined));
             }
         });
     }
@@ -68,7 +68,7 @@ export const fetchTransactionCategorizationViewEpic = (actions$, state$) => acti
         TRANSACTIONS_TABS.filter((tab) => tab !== selectedTab).forEach((otherTab) => {
             const otherTabSearchString = expenseAutomationTransactionsViewState.transactionCategorizationView[otherTab].uiState.searchString;
             if (searchString !== otherTabSearchString) {
-                updateActions.push(fetchTransactionCategorization(otherTab, period, true, keepExistingListItems, searchString, undefined, true, true, isUncategorizedExpenseCategoryEnabled));
+                updateActions.push(fetchTransactionCategorization(otherTab, period, true, keepExistingListItems, searchString, undefined, true, true));
             }
         });
     }

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/initializeTransactionCategorizationLocalDataEpic.js

@@ -2,12 +2,11 @@ import { from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
 import { getTransactionWithCOT } from '../../../../entity/transaction/transactionHelper';
 import { getSupportedTransactionsByIds } from '../../../../entity/transaction/transactionSelector';
-import { getUncategorizedAccounts } from '../../../accountList/accountListSelector';
 import { mergeTabSpecificLineItems, toTransactionDetailLocalData, } from '../../helpers/transactionCategorizationLocalDataHelper';
 import { initializeTransactionCategorizationViewLocalData, saveTransactionCategorizationLocalData, } from '../../reducers/transactionsViewReducer';
 import { initialSupportedTransactionCategorization, } from '../../types/transactionsViewState';
 export const initializeTransactionCategorizationViewLocalDataEpic = (actions$, state$) => actions$.pipe(filter(initializeTransactionCategorizationViewLocalData.match), mergeMap((action) => {
-    const { transactionIds, selectedPeriod, keepExistingListItems, selectedTab, pageToken, totalCount, lineItemsByTransactionIds, refreshViewInBackground, isUncategorizedExpenseCategoryEnabled, } = action.payload;
+    const { transactionIds, selectedPeriod, keepExistingListItems, selectedTab, pageToken, totalCount, lineItemsByTransactionIds, refreshViewInBackground, } = action.payload;
     const fetchActions = [];
     const { transactionState, expenseAutomationTransactionsViewState } = state$.value;
     const { transactionReviewLocalDataById } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTab];
@@ -15,10 +14,9 @@ export const initializeTransactionCategorizationViewLocalDataEpic = (actions$, s
         ? { ...transactionReviewLocalDataById }
         : {};
     const transactions = getSupportedTransactionsByIds(transactionState, transactionIds);
-    const uncategorizedIncomeExpense = getUncategorizedAccounts(state$.value.accountState, state$.value.accountListState, 'accountList');
     transactions.forEach((transaction) => {
         const transactionWithCOT = getTransactionWithCOT(transaction);
-        const newTransactionsLocalData = toTransactionDetailLocalData(transactionWithCOT, selectedTab, lineItemsByTransactionIds[transaction.id], uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled);
+        const newTransactionsLocalData = toTransactionDetailLocalData(transactionWithCOT, selectedTab, lineItemsByTransactionIds[transaction.id]);
         if (transactionLocalData[transaction.id] == null) {
             transactionLocalData[transaction.id] = {
                 ...initialSupportedTransactionCategorization,

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/markTransactionAsNotMiscategorizedEpic.js

@@ -10,7 +10,7 @@ import { getSnackbarMessageForTransactionReview } from '../../helpers/transactio
 import { fetchTransactionCategorizationView, markTransactionAsNotMiscategorized, updateStatusForTransactionNotMiscategorizedUpdateForCategorization, updateTotalCountForTransactionCategorization, } from '../../reducers/transactionsViewReducer';
 export const markTransactionAsNotMiscategorizedEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(markTransactionAsNotMiscategorized.match), mergeMap((action) => {
     const { expenseAutomationViewState, expenseAutomationTransactionsViewState, } = state$.value;
-    const { transactionsInReview, selectedTab, isUncategorizedExpenseCategoryEnabled, } = action.payload;
+    const { transactionsInReview, selectedTab, } = action.payload;
     const transactionsSuccess = transactionsInReview.transactions_update_success;
     const transactionsFailed = transactionsInReview.transactions_update_failed;
     const currentTenant = getCurrentTenant(state$.value);
@@ -107,7 +107,7 @@ export const markTransactionAsNotMiscategorizedEpic = (actions$, state$, zeniAPI
                     if (timePeriodStart != null && timePeriodEnd != null) {
                         actions.push(fetchTransactionCategorizationView('review', { start: timePeriodStart, end: timePeriodEnd }, true, // cacheOverride = true to force refresh
                         false, undefined, undefined, true, // refreshViewInBackground
-                        false, isUncategorizedExpenseCategoryEnabled));
+                        false));
                     }
                 }
                 actions.push(updateTotalCountForTransactionCategorization({

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/saveTransactionCategorizationEpic.js

@@ -6,7 +6,7 @@ import { getUncategorizedAccounts } from '../../../accountList/accountListSelect
 import { toTransactionUpdatesFromTransactionCategorizationLocalData } from '../../helpers/saveTransactionHelper';
 import { saveTransactionCategorization, updateTransactionCategorization, } from '../../reducers/transactionsViewReducer';
 export const saveTransactionCategorizationEpic = (actions$, state$) => actions$.pipe(filter(saveTransactionCategorization.match), mergeMap((action) => {
-    const { transactionIds, cotTrackingByTransactionId, selectedTab, isUncategorizedExpenseCategoryEnabled, } = action.payload;
+    const { transactionIds, cotTrackingByTransactionId, selectedTab, } = action.payload;
     const fetchActions = [];
     const { transactionState, expenseAutomationTransactionsViewState } = state$.value;
     const transactionSaveUpdates = [];
@@ -19,6 +19,6 @@ export const saveTransactionCategorizationEpic = (actions$, state$) => actions$.
             transactionSaveUpdates.push(toTransactionUpdatesFromTransactionCategorizationLocalData(localData, transaction, uncategorizedIncomeExpense));
         }
     });
-    fetchActions.push(updateTransactionCategorization(selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled));
+    fetchActions.push(updateTransactionCategorization(selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId));
     return from(fetchActions);
 }));

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/triggerReviewTabRefetchEpic.js

@@ -4,7 +4,7 @@ import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/ti
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { backgroundRefetchReviewTab, syncTransactionCategorizationFromDetailSave, } from '../../reducers/transactionsViewReducer';
 export const triggerReviewTabRefetchEpic = (actions$, state$) => actions$.pipe(filter(syncTransactionCategorizationFromDetailSave.match), mergeMap((action) => {
-    const { pendingReviewLineIds, transactionId, isUncategorizedExpenseCategoryEnabled, } = action.payload;
+    const { pendingReviewLineIds, transactionId, } = action.payload;
     if (pendingReviewLineIds.length === 0) {
         return EMPTY;
     }
@@ -23,5 +23,5 @@ export const triggerReviewTabRefetchEpic = (actions$, state$) => actions$.pipe(f
     if (timePeriodStart == null || timePeriodEnd == null) {
         return EMPTY;
     }
-    return of(backgroundRefetchReviewTab({ start: timePeriodStart, end: timePeriodEnd }, isUncategorizedExpenseCategoryEnabled));
+    return of(backgroundRefetchReviewTab({ start: timePeriodStart, end: timePeriodEnd }));
 }));

package/lib/esm/view/expenseAutomationView/epics/transactionCategorization/updateTransactionCategorizationEpic.js

@@ -15,7 +15,7 @@ import { getVendorByVendorId } from '../../../../entity/vendor/vendorSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { markTransactionAsNotMiscategorized, updateTransactionCategorization, updateTransactionCategorizationSaveStatus, } from '../../reducers/transactionsViewReducer';
 export const updateTransactionCategorizationEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateTransactionCategorization.match), mergeMap((action) => {
-    const { selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, isUncategorizedExpenseCategoryEnabled, } = action.payload;
+    const { selectedTab, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId, } = action.payload;
     const { transactionState, vendorState, expenseAutomationTransactionsViewState, } = state$.value;
     const payloadArray = preparePayload(selectedTab, transactionState, vendorState, expenseAutomationTransactionsViewState, transactionIds, transactionSaveUpdates, cotTrackingByTransactionId).filter((payload) => payload != null);
     return zeniAPI
@@ -24,7 +24,7 @@ export const updateTransactionCategorizationEpic = (actions$, state$, zeniAPI) =
         if (isSuccessResponse(response) && response.data != null) {
             const transactionsInReview = response.data;
             const actions = [];
-            actions.push(markTransactionAsNotMiscategorized(selectedTab, transactionsInReview, isUncategorizedExpenseCategoryEnabled), updateTransactionCategorizationSaveStatus(selectedTab, 'Completed', createZeniAPIStatus('Completed', 'Transaction categorization updated successfully')));
+            actions.push(markTransactionAsNotMiscategorized(selectedTab, transactionsInReview), updateTransactionCategorizationSaveStatus(selectedTab, 'Completed', createZeniAPIStatus('Completed', 'Transaction categorization updated successfully')));
             return from(actions);
         }
         else {

package/lib/esm/view/expenseAutomationView/expenseAutomationViewReducer.js

@@ -18,20 +18,19 @@ const expenseAutomationView = createSlice({
             reducer() {
                 //do nothing
             },
-            prepare(cacheOverride = false, refreshViewInBackground = false, isUncategorizedExpenseCategoryEnabled = false) {
+            prepare(cacheOverride = false, refreshViewInBackground = false) {
                 return {
                     payload: {
                         cacheOverride,
                         refreshViewInBackground,
-                        isUncategorizedExpenseCategoryEnabled,
                     },
                 };
             },
         },
         refreshExpenseAutomationCurrentTab: {
-            prepare(isUncategorizedExpenseCategoryEnabled) {
+            prepare() {
                 return {
-                    payload: { isUncategorizedExpenseCategoryEnabled },
+                    payload: {},
                 };
             },
             reducer() {

package/lib/esm/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js

@@ -66,16 +66,16 @@ export const MAX_SELECTION_LIMIT = 5;
 // triplet that was inlined at four sites (updateSelectedCustomer/Vendor,
 // setAllItemsToCategoryClassInLocalDataForCategorization, and
 // setEntityRecommendationForLineIdInLocalData below).
-export const shouldAutoSelectAndAdd = (transaction, localData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) => {
+export const shouldAutoSelectAndAdd = (transaction, localData, selectedCheckBoxTransactionIds, isAccountingClassesEnabled) => {
     if (selectedCheckBoxTransactionIds.includes(transaction.id)) {
         return false;
     }
     if (selectedCheckBoxTransactionIds.length >= MAX_SELECTION_LIMIT) {
         return false;
     }
-    return checkIfAllLineItemsAreCategoryClassFilled(transaction, localData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled);
+    return checkIfAllLineItemsAreCategoryClassFilled(transaction, localData, isAccountingClassesEnabled);
 };
-export const toTransactionDetailLocalData = (transaction, selectedTab, lineItemsByTransactionIds, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled) => {
+export const toTransactionDetailLocalData = (transaction, selectedTab, lineItemsByTransactionIds) => {
     const transactionLocal = {
         ...initialSupportedTransactionCategorization.transactionReviewLocalData,
     };
@@ -162,7 +162,7 @@ export const toTransactionDetailLocalData = (transaction, selectedTab, lineItems
     }
     transactionLocal.lineItemById =
         transaction.lines != null && transaction.lines.length > 0
-            ? buildLineItemById(transaction, uncategorizedIncomeExpense, transaction.recommendationsWithCOT, isUncategorizedExpenseCategoryEnabled)
+            ? buildLineItemById(transaction, transaction.recommendationsWithCOT)
             : {};
     transactionLocal.sortedLineItems =
         transaction.lines != null && transaction.lines.length > 0
@@ -177,7 +177,7 @@ export const toTransactionDetailLocalData = (transaction, selectedTab, lineItems
     };
     return transactionLocal;
 };
-const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendations, isUncategorizedExpenseCategoryEnabled) => {
+const buildLineItemById = (transaction, recommendations) => {
     const lineItemData = {};
     const { lines } = transaction;
     lines?.forEach((line) => {
@@ -241,10 +241,7 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
             if (recommendations != null) {
                 record.recommendationsWithCOT = recommendations[lineId];
                 const higherPreferenceRecommendation = recommendations[lineId]?.[0];
-                if ((Boolean(accountLine.account.accountId) === false ||
-                    isAccountUncategorized(uncategorizedIncomeExpense, accountLine.account.qboId, isUncategorizedExpenseCategoryEnabled === true
-                        ? ['income']
-                        : undefined)) &&
+                if (Boolean(accountLine.account.accountId) === false &&
                     higherPreferenceRecommendation?.account != null) {
                     record.account = {
                         ...higherPreferenceRecommendation.account,
@@ -322,7 +319,7 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
     });
     return lineItemData;
 };
-export const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, transactionLineId, transactionDetailLocalData, updatedItem, uncategorizedAccounts, selectedTab, vendorId, customerId, selectedAccount, selectedClassBase, selectedProjectBase, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) => {
+export const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, transactionLineId, transactionDetailLocalData, updatedItem, selectedTab, vendorId, customerId, selectedAccount, selectedClassBase, selectedProjectBase, isAccountingClassesEnabled) => {
     let newLineItems = {};
     let selectedCheckBoxTransactionIds = draft.selectedCheckBoxTransactionIds;
     let similarTransactionUpdated = false;
@@ -379,10 +376,7 @@ export const toSetAllLineItemsToCategoryClass = (draft, transaction, transaction
                             // if the vendor is same, then set the account and class with the selected ones and add the transaction to the selected list
                             if (selectedAccount != null &&
                                 updatedItem === 'category' &&
-                                (record.account?.qboId == null ||
-                                    isAccountUncategorized(uncategorizedAccounts, record.account?.qboId, isUncategorizedExpenseCategoryEnabled === true
-                                        ? ['income']
-                                        : undefined) === true)) {
+                                record.account?.qboId == null) {
                                 record.account = selectedAccount;
                                 similarTransactionUpdated = true;
                                 if ((isAccountingClassesEnabled === false ||
@@ -451,13 +445,13 @@ export const toSetAllLineItemsToCategoryClass = (draft, transaction, transaction
         selectedEntity: transactionDetailLocalData.selectedEntity,
         tabSpecificLineItems: transactionDetailLocalData.tabSpecificLineItems,
     };
-    if (!checkIfAllLineItemsAreCategoryClassFilled(transaction, newLocalData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
+    if (!checkIfAllLineItemsAreCategoryClassFilled(transaction, newLocalData, isAccountingClassesEnabled)) {
         selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds.filter((id) => id !== transaction.id);
     }
     draft.selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds;
     return { localData: newLocalData, similarTransactionUpdated };
 };
-export const setEntityRecommendationForLineIdInLocalData = (draft, transaction, transactionDetailLocalData, entity, recommendationLineIds, uncategorizedAccounts, recommendationWithCOTByLineId, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) => {
+export const setEntityRecommendationForLineIdInLocalData = (draft, transaction, transactionDetailLocalData, entity, recommendationLineIds, recommendationWithCOTByLineId, isAccountingClassesEnabled) => {
     const newLineItems = {};
     let matchingEntityLineId = undefined;
     const checkIfNotJEAndDeposit = !isVendorTransaction(transaction);
@@ -477,11 +471,8 @@ export const setEntityRecommendationForLineIdInLocalData = (draft, transaction,
                     };
                     const recommendations = mergeTransactionAndEntityRecommendationsWithCOT(oldRecord.recommendationsWithCOT, recommendationWithCOTByLineId?.[lineId]);
                     const accountLine = line;
-                    const isUncategorizedAccount = isAccountUncategorized(uncategorizedAccounts, accountLine.account.qboId, isUncategorizedExpenseCategoryEnabled === true
-                        ? ['income']
-                        : undefined);
                     record.account =
-                        isUncategorizedAccount === false && accountLine.account.qboId !== ''
+                        accountLine.account.qboId !== ''
                             ? accountLine.account
                             : recommendations?.[0]?.account
                                 ? {
@@ -564,23 +555,21 @@ export const setEntityRecommendationForLineIdInLocalData = (draft, transaction,
     // category/class became stale after the entity update). Otherwise
     // route through shouldAutoSelectAndAdd so the MAX_SELECTION_LIMIT
     // gate is consistently applied across all auto-add sites.
-    if (!checkIfAllLineItemsAreCategoryClassFilled(transaction, newLocalData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
+    if (!checkIfAllLineItemsAreCategoryClassFilled(transaction, newLocalData, isAccountingClassesEnabled)) {
         selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds.filter((id) => id !== transaction.id);
     }
-    else if (shouldAutoSelectAndAdd(transaction, newLocalData, selectedCheckBoxTransactionIds, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled)) {
+    else if (shouldAutoSelectAndAdd(transaction, newLocalData, selectedCheckBoxTransactionIds, isAccountingClassesEnabled)) {
         selectedCheckBoxTransactionIds.push(transaction.id);
     }
     draft.selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds;
     return newLocalData;
 };
-export const checkIfAllLineItemsAreCategoryClassFilled = (transaction, transactionDetailLocalData, uncategorizedAccounts, isUncategorizedExpenseCategoryEnabled, isAccountingClassesEnabled) => {
+export const checkIfAllLineItemsAreCategoryClassFilled = (transaction, transactionDetailLocalData, isAccountingClassesEnabled) => {
     const lineItems = Object.values(transactionDetailLocalData.lineItemById);
     const isVendorTransactionAvailable = isVendorTransaction(transaction);
-    const uncategorizedAccountTypes = isUncategorizedExpenseCategoryEnabled === true ? ['income'] : undefined;
     return lineItems.every((lineItem) => Boolean(lineItem?.account?.qboId) &&
         (isAccountingClassesEnabled === false ||
             Boolean(lineItem?.class?.qboId)) &&
-        isAccountUncategorized(uncategorizedAccounts, lineItem?.account?.qboId, uncategorizedAccountTypes) === false &&
         ((isVendorTransactionAvailable
             ? Boolean(transactionDetailLocalData?.vendor?.id)
             : Boolean(lineItem?.vendor?.id)) ||