From 2ac96f707c52d53bb498701c39b4606000d4703c Mon Sep 17 00:00:00 2001
From: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
Date: Fri, 16 Oct 2020 12:36:02 -0400
Subject: [PATCH] User name concatenated
Change-Id: I0b346381124e004026638e0d8360e56a7f66b0b9
---
.../src/views/UserProfile/DisplayUserProfile.js | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
index ce20d323..996ebf43 100644
--- a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
+++ b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js
@@ -416,7 +416,7 @@ export default function DisplayUserProfile(props) {
<div className={classes.userProfileHeader}>
<div>
<h3 className={classes.cardTitle}>
- {user.username ? user.username : "no username"}
+ {user.username}
</h3>
{getUserStatus()}
</div>
@@ -434,14 +434,14 @@ export default function DisplayUserProfile(props) {
</Grid>
<Grid item xs={12} sm={12} md={6}>
<List dense={false}>
- {user.firstName && (
+ {(user.firstName || user.lastName) && (
<ListItem>
<ListItemAvatar>
<Avatar>
<PersonIcon />
</Avatar>
</ListItemAvatar>
- <ListItemText primary={user.firstName} />
+ <ListItemText primary={`${user.firstName} ${user.lastName}`} />
</ListItem>
)}
{user.phoneNumber && (
@@ -479,16 +479,6 @@ export default function DisplayUserProfile(props) {
<Grid item xs={12} sm={12} md={6}>
<List dense={false}>
- {user.lastName && (
- <ListItem>
- <ListItemAvatar>
- <Avatar>
- <PersonOutlinedIcon />
- </Avatar>
- </ListItemAvatar>
- <ListItemText primary={user.lastName} />
- </ListItem>
- )}
{user.phoneNumberExtension && (
<ListItem>
<ListItemAvatar>
--
GitLab