From f7e07ad694bce9d7ae2fc5d4b0f84d217eeec9ca Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Fri, 28 Jul 2023 14:41:01 +0530
Subject: [PATCH] fix ui breaking on column task thread select and user profile
 display name (#12586)

---
 .../ActivityThreadPanel/ActivityThreadPanelBody.tsx             | 2 +-
 .../UserProfileDetails/UserProfileDetails.component.tsx         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx
index 2acc9f3209e..e9e98185b26 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx
@@ -236,7 +236,7 @@ const ActivityThreadPanelBody: FC<ActivityThreadPanelBodyProp> = ({
         {showHeader && isConversationType && (
           <FeedPanelHeader
             className="tw-px-4 tw-shadow-sm"
-            entityLink={selectedThread?.about ?? ''}
+            entityLink={selectedThread?.about ?? threadLink}
             noun={
               isConversationType
                 ? t('label.conversation-plural')
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx
index c0689d45049..c35d23b7685 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx
@@ -111,7 +111,7 @@ const UserProfileDetails = ({
               className="text-lg font-medium"
               ellipsis={{ tooltip: true }}>
               {hasEditPermission
-                ? userData.displayName ??
+                ? userData.displayName ||
                   t('label.add-entity', { entity: t('label.display-name') })
                 : getEntityName(userData)}
             </Typography.Text>