fix: conditional name in avatar and remove outline from navbar hambur…

…ger button
CinCoders · Apr 15, 2024 · 1887516 · 1887516
1 parent 3c98947
commit 1887516
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/components/HamburgerButton/styles.ts b/src/components/HamburgerButton/styles.ts
@@ -32,7 +32,7 @@ export const Hamburger = styled.button<{ isOpen: boolean }>`
   border: none;
   width: 30px;
   height: 16px;
-
+  outline: none;
   display: flex;
   flex-direction: column;
   justify-content: space-between;

diff --git a/src/components/UserPopup/index.tsx b/src/components/UserPopup/index.tsx
@@ -47,10 +47,10 @@ export const UserPopup = (props: UserPopupProps) => {
     <ScopedCssBaseline>
       <UserPopUp>
     <UserPopUpContainer>
-      <StyledAvatar alt={user.name[0] ?? user.username?.charAt(0) ?? '-'}>
-        {(user.name[0] ?? user.username?.charAt(0)) ?? ''}
+      <StyledAvatar alt={user.name ?? user.name[0] ?? '' }>
+        {user.name ? user.name[0] : '-'}
       </StyledAvatar>
-      <UserName>{user.name ?? user.username ?? 'User Display Name'}</UserName>
+      <UserName>{user.name ? user.name : '-'}</UserName>
       <EmailContainer>
         <IconGreen />
         <p>{user.email}</p>

diff --git a/src/lib-components/Navbar/index.tsx b/src/lib-components/Navbar/index.tsx
@@ -190,9 +190,9 @@ export const Navbar = ({
                     onClick={handleUserMenu}
                     color='inherit'
                   >
-                    <Avatar sx={{ bgcolor: '#db1e2f' }} alt={profile.name[0] ?? '-'}>
-  {profile.name[0]?.charAt(0) ?? profile.username?.charAt(0) ?? ''}
-</Avatar>
+                    <Avatar sx={{ bgcolor: '#db1e2f' }} alt={profile.name ? profile.name[0] : '-'}>
+                        {profile.name ? profile.name?.charAt(0) : '-'}
+                    </Avatar>
                   </IconButton>
                 </>
               )}
@@ -307,8 +307,8 @@ export const Navbar = ({
                     onClick={handleUserMenu}
                     color='inherit'
                   >
-                    <Avatar sx={{ bgcolor: '#db1e2f' }} alt={profile.name[0] ?? '-'}>
-                      {profile.name[0].charAt(0)}
+                    <Avatar sx={{ bgcolor: '#db1e2f' }} alt={profile.name ? profile.name[0] : '-'}>
+                      {profile.name ? profile.name[0].charAt(0) : '-'}
                     </Avatar>
                   </IconButton>
                 )}