diff --git a/packages/app/public/icons.svg b/packages/app/public/icons.svg index 873faecf..e6e5d47f 100644 --- a/packages/app/public/icons.svg +++ b/packages/app/public/icons.svg @@ -394,5 +394,14 @@ stroke-linejoin="round" /> + + + \ No newline at end of file diff --git a/packages/app/src/Pages/Layout.css b/packages/app/src/Pages/Layout.css index def9d952..076bbd53 100644 --- a/packages/app/src/Pages/Layout.css +++ b/packages/app/src/Pages/Layout.css @@ -18,8 +18,10 @@ header { padding: 4px 12px; } -header .pfp .avatar-wrapper { - margin-right: 0; +.header-actions .avatar { + width: 48px; + height: 48px; + cursor: pointer; } .header-actions { @@ -28,11 +30,6 @@ header .pfp .avatar-wrapper { align-items: center; } -.header-actions .avatar { - width: 40px; - height: 40px; -} - .header-actions .btn-rnd { position: relative; margin-right: 8px; diff --git a/packages/app/src/Pages/Layout.tsx b/packages/app/src/Pages/Layout.tsx index 456c1eca..3a1d4754 100644 --- a/packages/app/src/Pages/Layout.tsx +++ b/packages/app/src/Pages/Layout.tsx @@ -10,7 +10,6 @@ import Icon from "Icons/Icon"; import { RootState } from "State/Store"; import { setShow, reset } from "State/NoteCreator"; import { System } from "System"; -import ProfileImage from "Element/ProfileImage"; import useLoginFeed from "Feed/LoginFeed"; import { totalUnread } from "Pages/MessagesPage"; import useModeration from "Hooks/useModeration"; @@ -22,6 +21,9 @@ import { preload } from "Cache"; import { useDmCache } from "Hooks/useDmsCache"; import { mapPlanName } from "./subscribe"; import useLogin from "Hooks/useLogin"; +import Avatar from "Element/Avatar"; +import { useUserProfile } from "Hooks/useUserProfile"; +import { profileLink } from "Util"; export default function Layout() { const location = useLocation(); @@ -173,6 +175,7 @@ const AccountHeader = () => { const { isMuted } = useModeration(); const { publicKey, latestNotification, readNotifications } = useLogin(); const dms = useDmCache(); + const profile = useUserProfile(publicKey); const hasNotifications = useMemo( () => latestNotification > readNotifications, @@ -208,7 +211,7 @@ const AccountHeader = () => { return (
navigate("/wallet")}> - +
navigate("/search")}> @@ -221,7 +224,7 @@ const AccountHeader = () => { {hasNotifications && }
- + {profile && navigate(profileLink(profile.pubkey))} />}
); }; diff --git a/packages/app/src/Pages/settings/Index.tsx b/packages/app/src/Pages/settings/Index.tsx index 71622667..403ecf39 100644 --- a/packages/app/src/Pages/settings/Index.tsx +++ b/packages/app/src/Pages/settings/Index.tsx @@ -36,7 +36,7 @@ const SettingsIndex = () => {
navigate("wallet")}> - +