From 0ef471e175c2d7049821bbce1b61750da4037660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Tue, 5 Sep 2023 11:53:31 +0200
Subject: [PATCH] ContactScreen.js use either firstname or lastname or both on
 Name column

---
 ComApp/src/App/Views/ContactScreen.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ComApp/src/App/Views/ContactScreen.js b/ComApp/src/App/Views/ContactScreen.js
index 1b6539f..3a94557 100644
--- a/ComApp/src/App/Views/ContactScreen.js
+++ b/ComApp/src/App/Views/ContactScreen.js
@@ -266,7 +266,9 @@ class ContactScreen extends React.Component {
    */
   Item(contact) {
     const displayName =
-      String(contact.lastname ?? '').toUpperCase() + ' ' + contact.firstname;
+      String(contact.lastname ?? '').toUpperCase() +
+      ' ' +
+      (contact.firstname ?? '');
     return (
       <View style={styles.item}>
         <TouchableOpacity
@@ -277,7 +279,7 @@ class ContactScreen extends React.Component {
             })
           }>
           <Text style={{ ...styles.clickable, color: this.props.mainColor }}>
-            {contact.lastname && contact.firstname ? displayName : contact.id}
+            {contact.lastname || contact.firstname ? displayName : contact.id}
           </Text>
         </TouchableOpacity>
         <TouchableOpacity onPress={() => this.composeNewEmailTo(contact.email)}>