2.1.7

Feat/v2.1.6

.github/workflows/main.yml

@@ -51,8 +51,8 @@ jobs:
       - uses: tauri-apps/tauri-action@dev
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
           ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
@@ -62,7 +62,7 @@ jobs:
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
         with:
           tagName: v__VERSION__
-          releaseName: 'App v__VERSION__'
+          releaseName: 'v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'
           releaseDraft: true
           prerelease: false

package.json

@@ -2,7 +2,7 @@
   "name": "lume",
   "description": "the communication app",
   "private": true,
-  "version": "2.0.1",
+  "version": "2.1.7",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -19,10 +19,9 @@
   },
   "dependencies": {
     "@evilmartians/harmony": "^1.1.0",
-    "@getalby/sdk": "^2.5.0",
-    "@nostr-dev-kit/ndk": "^2.0.3",
-    "@nostr-dev-kit/ndk-cache-dexie": "^2.0.3",
-    "@nostr-fetch/adapter-ndk": "^0.13.0",
+    "@getalby/sdk": "^2.7.0",
+    "@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",
     "@radix-ui/react-collapsible": "^1.0.3",
@@ -30,24 +29,24 @@
     "@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/query-sync-storage-persister": "^5.4.3",
-    "@tanstack/react-query": "^5.0.5",
-    "@tanstack/react-query-persist-client": "^5.4.3",
-    "@tauri-apps/api": "^2.0.0-alpha.9",
-    "@tauri-apps/cli": "^2.0.0-alpha.16",
-    "@tauri-apps/plugin-clipboard-manager": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-dialog": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-fs": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-http": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-notification": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-os": "^2.0.0-alpha.3",
-    "@tauri-apps/plugin-process": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-shell": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-sql": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-updater": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-upload": "^2.0.0-alpha.2",
+    "@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",
+    "@tauri-apps/plugin-http": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-notification": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-os": "2.0.0-alpha.4",
+    "@tauri-apps/plugin-process": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-shell": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-sql": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-updater": "2.0.0-alpha.3",
+    "@tauri-apps/plugin-upload": "2.0.0-alpha.3",
     "@tiptap/extension-character-count": "^2.1.12",
     "@tiptap/extension-document": "^2.1.12",
     "@tiptap/extension-image": "^2.1.12",
@@ -60,65 +59,65 @@
     "@tiptap/starter-kit": "^2.1.12",
     "@tiptap/suggestion": "^2.1.12",
     "dayjs": "^1.11.10",
-    "destr": "^2.0.2",
-    "framer-motion": "^10.16.4",
+    "framer-motion": "^10.16.5",
     "html-to-text": "^9.0.5",
-    "immer": "^10.0.3",
+    "idb-keyval": "^6.2.1",
     "light-bolt11-decoder": "^3.0.0",
-    "lru-cache": "^10.0.1",
+    "lru-cache": "^10.1.0",
     "markdown-to-jsx": "^7.3.2",
-    "media-chrome": "^1.4.5",
-    "million": "^2.6.4",
+    "media-chrome": "^1.5.3",
     "minidenticons": "^4.2.0",
-    "nostr-fetch": "^0.13.0",
+    "nanoid": "^5.0.3",
+    "nostr-fetch": "^0.13.1",
     "nostr-tools": "^1.17.0",
     "qrcode.react": "^3.1.0",
     "re-resizable": "^6.9.11",
     "react": "^18.2.0",
-    "react-currency-input-field": "^3.6.11",
+    "react-currency-input-field": "^3.6.12",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.47.0",
+    "react-hook-form": "^7.48.2",
     "react-hotkeys-hook": "^4.4.1",
-    "react-router-dom": "^6.17.0",
-    "reactflow": "^11.9.4",
-    "sonner": "^1.0.3",
+    "react-router-dom": "^6.20.0",
+    "react-string-replace": "^1.1.1",
+    "reactflow": "^11.10.1",
+    "sonner": "^1.2.3",
     "tailwind-scrollbar": "^3.0.5",
-    "tauri-controls": "^0.2.0",
+    "tauri-controls": "github:reyamir/tauri-controls",
     "tippy.js": "^6.3.7",
-    "tiptap-markdown": "^0.8.2",
-    "virtua": "^0.15.6",
-    "zustand": "^4.4.4"
+    "tiptap-markdown": "^0.8.4",
+    "virtua": "^0.16.7",
+    "zustand": "^4.4.6"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",
-    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
-    "@types/html-to-text": "^9.0.3",
-    "@types/node": "^20.8.9",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
-    "@types/youtube-player": "^5.5.9",
-    "@typescript-eslint/eslint-plugin": "^6.9.0",
-    "@typescript-eslint/parser": "^6.9.0",
-    "@vitejs/plugin-react-swc": "^3.4.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@types/html-to-text": "^9.0.4",
+    "@types/node": "^20.10.0",
+    "@types/react": "^18.2.38",
+    "@types/react-dom": "^18.2.17",
+    "@types/youtube-player": "^5.5.11",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "@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.52.0",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "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-plugin-tailwindcss": "^0.5.6",
+    "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.0.1"
+version = "2.1.7"
 description = "the communication app"
 authors = ["Ren Amamiya"]
 license = "GPL-3.0"
@@ -28,10 +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

@@ -5,9 +5,9 @@
 
 use keyring::Entry;
 use std::time::Duration;
-use tauri::Manager;
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_sql::{Migration, MigrationKind};
+use tauri_plugin_theme::ThemePlugin;
 use webpage::{Webpage, WebpageOptions};
 
 #[derive(Clone, serde::Serialize)]
@@ -106,6 +106,7 @@ fn secure_remove(key: String) -> Result<(), ()> {
 }
 
 fn main() {
+  let mut ctx = tauri::generate_context!();
   tauri::Builder::default()
     .setup(|app| {
       #[cfg(desktop)]
@@ -114,16 +115,7 @@ fn main() {
         .plugin(tauri_plugin_updater::Builder::new().build())?;
       Ok(())
     })
-    .plugin(tauri_plugin_clipboard_manager::init())
-    .plugin(tauri_plugin_dialog::init())
-    .plugin(tauri_plugin_fs::init())
-    .plugin(tauri_plugin_http::init())
-    .plugin(tauri_plugin_notification::init())
-    .plugin(tauri_plugin_os::init())
-    .plugin(tauri_plugin_process::init())
-    .plugin(tauri_plugin_shell::init())
-    .plugin(tauri_plugin_upload::init())
-    .plugin(tauri_plugin_updater::Builder::new().build())
+    .plugin(ThemePlugin::init(ctx.config_mut()))
     .plugin(
       tauri_plugin_sql::Builder::default()
         .add_migrations(
@@ -145,24 +137,26 @@ fn main() {
         )
         .build(),
     )
+    .plugin(tauri_plugin_clipboard_manager::init())
+    .plugin(tauri_plugin_dialog::init())
+    .plugin(tauri_plugin_fs::init())
+    .plugin(tauri_plugin_http::init())
+    .plugin(tauri_plugin_notification::init())
+    .plugin(tauri_plugin_os::init())
+    .plugin(tauri_plugin_process::init())
+    .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!["--flag1", "--flag2"]),
+      Some(vec![]),
     ))
-    .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
-      println!("{}, {argv:?}, {cwd}", app.package_info().name);
-      app
-        .emit_all("single-instance", Payload { args: argv, cwd })
-        .unwrap();
-    }))
-    .plugin(tauri_plugin_upload::init())
-    .plugin(tauri_plugin_store::Builder::default().build())
     .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.0.1"
