update settings screen

src/shared/accounts/active.tsx

@@ -1,14 +1,15 @@
 import { NDKFilter, NDKKind } from '@nostr-dev-kit/ndk';
 import { useEffect } from 'react';
-import { Link } from 'react-router-dom';
 
 import { useStorage } from '@libs/storage/provider';
 
+import { AccountMoreActions } from '@shared/accounts/more';
 import { Image } from '@shared/image';
 
 import { useNostr } from '@utils/hooks/useNostr';
 import { useProfile } from '@utils/hooks/useProfile';
 import { sendNativeNotification } from '@utils/notification';
+import { displayNpub } from '@utils/shortenKey';
 
 export function ActiveAccount() {
   const { db } = useStorage();
@@ -57,16 +58,23 @@ export function ActiveAccount() {
   }
 
   return (
-    <Link
-      to={`/users/${db.account.pubkey}`}
-      className="flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 border-transparent pl-4 pr-2"
-    >
-      <Image
-        src={user?.picture || user?.image}
-        alt={db.account.npub}
-        className="h-7 w-7 shrink-0 rounded object-cover"
-      />
-      <p className="text-white/80">Your profile</p>
-    </Link>
+    <div className="flex h-16 items-center justify-between border-l-2 border-transparent pb-2 pl-4 pr-2">
+      <div className="flex items-center gap-2.5">
+        <Image
+          src={user?.picture || user?.image}
+          alt={db.account.npub}
+          className="h-10 w-10 shrink-0 rounded-lg object-cover"
+        />
+        <div className="flex w-full flex-1 flex-col items-start gap-1.5">
+          <p className="max-w-[10rem] truncate font-bold leading-none text-white">
+            {user?.name || user?.display_name || user?.nip05}
+          </p>
+          <span className="max-w-[8rem] truncate text-sm leading-none text-white/50">
+            {displayNpub(db.account.pubkey, 16)}
+          </span>
+        </div>
+      </div>
+      <AccountMoreActions pubkey={db.account.pubkey} />
+    </div>
   );
 }

src/shared/accounts/inactive.tsx

@@ -1,13 +0,0 @@
-import { Image } from '@shared/image';
-
-import { useProfile } from '@utils/hooks/useProfile';
-
-export function InactiveAccount({ data }: { data: any }) {
-  const { user } = useProfile(data.npub);
-
-  return (
-    <div className="relative h-9 w-9 shrink-0">
-      <Image src={user?.image} alt={data.npub} className="h-9 w-9 rounded object-cover" />
-    </div>
-  );
-}

src/shared/accounts/more.tsx

@@ -0,0 +1,55 @@
+import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
+import { useState } from 'react';
+import { Link } from 'react-router-dom';
+
+import { HorizontalDotsIcon } from '@shared/icons';
+
+export function AccountMoreActions({ pubkey }: { pubkey: string }) {
+  const [open, setOpen] = useState(false);
+
+  return (
+    <DropdownMenu.Root open={open} onOpenChange={setOpen}>
+      <DropdownMenu.Trigger asChild>
+        <button
+          type="button"
+          className="group ml-auto inline-flex h-7 w-7 items-center justify-center rounded-md hover:bg-white/10"
+        >
+          <HorizontalDotsIcon className="h-5 w-5 text-white/80 group-hover:text-white" />
+        </button>
+      </DropdownMenu.Trigger>
+      <DropdownMenu.Portal>
+        <DropdownMenu.Content className="flex w-[200px] flex-col overflow-hidden rounded-xl bg-white/10 p-2 backdrop-blur-3xl focus:outline-none">
+          <DropdownMenu.Item asChild>
+            <Link
+              to={`/users/${pubkey}`}
+              className="inline-flex h-10 items-center rounded-lg px-2 text-sm font-medium text-white hover:bg-white/10 focus:outline-none"
+            >
+              Profile
+            </Link>
+          </DropdownMenu.Item>
+          <DropdownMenu.Item asChild>
+            <Link
+              to={`/settings/backup`}
+              className="inline-flex h-10 items-center rounded-lg px-2 text-sm font-medium text-white hover:bg-white/10 focus:outline-none"
+            >
+              Backup
+            </Link>
+          </DropdownMenu.Item>
+          <DropdownMenu.Item asChild>
+            <Link
+              to={`/settings/`}
+              className="inline-flex h-10 items-center rounded-lg px-2 text-sm font-medium text-white hover:bg-white/10 focus:outline-none"
+            >
+              Settings
+            </Link>
+          </DropdownMenu.Item>
+          <DropdownMenu.Item asChild>
+            <button className="inline-flex h-10 items-center rounded-lg px-2 text-sm font-medium text-white hover:bg-white/10">
+              Logout
+            </button>
+          </DropdownMenu.Item>
+        </DropdownMenu.Content>
+      </DropdownMenu.Portal>
+    </DropdownMenu.Root>
+  );
+}

