diff --git a/client/src/components/owner-name-display/owner-name-display.component.jsx b/client/src/components/owner-name-display/owner-name-display.component.jsx index a7e59067d..da7965739 100644 --- a/client/src/components/owner-name-display/owner-name-display.component.jsx +++ b/client/src/components/owner-name-display/owner-name-display.component.jsx @@ -12,24 +12,24 @@ export default connect(mapStateToProps, mapDispatchToProps)(OwnerNameDisplay); export function OwnerNameDisplay({ bodyshop, ownerObject }) { const emptyTest = - ownerObject.ownr_fn + ownerObject.ownr_ln + ownerObject.ownr_co_nm; + ownerObject?.ownr_fn + ownerObject?.ownr_ln + ownerObject?.ownr_co_nm; if (!emptyTest || emptyTest === "null" || emptyTest.trim() === "") return "N/A"; if (bodyshop.last_name_first) - return `${ownerObject.ownr_ln || ""}, ${ownerObject.ownr_fn || ""} ${ - ownerObject.ownr_co_nm || "" + return `${ownerObject?.ownr_ln || ""}, ${ownerObject?.ownr_fn || ""} ${ + ownerObject?.ownr_co_nm || "" }`.trim(); - return `${ownerObject.ownr_fn || ""} ${ownerObject.ownr_ln || ""} ${ + return `${ownerObject?.ownr_fn || ""} ${ownerObject?.ownr_ln || ""} ${ ownerObject.ownr_co_nm || "" }`.trim(); } export function OwnerNameDisplayFunction(ownerObject, forceFirstLast = false) { const emptyTest = - ownerObject.ownr_fn + ownerObject.ownr_ln + ownerObject.ownr_co_nm; + ownerObject?.ownr_fn + ownerObject?.ownr_ln + ownerObject?.ownr_co_nm; if (!emptyTest || emptyTest === "null" || emptyTest.trim() === "") return "N/A"; @@ -37,11 +37,11 @@ export function OwnerNameDisplayFunction(ownerObject, forceFirstLast = false) { const rdxStore = store.getState(); if (rdxStore.user.bodyshop.last_name_first && !forceFirstLast) - return `${ownerObject.ownr_ln || ""}, ${ownerObject.ownr_fn || ""} ${ - ownerObject.ownr_co_nm || "" + return `${ownerObject?.ownr_ln || ""}, ${ownerObject?.ownr_fn || ""} ${ + ownerObject?.ownr_co_nm || "" }`.trim(); - return `${ownerObject.ownr_fn || ""} ${ownerObject.ownr_ln || ""} ${ - ownerObject.ownr_co_nm || "" + return `${ownerObject?.ownr_fn || ""} ${ownerObject?.ownr_ln || ""} ${ + ownerObject?.ownr_co_nm || "" }`.trim(); }