From 6f353567da6967285879cfad56060701a28aa843 Mon Sep 17 00:00:00 2001 From: morteza-mortezai Date: Thu, 2 Jul 2026 21:30:52 +0330 Subject: [PATCH] header --- src/shared/Header.tsx | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/shared/Header.tsx b/src/shared/Header.tsx index c3b59ee..15ff074 100644 --- a/src/shared/Header.tsx +++ b/src/shared/Header.tsx @@ -17,6 +17,11 @@ const Header: FC = () => { const [popoverKey, setPopoverKey] = useState(0); const { setOpenSidebar, openSidebar } = useSharedStore() const { data } = useGetAdminMe() + const admin = data?.data + + const displayName = [admin?.firstName, admin?.lastName].filter(Boolean).join(' ').trim() + const roleTitle = admin?.role?.title || admin?.role?.name || '' + const initials = `${String(admin?.firstName ?? '').charAt(0)}${String(admin?.lastName ?? '').charAt(0)}` useEffect(() => { setPopoverKey((prevKey) => prevKey + 1); @@ -44,16 +49,23 @@ const Header: FC = () => { */} - {data?.data && ( + {admin && (
- {String(data?.data?.firstName ?? '').charAt(0)}{String(data?.data?.lastName ?? '').charAt(0)} + {initials}
-
- {data?.data?.firstName + ' ' + data?.data?.lastName} +
+
+ {displayName || admin.phone} +
+ {roleTitle && ( +
+ {roleTitle} +
+ )}
@@ -64,15 +76,20 @@ const Header: FC = () => {
setPopoverKey((prevKey) => prevKey + 1)} size={20} color='black' />
- +
- {String(data?.data?.firstName ?? '').charAt(0)}{String(data?.data?.lastName ?? '').charAt(0)} + {initials}
- {data?.data?.firstName + ' ' + data?.data?.lastName} + {displayName || admin.phone}
+ {roleTitle && ( +
+ {roleTitle} +
+ )}
- {String(data?.data?.phone ?? '')} + {String(admin.phone ?? '')}