+    "version": "2.1.7"
   },
   "plugins": {
     "fs": {
@@ -45,15 +45,12 @@
   "tauri": {
     "bundle": {
       "active": true,
-      "appimage": {
-        "bundleMediaFramework": true
-      },
       "category": "SocialNetworking",
-      "copyright": "",
       "deb": {
         "depends": []
       },
       "externalBin": [],
+      "resources": [],
       "icon": [
         "icons/32x32.png",
         "icons/128x128.png",
@@ -61,8 +58,21 @@
         "icons/icon.icns",
         "icons/icon.ico"
       ],
+      "copyright": "",
       "identifier": "com.lume.nu",
-      "longDescription": "",
+      "longDescription": "The communication app build on Nostr Protocol",
+      "shortDescription": "",
+      "targets": "all",
+      "updater": {
+        "active": true,
+        "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3OTdCMkM3RjU5QzE2NzkKUldSNUZwejF4N0tYNTVHYjMrU0JkL090SlEyNUVLYU5TM2hTU3RXSWtEWngrZWJ4a0pydUhXZHEK",
+        "windows": {
+          "installMode": "quiet"
+        }
+      },
+      "appimage": {
+        "bundleMediaFramework": true
+      },
       "macOS": {
         "entitlements": null,
         "exceptionDomain": "",
@@ -72,10 +82,6 @@
         "providerShortName": null,
         "signingIdentity": null
       },
-      "resources": [],
-      "shortDescription": "",
-      "targets": "all",
-      "updater": {},
       "windows": {
         "certificateThumbprint": null,
         "digestAlgorithm": "sha256",

src/app.css

@@ -10,6 +10,10 @@
     word-wrap: break-word;
     overflow-wrap: break-word;
   }
+
+  .prose :where(iframe):not(:where([class~="not-prose"] *)) {
+		@apply aspect-video w-full h-auto mx-auto;
+	}
 }
 
 html {

src/app.tsx

@@ -1,4 +1,5 @@
 import { message } from '@tauri-apps/plugin-dialog';
+import { fetch } from '@tauri-apps/plugin-http';
 import { RouterProvider, createBrowserRouter, defer, redirect } from 'react-router-dom';
 import { ReactFlowProvider } from 'reactflow';
 
@@ -6,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';
 
@@ -54,8 +55,8 @@ export default function App() {
         {
           path: '',
           async lazy() {
-            const { SpaceScreen } = await import('@app/space');
-            return { Component: SpaceScreen };
+            const { HomeScreen } = await import('@app/home');
+            return { Component: HomeScreen };
           },
         },
         {
@@ -114,7 +115,7 @@ export default function App() {
     },
     {
       path: '/new',
-      element: <NewScreen />,
+      element: <NewLayout />,
       errorElement: <ErrorScreen />,
       children: [
         {
@@ -138,6 +139,13 @@ export default function App() {
             return { Component: NewFileScreen };
           },
         },
+        {
+          path: 'privkey',
+          async lazy() {
+            const { NewPrivkeyScreen } = await import('@app/new/privkey');
+            return { Component: NewPrivkeyScreen };
+          },
+        },
       ],
     },
     {
@@ -231,15 +239,50 @@ export default function App() {
         {
           path: '',
           async lazy() {
-            const { GeneralSettingsScreen } = await import('@app/settings/general');
-            return { Component: GeneralSettingsScreen };
+            const { UserSettingScreen } = await import('@app/settings');
+            return { Component: UserSettingScreen };
+          },
+        },
+        {
+          path: 'edit-profile',
+          async lazy() {
+            const { EditProfileScreen } = await import('@app/settings/editProfile');
+            return { Component: EditProfileScreen };
+          },
+        },
+        {
+          path: 'edit-contact',
+          async lazy() {
+            const { EditContactScreen } = await import('@app/settings/editContact');
+            return { Component: EditContactScreen };
+          },
+        },
+        {
+          path: 'general',
+          async lazy() {
+            const { GeneralSettingScreen } = await import('@app/settings/general');
+            return { Component: GeneralSettingScreen };
           },
         },
         {
           path: 'backup',
           async lazy() {
-            const { AccountSettingsScreen } = await import('@app/settings/account');
-            return { Component: AccountSettingsScreen };
+            const { BackupSettingScreen } = await import('@app/settings/backup');
+            return { Component: BackupSettingScreen };
+          },
+        },
+        {
+          path: 'advanced',
+          async lazy() {
+            const { AdvancedSettingScreen } = await import('@app/settings/advanced');
+            return { Component: AdvancedSettingScreen };
+          },
+        },
+        {
+          path: 'about',
+          async lazy() {
+            const { AboutScreen } = await import('@app/settings/about');
+            return { Component: AboutScreen };
           },
         },
       ],

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

@@ -23,7 +23,7 @@ export function Circle() {
   const enableLinks = async () => {
     setLoading(true);
 
-    const users = ndk.getUser({ hexpubkey: db.account.pubkey });
+    const users = ndk.getUser({ pubkey: db.account.pubkey });
     const follows = await users.follows();
 
     if (follows.size === 0) {

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/favoriteHashtag.tsx

@@ -11,10 +11,10 @@ export function FavoriteHashtag() {
     <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">
         <div>
-          <h5 className="font-semibold">Favorite hashtag</h5>
+          <h5 className="font-semibold">Favorite topic</h5>
           <p className="text-sm">
-            By adding favorite hashtag, Lume will display all contents related to this
-            hashtag as a column
+            By adding favorite topic, Lume will display all contents related to this topic
+            for you
           </p>
         </div>
         {hashtag ? (

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

@@ -12,22 +12,14 @@ export function FollowList() {
   const { status, data } = useQuery({
     queryKey: ['follows'],
     queryFn: async () => {
-      const user = ndk.getUser({ hexpubkey: db.account.pubkey });
-      const follows = await user.follows();
-      const followsAsArr = [];
-
-      follows.forEach((user) => {
-        followsAsArr.push(user.pubkey);
-      });
+      const user = ndk.getUser({ pubkey: db.account.pubkey });
+      const follows = [...(await user.follows())].map((user) => user.pubkey);
 
       // update db
-      await db.updateAccount('follows', JSON.stringify(followsAsArr));
-      await db.updateAccount('circles', JSON.stringify(followsAsArr));
+      await db.updateAccount('follows', JSON.stringify(follows));
+      db.account.follows = follows;
 
-      db.account.follows = followsAsArr;
-      db.account.circles = followsAsArr;
-
-      return followsAsArr;
+      return follows;
     },
     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;
 
@@ -165,7 +166,7 @@ export function ImportAccountScreen() {
             >
               <h5 className="mb-1.5 font-semibold">Account found</h5>
               <div className="flex w-full flex-col gap-2">
-                <div className="flex h-full w-full items-center justify-between rounded-lg bg-neutral-200 p-2">
+                <div className="flex h-full w-full items-center justify-between rounded-lg bg-neutral-200 p-2 dark:bg-neutral-800">
                   <User pubkey={pubkey} variant="simple" />
                   <button
                     type="button"
@@ -259,8 +260,8 @@ export function ImportAccountScreen() {
                         {db.platform === 'macos'
                           ? 'Apple Keychain (macOS)'
                           : db.platform === 'windows'
-                          ? 'Credential Manager (Windows)'
-                          : 'Secret Service (Linux)'}
+                            ? 'Credential Manager (Windows)'
+                            : '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/hashtag.tsx

@@ -2,71 +2,33 @@ import { message } from '@tauri-apps/plugin-dialog';
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { useStorage } from '@libs/storage/provider';
-
 import { ArrowLeftIcon, CheckCircleIcon, LoaderIcon } from '@shared/icons';
 
-import { WidgetKinds } from '@stores/constants';
+import { TOPICS, WIDGET_KIND } from '@stores/constants';
 import { useOnboarding } from '@stores/onboarding';
 
-const data = [
-  { hashtag: '#bitcoin' },
-  { hashtag: '#nostr' },
-  { hashtag: '#nostrdesign' },
-  { hashtag: '#security' },
-  { hashtag: '#zap' },
-  { hashtag: '#LFG' },
-  { hashtag: '#zapchain' },
-  { hashtag: '#shitcoin' },
-  { hashtag: '#plebchain' },
-  { hashtag: '#nodes' },
-  { hashtag: '#hodl' },
-  { hashtag: '#stacksats' },
-  { hashtag: '#nokyc' },
-  { hashtag: '#meme' },
-  { hashtag: '#memes' },
-  { hashtag: '#memestr' },
-  { hashtag: '#nostriches' },
-  { hashtag: '#dev' },
-  { hashtag: '#anime' },
-  { hashtag: '#waifu' },
-  { hashtag: '#manga' },
-  { hashtag: '#lume' },
-  { hashtag: '#snort' },
-  { hashtag: '#damus' },
-  { hashtag: '#primal' },
-];
+import { useWidget } from '@utils/hooks/useWidget';
 
 export function OnboardHashtagScreen() {
-  const { db } = useStorage();
-
   const [loading, setLoading] = useState(false);
-  const [tags, setTags] = useState(new Set<string>());
+  const [topic, setTopic] = useState(null);
 
   const navigate = useNavigate();
   const setHashtag = useOnboarding((state) => state.toggleHashtag);
 
-  const toggleTag = (tag: string) => {
-    if (tags.has(tag)) {
-      setTags((prev) => {
-        prev.delete(tag);
-        return new Set(prev);
-      });
-    } else {
-      if (tags.size >= 3) return;
-      setTags((prev) => new Set(prev.add(tag)));
-    }
-  };
+  const { addWidget } = useWidget();
 
   const submit = async () => {
     try {
       setLoading(true);
-
-      for (const tag of tags) {
-        await db.createWidget(WidgetKinds.global.hashtag, tag, tag.replace('#', ''));
-      }
-
       setHashtag();
+
+      addWidget.mutate({
+        kind: WIDGET_KIND.topic,
+        title: topic.title,
+        content: JSON.stringify(topic.content),
+      });
+
       navigate(-1);
     } catch (e) {
       setLoading(false);
@@ -89,19 +51,19 @@ export function OnboardHashtagScreen() {
       </div>
       <div className="mx-auto flex w-full max-w-md flex-col gap-10 px-3">
         <h1 className="text-center text-2xl font-semibold text-neutral-900 dark:text-neutral-100">
-          Choose {tags.size}/3 your favorite hashtag
+          Choose your favorite topic
         </h1>
         <div className="flex flex-col gap-4">
-          <div className="flex h-[420px] w-full flex-col overflow-y-auto rounded-xl bg-neutral-100 dark:bg-neutral-900">
-            {data.map((item: { hashtag: string }) => (
+          <div className="flex w-full flex-col gap-3">
+            {TOPICS.map((item) => (
               <button
-                key={item.hashtag}
+                key={item.title}
                 type="button"
-                onClick={() => toggleTag(item.hashtag)}
-                className="inline-flex items-center justify-between px-4 py-2 hover:bg-neutral-300 dark:hover:bg-neutral-700"
+                onClick={() => setTopic(item)}
+                className="inline-flex h-14 items-center justify-between rounded-xl bg-neutral-100 px-4 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800"
               >
-                <p className="text-neutral-900 dark:text-neutral-100">{item.hashtag}</p>
-                {tags.has(item.hashtag) && (
+                <p className="font-medium">{item.title}</p>
+                {topic && topic.title === item.title && (
                   <div>
                     <CheckCircleIcon className="h-5 w-5 text-teal-500" />
                   </div>
@@ -112,7 +74,7 @@ export function OnboardHashtagScreen() {
           <button
             type="button"
             onClick={submit}
-            disabled={loading || tags.size === 0}
+            disabled={loading || !topic}
             className="inline-flex h-9 w-full items-center justify-center gap-2 rounded-lg bg-blue-500 font-medium text-white hover:bg-blue-600 focus:outline-none disabled:opacity-50"
           >
             {loading ? (
@@ -121,7 +83,7 @@ export function OnboardHashtagScreen() {
                 <span>Adding...</span>
               </>
             ) : (
-              <span>Add {tags.size} tags & Continue</span>
+              <span>Add & Continue</span>
             )}
           </button>
         </div>

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';
@@ -31,7 +30,7 @@ export function OnboardingListScreen() {
     <div className="relative flex h-full w-full items-center justify-center">
       <div className="mx-auto flex w-full max-w-md flex-col gap-10">
         <div className="text-center">
-          <h1 className="text-2xl text-neutral-900 dark:text-neutral-100">
+          <h1 className="text-2xl font-light text-neutral-900 dark:text-neutral-100">
             You&apos;re almost ready to use Lume.
           </h1>
           <h2 className="text-xl font-semibold text-neutral-900 dark:text-neutral-100">
@@ -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
-              receiverPubkey={pubkey}
-              userPubkey={db.account.pubkey}
-              userPrivkey={''}
-            />
+            <ChatForm receiverPubkey={pubkey} />
           </div>
         </div>
       </div>

src/app/chats/components/chatForm.tsx

@@ -1,6 +1,6 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
-import { nip04 } from 'nostr-tools';
-import { useCallback, useState } from 'react';
+import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
+import { 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({
-  receiverPubkey,
-  userPrivkey,
-}: {
-  receiverPubkey: string;
-  userPubkey: string;
-  userPrivkey: string;
-}) {
+export function ChatForm({ receiverPubkey }: { receiverPubkey: 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();
-    const tags = [['p', receiverPubkey]];
+    try {
+      const recipient = new NDKUser({ pubkey: receiverPubkey });
+      const message = await ndk.signer.encrypt(recipient, value);
 
-    const event = new NDKEvent(ndk);
-    event.content = message;
-    event.kind = NDKKind.EncryptedDirectMessage;
-    event.tags = tags;
+      const event = new NDKEvent(ndk);
+      event.content = message;
+      event.kind = NDKKind.EncryptedDirectMessage;
+      event.tag(recipient);
 
-    await event.publish();
+      const publish = await event.publish();
 
-    // reset state
-    setValue('');
+      if (publish) 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,38 +3,22 @@ import { twMerge } from 'tailwind-merge';
 
 import { useDecryptMessage } from '@app/chats/hooks/useDecryptMessage';
 
-import { ImagePreview, LinkPreview, MentionNote, VideoPreview } from '@shared/notes';
-
-import { parser } from '@utils/parser';
-
-export function ChatMessage({ message, self }: { message: NDKEvent; self: boolean }) {
+export function ChatMessage({ message, isSelf }: { message: NDKEvent; isSelf: boolean }) {
   const decryptedContent = useDecryptMessage(message);
-  const richContent = parser(decryptedContent) ?? null;
 
   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'
       )}
     >
-      {!richContent ? (
+      {!decryptedContent ? (
         <p>Decrypting...</p>
       ) : (
-        <div>
-          <p className="select-text whitespace-pre-line">{richContent.parsed}</p>
-          <div>
-            {richContent.images.length > 0 && <ImagePreview urls={richContent.images} />}
-            {richContent.videos.length > 0 && <VideoPreview urls={richContent.videos} />}
-            {richContent.links.length > 0 && <LinkPreview urls={richContent.links} />}
-            {richContent.notes.length > 0 &&
-              richContent.notes.map((note: string) => (
-                <MentionNote key={note} id={note} />
-              ))}
-          </div>
-        </div>
+        <p className="select-text whitespace-pre-line break-all">{decryptedContent}</p>
       )}
     </div>
   );

src/app/chats/hooks/useDecryptMessage.tsx

@@ -14,7 +14,7 @@ export function useDecryptMessage(message: NDKEvent) {
     async function decryptContent() {
       try {
         const sender = new NDKUser({
-          hexpubkey:
+          pubkey:
             db.account.pubkey === message.pubkey
               ? message.tags.find((el) => el[0] === 'p')[1]
               : message.pubkey,

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 { Outlet } from 'react-router-dom';
+import { useCallback, useEffect } from 'react';
+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

@@ -1,85 +1,138 @@
-import { useEffect, useState } from 'react';
-import { useLocation, useRouteError } from 'react-router-dom';
+import { downloadDir } from '@tauri-apps/api/path';
+import { message, save } from '@tauri-apps/plugin-dialog';
+import { writeTextFile } from '@tauri-apps/plugin-fs';
+import { relaunch } from '@tauri-apps/plugin-process';
+import { useRouteError } from 'react-router-dom';
+
+import { useStorage } from '@libs/storage/provider';
 
 interface RouteError {
   statusText: string;
   message: string;
 }
 
-interface DebugInfo {
-  os: null | string;
-  appDir: null | string;
-}
-
 export function ErrorScreen() {
+  const { db } = useStorage();
   const error = useRouteError() as RouteError;
-  const location = useLocation();
 
-  const [debugInfo, setDebugInfo] = useState<DebugInfo>({
-    os: null,
-    appDir: null,
-  });
+  const restart = async () => {
+    await relaunch();
+  };
 
-  useEffect(() => {
-    async function getInformation() {
-      const { platform, version } = await import('@tauri-apps/plugin-os');
-      const { appConfigDir } = await import('@tauri-apps/api/path');
-
-      const platformName = await platform();
-      const osVersion = await version();
-      const appDir = await appConfigDir();
-
-      setDebugInfo({
-        os: platformName + ' ' + osVersion,
-        appDir: appDir,
+  const download = async () => {
+    try {
+      const downloadPath = await downloadDir();
+      const fileName = `nostr_keys_${new Date().toISOString()}.txt`;
+      const filePath = await save({
+        defaultPath: downloadPath + '/' + fileName,
       });
-    }
+      const nsec = await db.secureLoad(db.account.pubkey);
 
-    getInformation();
-  }, []);
+      if (filePath) {
+        if (nsec) {
+          await writeTextFile(
+            filePath,
+            `Nostr account, generated by Lume (lume.nu)\nPublic key: ${db.account.id}\nPrivate key: ${nsec}`
+          );
+        } else {
+          await writeTextFile(
+            filePath,
+            `Nostr account, generated by Lume (lume.nu)\nPublic key: ${db.account.id}`
+          );
+        }
+      } // else { user cancel action }
+    } catch (e) {
+      await message(e, { title: 'Cannot download account keys', type: 'error' });
+    }
+  };
 
   return (
-    <div className="flex h-full items-center justify-center">
-      <div className="flex w-full flex-col gap-4 px-4 md:max-w-lg md:px-0">
+    <div
+      data-tauri-drag-region
+      className="relative flex h-screen w-screen items-center justify-center bg-blue-600"
+    >
+      <div className="flex w-full max-w-2xl flex-col items-start gap-8">
         <div className="flex flex-col">
-          <h1 className="mb-1 text-2xl font-semibold text-white">
+          <h1 className="mb-3 text-4xl font-semibold text-blue-400">
             Sorry, an unexpected error has occurred.
           </h1>
-          <div className="mt-4 inline-flex h-16 items-center justify-center rounded-xl border border-dashed border-red-400 bg-red-200/10 px-5">
-            <p className="select-text text-sm font-medium text-red-400">
-              {error.statusText || error.message}
-            </p>
-          </div>
-          <div className="mt-4">
-            <p className="font-medium text-neutral-600 dark:text-neutral-400">
-              Current location: {location.pathname}
-            </p>
-            <p className="font-medium text-neutral-600 dark:text-neutral-400">
-              Platform: {debugInfo.os}
-            </p>
-          </div>
+          <h3 className="text-3xl font-semibold leading-snug text-white">
+            Don&apos;t panic, your account is safe.
+            <br />
+            Here are what things you can do:
+          </h3>
         </div>
-        <div className="flex flex-col gap-2">
-          <a
-            href="https://github.com/luminous-devs/lume/issues/new"
-            target="_blank"
-            rel="noreferrer"
-            className="inline-flex h-11 w-full items-center justify-center rounded-lg text-sm font-medium text-white backdrop-blur-xl hover:bg-white/10"
-          >
-            Click here to report the issue on GitHub
-          </a>
-          <button
-            type="button"
-            className="inline-flex h-11 w-full items-center justify-center rounded-lg text-sm font-medium text-white backdrop-blur-xl hover:bg-white/10"
-          >
-            Reload app
-          </button>
-          <button
-            type="button"
-            className="inline-flex h-11 w-full items-center justify-center rounded-lg text-sm font-medium text-white backdrop-blur-xl hover:bg-white/10"
-          >
-            Reset app
-          </button>
+        <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 to close and re-open the app
+            </div>
+            <button
+              type="button"
+              onClick={() => restart()}
+              className="h-9 w-28 rounded-lg bg-blue-800 px-3 font-medium text-white hover:bg-blue-900"
+            >
+              Restart
+            </button>
+          </div>
+          <div className="flex items-center justify-between rounded-xl bg-blue-700 px-3 py-4">
+            <div className="text-xl font-semibold text-white">
+              2. Backup Nostr account
+            </div>
+            <button
+              type="button"
+              onClick={() => download()}
+              className="h-9 w-28 rounded-lg bg-blue-800 px-3 font-medium text-white hover:bg-blue-900"
+            >
+              Download
+            </button>
+          </div>
+          <div className="rounded-xl bg-blue-700 px-3 py-4">
+            <div className="flex w-full flex-col gap-2">
+              <div className="flex w-full items-center justify-between">
+                <div className="text-xl font-semibold text-white">
+                  3. Report this issue to Lume&apos;s Devs
+                </div>
+                <a
+                  href="https://github.com/luminous-devs/lume/issues/new"
+                  target="_blank"
+                  rel="noreferrer"
+                  className="inline-flex h-9 w-28 items-center justify-center rounded-lg bg-blue-800 px-3 font-medium text-white hover:bg-blue-900"
+                >
+                  Report
+                </a>
+              </div>
+              <div className="inline-flex h-16 items-center justify-center overflow-y-auto rounded-lg border border-dashed border-red-300 bg-blue-800 px-5">
+                <p className="select-text break-all text-red-400">
+                  {error.statusText || error.message}
+                </p>
+              </div>
+            </div>
+          </div>
+          <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 another Nostr client
+              </div>
+              <div className="select-text text-lg font-medium text-blue-300">
+                <p>
+                  While waiting for Lume&apos;s Devs to release the bug fixes, you always can use
+                  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">
+                    snort.social
+                  </a>
+                  <a href="https://primal.net" className="hover:!underline">
+                    primal.net
+                  </a>
+                  <a href="https://nostrudel.ninja" className="hover:!underline">
+                    nostrudel.ninja
+                  </a>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>

src/app/explore/components/userLatestPosts.tsx

@@ -3,14 +3,7 @@ import { useQuery } from '@tanstack/react-query';
 import { useCallback } from 'react';
 
 import { LoaderIcon } from '@shared/icons';
-import {
-  ArticleNote,
-  FileNote,
-  NoteWrapper,
-  Repost,
-  TextNote,
-  UnknownNote,
-} from '@shared/notes';
+import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
 
 import { useNostr } from '@utils/hooks/useNostr';
 
@@ -28,31 +21,11 @@ export function UserLatestPosts({ pubkey }: { pubkey: string }) {
     (event: NDKEvent) => {
       switch (event.kind) {
         case NDKKind.Text:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <TextNote />
-            </NoteWrapper>
-          );
+          return <MemoizedTextNote key={event.id} event={event} />;
         case NDKKind.Repost:
-          return <Repost key={event.id} event={event} />;
-        case 1063:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <FileNote />
-            </NoteWrapper>
-          );
-        case NDKKind.Article:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <ArticleNote />
-            </NoteWrapper>
-          );
+          return <MemoizedRepost key={event.id} event={event} />;
         default:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <UnknownNote />
-            </NoteWrapper>
-          );
+          return <UnknownNote key={event.id} event={event} />;
       }
     },
     [data]

src/app/explore/components/userWithDrawer.tsx

@@ -29,9 +29,9 @@ export const UserWithDrawer = memo(function UserWithDrawer({
 
   const follow = async (pubkey: string) => {
     try {
-      const user = ndk.getUser({ hexpubkey: db.account.pubkey });
+      const user = ndk.getUser({ pubkey: db.account.pubkey });
       const contacts = await user.follows();
-      const add = await user.follow(new NDKUser({ hexpubkey: pubkey }), contacts);
+      const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
 
       if (add) {
         setFollowed(true);
@@ -45,14 +45,12 @@ export const UserWithDrawer = memo(function UserWithDrawer({
 
   const unfollow = async (pubkey: string) => {
     try {
-      const user = ndk.getUser({ hexpubkey: db.account.pubkey });
+      const user = ndk.getUser({ pubkey: db.account.pubkey });
       const contacts = await user.follows();
-      contacts.delete(new NDKUser({ hexpubkey: pubkey }));
+      contacts.delete(new NDKUser({ pubkey: pubkey }));
 
       let list: string[][];
-      contacts.forEach((el) =>
-        list.push(['p', el.pubkey, el.relayUrls?.[0] || '', el.profile?.name || ''])
-      );
+      contacts.forEach((el) => list.push(['p', el.pubkey, el.relayUrls?.[0] || '', '']));
 
       const event = new NDKEvent(ndk);
       event.content = '';

src/app/home/index.tsx

@@ -2,34 +2,30 @@ import { useQuery } from '@tanstack/react-query';
 import { useCallback, useRef, useState } from 'react';
 import { VList, VListHandle } from 'virtua';
 
-import { ToggleWidgetList } from '@app/space/components/toggle';
-import { WidgetList } from '@app/space/components/widgetList';
-
 import { useStorage } from '@libs/storage/provider';
 
 import { LoaderIcon } from '@shared/icons';
 import {
-  GlobalArticlesWidget,
-  GlobalFilesWidget,
-  GlobalHashtagWidget,
-  LocalArticlesWidget,
-  LocalFeedsWidget,
-  LocalFilesWidget,
-  LocalThreadWidget,
-  LocalUserWidget,
+  ArticleWidget,
+  FileWidget,
+  GroupWidget,
+  HashtagWidget,
   NewsfeedWidget,
   NotificationWidget,
+  ThreadWidget,
+  ToggleWidgetList,
+  TopicWidget,
   TrendingAccountsWidget,
   TrendingNotesWidget,
-  XfeedsWidget,
-  XhashtagWidget,
+  UserWidget,
+  WidgetList,
 } from '@shared/widgets';
 
-import { WidgetKinds } from '@stores/constants';
+import { WIDGET_KIND } from '@stores/constants';
 
 import { Widget } from '@utils/types';
 
-export function SpaceScreen() {
+export function HomeScreen() {
   const ref = useRef<VListHandle>(null);
   const [selectedIndex, setSelectedIndex] = useState(-1);
 
@@ -43,13 +39,13 @@ export function SpaceScreen() {
           id: '9998',
           title: 'Notification',
           content: '',
-          kind: WidgetKinds.local.notification,
+          kind: WIDGET_KIND.notification,
         },
         {
           id: '9999',
           title: 'Newsfeed',
           content: '',
-          kind: WidgetKinds.local.network,
+          kind: WIDGET_KIND.newsfeed,
         },
       ];
 
@@ -63,36 +59,30 @@ export function SpaceScreen() {
 
   const renderItem = useCallback((widget: Widget) => {
     switch (widget.kind) {
-      case WidgetKinds.local.feeds:
-        return <LocalFeedsWidget key={widget.id} params={widget} />;
-      case WidgetKinds.local.files:
-        return <LocalFilesWidget key={widget.id} params={widget} />;
-      case WidgetKinds.local.articles:
-        return <LocalArticlesWidget key={widget.id} params={widget} />;
-      case WidgetKinds.local.user:
-        return <LocalUserWidget key={widget.id} params={widget} />;
-      case WidgetKinds.local.thread:
-        return <LocalThreadWidget key={widget.id} params={widget} />;
-      case WidgetKinds.global.hashtag:
-        return <GlobalHashtagWidget key={widget.id} params={widget} />;
-      case WidgetKinds.global.articles:
-        return <GlobalArticlesWidget key={widget.id} params={widget} />;
-      case WidgetKinds.global.files:
-        return <GlobalFilesWidget key={widget.id} params={widget} />;
-      case WidgetKinds.nostrBand.trendingAccounts:
-        return <TrendingAccountsWidget key={widget.id} params={widget} />;
-      case WidgetKinds.nostrBand.trendingNotes:
-        return <TrendingNotesWidget key={widget.id} params={widget} />;
-      case WidgetKinds.tmp.xfeed:
-        return <XfeedsWidget key={widget.id} params={widget} />;
-      case WidgetKinds.tmp.xhashtag:
-        return <XhashtagWidget key={widget.id} params={widget} />;
-      case WidgetKinds.tmp.list:
-        return <WidgetList key={widget.id} params={widget} />;
-      case WidgetKinds.local.notification:
+      case WIDGET_KIND.notification:
         return <NotificationWidget key={widget.id} />;
-      case WidgetKinds.local.network:
+      case WIDGET_KIND.newsfeed:
         return <NewsfeedWidget key={widget.id} />;
+      case WIDGET_KIND.topic:
+        return <TopicWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.user:
+        return <UserWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.thread:
+        return <ThreadWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.article:
+        return <ArticleWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.file:
+        return <FileWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.hashtag:
+        return <HashtagWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.group:
+        return <GroupWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.trendingNotes:
+        return <TrendingNotesWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.trendingAccounts:
+        return <TrendingAccountsWidget key={widget.id} widget={widget} />;
+      case WIDGET_KIND.list:
+        return <WidgetList key={widget.id} widget={widget} />;
       default:
         return null;
     }
@@ -100,7 +90,7 @@ export function SpaceScreen() {
 
   if (status === 'pending') {
     return (
-      <div className="flex h-full w-full items-center justify-center">
+      <div className="flex h-full w-full items-center justify-center bg-white dark:bg-black">
         <LoaderIcon className="h-5 w-5 animate-spin" />
       </div>
     );
@@ -108,14 +98,15 @@ export function SpaceScreen() {
 
   return (
     <VList
-      className="h-full w-full flex-nowrap overflow-x-auto !overflow-y-hidden scrollbar-none focus:outline-none"
-      horizontal
       ref={ref}
+      className="h-full w-full flex-nowrap overflow-x-auto !overflow-y-hidden scrollbar-none focus:outline-none"
       initialItemSize={420}
       tabIndex={0}
+      horizontal
       onKeyDown={(e) => {
         if (!ref.current) return;
         switch (e.code) {
+          case 'ArrowUp':
           case 'ArrowLeft': {
             e.preventDefault();
             const prevIndex = Math.max(selectedIndex - 1, 0);
@@ -126,6 +117,7 @@ export function SpaceScreen() {
             });
             break;
           }
+          case 'ArrowDown':
           case 'ArrowRight': {
             e.preventDefault();
             const nextIndex = Math.min(selectedIndex + 1, data.length - 1);
@@ -136,6 +128,8 @@ export function SpaceScreen() {
             });
             break;
           }
+          default:
+            break;
         }
       }}
     >

src/app/new/article.tsx

@@ -1,10 +1,11 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
+import { NDKEvent, NDKKind, NDKTag } from '@nostr-dev-kit/ndk';
 import CharacterCount from '@tiptap/extension-character-count';
 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,13 +69,15 @@ export function NewArticleScreen() {
 
   const submit = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       setLoading(true);
 
       // get markdown content
       const content = editor.storage.markdown.getMarkdown();
 
       // define tags
-      const tags: string[][] = [
+      const tags: NDKTag[] = [
         ['d', ident],
         ['title', title],
         ['image', cover],
@@ -85,17 +91,20 @@ export function NewArticleScreen() {
         tags.push(['t', tag.replace('#', '')]);
       });
 
-      // publish message
       const event = new NDKEvent(ndk);
       event.content = content;
       event.kind = NDKKind.Article;
       event.tags = tags;
 
+      // publish
       const publishedRelays = await event.publish();
+
       if (publishedRelays) {
         toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
+
         // update state
         setLoading(false);
+
         // reset editor
         editor.commands.clearContent();
         localStorage.setItem('editor-article', '{}');
@@ -106,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-col gap-4">
-        {cover ? (
-          <img
-            src={cover}
-            alt="post cover"
-            className="h-72 w-full rounded-lg object-cover"
-          />
-        ) : null}
-        <div className="group flex justify-between gap-2">
-          <input
-            name="title"
-            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"
-            value={title}
-            onChange={(e) => setTitle(e.target.value)}
-          />
-          <div
-            className={twMerge(
-              'inline-flex shrink-0 gap-2 group-hover:inline-flex',
-              title.length > 0 ? '' : 'hidden'
-            )}
-          >
-            <ArticleCoverUploader setCover={setCover} />
-            <button
-              type="button"
-              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"
+    <div className="flex flex-1 flex-col justify-between">
+      <div className="flex-1 overflow-y-auto">
+        <div
+          className="flex flex-col gap-4"
+          ref={containerRef}
+          style={{ height: `${height}px` }}
+        >
+          {cover ? (
+            <img
+              src={cover}
+              alt="post cover"
+              className="h-72 w-full rounded-lg object-cover"
+            />
+          ) : null}
+          <div className="group flex justify-between gap-2">
+            <input
+              name="title"
+              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"
+              value={title}
+              onChange={(e) => setTitle(e.target.value)}
+            />
+            <div
+              className={twMerge(
+                'inline-flex shrink-0 gap-2 group-hover:inline-flex',
+                title.length > 0 ? '' : 'hidden'
+              )}
             >
-              <ThreadsIcon className="h-4 w-4" />
-              Add summary
-            </button>
-          </div>
-        </div>
-        {summary.open ? (
-          <div className="flex gap-3">
-            <div className="h-16 w-1 shrink-0 rounded-full bg-neutral-200 dark:bg-neutral-800" />
-            <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 }))
-                }
-              />
+              <ArticleCoverUploader setCover={setCover} />
+              <button
+                type="button"
+                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" />
+                Add summary
+              </button>
             </div>
           </div>
-        ) : null}
-        <div>
-          {editor && (
-            <FloatingMenu
+          {summary.open ? (
+            <div className="flex gap-3">
+              <div className="h-16 w-1 shrink-0 rounded-full bg-neutral-200 dark:bg-neutral-800" />
+              <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 }}
-              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}
-            spellCheck="false"
-            autoComplete="off"
-            autoCorrect="off"
-            autoCapitalize="off"
-          />
+              spellCheck="false"
+              autoComplete="off"
+              autoCorrect="off"
+              autoCapitalize="off"
+            />
+          </div>
         </div>
       </div>
       <div>
@@ -235,7 +254,7 @@ export function NewArticleScreen() {
         <div className="flex h-16 w-full items-center justify-between border-t border-neutral-100 dark:border-neutral-900">
           <div className="inline-flex items-center gap-3">
             <span className="text-sm font-medium tabular-nums text-neutral-600 dark:text-neutral-400">
-              {editor?.storage?.characterCount.characters()}
+              {editor?.storage?.characterCount.characters()} characters
             </span>
             <span className="text-sm font-medium tabular-nums text-neutral-600 dark:text-neutral-400">
               -

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/components/mentionPopupItem.tsx

@@ -1,5 +1,3 @@
-import { Image } from '@shared/image';
-
 import { useProfile } from '@utils/hooks/useProfile';
 import { displayNpub } from '@utils/shortenKey';
 
@@ -20,7 +18,7 @@ export function MentionPopupItem({ pubkey, embed }: { pubkey: string; embed?: st
 
   return (
     <div className="flex h-11 items-center justify-start gap-2.5 px-2 hover:bg-neutral-200 dark:bg-neutral-800">
-      <Image
+      <img
         src={user.picture || user.image}
         alt={pubkey}
         className="shirnk-0 h-8 w-8 rounded-md object-cover"

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 { useSearchParams } from 'react-router-dom';
+import { nip19 } from 'nostr-tools';
+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';
@@ -16,12 +18,22 @@ import { useNDK } from '@libs/ndk/provider';
 import { CancelIcon, LoaderIcon } from '@shared/icons';
 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, relayUrls } = useNDK();
+  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(),
@@ -33,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: {
@@ -49,13 +69,9 @@ export function NewPostScreen() {
 
   const submit = async () => {
     try {
-      setLoading(true);
+      if (!ndk.signer) return navigate('/new/privkey');
 
-      const reply = {
-        id: searchParams.get('id'),
-        root: searchParams.get('root'),
-        pubkey: searchParams.get('pubkey'),
-      };
+      setLoading(true);
 
       // get plaintext content
       const html = editor.getHTML();
@@ -66,47 +82,44 @@ export function NewPostScreen() {
         ],
       });
 
-      // define tags
-      let tags: string[][] = [];
-
-      // add reply to tags if present
-      if (reply.id && reply.pubkey) {
-        if (reply.root && reply.root.length > 1) {
-          tags = [
-            ['e', reply.root, relayUrls[0], 'root'],
-            ['e', reply.id, relayUrls[0], 'reply'],
-            ['p', reply.pubkey],
-          ];
-        } else {
-          tags = [
-            ['e', reply.id, relayUrls[0], 'reply'],
-            ['p', reply.pubkey],
-          ];
-        }
-      }
-
-      // add hashtag to tags if present
-      const hashtags = serializedContent
-        .split(/\s/gm)
-        .filter((s: string) => s.startsWith('#'));
-
-      hashtags?.forEach((tag: string) => {
-        tags.push(['t', tag.replace('#', '')]);
-      });
-
-      // publish message
       const event = new NDKEvent(ndk);
       event.content = serializedContent;
       event.kind = NDKKind.Text;
-      event.tags = tags;
 
+      // add reply to tags if present
+      const replyTo = searchParams.get('replyTo');
+      const rootReplyTo = searchParams.get('rootReplyTo');
+
+      if (rootReplyTo) {
+        const rootEvent = await ndk.fetchEvent(rootReplyTo);
+        event.tag(rootEvent, 'root');
+      }
+
+      if (replyTo) {
+        const replyEvent = await ndk.fetchEvent(replyTo);
+        event.tag(replyEvent, 'reply');
+      }
+
+      // publish event
       const publishedRelays = await event.publish();
+
       if (publishedRelays) {
         toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
+
         // update state
         setLoading(false);
-        // reset editor
         setSearchParams({});
+
+        // open new widget with this event id
+        if (!replyTo) {
+          addWidget.mutate({
+            title: 'Thread',
+            content: event.id,
+            kind: WIDGET_KIND.thread,
+          });
+        }
+
+        // reset editor
         editor.commands.clearContent();
         localStorage.setItem('editor-post', '{}');
       }
@@ -116,36 +129,42 @@ 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>
-        <EditorContent
-          editor={editor}
-          spellCheck="false"
-          autoComplete="off"
-          autoCorrect="off"
-          autoCapitalize="off"
-        />
-        {searchParams.get('id') && (
-          <div className="relative max-w-lg">
-            <MentionNote id={searchParams.get('id')} />
-            <button
-              type="button"
-              onClick={() => setSearchParams({})}
-              className="absolute right-3 top-3 inline-flex h-6 w-6 items-center justify-center rounded bg-neutral-300 px-2 dark:bg-neutral-700"
-            >
-              <CancelIcon className="h-4 w-4" />
-            </button>
-          </div>
-        )}
+    <div className="flex flex-1 flex-col gap-4">
+      <div className="flex-1 overflow-y-auto">
+        <div ref={containerRef} style={{ height: `${height}px` }}>
+          <EditorContent
+            editor={editor}
+            spellCheck="false"
+            autoComplete="off"
+            autoCorrect="off"
+            autoCapitalize="off"
+          />
+          {searchParams.get('replyTo') && (
+            <div className="relative max-w-lg">
+              <MentionNote id={searchParams.get('replyTo')} editing />
+              <button
+                type="button"
+                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>
+            </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()}
+          {editor?.storage?.characterCount.characters()} characters
         </span>
         <div className="flex items-center">
           <div className="inline-flex items-center gap-2">

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/notes/article.tsx

@@ -1,27 +1,44 @@
 import { writeText } from '@tauri-apps/plugin-clipboard-manager';
+import Markdown from 'markdown-to-jsx';
 import { nip19 } from 'nostr-tools';
-import { AddressPointer, EventPointer } from 'nostr-tools/lib/types/nip19';
-import { useRef, useState } from 'react';
+import { EventPointer } from 'nostr-tools/lib/types/nip19';
+import { useMemo, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
-import { ArrowLeftIcon, CheckCircleIcon, ReplyIcon, ShareIcon } from '@shared/icons';
-import { ArticleDetailNote, NoteActions, NoteReplyForm } from '@shared/notes';
+import { ArrowLeftIcon, CheckCircleIcon, ShareIcon } from '@shared/icons';
+import { NoteReplyForm } from '@shared/notes';
 import { ReplyList } from '@shared/notes/replies/list';
-import { User } from '@shared/user';
 
 import { useEvent } from '@utils/hooks/useEvent';
 
 export function ArticleNoteScreen() {
   const { id } = useParams();
-
-  const navigate = useNavigate();
-  const replyRef = useRef(null);
-
-  const naddr = id.startsWith('naddr') ? (nip19.decode(id).data as AddressPointer) : null;
-  const { status, data } = useEvent(id, naddr);
+  const { status, data } = useEvent(id);
 
   const [isCopy, setIsCopy] = useState(false);
 
+  const navigate = useNavigate();
+  const metadata = useMemo(() => {
+    if (status === 'pending') return;
+
+    const title = data.tags.find((tag) => tag[0] === 'title')?.[1];
+    const image = data.tags.find((tag) => tag[0] === 'image')?.[1];
+    const summary = data.tags.find((tag) => tag[0] === 'summary')?.[1];
+
+    let publishedAt: Date | string | number = data.tags.find(
+      (tag) => tag[0] === 'published_at'
+    )?.[1];
+
+    publishedAt = new Date(parseInt(publishedAt) * 1000).toLocaleDateString('en-US');
+
+    return {
+      title,
+      image,
+      publishedAt,
+      summary,
+    };
+  }, [data]);
+
   const share = async () => {
     await writeText(
       'https://njump.me/' +
@@ -33,69 +50,72 @@ export function ArticleNoteScreen() {
     setTimeout(() => setIsCopy(false), 2000);
   };
 
-  const scrollToReply = () => {
-    replyRef.current.scrollIntoView();
-  };
-
   return (
-    <div className="container mx-auto grid grid-cols-8 scroll-smooth px-4">
-      <div className="col-span-1">
-        <div className="flex flex-col items-end gap-4">
-          <button
-            type="button"
-            onClick={() => navigate(-1)}
-            className="inline-flex h-12 w-12 items-center justify-center rounded-xl bg-neutral-100 dark:bg-neutral-900"
-          >
-            <ArrowLeftIcon className="h-5 w-5" />
-          </button>
-          <div className="flex flex-col divide-y divide-neutral-200 rounded-xl bg-neutral-100 dark:divide-neutral-800 dark:bg-neutral-900">
-            <button
-              type="button"
-              onClick={share}
-              className="inline-flex h-12 w-12 items-center justify-center rounded-t-xl"
-            >
-              {isCopy ? (
-                <CheckCircleIcon className="h-5 w-5 text-teal-500" />
-              ) : (
-                <ShareIcon className="h-5 w-5" />
-              )}
-            </button>
-            <button
-              type="button"
-              onClick={scrollToReply}
-              className="inline-flex h-12 w-12 items-center justify-center rounded-b-xl"
-            >
-              <ReplyIcon className="h-5 w-5" />
-            </button>
-          </div>
-        </div>
-      </div>
-      <div className="relative col-span-6 flex flex-col overflow-y-auto">
-        <div className="mx-auto w-full max-w-2xl">
-          {status === 'pending' ? (
-            <div className="px-3 py-1.5">Loading...</div>
+    <div className="grid grid-cols-12 scroll-smooth px-4">
+      <div className="col-span-1 flex flex-col items-start">
+        <button
+          type="button"
+          onClick={() => navigate(-1)}
+          className="inline-flex h-12 w-12 items-center justify-center rounded-xl bg-neutral-100 dark:bg-neutral-900"
+        >
+          <ArrowLeftIcon className="h-5 w-5" />
+        </button>
+        <button
+          type="button"
+          onClick={share}
+          className="inline-flex h-12 w-12 items-center justify-center rounded-t-xl"
+        >
+          {isCopy ? (
+            <CheckCircleIcon className="h-5 w-5 text-teal-500" />
           ) : (
-            <div className="flex h-min w-full flex-col px-3">
-              <div className="mb-3 border-b border-neutral-100 pb-3 dark:border-neutral-900">
-                <User pubkey={data.pubkey} time={data.created_at} variant="thread" />
-                <div className="mt-3">
-                  <ArticleDetailNote event={data} />
-                </div>
-                <div className="mt-3">
-                  <NoteActions id={id} pubkey={data.pubkey} extraButtons={false} />
-                </div>
+            <ShareIcon className="h-5 w-5" />
+          )}
+        </button>
+      </div>
+      <div className="col-span-7 overflow-y-auto px-3 xl:col-span-8">
+        {status === 'pending' ? (
+          <div className="px-3 py-1.5">Loading...</div>
+        ) : (
+          <div className="flex flex-col gap-4">
+            <div className="flex flex-col gap-2 border-b border-neutral-100 pb-4 dark:border-neutral-900">
+              {metadata.image && (
+                <img
+                  src={metadata.image}
+                  alt={metadata.title}
+                  className="h-auto w-full rounded-lg object-cover"
+                />
+              )}
+              <div>
+                <h1 className="mb-2 text-3xl font-semibold">{metadata.title}</h1>
+                <span className="text-sm font-medium text-neutral-600 dark:text-neutral-400">
+                  Published: {metadata.publishedAt.toString()}
+                </span>
               </div>
             </div>
-          )}
-          <div ref={replyRef} className="px-3">
-            <div className="mb-3 border-b border-neutral-100 pb-3 dark:border-neutral-900">
-              <NoteReplyForm id={id} />
-            </div>
-            <ReplyList id={id} />
+            <Markdown
+              options={{
+                overrides: {
+                  a: {
+                    props: {
+                      className: 'text-blue-500 hover:text-blue-600',
+                      target: '_blank',
+                    },
+                  },
+                },
+              }}
+              className="break-p prose-lg prose-neutral dark:prose-invert prose-ul:list-disc"
+            >
+              {data.content}
+            </Markdown>
           </div>
-        </div>
+        )}
+      </div>
+      <div className="col-span-4 border-l border-neutral-100 px-3 dark:border-neutral-900 xl:col-span-3">
+        <div className="mb-3 border-b border-neutral-100 pb-3 dark:border-neutral-900">
+          <NoteReplyForm rootEvent={data} />
+        </div>
+        <ReplyList eventId={id} />
       </div>
-      <div className="col-span-1" />
     </div>
   );
 }

src/app/notes/text.tsx

@@ -7,25 +7,26 @@ import { useNavigate, useParams } from 'react-router-dom';
 
 import { ArrowLeftIcon, CheckCircleIcon, ReplyIcon, ShareIcon } from '@shared/icons';
 import {
-  ArticleNote,
-  FileNote,
+  ChildNote,
+  MemoizedTextKind,
   NoteActions,
   NoteReplyForm,
-  TextNote,
   UnknownNote,
 } from '@shared/notes';
 import { ReplyList } from '@shared/notes/replies/list';
 import { User } from '@shared/user';
 
 import { useEvent } from '@utils/hooks/useEvent';
+import { useNostr } from '@utils/hooks/useNostr';
 
 export function TextNoteScreen() {
-  const { id } = useParams();
-  const { status, data } = useEvent(id);
-
   const navigate = useNavigate();
   const replyRef = useRef(null);
 
+  const { id } = useParams();
+  const { status, data } = useEvent(id);
+  const { getEventThread } = useNostr();
+
   const [isCopy, setIsCopy] = useState(false);
 
   const share = async () => {
@@ -44,13 +45,24 @@ export function TextNoteScreen() {
   };
 
   const renderKind = (event: NDKEvent) => {
+    const thread = getEventThread(event.tags);
     switch (event.kind) {
       case NDKKind.Text:
-        return <TextNote content={event.content} />;
-      case NDKKind.Article:
-        return <ArticleNote event={event} />;
-      case 1063:
-        return <FileNote event={event} />;
+        return (
+          <>
+            {thread ? (
+              <div className="mb-2 w-full px-3">
+                <div className="flex h-min w-full flex-col gap-3 rounded-lg bg-neutral-100 p-3 dark:bg-neutral-900">
+                  {thread.rootEventId ? (
+                    <ChildNote id={thread.rootEventId} isRoot />
+                  ) : null}
+                  {thread.replyEventId ? <ChildNote id={thread.replyEventId} /> : null}
+                </div>
+              </div>
+            ) : null}
+            <MemoizedTextKind content={event.content} />
+          </>
+        );
       default:
         return <UnknownNote event={event} />;
     }
@@ -99,16 +111,16 @@ export function TextNoteScreen() {
                 <User pubkey={data.pubkey} time={data.created_at} variant="thread" />
                 <div className="mt-3">{renderKind(data)}</div>
                 <div className="mt-3">
-                  <NoteActions id={id} pubkey={data.pubkey} extraButtons={false} />
+                  <NoteActions event={data} canOpenEvent={false} />
                 </div>
               </div>
             </div>
           )}
           <div ref={replyRef} className="px-3">
             <div className="mb-3 border-b border-neutral-100 pb-3 dark:border-neutral-900">
-              <NoteReplyForm id={id} />
+              <NoteReplyForm rootEvent={data} />
             </div>
-            <ReplyList id={id} />
+            <ReplyList eventId={id} />
           </div>
         </div>
       </div>

src/app/relays/components/relayEventList.tsx

@@ -6,27 +6,20 @@ import { VList } from 'virtua';
 import { useNDK } from '@libs/ndk/provider';
 
 import { LoaderIcon } from '@shared/icons';
-import {
-  ArticleNote,
-  FileNote,
-  NoteWrapper,
-  Repost,
-  TextNote,
-  UnknownNote,
-} from '@shared/notes';
+import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
 
 export function RelayEventList({ relayUrl }: { relayUrl: string }) {
   const { fetcher } = useNDK();
   const { status, data } = useQuery({
-    queryKey: ['relay-event'],
+    queryKey: ['relay-events', relayUrl],
     queryFn: async () => {
       const url = 'wss://' + relayUrl;
       const events = await fetcher.fetchLatestEvents(
         [url],
         {
-          kinds: [NDKKind.Text, NDKKind.Repost, 1063, NDKKind.Article],
+          kinds: [NDKKind.Text, NDKKind.Repost],
         },
-        100
+        20
       );
       return events as unknown as NDKEvent[];
     },
@@ -37,31 +30,11 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) {
     (event: NDKEvent) => {
       switch (event.kind) {
         case NDKKind.Text:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <TextNote />
-            </NoteWrapper>
-          );
+          return <MemoizedTextNote key={event.id} event={event} />;
         case NDKKind.Repost:
-          return <Repost key={event.id} event={event} />;
-        case 1063:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <FileNote />
-            </NoteWrapper>
-          );
-        case NDKKind.Article:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <ArticleNote />
-            </NoteWrapper>
-          );
+          return <MemoizedRepost key={event.id} event={event} />;
         default:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <UnknownNote />
-            </NoteWrapper>
-          );
+          return <UnknownNote key={event.id} event={event} />;
       }
     },
     [data]
@@ -69,7 +42,7 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) {
 
   return (
     <div className="h-full">
-      <div className="mx-auto w-full max-w-[500px]">
+      <VList className="mx-auto w-full max-w-[500px] scrollbar-none">
         {status === 'pending' ? (
           <div className="flex h-full w-full items-center justify-center">
             <div className="inline-flex flex-col items-center justify-center gap-2">
@@ -78,13 +51,9 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) {
             </div>
           </div>
         ) : (
-          <VList className="h-full scrollbar-none">
-            <div className="h-10" />
-            {data.map((item) => renderItem(item))}
-            <div className="h-16" />
-          </VList>
+          data.map((item) => renderItem(item))
         )}
-      </div>
+      </VList>
     </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");
-    queryClient.invalidateQueries({
-      queryKey: ['user-relay'],
-    });
+    if (res) {
+      toast.info('Connected. You need to restart app to take effect');
+      queryClient.invalidateQueries({
+        queryKey: ['user-relay'],
+      });
+    } else {
+      toast.warning("You're aldready connected to this relay");
+    }
   };
 
   return (
@@ -56,7 +60,7 @@ export function RelayList() {
         <VList className="h-full">
           <div className="inline-flex h-16 w-full items-center border-b border-neutral-100 px-3 dark:border-neutral-900">
             <h3 className="font-semibold text-neutral-950 dark:text-neutral-50">
-              All relays used by your follows
+              All relays
             </h3>
           </div>
           {[...data].map(([key, value]) => (

src/app/relays/components/userRelay.tsx

@@ -36,7 +36,7 @@ export function UserRelay() {
           {data.map((item) => (
             <div
               key={item}
-              className="group flex h-10 items-center justify-between rounded-lg bg-neutral-200 pl-3 pr-1.5 dark:bg-neutral-800"
+              className="group flex h-10 items-center justify-between rounded-lg bg-neutral-100 pl-3 pr-1.5 dark:bg-neutral-900"
             >
               <div className="inline-flex items-center gap-2.5">
                 {relayUrls.includes(item) ? (

src/app/relays/relay.tsx

@@ -4,6 +4,8 @@ import { Await, useLoaderData, useNavigate, useParams } from 'react-router-dom';
 import { ArrowLeftIcon, LoaderIcon } from '@shared/icons';
 import { User } from '@shared/user';
 
+import { NIP11 } from '@utils/types';
+
 import { RelayEventList } from './components/relayEventList';
 
 export function RelayScreen() {
@@ -59,7 +61,7 @@ export function RelayScreen() {
                 </div>
               }
             >
-              {(resolvedRelay) => (
+              {(resolvedRelay: NIP11) => (
                 <div className="flex flex-col gap-5">
                   <div>
                     <h3 className="font-semibold leading-tight text-neutral-900 dark:text-neutral-100">
@@ -114,7 +116,7 @@ export function RelayScreen() {
                       Supported NIPs:
                     </h5>
                     <div className="mt-2 grid grid-cols-7 gap-2">
-                      {resolvedRelay.supported_nips.map((item: string) => (
+                      {resolvedRelay.supported_nips.map((item) => (
                         <a
                           key={item}
                           href={`https://nips.be/${item}`}

src/app/settings/about.tsx

@@ -0,0 +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() {
+  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/account.tsx

@@ -1,138 +0,0 @@
-import { nip19 } from 'nostr-tools';
-import { useMemo, useState } from 'react';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { EyeOffIcon, EyeOnIcon } from '@shared/icons';
-
-export function AccountSettingsScreen() {
-  const { db } = useStorage();
-
-  const [privType, setPrivType] = useState('password');
-  const [nsecType, setNsecType] = useState('password');
-
-  const privkey = 'todo';
-  const nsec = useMemo(() => nip19.nsecEncode(privkey), [privkey]);
-
-  const showPrivkey = () => {
-    if (privType === 'password') {
-      setPrivType('text');
-    } else {
-      setPrivType('password');
-    }
-  };
-
-  const showNsec = () => {
-    if (nsecType === 'password') {
-      setNsecType('text');
-    } else {
-      setNsecType('password');
-    }
-  };
-
-  return (
-    <div className="h-full w-full px-3 pt-11">
-      <div className="flex flex-col gap-2">
-        <h1 className="text-xl font-semibold text-white">Account</h1>
-        <div className="flex flex-col gap-4 rounded-xl bg-white/10 p-3 backdrop-blur-xl">
-          <div className="flex flex-col gap-1">
-            <label
-              htmlFor="pubkey"
-              className="text-base font-semibold text-neutral-600 dark:text-neutral-400"
-            >
-              Public Key
-            </label>
-            <input
-              readOnly
-              value={db.account.pubkey}
-              className="relative w-full rounded-lg bg-white/10 py-3 pl-3.5 pr-11 text-white !outline-none backdrop-blur-xl placeholder:text-neutral-600 dark:text-neutral-400"
-            />
-          </div>
-          <div className="flex flex-col gap-1">
-            <label
-              htmlFor="npub"
-              className="text-base font-semibold text-neutral-600 dark:text-neutral-400"
-            >
-              Npub
-            </label>
-            <input
-              readOnly
-              value={db.account.npub}
-              className="relative w-full rounded-lg bg-white/10 py-3 pl-3.5 pr-11 text-white !outline-none backdrop-blur-xl placeholder:text-neutral-600 dark:text-neutral-400"
-            />
-          </div>
-          <div className="flex flex-col gap-1">
-            <label
-              htmlFor="privkey"
-              className="text-base font-semibold text-neutral-600 dark:text-neutral-400"
-            >
-              Private Key
-            </label>
-            <div className="relative w-full">
-              <input
-                readOnly
-                type={privType}
-                value={privkey}
-                className="relative w-full rounded-lg bg-white/10 py-3 pl-3.5 pr-11 text-white !outline-none backdrop-blur-xl placeholder:text-neutral-600 dark:text-neutral-400"
-              />
-              <button
-                type="button"
-                onClick={() => showPrivkey()}
-                className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-neutral-700"
-              >
-                {privType === 'password' ? (
-                  <EyeOffIcon
-                    width={20}
-                    height={20}
-                    className="text-neutral-600 group-hover:text-white dark:text-neutral-400"
-                  />
-                ) : (
-                  <EyeOnIcon
-                    width={20}
-                    height={20}
-                    className="text-neutral-600 group-hover:text-white dark:text-neutral-400"
-                  />
-                )}
-              </button>
-            </div>
-          </div>
-          <div className="flex flex-col gap-1">
-            <label
-              htmlFor="privkey"
-              className="text-base font-semibold text-neutral-600 dark:text-neutral-400"
-            >
-              Nsec
-            </label>
-            <div className="relative w-full">
-              <input
-                readOnly
-                type={nsecType}
-                value={nsec}
-                className="relative w-full rounded-lg bg-white/10 py-3 pl-3.5 pr-11 text-white !outline-none backdrop-blur-xl placeholder:text-neutral-600 dark:text-neutral-400"
-              />
-              <button
-                type="button"
-                onClick={() => showNsec()}
-                className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-neutral-700"
-              >
-                {privType === 'password' ? (
-                  <EyeOffIcon
-                    width={20}
-                    height={20}
-                    className="text-neutral-600 group-hover:text-white dark:text-neutral-400"
-                  />
-                ) : (
-                  <EyeOnIcon
-                    width={20}
-                    height={20}
-                    className="text-neutral-600 group-hover:text-white dark:text-neutral-400"
-                  />
-                )}
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

src/app/settings/advanced.tsx

@@ -0,0 +1,29 @@
+import { useStorage } from '@libs/storage/provider';
+
+export function AdvancedSettingScreen() {
+  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

@@ -0,0 +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() {
+  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/autoStart.tsx

@@ -1,12 +0,0 @@
-export function AutoStartSetting() {
-  return (
-    <div className="inline-flex items-center justify-between px-5 py-4">
-      <div className="flex flex-col gap-1">
-        <span className="font-medium leading-none text-neutral-200">Auto start</span>
-        <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-          Auto start at login
-        </span>
-      </div>
-    </div>
-  );
-}

src/app/settings/components/cacheTime.tsx

@@ -1,40 +0,0 @@
-import { useState } from 'react';
-
-import { CheckCircleIcon } from '@shared/icons';
-
-export function CacheTimeSetting() {
-  const [time, setTime] = useState('0');
-
-  const update = async () => {
-    // await updateSetting('cache_time', time);
-  };
-
-  return (
-    <div className="inline-flex items-center justify-between px-5 py-4">
-      <div className="flex flex-col gap-1">
-        <span className="font-medium leading-none text-neutral-200">
-          Cache time (milliseconds)
-        </span>
-        <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-          The length of time before inactive data gets removed from the cache
-        </span>
-      </div>
-      <div className="inline-flex items-center gap-2">
-        <input
-          value={time}
-          onChange={(e) => setTime(e.currentTarget.value)}
-          autoCapitalize="none"
-          autoCorrect="none"
-          className="h-8 w-24 rounded-md bg-neutral-800 px-2 text-right font-medium text-neutral-300 focus:outline-none"
-        />
-        <button
-          type="button"
-          onClick={() => update()}
-          className="inline-flex h-8 w-8 items-center justify-center rounded-md bg-neutral-800 font-medium hover:bg-blue-600"
-        >
-          <CheckCircleIcon className="h-4 w-4 text-white" />
-        </button>
-      </div>
-    </div>
-  );
-}

src/app/settings/components/contactCard.tsx

@@ -0,0 +1,51 @@
+import { useQuery } from '@tanstack/react-query';
+import { Link } from 'react-router-dom';
+
+import { useNDK } from '@libs/ndk/provider';
+import { useStorage } from '@libs/storage/provider';
+
+import { EditIcon, LoaderIcon } from '@shared/icons';
+
+import { compactNumber } from '@utils/number';
+
+export function ContactCard() {
+  const { db } = useStorage();
+  const { ndk } = useNDK();
+  const { status, data } = useQuery({
+    queryKey: ['contacts'],
+    queryFn: async () => {
+      const user = ndk.getUser({ pubkey: db.account.pubkey });
+      const follows = await user.follows();
+      return [...follows];
+    },
+    refetchOnWindowFocus: false,
+  });
+
+  return (
+    <div className="col-span-1 h-44 rounded-2xl bg-neutral-100 transition-all duration-150 ease-smooth hover:scale-105 dark:bg-neutral-900">
+      {status === 'pending' ? (
+        <div className="flex h-full w-full items-center justify-center">
+          <LoaderIcon className="h-4 w-4 animate-spin" />
+        </div>
+      ) : (
+        <div className="flex h-full w-full flex-col justify-between p-4">
+          <h3 className="pt-1 text-5xl font-semibold tabular-nums text-neutral-900 dark:text-neutral-100">
+            {compactNumber.format(data.length)}
+          </h3>
+          <div className="mt-auto flex h-6 w-full items-center justify-between">
+            <p className="text-xl font-medium leading-none text-neutral-600 dark:text-neutral-400">
+              Contacts
+            </p>
+            <Link
+              to="/settings/edit-contact"
+              className="inline-flex h-6 w-max items-center gap-1 rounded-full bg-neutral-200 px-2.5 text-sm font-medium hover:bg-neutral-300 dark:bg-neutral-800 dark:hover:bg-neutral-700"
+            >
+              <EditIcon className="h-3 w-3" />
+              Edit
+            </Link>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

src/app/settings/components/dataPath.tsx

@@ -1,28 +0,0 @@
-import { appConfigDir } from '@tauri-apps/api/path';
-import { useEffect, useState } from 'react';
-
-export function DataPath() {
-  const [path, setPath] = useState<string>('');
-
-  useEffect(() => {
-    async function getPath() {
-      const dir = await appConfigDir();
-      setPath(dir);
-    }
-    getPath();
-  }, []);
-
-  return (
-    <div className="inline-flex items-center justify-between px-5 py-4">
-      <div className="flex flex-col gap-1">
-        <span className="font-medium leading-none text-neutral-200">App data path</span>
-        <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-          Where the local data is stored
-        </span>
-      </div>
-      <div className="inline-flex items-center gap-2">
-        <span className="font-medium text-neutral-300">{path}</span>
-      </div>
-    </div>
-  );
-}

src/app/settings/components/postCard.tsx

@@ -0,0 +1,61 @@
+import { useQuery } from '@tanstack/react-query';
+import { fetch } from '@tauri-apps/plugin-http';
+import { Link } from 'react-router-dom';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { LoaderIcon } from '@shared/icons';
+
+import { compactNumber } from '@utils/number';
+
+export function PostCard() {
+  const { db } = useStorage();
+  const { status, data } = useQuery({
+    queryKey: ['user-stats', db.account.pubkey],
+    queryFn: async ({ signal }: { signal: AbortSignal }) => {
+      const res = await fetch(
+        `https://api.nostr.band/v0/stats/profile/${db.account.pubkey}`,
+        {
+          signal,
+        }
+      );
+
+      if (!res.ok) {
+        throw new Error('Error');
+      }
+
+      return await res.json();
+    },
+    refetchOnWindowFocus: false,
+    refetchOnMount: false,
+    refetchOnReconnect: false,
+    staleTime: Infinity,
+  });
+
+  return (
+    <div className="col-span-1 h-44 rounded-2xl bg-neutral-100 transition-all duration-150 ease-smooth hover:scale-105 dark:bg-neutral-900">
+      {status === 'pending' ? (
+        <div className="flex h-full w-full items-center justify-center">
+          <LoaderIcon className="h-4 w-4 animate-spin" />
+        </div>
+      ) : (
+        <div className="flex h-full w-full flex-col justify-between p-4">
+          <h3 className="pt-1 text-5xl font-semibold tabular-nums text-neutral-900 dark:text-neutral-100">
+            {compactNumber.format(data.stats[db.account.pubkey].pub_note_count)}
+          </h3>
+          <div className="mt-auto flex h-6 w-full items-center justify-between">
+            <p className="text-xl font-medium leading-none text-neutral-600 dark:text-neutral-400">
+              Posts
+            </p>
+            <Link
+              to={`/users/${db.account.pubkey}`}
+              className="inline-flex h-6 w-max items-center gap-1 rounded-full bg-neutral-200 px-2.5 text-sm font-medium hover:bg-neutral-300 dark:bg-neutral-800 dark:hover:bg-neutral-700"
+            >
+              View
+            </Link>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

src/app/settings/components/profileCard.tsx

@@ -0,0 +1,68 @@
+import * as Avatar from '@radix-ui/react-avatar';
+import { minidenticon } from 'minidenticons';
+import { Link } from 'react-router-dom';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { EditIcon, LoaderIcon } from '@shared/icons';
+
+import { useProfile } from '@utils/hooks/useProfile';
+import { displayNpub } from '@utils/shortenKey';
+
+export function ProfileCard() {
+  const { db } = useStorage();
+  const { status, user } = useProfile(db.account.pubkey);
+
+  const svgURI =
+    'data:image/svg+xml;utf8,' +
+    encodeURIComponent(minidenticon(db.account.pubkey, 90, 50));
+
+  return (
+    <div className="mb-4 h-56 w-full rounded-2xl bg-neutral-100 transition-all duration-150 ease-smooth hover:scale-105 dark:bg-neutral-900">
+      {status === 'pending' ? (
+        <div className="flex h-full w-full items-center justify-center">
+          <LoaderIcon className="h-4 w-4 animate-spin" />
+        </div>
+      ) : (
+        <div className="flex h-full w-full flex-col justify-between p-4">
+          <div className="flex h-10 w-full justify-end">
+            <Link
+              to="/settings/edit-profile"
+              className="inline-flex h-8 w-20 items-center justify-center gap-1.5 rounded-full bg-neutral-200 text-sm font-medium hover:bg-neutral-400 dark:bg-neutral-800 dark:hover:bg-neutral-600"
+            >
+              <EditIcon className="h-4 w-4" />
+              Edit
+            </Link>
+          </div>
+          <div className="flex flex-col gap-2.5">
+            <Avatar.Root className="shrink-0">
+              <Avatar.Image
+                src={user?.picture || user?.image}
+                alt={db.account.pubkey}
+                loading="lazy"
+                decoding="async"
+                style={{ contentVisibility: 'auto' }}
+                className="h-16 w-16 rounded-xl border border-neutral-200/50 shadow-[rgba(17,_17,_26,_0.1)_0px_0px_16px] dark:border-neutral-800/50"
+              />
+              <Avatar.Fallback delayMs={300}>
+                <img
+                  src={svgURI}
+                  alt={db.account.pubkey}
+                  className="h-16 w-16 rounded-xl bg-black dark:bg-white"
+                />
+              </Avatar.Fallback>
+            </Avatar.Root>
+            <div>
+              <h3 className="text-3xl font-semibold leading-8 text-neutral-900 dark:text-neutral-100">
+                {user?.display_name || user?.name}
+              </h3>
+              <p className="text-lg text-neutral-700 dark:text-neutral-300">
+                {user?.nip05 || displayNpub(db.account.pubkey, 16)}
+              </p>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

src/app/settings/components/relayCard.tsx

@@ -0,0 +1,53 @@
+import { useQuery } from '@tanstack/react-query';
+import { Link } from 'react-router-dom';
+
+import { useNDK } from '@libs/ndk/provider';
+import { useStorage } from '@libs/storage/provider';
+
+import { EditIcon, LoaderIcon } from '@shared/icons';
+
+import { compactNumber } from '@utils/number';
+
+export function RelayCard() {
+  const { db } = useStorage();
+  const { ndk } = useNDK();
+  const { status, data } = useQuery({
+    queryKey: ['relays'],
+    queryFn: async () => {
+      const user = ndk.getUser({ pubkey: db.account.pubkey });
+      const relays = await user.relayList();
+
+      if (!relays) return Promise.reject(new Error("user's relay set not found"));
+      return relays;
+    },
+    refetchOnWindowFocus: false,
+  });
+
+  return (
+    <div className="col-span-1 h-44 rounded-2xl bg-neutral-100 transition-all duration-150 ease-smooth hover:scale-105 dark:bg-neutral-900">
+      {status === 'pending' ? (
+        <div className="flex h-full w-full items-center justify-center">
+          <LoaderIcon className="h-4 w-4 animate-spin" />
+        </div>
+      ) : (
+        <div className="flex h-full w-full flex-col justify-between p-4">
+          <h3 className="pt-1 text-5xl font-semibold tabular-nums text-neutral-900 dark:text-neutral-100">
+            {compactNumber.format(data?.relays?.length || 0)}
+          </h3>
+          <div className="mt-auto flex h-6 w-full items-center justify-between">
+            <p className="text-xl font-medium leading-none text-neutral-600 dark:text-neutral-400">
+              Relays
+            </p>
+            <Link
+              to="/relays"
+              className="inline-flex h-6 w-max items-center gap-1 rounded-full bg-neutral-200 px-2.5 text-sm font-medium hover:bg-neutral-300 dark:bg-neutral-800 dark:hover:bg-neutral-700"
+            >
+              <EditIcon className="h-3 w-3" />
+              Edit
+            </Link>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

src/app/settings/components/version.tsx

@@ -1,15 +0,0 @@
-export function VersionSetting() {
-  return (
-    <div className="inline-flex items-center justify-between px-5 py-4">
-      <div className="flex flex-col gap-1">
-        <span className="font-medium leading-none text-neutral-200">Version</span>
-        <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-          You&apos;re using latest version
-        </span>
-      </div>
-      <div className="inline-flex items-center gap-2">
-        <span className="font-medium text-neutral-300">2</span>
-      </div>
-    </div>
-  );
-}

src/app/settings/components/zapCard.tsx

@@ -0,0 +1,54 @@
+import { useQuery } from '@tanstack/react-query';
+import { fetch } from '@tauri-apps/plugin-http';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { LoaderIcon } from '@shared/icons';
+
+import { compactNumber } from '@utils/number';
+
+export function ZapCard() {
+  const { db } = useStorage();
+  const { status, data } = useQuery({
+    queryKey: ['user-stats', db.account.pubkey],
+    queryFn: async ({ signal }: { signal: AbortSignal }) => {
+      const res = await fetch(
+        `https://api.nostr.band/v0/stats/profile/${db.account.pubkey}`,
+        {
+          signal,
+        }
+      );
+
+      if (!res.ok) {
+        throw new Error('Error');
+      }
+
+      return await res.json();
+    },
+    refetchOnWindowFocus: false,
+    refetchOnMount: false,
+    refetchOnReconnect: false,
+    staleTime: Infinity,
+  });
+
+  return (
+    <div className="col-span-1 h-44 rounded-2xl bg-neutral-100 transition-all duration-150 ease-smooth hover:scale-105 dark:bg-neutral-900">
+      {status === 'pending' ? (
+        <div className="flex h-full w-full items-center justify-center">
+          <LoaderIcon className="h-4 w-4 animate-spin" />
+        </div>
+      ) : (
+        <div className="flex h-full w-full flex-col justify-between p-4">
+          <h3 className="pt-1 text-5xl font-semibold tabular-nums text-neutral-900 dark:text-neutral-100">
+            {compactNumber.format(
+              data?.stats[db.account.pubkey]?.zaps_received?.msats / 1000 || 0
+            )}
+          </h3>
+          <div className="mt-auto flex h-6 items-center text-xl font-medium leading-none text-neutral-600 dark:text-neutral-400">
+            Sats received
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

src/app/settings/editContact.tsx

@@ -0,0 +1,41 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { useNDK } from '@libs/ndk/provider';
+import { useStorage } from '@libs/storage/provider';
+
+import { LoaderIcon } from '@shared/icons';
+import { User } from '@shared/user';
+
+export function EditContactScreen() {
+  const { db } = useStorage();
+  const { ndk } = useNDK();
+  const { status, data } = useQuery({
+    queryKey: ['contacts'],
+    queryFn: async () => {
+      const user = ndk.getUser({ pubkey: db.account.pubkey });
+
+      const follows = await user.follows();
+      return [...follows];
+    },
+    refetchOnWindowFocus: false,
+  });
+
+  return (
+    <div className="mx-auto flex w-full max-w-xl flex-col gap-3">
+      {status === 'pending' ? (
+        <div className="flex h-10 w-full items-center justify-center">
+          <LoaderIcon className="h-4 w-4 animate-spin" />
+        </div>
+      ) : (
+        data.map((item) => (
+          <div
+            key={item.pubkey}
+            className="flex h-16 w-full items-center justify-between rounded-xl bg-neutral-100 px-2.5 dark:bg-neutral-900"
+          >
+            <User pubkey={item.pubkey} variant="simple" />
+          </div>
+        ))
+      )}
+    </div>
+  );
+}

src/app/settings/editProfile.tsx

@@ -0,0 +1,297 @@
+import { NDKEvent, NDKKind, NDKUserProfile } from '@nostr-dev-kit/ndk';
+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';
+
+import { CheckCircleIcon, LoaderIcon, PlusIcon, UnverifiedIcon } from '@shared/icons';
+
+import { useNostr } from '@utils/hooks/useNostr';
+
+export function EditProfileScreen() {
+  const queryClient = useQueryClient();
+  const navigate = useNavigate();
+
+  const [loading, setLoading] = useState(false);
+  const [picture, setPicture] = useState('');
+  const [banner, setBanner] = useState('');
+  const [nip05, setNIP05] = useState({ verified: true, text: '' });
+
+  const { db } = useStorage();
+  const { ndk } = useNDK();
+  const { upload } = useNostr();
+  const {
+    register,
+    handleSubmit,
+    reset,
+    setError,
+    formState: { isValid, errors },
+  } = useForm({
+    defaultValues: async () => {
+      const res: NDKUserProfile = queryClient.getQueryData(['user', db.account.pubkey]);
+      if (res.image) {
+        setPicture(res.image);
+      }
+      if (res.banner) {
+        setBanner(res.banner);
+      }
+      if (res.nip05) {
+        setNIP05((prev) => ({ ...prev, text: res.nip05 }));
+      }
+      return res;
+    },
+  });
+
+  const uploadAvatar = async () => {
+    try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
+      setLoading(true);
+
+      const image = await upload();
+      if (image) {
+        setPicture(image);
+        setLoading(false);
+      }
+    } catch (e) {
+      setLoading(false);
+      await message(`Upload failed, error: ${e}`, { title: 'Lume', type: 'error' });
+    }
+  };
+
+  const uploadBanner = async () => {
+    try {
+      setLoading(true);
+
+      const image = await upload();
+
+      if (image) {
+        setBanner(image);
+        setLoading(false);
+      }
+    } catch (e) {
+      setLoading(false);
+      await message(`Upload failed, error: ${e}`, { title: 'Lume', type: 'error' });
+    }
+  };
+
+  const onSubmit = async (data: NDKUserProfile) => {
+    // start loading
+    setLoading(true);
+
+    const content = {
+      ...data,
+      username: data.name,
+      display_name: data.name,
+      bio: data.about,
+      image: data.picture,
+    };
+
+    const event = new NDKEvent(ndk);
+    event.kind = NDKKind.Metadata;
+    event.tags = [];
+
+    if (data.nip05) {
+      const user = ndk.getUser({ pubkey: db.account.pubkey });
+      const verify = await user.validateNip05(data.nip05);
+      if (verify) {
+        event.content = JSON.stringify({ ...content, nip05: data.nip05 });
+      } else {
+        setNIP05((prev) => ({ ...prev, verified: false }));
+        setError('nip05', {
+          type: 'manual',
+          message: "Can't verify your Lume ID / NIP-05, please check again",
+        });
+      }
+    } else {
+      event.content = JSON.stringify(content);
+    }
+
+    const publishedRelays = await event.publish();
+
+    if (publishedRelays) {
+      // invalid cache
+      queryClient.invalidateQueries({
+        queryKey: ['user', db.account.pubkey],
+      });
+      // reset form
+      reset();
+      // reset state
+      setLoading(false);
+      setPicture(null);
+      setBanner(null);
+    } else {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <div className="mx-auto w-full max-w-md">
+      <form onSubmit={handleSubmit(onSubmit)} className="mb-0">
+        <input type={'hidden'} {...register('picture')} value={picture} />
+        <input type={'hidden'} {...register('banner')} value={banner} />
+        <div className="flex flex-col items-center justify-center">
+          <div className="relative h-36 w-full">
+            {banner ? (
+              <img
+                src={banner}
+                alt="user's banner"
+                className="h-full w-full rounded-xl object-cover"
+              />
+            ) : (
+              <div className="h-full w-full rounded-xl bg-neutral-200 dark:bg-neutral-900" />
+            )}
+            <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform overflow-hidden rounded-xl">
+              <button
+                type="button"
+                onClick={() => uploadBanner()}
+                className="inline-flex h-full w-full items-center justify-center bg-black/20 text-white"
+              >
+                <PlusIcon className="h-5 w-5" />
+              </button>
+            </div>
+          </div>
+          <div className="mb-5 px-4">
+            <div className="relative z-10 -mt-7 h-14 w-14 overflow-hidden rounded-xl ring-2 ring-white dark:ring-black">
+              <img
+                src={picture}
+                alt="user's avatar"
+                className="h-14 w-14 rounded-xl object-cover"
+              />
+              <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform">
+                <button
+                  type="button"
+                  onClick={() => uploadAvatar()}
+                  className="inline-flex h-full w-full items-center justify-center rounded-xl bg-black/50 text-white"
+                >
+                  <PlusIcon className="h-5 w-5" />
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div className="flex flex-col gap-4">
+          <div className="flex flex-col gap-1">
+            <label
+              htmlFor="display_name"
+              className="text-sm font-semibold uppercase tracking-wider"
+            >
+              Display Name
+            </label>
+            <input
+              type={'text'}
+              {...register('display_name')}
+              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"
+            />
+          </div>
+          <div className="flex flex-col gap-1">
+            <label
+              htmlFor="name"
+              className="text-sm font-semibold uppercase tracking-wider"
+            >
+              Name
+            </label>
+            <input
+              type={'text'}
+              {...register('name')}
+              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"
+            />
+          </div>
+          <div className="flex flex-col gap-1">
+            <label
+              htmlFor="nip05"
+              className="text-sm font-semibold uppercase tracking-wider"
+            >
+              NIP-05
+            </label>
+            <div className="relative">
+              <input
+                {...register('nip05')}
+                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"
+              />
+              <div className="absolute right-2 top-1/2 -translate-y-1/2 transform">
+                {nip05.verified ? (
+                  <span className="inline-flex h-6 items-center gap-1 rounded-full bg-teal-500 px-1 pr-1.5 text-xs font-medium text-white">
+                    <CheckCircleIcon className="h-4 w-4" />
+                    Verified
+                  </span>
+                ) : (
+                  <span className="inline-flex h-6 items-center gap-1 rounded bg-red-500 pl-1 pr-1.5 text-xs font-medium text-white">
+                    <UnverifiedIcon className="h-4 w-4" />
+                    Unverified
+                  </span>
+                )}
+              </div>
+              {errors.nip05 && (
+                <p className="mt-1 text-sm text-red-400">
+                  {errors.nip05.message.toString()}
+                </p>
+              )}
+            </div>
+          </div>
+          <div className="flex flex-col gap-1">
+            <label
+              htmlFor="website"
+              className="text-sm font-semibold uppercase tracking-wider"
+            >
+              Website
+            </label>
+            <input
+              type={'text'}
+              {...register('website', { required: false })}
+              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"
+            />
+          </div>
+          <div className="flex flex-col gap-1">
+            <label
+              htmlFor="website"
+              className="text-sm font-semibold uppercase tracking-wider"
+            >
+              Lightning address
+            </label>
+            <input
+              type={'text'}
+              {...register('lud16', { required: false })}
+              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"
+            />
+          </div>
+          <div className="flex flex-col gap-1">
+            <label
+              htmlFor="about"
+              className="text-sm font-semibold uppercase tracking-wider"
+            >
+              Bio
+            </label>
+            <textarea
+              {...register('about')}
+              spellCheck={false}
+              className="relative h-20 w-full resize-none rounded-lg bg-neutral-100 px-3 py-2 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-900 dark:text-neutral-100"
+            />
+          </div>
+          <div>
+            <button
+              type="submit"
+              disabled={!isValid}
+              className="mx-auto inline-flex h-9 w-full transform items-center justify-center gap-1 rounded-lg bg-blue-500 font-medium text-white hover:bg-blue-600 focus:outline-none active:translate-y-1 disabled:pointer-events-none disabled:opacity-50"
+            >
+              {loading ? (
+                <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-white" />
+              ) : (
+                'Update'
+              )}
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  );
+}

src/app/settings/general.tsx

@@ -1,17 +1,274 @@
-import { AutoStartSetting } from '@app/settings/components/autoStart';
-import { DataPath } from '@app/settings/components/dataPath';
-import { VersionSetting } from '@app/settings/components/version';
+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() {
+  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();
+  }, []);
 
-export function GeneralSettingsScreen() {
   return (
-    <div className="h-full w-full px-3 pt-11">
-      <div className="flex flex-col gap-2">
-        <h1 className="text-xl font-semibold text-white">General</h1>
-        <div className="w-full rounded-xl bg-neutral-400 dark:bg-neutral-600">
-          <div className="flex h-full w-full flex-col divide-y divide-white/5">
-            <AutoStartSetting />
-            <DataPath />
-            <VersionSetting />
+    <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>

src/app/settings/index.tsx

@@ -0,0 +1,19 @@
+import { ContactCard } from '@app/settings/components/contactCard';
+import { PostCard } from '@app/settings/components/postCard';
+import { ProfileCard } from '@app/settings/components/profileCard';
+import { RelayCard } from '@app/settings/components/relayCard';
+import { ZapCard } from '@app/settings/components/zapCard';
+
+export function UserSettingScreen() {
+  return (
+    <div className="mx-auto w-full max-w-xl">
+      <ProfileCard />
+      <div className="grid grid-cols-2 gap-4">
+        <ContactCard />
+        <RelayCard />
+        <PostCard />
+        <ZapCard />
+      </div>
+    </div>
+  );
+}

src/app/settings/shortcuts.tsx

@@ -1,118 +0,0 @@
-import { CommandIcon } from '@shared/icons';
-
-export function ShortcutsSettingsScreen() {
-  return (
-    <div className="h-full w-full px-3 pt-12">
-      <div className="flex flex-col gap-2">
-        <h1 className="text-lg font-semibold text-white">Shortcuts</h1>
-        <div className="w-full rounded-xl bg-neutral-400 dark:bg-neutral-600">
-          <div className="flex h-full w-full flex-col divide-y divide-white/5">
-            <div className="inline-flex items-center justify-between px-5 py-4">
-              <div className="flex flex-col gap-1">
-                <span className="font-medium leading-none text-white">Open composer</span>
-              </div>
-              <div className="flex items-center gap-2">
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <CommandIcon
-                    width={12}
-                    height={12}
-                    className="text-neutral-600 dark:text-neutral-400"
-                  />
-                </div>
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-                    N
-                  </span>
-                </div>
-              </div>
-            </div>
-            <div className="inline-flex items-center justify-between px-5 py-4">
-              <div className="flex flex-col gap-1">
-                <span className="font-medium leading-none text-white">
-                  Add image block
-                </span>
-              </div>
-              <div className="flex items-center gap-2">
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <CommandIcon
-                    width={12}
-                    height={12}
-                    className="text-neutral-600 dark:text-neutral-400"
-                  />
-                </div>
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-                    I
-                  </span>
-                </div>
-              </div>
-            </div>
-            <div className="inline-flex items-center justify-between px-5 py-4">
-              <div className="flex flex-col gap-1">
-                <span className="font-medium leading-none text-white">
-                  Add newsfeed block
-                </span>
-              </div>
-              <div className="flex items-center gap-2">
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <CommandIcon
-                    width={12}
-                    height={12}
-                    className="text-neutral-600 dark:text-neutral-400"
-                  />
-                </div>
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-                    F
-                  </span>
-                </div>
-              </div>
-            </div>
-            <div className="inline-flex items-center justify-between px-5 py-4">
-              <div className="flex flex-col gap-1">
-                <span className="font-medium leading-none text-white">
-                  Open personal page
-                </span>
-              </div>
-              <div className="flex items-center gap-2">
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <CommandIcon
-                    width={12}
-                    height={12}
-                    className="text-neutral-600 dark:text-neutral-400"
-                  />
-                </div>
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-                    P
-                  </span>
-                </div>
-              </div>
-            </div>
-            <div className="inline-flex items-center justify-between px-5 py-4">
-              <div className="flex flex-col gap-1">
-                <span className="font-medium leading-none text-white">
-                  Open notification
-                </span>
-              </div>
-              <div className="flex items-center gap-2">
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <CommandIcon
-                    width={12}
-                    height={12}
-                    className="text-neutral-600 dark:text-neutral-400"
-                  />
-                </div>
-                <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                  <span className="text-sm leading-none text-neutral-600 dark:text-neutral-400">
-                    B
-                  </span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

src/app/space/components/widgetList.tsx

@@ -1,135 +0,0 @@
-import { useCallback } from 'react';
-
-import {
-  ArticleIcon,
-  BellIcon,
-  FileIcon,
-  FollowsIcon,
-  GroupFeedsIcon,
-  HashtagIcon,
-  ThreadsIcon,
-  TrendingIcon,
-} from '@shared/icons';
-import { TitleBar } from '@shared/titleBar';
-import { WidgetWrapper } from '@shared/widgets';
-
-import { DefaultWidgets, WidgetKinds } from '@stores/constants';
-
-import { useWidget } from '@utils/hooks/useWidget';
-import { Widget, WidgetGroup, WidgetGroupItem } from '@utils/types';
-
-export function WidgetList({ params }: { params: Widget }) {
-  const { addWidget, removeWidget } = useWidget();
-
-  const open = (item: WidgetGroupItem) => {
-    addWidget.mutate({ kind: item.kind, title: item.title, content: '' });
-    removeWidget.mutate(params.id);
-  };
-
-  const renderIcon = useCallback(
-    (kind: number) => {
-      switch (kind) {
-        case WidgetKinds.tmp.xfeed:
-          return (
-            <GroupFeedsIcon className="h-5 w-5 text-neutral-900 dark:text-neutral-100" />
-          );
-        case WidgetKinds.local.follows:
-          return (
-            <FollowsIcon className="h-5 w-5 text-neutral-900 dark:text-neutral-100" />
-          );
-        case WidgetKinds.local.files:
-        case WidgetKinds.global.files:
-          return <FileIcon className="h-5 w-5 text-neutral-900 dark:text-neutral-100" />;
-        case WidgetKinds.local.articles:
-        case WidgetKinds.global.articles:
-          return (
-            <ArticleIcon className="h-5 w-5 text-neutral-900 dark:text-neutral-100" />
-          );
-        case WidgetKinds.tmp.xhashtag:
-          return (
-            <HashtagIcon className="h-5 w-5 text-neutral-900 dark:text-neutral-100" />
-          );
-        case WidgetKinds.nostrBand.trendingAccounts:
-        case WidgetKinds.nostrBand.trendingNotes:
-          return (
-            <TrendingIcon className="h-5 w-5 text-neutral-900 dark:text-neutral-100" />
-          );
-        case WidgetKinds.local.notification:
-          return <BellIcon className="h-5 w-5 text-neutral-900 dark:text-neutral-100" />;
-        case WidgetKinds.other.learnNostr:
-          return (
-            <ThreadsIcon className="h-5 w-5 text-neutral-900 dark:text-neutral-100" />
-          );
-        default:
-          return null;
-      }
-    },
-    [DefaultWidgets]
-  );
-
-  const renderItem = useCallback((row: WidgetGroup, index: number) => {
-    return (
-      <div key={index} className="flex flex-col gap-2">
-        <h3 className="text-sm font-semibold">{row.title}</h3>
-        <div className="flex flex-col divide-y divide-neutral-200 overflow-hidden rounded-xl bg-neutral-100 dark:divide-neutral-800 dark:bg-neutral-900">
-          {row.data.map((item, index) => (
-            <button
-              onClick={() => open(item)}
-              key={index}
-              className="group flex items-center gap-2.5 px-4 hover:bg-neutral-200 dark:hover:bg-neutral-800"
-            >
-              {item.icon ? (
-                <div className="h-10 w-10 shrink-0 rounded-lg">
-                  <img
-                    src={item.icon}
-                    alt={item.title}
-                    className="h-10 w-10 object-cover"
-                  />
-                </div>
-              ) : (
-                <div className="inline-flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-neutral-200 group-hover:bg-neutral-300 dark:bg-neutral-800 dark:group-hover:bg-neutral-700">
-                  {renderIcon(item.kind)}
-                </div>
-              )}
-              <div className="inline-flex h-16 w-full flex-col items-start justify-center">
-                <h5 className="line-clamp-1 text-sm font-semibold text-neutral-900 dark:text-neutral-100">
-                  {item.title}
-                </h5>
-                <p className="line-clamp-1 text-sm text-neutral-600 dark:text-neutral-400">
-                  {item.description}
-                </p>
-              </div>
-            </button>
-          ))}
-        </div>
-      </div>
-    );
-  }, []);
-
-  return (
-    <WidgetWrapper>
-      <TitleBar id={params.id} title="Add widget" />
-      <div className="flex-1 overflow-y-auto pb-10 scrollbar-none">
-        <div className="flex flex-col gap-6 px-3">
-          {DefaultWidgets.map((row: WidgetGroup, index: number) =>
-            renderItem(row, index)
-          )}
-          <div className="border-t border-neutral-200 pt-6 dark:border-neutral-800">
-            <button
-              type="button"
-              disabled
-              className="inline-flex h-14 w-full items-center justify-center gap-2.5 rounded-xl bg-neutral-50 text-sm font-medium text-neutral-900 dark:bg-neutral-950 dark:text-neutral-100"
-            >
-              Build your own widget{' '}
-              <div className="-rotate-3 transform-gpu rounded-md border border-neutral-200 bg-neutral-100 px-1.5 py-1 dark:border-neutral-800 dark:bg-neutral-900">
-                <span className="bg-gradient-to-r from-blue-400 via-red-400 to-orange-500 bg-clip-text text-xs text-transparent dark:from-blue-200 dark:via-red-200 dark:to-orange-300">
-                  Coming soon
-                </span>
-              </div>
-            </button>
-          </div>
-        </div>
-      </div>
-    </WidgetWrapper>
-  );
-}

src/app/users/components/modal.tsx

@@ -1,418 +0,0 @@
-import { NDKEvent, NDKKind, NDKUserProfile } from '@nostr-dev-kit/ndk';
-import * as Dialog from '@radix-ui/react-dialog';
-import { useQueryClient } from '@tanstack/react-query';
-import { message, open } from '@tauri-apps/plugin-dialog';
-import { readBinaryFile } from '@tauri-apps/plugin-fs';
-import { fetch } from '@tauri-apps/plugin-http';
-import { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
-
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
-
-import {
-  CancelIcon,
-  CheckCircleIcon,
-  LoaderIcon,
-  PlusIcon,
-  UnverifiedIcon,
-} from '@shared/icons';
-
-interface NIP05 {
-  names: {
-    [key: string]: string;
-  };
-}
-
-export function EditProfileModal() {
-  const queryClient = useQueryClient();
-
-  const [isOpen, setIsOpen] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [picture, setPicture] = useState('');
-  const [banner, setBanner] = useState('');
-  const [nip05, setNIP05] = useState({ verified: false, text: '' });
-
-  const { db } = useStorage();
-  const { ndk } = useNDK();
-  const {
-    register,
-    handleSubmit,
-    reset,
-    setError,
-    formState: { isValid, errors },
-  } = useForm({
-    defaultValues: async () => {
-      const res: NDKUserProfile = queryClient.getQueryData(['user', db.account.pubkey]);
-      if (res.image) {
-        setPicture(res.image);
-      }
-      if (res.banner) {
-        setBanner(res.banner);
-      }
-      if (res.nip05) {
-        setNIP05((prev) => ({ ...prev, text: res.nip05 }));
-      }
-      return res;
-    },
-  });
-
-  const verifyNIP05 = async (nip05: string) => {
-    const localPath = nip05.split('@')[0];
-    const service = nip05.split('@')[1];
-    const verifyURL = `https://${service}/.well-known/nostr.json?name=${localPath}`;
-
-    const res = await fetch(verifyURL, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-      },
-    });
-
-    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] !== db.account.pubkey) return false;
-      return true;
-    }
-    return false;
-  };
-
-  const uploadAvatar = async () => {
-    try {
-      // start loading
-      setLoading(true);
-
-      const selected = await open({
-        multiple: false,
-        filters: [
-          {
-            name: 'Image',
-            extensions: ['png', 'jpeg', 'jpg', 'gif'],
-          },
-        ],
-      });
-
-      if (!selected) {
-        setLoading(false);
-        return;
-      }
-
-      const file = await readBinaryFile(selected.path);
-      const blob = new Blob([file]);
-
-      const data = new FormData();
-      data.append('fileToUpload', blob);
-      data.append('submit', 'Upload Image');
-
-      const res = await fetch('https://nostr.build/api/v2/upload/files', {
-        method: 'POST',
-        body: data,
-      });
-
-      if (res.ok) {
-        const json = await res.json();
-        const content = json.data[0];
-
-        setPicture(content.url);
-
-        // stop loading
-        setLoading(false);
-      }
-    } catch (e) {
-      // stop loading
-      setLoading(false);
-      await message(`Upload failed, error: ${e}`, { title: 'Lume', type: 'error' });
-    }
-  };
-
-  const uploadBanner = async () => {
-    try {
-      // start loading
-      setLoading(true);
-
-      const selected = await open({
-        multiple: false,
-        filters: [
-          {
-            name: 'Image',
-            extensions: ['png', 'jpeg', 'jpg', 'gif'],
-          },
-        ],
-      });
-
-      if (!selected) {
-        setLoading(false);
-        return;
-      }
-
-      const file = await readBinaryFile(selected.path);
-      const blob = new Blob([file]);
-
-      const data = new FormData();
-      data.append('fileToUpload', blob);
-      data.append('submit', 'Upload Image');
-
-      const res = await fetch('https://nostr.build/api/v2/upload/files', {
-        method: 'POST',
-        body: data,
-      });
-
-      if (res.ok) {
-        const json = await res.json();
-        const content = json.data[0];
-
-        setBanner(content.url);
-
-        // stop loading
-        setLoading(false);
-      }
-    } catch (e) {
-      // stop loading
-      setLoading(false);
-      await message(`Upload failed, error: ${e}`, { title: 'Lume', type: 'error' });
-    }
-  };
-
-  const onSubmit = async (data: NDKUserProfile) => {
-    // start loading
-    setLoading(true);
-
-    const content = {
-      ...data,
-      username: data.name,
-      display_name: data.name,
-      bio: data.about,
-      image: data.picture,
-    };
-
-    const event = new NDKEvent(ndk);
-    event.kind = NDKKind.Metadata;
-    event.tags = [];
-
-    if (data.nip05) {
-      const nip05IsVerified = await verifyNIP05(data.nip05);
-      if (nip05IsVerified) {
-        event.content = JSON.stringify({ ...content, nip05: data.nip05 });
-      } else {
-        setNIP05((prev) => ({ ...prev, verified: false }));
-        setError('nip05', {
-          type: 'manual',
-          message: "Can't verify your Lume ID / NIP-05, please check again",
-        });
-      }
-    } else {
-      event.content = JSON.stringify(content);
-    }
-
-    const publishedRelays = await event.publish();
-
-    if (publishedRelays) {
-      // invalid cache
-      queryClient.invalidateQueries({
-        queryKey: ['user', db.account.pubkey]
-      });
-      // reset form
-      reset();
-      // reset state
-      setLoading(false);
-      setIsOpen(false);
-      setPicture('https://void.cat/d/5VKmKyuHyxrNMf9bWSVPih');
-      setBanner(null);
-    } else {
-      setLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    if (!nip05.verified && /\S+@\S+\.\S+/.test(nip05.text)) {
-      verifyNIP05(nip05.text);
-    }
-  }, [nip05.text]);
-
-  return (
-    <Dialog.Root open={isOpen} onOpenChange={setIsOpen}>
-      <Dialog.Trigger asChild>
-        <button
-          type="button"
-          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"
-        >
-          Edit profile
-        </button>
-      </Dialog.Trigger>
-      <Dialog.Portal>
-        <Dialog.Overlay className="fixed inset-0 z-50 bg-black/20 backdrop-blur-sm dark:bg-black/20" />
-        <Dialog.Content className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
-          <div className="relative h-min w-full max-w-xl rounded-xl bg-neutral-100 dark:bg-neutral-900">
-            <div className="h-min w-full shrink-0 rounded-t-xl border-b border-neutral-200 px-5 py-5 dark:border-neutral-800">
-              <div className="flex items-center justify-between">
-                <Dialog.Title className="text-lg font-semibold leading-none text-neutral-900 dark:text-neutral-100">
-                  Edit profile
-                </Dialog.Title>
-                <Dialog.Close className="inline-flex h-6 w-6 items-center justify-center rounded-md text-neutral-900 hover:bg-neutral-200 dark:text-neutral-100 dark:hover:bg-neutral-800">
-                  <CancelIcon className="h-4 w-4" />
-                </Dialog.Close>
-              </div>
-            </div>
-            <div className="flex h-full w-full flex-col overflow-y-auto">
-              <form onSubmit={handleSubmit(onSubmit)} className="mb-0">
-                <input type={'hidden'} {...register('picture')} value={picture} />
-                <input type={'hidden'} {...register('banner')} value={banner} />
-                <div className="relative">
-                  <div className="relative h-44 w-full">
-                    {banner ? (
-                      <img
-                        src={banner}
-                        alt="user's banner"
-                        className="h-full w-full object-cover"
-                      />
-                    ) : (
-                      <div className="h-full w-full bg-black dark:bg-white" />
-                    )}
-                    <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform">
-                      <button
-                        type="button"
-                        onClick={() => uploadBanner()}
-                        className="inline-flex h-full w-full items-center justify-center bg-black/50"
-                      >
-                        <PlusIcon className="h-5 w-5" />
-                      </button>
-                    </div>
-                  </div>
-                  <div className="mb-5 px-4">
-                    <div className="relative z-10 -mt-7 h-14 w-14 overflow-hidden rounded-xl ring-2 ring-neutral-900">
-                      <img
-                        src={picture}
-                        alt="user's avatar"
-                        className="h-14 w-14 rounded-xl object-cover"
-                      />
-                      <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform">
-                        <button
-                          type="button"
-                          onClick={() => uploadAvatar()}
-                          className="inline-flex h-full w-full items-center justify-center rounded-xl bg-black/50"
-                        >
-                          <PlusIcon className="h-5 w-5" />
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div className="flex flex-col gap-4 px-4 pb-4">
-                  <div className="flex flex-col gap-1">
-                    <label
-                      htmlFor="name"
-                      className="text-sm font-semibold uppercase tracking-wider text-neutral-500 dark:text-neutral-400"
-                    >
-                      Name
-                    </label>
-                    <input
-                      type={'text'}
-                      {...register('name', {
-                        required: true,
-                        minLength: 4,
-                      })}
-                      spellCheck={false}
-                      className="relative h-11 w-full rounded-lg bg-neutral-200 px-3 py-1 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-800 dark:text-neutral-100"
-                    />
-                  </div>
-                  <div className="flex flex-col gap-1">
-                    <label
-                      htmlFor="nip05"
-                      className="text-sm font-semibold uppercase tracking-wider text-neutral-500 dark:text-neutral-400"
-                    >
-                      NIP-05
-                    </label>
-                    <div className="relative">
-                      <input
-                        {...register('nip05', {
-                          required: true,
-                          minLength: 4,
-                        })}
-                        spellCheck={false}
-                        className="relative h-11 w-full rounded-lg bg-neutral-200 px-3 py-1 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-800 dark:text-neutral-100"
-                      />
-                      <div className="absolute right-2 top-1/2 -translate-y-1/2 transform">
-                        {nip05.verified ? (
-                          <span className="inline-flex h-6 items-center gap-1 rounded bg-green-500 px-2 text-sm font-medium text-white">
-                            <CheckCircleIcon className="h-4 w-4 text-black dark:text-white" />
-                            Verified
-                          </span>
-                        ) : (
-                          <span className="inline-flex h-6 items-center gap-1 rounded bg-red-500 px-2 text-sm font-medium text-white">
-                            <UnverifiedIcon className="h-4 w-4 text-black dark:text-white" />
-                            Unverified
-                          </span>
-                        )}
-                      </div>
-                      {errors.nip05 && (
-                        <p className="mt-1 text-sm text-red-400">
-                          {errors.nip05.message.toString()}
-                        </p>
-                      )}
-                    </div>
-                  </div>
-                  <div className="flex flex-col gap-1">
-                    <label
-                      htmlFor="about"
-                      className="text-sm font-semibold uppercase tracking-wider text-neutral-500 dark:text-neutral-400"
-                    >
-                      Bio
-                    </label>
-                    <textarea
-                      {...register('about')}
-                      spellCheck={false}
-                      className="relative h-20 w-full resize-none rounded-lg bg-neutral-200 px-3 py-2 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-800 dark:text-neutral-100"
-                    />
-                  </div>
-                  <div className="flex flex-col gap-1">
-                    <label
-                      htmlFor="website"
-                      className="text-sm font-semibold uppercase tracking-wider text-neutral-500 dark:text-neutral-400"
-                    >
-                      Website
-                    </label>
-                    <input
-                      type={'text'}
-                      {...register('website', { required: false })}
-                      spellCheck={false}
-                      className="relative h-11 w-full rounded-lg bg-neutral-200 px-3 py-1 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-800 dark:text-neutral-100"
-                    />
-                  </div>
-                  <div className="flex flex-col gap-1">
-                    <label
-                      htmlFor="website"
-                      className="text-sm font-semibold uppercase tracking-wider text-neutral-500 dark:text-neutral-400"
-                    >
-                      Lightning address
-                    </label>
-                    <input
-                      type={'text'}
-                      {...register('lud16', { required: false })}
-                      spellCheck={false}
-                      className="relative h-11 w-full rounded-lg bg-neutral-200 px-3 py-1 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 dark:bg-neutral-800 dark:text-neutral-100"
-                    />
-                  </div>
-                  <div>
-                    <button
-                      type="submit"
-                      disabled={!isValid}
-                      className="inline-flex h-11 w-full transform items-center justify-center gap-1 rounded-lg bg-blue-500 font-medium text-white hover:bg-blue-600 focus:outline-none active:translate-y-1 disabled:pointer-events-none disabled:opacity-50"
-                    >
-                      {loading ? (
-                        <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-white" />
-                      ) : (
-                        'Update'
-                      )}
-                    </button>
-                  </div>
-                </div>
-              </form>
-            </div>
-          </div>
-        </Dialog.Content>
-      </Dialog.Portal>
-    </Dialog.Root>
-  );
-}

src/app/users/components/profile.tsx

@@ -1,15 +1,15 @@
 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 { EditProfileModal } from '@app/users/components/modal';
 import { UserStats } from '@app/users/components/stats';
 
 import { useNDK } from '@libs/ndk/provider';
 import { useStorage } from '@libs/storage/provider';
 
-import { Image } from '@shared/image';
 import { NIP05 } from '@shared/nip05';
 
 import { useProfile } from '@utils/hooks/useProfile';
@@ -22,44 +22,52 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
 
   const [followed, setFollowed] = useState(false);
 
-  const follow = async (pubkey: string) => {
-    try {
-      const user = ndk.getUser({ hexpubkey: db.account.pubkey });
-      const contacts = await user.follows();
-      const add = await user.follow(new NDKUser({ hexpubkey: pubkey }), contacts);
+  const navigate = useNavigate();
+  const svgURI =
+    'data:image/svg+xml;utf8,' + encodeURIComponent(minidenticon(pubkey, 90, 50));
 
-      if (add) {
-        setFollowed(true);
-      } else {
-        toast('You already follow this user');
+  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) {
+        toast.success('You already follow this user');
+        setFollowed(false);
       }
-    } catch (error) {
-      console.log(error);
+    } catch (e) {
+      toast.error(e);
+      setFollowed(false);
     }
   };
 
-  const unfollow = async (pubkey: string) => {
+  const unfollow = async () => {
     try {
-      const user = ndk.getUser({ hexpubkey: db.account.pubkey });
+      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({ hexpubkey: pubkey }));
-
-      let list: string[][];
-      contacts.forEach((el) =>
-        list.push(['p', el.pubkey, el.relayUrls?.[0] || '', el.profile?.name || ''])
-      );
+      contacts.delete(new NDKUser({ pubkey: pubkey }));
 
+      const list = [...contacts].map((item) => [
+        '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();
-      if (publishedRelays) {
-        setFollowed(false);
-      }
-    } catch (error) {
-      console.log(error);
+      await event.publish();
+    } catch (e) {
+      toast.error(e);
     }
   };
 
@@ -74,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"
           />
@@ -85,22 +93,34 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
         )}
       </div>
       <div className="-mt-7 flex w-full flex-col items-center px-5">
-        <Image
-          src={user.picture || user.image}
-          alt={pubkey}
-          className="h-14 w-14 rounded-lg ring-2 ring-neutral-100 dark:ring-neutral-900"
-        />
+        <Avatar.Root className="shrink-0">
+          <Avatar.Image
+            src={user?.picture || user?.image}
+            alt={pubkey}
+            loading="lazy"
+            decoding="async"
+            style={{ contentVisibility: 'auto' }}
+            className="h-14 w-14 rounded-lg bg-white ring-2 ring-neutral-100 dark:ring-neutral-900"
+          />
+          <Avatar.Fallback delayMs={300}>
+            <img
+              src={svgURI}
+              alt={pubkey}
+              className="h-14 w-14 rounded-lg bg-black dark:bg-white"
+            />
+          </Avatar.Fallback>
+        </Avatar.Root>
         <div className="mt-2 flex flex-1 flex-col gap-6">
           <div className="flex flex-col items-center gap-1">
             <div className="inline-flex flex-col items-center">
               <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}
-                  className="max-w-[15rem] truncate text-sm text-neutral-500 dark:text-neutral-400"
+                  nip05={user.nip05}
+                  className="text-neutral-600 dark:text-neutral-400"
                 />
               ) : (
                 <span className="max-w-[15rem] truncate text-sm text-neutral-500 dark:text-neutral-400">
@@ -109,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>
@@ -123,32 +143,26 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
             {followed ? (
               <button
                 type="button"
-                onClick={() => unfollow(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"
+                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-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)}
-                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"
+                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-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>
-            {db.account.pubkey === pubkey && (
-              <>
-                <span className="mx-2 inline-flex h-4 w-px bg-neutral-200 dark:bg-neutral-800" />
-                <EditProfileModal />
-              </>
-            )}
           </div>
         </div>
       </div>

src/app/users/components/stats.tsx

@@ -1,4 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
+import { fetch } from '@tauri-apps/plugin-http';
 
 import { LoaderIcon } from '@shared/icons';
 
@@ -6,15 +7,22 @@ import { compactNumber } from '@utils/number';
 
 export function UserStats({ pubkey }: { pubkey: string }) {
   const { status, data } = useQuery({
-    queryKey: ['user-metadata', pubkey],
+    queryKey: ['user-stats', pubkey],
+    queryFn: async ({ signal }: { signal: AbortSignal }) => {
+      const res = await fetch(`https://api.nostr.band/v0/stats/profile/${pubkey}`, {
+        signal,
+      });
 
-    ...async () => {
-      const res = await fetch(`https://api.nostr.band/v0/stats/profile/${pubkey}`);
       if (!res.ok) {
         throw new Error('Error');
       }
+
       return await res.json();
     },
+    refetchOnWindowFocus: false,
+    refetchOnMount: false,
+    refetchOnReconnect: false,
+    staleTime: Infinity,
   });
 
   if (status === 'pending') {
@@ -33,7 +41,7 @@ export function UserStats({ pubkey }: { pubkey: string }) {
     <div className="flex w-full items-center justify-center gap-10">
       <div className="inline-flex flex-col items-center gap-1">
         <span className="font-semibold leading-none text-neutral-900 dark:text-neutral-100">
-          {compactNumber.format(data.stats[pubkey].followers_pubkey_count) ?? 0}
+          {compactNumber.format(data?.stats[pubkey]?.followers_pubkey_count) ?? 0}
         </span>
         <span className="text-sm leading-none text-neutral-500 dark:text-neutral-400">
           Followers
@@ -41,7 +49,7 @@ export function UserStats({ pubkey }: { pubkey: string }) {
       </div>
       <div className="inline-flex flex-col items-center gap-1">
         <span className="font-semibold leading-none text-neutral-900 dark:text-neutral-100">
-          {compactNumber.format(data.stats[pubkey].pub_following_pubkey_count) ?? 0}
+          {compactNumber.format(data?.stats[pubkey]?.pub_following_pubkey_count) ?? 0}
         </span>
         <span className="text-sm leading-none text-neutral-500 dark:text-neutral-400">
           Following
@@ -49,9 +57,7 @@ export function UserStats({ pubkey }: { pubkey: string }) {
       </div>
       <div className="inline-flex flex-col items-center gap-1">
         <span className="font-semibold leading-none text-neutral-900 dark:text-neutral-100">
-          {data.stats[pubkey].zaps_received
-            ? compactNumber.format(data.stats[pubkey].zaps_received.msats / 1000)
-            : 0}
+          {compactNumber.format(data?.stats[pubkey]?.zaps_received?.msats / 1000 ?? 0)}
         </span>
         <span className="text-sm leading-none text-neutral-500 dark:text-neutral-400">
           Zaps received
@@ -59,9 +65,7 @@ export function UserStats({ pubkey }: { pubkey: string }) {
       </div>
       <div className="inline-flex flex-col items-center gap-1">
         <span className="font-semibold leading-none text-neutral-900 dark:text-neutral-100">
-          {data.stats[pubkey].zaps_sent
-            ? compactNumber.format(data.stats[pubkey].zaps_sent.msats / 1000)
-            : 0}
+          {compactNumber.format(data?.stats[pubkey]?.zaps_sent?.msats / 1000 ?? 0)}
         </span>
         <span className="text-sm leading-none text-neutral-500 dark:text-neutral-400">
           Zaps sent

src/app/users/index.tsx

@@ -7,14 +7,7 @@ import { UserProfile } from '@app/users/components/profile';
 
 import { useNDK } from '@libs/ndk/provider';
 
-import {
-  ArticleNote,
-  FileNote,
-  NoteWrapper,
-  Repost,
-  TextNote,
-  UnknownNote,
-} from '@shared/notes';
+import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
 
 export function UserScreen() {
   const { pubkey } = useParams();
@@ -23,9 +16,9 @@ export function UserScreen() {
     queryKey: ['user-feed', pubkey],
     queryFn: async () => {
       const events = await ndk.fetchEvents({
-        kinds: [NDKKind.Text, NDKKind.Repost, NDKKind.Article],
+        kinds: [NDKKind.Text, NDKKind.Repost],
         authors: [pubkey],
-        limit: 50,
+        limit: 20,
       });
       const sorted = [...events].sort((a, b) => b.created_at - a.created_at);
       return sorted;
@@ -38,31 +31,11 @@ export function UserScreen() {
     (event: NDKEvent) => {
       switch (event.kind) {
         case NDKKind.Text:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <TextNote />
-            </NoteWrapper>
-          );
+          return <MemoizedTextNote key={event.id} event={event} />;
         case NDKKind.Repost:
-          return <Repost key={event.id} event={event} />;
-        case 1063:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <FileNote />
-            </NoteWrapper>
-          );
-        case NDKKind.Article:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <ArticleNote />
-            </NoteWrapper>
-          );
+          return <MemoizedRepost key={event.id} event={event} />;
         default:
-          return (
-            <NoteWrapper key={event.id} event={event}>
-              <UnknownNote />
-            </NoteWrapper>
-          );
+          return <UnknownNote key={event.id} event={event} />;
       }
     },
     [data]
@@ -70,7 +43,6 @@ export function UserScreen() {
 
   return (
     <div className="relative h-full w-full overflow-y-auto">
-      <div data-tauri-drag-region className="absolute left-0 top-0 h-11 w-full" />
       <UserProfile pubkey={pubkey} />
       <div className="mt-6 h-full w-full border-t border-neutral-100 px-1.5 dark:border-neutral-900">
         <h3 className="mb-2 pt-4 text-center text-lg font-semibold leading-none text-neutral-900 dark:text-neutral-100">

src/libs/ndk/cache.ts

@@ -1,3 +1,4 @@
+// inspired by: https://github.com/nostr-dev-kit/ndk/tree/master/ndk-cache-dexie
 import { NDKEvent, NDKRelay, profileFromEvent } from '@nostr-dev-kit/ndk';
 import type {
   Hexpubkey,

src/libs/ndk/instance.ts

@@ -1,9 +1,11 @@
 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';
 
 import NDKCacheAdapterTauri from '@libs/ndk/cache';
 import { useStorage } from '@libs/storage/provider';
@@ -25,6 +27,9 @@ export const NDKInstance = () => {
       const relays = await db.getExplicitRelayUrls();
       const onlineRelays = new Set(relays);
 
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), 8000);
+
       for (const relay of relays) {
         try {
           const url = new URL(relay);
@@ -33,15 +38,20 @@ export const NDKInstance = () => {
             headers: {
               Accept: 'application/nostr+json',
             },
+            signal: controller.signal,
           });
 
           if (!res.ok) {
-            console.info(`${relay} is not working, skipping...`);
+            toast.warning(`${relay} is not working, skipping...`);
             onlineRelays.delete(relay);
           }
+
+          toast.success(`Connected to ${relay}`);
         } catch {
-          console.warn(`${relay} is not working, skipping...`);
+          toast.warning(`${relay} is not working, skipping...`);
           onlineRelays.delete(relay);
+        } finally {
+          clearTimeout(timeoutId);
         }
       }
 
@@ -52,81 +62,76 @@ export const NDKInstance = () => {
     }
   }
 
-  async function getSigner(instance: NDK) {
-    if (!db.account) return null;
-
-    const localSignerPrivkey = await db.secureLoad(db.account.pubkey + '-bunker');
-    const userPrivkey = await db.secureLoad(db.account.pubkey);
+  async function getSigner(nsecbunker?: boolean) {
+    if (!db.account) return;
 
     // 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();
-
-      return remoteSigner;
+      if (!localSigner) return null;
+      // await remoteSigner.blockUntilReady();
+      return new NDKNip46Signer(ndk, db.account.id, localSigner);
     }
 
-    // Privkey Signer
-    if (userPrivkey) {
-      return new NDKPrivateKeySigner(userPrivkey);
-    }
+    // Private key Signer
+    const userPrivkey = await db.secureLoad(db.account.pubkey);
+    if (!userPrivkey) return null;
+    return new NDKPrivateKeySigner(userPrivkey);
   }
 
   async function initNDK() {
-    const outboxSetting = await db.getSettingValue('outbox');
-    const explicitRelayUrls = await getExplicitRelays();
-
-    const dexieAdapter = new NDKCacheAdapterTauri(db);
-    const instance = new NDK({
-      explicitRelayUrls,
-      cacheAdapter: dexieAdapter,
-      outboxRelayUrls: ['wss://purplepag.es'],
-      enableOutboxModel: outboxSetting === '1',
-    });
-
     try {
-      // connect
-      await instance.connect(2000);
+      const outboxSetting = await db.getSettingValue('outbox');
+      const bunkerSetting = await db.getSettingValue('nsecbunker');
+      const signer = await getSigner(!!parseInt(bunkerSetting));
+      const explicitRelayUrls = await getExplicitRelays();
 
-      // add signer
-      const signer = await getSigner(instance);
+      const tauriAdapter = new NDKCacheAdapterTauri(db);
+      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 });
+        if (user) {
+          const follows = [...(await user.follows())].map((user) => user.pubkey);
+          const relayList = await user.relayList();
 
-        const user = instance.getUser({ hexpubkey: db.account.pubkey });
-        const follows = await user.follows();
-        const relayList = await user.relayList();
+          // update user's follows
+          await db.updateAccount('follows', JSON.stringify(follows));
 
-        const followsAsArr = [];
-        follows.forEach((user) => {
-          followsAsArr.push(user.pubkey);
-        });
-
-        // update user's follows
-        await db.updateAccount('follows', JSON.stringify(followsAsArr));
-        if (circleSetting !== '1')
-          await db.updateAccount('circles', JSON.stringify(followsAsArr));
-
-        // update user's relay list
-        if (relayList) {
-          for (const relay of relayList.relays) {
-            await db.createRelay(relay);
-          }
+          if (relayList)
+            // update user's relays
+            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);
-    setRelayUrls(explicitRelayUrls);
+      setNDK(instance);
+      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/ndk/provider.tsx

@@ -1,5 +1,6 @@
 // source: https://github.com/nostr-dev-kit/ndk-react/
 import NDK from '@nostr-dev-kit/ndk';
+import Markdown from 'markdown-to-jsx';
 import { NostrFetcher } from 'nostr-fetch';
 import { PropsWithChildren, createContext, useContext } from 'react';
 
@@ -7,34 +8,53 @@ import { NDKInstance } from '@libs/ndk/instance';
 
 import { LoaderIcon } from '@shared/icons';
 
+import { QUOTES } from '@stores/constants';
+
 interface NDKContext {
   ndk: undefined | NDK;
+  fetcher: undefined | NostrFetcher;
   relayUrls: string[];
-  fetcher: NostrFetcher;
 }
 
 const NDKContext = createContext<NDKContext>({
   ndk: undefined,
-  relayUrls: [],
   fetcher: undefined,
+  relayUrls: [],
 });
 
 const NDKProvider = ({ children }: PropsWithChildren<object>) => {
   const { ndk, relayUrls, fetcher } = NDKInstance();
 
-  if (!ndk) {
+  if (!ndk)
     return (
       <div
         data-tauri-drag-region
-        className="flex h-screen w-screen items-center justify-center bg-neutral-50 dark:bg-neutral-950"
+        className="relative flex h-screen w-screen items-center justify-center bg-neutral-50 dark:bg-neutral-950"
       >
-        <div className="flex flex-col items-center justify-center gap-2 text-center">
-          <LoaderIcon className="h-7 w-7 animate-spin text-neutral-950 dark:text-neutral-50" />
-          <p className="font-semibold">Connecting to relays</p>
+        <div className="flex max-w-2xl flex-col items-start gap-1">
+          <h5 className="font-semibold uppercase">TIP:</h5>
+          <Markdown
+            options={{
+              overrides: {
+                a: {
+                  props: {
+                    className: 'text-blue-500 hover:text-blue-600',
+                    target: '_blank',
+                  },
+                },
+              },
+            }}
+            className="text-4xl font-semibold leading-snug text-neutral-300 dark:text-neutral-700"
+          >
+            {QUOTES[Math.floor(Math.random() * QUOTES.length)]}
+          </Markdown>
+        </div>
+        <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">Connecting to relays...</p>
         </div>
       </div>
     );
-  }
 
   return (
     <NDKContext.Provider

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);
   }
@@ -406,7 +428,7 @@ export class LumeStorage {
       `SELECT * FROM relays WHERE account_id = "${this.account.id}" ORDER BY id DESC LIMIT 50;`
     );
 
-    if (!result || result.length < 1) return FULL_RELAYS;
+    if (!result || !result.length) return FULL_RELAYS;
     return result.map((el) => el.relay);
   }
 
@@ -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(
-      'INSERT OR IGNORE INTO settings (key, value) VALUES ($1, $2);',
-      [key, value]
+    const currentSetting = await this.checkSettingValue(key);
+
+    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,15 +1,17 @@
-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';
 import Database from '@tauri-apps/plugin-sql';
 import { check } from '@tauri-apps/plugin-updater';
+import Markdown from 'markdown-to-jsx';
 import { PropsWithChildren, createContext, useContext, useEffect, useState } from 'react';
 
 import { LumeStorage } from '@libs/storage/instance';
 
 import { LoaderIcon } from '@shared/icons';
 
+import { QUOTES } from '@stores/constants';
+
 interface StorageContext {
   db: LumeStorage;
 }
@@ -18,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);
 
@@ -26,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 update = await check();
-      if (update) {
-        setIsNewVersion(true);
+      const settings = await lumeStorage.getAllSettings();
+      let autoUpdater = false;
 
-        await update.downloadAndInstall();
-        await relaunch();
+      if (settings) {
+        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',
@@ -54,21 +75,44 @@ const StorageProvider = ({ children }: PropsWithChildren<object>) => {
     if (!db) initLumeStorage();
   }, []);
 
-  if (!db) {
+  return { db, isNewVersion };
+};
+
+const StorageProvider = ({ children }: PropsWithChildren<object>) => {
+  const { db, isNewVersion } = StorageInstance();
+
+  if (!db)
     return (
       <div
         data-tauri-drag-region
-        className="flex h-screen w-screen items-center justify-center bg-neutral-50 dark:bg-neutral-950"
+        className="relative flex h-screen w-screen items-center justify-center bg-neutral-50 dark:bg-neutral-950"
       >
-        <div className="flex flex-col items-center justify-center gap-2 text-center">
-          <LoaderIcon className="h-7 w-7 animate-spin text-neutral-950 dark:text-neutral-50" />
+        <div className="flex max-w-2xl flex-col items-start gap-1">
+          <h5 className="font-semibold uppercase">TIP:</h5>
+          <Markdown
+            options={{
+              overrides: {
+                a: {
+                  props: {
+                    className: 'text-blue-500 hover:text-blue-600',
+                    target: '_blank',
+                  },
+                },
+              },
+            }}
+            className="text-4xl font-semibold leading-snug text-neutral-300 dark:text-neutral-700"
+          >
+            {QUOTES[Math.floor(Math.random() * QUOTES.length)]}
+          </Markdown>
+        </div>
+        <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>
     );
-  }
 
   return <StorageContext.Provider value={{ db }}>{children}</StorageContext.Provider>;
 };

src/main.jsx

@@ -1,6 +1,4 @@
-import { createSyncStoragePersister } from '@tanstack/query-sync-storage-persister';
-import { QueryClient } from '@tanstack/react-query';
-import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { createRoot } from 'react-dom/client';
 import { Toaster } from 'sonner';
 
@@ -17,20 +15,16 @@ const queryClient = new QueryClient({
   },
 });
 
-const persister = createSyncStoragePersister({
-  storage: window.localStorage,
-});
-
 const container = document.getElementById('root');
 const root = createRoot(container);
 
 root.render(
-  <PersistQueryClientProvider client={queryClient} persistOptions={{ persister }}>
+  <QueryClientProvider client={queryClient}>
+    <Toaster position="top-center" closeButton theme="system" />
     <StorageProvider>
       <NDKProvider>
-        <Toaster position="top-center" closeButton />
         <App />
       </NDKProvider>
     </StorageProvider>
-  </PersistQueryClientProvider>
+  </QueryClientProvider>
 );

src/shared/accounts/active.tsx

@@ -24,8 +24,8 @@ export function ActiveAccount() {
   }
 
   return (
-    <div className="flex flex-col gap-1 rounded-lg bg-neutral-100 p-1 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800">
-      <Link to={`/users/${db.account.pubkey}`} className="relative inline-block">
+    <div className="flex flex-col gap-1 rounded-lg bg-neutral-100 p-1 ring-1 ring-transparent hover:bg-neutral-200 hover:ring-blue-500 dark:bg-neutral-900 dark:hover:bg-neutral-800">
+      <Link to="/settings/" className="relative inline-block">
         <Avatar.Root>
           <Avatar.Image
             src={user?.picture || user?.image}
@@ -38,14 +38,14 @@ export function ActiveAccount() {
           <Avatar.Fallback delayMs={150}>
             <img
               src={svgURI}
-              alt={db.account.pubkeypubkey}
+              alt={db.account.pubkey}
               className="aspect-square h-auto w-full rounded-md bg-black dark:bg-white"
             />
           </Avatar.Fallback>
         </Avatar.Root>
         <NetworkStatusIndicator />
       </Link>
-      <AccountMoreActions pubkey={db.account.pubkey} />
+      <AccountMoreActions />
     </div>
   );
 }

src/shared/accounts/more.tsx

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

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/image.tsx

@@ -1,32 +0,0 @@
-import { minidenticon } from 'minidenticons';
-import { ImgHTMLAttributes, memo, useState } from 'react';
-
-export const Image = memo(function Image({
-  src,
-  ...props
-}: ImgHTMLAttributes<HTMLImageElement>) {
-  const [isError, setIsError] = useState(false);
-
-  if (isError || !src) {
-    const svgURI =
-      'data:image/svg+xml;utf8,' + encodeURIComponent(minidenticon(props.alt, 90, 50));
-    return (
-      <img src={svgURI} alt={props.alt} {...props} style={{ backgroundColor: '#000' }} />
-    );
-  }
-
-  return (
-    <img
-      {...props}
-      src={src}
-      onError={({ currentTarget }) => {
-        currentTarget.onerror = null;
-        setIsError(true);
-      }}
-      loading="lazy"
-      decoding="async"
-      alt="lume default img"
-      style={{ contentVisibility: 'auto' }}
-    />
-  );
-});

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 className="flex h-full min-h-0 w-full">
-        <div className="container mx-auto grid grid-cols-8 px-4">
-          <div className="col-span-1">
-            <Link
-              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"
-            >
-              <ArrowLeftIcon className="h-5 w-5" />
-            </Link>
-          </div>
-          <div className="relative col-span-6 flex flex-col">
-            <div className="mb-8 flex h-10 shrink-0 items-center gap-3">
+      <div data-tauri-drag-region className="h-4 shrink-0" />
+      <div className="container mx-auto grid flex-1 grid-cols-8 px-4">
+        <div className="col-span-1">
+          <Link
+            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"
+          >
+            <ArrowLeftIcon className="h-5 w-5" />
+          </Link>
+        </div>
+        <div className="col-span-6 flex flex-col">
+          <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>
-            <div className="h-full min-h-0 w-full">
-              <Outlet />
-            </div>
+            ) : null}
           </div>
-          <div className="col-span-1" />
+          <Outlet />
         </div>
+        <div className="col-span-1" />
       </div>
     </div>
   );

src/shared/layouts/note.tsx

@@ -13,7 +13,6 @@ export function NoteLayout() {
       ) : (
         <div data-tauri-drag-region className="h-9" />
       )}
-      <div data-tauri-drag-region className="h-6" />
       <div className="flex h-full min-h-0 w-full">
         <Outlet />
         <ScrollRestoration />

src/shared/layouts/settings.tsx

@@ -1,68 +1,117 @@
-import { Link, 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 { ArrowLeftIcon, SecureIcon, SettingsIcon } from '@shared/icons';
+import { useStorage } from '@libs/storage/provider';
+
+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">
-      <div className="relative flex h-full w-[232px] flex-col">
-        <div data-tauri-drag-region className="h-11 w-full shrink-0" />
-        <div className="flex h-full flex-1 flex-col gap-2 overflow-y-auto pb-32 scrollbar-none">
-          <div className="inline-flex items-center gap-2 border-l-2 border-transparent pl-4">
-            <Link
-              to="/"
-              className="inline-flex h-7 w-7 items-center justify-center rounded hover:bg-white/10"
+    <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 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-center justify-between border-b border-neutral-200 px-2 pb-2 dark:border-neutral-900">
+          <div>
+            <button
+              type="button"
+              onClick={() => navigate(-1)}
+              className="inline-flex h-12 w-12 items-center justify-center rounded-xl bg-neutral-100 dark:bg-neutral-900"
             >
-              <ArrowLeftIcon className="h-4 w-4 text-neutral-600 dark:text-neutral-400" />
-            </Link>
-            <h3 className="text-[11px] font-bold uppercase tracking-widest text-neutral-600 dark:text-neutral-400">
-              Settings
-            </h3>
+              <ArrowLeftIcon className="h-5 w-5" />
+            </button>
           </div>
-          <div className="flex flex-col pr-2">
+          <div className="flex items-center gap-0.5">
             <NavLink
               to="/settings/"
+              end
               className={({ isActive }) =>
                 twMerge(
-                  'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 pl-4 pr-2',
+                  '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
-                    ? 'border-blue-500 bg-white/5 text-white'
-                    : 'border-transparent text-white/80'
+                    ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
+                    : ''
                 )
               }
             >
-              <span className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                <SettingsIcon className="h-4 w-4 text-white" />
-              </span>
-              <span className="font-medium">General</span>
+              <UserIcon className="h-6 w-6" />
+              <p className="text-sm font-medium">User</p>
+            </NavLink>
+            <NavLink
+              to="/settings/general"
+              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'
+                    : ''
+                )
+              }
+            >
+              <SettingsIcon className="h-6 w-6" />
+              <p className="text-sm font-medium">General</p>
             </NavLink>
             <NavLink
               to="/settings/backup"
               className={({ isActive }) =>
                 twMerge(
-                  'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 pl-4 pr-2',
+                  '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
-                    ? 'border-blue-500 bg-white/5 text-white'
-                    : 'border-transparent text-white/80'
+                    ? 'bg-neutral-100 text-blue-500 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800'
+                    : ''
                 )
               }
             >
-              <span className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded bg-neutral-400 dark:bg-neutral-600">
-                <SecureIcon className="h-4 w-4 text-white" />
-              </span>
-              <span className="font-medium">Backup</span>
+              <SecureIcon className="h-6 w-6" />
+              <p className="text-sm font-medium">Backup</p>
+            </NavLink>
+            <NavLink
+              to="/settings/advanced"
+              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'
+                    : ''
+                )
+              }
+            >
+              <AdvancedSettingsIcon className="h-6 w-6" />
+              <p className="text-sm font-medium">Advanced</p>
+            </NavLink>
+            <NavLink
+              to="/settings/about"
+              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>
-      </div>
-      <div className="h-full w-full flex-1 bg-black/90 backdrop-blur-xl">
         <Outlet />
-        <ScrollRestoration
-          getKey={(location) => {
-            return location.pathname;
-          }}
-        />
+        <ScrollRestoration />
       </div>
     </div>
   );

src/shared/logout.tsx

@@ -1,25 +1,37 @@
 import * as AlertDialog from '@radix-ui/react-alert-dialog';
+import { useQueryClient } from '@tanstack/react-query';
 import { useNavigate } from 'react-router-dom';
+import { toast } from 'sonner';
 
 import { useNDK } from '@libs/ndk/provider';
 import { useStorage } from '@libs/storage/provider';
 
 export function Logout() {
-  const navigate = useNavigate();
-
   const { db } = useStorage();
   const { ndk } = useNDK();
 
+  const navigate = useNavigate();
+  const queryClient = useQueryClient();
+
   const logout = async () => {
-    ndk.signer = null;
+    try {
+      ndk.signer = null;
 
-    // remove account
-    await db.accountLogout();
-    await db.secureRemove(db.account.pubkey);
-    await db.secureRemove(db.account.pubkey + '-bunker');
+      // remove private key
+      await db.secureRemove(db.account.pubkey);
+      await db.secureRemove(db.account.pubkey + '-bunker');
 
-    // redirect to welcome screen
-    navigate('/auth/welcome');
+      // logout
+      await db.accountLogout();
+
+      // clear cache
+      queryClient.clear();
+
+      // redirect to welcome screen
+      navigate('/auth/welcome');
+    } catch (e) {
+      toast.error(e);
+    }
   };
 
   return (
@@ -33,7 +45,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 +66,15 @@ export function Logout() {
                   Cancel
                 </button>
               </AlertDialog.Cancel>
-              <button
-                type="button"
-                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>
+              <AlertDialog.Action asChild>
+                <button
+                  type="button"
+                  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>
+              </AlertDialog.Action>
             </div>
           </div>
         </AlertDialog.Content>

src/shared/navigation.tsx

@@ -2,14 +2,7 @@ import { Link, NavLink } from 'react-router-dom';
 import { twMerge } from 'tailwind-merge';
 
 import { ActiveAccount } from '@shared/accounts/active';
-import {
-  ChatsIcon,
-  ComposeIcon,
-  ExploreIcon,
-  HomeIcon,
-  NwcIcon,
-  RelayIcon,
-} from '@shared/icons';
+import { ChatsIcon, ComposeIcon, HomeIcon, NwcIcon, RelayIcon } from '@shared/icons';
 
 import { compactNumber } from '@utils/number';
 
@@ -87,29 +80,6 @@ export function Navigation() {
             </>
           )}
         </NavLink>
-        <NavLink
-          to="/explore"
-          preventScrollReset={true}
-          className="inline-flex flex-col items-center justify-center"
-        >
-          {({ isActive }) => (
-            <>
-              <div
-                className={twMerge(
-                  'inline-flex aspect-square h-auto w-full items-center justify-center rounded-lg',
-                  isActive
-                    ? 'bg-black/10 text-black dark:bg-white/10 dark:text-white'
-                    : 'text-black/50 dark:text-neutral-400'
-                )}
-              >
-                <ExploreIcon className="h-6 w-6" />
-              </div>
-              <div className="text-sm font-medium text-black dark:text-white">
-                Explore
-              </div>
-            </>
-          )}
-        </NavLink>
       </div>
       <div className="flex shrink-0 flex-col gap-3 p-1">
         <Link

src/shared/nip05.tsx

@@ -22,7 +22,7 @@ export const NIP05 = memo(function NIP05({
 }) {
   const { status, data } = useQuery({
     queryKey: ['nip05', nip05],
-    queryFn: async () => {
+    queryFn: async ({ signal }: { signal: AbortSignal }) => {
       try {
         const localPath = nip05.split('@')[0];
         const service = nip05.split('@')[1];
@@ -33,6 +33,7 @@ export const NIP05 = memo(function NIP05({
           headers: {
             'Content-Type': 'application/json; charset=utf-8',
           },
+          signal,
         });
 
         if (!res.ok) throw new Error(`Failed to fetch NIP-05 service: ${nip05}`);
@@ -58,15 +59,19 @@ export const NIP05 = memo(function NIP05({
   }
 
   return (
-    <div className={twMerge('inline-flex items-center gap-1', className)}>
-      <p className="text-sm">{nip05}</p>
-      <div className="shrink-0">
-        {data === true ? (
-          <VerifiedIcon className="h-3 w-3 text-green-500" />
-        ) : (
-          <UnverifiedIcon className="h-3 w-3 text-red-500" />
-        )}
-      </div>
+    <div className="inline-flex items-center gap-1">
+      <p className={twMerge('text-sm font-medium', className)}>{nip05}</p>
+      {data === true ? (
+        <div className="inline-flex h-5 w-max shrink-0 items-center justify-center gap-1 rounded-full bg-teal-500 pl-0.5 pr-1.5 text-xs font-medium text-white">
+          <VerifiedIcon className="h-4 w-4" />
+          Verified
+        </div>
+      ) : (
+        <div className="inline-flex h-5 w-max shrink-0 items-center justify-center gap-1.5 rounded-full bg-red-500 pl-0.5 pr-1.5 text-xs font-medium text-white">
+          <UnverifiedIcon className="h-4 w-4" />
+          Unverified
+        </div>
+      )}
     </div>
   );
 });

src/shared/notes/actions.tsx

@@ -1,53 +1,48 @@
+import { NDKEvent } from '@nostr-dev-kit/ndk';
 import * as Tooltip from '@radix-ui/react-tooltip';
+import { createSearchParams, useNavigate } from 'react-router-dom';
 
-import { FocusIcon } from '@shared/icons';
+import { FocusIcon, ReplyIcon } from '@shared/icons';
 import { NoteReaction } from '@shared/notes/actions/reaction';
-import { NoteReply } from '@shared/notes/actions/reply';
 import { NoteRepost } from '@shared/notes/actions/repost';
 import { NoteZap } from '@shared/notes/actions/zap';
 
-import { WidgetKinds } from '@stores/constants';
+import { WIDGET_KIND } from '@stores/constants';
 
 import { useWidget } from '@utils/hooks/useWidget';
 
 export function NoteActions({
-  id,
-  pubkey,
-  extraButtons = true,
-  root,
+  event,
+  rootEventId,
+  canOpenEvent = true,
 }: {
-  id: string;
-  pubkey: string;
-  extraButtons?: boolean;
-  root?: string;
+  event: NDKEvent;
+  rootEventId?: string;
+  canOpenEvent?: boolean;
 }) {
   const { addWidget } = useWidget();
+  const navigate = useNavigate();
 
   return (
     <Tooltip.Provider>
-      <div className="-ml-1 mt-2 inline-flex w-full items-center">
-        <div className="inline-flex items-center gap-10">
-          <NoteReply id={id} pubkey={pubkey} root={root} />
-          <NoteReaction id={id} pubkey={pubkey} />
-          <NoteRepost id={id} pubkey={pubkey} />
-          <NoteZap id={id} pubkey={pubkey} />
-        </div>
-        {extraButtons && (
-          <div className="ml-auto inline-flex items-center gap-3">
+      <div className="flex h-14 items-center justify-between px-3">
+        {canOpenEvent && (
+          <div className="inline-flex items-center gap-3">
             <Tooltip.Root delayDuration={150}>
               <Tooltip.Trigger asChild>
                 <button
                   type="button"
                   onClick={() =>
                     addWidget.mutate({
-                      kind: WidgetKinds.local.thread,
+                      kind: WIDGET_KIND.thread,
                       title: 'Thread',
-                      content: id,
+                      content: event.id,
                     })
                   }
-                  className="group inline-flex h-7 w-7 items-center justify-center text-neutral-500 dark:text-neutral-300"
+                  className="inline-flex h-7 w-max items-center justify-center gap-2 rounded-full bg-neutral-100 px-2 text-sm font-medium dark:bg-neutral-900"
                 >
-                  <FocusIcon className="h-5 w-5 group-hover:text-blue-500" />
+                  <FocusIcon className="h-4 w-4" />
+                  Open
                 </button>
               </Tooltip.Trigger>
               <Tooltip.Portal>
@@ -59,6 +54,36 @@ export function NoteActions({
             </Tooltip.Root>
           </div>
         )}
+        <div className="inline-flex items-center gap-10">
+          <Tooltip.Root delayDuration={150}>
+            <Tooltip.Trigger asChild>
+              <button
+                type="button"
+                onClick={() =>
+                  navigate({
+                    pathname: '/new/',
+                    search: createSearchParams({
+                      replyTo: event.id,
+                      rootReplyTo: rootEventId,
+                    }).toString(),
+                  })
+                }
+                className="group inline-flex h-7 w-7 items-center justify-center text-neutral-600 dark:text-neutral-400"
+              >
+                <ReplyIcon className="h-5 w-5 group-hover:text-blue-500" />
+              </button>
+            </Tooltip.Trigger>
+            <Tooltip.Portal>
+              <Tooltip.Content className="-left-10 inline-flex h-7 select-none items-center justify-center rounded-md bg-neutral-200 px-3.5 text-sm text-neutral-900 will-change-[transform,opacity] data-[state=delayed-open]:data-[side=bottom]:animate-slideUpAndFade data-[state=delayed-open]:data-[side=left]:animate-slideRightAndFade data-[state=delayed-open]:data-[side=right]:animate-slideLeftAndFade data-[state=delayed-open]:data-[side=top]:animate-slideDownAndFade dark:bg-neutral-800 dark:text-neutral-100">
+                Quick reply
+                <Tooltip.Arrow className="fill-neutral-200 dark:fill-neutral-800" />
+              </Tooltip.Content>
+            </Tooltip.Portal>
+          </Tooltip.Root>
+          <NoteReaction event={event} />
+          <NoteRepost event={event} />
+          <NoteZap event={event} />
+        </div>
       </div>
     </Tooltip.Provider>
   );

src/shared/notes/actions/more.tsx

@@ -30,20 +30,12 @@ export function MoreActions({ id, pubkey }: { id: string; pubkey: string }) {
         </button>
       </DropdownMenu.Trigger>
       <DropdownMenu.Portal>
-        <DropdownMenu.Content className="flex w-[200px] flex-col overflow-hidden rounded-xl border border-neutral-300 bg-neutral-200 focus:outline-none dark:border-neutral-700 dark:bg-neutral-800">
-          <DropdownMenu.Item asChild>
-            <Link
-              to={`/notes/text/${id}`}
-              className="inline-flex h-10 items-center px-4 text-sm text-neutral-900 hover:bg-neutral-300 focus:outline-none dark:text-neutral-100 dark:hover:bg-neutral-700"
-            >
-              Focus
-            </Link>
-          </DropdownMenu.Item>
+        <DropdownMenu.Content className="flex w-[200px] flex-col overflow-hidden rounded-xl border border-neutral-200 bg-neutral-100 focus:outline-none dark:border-neutral-800 dark:bg-neutral-900">
           <DropdownMenu.Item asChild>
             <button
               type="button"
               onClick={() => copyLink()}
-              className="inline-flex h-10 items-center px-4 text-sm text-neutral-900 hover:bg-neutral-300 focus:outline-none dark:text-neutral-100 dark:hover:bg-neutral-700"
+              className="inline-flex h-10 items-center px-4 text-sm text-neutral-900 hover:bg-neutral-200 focus:outline-none dark:text-neutral-100 dark:hover:bg-neutral-800"
             >
               Copy shareable link
             </button>
@@ -52,7 +44,7 @@ export function MoreActions({ id, pubkey }: { id: string; pubkey: string }) {
             <button
               type="button"
               onClick={() => copyID()}
-              className="inline-flex h-10 items-center px-4 text-sm text-neutral-900 hover:bg-neutral-300 focus:outline-none dark:text-neutral-100 dark:hover:bg-neutral-700"
+              className="inline-flex h-10 items-center px-4 text-sm text-neutral-900 hover:bg-neutral-200 focus:outline-none dark:text-neutral-100 dark:hover:bg-neutral-800"
             >
               Copy ID
             </button>
@@ -60,7 +52,7 @@ export function MoreActions({ id, pubkey }: { id: string; pubkey: string }) {
           <DropdownMenu.Item asChild>
             <Link
               to={`/users/${pubkey}`}
-              className="inline-flex h-10 items-center px-4 text-sm text-neutral-900 hover:bg-neutral-300 focus:outline-none dark:text-neutral-100 dark:hover:bg-neutral-700"
+              className="inline-flex h-10 items-center px-4 text-sm text-neutral-900 hover:bg-neutral-200 focus:outline-none dark:text-neutral-100 dark:hover:bg-neutral-800"
             >
               View profile
             </Link>

src/shared/notes/actions/reaction.tsx

@@ -1,6 +1,8 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
+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';
 
@@ -29,31 +31,29 @@ const REACTIONS = [
   },
 ];
 
-export function NoteReaction({ id, pubkey }: { id: string; pubkey: string }) {
-  const { ndk } = useNDK();
-
+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;
   };
 
   const react = async (content: string) => {
-    setReaction(content);
+    try {
+      if (!ndk.signer) return navigate('/new/privkey');
 
-    const event = new NDKEvent(ndk);
-    event.content = content;
-    event.kind = NDKKind.Reaction;
-    event.tags = [
-      ['e', id],
-      ['p', pubkey],
-    ];
+      setReaction(content);
 
-    const publishedRelays = await event.publish();
-    if (publishedRelays) {
+      // react
+      await event.react(content);
       setOpen(false);
+    } catch (e) {
+      toast.error(e);
     }
   };
 

src/shared/notes/actions/reply.tsx

@@ -1,45 +0,0 @@
-import * as Tooltip from '@radix-ui/react-tooltip';
-import { createSearchParams, useNavigate } from 'react-router-dom';
-
-import { ReplyIcon } from '@shared/icons';
-
-export function NoteReply({
-  id,
-  pubkey,
-  root,
-}: {
-  id: string;
-  pubkey: string;
-  root?: string;
-}) {
-  const navigate = useNavigate();
-
-  return (
-    <Tooltip.Root delayDuration={150}>
-      <Tooltip.Trigger asChild>
-        <button
-          type="button"
-          onClick={() =>
-            navigate({
-              pathname: '/new/',
-              search: createSearchParams({
-                id,
-                pubkey,
-                root,
-              }).toString(),
-            })
-          }
-          className="group inline-flex h-7 w-7 items-center justify-center text-neutral-600 dark:text-neutral-400"
-        >
-          <ReplyIcon className="h-5 w-5 group-hover:text-blue-500" />
-        </button>
-      </Tooltip.Trigger>
-      <Tooltip.Portal>
-        <Tooltip.Content className="-left-10 inline-flex h-7 select-none items-center justify-center rounded-md bg-neutral-200 px-3.5 text-sm text-neutral-900 will-change-[transform,opacity] data-[state=delayed-open]:data-[side=bottom]:animate-slideUpAndFade data-[state=delayed-open]:data-[side=left]:animate-slideRightAndFade data-[state=delayed-open]:data-[side=right]:animate-slideLeftAndFade data-[state=delayed-open]:data-[side=top]:animate-slideDownAndFade dark:bg-neutral-800 dark:text-neutral-100">
-          Quick reply
-          <Tooltip.Arrow className="fill-neutral-200 dark:fill-neutral-800" />
-        </Tooltip.Content>
-      </Tooltip.Portal>
-    </Tooltip.Root>
-  );
-}

src/shared/notes/actions/repost.tsx

@@ -1,7 +1,8 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
+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';
 
@@ -9,33 +10,29 @@ import { useNDK } from '@libs/ndk/provider';
 
 import { LoaderIcon, RepostIcon } from '@shared/icons';
 
-export function NoteRepost({ id, pubkey }: { id: string; pubkey: string }) {
-  const { ndk, relayUrls } = useNDK();
-
+export function NoteRepost({ event }: { event: NDKEvent }) {
   const [open, setOpen] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
   const [isRepost, setIsRepost] = useState(false);
 
+  const { ndk } = useNDK();
+  const navigate = useNavigate();
+
   const submit = async () => {
-    setIsLoading(true);
+    try {
+      if (!ndk.signer) return navigate('/new/privkey');
 
-    const tags = [
-      ['e', id, relayUrls[0], 'root'],
-      ['p', pubkey],
-    ];
+      setIsLoading(true);
 
-    const event = new NDKEvent(ndk);
-    event.content = '';
-    event.kind = NDKKind.Repost;
-    event.tags = tags;
+      // repsot
+      await event.repost(true);
 
-    const publishedRelays = await event.publish();
-    if (publishedRelays) {
+      // reset state
       setOpen(false);
       setIsRepost(true);
 
-      toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
-    } else {
+      toast.success("You've reposted this post successfully");
+    } catch (e) {
       setIsLoading(false);
       toast.error('Repost failed, try again later');
     }

src/shared/notes/actions/zap.tsx

@@ -1,24 +1,28 @@
 import { webln } from '@getalby/sdk';
 import { SendPaymentResponse } from '@getalby/sdk/dist/types';
+import { NDKEvent } from '@nostr-dev-kit/ndk';
 import * as Dialog from '@radix-ui/react-dialog';
 import { invoke } from '@tauri-apps/api/primitives';
 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';
 
-import { useEvent } from '@utils/hooks/useEvent';
-import { useNostr } from '@utils/hooks/useNostr';
 import { useProfile } from '@utils/hooks/useProfile';
 import { sendNativeNotification } from '@utils/notification';
 import { compactNumber } from '@utils/number';
 
-export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
-  const { createZap } = useNostr();
-  const { user } = useProfile(pubkey);
-  const { data: event } = useEvent(id);
+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);
   const [amount, setAmount] = useState<string>('21');
@@ -28,12 +32,12 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
   const [isCompleted, setIsCompleted] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
 
-  const nwc = useRef(null);
-
   const createZapRequest = async () => {
     try {
+      if (!ndk.signer) return navigate('/new/privkey');
+
       const zapAmount = parseInt(amount) * 1000;
-      const res = await createZap(event, zapAmount, zapMessage);
+      const res = await event.zap(zapAmount, zapMessage);
 
       if (!res)
         return await message('Cannot create zap request', {
@@ -84,9 +88,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
       if (uri) setWalletConnectURL(uri);
     }
 
-    if (isOpen) {
-      getWalletConnectURL();
-    }
+    if (isOpen) getWalletConnectURL();
 
     return () => {
       setAmount('21');
@@ -107,16 +109,16 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
         </button>
       </Dialog.Trigger>
       <Dialog.Portal>
-        <Dialog.Overlay className="fixed inset-0 z-50 bg-black" />
+        <Dialog.Overlay className="fixed inset-0 z-50 bg-black/20 backdrop-blur-sm dark:bg-black/20" />
         <Dialog.Content className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
-          <div className="relative h-min w-full max-w-xl rounded-xl bg-neutral-400 dark:bg-neutral-600">
+          <div className="relative h-min w-full max-w-xl rounded-xl bg-white dark:bg-black">
             <div className="inline-flex w-full shrink-0 items-center justify-between px-5 py-3">
               <div className="w-6" />
-              <Dialog.Title className="text-center text-sm font-semibold leading-none text-white">
+              <Dialog.Title className="text-center font-semibold">
                 Send tip to {user?.name || user?.display_name || user?.displayName}
               </Dialog.Title>
-              <Dialog.Close className="inline-flex h-6 w-6 items-center justify-center rounded-md backdrop-blur-xl hover:bg-white/10">
-                <CancelIcon className="h-4 w-4 text-neutral-600 dark:text-neutral-400" />
+              <Dialog.Close className="inline-flex h-6 w-6 items-center justify-center rounded-md bg-neutral-100 dark:bg-neutral-900">
+                <CancelIcon className="h-4 w-4" />
               </Dialog.Close>
             </div>
             <div className="overflow-y-auto overflow-x-hidden px-5 pb-5">
@@ -133,7 +135,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
                         max={10000} // 1M sats
                         maxLength={10000} // 1M sats
                         onValueChange={(value) => setAmount(value)}
-                        className="w-full flex-1 bg-transparent text-right text-4xl font-semibold text-white placeholder:text-neutral-600 focus:outline-none dark:text-neutral-400"
+                        className="w-full flex-1 bg-transparent text-right text-4xl font-semibold placeholder:text-neutral-600 focus:outline-none dark:text-neutral-400"
                       />
                       <span className="w-full flex-1 text-left text-4xl font-semibold text-neutral-600 dark:text-neutral-400">
                         sats
@@ -143,35 +145,35 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
                       <button
                         type="button"
                         onClick={() => setAmount('69')}
-                        className="w-max rounded-full border border-white/5 bg-white/5 px-2.5 py-1 text-sm font-medium hover:bg-white/10"
+                        className="w-max rounded-full border border-neutral-200 bg-neutral-100 px-2.5 py-1 text-sm font-medium hover:bg-neutral-200 dark:border-neutral-800 dark:bg-neutral-900 dark:hover:bg-neutral-800"
                       >
                         69 sats
                       </button>
                       <button
                         type="button"
                         onClick={() => setAmount('100')}
-                        className="w-max rounded-full border border-white/5 bg-white/5 px-2.5 py-1 text-sm font-medium hover:bg-white/10"
+                        className="w-max rounded-full border border-neutral-200 bg-neutral-100 px-2.5 py-1 text-sm font-medium hover:bg-neutral-200 dark:border-neutral-800 dark:bg-neutral-900 dark:hover:bg-neutral-800"
                       >
                         100 sats
                       </button>
                       <button
                         type="button"
                         onClick={() => setAmount('200')}
-                        className="w-max rounded-full border border-white/5 bg-white/5 px-2.5 py-1 text-sm font-medium hover:bg-white/10"
+                        className="w-max rounded-full border border-neutral-200 bg-neutral-100 px-2.5 py-1 text-sm font-medium hover:bg-neutral-200 dark:border-neutral-800 dark:bg-neutral-900 dark:hover:bg-neutral-800"
                       >
                         200 sats
                       </button>
                       <button
                         type="button"
                         onClick={() => setAmount('500')}
-                        className="w-max rounded-full border border-white/5 bg-white/5 px-2.5 py-1 text-sm font-medium hover:bg-white/10"
+                        className="w-max rounded-full border border-neutral-200 bg-neutral-100 px-2.5 py-1 text-sm font-medium hover:bg-neutral-200 dark:border-neutral-800 dark:bg-neutral-900 dark:hover:bg-neutral-800"
                       >
                         500 sats
                       </button>
                       <button
                         type="button"
                         onClick={() => setAmount('1000')}
-                        className="w-max rounded-full border border-white/5 bg-white/5 px-2.5 py-1 text-sm font-medium hover:bg-white/10"
+                        className="w-max rounded-full border border-neutral-200 bg-neutral-100 px-2.5 py-1 text-sm font-medium hover:bg-neutral-200 dark:border-neutral-800 dark:bg-neutral-900 dark:hover:bg-neutral-800"
                       >
                         1K sats
                       </button>
@@ -187,28 +189,28 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
                       autoCorrect="off"
                       autoCapitalize="off"
                       placeholder="Enter message (optional)"
-                      className="relative min-h-[56px] w-full resize-none rounded-lg bg-white/10 px-3 py-2 !outline-none backdrop-blur-xl placeholder:text-neutral-600 dark:text-neutral-400"
+                      className="w-full resize-none rounded-lg bg-neutral-100 px-3 py-3 !outline-none placeholder:text-neutral-600 dark:bg-neutral-900 dark:text-neutral-400"
                     />
                     <div className="flex flex-col gap-2">
                       {walletConnectURL ? (
                         <button
                           type="button"
                           onClick={() => createZapRequest()}
-                          className="inline-flex h-11 w-full items-center justify-center rounded-lg bg-blue-500 px-4 font-medium text-white hover:bg-blue-600"
+                          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-blue-500 px-4 font-medium text-white hover:bg-blue-600"
                         >
                           {isCompleted ? (
                             <p>Successfully tipped</p>
                           ) : isLoading ? (
                             <span className="flex flex-col">
-                              <p className="mb-px leading-none">Waiting for approval</p>
-                              <p className="text-xs leading-none text-neutral-600 dark:text-neutral-400">
+                              <p>Waiting for approval</p>
+                              <p className="text-xs text-neutral-600 dark:text-neutral-400">
                                 Go to your wallet and approve payment request
                               </p>
                             </span>
                           ) : (
                             <span className="flex flex-col">
-                              <p className="mb-px leading-none">Send tip</p>
-                              <p className="text-xs leading-none text-neutral-600 dark:text-neutral-400">
+                              <p>Send tip</p>
+                              <p className="text-xs text-neutral-600 dark:text-neutral-400">
                                 You&apos;re using nostr wallet connect
                               </p>
                             </span>
@@ -218,9 +220,9 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
                         <button
                           type="button"
                           onClick={() => createZapRequest()}
-                          className="inline-flex h-11 w-full items-center justify-center rounded-lg bg-blue-500 px-4 font-medium hover:bg-blue-600"
+                          className="inline-flex h-9 w-full items-center justify-center rounded-lg bg-blue-500 px-4 font-medium text-white hover:bg-blue-600"
                         >
-                          <p>Create Lightning invoice</p>
+                          Create Lightning invoice
                         </button>
                       )}
                     </div>
@@ -228,13 +230,11 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
                 </>
               ) : (
                 <div className="mt-3 flex flex-col items-center justify-center gap-4">
-                  <div className="rounded-md bg-white p-3">
+                  <div className="rounded-md bg-neutral-100 p-3 dark:bg-neutral-900">
                     <QRCodeSVG value={invoice} size={256} />
                   </div>
                   <div className="flex flex-col items-center gap-1">
-                    <h3 className="text-lg font-medium leading-none text-white">
-                      Scan to pay
-                    </h3>
+                    <h3 className="text-lg font-medium">Scan to pay</h3>
                     <span className="text-center text-sm text-neutral-600 dark:text-neutral-400">
                       You must use Bitcoin wallet which support Lightning
                       <br />

src/shared/notes/article.tsx

@@ -0,0 +1,75 @@
+import { NDKEvent } from '@nostr-dev-kit/ndk';
+import { memo } from 'react';
+import { Link } from 'react-router-dom';
+
+import { User } from '@shared/user';
+
+import { NoteActions } from './actions';
+
+export function ArticleNote({ event }: { event: NDKEvent }) {
+  const getMetadata = () => {
+    const title = event.tags.find((tag) => tag[0] === 'title')?.[1];
+    const image = event.tags.find((tag) => tag[0] === 'image')?.[1];
+    const summary = event.tags.find((tag) => tag[0] === 'summary')?.[1];
+
+    let publishedAt: Date | string | number = event.tags.find(
+      (tag) => tag[0] === 'published_at'
+    )?.[1];
+    if (publishedAt) {
+      publishedAt = new Date(parseInt(publishedAt) * 1000).toLocaleDateString('en-US');
+    } else {
+      publishedAt = new Date(event.created_at * 1000).toLocaleDateString('en-US');
+    }
+
+    return {
+      title,
+      image,
+      publishedAt,
+      summary,
+    };
+  };
+
+  const metadata = getMetadata();
+
+  return (
+    <div className="mb-3 h-min w-full px-3">
+      <div className="relative flex flex-col gap-2 overflow-hidden rounded-xl bg-neutral-50 pt-3 dark:bg-neutral-950">
+        <User pubkey={event.pubkey} time={event.created_at} eventId={event.id} />
+        <div className="px-3">
+          <Link
+            to={`/notes/article/${event.id}`}
+            preventScrollReset={true}
+            className="flex w-full flex-col rounded-lg bg-neutral-100 dark:bg-neutral-900"
+          >
+            {metadata.image && (
+              <img
+                src={metadata.image}
+                alt={metadata.title}
+                loading="lazy"
+                decoding="async"
+                style={{ contentVisibility: 'auto' }}
+                className="h-auto w-full rounded-t-lg object-cover"
+              />
+            )}
+            <div className="flex flex-col gap-1 rounded-b-lg rounded-t-lg bg-neutral-100 px-3 py-3 dark:bg-neutral-900">
+              <h5 className="break-all font-semibold text-neutral-900 dark:text-neutral-100">
+                {metadata.title}
+              </h5>
+              {metadata.summary ? (
+                <p className="line-clamp-3 break-all text-sm text-neutral-600 dark:text-neutral-400">
+                  {metadata.summary}
+                </p>
+              ) : null}
+              <span className="mt-2.5 text-sm text-neutral-600 dark:text-neutral-400">
+                {metadata.publishedAt.toString()}
+              </span>
+            </div>
+          </Link>
+        </div>
+        <NoteActions event={event} />
+      </div>
+    </div>
+  );
+}
+
+export const MemoizedArticleNote = memo(ArticleNote);