From 2b9e1c48dbd24e7de807b1e3ee8e1807ff028546 Mon Sep 17 00:00:00 2001
From: Viacheslav Surzhikov <syva80@yandex.ru>
Date: Thu, 6 May 2021 22:21:21 +0300
Subject: [PATCH 1/5] use firstName in HeaderView

---
 src/pages/home/HeaderView.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index db0f0e94a645..171381f0be7d 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -56,9 +56,9 @@ const HeaderView = (props) => {
     const reportTitle = lodashGet(props.report, 'reportName', '');
     const displayNamesWithTooltips = _.map(
         getPersonalDetailsForLogins(participants, props.personalDetails),
-        ({displayName, login}) => ({displayName, tooltip: login}),
+        ({firstName, login}) => ({displayName: firstName || login, tooltip: login}),
     );
-
+    const fullTitle = displayNamesWithTooltips.map(({displayName})=> displayName).join(', ');
     return (
         <View style={[styles.appContentHeader]} nativeID="drag-area">
             <View style={[styles.appContentHeaderTitle, !props.isSmallScreenWidth && styles.pl5]}>
@@ -94,7 +94,7 @@ const HeaderView = (props) => {
                             />
                             <View style={[styles.flex1, styles.flexRow]}>
                                 <DisplayNames
-                                    fullTitle={reportTitle}
+                                    fullTitle={fullTitle}
                                     displayNamesWithTooltips={displayNamesWithTooltips}
                                     tooltipEnabled
                                     numberOfLines={1}

From c8053300d048367b0e77c6f1df38dff205d33c44 Mon Sep 17 00:00:00 2001
From: Viacheslav Surzhikov <syva80@yandex.ru>
Date: Tue, 11 May 2021 15:55:00 +0300
Subject: [PATCH 2/5] firstName instead of displayName in sideBar

---
 src/pages/home/sidebar/OptionRow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js
index 87954e6c48e3..abeb9ff8ad1e 100644
--- a/src/pages/home/sidebar/OptionRow.js
+++ b/src/pages/home/sidebar/OptionRow.js
@@ -112,7 +112,7 @@ const OptionRow = ({
     const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
     const displayNamesWithTooltips = _.map(
         option.participantsList,
-        ({displayName, login}) => ({displayName, tooltip: login}),
+        ({displayName, firstName, login}) => ({displayName: firstName || displayName, tooltip: login}),
     );
 
     return (

From ffcca3ec764ce1e23090ea88fa7e4cf3d87357db Mon Sep 17 00:00:00 2001
From: Viacheslav Surzhikov <syva80@yandex.ru>
Date: Wed, 12 May 2021 10:28:05 +0300
Subject: [PATCH 3/5] remove const reportTitle + lint

---
 src/pages/home/HeaderView.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index 171381f0be7d..ba5aa43ae0f4 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -53,12 +53,11 @@ const defaultProps = {
 
 const HeaderView = (props) => {
     const participants = lodashGet(props.report, 'participants', []);
-    const reportTitle = lodashGet(props.report, 'reportName', '');
     const displayNamesWithTooltips = _.map(
         getPersonalDetailsForLogins(participants, props.personalDetails),
         ({firstName, login}) => ({displayName: firstName || login, tooltip: login}),
     );
-    const fullTitle = displayNamesWithTooltips.map(({displayName})=> displayName).join(', ');
+    const fullTitle = displayNamesWithTooltips.map(({displayName}) => displayName).join(', ');
     return (
         <View style={[styles.appContentHeader]} nativeID="drag-area">
             <View style={[styles.appContentHeaderTitle, !props.isSmallScreenWidth && styles.pl5]}>

From b397e8a12be5eed8c87db8415ece7d008d3e601a Mon Sep 17 00:00:00 2001
From: Viacheslav Surzhikov <syva80@yandex.ru>
Date: Wed, 12 May 2021 22:10:02 +0300
Subject: [PATCH 4/5] added a check for one participant or multiple
 participants

---
 src/pages/home/HeaderView.js        | 5 ++++-
 src/pages/home/sidebar/OptionRow.js | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index ba5aa43ae0f4..e706d5967d0f 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -53,9 +53,12 @@ const defaultProps = {
 
 const HeaderView = (props) => {
     const participants = lodashGet(props.report, 'participants', []);
+    const isMultipleParticipant = participants.length > 1;
     const displayNamesWithTooltips = _.map(
         getPersonalDetailsForLogins(participants, props.personalDetails),
-        ({firstName, login}) => ({displayName: firstName || login, tooltip: login}),
+        ({displayName, firstName, login}) => (
+            {displayName: isMultipleParticipant ? firstName : displayName || login, tooltip: login}
+        ),
     );
     const fullTitle = displayNamesWithTooltips.map(({displayName}) => displayName).join(', ');
     return (
diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js
index abeb9ff8ad1e..2493311f0e15 100644
--- a/src/pages/home/sidebar/OptionRow.js
+++ b/src/pages/home/sidebar/OptionRow.js
@@ -110,11 +110,14 @@ const OptionRow = ({
         ? hoverStyle.backgroundColor
         : backgroundColor;
     const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
+    const isMultipleParticipant = option.participantsList.length > 1;
     const displayNamesWithTooltips = _.map(
         option.participantsList,
-        ({displayName, firstName, login}) => ({displayName: firstName || displayName, tooltip: login}),
+        ({displayName, firstName, login}) => (
+            {displayName: isMultipleParticipant ? firstName : displayName, tooltip: login}
+        ),
     );
-
+    const fullTitle = displayNamesWithTooltips.map(({displayName}) => displayName).join(', ');
     return (
         <Hoverable>
             {hovered => (
@@ -159,7 +162,7 @@ const OptionRow = ({
                             }
                             <View style={contentContainerStyles}>
                                 <DisplayNames
-                                    fullTitle={option.text}
+                                    fullTitle={fullTitle}
                                     displayNamesWithTooltips={displayNamesWithTooltips}
                                     tooltipEnabled={showTitleTooltip}
                                     numberOfLines={1}

From b037e174af2c10bf1917db431b78fecdc8221c22 Mon Sep 17 00:00:00 2001
From: Viacheslav Surzhikov <syva80@yandex.ru>
Date: Wed, 12 May 2021 23:30:41 +0300
Subject: [PATCH 5/5] fix bug empty displayName if empty firstName and lastName

---
 src/pages/home/HeaderView.js        | 2 +-
 src/pages/home/sidebar/OptionRow.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index e706d5967d0f..ef5754fbc33c 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -57,7 +57,7 @@ const HeaderView = (props) => {
     const displayNamesWithTooltips = _.map(
         getPersonalDetailsForLogins(participants, props.personalDetails),
         ({displayName, firstName, login}) => (
-            {displayName: isMultipleParticipant ? firstName : displayName || login, tooltip: login}
+            {displayName: (isMultipleParticipant ? firstName : displayName) || login, tooltip: login}
         ),
     );
     const fullTitle = displayNamesWithTooltips.map(({displayName}) => displayName).join(', ');
diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js
index 2493311f0e15..344c51284a48 100644
--- a/src/pages/home/sidebar/OptionRow.js
+++ b/src/pages/home/sidebar/OptionRow.js
@@ -114,7 +114,7 @@ const OptionRow = ({
     const displayNamesWithTooltips = _.map(
         option.participantsList,
         ({displayName, firstName, login}) => (
-            {displayName: isMultipleParticipant ? firstName : displayName, tooltip: login}
+            {displayName: (isMultipleParticipant ? firstName : displayName) || login, tooltip: login}
         ),
     );
     const fullTitle = displayNamesWithTooltips.map(({displayName}) => displayName).join(', ');