@zeniai/client-epic-state 4.15.35 → 4.15.36

package/lib/view/expenseAutomationView/helpers/saveTransactionHelper.js

@@ -11,7 +11,7 @@ const saveTransactionHelper_1 = require("../../transactionDetail/epics/saveTrans
  * @param transactionCategorizationLocalData
  */
 const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionCategorizationLocalData, transaction, uncategorizedIncomeExpense) => {
-    var _a, _b;
+    var _a;
     const updates = {
         updatesByLineId: {},
     };
@@ -20,21 +20,27 @@ const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionC
     const isTransactionMisCategorized = (0, saveTransactionHelper_1.isTransactionMiscategorized)(transaction, true);
     const isTransactionUnCategorized = (0, saveTransactionHelper_1.isTransactionUncategorized)(transaction, uncategorizedIncomeExpense);
     updates.memo = transactionCategorizationLocalData.memo;
-    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) === true) {
-        updates.vendorId = (_a = transactionCategorizationLocalData.vendorUpdates) === null || _a === void 0 ? void 0 : _a.id;
+    const currentSelectedEntity = transactionCategorizationLocalData.selectedEntity;
+    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) === true &&
+        currentSelectedEntity != null &&
+        currentSelectedEntity.type === 'vendor') {
+        updates.vendorId = currentSelectedEntity.id;
     }
