Merge pull request #76 from Vidhanvyrs/DotLasher-Branch

Done the asked changes
CinCoders · Aug 9, 2023 · b42005e · b42005e
2 parents dff32c4 + 591609e
commit b42005e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/components/UserPopup/index.tsx b/src/components/UserPopup/index.tsx
@@ -46,15 +46,15 @@ export const UserPopup = (props: UserPopupProps) => {
   return (
     <ScopedCssBaseline>
       <UserPopUp>
-        <UserPopUpContainer>
-          <StyledAvatar alt={user.name[0]}>
-            {user.name[0].charAt(0)}
-          </StyledAvatar>
-          <UserName>{user.name}</UserName>
-          <EmailContainer>
-            <IconGreen />
-            <p>{user.email}</p>
-          </EmailContainer>
+    <UserPopUpContainer>
+      <StyledAvatar alt={user.name[0] ?? user.username?.charAt(0)}>
+        {(user.name[0] ?? user.username?.charAt(0)) ?? ''}
+      </StyledAvatar>
+      <UserName>{user.name ?? user.username ?? 'User Display Name'}</UserName>
+      <EmailContainer>
+        <IconGreen />
+        <p>{user.email}</p>
+      </EmailContainer>
           <ManageAccount href={`${accountManagementUrl}`}>
             Gerenciar sua conta
           </ManageAccount>

diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts
@@ -15,6 +15,7 @@ export interface Position {
 export interface User {
   name: string;
   email: string;
+  username?: string;
   profilePictureUrl?: string;
   positions?: Position[];
 }

diff --git a/src/lib-components/Navbar/index.tsx b/src/lib-components/Navbar/index.tsx
@@ -84,7 +84,8 @@ export const Navbar = ({
       if (auth) {
         setProfile({
           name: auth.user?.profile?.given_name ?? '',
-          email: auth.user?.profile?.email ?? ''
+          email: auth.user?.profile?.email ?? '',
+          username: auth.user?.profile?.preferred_username ?? '',
         });
       }
     }
@@ -190,8 +191,8 @@ export const Navbar = ({
                     color='inherit'
                   >
                     <Avatar sx={{ bgcolor: '#db1e2f' }} alt={profile.name[0]}>
-                      {profile.name[0].charAt(0)}
-                    </Avatar>
+  {profile.name[0]?.charAt(0) ?? profile.username?.charAt(0) ?? ''}
+</Avatar>
                   </IconButton>
                 </>
               )}