src/shared/icons/index.ts

@@ -55,3 +55,4 @@ export * from './share';
 export * from './expand';
 export * from './focus';
 export * from './chevronUp';
+export * from './secure';

src/shared/icons/secure.tsx

@@ -0,0 +1,22 @@
+import { SVGProps } from 'react';
+
+export function SecureIcon(props: JSX.IntrinsicAttributes & SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      fill="none"
+      viewBox="0 0 24 24"
+      {...props}
+    >
+      <path
+        stroke="currentColor"
+        strokeLinecap="square"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+        d="M20.25 6.22a1 1 0 00-.684-.948l-7.25-2.417a1 1 0 00-.632 0l-7.25 2.417a1 1 0 00-.684.949v5.691c0 4.973 4.25 7.338 8.25 9.496 4-2.158 8.25-4.523 8.25-9.496V6.221z"
+      ></path>
+    </svg>
+  );
+}

src/shared/layouts/settings.tsx

@@ -1,60 +1,58 @@
-import { NavLink, Outlet, ScrollRestoration } from 'react-router-dom';
+import { Link, NavLink, Outlet, ScrollRestoration } from 'react-router-dom';
 import { twMerge } from 'tailwind-merge';
 
+import { ArrowLeftIcon, SecureIcon, SettingsIcon } from '@shared/icons';
+
 export function SettingsLayout() {
   return (
     <div className="flex h-screen w-screen">
-      <div className="relative flex shrink-0 flex-row bg-black/80 pt-12">
-        <div className="relative flex w-[232px] flex-col gap-3">
-          <div className="scrollbar-hide flex flex-col gap-5 overflow-y-auto pb-20">
-            <div className="flex flex-col gap-0.5 px-1.5">
-              <div className="px-2.5">
-                <h3 className="text-[11px] font-bold uppercase tracking-widest text-white/50">
-                  Settings
-                </h3>
-              </div>
-              <div className="flex flex-col">
-                <NavLink
-                  to="/settings/general"
-                  className={({ isActive }) =>
-                    twMerge(
-                      'flex h-9 items-center gap-2.5 rounded-md px-2.5',
-                      isActive
-                        ? 'bg-white/10 text-white backdrop-blur-xl'
-                        : 'text-white/80'
-                    )
-                  }
-                >
-                  <span className="font-medium">General</span>
-                </NavLink>
-                <NavLink
-                  to="/settings/shortcuts"
-                  className={({ isActive }) =>
-                    twMerge(
-                      'flex h-9 items-center gap-2.5 rounded-md px-2.5',
-                      isActive
-                        ? 'bg-white/10 text-white backdrop-blur-xl'
-                        : 'text-white/80'
-                    )
-                  }
-                >
-                  <span className="font-medium">Shortcuts</span>
-                </NavLink>
-                <NavLink
-                  to="/settings/account"
-                  className={({ isActive }) =>
-                    twMerge(
-                      'flex h-9 items-center gap-2.5 rounded-md px-2.5',
-                      isActive
-                        ? 'bg-white/10 text-white backdrop-blur-xl'
-                        : 'text-white/80'
-                    )
-                  }
-                >
-                  <span className="font-medium">Account</span>
-                </NavLink>
-              </div>
-            </div>
+      <div className="relative flex h-full w-[232px] flex-col bg-black/80">
+        <div data-tauri-drag-region className="h-11 w-full shrink-0" />
+        <div className="scrollbar-hide flex h-full flex-1 flex-col gap-2 overflow-y-auto pb-32">
+          <div className="inline-flex items-center gap-2 border-l-2 border-transparent pl-4">
+            <Link
+              to="/"
+              className="inline-flex h-7 w-7 items-center justify-center rounded hover:bg-white/10"
+            >
+              <ArrowLeftIcon className="h-4 w-4 text-white/50" />
+            </Link>
+            <h3 className="text-[11px] font-bold uppercase tracking-widest text-white/50">
+              Settings
+            </h3>
+          </div>
+          <div className="flex flex-col pr-2">
+            <NavLink
+              to="/settings/"
+              className={({ isActive }) =>
+                twMerge(
+                  'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 pl-4 pr-2',
+                  isActive
+                    ? 'border-fuchsia-500 bg-white/5 text-white'
+                    : 'border-transparent text-white/80'
+                )
+              }
+            >
+              <span className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded bg-white/10 backdrop-blur-xl">
+                <SettingsIcon className="h-4 w-4 text-white" />
+              </span>
+              <span className="font-medium">General</span>
+            </NavLink>
+            <NavLink
+              to="/settings/backup"
+              className={({ isActive }) =>
+                twMerge(
+                  'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 pl-4 pr-2',
+                  isActive
+                    ? 'border-fuchsia-500 bg-white/5 text-white'
+                    : 'border-transparent text-white/80'
+                )
+              }
+            >
+              <span className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded bg-white/10 backdrop-blur-xl">
+                <SecureIcon className="h-4 w-4 text-white" />
+              </span>
+              <span className="font-medium">Backup</span>
+            </NavLink>
           </div>
         </div>
       </div>

src/shared/navigation.tsx

@@ -6,7 +6,7 @@ import { ChatsList } from '@app/chats/components/list';
 
 import { ActiveAccount } from '@shared/accounts/active';
 import { ComposerModal } from '@shared/composer';
-import { BellIcon, NavArrowDownIcon, SettingsIcon, SpaceIcon } from '@shared/icons';
+import { BellIcon, NavArrowDownIcon, SpaceIcon } from '@shared/icons';
 
 import { useSidebar } from '@stores/sidebar';
 
@@ -14,9 +14,9 @@ export function Navigation() {
   const [chats, toggleChats] = useSidebar((state) => [state.chats, state.toggleChats]);
 
   return (
-    <div className="relative h-full w-[232px] bg-black/80">
-      <div data-tauri-drag-region className="h-11 w-full" />
-      <div className="scrollbar-hide flex h-full flex-col gap-6 overflow-y-auto pb-32">
+    <div className="relative flex h-full w-[232px] flex-col bg-black/80">
+      <div data-tauri-drag-region className="h-11 w-full shrink-0" />
+      <div className="scrollbar-hide flex h-full flex-1 flex-col gap-6 overflow-y-auto pb-32">
         <div className="flex flex-col pr-2">
           <ComposerModal />
           <NavLink
@@ -53,24 +53,6 @@ export function Navigation() {
             </span>
             Notifications
           </NavLink>
-          <NavLink
-            to="/settings"
-            preventScrollReset={true}
-            className={({ isActive }) =>
-              twMerge(
-                'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 pl-4 pr-2',
-                isActive
-                  ? 'border-fuchsia-500 bg-white/5 text-white'
-                  : 'border-transparent text-white/80'
-              )
-            }
-          >
-            <span className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded bg-white/10 backdrop-blur-xl">
-              <SettingsIcon className="h-4 w-4 text-white" />
-            </span>
-            Settings
-          </NavLink>
-          <ActiveAccount />
         </div>
         <Collapsible.Root open={chats} onOpenChange={toggleChats}>
           <div className="flex flex-col gap-1 pr-2">
@@ -95,6 +77,9 @@ export function Navigation() {
           </div>
         </Collapsible.Root>
       </div>
+      <div className="shrink-0">
+        <ActiveAccount />
+      </div>
     </div>
   );
 }

src/shared/notes/actions/more.tsx

@@ -45,7 +45,7 @@ export function MoreActions({ id, pubkey }: { id: string; pubkey: string }) {
         </Tooltip.Portal>
       </Tooltip.Root>
       <DropdownMenu.Portal>
-        <DropdownMenu.Content className="flex w-[200px] flex-col overflow-hidden rounded-md bg-white/10 p-2 backdrop-blur-3xl focus:outline-none">
+        <DropdownMenu.Content className="flex w-[200px] flex-col overflow-hidden rounded-xl bg-white/10 p-2 backdrop-blur-3xl focus:outline-none">
           <DropdownMenu.Item asChild>
             <button
               type="button"