-    // This needs to be changed to customerUpdates as of now we are not updating customerId so we are using the one from the transaction
-    if ((0, vendorTransaction_1.isVendorTransactionWithCustomer)(transaction) === true) {
-        updates.customerId = transaction.customerId;
+    if ((0, vendorTransaction_1.isVendorTransactionWithCustomer)(transaction) === true &&
+        currentSelectedEntity != null &&
+        currentSelectedEntity.type === 'customer') {
+        updates.customerId = currentSelectedEntity.id;
     }
-    const entity = getEntityFromTransaction(transaction);
+    const entity = getEntityFromTransaction(transaction, currentSelectedEntity);
     let lastUpdatedCategory;
     let lastUpdatedClass;
     // single recommendation to just pick the last recommendation in the list of lines
-    (_b = transaction.lines) === null || _b === void 0 ? void 0 : _b.forEach((line) => {
+    (_a = transaction.lines) === null || _a === void 0 ? void 0 : _a.forEach((line) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const updatedEntityId = (_b = (_a = transactionCategorizationLocalData.vendorUpdates) === null || _a === void 0 ? void 0 : _a.qboId) !== null && _b !== void 0 ? _b : (_c = transactionCategorizationLocalData.customerUpdates) === null || _c === void 0 ? void 0 : _c.qboId;
-        const entityDetails = getEntityDetails(entity, transactionCategorizationLocalData.lineItemById[line.id], transactionCategorizationLocalData.vendorUpdates, transactionCategorizationLocalData.customerUpdates);
+        const currentSelectedEntityLine = transactionCategorizationLocalData.lineItemById[line.id]
+            .selectedEntityLine;
+        const entityDetails = getEntityDetails(entity, transactionCategorizationLocalData.lineItemById[line.id], transactionCategorizationLocalData.vendorUpdates, transactionCategorizationLocalData.customerUpdates, currentSelectedEntityLine);
         if (line.type === 'transaction_with_account_and_class_line' ||
             line.type === 'transaction_with_product_or_service_line' ||
             line.type === 'journal_entry_transaction_line') {
@@ -47,7 +53,13 @@ const toTransactionUpdatesFromTransactionCategorizationLocalData = (transactionC
             };
             if (line.type === 'journal_entry_transaction_line' ||
                 line.platformLineDetailType === 'deposit_line_detail') {
-                updatesByLineId[line.id] = Object.assign(Object.assign({}, updatesByLineId[line.id]), { vendor: lineItem.vendor, customer: lineItem.customer });
+                updatesByLineId[line.id] = Object.assign(Object.assign({}, updatesByLineId[line.id]), { vendor: currentSelectedEntityLine != null &&
+                        currentSelectedEntityLine.type === 'vendor'
+                        ? lineItem.vendor
+                        : undefined, customer: currentSelectedEntityLine != null &&
+                        currentSelectedEntityLine.type === 'customer'
+                        ? lineItem.customer
+                        : undefined });
             }
             let hasCategoryChanged = false;
             let hasClassChanged = false;
@@ -136,7 +148,7 @@ const doUpdateEntityUpdates = (entityUpdates, entityId, entityType, recommendati
         entityUpdates[entityKey] = Object.assign(Object.assign({}, entityUpdate), { recommendations: recommendation });
     }
 };
-const getEntityDetails = (entity, lineItemLocalData, vendorUpdates, customerUpdates) => {
+const getEntityDetails = (entity, lineItemLocalData, vendorUpdates, customerUpdates, currentSelectedEntityLine) => {
     var _a, _b, _c, _d;
     if (entity != null) {
         return {
@@ -150,25 +162,35 @@ const getEntityDetails = (entity, lineItemLocalData, vendorUpdates, customerUpda
             entityType: lineItemLocalData.vendor != null ? 'vendor' : 'customer',
         };
     }
-    if (vendorUpdates != null && vendorUpdates.id != null) {
-        return {
-            entityId: vendorUpdates.id,
-            entityType: 'vendor',
-        };
+    if (currentSelectedEntityLine != null &&
+        currentSelectedEntityLine.type === 'vendor') {
+        if (vendorUpdates != null && vendorUpdates.id != null) {
+            return {
+                entityId: vendorUpdates.id,
+                entityType: 'vendor',
+            };
+        }
     }
-    if (customerUpdates != null && customerUpdates.id != null) {
-        return {
-            entityId: customerUpdates.id,
-            entityType: 'customer',
-        };
+    if (currentSelectedEntityLine != null &&
+        currentSelectedEntityLine.type === 'customer') {
+        if (customerUpdates != null && customerUpdates.id != null) {
+            return {
+                entityId: customerUpdates.id,
+                entityType: 'customer',
+            };
+        }
     }
-    if (((_c = lineItemLocalData.customer) === null || _c === void 0 ? void 0 : _c.id) != null) {
+    if (((_c = lineItemLocalData.customer) === null || _c === void 0 ? void 0 : _c.id) != null &&
+        currentSelectedEntityLine != null &&
+        currentSelectedEntityLine.type === 'customer') {
         return {
             entityId: lineItemLocalData.customer.id,
             entityType: 'customer',
         };
     }
-    if (((_d = lineItemLocalData.vendor) === null || _d === void 0 ? void 0 : _d.id) != null) {
+    if (((_d = lineItemLocalData.vendor) === null || _d === void 0 ? void 0 : _d.id) != null &&
+        currentSelectedEntityLine != null &&
+        currentSelectedEntityLine.type === 'vendor') {
         return {
             entityId: lineItemLocalData.vendor.id,
             entityType: 'vendor',
@@ -176,12 +198,13 @@ const getEntityDetails = (entity, lineItemLocalData, vendorUpdates, customerUpda
     }
     return undefined;
 };
-const getEntityFromTransaction = (transaction) => {
-    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) ||
-        (0, vendorTransaction_1.isVendorTransactionWithCustomer)(transaction)) {
+const getEntityFromTransaction = (transaction, currentSelectedEntity) => {
+    if ((0, vendorTransaction_1.isVendorTransaction)(transaction)) {
         const vendor = transaction.vendor;
         const customer = transaction.customer;
-        if (customer != null) {
+        if (customer != null &&
+            currentSelectedEntity != null &&
+            currentSelectedEntity.type === 'customer') {
             return {
                 id: customer.id,
                 name: customer.name,
@@ -190,7 +213,9 @@ const getEntityFromTransaction = (transaction) => {
                 zeniId: customer.id,
             };
         }
-        if (vendor != null) {
+        if (vendor != null &&
+            currentSelectedEntity != null &&
+            currentSelectedEntity.type === 'vendor') {
             return {
                 id: vendor.id,
                 name: vendor.name,
@@ -201,14 +226,14 @@ const getEntityFromTransaction = (transaction) => {
         }
     }
     if ((0, customerTransaction_1.isCustomerTransaction)(transaction)) {
-        const customer = transaction.customer;
-        if (customer) {
+        const customerEntity = transaction.customer;
+        if (customerEntity != null) {
             return {
-                id: customer.id,
-                name: customer.name,
+                id: customerEntity.id,
+                name: customerEntity.name,
                 type: (0, entity_1.toEntityType)('customer'),
-                qboId: customer.id,
-                zeniId: customer.id,
+                qboId: customerEntity.id,
+                zeniId: customerEntity.id,
             };
         }
     }

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

@@ -30,18 +30,30 @@ const toTransactionDetailLocalData = (transaction) => {
                 logo: transaction.logo,
             }
             : undefined;
-    transactionLocal.vendorUpdates = undefined;
-    if ((0, vendorTransaction_1.isVendorTransactionWithCustomer)(transaction) &&
+    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) &&
+        transaction.vendorId != null &&
+        transaction.vendorName != null) {
+        transactionLocal.selectedEntity = {
+            id: transaction.vendorId,
+            name: transaction.vendorName,
+            type: 'vendor',
+            qboId: transaction.vendorId,
+            zeniId: transaction.vendorId,
+        };
+    }
+    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) &&
+        transaction.customerId != null &&
         transaction.customerName != null) {
-        transactionLocal.customerUpdates = {
+        transactionLocal.selectedEntity = {
             id: transaction.customerId,
             name: transaction.customerName,
+            type: 'customer',
             qboId: transaction.customerId,
+            zeniId: transaction.customerId,
         };
     }
-    else {
-        transactionLocal.customerUpdates = undefined;
-    }
+    transactionLocal.vendorUpdates = undefined;
+    transactionLocal.customerUpdates = undefined;
     transactionLocal.lineItemById =
         transaction.lines != null && transaction.lines.length > 0
             ? buildLineItemById(transaction, transaction.recommendations)
@@ -85,6 +97,24 @@ const buildLineItemById = (transaction, recommendations) => {
                         logo: accountLine.customer.logo,
                     }
                     : undefined;
+            record.selectedEntityLine =
+                record.vendor != null
+                    ? {
+                        id: record.vendor.id,
+                        name: record.vendor.name,
+                        type: 'vendor',
+                        qboId: record.vendor.id,
+                        zeniId: record.vendor.id,
+                    }
+                    : record.customer != null
+                        ? {
+                            id: record.customer.id,
+                            name: record.customer.name,
+                            type: 'customer',
+                            qboId: record.customer.id,
+                            zeniId: record.customer.id,
+                        }
+                        : undefined;
             record.billable = accountLine.billable;
             record.categorizationStatus = accountLine.categorizationStatus;
             record.reviewPendingReasons = accountLine.reviewPendingReasons;
@@ -208,7 +238,7 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
             }
         });
     }
-    const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { sortedLineItems: transactionDetailLocalData.sortedLineItems, memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendor: transactionDetailLocalData.vendor, customer: transactionDetailLocalData.customer, vendorUpdates: transactionDetailLocalData.vendorUpdates, customerUpdates: transactionDetailLocalData.customerUpdates, vendorDetails: transactionDetailLocalData.vendorDetails, customerDetails: transactionDetailLocalData.customerDetails });
+    const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { sortedLineItems: transactionDetailLocalData.sortedLineItems, memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendor: transactionDetailLocalData.vendor, customer: transactionDetailLocalData.customer, vendorUpdates: transactionDetailLocalData.vendorUpdates, customerUpdates: transactionDetailLocalData.customerUpdates, vendorDetails: transactionDetailLocalData.vendorDetails, customerDetails: transactionDetailLocalData.customerDetails, selectedEntity: transactionDetailLocalData.selectedEntity });
     if (!(0, exports.checkIfAllLineItemsAreCategoryClassFilled)(transaction, newLocalData, uncategorizedAccounts)) {
         selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds.filter((id) => id !== transaction.id);
     }
@@ -272,7 +302,7 @@ const setEntityRecommendationForLineIdInLocalData = (draft, transaction, transac
         const newLineItem = newLineItems[matchingEntityLineId];
         newLineItems[matchingEntityLineId] = Object.assign(Object.assign({}, newLineItem), { class: matchingRecord.class, account: matchingRecord.account, lineEntity: matchingRecord.lineEntity });
     }
-    const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { sortedLineItems: transactionDetailLocalData.sortedLineItems, memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendorUpdates: transactionDetailLocalData.vendorUpdates, customerUpdates: transactionDetailLocalData.customerUpdates, vendorDetails: transactionDetailLocalData.vendorDetails, customerDetails: transactionDetailLocalData.customerDetails, vendor: transactionDetailLocalData.vendor, customer: transactionDetailLocalData.customer });
+    const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { sortedLineItems: transactionDetailLocalData.sortedLineItems, memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendorUpdates: transactionDetailLocalData.vendorUpdates, customerUpdates: transactionDetailLocalData.customerUpdates, vendorDetails: transactionDetailLocalData.vendorDetails, customerDetails: transactionDetailLocalData.customerDetails, vendor: transactionDetailLocalData.vendor, customer: transactionDetailLocalData.customer, selectedEntity: transactionDetailLocalData.selectedEntity });
     if (!(0, exports.checkIfAllLineItemsAreCategoryClassFilled)(transaction, newLocalData, uncategorizedAccounts)) {
         selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds.filter((id) => id !== transaction.id);
     }

package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts

@@ -4,6 +4,7 @@ import { MonthYearPeriod, TimePeriod } from '../../../commonStateTypes/timePerio
 import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport';
 import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
+import { CustomerBase } from '../../../entity/customer/customerState';
 import { Entity } from '../../../entity/genericEntity/entity';
 import { RecommendationByLineId, TransactionID } from '../../../entity/transaction/stateTypes/transaction';
 import { SupportedTransaction } from '../../../entity/transaction/transactionState';
@@ -76,7 +77,16 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
     selectedTransaction: SupportedTransaction;
     uncategorizedAccounts: UncategorizedAccounts;
     updatedVendor?: VendorBase;
-}, "expenseAutomationTransactionsView/updateSelectedVendorForTransaction">, setAllItemsToCategoryClassInLocalDataForCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", transactionId: string, lineId: string, transactions: SupportedTransaction[], uncategorizedAccounts: UncategorizedAccounts, vendorId?: string | undefined, customerId?: string | undefined, selectedAccount?: AccountBase | undefined, selectedClassBase?: ClassBase | undefined, lineEntity?: Entity | undefined, recommendations?: Recommendation[] | undefined], {
+    selectedEntity?: Entity;
+}, "expenseAutomationTransactionsView/updateSelectedVendorForTransaction">, updateSelectedCustomerForTransaction: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    selectedTab: TransactionsTab;
+    transactionId: ID;
+    lineId: ID;
+    selectedTransaction: SupportedTransaction;
+    uncategorizedAccounts: UncategorizedAccounts;
+    updatedCustomer?: CustomerBase;
+    selectedEntity?: Entity;
+}, "expenseAutomationTransactionsView/updateSelectedCustomerForTransaction">, setAllItemsToCategoryClassInLocalDataForCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", transactionId: string, lineId: string, transactions: SupportedTransaction[], uncategorizedAccounts: UncategorizedAccounts, vendorId?: string | undefined, customerId?: string | undefined, selectedAccount?: AccountBase | undefined, selectedClassBase?: ClassBase | undefined, lineEntity?: Entity | undefined, recommendations?: Recommendation[] | undefined], {
     selectedTab: "review" | "autoCategorized";
     transactionId: string;
     lineId: string;

package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdate = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
+exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdate = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -367,6 +367,58 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
             draft.transactionCategorizationView[selectedTab].error =
                 action.payload.status;
         },
+        updateSelectedCustomerForTransaction(draft, action) {
+            const { transactionId, lineId, updatedCustomer, selectedTransaction, selectedTab, uncategorizedAccounts, } = action.payload;
+            const transactionLocalData = (0, get_1.default)(draft.transactionCategorizationView[selectedTab]
+                .transactionReviewLocalDataById, transactionId, undefined);
+            if (transactionLocalData != null) {
+                let newTransactionLocalData = Object.assign({}, transactionLocalData.transactionReviewLocalData);
+                if (!(0, vendorTransaction_1.isVendorTransaction)(selectedTransaction) &&
+                    updatedCustomer != null) {
+                    newTransactionLocalData = Object.assign(Object.assign({}, newTransactionLocalData), { lineItemById: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById), { [lineId]: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById[lineId]), { customer: updatedCustomer, selectedEntityLine: action.payload.selectedEntity != null
+                                    ? action.payload.selectedEntity
+                                    : undefined }) }) });
+                }
+                else {
+                    if (action.payload.selectedEntity != null) {
+                        newTransactionLocalData.selectedEntity =
+                            action.payload.selectedEntity;
+                    }
+                    newTransactionLocalData.customerUpdates =
+                        updatedCustomer != null && updatedCustomer.id != null
+                            ? {
+                                id: updatedCustomer.id,
+                                name: updatedCustomer.name,
+                                qboId: updatedCustomer.id,
+                            }
+                            : undefined;
+                    newTransactionLocalData.customer =
+                        updatedCustomer != null && updatedCustomer.id != null
+                            ? {
+                                id: updatedCustomer.id,
+                                name: updatedCustomer.name,
+                                logo: updatedCustomer.logo,
+                            }
+                            : undefined;
+                }
+                draft.transactionCategorizationView[selectedTab].transactionReviewLocalDataById[transactionId] = {
+                    transactionReviewLocalData: newTransactionLocalData,
+                    transactionId,
+                };
+                const selectedCheckBoxTransactionIds = draft.transactionCategorizationView[selectedTab]
+                    .selectedCheckBoxTransactionIds;
+                if (newTransactionLocalData.customer != null &&
+                    newTransactionLocalData.customer.id != null &&
+                    (0, transactionCategorizationLocalDataHelper_1.checkIfAllLineItemsAreCategoryClassFilled)(selectedTransaction, newTransactionLocalData, uncategorizedAccounts) === true && // check if all line items are filled
+                    selectedCheckBoxTransactionIds.length < transactionCategorizationLocalDataHelper_1.MAX_SELECTION_LIMIT &&
+                    selectedCheckBoxTransactionIds.includes(transactionId) === false) {
+                    draft.transactionCategorizationView[selectedTab].selectedCheckBoxTransactionIds = [
+                        ...selectedCheckBoxTransactionIds,
+                        transactionId,
+                    ];
+                }
+            }
+        },
         updateSelectedVendorForTransaction(draft, action) {
             const { transactionId, lineId, updatedVendor, selectedTransaction, selectedTab, uncategorizedAccounts, } = action.payload;
             const transactionLocalData = (0, get_1.default)(draft.transactionCategorizationView[selectedTab]
@@ -375,9 +427,15 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                 let newTransactionLocalData = Object.assign({}, transactionLocalData.transactionReviewLocalData);
                 if (!(0, vendorTransaction_1.isVendorTransaction)(selectedTransaction) &&
                     updatedVendor != null) {
-                    newTransactionLocalData = Object.assign(Object.assign({}, newTransactionLocalData), { lineItemById: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById), { [lineId]: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById[lineId]), { vendor: updatedVendor }) }) });
+                    newTransactionLocalData = Object.assign(Object.assign({}, newTransactionLocalData), { lineItemById: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById), { [lineId]: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById[lineId]), { vendor: updatedVendor, selectedEntityLine: action.payload.selectedEntity != null
+                                    ? action.payload.selectedEntity
+                                    : undefined }) }) });
                 }
                 else {
+                    if (action.payload.selectedEntity != null) {
+                        newTransactionLocalData.selectedEntity =
+                            action.payload.selectedEntity;
+                    }
                     newTransactionLocalData.vendorUpdates =
                         updatedVendor != null && updatedVendor.id != null
                             ? {
@@ -503,5 +561,5 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdate = _a.updateStatusForTransactionNotMiscategorizedUpdate, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId;
+_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdate = _a.updateStatusForTransactionNotMiscategorizedUpdate, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId;
 exports.default = expenseAutomationTransactionsView.reducer;

package/lib/view/expenseAutomationView/types/transactionsViewState.d.ts

@@ -55,6 +55,7 @@ export interface TransactionCategorizationLineItemData extends TransactionLineBa
     lineEntity?: Entity;
     isCategoryMiscategorized: boolean;
     isClassMiscategorized: boolean;
+    selectedEntityLine?: Entity;
 }
 export interface TransactionReviewLocalData {
     lineItemById: Record<ID, TransactionCategorizationLineItemData>;
@@ -77,6 +78,7 @@ export interface TransactionReviewLocalData {
     transactionTypeName?: string;
     vendorUpdates?: TransactionVendorUpdates;
     customerUpdates?: TransactionVendorUpdates;
+    selectedEntity?: Entity;
 }
 export interface SupportedTransactionCategorization {
     transactionReviewLocalData: TransactionReviewLocalData;

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

@@ -25,7 +25,7 @@ const recommendationState_1 = require("../../recommendation/recommendationState"
  * additionally fire “Mark as not miscat” for every point above.
  */
 const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLocalData, transaction, isExpenseAutomationEnabled) => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const updates = {
         updatesByLineId: {},
     };
@@ -33,20 +33,27 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
     const entityUpdates = {};
     const isTransactionMisCategorized = (0, exports.isTransactionMiscategorized)(transaction, isExpenseAutomationEnabled);
     updates.memo = transactionDetailLocalData.memo;
+    const selectedEntity = transactionDetailLocalData.selectedEntity;
     const updatedEntityId = transactionDetailLocalData.updatePreviousTransactionsWithUpdatedVendor ===
         true
         ? (_a = transactionDetailLocalData.vendorUpdates) === null || _a === void 0 ? void 0 : _a.qboId
         : undefined;
-    if ((0, vendorTransaction_1.isVendorTransaction)(transaction)) {
-        updates.vendorId = (_b = transactionDetailLocalData.vendorUpdates) === null || _b === void 0 ? void 0 : _b.id;
-        updates.customerId = (_c = transactionDetailLocalData.customerUpdates) === null || _c === void 0 ? void 0 : _c.id;
+    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) &&
+        selectedEntity != null &&
+        selectedEntity.type === 'vendor') {
+        updates.vendorId = selectedEntity.id;
+    }
+    if ((0, vendorTransaction_1.isVendorTransaction)(transaction) &&
+        selectedEntity != null &&
+        selectedEntity.type === 'customer') {
+        updates.customerId = selectedEntity.id;
     }
     let isBulkUpdate = false;
-    const entity = getEntityFromTransaction(transaction);
+    const entity = getEntityFromTransaction(transaction, selectedEntity);
     let lastUpdatedCategory;
     let lastUpdatedClass;
     // single recommendation to just pick the last recommendation in the list of lines
-    (_d = transaction.lines) === null || _d === void 0 ? void 0 : _d.forEach((line) => {
+    (_b = transaction.lines) === null || _b === void 0 ? void 0 : _b.forEach((line) => {
         var _a, _b, _c, _d, _e, _f;
         const entityDetails = getEntityDetails(entity, transactionDetailLocalData.lineItemById[line.id], transactionDetailLocalData.vendorUpdates, transactionDetailLocalData.customerUpdates);
         if (line.type === 'transaction_with_account_and_class_line' ||
@@ -202,17 +209,31 @@ const getVendorOrCustomerDetails = (lineItem) => {
     }
     return {};
 };
-const getEntityFromTransaction = (transaction) => {
+const getEntityFromTransaction = (transaction, currentSelectedEntity) => {
     let entity = undefined;
     if ((0, vendorTransaction_1.isVendorTransaction)(transaction)) {
-        const vendorEntity = transaction.vendor;
-        if (vendorEntity != null) {
-            entity = {
-                id: vendorEntity.id,
-                name: vendorEntity.name,
+        const vendor = transaction.vendor;
+        const customer = transaction.customer;
+        if (customer != null &&
+            currentSelectedEntity != null &&
+            currentSelectedEntity.type === 'customer') {
+            return {
+                id: customer.id,
+                name: customer.name,
+                type: (0, entity_1.toEntityType)('customer'),
+                qboId: customer.id,
+                zeniId: customer.id,
+            };
+        }
+        if (vendor != null &&
+            currentSelectedEntity != null &&
+            currentSelectedEntity.type === 'vendor') {
+            return {
+                id: vendor.id,
+                name: vendor.name,
                 type: (0, entity_1.toEntityType)('vendor'),
-                qboId: vendorEntity.id,
-                zeniId: vendorEntity.id,
+                qboId: vendor.id,
+                zeniId: vendor.id,
             };
         }
     }

package/lib/view/transactionDetail/epics/updateTransactionDetailEpic.js

@@ -127,8 +127,11 @@ function preparePayload(transactionState, vendorState, transactionDetailState, t
     const tranDetail = (0, get_1.default)(transactionDetailState.transactionDetailById, transactionDetailKey, undefined);
     const tranVendorUpdates = tranDetail === null || tranDetail === void 0 ? void 0 : tranDetail.transactionDetailLocalData.vendorUpdates;
     const tranCustomerUpdates = tranDetail === null || tranDetail === void 0 ? void 0 : tranDetail.transactionDetailLocalData.customerUpdates;
+    const currentSelectedEntity = tranDetail === null || tranDetail === void 0 ? void 0 : tranDetail.transactionDetailLocalData.selectedEntity;
     let vendorUpdates = undefined;
-    if ((tranVendorUpdates === null || tranVendorUpdates === void 0 ? void 0 : tranVendorUpdates.qboId) != null) {
+    if ((tranVendorUpdates === null || tranVendorUpdates === void 0 ? void 0 : tranVendorUpdates.qboId) != null &&
+        currentSelectedEntity != null &&
+        currentSelectedEntity.type === 'vendor') {
         const vendor = (0, vendorSelector_1.getVendorByVendorId)(vendorState, tranVendorUpdates.qboId);
         if (vendor != null) {
             vendorUpdates = {
@@ -144,7 +147,9 @@ function preparePayload(transactionState, vendorState, transactionDetailState, t
         }
     }
     let customerUpdates = undefined;
-    if ((tranCustomerUpdates === null || tranCustomerUpdates === void 0 ? void 0 : tranCustomerUpdates.qboId) != null) {
+    if ((tranCustomerUpdates === null || tranCustomerUpdates === void 0 ? void 0 : tranCustomerUpdates.qboId) != null &&
+        currentSelectedEntity != null &&
+        currentSelectedEntity.type === 'customer') {
         customerUpdates = {
             id: tranCustomerUpdates.qboId,
             name: tranCustomerUpdates.name,