Merge pull request #123 from luminous-devs/feat/v2.1.6

Feat/v2.1.6

package.json

@@ -2,7 +2,7 @@
   "name": "lume",
   "description": "the communication app",
   "private": true,
-  "version": "2.1.0",
+  "version": "2.1.6",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@evilmartians/harmony": "^1.1.0",
-    "@getalby/sdk": "^2.5.0",
+    "@getalby/sdk": "^2.7.0",
-    "@nostr-dev-kit/ndk": "^2.0.5",
+    "@nostr-dev-kit/ndk": "^2.1.1",
     "@nostr-fetch/adapter-ndk": "^0.13.1",
     "@radix-ui/react-alert-dialog": "^1.0.5",
     "@radix-ui/react-avatar": "^1.0.4",
@@ -29,11 +29,13 @@
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-hover-card": "^1.0.7",
     "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-switch": "^1.0.3",
     "@radix-ui/react-toolbar": "^1.0.4",
     "@radix-ui/react-tooltip": "^1.0.7",
-    "@tanstack/react-query": "^5.8.1",
+    "@tanstack/react-query": "^5.8.7",
     "@tauri-apps/api": "2.0.0-alpha.11",
     "@tauri-apps/cli": "2.0.0-alpha.17",
+    "@tauri-apps/plugin-autostart": "2.0.0-alpha.3",
     "@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.3",
     "@tauri-apps/plugin-dialog": "2.0.0-alpha.3",
     "@tauri-apps/plugin-fs": "2.0.0-alpha.3",
@@ -57,13 +59,13 @@
     "@tiptap/starter-kit": "^2.1.12",
     "@tiptap/suggestion": "^2.1.12",
     "dayjs": "^1.11.10",
-    "framer-motion": "^10.16.4",
+    "framer-motion": "^10.16.5",
     "html-to-text": "^9.0.5",
     "idb-keyval": "^6.2.1",
     "light-bolt11-decoder": "^3.0.0",
-    "lru-cache": "^10.0.2",
+    "lru-cache": "^10.1.0",
     "markdown-to-jsx": "^7.3.2",
-    "media-chrome": "^1.5.2",
+    "media-chrome": "^1.5.3",
     "minidenticons": "^4.2.0",
     "nanoid": "^5.0.3",
     "nostr-fetch": "^0.13.1",
@@ -75,47 +77,47 @@
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.48.2",
     "react-hotkeys-hook": "^4.4.1",
-    "react-router-dom": "^6.18.0",
+    "react-router-dom": "^6.20.0",
     "react-string-replace": "^1.1.1",
     "reactflow": "^11.10.1",
-    "sonner": "^1.2.0",
+    "sonner": "^1.2.3",
     "tailwind-scrollbar": "^3.0.5",
     "tauri-controls": "github:reyamir/tauri-controls",
     "tippy.js": "^6.3.7",
     "tiptap-markdown": "^0.8.4",
-    "virtua": "^0.16.2",
+    "virtua": "^0.16.7",
     "zustand": "^4.4.6"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/html-to-text": "^9.0.4",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.10.0",
-    "@types/react": "^18.2.37",
+    "@types/react": "^18.2.38",
-    "@types/react-dom": "^18.2.15",
+    "@types/react-dom": "^18.2.17",
-    "@types/youtube-player": "^5.5.10",
+    "@types/youtube-player": "^5.5.11",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.10.0",
+    "@typescript-eslint/parser": "^6.12.0",
-    "@vitejs/plugin-react-swc": "^3.4.1",
+    "@vitejs/plugin-react-swc": "^3.5.0",
     "autoprefixer": "^10.4.16",
     "clsx": "^2.0.0",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.2",
     "encoding": "^0.1.13",
-    "eslint": "^8.53.0",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "husky": "^8.0.3",
-    "lint-staged": "^15.0.2",
+    "lint-staged": "^15.1.0",
     "postcss": "^8.4.31",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.0",
     "prettier-plugin-tailwindcss": "^0.5.7",
     "prop-types": "^15.8.1",
     "tailwind-merge": "^1.14.0",
     "tailwindcss": "^3.3.5",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.2",
     "vite": "^4.5.0",
     "vite-tsconfig-paths": "^4.2.1"
   }

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lume"
-version = "2.1.0"
+version = "2.1.6"
 description = "the communication app"
 authors = ["Ren Amamiya"]
 license = "GPL-3.0"
@@ -28,11 +28,11 @@ tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", bra
 tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-theme = { git = "https://github.com/wyhaya/tauri-plugin-theme" }
 tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [
   "sqlite",
 ] }

src-tauri/src/main.rs

@@ -7,6 +7,7 @@ use keyring::Entry;
 use std::time::Duration;
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_sql::{Migration, MigrationKind};
+use tauri_plugin_theme::ThemePlugin;
 use webpage::{Webpage, WebpageOptions};
 
 #[derive(Clone, serde::Serialize)]
