From 84317afa371a97711cf2411487436d7f26b6ba0b Mon Sep 17 00:00:00 2001
From: Shahe Shahinyan <shahe.shahinyan@gmail.com>
Date: Mon, 5 Feb 2024 00:54:12 +0400
Subject: [PATCH] Addressed to reviewer comments

---
 src/components/DisplayNames/index.tsx            | 12 +++++++++++-
 src/pages/settings/Report/ReportSettingsPage.tsx |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/DisplayNames/index.tsx b/src/components/DisplayNames/index.tsx
index 155193368cc5..5b8844eb4e99 100644
--- a/src/components/DisplayNames/index.tsx
+++ b/src/components/DisplayNames/index.tsx
@@ -18,9 +18,19 @@ function DisplayNames({fullTitle, tooltipEnabled, textStyles, numberOfLines, sho
         );
     }
 
+    if (shouldUseFullTitle) {
+        return (
+            <DisplayNamesWithToolTip
+                shouldUseFullTitle
+                fullTitle={title}
+                textStyles={textStyles}
+                numberOfLines={numberOfLines}
+            />
+        );
+    }
+
     return (
         <DisplayNamesWithToolTip
-            shouldUseFullTitle={shouldUseFullTitle}
             fullTitle={title}
             displayNamesWithTooltips={displayNamesWithTooltips}
             textStyles={textStyles}
diff --git a/src/pages/settings/Report/ReportSettingsPage.tsx b/src/pages/settings/Report/ReportSettingsPage.tsx
index 37408ef61df2..c1839b44553d 100644
--- a/src/pages/settings/Report/ReportSettingsPage.tsx
+++ b/src/pages/settings/Report/ReportSettingsPage.tsx
@@ -138,7 +138,7 @@ function ReportSettingsPage({report, policies}: ReportSettingsPageProps) {
                                     {translate('workspace.common.workspace')}
                                 </Text>
                                 <DisplayNames
-                                    fullTitle={linkedWorkspace?.name}
+                                    fullTitle={linkedWorkspace.name}
                                     tooltipEnabled
                                     numberOfLines={1}
                                     textStyles={[styles.optionAlternateText, styles.pre]}
@@ -160,7 +160,7 @@ function ReportSettingsPage({report, policies}: ReportSettingsPageProps) {
                                 >
                                     {translate(`newRoomPage.visibilityOptions.${report.visibility}`)}
                                 </Text>
-                                <Text style={[styles.textLabelSupporting, styles.mt1]}>{report.visibility && translate(`newRoomPage.${report.visibility}Description`)}</Text>
+                                <Text style={[styles.textLabelSupporting, styles.mt1]}>{translate(`newRoomPage.${report.visibility}Description`)}</Text>
                             </View>
                         )}
                     </View>