diff --git a/jams-react-client/src/views/UserProfile/DisplayUserProfile.js b/jams-react-client/src/views/UserProfile/DisplayUserProfile.js index ce20d323d562f753b49f2155e2b3c64469f3388f..996ebf43d39699b6fcb8809f1e5c28108281264c 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>