@@ -105,6 +106,7 @@ fn secure_remove(key: String) -> Result<(), ()> {
 }
 
 fn main() {
+  let mut ctx = tauri::generate_context!();
   tauri::Builder::default()
     .setup(|app| {
       #[cfg(desktop)]
@@ -113,6 +115,7 @@ fn main() {
         .plugin(tauri_plugin_updater::Builder::new().build())?;
       Ok(())
     })
+    .plugin(ThemePlugin::init(ctx.config_mut()))
     .plugin(
       tauri_plugin_sql::Builder::default()
         .add_migrations(
@@ -134,10 +137,6 @@ fn main() {
         )
         .build(),
     )
-    .plugin(tauri_plugin_autostart::init(
-      MacosLauncher::LaunchAgent,
-      Some(vec!["--flag1", "--flag2"]),
-    ))
     .plugin(tauri_plugin_clipboard_manager::init())
     .plugin(tauri_plugin_dialog::init())
     .plugin(tauri_plugin_fs::init())
@@ -148,12 +147,16 @@ fn main() {
     .plugin(tauri_plugin_shell::init())
     .plugin(tauri_plugin_upload::init())
     .plugin(tauri_plugin_window_state::Builder::default().build())
+    .plugin(tauri_plugin_autostart::init(
+      MacosLauncher::LaunchAgent,
+      Some(vec![]),
+    ))
     .invoke_handler(tauri::generate_handler![
       opengraph,
       secure_save,
       secure_load,
       secure_remove
     ])
-    .run(tauri::generate_context!())
+    .run(ctx)
     .expect("error while running tauri application");
 }

src-tauri/tauri.conf.json

@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "Lume",
-    "version": "2.1.0"
+    "version": "2.1.6"
   },
   "plugins": {
     "fs": {

src/app.tsx

@@ -7,13 +7,13 @@ import { OnboardingScreen } from '@app/auth/onboarding';
 import { ChatsScreen } from '@app/chats';
 import { ErrorScreen } from '@app/error';
 import { ExploreScreen } from '@app/explore';
-import { NewScreen } from '@app/new';
 
 import { useStorage } from '@libs/storage/provider';
 
 import { LoaderIcon } from '@shared/icons';
 import { AppLayout } from '@shared/layouts/app';
 import { AuthLayout } from '@shared/layouts/auth';
+import { NewLayout } from '@shared/layouts/new';
 import { NoteLayout } from '@shared/layouts/note';
 import { SettingsLayout } from '@shared/layouts/settings';
 
@@ -115,7 +115,7 @@ export default function App() {
     },
     {
       path: '/new',
-      element: <NewScreen />,
+      element: <NewLayout />,
       errorElement: <ErrorScreen />,
       children: [
         {
@@ -139,6 +139,13 @@ export default function App() {
             return { Component: NewFileScreen };
           },
         },
+        {
+          path: 'privkey',
+          async lazy() {
+            const { NewPrivkeyScreen } = await import('@app/new/privkey');
+            return { Component: NewPrivkeyScreen };
+          },
+        },
       ],
     },
     {

src/app/auth/components/features/enableOutbox.tsx

@@ -21,7 +21,7 @@ export function OutboxModel() {
     <div className="rounded-xl bg-neutral-100 p-3 text-neutral-800 dark:bg-neutral-900 dark:text-neutral-200">
       <div className="flex items-start justify-between gap-2">
         <div>
-          <h5 className="font-semibold">Enable Outbox (experiment)</h5>
+          <h5 className="font-semibold">Enable Outbox</h5>
           <p className="text-sm">
             When you request information about a user, Lume will automatically query the
             user&apos;s outbox relays and subsequent queries will favour using those

src/app/auth/components/features/followList.tsx

@@ -13,21 +13,13 @@ export function FollowList() {
     queryKey: ['follows'],
     queryFn: async () => {
       const user = ndk.getUser({ pubkey: db.account.pubkey });
-      const follows = await user.follows();
+      const follows = [...(await user.follows())].map((user) => user.pubkey);
-      const followsAsArr = [];
-
-      follows.forEach((user) => {
-        followsAsArr.push(user.pubkey);
-      });
 
       // update db
-      await db.updateAccount('follows', JSON.stringify(followsAsArr));
+      await db.updateAccount('follows', JSON.stringify(follows));
-      await db.updateAccount('circles', JSON.stringify(followsAsArr));
+      db.account.follows = follows;
 
-      db.account.follows = followsAsArr;
+      return follows;
-      db.account.circles = followsAsArr;
-
-      return followsAsArr;
     },
     refetchOnWindowFocus: false,
   });

src/app/auth/import.tsx

@@ -44,10 +44,11 @@ export function ImportAccountScreen() {
     try {
       const pubkey = nip19.decode(npub.split('#')[0]).data as string;
       const localSigner = NDKPrivateKeySigner.generate();
-      await db.secureSave(pubkey + '-bunker', localSigner.privateKey);
+      await db.createSetting('nsecbunker', '1');
+      await db.secureSave(pubkey + '-nsecbunker', localSigner.privateKey);
 
       const remoteSigner = new NDKNip46Signer(ndk, npub, localSigner);
-      await remoteSigner.blockUntilReady();
+      // await remoteSigner.blockUntilReady();
 
       ndk.signer = remoteSigner;
 
@@ -259,8 +260,8 @@ export function ImportAccountScreen() {
                         {db.platform === 'macos'
                           ? 'Apple Keychain (macOS)'
                           : db.platform === 'windows'
-                          ? 'Credential Manager (Windows)'
+                            ? 'Credential Manager (Windows)'
-                          : 'Secret Service (Linux)'}
+                            : 'Secret Service (Linux)'}
                       </b>
                       , it will be secured by your OS
                     </p>

src/app/auth/onboarding/enrich.tsx

@@ -47,7 +47,6 @@ export function OnboardEnrichScreen() {
       setLoading(true);
 
       const tags = arrayToNIP02(follows);
-
       const event = new NDKEvent(ndk);
       event.content = '';
       event.kind = NDKKind.Contacts;

src/app/auth/onboarding/list.tsx

@@ -2,7 +2,6 @@ import { useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
 import { AllowNotification } from '@app/auth/components/features/allowNotification';
-import { Circle } from '@app/auth/components/features/enableCircle';
 import { OutboxModel } from '@app/auth/components/features/enableOutbox';
 import { FavoriteHashtag } from '@app/auth/components/features/favoriteHashtag';
 import { FollowList } from '@app/auth/components/features/followList';
@@ -41,7 +40,6 @@ export function OnboardingListScreen() {
         <div className="flex flex-col gap-3">
           {newuser ? <SuggestFollow /> : <FollowList />}
           <FavoriteHashtag />
-          <Circle />
           <OutboxModel />
           <AllowNotification />
           <button

src/app/chats/chat.tsx

@@ -1,5 +1,5 @@
 import { NDKEvent, NDKSubscription } from '@nostr-dev-kit/ndk';
-import { useQuery } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useCallback, useEffect, useRef } from 'react';
 import { useParams } from 'react-router-dom';
 import { VList, VListHandle } from 'virtua';
@@ -16,8 +16,6 @@ import { User } from '@shared/user';
 import { useNostr } from '@utils/hooks/useNostr';
 
 export function ChatScreen() {
-  const listRef = useRef<VListHandle>(null);
-
   const { db } = useStorage();
   const { ndk } = useNDK();
   const { pubkey } = useParams();
@@ -30,10 +28,39 @@ export function ChatScreen() {
     refetchOnWindowFocus: false,
   });
 
+  const queryClient = useQueryClient();
+  const listRef = useRef<VListHandle>(null);
+
+  const newMessage = useMutation({
+    mutationFn: async (event: NDKEvent) => {
+      // Cancel any outgoing refetches
+      await queryClient.cancelQueries({ queryKey: ['nip04-dm', pubkey] });
+
+      // Snapshot the previous value
+      const prevMessages = queryClient.getQueryData(['nip04-dm', pubkey]);
+
+      // Optimistically update to the new value
+      queryClient.setQueryData(['nip04-dm', pubkey], (prev: NDKEvent[]) => [
+        ...prev,
+        event,
+      ]);
+
+      // Return a context object with the snapshotted value
+      return { prevMessages };
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ['nip04-dm', pubkey] });
+    },
+  });
+
   const renderItem = useCallback(
     (message: NDKEvent) => {
       return (
-        <ChatMessage message={message} self={message.pubkey === db.account.pubkey} />
+        <ChatMessage
+          key={message.id}
+          message={message}
+          isSelf={message.pubkey === db.account.pubkey}
+        />
       );
     },
     [data]
@@ -57,7 +84,7 @@ export function ChatScreen() {
     );
 
     sub.addListener('event', (event) => {
-      console.log(event);
+      newMessage.mutate(event);
     });
 
     return () => {
@@ -96,11 +123,7 @@ export function ChatScreen() {
             )}
           </div>
           <div className="shrink-0 rounded-b-lg border-t border-neutral-300 bg-neutral-200 p-3 dark:border-neutral-700 dark:bg-neutral-800">
-            <ChatForm
+            <ChatForm receiverPubkey={pubkey} />
-              receiverPubkey={pubkey}
-              userPubkey={db.account.pubkey}
-              userPrivkey={''}
-            />
           </div>
         </div>
       </div>

src/app/chats/components/chatForm.tsx

@@ -1,6 +1,6 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
+import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
-import { nip04 } from 'nostr-tools';
+import { useState } from 'react';
-import { useCallback, useState } from 'react';
+import { toast } from 'sonner';
 
 import { MediaUploader } from '@app/chats/components/mediaUploader';
 
@@ -8,34 +8,26 @@ import { useNDK } from '@libs/ndk/provider';
 
 import { EnterIcon } from '@shared/icons';
 
-export function ChatForm({
+export function ChatForm({ receiverPubkey }: { receiverPubkey: string }) {
-  receiverPubkey,
-  userPrivkey,
-}: {
-  receiverPubkey: string;
-  userPubkey: string;
-  userPrivkey: string;
-}) {
   const { ndk } = useNDK();
   const [value, setValue] = useState('');
 
-  const encryptMessage = useCallback(async () => {
-    return await nip04.encrypt(userPrivkey, receiverPubkey, value);
-  }, [receiverPubkey, value]);
-
   const submit = async () => {
-    const message = await encryptMessage();
+    try {
-    const tags = [['p', receiverPubkey]];
+      const recipient = new NDKUser({ pubkey: receiverPubkey });
+      const message = await ndk.signer.encrypt(recipient, value);
 
-    const event = new NDKEvent(ndk);
+      const event = new NDKEvent(ndk);
-    event.content = message;
+      event.content = message;
-    event.kind = NDKKind.EncryptedDirectMessage;
+      event.kind = NDKKind.EncryptedDirectMessage;
-    event.tags = tags;
+      event.tag(recipient);
 
-    await event.publish();
+      const publish = await event.publish();
 
-    // reset state
+      if (publish) setValue('');
-    setValue('');
+    } catch (e) {
+      toast.error(e);
+    }
   };
 
   const handleEnterPress = (e: {
@@ -61,7 +53,7 @@ export function ChatForm({
           autoComplete="off"
           autoCorrect="off"
           autoCapitalize="off"
-          placeholder="Message"
+          placeholder="Message..."
           className="h-10 flex-1 resize-none bg-transparent px-3 text-neutral-900 placeholder:text-neutral-600 focus:outline-none dark:text-neutral-100 dark:placeholder:text-neutral-300"
         />
         <button

src/app/chats/components/message.tsx

@@ -3,14 +3,14 @@ import { twMerge } from 'tailwind-merge';
 
 import { useDecryptMessage } from '@app/chats/hooks/useDecryptMessage';
 
-export function ChatMessage({ message, self }: { message: NDKEvent; self: boolean }) {
+export function ChatMessage({ message, isSelf }: { message: NDKEvent; isSelf: boolean }) {
   const decryptedContent = useDecryptMessage(message);
 
   return (
     <div
       className={twMerge(
         'my-2 w-max max-w-[400px] rounded-t-xl px-3 py-3',
-        self
+        isSelf
           ? 'ml-auto rounded-l-xl bg-blue-500 text-white'
           : 'rounded-r-xl bg-neutral-200 text-neutral-900 dark:bg-neutral-800 dark:text-neutral-100'
       )}
@@ -18,9 +18,7 @@ export function ChatMessage({ message, self }: { message: NDKEvent; self: boolea
       {!decryptedContent ? (
         <p>Decrypting...</p>
       ) : (
-        <div>
+        <p className="select-text whitespace-pre-line break-all">{decryptedContent}</p>
-          <p className="select-text whitespace-pre-line">{decryptedContent}</p>
-        </div>
       )}
     </div>
   );

src/app/chats/index.tsx

@@ -1,15 +1,20 @@
 import { NDKEvent } from '@nostr-dev-kit/ndk';
 import { useQuery } from '@tanstack/react-query';
-import { useCallback } from 'react';
+import { useCallback, useEffect } from 'react';
-import { Outlet } from 'react-router-dom';
+import { Outlet, useNavigate } from 'react-router-dom';
 
 import { ChatListItem } from '@app/chats/components/chatListItem';
 
+import { useNDK } from '@libs/ndk/provider';
+
 import { LoaderIcon } from '@shared/icons';
 
 import { useNostr } from '@utils/hooks/useNostr';
 
 export function ChatsScreen() {
+  const navigate = useNavigate();
+
+  const { ndk } = useNDK();
   const { getAllNIP04Chats } = useNostr();
   const { status, data } = useQuery({
     queryKey: ['nip04-chats'],
@@ -29,6 +34,10 @@ export function ChatsScreen() {
     [data]
   );
 
+  useEffect(() => {
+    if (!ndk.signer) navigate('/new/privkey');
+  }, []);
+
   return (
     <div className="grid h-full w-full grid-cols-3">
       <div className="col-span-1 h-full overflow-y-auto border-r border-neutral-200 scrollbar-none dark:border-neutral-800">

src/app/error.tsx

@@ -57,7 +57,7 @@ export function ErrorScreen() {
             Sorry, an unexpected error has occurred.
           </h1>
           <h3 className="text-3xl font-semibold leading-snug text-white">
-            Don&apos;t be panic, your account is safe.
+            Don&apos;t panic, your account is safe.
             <br />
             Here are what things you can do:
           </h3>
@@ -65,7 +65,7 @@ export function ErrorScreen() {
         <div className="flex w-full flex-col gap-3">
           <div className="flex items-center justify-between rounded-xl bg-blue-700 px-3 py-4">
             <div className="text-xl font-semibold text-white">
-              1. Try close and re-open app
+              1. Try to close and re-open the app
             </div>
             <button
               type="button"
@@ -112,12 +112,12 @@ export function ErrorScreen() {
           <div className="rounded-xl bg-blue-700 px-3 py-4">
             <div className="flex w-full flex-col gap-1.5">
               <div className="text-xl font-semibold text-white">
-                4. Use other Nostr client
+                4. Use another Nostr client
               </div>
               <div className="select-text text-lg font-medium text-blue-300">
                 <p>
-                  While waiting Lume&apos;s Devs release the bug fixes, you always can use
+                  While waiting for Lume&apos;s Devs to release the bug fixes, you always can use
-                  other Nostr client with your account:
+                  other Nostr clients with your account:
                 </p>
                 <div className="mt-2 flex flex-col gap-1 text-white">
                   <a href="https://snort.social" className="hover:!underline">

src/app/new/article.tsx

@@ -4,7 +4,8 @@ import Image from '@tiptap/extension-image';
 import Placeholder from '@tiptap/extension-placeholder';
 import { EditorContent, FloatingMenu, useEditor } from '@tiptap/react';
 import StarterKit from '@tiptap/starter-kit';
-import { useMemo, useState } from 'react';
+import { useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 import { twMerge } from 'tailwind-merge';
 import { Markdown } from 'tiptap-markdown';
@@ -26,11 +27,14 @@ import {
 export function NewArticleScreen() {
   const { ndk } = useNDK();
 
+  const [height, setHeight] = useState(0);
   const [loading, setLoading] = useState(false);
   const [title, setTitle] = useState('');
   const [summary, setSummary] = useState({ open: false, content: '' });
   const [cover, setCover] = useState('');
 
+  const navigate = useNavigate();
+  const containerRef = useRef(null);
   const ident = useMemo(() => String(Date.now()), []);
   const editor = useEditor({
     extensions: [
@@ -65,6 +69,8 @@ export function NewArticleScreen() {
 
   const submit = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       setLoading(true);
 
       // get markdown content
@@ -109,123 +115,133 @@ export function NewArticleScreen() {
     }
   };
 
+  useLayoutEffect(() => {
+    setHeight(containerRef.current.clientHeight);
+  }, []);
+
   return (
-    <div className="flex h-full flex-col justify-between">
+    <div className="flex flex-1 flex-col justify-between">
-      <div className="flex flex-col gap-4">
+      <div className="flex-1 overflow-y-auto">
-        {cover ? (
+        <div
-          <img
+          className="flex flex-col gap-4"
-            src={cover}
+          ref={containerRef}
-            alt="post cover"
+          style={{ height: `${height}px` }}
-            className="h-72 w-full rounded-lg object-cover"
+        >
-          />
+          {cover ? (
-        ) : null}
+            <img
-        <div className="group flex justify-between gap-2">
+              src={cover}
-          <input
+              alt="post cover"
-            name="title"
+              className="h-72 w-full rounded-lg object-cover"
-            className="h-9 flex-1 border-none bg-transparent text-2xl font-semibold text-neutral-900 shadow-none outline-none placeholder:text-neutral-400 dark:text-neutral-100 dark:placeholder:text-neutral-600"
+            />
-            placeholder="Untitled"
+          ) : null}
-            value={title}
+          <div className="group flex justify-between gap-2">
-            onChange={(e) => setTitle(e.target.value)}
+            <input
-          />
+              name="title"
-          <div
+              className="h-9 flex-1 border-none bg-transparent text-2xl font-semibold text-neutral-900 shadow-none outline-none placeholder:text-neutral-400 dark:text-neutral-100 dark:placeholder:text-neutral-600"
-            className={twMerge(
+              placeholder="Untitled"
-              'inline-flex shrink-0 gap-2 group-hover:inline-flex',
+              value={title}
-              title.length > 0 ? '' : 'hidden'
+              onChange={(e) => setTitle(e.target.value)}
-            )}
+            />
-          >
+            <div
-            <ArticleCoverUploader setCover={setCover} />
+              className={twMerge(
-            <button
+                'inline-flex shrink-0 gap-2 group-hover:inline-flex',
-              type="button"
+                title.length > 0 ? '' : 'hidden'
-              onClick={() => setSummary((prev) => ({ ...prev, open: !prev.open }))}
+              )}
-              className="inline-flex h-9 w-max items-center gap-2 rounded-lg bg-neutral-100 px-2.5 text-sm font-medium hover:bg-neutral-200 dark:bg-neutral-800 dark:hover:bg-neutral-800"
             >
-              <ThreadsIcon className="h-4 w-4" />
+              <ArticleCoverUploader setCover={setCover} />
-              Add summary
+              <button
-            </button>
+                type="button"
-          </div>
+                onClick={() => setSummary((prev) => ({ ...prev, open: !prev.open }))}
-        </div>
+                className="inline-flex h-9 w-max items-center gap-2 rounded-lg bg-neutral-100 px-2.5 text-sm font-medium hover:bg-neutral-200 dark:bg-neutral-800 dark:hover:bg-neutral-800"
-        {summary.open ? (
+              >
-          <div className="flex gap-3">
+                <ThreadsIcon className="h-4 w-4" />
-            <div className="h-16 w-1 shrink-0 rounded-full bg-neutral-200 dark:bg-neutral-800" />
+                Add summary
-            <div className="flex-1">
+              </button>
-              <textarea
-                className="h-16 w-full border-none bg-transparent px-1 py-1 text-neutral-900 shadow-none outline-none placeholder:text-neutral-400 dark:text-neutral-100 dark:placeholder:text-neutral-600"
-                placeholder="A brief summary of your article"
-                value={summary.content}
-                onChange={(e) =>
-                  setSummary((prev) => ({ ...prev, content: e.target.value }))
-                }
-              />
             </div>
           </div>
-        ) : null}
+          {summary.open ? (
-        <div>
+            <div className="flex gap-3">
-          {editor && (
+              <div className="h-16 w-1 shrink-0 rounded-full bg-neutral-200 dark:bg-neutral-800" />
-            <FloatingMenu
+              <div className="flex-1">
+                <textarea
+                  className="h-16 w-full border-none bg-transparent px-1 py-1 text-neutral-900 shadow-none outline-none placeholder:text-neutral-400 dark:text-neutral-100 dark:placeholder:text-neutral-600"
+                  placeholder="A brief summary of your article"
+                  value={summary.content}
+                  onChange={(e) =>
+                    setSummary((prev) => ({ ...prev, content: e.target.value }))
+                  }
+                />
+              </div>
+            </div>
+          ) : null}
+          <div>
+            {editor && (
+              <FloatingMenu
+                editor={editor}
+                tippyOptions={{ duration: 100 }}
+                className="ml-36 inline-flex h-10 items-center gap-1 rounded-lg border border-neutral-200 bg-neutral-100 px-px dark:border-neutral-800 dark:bg-neutral-900"
+              >
+                <button
+                  onClick={() => editor.chain().focus().toggleHeading({ level: 1 }).run()}
+                  className={twMerge(
+                    'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
+                    editor.isActive('heading', { level: 1 })
+                      ? 'bg-white shadow dark:bg-black'
+                      : ''
+                  )}
+                >
+                  <Heading1Icon className="h-5 w-5" />
+                </button>
+                <button
+                  onClick={() => editor.chain().focus().toggleHeading({ level: 2 }).run()}
+                  className={twMerge(
+                    'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
+                    editor.isActive('heading', { level: 2 })
+                      ? 'bg-white shadow dark:bg-black'
+                      : ''
+                  )}
+                >
+                  <Heading2Icon className="h-5 w-5" />
+                </button>
+                <button
+                  onClick={() => editor.chain().focus().toggleHeading({ level: 2 }).run()}
+                  className={twMerge(
+                    'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
+                    editor.isActive('heading', { level: 3 })
+                      ? 'bg-white shadow dark:bg-black'
+                      : ''
+                  )}
+                >
+                  <Heading3Icon className="h-5 w-5" />
+                </button>
+                <button
+                  onClick={() => editor.chain().focus().toggleBold().run()}
+                  className={twMerge(
+                    'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
+                    editor.isActive('bold') ? 'bg-white shadow dark:bg-black' : ''
+                  )}
+                >
+                  <BoldIcon className="h-5 w-5" />
+                </button>
+                <button
+                  onClick={() => editor.chain().focus().toggleItalic().run()}
+                  className={twMerge(
+                    'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
+                    editor.isActive('italic') ? 'bg-white shadow dark:bg-black' : ''
+                  )}
+                >
+                  <ItalicIcon className="h-5 w-5" />
+                </button>
+              </FloatingMenu>
+            )}
+            <EditorContent
               editor={editor}
-              tippyOptions={{ duration: 100 }}
+              spellCheck="false"
-              className="ml-36 inline-flex h-10 items-center gap-1 rounded-lg border border-neutral-200 bg-neutral-100 px-px dark:border-neutral-800 dark:bg-neutral-900"
+              autoComplete="off"
-            >
+              autoCorrect="off"
-              <button
+              autoCapitalize="off"
-                onClick={() => editor.chain().focus().toggleHeading({ level: 1 }).run()}
+            />
-                className={twMerge(
+          </div>
-                  'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
-                  editor.isActive('heading', { level: 1 })
-                    ? 'bg-white shadow dark:bg-black'
-                    : ''
-                )}
-              >
-                <Heading1Icon className="h-5 w-5" />
-              </button>
-              <button
-                onClick={() => editor.chain().focus().toggleHeading({ level: 2 }).run()}
-                className={twMerge(
-                  'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
-                  editor.isActive('heading', { level: 2 })
-                    ? 'bg-white shadow dark:bg-black'
-                    : ''
-                )}
-              >
-                <Heading2Icon className="h-5 w-5" />
-              </button>
-              <button
-                onClick={() => editor.chain().focus().toggleHeading({ level: 2 }).run()}
-                className={twMerge(
-                  'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
-                  editor.isActive('heading', { level: 3 })
-                    ? 'bg-white shadow dark:bg-black'
-                    : ''
-                )}
-              >
-                <Heading3Icon className="h-5 w-5" />
-              </button>
-              <button
-                onClick={() => editor.chain().focus().toggleBold().run()}
-                className={twMerge(
-                  'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
-                  editor.isActive('bold') ? 'bg-white shadow dark:bg-black' : ''
-                )}
-              >
-                <BoldIcon className="h-5 w-5" />
-              </button>
-              <button
-                onClick={() => editor.chain().focus().toggleItalic().run()}
-                className={twMerge(
-                  'inline-flex h-9 w-9 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-50 dark:text-neutral-100 dark:hover:bg-neutral-950',
-                  editor.isActive('italic') ? 'bg-white shadow dark:bg-black' : ''
-                )}
-              >
-                <ItalicIcon className="h-5 w-5" />
-              </button>
-            </FloatingMenu>
-          )}
-          <EditorContent
-            editor={editor}
-            spellCheck="false"
-            autoComplete="off"
-            autoCorrect="off"
-            autoCapitalize="off"
-          />
         </div>
       </div>
       <div>

src/app/new/components/index.ts

@@ -2,3 +2,4 @@ export * from './articleCoverUploader';
 export * from './mediaUploader';
 export * from './mentionPopup';
 export * from './mentionPopupItem';
+export * from './mentionList';

src/app/new/components/mentionList.tsx

@@ -0,0 +1,104 @@
+import * as Avatar from '@radix-ui/react-avatar';
+import { minidenticon } from 'minidenticons';
+import { Ref, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { twMerge } from 'tailwind-merge';
+
+import { NDKCacheUserProfile } from '@utils/types';
+
+type MentionListRef = {
+  onKeyDown: (props: { event: Event }) => boolean;
+};
+
+const List = (
+  props: {
+    items: NDKCacheUserProfile[];
+    command: (arg0: { id: string }) => void;
+  },
+  ref: Ref<unknown>
+) => {
+  const [selectedIndex, setSelectedIndex] = useState(0);
+
+  const selectItem = (index) => {
+    const item = props.items[index];
+    if (item) {
+      props.command({ id: item.pubkey });
+    }
+  };
+
+  const upHandler = () => {
+    setSelectedIndex((selectedIndex + props.items.length - 1) % props.items.length);
+  };
+
+  const downHandler = () => {
+    setSelectedIndex((selectedIndex + 1) % props.items.length);
+  };
+
+  const enterHandler = () => {
+    selectItem(selectedIndex);
+  };
+
+  useEffect(() => setSelectedIndex(0), [props.items]);
+
+  useImperativeHandle(ref, () => ({
+    onKeyDown: ({ event }) => {
+      if (event.key === 'ArrowUp') {
+        upHandler();
+        return true;
+      }
+
+      if (event.key === 'ArrowDown') {
+        downHandler();
+        return true;
+      }
+
+      if (event.key === 'Enter') {
+        enterHandler();
+        return true;
+      }
+
+      return false;
+    },
+  }));
+
+  return (
+    <div className="flex w-[200px] flex-col overflow-y-auto rounded-lg border border-neutral-200 bg-neutral-50 p-2 shadow-lg shadow-neutral-500/20 dark:border-neutral-800 dark:bg-neutral-950 dark:shadow-neutral-300/50">
+      {props.items.length ? (
+        props.items.map((item, index) => (
+          <button
+            key={index}
+            onClick={() => selectItem(index)}
+            className={twMerge(
+              'inline-flex h-11 items-center gap-2 rounded-md px-2',
+              index === selectedIndex ? 'bg-neutral-100 dark:bg-neutral-900' : ''
+            )}
+          >
+            <Avatar.Root className="h-8 w-8 shrink-0">
+              <Avatar.Image
+                src={item.image}
+                alt={item.name}
+                loading="lazy"
+                decoding="async"
+                className="h-8 w-8 rounded-md"
+              />
+              <Avatar.Fallback delayMs={150}>
+                <img
+                  src={
+                    'data:image/svg+xml;utf8,' +
+                    encodeURIComponent(minidenticon(item.name, 90, 50))
+                  }
+                  alt={item.name}
+                  className="h-8 w-8 rounded-md bg-black dark:bg-white"
+                />
+              </Avatar.Fallback>
+            </Avatar.Root>
+            <h5 className="max-w-[150px] truncate text-sm font-medium">{item.name}</h5>
+          </button>
+        ))
+      ) : (
+        <div className="text-center text-sm font-medium">No result</div>
+      )}
+    </div>
+  );
+};
+
+export const MentionList = forwardRef<MentionListRef>(List);

src/app/new/file.tsx

@@ -2,6 +2,7 @@ import { NDKEvent } from '@nostr-dev-kit/ndk';
 import { message, open } from '@tauri-apps/plugin-dialog';
 import { readBinaryFile } from '@tauri-apps/plugin-fs';
 import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 
 import { useNDK } from '@libs/ndk/provider';
@@ -10,6 +11,7 @@ import { LoaderIcon } from '@shared/icons';
 
 export function NewFileScreen() {
   const { ndk } = useNDK();
+  const navigate = useNavigate();
 
   const [loading, setLoading] = useState(false);
   const [isPublish, setIsPublish] = useState(false);
@@ -84,6 +86,8 @@ export function NewFileScreen() {
 
   const submit = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       setIsPublish(true);
 
       const event = new NDKEvent(ndk);

src/app/new/post.tsx

@@ -1,12 +1,14 @@
 import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
 import CharacterCount from '@tiptap/extension-character-count';
 import Image from '@tiptap/extension-image';
+import Mention from '@tiptap/extension-mention';
 import Placeholder from '@tiptap/extension-placeholder';
 import { EditorContent, useEditor } from '@tiptap/react';
 import StarterKit from '@tiptap/starter-kit';
 import { convert } from 'html-to-text';
-import { useEffect, useState } from 'react';
+import { nip19 } from 'nostr-tools';
-import { useSearchParams } from 'react-router-dom';
+import { useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { toast } from 'sonner';
 
 import { MediaUploader, MentionPopup } from '@app/new/components';
@@ -18,15 +20,20 @@ import { MentionNote } from '@shared/notes';
 
 import { WIDGET_KIND } from '@stores/constants';
 
+import { useSuggestion } from '@utils/hooks/useSuggestion';
 import { useWidget } from '@utils/hooks/useWidget';
 
 export function NewPostScreen() {
   const { ndk } = useNDK();
   const { addWidget } = useWidget();
+  const { suggestion } = useSuggestion();
 
   const [loading, setLoading] = useState(false);
+  const [height, setHeight] = useState(0);
   const [searchParams, setSearchParams] = useSearchParams();
 
+  const navigate = useNavigate();
+  const containerRef = useRef(null);
   const editor = useEditor({
     extensions: [
       StarterKit.configure(),
@@ -38,6 +45,14 @@ export function NewPostScreen() {
         },
       }),
       CharacterCount.configure(),
+      Mention.configure({
+        suggestion,
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        renderLabel({ options, node }) {
+          const npub = nip19.npubEncode(node.attrs.id);
+          return `nostr:${npub}`;
+        },
+      }),
     ],
     content: JSON.parse(localStorage.getItem('editor-post') || '{}'),
     editorProps: {
@@ -54,6 +69,8 @@ export function NewPostScreen() {
 
   const submit = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       setLoading(true);
 
       // get plaintext content
@@ -112,34 +129,40 @@ export function NewPostScreen() {
     }
   };
 
+  useLayoutEffect(() => {
+    setHeight(containerRef.current.clientHeight);
+  }, []);
+
   useEffect(() => {
     if (editor) editor.commands.focus('end');
   }, [editor]);
 
   return (
-    <div className="flex h-full flex-col justify-between">
+    <div className="flex flex-1 flex-col gap-4">
-      <div>
+      <div className="flex-1 overflow-y-auto">
-        <EditorContent
+        <div ref={containerRef} style={{ height: `${height}px` }}>
-          editor={editor}
+          <EditorContent
-          spellCheck="false"
+            editor={editor}
-          autoComplete="off"
+            spellCheck="false"
-          autoCorrect="off"
+            autoComplete="off"
-          autoCapitalize="off"
+            autoCorrect="off"
-        />
+            autoCapitalize="off"
-        {searchParams.get('replyTo') && (
+          />
-          <div className="relative max-w-lg">
+          {searchParams.get('replyTo') && (
-            <MentionNote id={searchParams.get('replyTo')} editing />
+            <div className="relative max-w-lg">
-            <button
+              <MentionNote id={searchParams.get('replyTo')} editing />
-              type="button"
+              <button
-              onClick={() => setSearchParams({})}
+                type="button"
-              className="absolute right-3 top-3 inline-flex h-6 w-6 items-center justify-center rounded bg-neutral-200 px-2 dark:bg-neutral-800"
+                onClick={() => setSearchParams({})}
-            >
+                className="absolute right-3 top-3 inline-flex h-6 w-6 items-center justify-center rounded bg-neutral-200 px-2 dark:bg-neutral-800"
-              <CancelIcon className="h-5 w-5" />
+              >
-            </button>
+                <CancelIcon className="h-5 w-5" />
-          </div>
+              </button>
-        )}
+            </div>
+          )}
+        </div>
       </div>
-      <div className="flex h-16 w-full items-center justify-between border-t border-neutral-100 dark:border-neutral-900">
+      <div className="inline-flex h-16 w-full items-center justify-between border-t border-neutral-100 bg-neutral-50 dark:border-neutral-900 dark:bg-neutral-950">
         <span className="text-sm font-medium tabular-nums text-neutral-600 dark:text-neutral-400">
           {editor?.storage?.characterCount.characters()} characters
         </span>

src/app/new/privkey.tsx

@@ -0,0 +1,86 @@
+import { NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
+import { getPublicKey, nip19 } from 'nostr-tools';
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';
+
+import { useNDK } from '@libs/ndk/provider';
+import { useStorage } from '@libs/storage/provider';
+
+export function NewPrivkeyScreen() {
+  const { db } = useStorage();
+  const { ndk } = useNDK();
+
+  const [nsec, setNsec] = useState('');
+  const navigate = useNavigate();
+
+  const save = async (content: string) => {
+    return await db.secureSave(db.account.pubkey, content);
+  };
+
+  const submit = async (isSave?: boolean) => {
+    try {
+      if (!nsec.startsWith('nsec1'))
+        return toast.info('You must enter a private key starts with nsec');
+
+      const decoded = nip19.decode(nsec);
+
+      if (decoded.type !== 'nsec') return toast.info('You must enter a valid nsec');
+
+      const privkey = decoded.data;
+      const pubkey = getPublicKey(privkey);
+
+      if (pubkey !== db.account.pubkey)
+        return toast.info(
+          'Your nsec is not match your current public key, please make sure you enter right nsec'
+        );
+
+      const signer = new NDKPrivateKeySigner(privkey);
+      ndk.signer = signer;
+
+      if (isSave) await save(privkey);
+
+      navigate(-1);
+    } catch (e) {
+      toast.error(e);
+    }
+  };
+
+  return (
+    <div className="flex h-full w-full items-center justify-center">
+      <div className="mb-16 flex flex-col gap-3">
+        <h1 className="text-center font-semibold text-neutral-900 dark:text-neutral-100">
+          You need to provide private key to sign nostr event.
+        </h1>
+        <input
+          name="privkey"
+          placeholder="nsec..."
+          type="password"
+          value={nsec}
+          onChange={(e) => setNsec(e.target.value)}
+          spellCheck={false}
+          autoComplete="off"
+          autoCorrect="off"
+          autoCapitalize="off"
+          className="h-11 w-full rounded-lg bg-neutral-100 px-3 py-2 placeholder:text-neutral-500 dark:bg-neutral-900 dark:placeholder:text-neutral-400"
+        />
+        <div className="mt-2 flex flex-col gap-2">
+          <button
+            type="button"
+            onClick={() => submit()}
+            className="inline-flex h-9 w-full shrink-0 items-center justify-center rounded-lg bg-blue-500 font-semibold text-white hover:bg-blue-600"
+          >
+            Submit
+          </button>
+          <button
+            type="button"
+            onClick={() => submit(true)}
+            className="inline-flex h-9 w-full shrink-0 items-center justify-center rounded-lg bg-neutral-100 font-medium text-neutral-900 hover:bg-neutral-200 dark:bg-neutral-900 dark:text-neutral-100 dark:hover:bg-neutral-800"
+          >
+            Submit and Save
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}

src/app/relays/components/relayList.tsx

@@ -1,7 +1,7 @@
 import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { message } from '@tauri-apps/plugin-dialog';
 import { normalizeRelayUrl } from 'nostr-fetch';
 import { useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';
 import { VList } from 'virtua';
 
 import { useStorage } from '@libs/storage/provider';
@@ -37,10 +37,14 @@ export function RelayList() {
     const url = normalizeRelayUrl(relayUrl);
     const res = await db.createRelay(url);
 
-    if (!res) await message("You're aldready connected to this relay");
+    if (res) {
-    queryClient.invalidateQueries({
+      toast.info('Connected. You need to restart app to take effect');
-      queryKey: ['user-relay'],
+      queryClient.invalidateQueries({
-    });
+        queryKey: ['user-relay'],
+      });
+    } else {
+      toast.warning("You're aldready connected to this relay");
+    }
   };
 
   return (

src/app/settings/about.tsx

@@ -1,3 +1,76 @@
+import { getVersion } from '@tauri-apps/api/app';
+import { relaunch } from '@tauri-apps/plugin-process';
+import { Update, check } from '@tauri-apps/plugin-updater';
+import { useEffect, useState } from 'react';
+import { Link } from 'react-router-dom';
+import { toast } from 'sonner';
+
 export function AboutScreen() {
-  return <div></div>;
+  const [version, setVersion] = useState('');
+  const [newUpdate, setNewUpdate] = useState<Update>(null);
+
+  const checkUpdate = async () => {
+    const update = await check();
+    if (!update) toast.info('There is no update available');
+    setNewUpdate(update);
+  };
+
+  const installUpdate = async () => {
+    await newUpdate.downloadAndInstall();
+    await relaunch();
+  };
+
+  useEffect(() => {
+    async function loadVersion() {
+      const appVersion = await getVersion();
+      setVersion(appVersion);
+    }
+
+    loadVersion();
+  }, []);
+
+  return (
+    <div className="mx-auto w-full max-w-lg">
+      <div className="flex items-center justify-center gap-2">
+        <img src="/icon.png" alt="Lume's logo" className="w-16 shrink-0" />
+        <div>
+          <h1 className="text-xl font-semibold">Lume</h1>
+          <p className="text-sm font-medium text-neutral-700 dark:text-neutral-300">
+            Version {version}
+          </p>
+        </div>
+      </div>
+      <div className="mx-auto mt-4 flex w-full max-w-xs flex-col gap-2">
+        {!newUpdate ? (
+          <button
+            type="button"
+            onClick={() => checkUpdate()}
+            className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-blue-500 text-sm font-medium text-white hover:bg-blue-600"
+          >
+            Check for update
+          </button>
+        ) : (
+          <button
+            type="button"
+            onClick={() => installUpdate()}
+            className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-blue-500 text-sm font-medium text-white hover:bg-blue-600"
+          >
+            Install {newUpdate.version}
+          </button>
+        )}
+        <Link
+          to="https://lume.nu"
+          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-neutral-100 text-sm font-medium hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
+        >
+          Website
+        </Link>
+        <Link
+          to="https://github.com/luminous-devs/lume/issues"
+          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-neutral-100 text-sm font-medium hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
+        >
+          Report a issue
+        </Link>
+      </div>
+    </div>
+  );
 }

src/app/settings/advanced.tsx

@@ -1,3 +1,29 @@
+import { useStorage } from '@libs/storage/provider';
+
 export function AdvancedSettingScreen() {
-  return <div></div>;
+  const { db } = useStorage();
+
+  const clearCache = async () => {
+    await db.clearCache();
+  };
+
+  return (
+    <div className="mx-auto w-full max-w-lg">
+      <div className="flex flex-col gap-6">
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center gap-8">
+            <div className="w-24 shrink-0 text-end text-sm font-semibold">Caches</div>
+            <div className="text-sm">Use for boost up NDK</div>
+          </div>
+          <button
+            type="button"
+            onClick={() => clearCache()}
+            className="h-8 w-max rounded-lg bg-blue-500 px-3 text-sm font-medium text-white hover:bg-blue-600"
+          >
+            Clear
+          </button>
+        </div>
+      </div>
+    </div>
+  );
 }

src/app/settings/backup.tsx

@@ -1,3 +1,64 @@
+import { nip19 } from 'nostr-tools';
+import { useEffect, useState } from 'react';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { EyeOffIcon } from '@shared/icons';
+
 export function BackupSettingScreen() {
-  return <div></div>;
+  const { db } = useStorage();
+
+  const [privkey, setPrivkey] = useState(null);
+  const [showPassword, setShowPassword] = useState(false);
+
+  const removePrivkey = async () => {
+    await db.secureRemove(db.account.pubkey);
+  };
+
+  useEffect(() => {
+    async function loadPrivkey() {
+      const key = await db.secureLoad(db.account.pubkey);
+      if (key) setPrivkey(key);
+    }
+
+    loadPrivkey();
+  }, []);
+
+  return (
+    <div className="mx-auto w-full max-w-lg">
+      <div className="mb-2 text-sm font-semibold">Private key</div>
+      <div>
+        {!privkey ? (
+          <div className="inline-flex h-24 w-full items-center justify-center rounded-lg bg-neutral-100 dark:bg-neutral-900">
+            You&apos;ve stored private key on Lume
+          </div>
+        ) : (
+          <>
+            <div className="relative">
+              <input
+                readOnly
+                type={showPassword ? 'text' : 'password'}
+                value={nip19.nsecEncode(privkey)}
+                className="relative h-11 w-full resize-none rounded-lg bg-neutral-200 py-1 pl-3 pr-11 text-neutral-900 !outline-none placeholder:text-neutral-600 dark:bg-neutral-800 dark:text-neutral-100 dark:placeholder:text-neutral-400"
+              />
+              <button
+                type="button"
+                onClick={() => setShowPassword(!showPassword)}
+                className="absolute right-1.5 top-1/2 inline-flex h-8 w-8 -translate-y-1/2 transform items-center justify-center rounded-lg bg-neutral-50 dark:bg-neutral-950"
+              >
+                <EyeOffIcon className="h-4 w-4" />
+              </button>
+            </div>
+            <button
+              type="button"
+              onClick={() => removePrivkey()}
+              className="mt-2 inline-flex h-9 w-full items-center justify-center gap-2 rounded-lg bg-red-200 px-6 font-medium text-red-500 hover:bg-red-500 hover:text-white focus:outline-none dark:hover:text-white"
+            >
+              Remove private key
+            </button>
+          </>
+        )}
+      </div>
+    </div>
+  );
 }

src/app/settings/components/profileCard.tsx

@@ -57,7 +57,7 @@ export function ProfileCard() {
                 {user?.display_name || user?.name}
               </h3>
               <p className="text-lg text-neutral-700 dark:text-neutral-300">
-                {user.nip05 || displayNpub(db.account.pubkey, 16)}
+                {user?.nip05 || displayNpub(db.account.pubkey, 16)}
               </p>
             </div>
           </div>

src/app/settings/editProfile.tsx

@@ -3,6 +3,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import { message } from '@tauri-apps/plugin-dialog';
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
+import { useNavigate } from 'react-router-dom';
 
 import { useNDK } from '@libs/ndk/provider';
 import { useStorage } from '@libs/storage/provider';
@@ -13,6 +14,7 @@ import { useNostr } from '@utils/hooks/useNostr';
 
 export function EditProfileScreen() {
   const queryClient = useQueryClient();
+  const navigate = useNavigate();
 
   const [loading, setLoading] = useState(false);
   const [picture, setPicture] = useState('');
@@ -46,10 +48,11 @@ export function EditProfileScreen() {
 
   const uploadAvatar = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       setLoading(true);
 
       const image = await upload();
-
       if (image) {
         setPicture(image);
         setLoading(false);
@@ -181,10 +184,7 @@ export function EditProfileScreen() {
             </label>
             <input
               type={'text'}
-              {...register('display_name', {
+              {...register('display_name')}
-                required: true,
-                minLength: 4,
-              })}
               spellCheck={false}
               className="relative h-11 w-full rounded-lg bg-neutral-100 px-3 py-1 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-900 dark:text-neutral-100"
             />
@@ -198,10 +198,7 @@ export function EditProfileScreen() {
             </label>
             <input
               type={'text'}
-              {...register('name', {
+              {...register('name')}
-                required: true,
-                minLength: 4,
-              })}
               spellCheck={false}
               className="relative h-11 w-full rounded-lg bg-neutral-100 px-3 py-1 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-900 dark:text-neutral-100"
             />
@@ -215,10 +212,7 @@ export function EditProfileScreen() {
             </label>
             <div className="relative">
               <input
-                {...register('nip05', {
+                {...register('nip05')}
-                  required: true,
-                  minLength: 4,
-                })}
                 spellCheck={false}
                 className="relative h-11 w-full rounded-lg bg-neutral-100 px-3 py-1 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-900 dark:text-neutral-100"
               />

src/app/settings/general.tsx

@@ -1,3 +1,277 @@
+import * as Switch from '@radix-ui/react-switch';
+import { invoke } from '@tauri-apps/api/primitives';
+import { getCurrent } from '@tauri-apps/api/window';
+import { disable, enable, isEnabled } from '@tauri-apps/plugin-autostart';
+import { isPermissionGranted, requestPermission } from '@tauri-apps/plugin-notification';
+import { useEffect, useState } from 'react';
+import { twMerge } from 'tailwind-merge';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { DarkIcon, LightIcon, SystemModeIcon } from '@shared/icons';
+
 export function GeneralSettingScreen() {
-  return <div></div>;
+  const { db } = useStorage();
+  const [settings, setSettings] = useState({
+    autoupdate: false,
+    autolaunch: false,
+    outbox: false,
+    media: true,
+    hashtag: true,
+    notification: true,
+    appearance: 'system',
+  });
+
+  const changeTheme = async (theme: 'light' | 'dark' | 'auto') => {
+    await invoke('plugin:theme|set_theme', { theme });
+    // update state
+    setSettings((prev) => ({ ...prev, appearance: theme }));
+  };
+
+  const toggleAutolaunch = async () => {
+    if (!settings.autolaunch) {
+      await enable();
+      // update state
+      setSettings((prev) => ({ ...prev, autolaunch: true }));
+    } else {
+      await disable();
+      // update state
+      setSettings((prev) => ({ ...prev, autolaunch: false }));
+    }
+  };
+
+  const toggleOutbox = async () => {
+    await db.createSetting('outbox', String(+!settings.outbox));
+    // update state
+    setSettings((prev) => ({ ...prev, outbox: !settings.outbox }));
+  };
+
+  const toggleMedia = async () => {
+    await db.createSetting('media', String(+!settings.media));
+    db.settings.media = !settings.media;
+    // update state
+    setSettings((prev) => ({ ...prev, media: !settings.media }));
+  };
+
+  const toggleHashtag = async () => {
+    await db.createSetting('hashtag', String(+!settings.hashtag));
+    db.settings.hashtag = !settings.hashtag;
+    // update state
+    setSettings((prev) => ({ ...prev, hashtag: !settings.hashtag }));
+  };
+
+  const toggleAutoupdate = async () => {
+    await db.createSetting('autoupdate', String(+!settings.autoupdate));
+    db.settings.autoupdate = !settings.autoupdate;
+    // update state
+    setSettings((prev) => ({ ...prev, autoupdate: !settings.autoupdate }));
+  };
+
+  const toggleNofitication = async () => {
+    if (settings.notification) return;
+
+    await requestPermission();
+    // update state
+    setSettings((prev) => ({ ...prev, notification: !settings.notification }));
+  };
+
+  useEffect(() => {
+    async function loadSettings() {
+      const theme = await getCurrent().theme();
+      setSettings((prev) => ({ ...prev, appearance: theme }));
+
+      const autostart = await isEnabled();
+      setSettings((prev) => ({ ...prev, autolaunch: autostart }));
+
+      const permissionGranted = await isPermissionGranted();
+      setSettings((prev) => ({ ...prev, notification: permissionGranted }));
+
+      const data = await db.getAllSettings();
+      if (!data) return;
+
+      data.forEach((item) => {
+        if (item.key === 'autoupdate')
+          setSettings((prev) => ({
+            ...prev,
+            autoupdate: !!parseInt(item.value),
+          }));
+
+        if (item.key === 'outbox')
+          setSettings((prev) => ({
+            ...prev,
+            outbox: !!parseInt(item.value),
+          }));
+
+        if (item.key === 'media')
+          setSettings((prev) => ({
+            ...prev,
+            media: !!parseInt(item.value),
+          }));
+
+        if (item.key === 'hashtag')
+          setSettings((prev) => ({
+            ...prev,
+            hashtag: !!parseInt(item.value),
+          }));
+
+        if (item.key === 'notification')
+          setSettings((prev) => ({
+            ...prev,
+            notification: !!parseInt(item.value),
+          }));
+      });
+    }
+
+    loadSettings();
+  }, []);
+
+  return (
+    <div className="mx-auto w-full max-w-lg">
+      <div className="flex flex-col gap-6">
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center gap-8">
+            <div className="w-24 shrink-0 text-end text-sm font-semibold">Updater</div>
+            <div className="text-sm">Auto download new update at Login</div>
+          </div>
+          <Switch.Root
+            checked={settings.autoupdate}
+            onClick={() => toggleAutoupdate()}
+            className="relative h-7 w-12 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
+          >
+            <Switch.Thumb className="block h-6 w-6 translate-x-0.5 rounded-full bg-white transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[19px]" />
+          </Switch.Root>
+        </div>
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center gap-8">
+            <div className="w-24 shrink-0 text-end text-sm font-semibold">Startup</div>
+            <div className="text-sm">Launch Lume at Login</div>
+          </div>
+          <Switch.Root
+            checked={settings.autolaunch}
+            onClick={() => toggleAutolaunch()}
+            className="relative h-7 w-12 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
+          >
+            <Switch.Thumb className="block h-6 w-6 translate-x-0.5 rounded-full bg-white transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[19px]" />
+          </Switch.Root>
+        </div>
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center gap-8">
+            <div className="w-24 shrink-0 text-end text-sm font-semibold">Gossip</div>
+            <div className="text-sm">Use Outbox model</div>
+          </div>
+          <Switch.Root
+            checked={settings.outbox}
+            onClick={() => toggleOutbox()}
+            className="relative h-7 w-12 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
+          >
+            <Switch.Thumb className="block h-6 w-6 translate-x-0.5 rounded-full bg-white transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[19px]" />
+          </Switch.Root>
+        </div>
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center gap-8">
+            <div className="w-24 shrink-0 text-end text-sm font-semibold">Media</div>
+            <div className="text-sm">Automatically load media</div>
+          </div>
+          <Switch.Root
+            checked={settings.media}
+            onClick={() => toggleMedia()}
+            className="relative h-7 w-12 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
+          >
+            <Switch.Thumb className="block h-6 w-6 translate-x-0.5 rounded-full bg-white transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[19px]" />
+          </Switch.Root>
+        </div>
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center gap-8">
+            <div className="w-24 shrink-0 text-end text-sm font-semibold">Hashtag</div>
+            <div className="text-sm">Hide all hashtags in content</div>
+          </div>
+          <Switch.Root
+            checked={settings.hashtag}
+            onClick={() => toggleHashtag()}
+            className="relative h-7 w-12 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
+          >
+            <Switch.Thumb className="block h-6 w-6 translate-x-0.5 rounded-full bg-white transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[19px]" />
+          </Switch.Root>
+        </div>
+        <div className="flex w-full items-center justify-between">
+          <div className="flex items-center gap-8">
+            <div className="w-24 shrink-0 text-end text-sm font-semibold">
+              Notification
+            </div>
+            <div className="text-sm">Automatically send notification</div>
+          </div>
+          <Switch.Root
+            checked={settings.notification}
+            disabled={settings.notification}
+            onClick={() => toggleNofitication()}
+            className="relative h-7 w-12 cursor-default rounded-full bg-neutral-200 outline-none data-[state=checked]:bg-blue-500 dark:bg-neutral-800"
+          >
+            <Switch.Thumb className="block h-6 w-6 translate-x-0.5 rounded-full bg-white transition-transform duration-100 will-change-transform data-[state=checked]:translate-x-[19px]" />
+          </Switch.Root>
+        </div>
+        <div className="flex w-full items-start gap-8">
+          <div className="w-24 shrink-0 text-end text-sm font-semibold">Appearance</div>
+          <div className="flex flex-1 gap-6">
+            <button
+              type="button"
+              onClick={() => changeTheme('light')}
+              className="flex flex-col items-center justify-center gap-0.5"
+            >
+              <div
+                className={twMerge(
+                  'inline-flex h-11 w-11 items-center justify-center rounded-lg',
+                  settings.appearance === 'light'
+                    ? 'bg-blue-500 text-white'
+                    : 'bg-neutral-100 dark:bg-neutral-900'
+                )}
+              >
+                <LightIcon className="h-5 w-5" />
+              </div>
+              <p className="text-sm font-medium text-neutral-700 dark:text-neutral-300">
+                Light
+              </p>
+            </button>
+            <button
+              type="button"
+              onClick={() => changeTheme('dark')}
+              className="flex flex-col items-center justify-center gap-0.5"
+            >
+              <div
+                className={twMerge(
+                  'inline-flex h-11 w-11 items-center justify-center rounded-lg',
+                  settings.appearance === 'dark'
+                    ? 'bg-blue-500 text-white'
+                    : 'bg-neutral-100 dark:bg-neutral-900'
+                )}
+              >
+                <DarkIcon className="h-5 w-5" />
+              </div>
+              <p className="text-sm font-medium text-neutral-700 dark:text-neutral-300">
+                Dark
+              </p>
+            </button>
+            <button
+              type="button"
+              onClick={() => changeTheme('auto')}
+              className="flex flex-col items-center justify-center gap-0.5"
+            >
+              <div
+                className={twMerge(
+                  'inline-flex h-11 w-11 items-center justify-center rounded-lg',
+                  settings.appearance === 'auto'
+                    ? 'bg-blue-500 text-white'
+                    : 'bg-neutral-100 dark:bg-neutral-900'
+                )}
+              >
+                <SystemModeIcon className="h-5 w-5" />
+              </div>
+              <p className="text-sm font-medium text-neutral-700 dark:text-neutral-300">
+                System
+              </p>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
 }

src/app/users/components/profile.tsx

@@ -2,7 +2,7 @@ import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
 import * as Avatar from '@radix-ui/react-avatar';
 import { minidenticon } from 'minidenticons';
 import { useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 
 import { UserStats } from '@app/users/components/stats';
@@ -22,45 +22,52 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
 
   const [followed, setFollowed] = useState(false);
 
+  const navigate = useNavigate();
   const svgURI =
     'data:image/svg+xml;utf8,' + encodeURIComponent(minidenticon(pubkey, 90, 50));
 
-  const follow = async (pubkey: string) => {
+  const follow = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+      setFollowed(true);
+
       const user = ndk.getUser({ pubkey: db.account.pubkey });
       const contacts = await user.follows();
       const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
 
-      if (add) {
+      if (!add) {
-        setFollowed(true);
+        toast.success('You already follow this user');
-      } else {
+        setFollowed(false);
-        toast('You already follow this user');
       }
-    } catch (error) {
+    } catch (e) {
-      console.log(error);
+      toast.error(e);
+      setFollowed(false);
     }
   };
 
-  const unfollow = async (pubkey: string) => {
+  const unfollow = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+      setFollowed(false);
+
       const user = ndk.getUser({ pubkey: db.account.pubkey });
       const contacts = await user.follows();
       contacts.delete(new NDKUser({ pubkey: pubkey }));
 
-      let list: string[][];
+      const list = [...contacts].map((item) => [
-      contacts.forEach((el) => list.push(['p', el.pubkey, el.relayUrls?.[0] || '', '']));
+        'p',
-
+        item.pubkey,
+        item.relayUrls?.[0] || '',
+        '',
+      ]);
       const event = new NDKEvent(ndk);
       event.content = '';
       event.kind = NDKKind.Contacts;
       event.tags = list;
 
-      const publishedRelays = await event.publish();
+      await event.publish();
-      if (publishedRelays) {
+    } catch (e) {
-        setFollowed(false);
+      toast.error(e);
-      }
-    } catch (error) {
-      console.log(error);
     }
   };
 
@@ -75,9 +82,9 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
   return (
     <>
       <div className="h-56 w-full overflow-hidden rounded-tl-lg">
-        {user.banner ? (
+        {user?.banner ? (
           <img
-            src={user.banner}
+            src={user?.banner}
             alt="user banner"
             className="h-full w-full rounded-tl-lg object-cover"
           />
@@ -109,10 +116,10 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
               <h5 className="text-center text-xl font-semibold text-neutral-900 dark:text-neutral-100">
                 {user.name || user.display_name || user.displayName || 'No name'}
               </h5>
-              {user.nip05 ? (
+              {user?.nip05 ? (
                 <NIP05
                   pubkey={pubkey}
-                  nip05={user?.nip05}
+                  nip05={user.nip05}
                   className="text-neutral-600 dark:text-neutral-400"
                 />
               ) : (
@@ -122,7 +129,7 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
               )}
             </div>
             <div className="flex flex-col gap-6">
-              {user.about || user.bio ? (
+              {user?.about || user?.bio ? (
                 <p className="mt-2 max-w-[500px] select-text break-words text-center text-neutral-900 dark:text-neutral-100">
                   {user.about || user.bio}
                 </p>
@@ -136,23 +143,23 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
             {followed ? (
               <button
                 type="button"
-                onClick={() => unfollow(pubkey)}
+                onClick={unfollow}
-                className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-600 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
+                className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-500 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
               >
                 Unfollow
               </button>
             ) : (
               <button
                 type="button"
-                onClick={() => follow(pubkey)}
+                onClick={follow}
-                className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-600 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
+                className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-500 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
               >
                 Follow
               </button>
             )}
             <Link
               to={`/chats/${pubkey}`}
-              className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-600 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
+              className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-500 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
             >
               Message
             </Link>

src/libs/ndk/instance.ts

@@ -1,7 +1,8 @@
 import NDK, { NDKNip46Signer, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
 import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
-import { message } from '@tauri-apps/plugin-dialog';
+import { ask } from '@tauri-apps/plugin-dialog';
 import { fetch } from '@tauri-apps/plugin-http';
+import { relaunch } from '@tauri-apps/plugin-process';
 import { NostrFetcher } from 'nostr-fetch';
 import { useEffect, useMemo, useState } from 'react';
 import { toast } from 'sonner';
@@ -61,81 +62,74 @@ export const NDKInstance = () => {
     }
   }
 
-  async function getSigner(instance: NDK) {
+  async function getSigner(nsecbunker?: boolean) {
-    if (!db.account) return null;
+    if (!db.account) return;
-
-    const localSignerPrivkey = await db.secureLoad(db.account.pubkey + '-bunker');
-    const userPrivkey = await db.secureLoad(db.account.pubkey);
 
     // NIP-46 Signer
-    if (localSignerPrivkey) {
+    if (nsecbunker) {
+      const localSignerPrivkey = await db.secureLoad(db.account.pubkey + '-nsecbunker');
       const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
-      const remoteSigner = new NDKNip46Signer(instance, db.account.id, localSigner);
+      // await remoteSigner.blockUntilReady();
-      await remoteSigner.blockUntilReady();
+      return new NDKNip46Signer(ndk, db.account.id, localSigner);
-
-      return remoteSigner;
     }
 
-    // Privkey Signer
+    // Private key Signer
-    if (userPrivkey) {
+    const userPrivkey = await db.secureLoad(db.account.pubkey);
-      return new NDKPrivateKeySigner(userPrivkey);
+    return new NDKPrivateKeySigner(userPrivkey);
-    }
   }
 
   async function initNDK() {
-    const outboxSetting = await db.getSettingValue('outbox');
-    const explicitRelayUrls = await getExplicitRelays();
-
-    const tauriAdapter = new NDKCacheAdapterTauri(db);
-    const instance = new NDK({
-      explicitRelayUrls,
-      cacheAdapter: tauriAdapter,
-      outboxRelayUrls: ['wss://purplepag.es'],
-      enableOutboxModel: outboxSetting === '1',
-    });
-
     try {
-      // connect
+      const outboxSetting = await db.getSettingValue('outbox');
-      await instance.connect(2000);
+      const bunkerSetting = await db.getSettingValue('nsecbunker');
+      const signer = await getSigner(!!parseInt(bunkerSetting));
+      const explicitRelayUrls = await getExplicitRelays();
 
-      // add signer
+      const tauriAdapter = new NDKCacheAdapterTauri(db);
-      const signer = await getSigner(instance);
+      const instance = new NDK({
+        explicitRelayUrls,
+        cacheAdapter: tauriAdapter,
+        outboxRelayUrls: ['wss://purplepag.es'],
+        blacklistRelayUrls: [],
+        enableOutboxModel: !!parseInt(outboxSetting),
+      });
       instance.signer = signer;
 
+      // connect
+      await instance.connect();
+
       // update account's metadata
       if (db.account) {
-        const circleSetting = await db.getSettingValue('circles');
-
         const user = instance.getUser({ pubkey: db.account.pubkey });
-        const follows = await user.follows();
+        if (user) {
-        const relayList = await user.relayList();
+          const follows = [...(await user.follows())].map((user) => user.pubkey);
+          const relayList = await user.relayList();
 
-        const followsAsArr = [];
+          // update user's follows
-        follows.forEach((user) => {
+          await db.updateAccount('follows', JSON.stringify(follows));
-          followsAsArr.push(user.pubkey);
-        });
 
-        // update user's follows
+          if (relayList)
-        await db.updateAccount('follows', JSON.stringify(followsAsArr));
+            // update user's relays
-        if (circleSetting !== '1')
+            for (const relay of relayList.relays) {
-          await db.updateAccount('circles', JSON.stringify(followsAsArr));
+              await db.createRelay(relay);
-
+            }
-        // update user's relay list
-        if (relayList) {
-          for (const relay of relayList.relays) {
-            await db.createRelay(relay);
-          }
         }
       }
-    } catch (error) {
-      await message(`NDK instance init failed: ${error}`, {
-        title: 'Lume',
-        type: 'error',
-      });
-    }
 
-    setNDK(instance);
+      setNDK(instance);
-    setRelayUrls(explicitRelayUrls);
+      setRelayUrls(explicitRelayUrls);
+    } catch (e) {
+      const yes = await ask(
+        `Something wrong, Lume is not working as expected, do you want to relaunch app?`,
+        {
+          title: 'Lume',
+          type: 'error',
+          okLabel: 'Yes',
+        }
+      );
+
+      if (yes) relaunch();
+    }
   }
 
   useEffect(() => {

src/libs/storage/instance.ts

@@ -12,6 +12,7 @@ import type {
   NDKCacheEvent,
   NDKCacheEventTag,
   NDKCacheUser,
+  NDKCacheUserProfile,
   Relays,
   Widget,
 } from '@utils/types';
@@ -20,11 +21,18 @@ export class LumeStorage {
   public db: Database;
   public account: Account | null;
   public platform: Platform | null;
+  public settings: {
+    autoupdate: boolean;
+    outbox: boolean;
+    media: boolean;
+    hashtag: boolean;
+  };
 
   constructor(sqlite: Database, platform: Platform) {
     this.db = sqlite;
     this.account = null;
     this.platform = platform;
+    this.settings = { autoupdate: false, outbox: false, media: true, hashtag: true };
   }
 
   public async secureSave(key: string, value: string) {
@@ -45,6 +53,20 @@ export class LumeStorage {
     return await invoke('secure_remove', { key });
   }
 
+  public async getAllCacheUsers() {
+    const results: Array<NDKCacheUser> = await this.db.select(
+      'SELECT * FROM ndk_users ORDER BY createdAt DESC;'
+    );
+
+    if (!results.length) return [];
+
+    const users: NDKCacheUserProfile[] = results.map((item) => ({
+      pubkey: item.pubkey,
+      ...JSON.parse(item.profile as string),
+    }));
+    return users;
+  }
+
   public async getCacheUser(pubkey: string) {
     const results: Array<NDKCacheUser> = await this.db.select(
       'SELECT * FROM ndk_users WHERE pubkey = $1 ORDER BY pubkey DESC LIMIT 1;',
@@ -156,7 +178,7 @@ export class LumeStorage {
 
   public async checkAccount() {
     const result: Array<{ total: string }> = await this.db.select(
-      'SELECT COUNT(*) AS "total" FROM accounts;'
+      'SELECT COUNT(*) AS "total" FROM accounts WHERE is_active = "1" ORDER BY id DESC LIMIT 1;'
     );
     return parseInt(result[0].total);
   }
@@ -416,7 +438,7 @@ export class LumeStorage {
       [relay, this.account.id]
     );
 
-    if (existRelays.length > 0) return false;
+    if (existRelays.length) return;
 
     return await this.db.execute(
       'INSERT OR IGNORE INTO relays (account_id, relay, purpose) VALUES ($1, $2, $3);',
@@ -429,10 +451,37 @@ export class LumeStorage {
   }
 
   public async createSetting(key: string, value: string) {
-    return await this.db.execute(
+    const currentSetting = await this.checkSettingValue(key);
-      'INSERT OR IGNORE INTO settings (key, value) VALUES ($1, $2);',
+
-      [key, value]
+    if (!currentSetting)
+      return await this.db.execute(
+        'INSERT OR IGNORE INTO settings (key, value) VALUES ($1, $2);',
+        [key, value]
+      );
+
+    const currentValue = !!parseInt(currentSetting);
+
+    return await this.db.execute('UPDATE settings SET value = $1 WHERE key = $2;', [
+      +!currentValue,
+      key,
+    ]);
+  }
+
+  public async getAllSettings() {
+    const results: { key: string; value: string }[] = await this.db.select(
+      'SELECT * FROM settings ORDER BY id DESC;'
     );
+    if (results.length < 1) return null;
+    return results;
+  }
+
+  public async checkSettingValue(key: string) {
+    const results: { key: string; value: string }[] = await this.db.select(
+      'SELECT * FROM settings WHERE key = $1 ORDER BY id DESC LIMIT 1;',
+      [key]
+    );
+    if (!results.length) return false;
+    return results[0].value;
   }
 
   public async getSettingValue(key: string) {
@@ -440,10 +489,16 @@ export class LumeStorage {
       'SELECT * FROM settings WHERE key = $1 ORDER BY id DESC LIMIT 1;',
       [key]
     );
-    if (results.length < 1) return null;
+    if (!results.length) return '0';
     return results[0].value;
   }
 
+  public async clearCache() {
+    await this.db.execute('DELETE FROM ndk_events;');
+    await this.db.execute('DELETE FROM ndk_eventtags;');
+    await this.db.execute('DELETE FROM ndk_users;');
+  }
+
   public async accountLogout() {
     // update current account status
     await this.db.execute("UPDATE accounts SET is_active = '0' WHERE id = $1;", [

src/libs/storage/provider.tsx

@@ -1,4 +1,3 @@
-import { appConfigDir } from '@tauri-apps/api/path';
 import { message } from '@tauri-apps/plugin-dialog';
 import { platform } from '@tauri-apps/plugin-os';
 import { relaunch } from '@tauri-apps/plugin-process';
@@ -21,7 +20,7 @@ const StorageContext = createContext<StorageContext>({
   db: undefined,
 });
 
-const StorageProvider = ({ children }: PropsWithChildren<object>) => {
+const StorageInstance = () => {
   const [db, setDB] = useState<LumeStorage>(undefined);
   const [isNewVersion, setIsNewVersion] = useState(false);
 
@@ -29,22 +28,41 @@ const StorageProvider = ({ children }: PropsWithChildren<object>) => {
     try {
       const sqlite = await Database.load('sqlite:lume_v2.db');
       const platformName = await platform();
-      const dir = await appConfigDir();
 
       const lumeStorage = new LumeStorage(sqlite, platformName);
       if (!lumeStorage.account) await lumeStorage.getActiveAccount();
 
-      // check update
+      const settings = await lumeStorage.getAllSettings();
-      const update = await check();
+      let autoUpdater = false;
-      if (update) {
-        setIsNewVersion(true);
 
-        await update.downloadAndInstall();
+      if (settings) {
-        await relaunch();
+        settings.forEach((item) => {
+          if (item.key === 'outbox') lumeStorage.settings.outbox = !!parseInt(item.value);
+
+          if (item.key === 'media') lumeStorage.settings.media = !!parseInt(item.value);
+
+          if (item.key === 'hashtag')
+            lumeStorage.settings.hashtag = !!parseInt(item.value);
+
+          if (item.key === 'autoupdate') {
+            if (parseInt(item.value)) autoUpdater = true;
+          }
+        });
+      }
+
+      if (autoUpdater) {
+        // check update
+        const update = await check();
+        // install new version
+        if (update) {
+          setIsNewVersion(true);
+
+          await update.downloadAndInstall();
+          await relaunch();
+        }
       }
 
       setDB(lumeStorage);
-      console.info(dir);
     } catch (e) {
       await message(`Cannot initialize database: ${e}`, {
         title: 'Lume',
@@ -57,6 +75,12 @@ const StorageProvider = ({ children }: PropsWithChildren<object>) => {
     if (!db) initLumeStorage();
   }, []);
 
+  return { db, isNewVersion };
+};
+
+const StorageProvider = ({ children }: PropsWithChildren<object>) => {
+  const { db, isNewVersion } = StorageInstance();
+
   if (!db)
     return (
       <div
@@ -84,7 +108,7 @@ const StorageProvider = ({ children }: PropsWithChildren<object>) => {
         <div className="absolute bottom-5 right-5 inline-flex items-center gap-2.5">
           <LoaderIcon className="h-6 w-6 animate-spin text-blue-500" />
           <p className="font-semibold">
-            {isNewVersion ? 'Found a new version, updating' : 'Checking for updates...'}
+            {isNewVersion ? 'Found a new version, updating...' : 'Starting...'}
           </p>
         </div>
       </div>

src/main.jsx

@@ -20,7 +20,7 @@ const root = createRoot(container);
 
 root.render(
   <QueryClientProvider client={queryClient}>
-    <Toaster position="top-center" closeButton />
+    <Toaster position="top-center" closeButton theme="system" />
     <StorageProvider>
       <NDKProvider>
         <App />

src/shared/icons/advancedSettings.tsx

@@ -0,0 +1,24 @@
+import { SVGProps } from 'react';
+
+export function AdvancedSettingsIcon(
+  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="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+        d="M13.75 7h-10m10 0a3.25 3.25 0 116.5 0 3.25 3.25 0 11-6.5 0zm6.5 10h-8m0 0a3.25 3.25 0 11-6.5 0m6.5 0a3.25 3.25 0 10-6.5 0m0 0h-2"
+      ></path>
+    </svg>
+  );
+}

src/shared/icons/dark.tsx

@@ -0,0 +1,22 @@
+import { SVGProps } from 'react';
+
+export function DarkIcon(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="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+        d="M21.248 11.811a6.5 6.5 0 01-9.06-9.06 9.25 9.25 0 109.06 9.06z"
+      ></path>
+    </svg>
+  );
+}

src/shared/icons/index.ts

@@ -78,3 +78,9 @@ export * from './heading2';
 export * from './heading3';
 export * from './bold';
 export * from './italic';
+export * from './user';
+export * from './advancedSettings';
+export * from './info';
+export * from './light';
+export * from './dark';
+export * from './system';

src/shared/icons/info.tsx

@@ -0,0 +1,32 @@
+import { SVGProps } from 'react';
+
+export function InfoIcon(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="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+        d="M10.75 11H12v5.25M21.25 12a9.25 9.25 0 11-18.5 0 9.25 9.25 0 0118.5 0z"
+      ></path>
+      <rect
+        width="1.25"
+        height="1.25"
+        x="11.375"
+        y="7.375"
+        fill="currentColor"
+        stroke="currentColor"
+        strokeWidth="0.25"
+        rx="0.625"
+      ></rect>
+    </svg>
+  );
+}

src/shared/icons/light.tsx

@@ -0,0 +1,22 @@
+import { SVGProps } from 'react';
+
+export function LightIcon(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="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+        d="M11.998 3.29V1.769M5.84 18.158l-1.077 1.078m7.235 2.997v-1.524m7.235-15.944l-1.077 1.077M20.707 12h1.523m-4.074 6.159l1.077 1.077M1.766 12h1.523m1.474-7.235L5.84 5.842m9.87 2.446a5.25 5.25 0 11-7.424 7.424 5.25 5.25 0 017.424-7.424z"
+      ></path>
+    </svg>
+  );
+}

src/shared/icons/system.tsx

@@ -0,0 +1,22 @@
+import { SVGProps } from 'react';
+
+export function SystemModeIcon(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="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+        d="M3.75 12.25V12a8.25 8.25 0 1116.5 0v.25m-18.5 4h20.5m-15.5 4h10.5"
+      ></path>
+    </svg>
+  );
+}

src/shared/icons/user.tsx

@@ -0,0 +1,21 @@
+import { SVGProps } from 'react';
+
+export function UserIcon(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"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+        d="M5.857 18.916C7.171 16.996 9.332 15.75 12 15.75c2.668 0 4.83 1.247 6.143 3.166m-12.286 0A9.215 9.215 0 0012 21.25c2.358 0 4.51-.882 6.143-2.334m-12.286 0a9.25 9.25 0 1112.286 0M15.25 10a3.25 3.25 0 11-6.5 0 3.25 3.25 0 016.5 0z"
+      ></path>
+    </svg>
+  );
+}

src/shared/layouts/new.tsx

@@ -1,4 +1,4 @@
-import { Link, NavLink, Outlet } from 'react-router-dom';
+import { Link, NavLink, Outlet, useLocation } from 'react-router-dom';
 import { twMerge } from 'tailwind-merge';
 import { WindowTitlebar } from 'tauri-controls';
 
@@ -6,32 +6,34 @@ import { useStorage } from '@libs/storage/provider';
 
 import { ArrowLeftIcon } from '@shared/icons';
 
-export function NewScreen() {
+export function NewLayout() {
   const { db } = useStorage();
+  const location = useLocation();
 
   return (
     <div className="flex h-screen w-screen flex-col bg-neutral-50 dark:bg-neutral-950">
       {db.platform !== 'macos' ? (
         <WindowTitlebar />
       ) : (
-        <div data-tauri-drag-region className="h-9" />
+        <div data-tauri-drag-region className="h-9 shrink-0" />
       )}
-      <div data-tauri-drag-region className="h-6" />
+      <div data-tauri-drag-region className="h-4 shrink-0" />
-      <div className="flex h-full min-h-0 w-full">
+      <div className="container mx-auto grid flex-1 grid-cols-8 px-4">
-        <div className="container mx-auto grid grid-cols-8 px-4">
+        <div className="col-span-1">
-          <div className="col-span-1">
+          <Link
-            <Link
+            to="/"
-              to="/"
+            className="inline-flex h-10 w-10 items-center justify-center rounded-lg bg-neutral-100 hover:bg-neutral-200 dark:bg-neutral-900"
-              className="inline-flex h-10 w-10 items-center justify-center rounded-lg bg-neutral-100 hover:bg-neutral-200 dark:bg-neutral-900"
+          >
-            >
+            <ArrowLeftIcon className="h-5 w-5" />
-              <ArrowLeftIcon className="h-5 w-5" />
+          </Link>
-            </Link>
+        </div>
-          </div>
+        <div className="col-span-6 flex flex-col">
-          <div className="relative col-span-6 flex flex-col">
+          <div className="mb-8 flex h-10 shrink-0 items-center gap-3">
-            <div className="mb-8 flex h-10 shrink-0 items-center gap-3">
+            {location.pathname !== '/new/privkey' ? (
               <div className="flex h-10 items-center gap-2 rounded-lg bg-neutral-100 px-0.5 dark:bg-neutral-800">
                 <NavLink
                   to="/new/"
+                  end
                   className={({ isActive }) =>
                     twMerge(
                       'inline-flex h-9 w-20 items-center justify-center rounded-lg text-sm font-medium',
@@ -64,13 +66,11 @@ export function NewScreen() {
                   File Sharing
                 </NavLink>
               </div>
-            </div>
+            ) : null}
-            <div className="h-full min-h-0 w-full">
-              <Outlet />
-            </div>
           </div>
-          <div className="col-span-1" />
+          <Outlet />
         </div>
+        <div className="col-span-1" />
       </div>
     </div>
   );

src/shared/layouts/settings.tsx

@@ -1,13 +1,21 @@
-import { NavLink, Outlet, ScrollRestoration } from 'react-router-dom';
+import { NavLink, Outlet, ScrollRestoration, useNavigate } from 'react-router-dom';
 import { twMerge } from 'tailwind-merge';
 import { WindowTitlebar } from 'tauri-controls';
 
 import { useStorage } from '@libs/storage/provider';
 
-import { SecureIcon, SettingsIcon } from '@shared/icons';
+import {
+  AdvancedSettingsIcon,
+  ArrowLeftIcon,
+  InfoIcon,
+  SecureIcon,
+  SettingsIcon,
+  UserIcon,
+} from '@shared/icons';
 
 export function SettingsLayout() {
   const { db } = useStorage();
+  const navigate = useNavigate();
 
   return (
     <div className="flex h-screen w-screen flex-col bg-neutral-50 dark:bg-neutral-950">
@@ -17,77 +25,90 @@ export function SettingsLayout() {
         <div data-tauri-drag-region className="h-9" />
       )}
       <div className="flex h-full min-h-0 w-full flex-col gap-8 overflow-y-auto pb-10">
-        <div className="flex h-20 w-full items-end justify-center gap-0.5 border-b border-neutral-200 pb-2 dark:border-neutral-800">
+        <div className="flex h-20 w-full items-center justify-between border-b border-neutral-200 px-2 pb-2 dark:border-neutral-900">
-          <NavLink
+          <div>
-            to="/settings/"
+            <button
-            className={({ isActive }) =>
+              type="button"
-              twMerge(
+              onClick={() => navigate(-1)}
-                'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 hover:bg-neutral-100 dark:hover:bg-neutral-900',
+              className="inline-flex h-12 w-12 items-center justify-center rounded-xl bg-neutral-100 dark:bg-neutral-900"
-                isActive
+            >
-                  ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
+              <ArrowLeftIcon className="h-5 w-5" />
-                  : ''
+            </button>
-              )
+          </div>
-            }
+          <div className="flex items-center gap-0.5">
-          >
+            <NavLink
-            <SettingsIcon className="h-6 w-6" />
+              to="/settings/"
-            <p className="text-sm font-medium">User</p>
+              end
-          </NavLink>
+              className={({ isActive }) =>
-          <NavLink
+                twMerge(
-            to="/settings/general"
+                  'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
-            className={({ isActive }) =>
+                  isActive
-              twMerge(
+                    ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
-                'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
+                    : ''
-                isActive
+                )
-                  ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
+              }
-                  : ''
+            >
-              )
+              <UserIcon className="h-6 w-6" />
-            }
+              <p className="text-sm font-medium">User</p>
-          >
+            </NavLink>
-            <SettingsIcon className="h-6 w-6" />
+            <NavLink
-            <p className="text-sm font-medium">General</p>
+              to="/settings/general"
-          </NavLink>
+              className={({ isActive }) =>
-          <NavLink
+                twMerge(
-            to="/settings/backup"
+                  'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
-            className={({ isActive }) =>
+                  isActive
-              twMerge(
+                    ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
-                'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
+                    : ''
-                isActive
+                )
-                  ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
+              }
-                  : ''
+            >
-              )
+              <SettingsIcon className="h-6 w-6" />
-            }
+              <p className="text-sm font-medium">General</p>
-          >
+            </NavLink>
-            <SecureIcon className="h-6 w-6" />
+            <NavLink
-            <p className="text-sm font-medium">Backup</p>
+              to="/settings/backup"
-          </NavLink>
+              className={({ isActive }) =>
-          <NavLink
+                twMerge(
-            to="/settings/advanced"
+                  'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
-            className={({ isActive }) =>
+                  isActive
-              twMerge(
+                    ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
-                'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
+                    : ''
-                isActive
+                )
-                  ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
+              }
-                  : ''
+            >
-              )
+              <SecureIcon className="h-6 w-6" />
-            }
+              <p className="text-sm font-medium">Backup</p>
-          >
+            </NavLink>
-            <SettingsIcon className="h-6 w-6" />
+            <NavLink
-            <p className="text-sm font-medium">Advanced</p>
+              to="/settings/advanced"
-          </NavLink>
+              className={({ isActive }) =>
-          <NavLink
+                twMerge(
-            to="/settings/about"
+                  'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
-            className={({ isActive }) =>
+                  isActive
-              twMerge(
+                    ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
-                'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
+                    : ''
-                isActive
+                )
-                  ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
+              }
-                  : ''
+            >
-              )
+              <AdvancedSettingsIcon className="h-6 w-6" />
-            }
+              <p className="text-sm font-medium">Advanced</p>
-          >
+            </NavLink>
-            <SettingsIcon className="h-6 w-6" />
+            <NavLink
-            <p className="text-sm font-medium">About</p>
+              to="/settings/about"
-          </NavLink>
+              className={({ isActive }) =>
+                twMerge(
+                  'flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900',
+                  isActive
+                    ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
+                    : ''
+                )
+              }
+            >
+              <InfoIcon className="h-6 w-6" />
+              <p className="text-sm font-medium">About</p>
+            </NavLink>
+          </div>
+          <div />
         </div>
         <Outlet />
         <ScrollRestoration />

src/shared/logout.tsx

@@ -1,5 +1,6 @@
 import * as AlertDialog from '@radix-ui/react-alert-dialog';
 import { useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';
 
 import { useNDK } from '@libs/ndk/provider';
 import { useStorage } from '@libs/storage/provider';
@@ -11,15 +12,21 @@ export function Logout() {
   const navigate = useNavigate();
 
   const logout = async () => {
-    ndk.signer = null;
+    try {
+      ndk.signer = null;
 
-    // remove account
+      // remove private key
-    await db.accountLogout();
+      await db.secureRemove(db.account.pubkey);
-    await db.secureRemove(db.account.pubkey);
+      await db.secureRemove(db.account.pubkey + '-bunker');
-    await db.secureRemove(db.account.pubkey + '-bunker');
 
-    // redirect to welcome screen
+      // logout
-    navigate('/auth/welcome');
+      await db.accountLogout();
+
+      // redirect to welcome screen
+      navigate('/auth/welcome');
+    } catch (e) {
+      toast.error(e);
+    }
   };
 
   return (
@@ -33,7 +40,7 @@ export function Logout() {
         </button>
       </AlertDialog.Trigger>
       <AlertDialog.Portal>
-        <AlertDialog.Overlay className="fixed inset-0 z-50 bg-black/50 backdrop-blur-2xl dark:bg-white/50" />
+        <AlertDialog.Overlay className="fixed inset-0 z-50 bg-black/20 backdrop-blur-sm dark:bg-black/20" />
         <AlertDialog.Content className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
           <div className="relative h-min w-full max-w-md rounded-xl bg-neutral-100 dark:bg-neutral-900">
             <div className="flex flex-col gap-1 border-b border-white/5 px-5 py-4">
@@ -54,13 +61,15 @@ export function Logout() {
                   Cancel
                 </button>
               </AlertDialog.Cancel>
-              <button
+              <AlertDialog.Action asChild>
-                type="button"
+                <button
-                onClick={() => logout()}
+                  type="button"
-                className="inline-flex h-9 items-center justify-center rounded-lg bg-red-500 px-4 text-sm font-medium text-white outline-none hover:bg-red-600"
+                  onClick={() => logout()}
-              >
+                  className="inline-flex h-9 items-center justify-center rounded-lg bg-red-500 px-4 text-sm font-medium text-white outline-none hover:bg-red-600"
-                Logout
+                >
-              </button>
+                  Logout
+                </button>
+              </AlertDialog.Action>
             </div>
           </div>
         </AlertDialog.Content>

src/shared/nip05.tsx

@@ -39,7 +39,6 @@ export const NIP05 = memo(function NIP05({
         if (!res.ok) throw new Error(`Failed to fetch NIP-05 service: ${nip05}`);
 
         const data: NIP05 = await res.json();
-
         if (data.names) {
           if (data.names[localPath] !== pubkey) return false;
           return true;

src/shared/notes/actions/reaction.tsx

@@ -1,8 +1,11 @@
 import { NDKEvent } from '@nostr-dev-kit/ndk';
 import * as Popover from '@radix-ui/react-popover';
 import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 
+import { useNDK } from '@libs/ndk/provider';
+
 import { ReactionIcon } from '@shared/icons';
 
 const REACTIONS = [
@@ -32,6 +35,9 @@ export function NoteReaction({ event }: { event: NDKEvent }) {
   const [open, setOpen] = useState(false);
   const [reaction, setReaction] = useState<string | null>(null);
 
+  const { ndk } = useNDK();
+  const navigate = useNavigate();
+
   const getReactionImage = (content: string) => {
     const reaction: { img: string } = REACTIONS.find((el) => el.content === content);
     return reaction.img;
@@ -39,6 +45,8 @@ export function NoteReaction({ event }: { event: NDKEvent }) {
 
   const react = async (content: string) => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       setReaction(content);
 
       // react

src/shared/notes/actions/repost.tsx

@@ -2,9 +2,12 @@ import { NDKEvent } from '@nostr-dev-kit/ndk';
 import * as AlertDialog from '@radix-ui/react-alert-dialog';
 import * as Tooltip from '@radix-ui/react-tooltip';
 import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 import { twMerge } from 'tailwind-merge';
 
+import { useNDK } from '@libs/ndk/provider';
+
 import { LoaderIcon, RepostIcon } from '@shared/icons';
 
 export function NoteRepost({ event }: { event: NDKEvent }) {
@@ -12,8 +15,13 @@ export function NoteRepost({ event }: { event: NDKEvent }) {
   const [isLoading, setIsLoading] = useState(false);
   const [isRepost, setIsRepost] = useState(false);
 
+  const { ndk } = useNDK();
+  const navigate = useNavigate();
+
   const submit = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       setIsLoading(true);
 
       // repsot

src/shared/notes/actions/zap.tsx

@@ -7,6 +7,9 @@ import { message } from '@tauri-apps/plugin-dialog';
 import { QRCodeSVG } from 'qrcode.react';
 import { useEffect, useRef, useState } from 'react';
 import CurrencyInput from 'react-currency-input-field';
+import { useNavigate } from 'react-router-dom';
+
+import { useNDK } from '@libs/ndk/provider';
 
 import { CancelIcon, ZapIcon } from '@shared/icons';
 
@@ -16,6 +19,9 @@ import { compactNumber } from '@utils/number';
 
 export function NoteZap({ event }: { event: NDKEvent }) {
   const nwc = useRef(null);
+  const navigate = useNavigate();
+
+  const { ndk } = useNDK();
   const { user } = useProfile(event.pubkey);
 
   const [walletConnectURL, setWalletConnectURL] = useState<string>(null);
@@ -28,6 +34,8 @@ export function NoteZap({ event }: { event: NDKEvent }) {
 
   const createZapRequest = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       const zapAmount = parseInt(amount) * 1000;
       const res = await event.zap(zapAmount, zapMessage);
 

src/shared/notes/replies/form.tsx

@@ -1,5 +1,6 @@
 import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
 import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 
 import { useNDK } from '@libs/ndk/provider';
@@ -9,12 +10,15 @@ import { ReplyMediaUploader } from '@shared/notes';
 
 export function NoteReplyForm({ rootEvent }: { rootEvent: NDKEvent }) {
   const { ndk } = useNDK();
+  const navigate = useNavigate();
 
   const [value, setValue] = useState('');
   const [loading, setLoading] = useState(false);
 
   const submit = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       setLoading(true);
 
       const event = new NDKEvent(ndk);

src/shared/titleBar.tsx

@@ -33,13 +33,13 @@ export function TitleBar({
       <div className="col-span-1 flex justify-center">
         {id === '9999' ? (
           <div className="isolate flex -space-x-2">
-            {db.account.circles
+            {db.account.follows
               ?.slice(0, 8)
               .map((item) => <User key={item} pubkey={item} variant="ministacked" />)}
-            {db.account.circles?.length > 8 ? (
+            {db.account.follows?.length > 8 ? (
               <div className="inline-flex h-6 w-6 items-center justify-center rounded-full bg-neutral-300 text-neutral-900 ring-1 ring-white dark:bg-neutral-700 dark:text-neutral-100 dark:ring-black">
                 <span className="text-[8px] font-medium">
-                  +{db.account.circles?.length - 8}
+                  +{db.account.follows?.length - 8}
                 </span>
               </div>
             ) : null}

src/shared/user.tsx

@@ -222,7 +222,7 @@ export const User = memo(function User({
             {user?.name || user?.display_name || user?.displayName}
           </h3>
           <p className="max-w-[10rem] truncate text-sm text-neutral-900 dark:text-neutral-100/70">
-            {user?.nip05 || user?.username || displayNpub(pubkey, 16)}
+            {user?.username || displayNpub(pubkey, 16)}
           </p>
         </div>
       </div>
@@ -541,7 +541,7 @@ export const User = memo(function User({
               </Avatar.Fallback>
             </Avatar.Root>
             <div className="flex flex-1 flex-col gap-2">
-              <div className="inline-flex flex-col gap-1">
+              <div className="inline-flex flex-col">
                 <h5 className="text-sm font-semibold">
                   {user?.name ||
                     user?.display_name ||
@@ -551,7 +551,7 @@ export const User = memo(function User({
                 {user?.nip05 ? (
                   <NIP05
                     pubkey={pubkey}
-                    nip05={user?.nip05}
+                    nip05={user.nip05}
                     className="max-w-[15rem] truncate text-sm text-neutral-500 dark:text-neutral-300"
                   />
                 ) : (

src/shared/userProfile.tsx

@@ -1,6 +1,6 @@
 import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
 import { useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 
 import { useNDK } from '@libs/ndk/provider';
@@ -17,6 +17,7 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
   const { user } = useProfile(pubkey);
 
   const [followed, setFollowed] = useState(false);
+  const navigate = useNavigate();
 
   const follow = async (pubkey: string) => {
     try {
@@ -36,6 +37,8 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
 
   const unfollow = async (pubkey: string) => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       const user = ndk.getUser({ pubkey: db.account.pubkey });
       const contacts = await user.follows();
       contacts.delete(new NDKUser({ pubkey: pubkey }));

src/shared/widgets/article.tsx

@@ -40,7 +40,7 @@ export function ArticleWidget({ widget }: { widget: Widget }) {
         } else {
           filter = {
             kinds: [NDKKind.Article],
-            authors: db.account.circles,
+            authors: db.account.follows,
           };
         }
 

src/shared/widgets/file.tsx

@@ -40,7 +40,7 @@ export function FileWidget({ widget }: { widget: Widget }) {
         } else {
           filter = {
             kinds: [1063],
-            authors: db.account.circles,
+            authors: db.account.follows,
           };
         }
 

src/shared/widgets/newsfeed.tsx

@@ -39,7 +39,7 @@ export function NewsfeedWidget() {
           relayUrls,
           {
             kinds: [NDKKind.Text, NDKKind.Repost],
-            authors: db.account.circles,
+            authors: db.account.follows,
           },
           FETCH_LIMIT,
           { asOf: pageParam === 0 ? undefined : pageParam, abortSignal: signal }

src/shared/widgets/other/addGroupFeeds.tsx

@@ -44,9 +44,9 @@ export function AddGroupFeeds({ currentWidgetId }: { currentWidgetId: string })
 
   return (
     <Dialog.Root>
-      <div className="inline-flex h-14 w-full items-center justify-between rounded-lg bg-white px-3 hover:shadow-md hover:shadow-neutral-200/50 dark:hover:shadow-neutral-800/50">
+      <div className="inline-flex h-14 w-full items-center justify-between rounded-lg bg-neutral-50 px-3 hover:shadow-md hover:shadow-neutral-200/50 dark:bg-neutral-950 dark:hover:shadow-neutral-800/50">
         <div className="inline-flex items-center gap-2.5">
-          <div className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-neutral-100">
+          <div className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-neutral-100 dark:bg-neutral-900">
             <GroupFeedsIcon className="h-4 w-4" />
           </div>
           <p className="font-medium">Group feeds</p>
@@ -96,7 +96,7 @@ export function AddGroupFeeds({ currentWidgetId }: { currentWidgetId: string })
                   Users
                 </span>
                 <div className="flex h-[420px] flex-col overflow-y-auto rounded-xl bg-neutral-100 py-2 dark:bg-neutral-900">
-                  {db.account.circles.map((item: string) => (
+                  {db.account.follows.map((item: string) => (
                     <button
                       key={item}
                       type="button"

src/shared/widgets/other/addHashtagFeeds.tsx

@@ -55,9 +55,9 @@ export function AddHashtagFeeds({ currentWidgetId }: { currentWidgetId: string }
 
   return (
     <Dialog.Root>
-      <div className="inline-flex h-14 w-full items-center justify-between rounded-lg bg-white px-3 hover:shadow-md hover:shadow-neutral-200/50 dark:hover:shadow-neutral-800/50">
+      <div className="inline-flex h-14 w-full items-center justify-between rounded-lg bg-neutral-50 px-3 hover:shadow-md hover:shadow-neutral-200/50 dark:bg-neutral-950 dark:hover:shadow-neutral-800/50">
         <div className="inline-flex items-center gap-2.5">
-          <div className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-neutral-100">
+          <div className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-neutral-100 dark:bg-neutral-900">
             <GroupFeedsIcon className="h-4 w-4" />
           </div>
           <p className="font-medium">Hashtag</p>

src/shared/widgets/other/liveUpdater.tsx

@@ -30,12 +30,12 @@ export function LiveUpdater({ status }: { status: QueryStatus }) {
   useEffect(() => {
     let sub: NDKSubscription = undefined;
 
-    if (status === 'success' && db.account && db.account.circles.length > 0) {
+    if (status === 'success' && db.account && db.account.follows.length > 0) {
       queryClient.fetchQuery({ queryKey: ['notification'] });
 
       const filter: NDKFilter = {
         kinds: [NDKKind.Text, NDKKind.Repost],
-        authors: db.account.circles,
+        authors: db.account.follows,
         since: Math.floor(Date.now() / 1000),
       };
 

src/shared/widgets/other/nostrBandUserProfile.tsx

@@ -1,11 +1,12 @@
-import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
+import { NDKUser } from '@nostr-dev-kit/ndk';
 import { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { toast } from 'sonner';
 
 import { useNDK } from '@libs/ndk/provider';
 import { useStorage } from '@libs/storage/provider';
 
-import { FollowIcon, UnfollowIcon } from '@shared/icons';
+import { FollowIcon } from '@shared/icons';
 
 import { shortenKey } from '@utils/shortenKey';
 
@@ -15,50 +16,30 @@ export interface Profile {
 }
 
 export function NostrBandUserProfile({ data }: { data: Profile }) {
-  const embedProfile = data.profile ? JSON.parse(data.profile.content) : null;
-  const profile = embedProfile;
-
   const { db } = useStorage();
   const { ndk } = useNDK();
 
   const [followed, setFollowed] = useState(false);
+  const navigate = useNavigate();
+
+  const profile = data.profile ? JSON.parse(data.profile.content) : null;
 
   const follow = async (pubkey: string) => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+      setFollowed(true);
+
       const user = ndk.getUser({ pubkey: db.account.pubkey });
       const contacts = await user.follows();
       const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
 
-      if (add) {
+      if (!add) {
-        setFollowed(true);
+        toast.success('You already follow this user');
-      } else {
-        toast('You already follow this user');
-      }
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  const unfollow = async (pubkey: string) => {
-    try {
-      const user = ndk.getUser({ pubkey: db.account.pubkey });
-      const contacts = await user.follows();
-      contacts.delete(new NDKUser({ pubkey: pubkey }));
-
-      let list: string[][];
-      contacts.forEach((el) => list.push(['p', el.pubkey, el.relayUrls?.[0] || '', '']));
-
-      const event = new NDKEvent(ndk);
-      event.content = '';
-      event.kind = NDKKind.Contacts;
-      event.tags = list;
-
-      const publishedRelays = await event.publish();
-      if (publishedRelays) {
         setFollowed(false);
       }
-    } catch (error) {
+    } catch (e) {
-      console.log(error);
+      toast.error(e);
+      setFollowed(false);
     }
   };
 
@@ -96,15 +77,7 @@ export function NostrBandUserProfile({ data }: { data: Profile }) {
             </div>
           </div>
           <div className="inline-flex items-center gap-2">
-            {followed ? (
+            {!followed ? (
-              <button
-                type="button"
-                onClick={() => unfollow(data.pubkey)}
-                className="inline-flex h-8 w-8 items-center justify-center rounded-md bg-neutral-200 text-neutral-900 backdrop-blur-xl hover:bg-blue-600 hover:text-white dark:bg-neutral-800 dark:text-neutral-100 dark:hover:text-white"
-              >
-                <UnfollowIcon className="h-4 w-4" />
-              </button>
-            ) : (
               <button
                 type="button"
                 onClick={() => follow(data.pubkey)}
@@ -112,7 +85,7 @@ export function NostrBandUserProfile({ data }: { data: Profile }) {
               >
                 <FollowIcon className="h-4 w-4" />
               </button>
-            )}
+            ) : null}
           </div>
         </div>
         <div className="mt-2 line-clamp-5 whitespace-pre-line break-all text-neutral-900 dark:text-neutral-100">

src/shared/widgets/other/toggleWidgetList.tsx

@@ -16,7 +16,7 @@ export function ToggleWidgetList() {
           onClick={() =>
             addWidget.mutate({ kind: WIDGET_KIND.list, title: '', content: '' })
           }
-          className="inline-flex h-14 w-14 items-center justify-center rounded-full bg-neutral-100 text-neutral-900 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
+          className="inline-flex h-14 w-14 items-center justify-center rounded-full bg-neutral-100 text-neutral-900 hover:bg-neutral-200 dark:bg-neutral-900 dark:text-neutral-100 dark:hover:bg-neutral-800"
         >
           <PlusIcon className="h-5 w-5" />
         </button>

src/shared/widgets/other/widgetList.tsx

@@ -65,9 +65,9 @@ export function WidgetList({ widget }: { widget: Widget }) {
             <div className="flex flex-col gap-3">
               <AddGroupFeeds currentWidgetId={widget.id} />
               <AddHashtagFeeds currentWidgetId={widget.id} />
-              <div className="inline-flex h-14 w-full items-center justify-between rounded-lg bg-white px-3 hover:shadow-md hover:shadow-neutral-200/50 dark:hover:shadow-neutral-800/50">
+              <div className="inline-flex h-14 w-full items-center justify-between rounded-lg bg-neutral-50 px-3 hover:shadow-md hover:shadow-neutral-200/50 dark:bg-neutral-950 dark:hover:shadow-neutral-800/50">
                 <div className="inline-flex items-center gap-2.5">
-                  <div className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-neutral-100">
+                  <div className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-neutral-100 dark:bg-neutral-900">
                     <ArticleIcon className="h-4 w-4" />
                   </div>
                   <p className="font-medium">Articles</p>
@@ -90,9 +90,9 @@ export function WidgetList({ widget }: { widget: Widget }) {
                   Add
                 </button>
               </div>
-              <div className="inline-flex h-14 w-full items-center justify-between rounded-lg bg-white px-3 hover:shadow-md hover:shadow-neutral-200/50 dark:hover:shadow-neutral-800/50">
+              <div className="inline-flex h-14 w-full items-center justify-between rounded-lg bg-neutral-50 px-3 hover:shadow-md hover:shadow-neutral-200/50 dark:bg-neutral-950 dark:hover:shadow-neutral-800/50">
                 <div className="inline-flex items-center gap-2.5">
-                  <div className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-neutral-100">
+                  <div className="inline-flex h-9 w-9 shrink-0 items-center justify-center rounded-md bg-neutral-100 dark:bg-neutral-900">
                     <MediaIcon className="h-4 w-4" />
                   </div>
                   <p className="font-medium">Media</p>

src/stores/constants.ts

@@ -1,6 +1,5 @@
 export const FULL_RELAYS = [
   'wss://relay.damus.io',
-  'wss://relayable.org',
   'wss://relay.nostr.band/all',
   'wss://nostr.mutinywallet.com',
 ];

src/utils/hooks/useRichContent.tsx

@@ -4,6 +4,8 @@ import { ReactNode } from 'react';
 import { Link } from 'react-router-dom';
 import reactStringReplace from 'react-string-replace';
 
+import { useStorage } from '@libs/storage/provider';
+
 import {
   Hashtag,
   ImagePreview,
@@ -44,6 +46,8 @@ const VIDEOS = [
 ];
 
 export function useRichContent(content: string, textmode: boolean = false) {
+  const { db } = useStorage();
+
   let parsedContent: string | ReactNode[] = content.replace(/\n+/g, '\n');
   let linkPreview: string;
   let images: string[] = [];
@@ -54,8 +58,10 @@ export function useRichContent(content: string, textmode: boolean = false) {
   const words = text.split(/( |\n)/);
 
   if (!textmode) {
-    images = words.filter((word) => IMAGES.some((el) => word.endsWith(el)));
+    if (db.settings.media) {
-    videos = words.filter((word) => VIDEOS.some((el) => word.endsWith(el)));
+      images = words.filter((word) => IMAGES.some((el) => word.endsWith(el)));
+      videos = words.filter((word) => VIDEOS.some((el) => word.endsWith(el)));
+    }
     events = words.filter((word) => NOSTR_EVENTS.some((el) => word.startsWith(el)));
   }
 
@@ -83,9 +89,10 @@ export function useRichContent(content: string, textmode: boolean = false) {
 
     if (hashtags.length) {
       hashtags.forEach((hashtag) => {
-        parsedContent = reactStringReplace(parsedContent, hashtag, (match, i) => (
+        parsedContent = reactStringReplace(parsedContent, hashtag, (match, i) => {
-          <Hashtag key={match + i} tag={hashtag} />
+          if (db.settings.hashtag) return <Hashtag key={match + i} tag={hashtag} />;
-        ));
+          return null;
+        });
       });
     }
 

src/utils/hooks/useSuggestion.ts

@@ -0,0 +1,79 @@
+import { MentionOptions } from '@tiptap/extension-mention';
+import { ReactRenderer } from '@tiptap/react';
+import tippy from 'tippy.js';
+
+import { MentionList } from '@app/new/components';
+
+import { useStorage } from '@libs/storage/provider';
+
+export function useSuggestion() {
+  const { db } = useStorage();
+
+  const suggestion: MentionOptions['suggestion'] = {
+    items: async ({ query }) => {
+      const users = await db.getAllCacheUsers();
+      return users
+        .filter((item) => {
+          if (item.name) return item.name.toLowerCase().startsWith(query.toLowerCase());
+          return item.displayName.toLowerCase().startsWith(query.toLowerCase());
+        })
+        .slice(0, 5);
+    },
+    render: () => {
+      let component;
+      let popup;
+
+      return {
+        onStart: (props) => {
+          component = new ReactRenderer(MentionList, {
+            props,
+            editor: props.editor,
+          });
+
+          if (!props.clientRect) {
+            return;
+          }
+
+          popup = tippy('body', {
+            getReferenceClientRect: props.clientRect,
+            appendTo: () => document.body,
+            content: component.element,
+            showOnCreate: true,
+            interactive: true,
+            trigger: 'manual',
+            placement: 'bottom-start',
+          });
+        },
+
+        onUpdate(props) {
+          component.updateProps(props);
+
+          if (!props.clientRect) {
+            return;
+          }
+
+          popup[0].setProps({
+            getReferenceClientRect: props.clientRect,
+          });
+        },
+
+        onKeyDown(props) {
+          if (props.event.key === 'Escape') {
+            popup[0].hide();
+
+            return true;
+          }
+
+          return component.ref?.onKeyDown(props);
+        },
+
+        onExit() {
+          popup[0].destroy();
+          component.destroy();
+        },
+      };
+    },
+  };
+
+  return { suggestion };
+}

src/utils/types.d.ts

@@ -122,6 +122,10 @@ export interface NDKCacheUser {
   createdAt: number;
 }
 
+export interface NDKCacheUserProfile extends NDKUserProfile {
+  pubkey: string;
+}
+
 export interface NDKCacheEvent {
   id: string;
   pubkey: string;