@zeniai/client-epic-state 4.19.77-betaAK7 → 4.19.77-betaAS1

package/lib/entity/company/companyPayload.d.ts

@@ -48,6 +48,7 @@ export interface CompanyIncInfoPayload {
     company_inc_state_code: string | null;
     company_inc_type: string | null;
     company_industry_sub_type?: string | null;
+    company_industry_type?: string | null;
     file_ids?: ID[] | null;
 }
 export interface CompanyTaxInfoPayload {

package/lib/entity/company/companyPayload.js

@@ -76,6 +76,7 @@ const toCompanyIncInfo = (payload) => ({
     companyIncCountryCode: payload.company_inc_country_code ?? undefined,
     fileIds: payload.file_ids ?? [],
     companySubIndustry: payload.company_industry_sub_type ?? undefined,
+    companyIndustryType: payload.company_industry_type ?? undefined,
 });
 const toCompanyTaxInfo = (payload) => ({
     taxesFiledDate: payload.taxes_filed_date != null

package/lib/entity/company/companyStateTypes.d.ts

@@ -61,6 +61,7 @@ export interface CompanyIncInfo {
     companyIncState?: string;
     companyIncStateCode?: string;
     companyIncType?: string;
+    companyIndustryType?: string;
     companySubIndustry?: string;
 }
 export interface CompanyTaxInfo {

package/lib/esm/entity/company/companyPayload.js

@@ -73,6 +73,7 @@ const toCompanyIncInfo = (payload) => ({
     companyIncCountryCode: payload.company_inc_country_code ?? undefined,
     fileIds: payload.file_ids ?? [],
     companySubIndustry: payload.company_industry_sub_type ?? undefined,
+    companyIndustryType: payload.company_industry_type ?? undefined,
 });
 const toCompanyTaxInfo = (payload) => ({
     taxesFiledDate: payload.taxes_filed_date != null

package/lib/esm/view/companyView/epic/companyPassport/updateCompanyDetailsEpic.js

@@ -12,6 +12,9 @@ export const updateCompanyDetailsEpic = (actions$, state$, zeniAPI) => actions$.
         ...toCompanyIncInfoUpdatableInfoPayload(companyDetails.incInfo),
         ...toCompanyTaxInfoUpdatableInfoPayload(companyDetails.taxDetails),
         ...toCompanyFileInfoPayload(companyDetails.incInfo, companyDetails.taxDetails),
+        ...(companyDetails.companyInfo.companyIndustryType != null && {
+            company_industry_type: companyDetails.companyInfo.companyIndustryType,
+        }),
         ...(companyDetails.companyInfo.companySubIndustry != null && {
             company_industry_sub_type: companyDetails.companyInfo.companySubIndustry,
         }),

package/lib/esm/view/companyView/types/companyPassport/companyPassportLocalData.js

@@ -10,6 +10,7 @@ export function toCompanyPassportLocalData(companyView, companyFiles) {
             website: companyInfo.companyUrl,
             meetingLink: companyInfo.meetingUrl,
             industry: companyQuestionaire.companyIndustry,
+            companyIndustryType: incInfo.companyIndustryType,
             companySubIndustry: incInfo.companySubIndustry,
             businessModel: companyQuestionaire.companyBusinessModel ?? '',
             phone: companyInfo.phone ?? '',

package/lib/esm/view/spendManagement/commonSetup/epic/setup/updateBusinessVerificationDetailsEpic.js

@@ -136,7 +136,7 @@ function toUsNexusTypeKey(value) {
     return US_NEXUS_LABEL_TO_KEY[value] ?? value;
 }
 export const toBusinessVerificationCompanyDataPayload = (companyLocalData, sendForVerification, companyAddressData, registeredAddressData, setupViewType) => {
-    const { companyDescription, companyLegalName, companyIndustry, companySubIndustry, countriesOfOperations, companySourceOfFunds, companySourceOfFundsDescription, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, website, incDate, taxIdOrEIN, phone, syncToken, fileIds, typeOfIncorporation, stateOfIncorporation, sourceOfFunds, } = companyLocalData;
+    const { companyDescription, companyLegalName, companyIndustry, companyIndustryType, companySubIndustry, countriesOfOperations, companySourceOfFunds, companySourceOfFundsDescription, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, website, incDate, taxIdOrEIN, phone, syncToken, fileIds, typeOfIncorporation, stateOfIncorporation, sourceOfFunds, } = companyLocalData;
     const company = {
         is_ready_for_verification: sendForVerification,
         file_ids: fileIds,
@@ -194,6 +194,9 @@ export const toBusinessVerificationCompanyDataPayload = (companyLocalData, sendF
         company['company_industry'] = companyIndustry;
     }
     Object.assign(company, {
+        ...(companyIndustryType != null && {
+            company_industry_type: companyIndustryType,
+        }),
         ...(companySubIndustry != null && {
             company_industry_sub_type: companySubIndustry,
         }),

package/lib/esm/view/spendManagement/commonSetup/epic/setup/updateSetupViewLocalStoreDataEpic.js

@@ -45,13 +45,14 @@ export function toSetupViewLocalData(company, users, userRoles, primaryContact)
     const { companyInfo, incInfo, taxInfo, questionaire, companyBillPayInfo } = company;
     const { companyId, companyDescription, companyLegalName, companyUrl, phone, syncToken, sourceOfFunds, companySourceOfFunds: incCompanySourceOfFunds, companySourceOfFundsDescription, countriesOfOperations, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, } = companyInfo;
     const { usersSelectedForVerification: usersSelected } = companyBillPayInfo;
-    const { fileIds, companyIncDate: incDate, companyIncType, companyIncState, companySubIndustry, } = incInfo;
+    const { fileIds, companyIncDate: incDate, companyIncType, companyIncState, companySubIndustry, companyIndustryType, } = incInfo;
     const { companyIndustry } = questionaire;
     const { taxId } = taxInfo;
     const companyDetails = {
         companyId,
         companyDescription,
         companyIndustry,
+        companyIndustryType,
         companyLegalName,
         companySubIndustry,
         companySourceOfFunds: incCompanySourceOfFunds,

package/lib/esm/view/spendManagement/commonSetup/setupViewSelector.js

@@ -109,7 +109,7 @@ export const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentit
     if (companyDetails.localData != null) {
         const deleteFileStatusById = {};
         const updateFileStatusById = {};
-        const { syncToken, companyDescription, companyLegalName, website, companyIndustry, companySubIndustry, companySourceOfFunds, companySourceOfFundsDescription, countriesOfOperations, phone, taxIdOrEIN, incDate, fileIds, typeOfIncorporation, sourceOfFunds, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, stateOfIncorporation, usNexus, usNexusTypes, } = companyDetails.localData;
+        const { syncToken, companyDescription, companyLegalName, website, companyIndustry, companyIndustryType, companySubIndustry, companySourceOfFunds, companySourceOfFundsDescription, countriesOfOperations, phone, taxIdOrEIN, incDate, fileIds, typeOfIncorporation, sourceOfFunds, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, stateOfIncorporation, usNexus, usNexusTypes, } = companyDetails.localData;
         fileIds.forEach((fileId) => {
             deleteFileStatusById[fileId] = getFileDeleteStatusById(state, fileId);
         });
@@ -123,6 +123,7 @@ export const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentit
             companyDescription,
             companyLegalName,
             companyIndustry,
+            companyIndustryType,
             companySubIndustry,
             companySourceOfFunds,
             companySourceOfFundsDescription,

package/lib/esm/view/transactionDetail/epics/initializeTransactionDetailLocalDataEpic.js

@@ -4,11 +4,13 @@ import { getSupportedTransactionById } from '../../../entity/transaction/transac
 import { getUncategorizedAccounts } from '../../accountList/accountListSelector';
 import { toTransactionDetailLocalData } from '../transactionDetailLocalDataHelper';
 import { clearTransactionDetailLocalData, initializeTransactionDetailLocalData, saveTransactionDetailLocalData, } from '../transactionDetailReducer';
+import { getTransactionDetailKey } from '../transactionDetailState';
 export const initializeTransactionDetailLocalDataEpic = (actions$, state$) => actions$.pipe(filter(initializeTransactionDetailLocalData.match), mergeMap((action) => {
     const { transactionId, vendorId } = action.payload;
     const fetchActions = [];
     const transactionState = state$.value.transactionState;
-    const detail = getSupportedTransactionById(transactionState, transactionId.id); // entity store uses full zeni ID as canonical key
+    const key = getTransactionDetailKey(transactionId);
+    const detail = getSupportedTransactionById(transactionState, key);
     if (detail != null) {
         const uncategorizedIncomeExpense = getUncategorizedAccounts(state$.value.accountState, state$.value.accountListState, 'accountList');
         const localData = toTransactionDetailLocalData(detail, vendorId, uncategorizedIncomeExpense);

package/lib/esm/view/transactionDetail/epics/saveTransactionDetailEpic.js

@@ -11,10 +11,8 @@ export const saveTransactionDetailEpic = (actions$, state$) => actions$.pipe(fil
     const transactionDetailState = state$.value.transactionDetailState;
     const transactionState = state$.value.transactionState;
     const key = getTransactionDetailKey(transactionId);
-    const detail = recordGet(transactionDetailState.transactionDetailById, key, // detail key is correct for transactionDetailState
-    undefined);
-    const transaction = getSupportedTransactionById(transactionState, transactionId.id // entity store uses full zeni ID as canonical key
-    );
+    const detail = recordGet(transactionDetailState.transactionDetailById, key, undefined);
+    const transaction = getSupportedTransactionById(transactionState, key);
     if (detail != null && transaction != null) {
         const localData = detail.transactionDetailLocalData;
         const transactionSaveUpdates = toTransactionUpdatesFromTransactionDetailLocalData(localData, transaction, isExpenseAutomationEnabled);

package/lib/esm/view/transactionDetail/epics/transactionDetailEpic.js

@@ -21,7 +21,7 @@ export const fetchTransactionDetailEpic = (actions$, state$, zeniAPI) => actions
     const detailKey = getTransactionDetailKey(transactionId);
     const transactionActions = [];
     if (cacheOverride === true) {
-        const transaction = getSupportedTransactionById(state$.value.transactionState, transactionId.id);
+        const transaction = getSupportedTransactionById(state$.value.transactionState, detailKey);
         transactionActions.push(...removeCompleteTransaction(transactionId, transaction));
     }
     const transactionDetail = recordGet(state$.value.transactionDetailState.transactionDetailById, detailKey, undefined);
@@ -40,27 +40,6 @@ export const fetchTransactionDetailEpic = (actions$, state$, zeniAPI) => actions
             transactionActions.push(fetchClassList());
         }
         transactionActions.push(updateTransactionDetailFetchState(transactionId, 'In-Progress'));
-        // If the transaction already exists in the entity store (e.g. fetched by the
-        // list page), initialize local data immediately so the UI can render whatever
-        // data is available while the full detail fetch completes in parallel.
-        //
-        // The entity store canonical key is the full zeni ID (transactionId.id),
-        // which is the same key used by all list-fetch epics.
-        //
-        // DEPENDENCY: The web-components TransactionDetailPage sets effectiveIsDisabled
-        // to "disabled" while fetchState !== "Completed". This prevents any user edits
-        // between this early init and the second init dispatched on API response (below).
-        // If that guard is ever removed, user edits made against partial list data will
-        // be silently overwritten when the full detail response arrives.
-        if (cacheOverride !== true) {
-            const existingTransaction = getSupportedTransactionById(state$.value.transactionState, transactionId.id);
-            if (existingTransaction != null) {
-                transactionActions.push(initializeTransactionDetailLocalData({
-                    transactionId,
-                    vendorId: existingTransaction.vendorId,
-                }));
-            }
-        }
         const query = { transaction_type: transactionId.type };
         const getTransactionDetail$ = zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/transactions/${transactionId.id}?query=${encodeURIComponent(JSON.stringify(query))}`)
@@ -68,7 +47,7 @@ export const fetchTransactionDetailEpic = (actions$, state$, zeniAPI) => actions
             if (isSuccessResponse(response) &&
                 response.data?.transaction?.transaction_id != null) {
                 const updateActions = [];
-                const responseTransactionId = toTransactionID(response.data.transaction);
+                const transcationId = toTransactionID(response.data.transaction);
                 const responseData = {
                     ...response.data,
                     vendors: response.data.vendors?.map((vendor) => ({
@@ -79,15 +58,13 @@ export const fetchTransactionDetailEpic = (actions$, state$, zeniAPI) => actions
                 if (responseData.vendors.length > 0) {
                     updateActions.push(updateVendors(responseData.vendors, 'merge'));
                 }
-                // Use the full zeni ID as the entity store key so it matches
-                // how all list-fetch epics save transactions, avoiding
-                // duplicate entries under different key formats.
-                updateActions.push(updateTransaction(responseTransactionId.id, responseData.transaction));
+                const transactionDetailKeyForResponse = getTransactionDetailKey(transcationId);
+                updateActions.push(updateTransaction(transactionDetailKeyForResponse, responseData.transaction));
                 updateActions.push(initializeTransactionDetailLocalData({
-                    transactionId: responseTransactionId,
+                    transactionId: transcationId,
                     vendorId: responseData.vendors[0]?.vendor_id,
                 }));
-                updateActions.push(updateTransactionDetailFetchState(responseTransactionId, 'Completed'));
+                updateActions.push(updateTransactionDetailFetchState(transcationId, 'Completed'));
                 // IMPORTANT: Fetch linked transactions..
                 updateActions.push(...getAllFetchLinkedTransactionDetailActions(responseData.transaction, state$.value));
                 if (responseData.vendors.length > 0) {
@@ -122,15 +99,12 @@ function removeCompleteTransaction(transactionId, transaction) {
     const actions = [];
     actions.push(removeTransactionDetail(transactionId));
     if (transaction != null) {
-        // Use transactionId.id (full zeni ID) — the canonical entity store key.
-        // getTransactionDetailKey produces a different composite key used only by
-        // transactionDetailState, not the entity store.
-        actions.push(removeTransaction(transactionId.id));
+        actions.push(removeTransaction(getTransactionDetailKey(transactionId)));
         // remove all the linked transactions too..
         const linkedTransactions = getAllLinkedTransactions(transaction);
         linkedTransactions.forEach((linkedTransaction) => {
             actions.push(removeTransactionDetail(linkedTransaction));
-            actions.push(removeTransaction(linkedTransaction.id));
+            actions.push(removeTransaction(getTransactionDetailKey(linkedTransaction)));
         });
     }
     return actions;

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

@@ -14,7 +14,7 @@ import { toJEAndDepositTransactionTypeStrict, toVendorTransactionTypeStrict, } f
 import { isVendorTransaction, } from '../../../entity/transaction/stateTypes/vendorTransaction';
 import toSupportedTransaction from '../../../entity/transaction/toSupportedTransaction';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
-import { updateTransaction } from '../../../entity/transaction/transactionReducer';
+import { updateTransaction, updateTransactions, } from '../../../entity/transaction/transactionReducer';
 import { getSupportedTransactionById } from '../../../entity/transaction/transactionSelector';
 import { updateVendors } from '../../../entity/vendor/vendorReducer';
 import { getVendorByVendorId } from '../../../entity/vendor/vendorSelector';
@@ -34,8 +34,7 @@ export const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => action
         if (isSuccessResponse(response) && response.data != null) {
             const transactionIdResp = toTransactionID(response.data.transaction);
             const transactionDetailKeyForResponse = getTransactionDetailKey(transactionIdResp);
-            const tranDetail = recordGet(transactionDetailState.transactionDetailById, transactionDetailKeyForResponse, // detail key is correct for transactionDetailState
-            undefined);
+            const tranDetail = recordGet(transactionDetailState.transactionDetailById, transactionDetailKeyForResponse, undefined);
             const tranVendorUpdates = tranDetail?.transactionDetailLocalData.vendorUpdates;
             let vendorUpdates = undefined;
             if (tranVendorUpdates?.qboId != null) {
@@ -57,7 +56,7 @@ export const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => action
             if (response.data.vendors != null) {
                 actions.push(updateVendors(response.data.vendors, 'merge'));
             }
-            actions.push(updateTransaction(transactionIdResp.id, response.data.transaction));
+            actions.push(updateTransaction(transactionDetailKeyForResponse, response.data.transaction));
             actions.push(initializeTransactionDetailLocalData({
                 transactionId: transactionIdResp,
                 vendorId: response.data.vendors?.[0]?.vendor_id,
@@ -106,12 +105,9 @@ export const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => action
                     }));
                 }
             }
-            // No separate updateTransactions call needed: updateTransaction above
-            // writes under transactionIdResp.id (the full zeni ID). This is the same
-            // key all list-fetch epics use, so list selectors will read fresh data.
-            // ASSUMPTION: toTransactionID(response).id === the transaction_id value
-            // that list-fetch epics pass to updateTransactions. If these ever diverge,
-            // list rows will go stale after a detail save.
+            // Sync transaction categorization list state from detail save
+            // Updates list-keyed canonical entity so the list selector reads fresh data
+            actions.push(updateTransactions([response.data.transaction], (value) => value.transaction_id, 'merge'));
             const transactionWithCOT = getTransactionWithCOT(transaction);
             const pendingReviewLineIds = getPendingReviewLineIdsFromTransaction(transactionWithCOT);
             actions.push(syncTransactionCategorizationFromDetailSave(transactionIdResp, transactionWithCOT, pendingReviewLineIds, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled));
@@ -129,8 +125,7 @@ export const updateTransactionDetailEpic = (actions$, state$, zeniAPI) => action
 }));
 function preparePayload(transactionState, vendorState, transactionDetailState, transactionId, saveUpdates, cotTransactionTracking) {
     const transactionDetailKey = getTransactionDetailKey(transactionId);
-    const detail = getSupportedTransactionById(transactionState, transactionId.id // entity store uses full zeni ID as canonical key
-    );
+    const detail = getSupportedTransactionById(transactionState, transactionDetailKey);
     const tranDetail = recordGet(transactionDetailState.transactionDetailById, transactionDetailKey, undefined);
     const tranVendorUpdates = tranDetail?.transactionDetailLocalData.vendorUpdates;
     const tranCustomerUpdates = tranDetail?.transactionDetailLocalData.customerUpdates;

package/lib/esm/view/transactionDetail/epics/uploadMissingAttachmentSuccessEpic.js

@@ -4,12 +4,13 @@ import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { toTransactionID } from '../../../entity/transaction/payloadTypes/transactionIDPayload';
 import { updateTransaction } from '../../../entity/transaction/transactionReducer';
 import { uploadMissingAttachmentSuccess } from '../transactionDetailReducer';
+import { getTransactionDetailKey } from '../transactionDetailState';
 export const uploadMissingAttachmentSuccessEpic = (actions$) => actions$.pipe(filter(uploadMissingAttachmentSuccess.match), switchMap((action) => {
     const transactionId = toTransactionID(action.payload.payload);
+    const transactionDetailKeyForResponse = getTransactionDetailKey(transactionId);
     return of(openSnackbar({
         messageSection: 'receipts_upload',
         messageText: 'success',
         type: 'success',
-    }), updateTransaction(transactionId.id, // entity store uses full zeni ID as canonical key
-    action.payload.payload));
+    }), updateTransaction(transactionDetailKeyForResponse, action.payload.payload));
 }));

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

@@ -16,8 +16,7 @@ export const getTransactionDetail = (state, transactionId, fetchLinkedTransactio
         fetchState: transactionDetail?.fetchState ?? 'Not-Started',
         error: transactionDetail?.error,
     };
-    const transaction = getSupportedTransactionById(transactionState, transactionId.id // entity store uses full zeni ID as canonical key
-    );
+    const transaction = getSupportedTransactionById(transactionState, detailKey);
     let linkedTransactions = [];
     if (transactionDetail?.fetchState === 'Completed' && transaction != null) {
         // IMPORTANT: filtering out unsupported linked transactions
@@ -37,9 +36,8 @@ export const getTransactionDetail = (state, transactionId, fetchLinkedTransactio
             linkedTransactionsFetchState.fetchState === 'Completed') {
             linkedTransactions = linkedTransactionDetails
                 .map((linkedTranDetail) => {
-                const linkedTranId = linkedTranDetail.transactionId; // eslint-disable-line @typescript-eslint/no-non-null-assertion
-                return getSupportedTransactionById(transactionState, linkedTranId.id // entity store uses full zeni ID as canonical key
-                );
+                const key = getTransactionDetailKey(linkedTranDetail.transactionId); // eslint-disable-line @typescript-eslint/no-non-null-assertion
+                return getSupportedTransactionById(transactionState, key);
             })
                 .filter((value) => {
                 if (value == null) {

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

@@ -1,18 +1,6 @@
-// TWO-KEY SYSTEM — read before touching transaction lookups:
-//
-// 1. transactionDetailState.transactionDetailById  →  keyed by getTransactionDetailKey()
-//    Format: "<qbo_id>_<type>"  (strips the "tran_<uuid>:" prefix)
-//    Used by: all transactionDetail epics/selectors for detail metadata (fetch state, local data, etc.)
-//
-// 2. transactionState.transactionById  →  keyed by transactionId.id  (full zeni ID, e.g. "tran_<uuid>:<qbo_id>")
-//    Used by: all list-fetch epics, getSupportedTransactionById, and all entity store reads/writes
-//
-// IMPORTANT: Never use getTransactionDetailKey() to look up or remove from transactionState.
-// Always use transactionId.id for the entity store.
-// Produces the transactionDetailState key: "<qbo_id>_<type>"
+// This transaction key only extracts the third party ID and uses that
+// for the ID
 export const getTransactionDetailKey = (transactionId) => `${getActualTransactionID(transactionId.id)}_${transactionId.type}`;
-// Produces the full-zeni-ID-based key: "<tran_uuid:qbo_id>_<type>"
-// Note: this key format is not used by the entity store (which uses transactionId.id directly).
 export const getZeniTransactionDetailKey = (transactionId) => `${transactionId.id}_${transactionId.type}`;
 export const getThirdPartyIdFromTransactionId = (transactionId) => {
     const zeniGeneratedId = transactionId.id;

package/lib/view/companyView/epic/companyPassport/updateCompanyDetailsEpic.js

@@ -15,6 +15,9 @@ const updateCompanyDetailsEpic = (actions$, state$, zeniAPI) => actions$.pipe((0
         ...(0, companyPassportViewPayload_1.toCompanyIncInfoUpdatableInfoPayload)(companyDetails.incInfo),
         ...(0, companyPassportViewPayload_1.toCompanyTaxInfoUpdatableInfoPayload)(companyDetails.taxDetails),
         ...(0, companyPassportViewPayload_1.toCompanyFileInfoPayload)(companyDetails.incInfo, companyDetails.taxDetails),
+        ...(companyDetails.companyInfo.companyIndustryType != null && {
+            company_industry_type: companyDetails.companyInfo.companyIndustryType,
+        }),
         ...(companyDetails.companyInfo.companySubIndustry != null && {
             company_industry_sub_type: companyDetails.companyInfo.companySubIndustry,
         }),

package/lib/view/companyView/types/companyPassport/companyDetailsLocalData.d.ts

@@ -8,6 +8,7 @@ export interface CompanyInfoLocalData {
     firstMonthOfFY: Month;
     legalName: string;
     phone: string;
+    companyIndustryType?: string;
     companySourceOfFunds?: string;
     companySourceOfFundsDescription?: string;
     companySubIndustry?: string;

package/lib/view/companyView/types/companyPassport/companyPassportLocalData.js

@@ -13,6 +13,7 @@ function toCompanyPassportLocalData(companyView, companyFiles) {
             website: companyInfo.companyUrl,
             meetingLink: companyInfo.meetingUrl,
             industry: companyQuestionaire.companyIndustry,
+            companyIndustryType: incInfo.companyIndustryType,
             companySubIndustry: incInfo.companySubIndustry,
             businessModel: companyQuestionaire.companyBusinessModel ?? '',
             phone: companyInfo.phone ?? '',

package/lib/view/spendManagement/commonSetup/epic/setup/updateBusinessVerificationDetailsEpic.js

@@ -143,7 +143,7 @@ function toUsNexusTypeKey(value) {
     return US_NEXUS_LABEL_TO_KEY[value] ?? value;
 }
 const toBusinessVerificationCompanyDataPayload = (companyLocalData, sendForVerification, companyAddressData, registeredAddressData, setupViewType) => {
-    const { companyDescription, companyLegalName, companyIndustry, companySubIndustry, countriesOfOperations, companySourceOfFunds, companySourceOfFundsDescription, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, website, incDate, taxIdOrEIN, phone, syncToken, fileIds, typeOfIncorporation, stateOfIncorporation, sourceOfFunds, } = companyLocalData;
+    const { companyDescription, companyLegalName, companyIndustry, companyIndustryType, companySubIndustry, countriesOfOperations, companySourceOfFunds, companySourceOfFundsDescription, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, website, incDate, taxIdOrEIN, phone, syncToken, fileIds, typeOfIncorporation, stateOfIncorporation, sourceOfFunds, } = companyLocalData;
     const company = {
         is_ready_for_verification: sendForVerification,
         file_ids: fileIds,
@@ -201,6 +201,9 @@ const toBusinessVerificationCompanyDataPayload = (companyLocalData, sendForVerif
         company['company_industry'] = companyIndustry;
     }
     Object.assign(company, {
+        ...(companyIndustryType != null && {
+            company_industry_type: companyIndustryType,
+        }),
         ...(companySubIndustry != null && {
             company_industry_sub_type: companySubIndustry,
         }),

package/lib/view/spendManagement/commonSetup/epic/setup/updateSetupViewLocalStoreDataEpic.js

@@ -53,13 +53,14 @@ function toSetupViewLocalData(company, users, userRoles, primaryContact) {
     const { companyInfo, incInfo, taxInfo, questionaire, companyBillPayInfo } = company;
     const { companyId, companyDescription, companyLegalName, companyUrl, phone, syncToken, sourceOfFunds, companySourceOfFunds: incCompanySourceOfFunds, companySourceOfFundsDescription, countriesOfOperations, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, usNexus, usNexusTypes, } = companyInfo;
     const { usersSelectedForVerification: usersSelected } = companyBillPayInfo;
-    const { fileIds, companyIncDate: incDate, companyIncType, companyIncState, companySubIndustry, } = incInfo;
+    const { fileIds, companyIncDate: incDate, companyIncType, companyIncState, companySubIndustry, companyIndustryType, } = incInfo;
     const { companyIndustry } = questionaire;
     const { taxId } = taxInfo;
     const companyDetails = {
         companyId,
         companyDescription,
         companyIndustry,
+        companyIndustryType,
         companyLegalName,
         companySubIndustry,
         companySourceOfFunds: incCompanySourceOfFunds,

package/lib/view/spendManagement/commonSetup/setupViewSelector.d.ts

@@ -69,6 +69,7 @@ export interface CompanyDetails {
     addressStatus?: NewAddressData;
     companyDescription?: string;
     companyIndustry?: string;
+    companyIndustryType?: string;
     companyLegalName?: string;
     companySourceOfFunds?: string;
     companySourceOfFundsDescription?: string;

package/lib/view/spendManagement/commonSetup/setupViewSelector.js

@@ -114,7 +114,7 @@ const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentityDetail
     if (companyDetails.localData != null) {
         const deleteFileStatusById = {};
         const updateFileStatusById = {};
-        const { syncToken, companyDescription, companyLegalName, website, companyIndustry, companySubIndustry, companySourceOfFunds, companySourceOfFundsDescription, countriesOfOperations, phone, taxIdOrEIN, incDate, fileIds, typeOfIncorporation, sourceOfFunds, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, stateOfIncorporation, usNexus, usNexusTypes, } = companyDetails.localData;
+        const { syncToken, companyDescription, companyLegalName, website, companyIndustry, companyIndustryType, companySubIndustry, companySourceOfFunds, companySourceOfFundsDescription, countriesOfOperations, phone, taxIdOrEIN, incDate, fileIds, typeOfIncorporation, sourceOfFunds, transactionVolume, transactionVolumeDescription, purposeOfAccount, purposeOfAccountDescription, regulatedStatus, regulatedStatusDescription, stateOfIncorporation, usNexus, usNexusTypes, } = companyDetails.localData;
         fileIds.forEach((fileId) => {
             deleteFileStatusById[fileId] = (0, fileViewSelector_1.getFileDeleteStatusById)(state, fileId);
         });
@@ -128,6 +128,7 @@ const getCompanyAndIdentityDetails = (state, companyId, companyAndIdentityDetail
             companyDescription,
             companyLegalName,
             companyIndustry,
+            companyIndustryType,
             companySubIndustry,
             companySourceOfFunds,
             companySourceOfFundsDescription,

package/lib/view/spendManagement/commonSetup/setupViewState.d.ts

@@ -16,6 +16,7 @@ export interface CompanyDetailsLocalData {
     fileIds: ID[];
     companyDescription?: string;
     companyIndustry?: string;
+    companyIndustryType?: string;
     companyLegalName?: string;
     companySourceOfFunds?: string;
     companySourceOfFundsDescription?: string;

package/lib/view/spendManagement/commonSetup/types/businessVerification.d.ts

@@ -66,6 +66,7 @@ export interface CompanyDetailsVerificationPayload {
     company_countries_of_operations?: string[];
     company_inc_state?: string | null;
     company_industry_sub_type?: string;
+    company_industry_type?: string;
     company_purpose_of_account?: string;
     company_purpose_of_account_desc?: string;
     company_regulated_states?: boolean;

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

@@ -7,11 +7,13 @@ const transactionSelector_1 = require("../../../entity/transaction/transactionSe
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const transactionDetailLocalDataHelper_1 = require("../transactionDetailLocalDataHelper");
 const transactionDetailReducer_1 = require("../transactionDetailReducer");
+const transactionDetailState_1 = require("../transactionDetailState");
 const initializeTransactionDetailLocalDataEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionDetailReducer_1.initializeTransactionDetailLocalData.match), (0, operators_1.mergeMap)((action) => {
     const { transactionId, vendorId } = action.payload;
     const fetchActions = [];
     const transactionState = state$.value.transactionState;
-    const detail = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, transactionId.id); // entity store uses full zeni ID as canonical key
+    const key = (0, transactionDetailState_1.getTransactionDetailKey)(transactionId);
+    const detail = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, key);
     if (detail != null) {
         const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(state$.value.accountState, state$.value.accountListState, 'accountList');
         const localData = (0, transactionDetailLocalDataHelper_1.toTransactionDetailLocalData)(detail, vendorId, uncategorizedIncomeExpense);

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

@@ -17,10 +17,8 @@ const saveTransactionDetailEpic = (actions$, state$) => actions$.pipe((0, operat
     const transactionDetailState = state$.value.transactionDetailState;
     const transactionState = state$.value.transactionState;
     const key = (0, transactionDetailState_1.getTransactionDetailKey)(transactionId);
-    const detail = (0, get_1.default)(transactionDetailState.transactionDetailById, key, // detail key is correct for transactionDetailState
-    undefined);
-    const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, transactionId.id // entity store uses full zeni ID as canonical key
-    );
+    const detail = (0, get_1.default)(transactionDetailState.transactionDetailById, key, undefined);
+    const transaction = (0, transactionSelector_1.getSupportedTransactionById)(transactionState, key);
     if (detail != null && transaction != null) {
         const localData = detail.transactionDetailLocalData;
         const transactionSaveUpdates = (0, saveTransactionHelper_1.toTransactionUpdatesFromTransactionDetailLocalData)(localData, transaction, isExpenseAutomationEnabled);

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

@@ -27,7 +27,7 @@ const fetchTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
     const detailKey = (0, transactionDetailState_1.getTransactionDetailKey)(transactionId);
     const transactionActions = [];
     if (cacheOverride === true) {
-        const transaction = (0, transactionSelector_1.getSupportedTransactionById)(state$.value.transactionState, transactionId.id);
+        const transaction = (0, transactionSelector_1.getSupportedTransactionById)(state$.value.transactionState, detailKey);
         transactionActions.push(...removeCompleteTransaction(transactionId, transaction));
     }
     const transactionDetail = (0, get_1.default)(state$.value.transactionDetailState.transactionDetailById, detailKey, undefined);
@@ -46,27 +46,6 @@ const fetchTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
             transactionActions.push((0, classListReducer_1.fetchClassList)());
         }
         transactionActions.push((0, transactionDetailReducer_1.updateTransactionDetailFetchState)(transactionId, 'In-Progress'));
-        // If the transaction already exists in the entity store (e.g. fetched by the
-        // list page), initialize local data immediately so the UI can render whatever
-        // data is available while the full detail fetch completes in parallel.
-        //
-        // The entity store canonical key is the full zeni ID (transactionId.id),
-        // which is the same key used by all list-fetch epics.
-        //
-        // DEPENDENCY: The web-components TransactionDetailPage sets effectiveIsDisabled
-        // to "disabled" while fetchState !== "Completed". This prevents any user edits
-        // between this early init and the second init dispatched on API response (below).
-        // If that guard is ever removed, user edits made against partial list data will
-        // be silently overwritten when the full detail response arrives.
-        if (cacheOverride !== true) {
-            const existingTransaction = (0, transactionSelector_1.getSupportedTransactionById)(state$.value.transactionState, transactionId.id);
-            if (existingTransaction != null) {
-                transactionActions.push((0, transactionDetailReducer_1.initializeTransactionDetailLocalData)({
-                    transactionId,
-                    vendorId: existingTransaction.vendorId,
-                }));
-            }
-        }
         const query = { transaction_type: transactionId.type };
         const getTransactionDetail$ = zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/transactions/${transactionId.id}?query=${encodeURIComponent(JSON.stringify(query))}`)
@@ -74,7 +53,7 @@ const fetchTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
             if ((0, responsePayload_1.isSuccessResponse)(response) &&
                 response.data?.transaction?.transaction_id != null) {
                 const updateActions = [];
-                const responseTransactionId = (0, transactionIDPayload_1.toTransactionID)(response.data.transaction);
+                const transcationId = (0, transactionIDPayload_1.toTransactionID)(response.data.transaction);
                 const responseData = {
                     ...response.data,
                     vendors: response.data.vendors?.map((vendor) => ({
@@ -85,15 +64,13 @@ const fetchTransactionDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
                 if (responseData.vendors.length > 0) {
                     updateActions.push((0, vendorReducer_1.updateVendors)(responseData.vendors, 'merge'));
                 }
-                // Use the full zeni ID as the entity store key so it matches
-                // how all list-fetch epics save transactions, avoiding
-                // duplicate entries under different key formats.
-                updateActions.push((0, transactionReducer_1.updateTransaction)(responseTransactionId.id, responseData.transaction));
+                const transactionDetailKeyForResponse = (0, transactionDetailState_1.getTransactionDetailKey)(transcationId);
+                updateActions.push((0, transactionReducer_1.updateTransaction)(transactionDetailKeyForResponse, responseData.transaction));
                 updateActions.push((0, transactionDetailReducer_1.initializeTransactionDetailLocalData)({
-                    transactionId: responseTransactionId,
+                    transactionId: transcationId,
                     vendorId: responseData.vendors[0]?.vendor_id,
                 }));
-                updateActions.push((0, transactionDetailReducer_1.updateTransactionDetailFetchState)(responseTransactionId, 'Completed'));
+                updateActions.push((0, transactionDetailReducer_1.updateTransactionDetailFetchState)(transcationId, 'Completed'));
                 // IMPORTANT: Fetch linked transactions..
                 updateActions.push(...getAllFetchLinkedTransactionDetailActions(responseData.transaction, state$.value));
                 if (responseData.vendors.length > 0) {
@@ -129,15 +106,12 @@ function removeCompleteTransaction(transactionId, transaction) {
     const actions = [];
     actions.push((0, transactionDetailReducer_1.removeTransactionDetail)(transactionId));
     if (transaction != null) {
-        // Use transactionId.id (full zeni ID) — the canonical entity store key.
-        // getTransactionDetailKey produces a different composite key used only by
-        // transactionDetailState, not the entity store.
-        actions.push((0, transactionReducer_1.removeTransaction)(transactionId.id));
+        actions.push((0, transactionReducer_1.removeTransaction)((0, transactionDetailState_1.getTransactionDetailKey)(transactionId)));
         // remove all the linked transactions too..
         const linkedTransactions = (0, transactionDetailState_1.getAllLinkedTransactions)(transaction);
         linkedTransactions.forEach((linkedTransaction) => {
             actions.push((0, transactionDetailReducer_1.removeTransactionDetail)(linkedTransaction));
-            actions.push((0, transactionReducer_1.removeTransaction)(linkedTransaction.id));
+            actions.push((0, transactionReducer_1.removeTransaction)((0, transactionDetailState_1.getTransactionDetailKey)(linkedTransaction)));
         });
     }
     return actions;

package/lib/view/transactionDetail/epics/updateTransactionDetailEpic.d.ts

@@ -1,10 +1,10 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
-import { updateTransaction } from '../../../entity/transaction/transactionReducer';
+import { updateTransaction, updateTransactions } from '../../../entity/transaction/transactionReducer';
 import { updateVendors } from '../../../entity/vendor/vendorReducer';
 import { RootState } from '../../../reducer';
 import { ZeniAPI } from '../../../zeniAPI';
 import { syncTransactionCategorizationFromDetailSave } from '../../expenseAutomationView/reducers/transactionsViewReducer';
 import { initializeTransactionDetailLocalData, markTransactionAsNotMiscategorized, updateStatusConsolidatedSaveTransactionDetail, updateTransactionDetail, updateTransactionDetailSaveStatus, updateTransactionStateIfUpdateActionNotAllowed } from '../transactionDetailReducer';
-export type ActionType = ReturnType<typeof updateTransactionDetail> | ReturnType<typeof updateTransaction> | ReturnType<typeof updateTransactionStateIfUpdateActionNotAllowed> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateTransactionDetailSaveStatus> | ReturnType<typeof updateStatusConsolidatedSaveTransactionDetail> | ReturnType<typeof initializeTransactionDetailLocalData> | ReturnType<typeof updateVendors> | ReturnType<typeof markTransactionAsNotMiscategorized> | ReturnType<typeof syncTransactionCategorizationFromDetailSave>;
+export type ActionType = ReturnType<typeof updateTransactionDetail> | ReturnType<typeof updateTransaction> | ReturnType<typeof updateTransactions> | ReturnType<typeof updateTransactionStateIfUpdateActionNotAllowed> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateTransactionDetailSaveStatus> | ReturnType<typeof updateStatusConsolidatedSaveTransactionDetail> | ReturnType<typeof initializeTransactionDetailLocalData> | ReturnType<typeof updateVendors> | ReturnType<typeof markTransactionAsNotMiscategorized> | ReturnType<typeof syncTransactionCategorizationFromDetailSave>;
 export declare const updateTransactionDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;