From c8bd19aacf9059f740df4f6fa9890127c20c1f6d Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 13 Feb 2021 21:23:30 +0800
Subject: ...

---
 FrontEnd/src/app/views/common/AppBar.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'FrontEnd/src/app/views/common/AppBar.tsx')

diff --git a/FrontEnd/src/app/views/common/AppBar.tsx b/FrontEnd/src/app/views/common/AppBar.tsx
index d0e39f98..e682a308 100644
--- a/FrontEnd/src/app/views/common/AppBar.tsx
+++ b/FrontEnd/src/app/views/common/AppBar.tsx
@@ -4,14 +4,13 @@ import { LinkContainer } from "react-router-bootstrap";
 import { Navbar, Nav } from "react-bootstrap";
 import { NavLink } from "react-router-dom";
 
-import { useUser, useAvatar } from "@/services/user";
+import { useUser } from "@/services/user";
 
 import TimelineLogo from "./TimelineLogo";
-import BlobImage from "./BlobImage";
+import UserAvatar from "./user/UserAvatar";
 
 const AppBar: React.FC = (_) => {
   const user = useUser();
-  const avatar = useAvatar(user?.username);
 
   const { t } = useTranslation();
 
@@ -70,10 +69,9 @@ const AppBar: React.FC = (_) => {
         <Nav className="ml-auto mr-2 align-items-center">
           {user != null ? (
             <LinkContainer to={`/users/${user.username}`}>
-              <BlobImage
+              <UserAvatar
+                username={user.username}
                 className="avatar small rounded-circle bg-white cursor-pointer ml-auto"
-                onClick={collapse}
-                blob={avatar}
               />
             </LinkContainer>
           ) : (
-- 
cgit v1.2.3