Skip to content
Snippets Groups Projects
Commit 2ac96f70 authored by Larbi Gharib's avatar Larbi Gharib
Browse files

User name concatenated

Change-Id: I0b346381124e004026638e0d8360e56a7f66b0b9
parent 642e3e5b
No related branches found
No related tags found
No related merge requests found
...@@ -416,7 +416,7 @@ export default function DisplayUserProfile(props) { ...@@ -416,7 +416,7 @@ export default function DisplayUserProfile(props) {
<div className={classes.userProfileHeader}> <div className={classes.userProfileHeader}>
<div> <div>
<h3 className={classes.cardTitle}> <h3 className={classes.cardTitle}>
{user.username ? user.username : "no username"} {user.username}
</h3> </h3>
{getUserStatus()} {getUserStatus()}
</div> </div>
...@@ -434,14 +434,14 @@ export default function DisplayUserProfile(props) { ...@@ -434,14 +434,14 @@ export default function DisplayUserProfile(props) {
</Grid> </Grid>
<Grid item xs={12} sm={12} md={6}> <Grid item xs={12} sm={12} md={6}>
<List dense={false}> <List dense={false}>
{user.firstName && ( {(user.firstName || user.lastName) && (
<ListItem> <ListItem>
<ListItemAvatar> <ListItemAvatar>
<Avatar> <Avatar>
<PersonIcon /> <PersonIcon />
</Avatar> </Avatar>
</ListItemAvatar> </ListItemAvatar>
<ListItemText primary={user.firstName} /> <ListItemText primary={`${user.firstName} ${user.lastName}`} />
</ListItem> </ListItem>
)} )}
{user.phoneNumber && ( {user.phoneNumber && (
...@@ -479,16 +479,6 @@ export default function DisplayUserProfile(props) { ...@@ -479,16 +479,6 @@ export default function DisplayUserProfile(props) {
<Grid item xs={12} sm={12} md={6}> <Grid item xs={12} sm={12} md={6}>
<List dense={false}> <List dense={false}>
{user.lastName && (
<ListItem>
<ListItemAvatar>
<Avatar>
<PersonOutlinedIcon />
</Avatar>
</ListItemAvatar>
<ListItemText primary={user.lastName} />
</ListItem>
)}
{user.phoneNumberExtension && ( {user.phoneNumberExtension && (
<ListItem> <ListItem>
<ListItemAvatar> <ListItemAvatar>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment