chore: release version 0.2.11

chore: update the release script
chore: follow up on #172 (#173 )
2025-10-01 13:50:57 +07:00 · 2025-10-01 13:49:39 +07:00 · 2025-10-01 13:45:13 +07:00 · 2025-09-30 08:59:38 +07:00 · 2025-09-28 08:01:41 +07:00 · 2025-09-28 07:57:04 +07:00
110 changed files with 11159 additions and 7499 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -157,7 +157,7 @@ jobs:
        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ steps.version.outputs.tag }}
-          name: Release ${{ steps.version.outputs.tag }}
+          name: ${{ steps.version.outputs.tag }}
          draft: true
          prerelease: false
          generate_release_notes: true
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -14,7 +14,7 @@ jobs:
    strategy:
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
-        rustup: [stable, nightly]
+        rustup: [stable]

    runs-on: ${{ matrix.os }}

--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,12 +4,12 @@ members = ["crates/*"]
 default-members = ["crates/coop"]

 [workspace.package]
-version = "0.2.1"
+version = "0.2.11"
 edition = "2021"
 publish = false

 [workspace.metadata.i18n]
-available-locales = ["en", "zh-CN", "zh-TW", "ru", "vi", "ja", "es", "pt", "ko"]
+available-locales = ["en"]
 default-locale = "en"
 load-path = "locales"

@@ -42,6 +42,7 @@ itertools = "0.13.0"
 log = "0.4"
 oneshot = "0.1.10"
 reqwest = { version = "0.12", features = ["multipart", "stream", "json"] }
+flume = { version = "0.11.1", default-features = false, features = ["async", "select"] }
 rust-embed = "8.5.0"
 rust-i18n = "3"
 serde = { version = "1.0", features = ["derive"] }
@@ -49,6 +50,7 @@ serde_json = "1.0"
 smallvec = "1.14.0"
 smol = "2"
 tracing = "0.1.40"
+webbrowser = "1.0.4"

 [profile.release]
 strip = true
@@ -56,3 +58,7 @@ opt-level = "z"
 lto = true
 codegen-units = 1
 panic = "abort"
+
+[profile.profiling]
+inherits = "release"
+debug = true
--- a/assets/brand/system.png
+++ b/assets/brand/system.png
--- a/assets/icons/address-book.svg
+++ b/assets/icons/address-book.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M19.25 21.25H6c-.69 0-1.25-.56-1.25-1.25M11.5 9.25h1M4.75 20V4.75a2 2 0 0 1 2-2h12.5v16H6c-.69 0-1.25.56-1.25 1.25Zm5-6.25s0-1.5 2.25-1.5 2.25 1.5 2.25 1.5h-4.5ZM13 9.25a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"/>
-</svg>
--- a/assets/icons/arrow-up-circle.svg
+++ b/assets/icons/arrow-up-circle.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10S2 17.523 2 12Zm6.22-1.53 3.25-3.25a.75.75 0 0 1 1.06 0l3.25 3.25a.75.75 0 1 1-1.06 1.06l-1.97-1.97v6.69a.75.75 0 0 1-1.5 0V9.56l-1.97 1.97a.75.75 0 0 1-1.06-1.06Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/bubble-fill.svg
+++ b/assets/icons/bubble-fill.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-  <path fill="#000" fill-rule="evenodd" d="M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10a9.967 9.967 0 0 1-4.098-.876.313.313 0 0 0-.195-.026l-3.471.78a1.75 1.75 0 0 1-2.084-2.12l.809-3.33a.313.313 0 0 0-.028-.204A9.965 9.965 0 0 1 2 12Zm4.5 0a1 1 0 1 0 2 0 1 1 0 0 0-2 0Zm4.5 0a1 1 0 1 0 2 0 1 1 0 0 0-2 0Zm5.5 1a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/edit-fill.svg
+++ b/assets/icons/edit-fill.svg
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" d="M4 4.75A2.75 2.75 0 0 1 6.75 2h10.5A2.75 2.75 0 0 1 20 4.75v7.917a3.9 3.9 0 0 0-4.091.909l-3.75 3.75a2.25 2.25 0 0 0-.659 1.59v2.334c0 .263.045.515.128.75H6.75A2.75 2.75 0 0 1 4 19.25V4.75Z"/>
-  <path fill="currentColor" fill-rule="evenodd" d="M19.303 15.697a.9.9 0 0 0-1.273 0l-3.53 3.53V20.5h1.273l3.53-3.53a.9.9 0 0 0 0-1.273Zm-2.333-1.06a2.4 2.4 0 1 1 3.394 3.393l-3.75 3.75a.75.75 0 0 1-.53.22H13.75a.75.75 0 0 1-.75-.75v-2.333a.75.75 0 0 1 .22-.53l3.75-3.75Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/edit.svg
+++ b/assets/icons/edit.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M10.75 21.25h-4a2 2 0 0 1-2-2V4.75a2 2 0 0 1 2-2h10.5a2 2 0 0 1 2 2v7"/>
+  <path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.5" d="M13.75 21.25v-2.333l3.75-3.75a1.65 1.65 0 0 1 2.333 2.333l-3.75 3.75H13.75Z"/>
+</svg>
--- a/assets/icons/filter-fill.svg
+++ b/assets/icons/filter-fill.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" d="M5.75 3A2.75 2.75 0 0 0 3 5.75v1.422c0 .729.29 1.428.805 1.944l4.829 4.829c.234.234.366.552.366.883v6.422a.75.75 0 0 0 .95.723l4.5-1.25A.75.75 0 0 0 15 20v-5.172c0-.331.132-.649.366-.883l4.829-4.829A2.75 2.75 0 0 0 21 7.172V5.75A2.75 2.75 0 0 0 18.25 3H5.75Z"/>
-</svg>
--- a/assets/icons/filter.svg
+++ b/assets/icons/filter.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linejoin="round" stroke-width="1.5" d="M18.25 3.75H5.75a2 2 0 0 0-2 2v1.422a2 2 0 0 0 .586 1.414l4.828 4.828a2 2 0 0 1 .586 1.414v6.422l4.5-1.25v-5.172a2 2 0 0 1 .586-1.414l4.828-4.828a2 2 0 0 0 .586-1.414V5.75a2 2 0 0 0-2-2Z"/>
-</svg>
--- a/assets/icons/folder.svg
+++ b/assets/icons/folder.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.75 5.75v11.5a2 2 0 0 0 2 2h14.5a2 2 0 0 0 2-2v-8.5a2 2 0 0 0-2-2h-6.18a2 2 0 0 1-1.664-.89l-.812-1.22a2 2 0 0 0-1.664-.89H4.75a2 2 0 0 0-2 2Z"/>
-</svg>
--- a/assets/icons/forward.svg
+++ b/assets/icons/forward.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linejoin="round" stroke-width="1.5" d="m21.76 11.45-8.146-7.535a.75.75 0 0 0-1.26.55V8a.51.51 0 0 1-.504.504C3.765 8.632 1.604 11.92 1.604 20.25c1.47-2.94 2.22-4.679 10.245-4.748a.501.501 0 0 1 .505.498v3.535a.75.75 0 0 0 1.26.55l8.145-7.535a.75.75 0 0 0 0-1.1Z"/>
-</svg>
--- a/assets/icons/group.svg
+++ b/assets/icons/group.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17.75 19.25h2.596c1.163 0 2.106-1.001 1.788-2.12-.733-2.573-2.465-4.38-5.134-4.38-.446 0-.866.05-1.26.147M11.25 7a3.25 3.25 0 1 1-6.5 0 3.25 3.25 0 0 1 6.5 0Zm8.5.5a2.75 2.75 0 1 1-5.5 0 2.75 2.75 0 0 1 5.5 0ZM2.08 18.126c.78-3.14 2.78-5.376 5.92-5.376s5.14 2.237 5.918 5.376c.28 1.128-.658 2.124-1.82 2.124H3.901c-1.162 0-2.1-.996-1.82-2.124Z"/>
+</svg>
--- a/assets/icons/language.svg
+++ b/assets/icons/language.svg
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.75 5.816h8.5M8 5.75v-2m4 10.5C7.935 13.198 5.845 10.614 5.25 6"/>
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4 14c4.064-1.02 6.154-3.527 6.75-8m3.594 11.125h5.312m1.594 2.125-3.314-8.774c-.326-.862-1.546-.862-1.872 0L12.75 19.25"/>
-</svg>
--- a/assets/icons/mailbox-fill.svg
+++ b/assets/icons/mailbox-fill.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M104,152a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H96A8,8,0,0,1,104,152ZM168,32h24a8,8,0,0,0,0-16H160a8,8,0,0,0-8,8V56h16Zm72,84v60a16,16,0,0,1-16,16H136v32a8,8,0,0,1-16,0V192H32a16,16,0,0,1-16-16V116A60.07,60.07,0,0,1,76,56h76v88a8,8,0,0,0,16,0V56h12A60.07,60.07,0,0,1,240,116Zm-120,0a44,44,0,0,0-88,0v60h88Z"></path></svg>
--- a/assets/icons/notifications.svg
+++ b/assets/icons/notifications.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M12 2a7.795 7.795 0 0 0-7.696 6.554l-1.17 7.258A2.75 2.75 0 0 0 5.848 19h1.66c.849 1.75 2.512 3 4.492 3s3.643-1.25 4.492-3h1.66a2.75 2.75 0 0 0 2.714-3.188l-1.17-7.258A7.795 7.795 0 0 0 12 2Zm2.754 17H9.245c.678.937 1.68 1.5 2.754 1.5s2.076-.563 2.754-1.5Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/refresh.svg
+++ b/assets/icons/refresh.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="currentColor" d="M13 21a1 1 0 1 0 0-2 1 1 0 0 0 0 2Zm8-10a1 1 0 1 0-2 0 1 1 0 0 0 2 0Zm-1.07 3.268a1 1 0 1 1-1 1.732 1 1 0 0 1 1-1.732Zm-2.562 5.026a1 1 0 1 0-1-1.732 1 1 0 0 0 1 1.732ZM18.927 8a1 1 0 1 1-1-1.732 1 1 0 0 1 1 1.732Z"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.25 14.75v5.5h-5.5M9 19.688a8.25 8.25 0 1 1 6.25-15.273"/>
+</svg>
--- a/assets/icons/search-fill.svg
+++ b/assets/icons/search-fill.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" d="M3 11a8 8 0 1 1 14.162 5.102l3.368 3.368a.75.75 0 1 1-1.06 1.06l-3.368-3.368A8 8 0 0 1 3 11Z"/>
-</svg>
--- a/assets/icons/server.svg
+++ b/assets/icons/server.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.5" d="M21.25 12V6.75a2 2 0 0 0-2-2H4.75a2 2 0 0 0-2 2V12m18.5 0H2.75m18.5 0v5.25a2 2 0 0 1-2 2H4.75a2 2 0 0 1-2-2V12"/>
+  <path fill="currentColor" stroke="currentColor" stroke-width=".5" d="M6.5 14.875a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5Zm0-7.25a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5Z"/>
+</svg>
--- a/assets/icons/signal.svg
+++ b/assets/icons/signal.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="m7.5 3.25 4.5 3.5 4.5-3.5m-11.75 17h14.5a2 2 0 0 0 2-2v-9.5a2 2 0 0 0-2-2H4.75a2 2 0 0 0-2 2v9.5a2 2 0 0 0 2 2Z"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 17v2m6-6v6m6-10v10m6-14v14"/>
 </svg>
--- a/assets/icons/toggle-fill.svg
+++ b/assets/icons/toggle-fill.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path fill="currentColor" fill-rule="evenodd" d="M1 11.75A5.75 5.75 0 0 1 6.75 6h10.5A5.75 5.75 0 0 1 23 11.75v.5A5.75 5.75 0 0 1 17.25 18H6.75A5.75 5.75 0 0 1 1 12.25v-.5ZM17 7.5a4.5 4.5 0 1 0 0 9 4.5 4.5 0 0 0 0-9Z" clip-rule="evenodd"/>
-</svg>
--- a/assets/icons/toggle.svg
+++ b/assets/icons/toggle.svg
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-width="1.5" d="M17 17.25H7a5.25 5.25 0 1 1 0-10.5h10m0 10.5a5.25 5.25 0 1 0 0-10.5m0 10.5a5.25 5.25 0 1 1 0-10.5"/>
-</svg>
--- a/assets/icons/users-three-fill.svg
+++ b/assets/icons/users-three-fill.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M64.12,147.8a4,4,0,0,1-4,4.2H16a8,8,0,0,1-7.8-6.17,8.35,8.35,0,0,1,1.62-6.93A67.79,67.79,0,0,1,37,117.51a40,40,0,1,1,66.46-35.8,3.94,3.94,0,0,1-2.27,4.18A64.08,64.08,0,0,0,64,144C64,145.28,64,146.54,64.12,147.8Zm182-8.91A67.76,67.76,0,0,0,219,117.51a40,40,0,1,0-66.46-35.8,3.94,3.94,0,0,0,2.27,4.18A64.08,64.08,0,0,1,192,144c0,1.28,0,2.54-.12,3.8a4,4,0,0,0,4,4.2H240a8,8,0,0,0,7.8-6.17A8.33,8.33,0,0,0,246.17,138.89Zm-89,43.18a48,48,0,1,0-58.37,0A72.13,72.13,0,0,0,65.07,212,8,8,0,0,0,72,224H184a8,8,0,0,0,6.93-12A72.15,72.15,0,0,0,157.19,182.07Z"></path></svg>
--- a/assets/icons/warning.svg
+++ b/assets/icons/warning.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M12 9.02v2.993M12 15h.01M10.277 3.99 3.275 15.998C2.499 17.328 3.458 19 4.998 19h14.004c1.54 0 2.5-1.671 1.723-3.002L13.723 3.99c-.77-1.32-2.677-1.32-3.447 0ZM12.25 15a.25.25 0 1 1-.5 0 .25.25 0 0 1 .5 0Z"/>
+</svg>
--- a/crates/auto_update/src/lib.rs
+++ b/crates/auto_update/src/lib.rs
@@ -108,12 +108,9 @@ impl AutoUpdater {

        cx.spawn_in(window, async move |this, cx| {
            if let Ok(Some(update)) = checking.await {
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.set_status(AutoUpdateStatus::checked(update), cx);
-                        this.install_update(window, cx);
-                    })
-                    .ok();
+                this.update_in(cx, |this, window, cx| {
+                    this.set_status(AutoUpdateStatus::checked(update), cx);
+                    this.install_update(window, cx);
                })
                .ok();
            } else {
--- a/crates/client_keys/src/lib.rs
+++ b/crates/client_keys/src/lib.rs
@@ -1,4 +1,7 @@
-use global::{constants::KEYRING_URL, first_run};
+use std::sync::atomic::Ordering;
+
+use global::app_state;
+use global::constants::KEYRING_URL;
 use gpui::{App, AppContext, Context, Entity, Global, Subscription, Window};
 use nostr_sdk::prelude::*;
 use smallvec::{smallvec, SmallVec};
@@ -24,7 +27,7 @@ impl ClientKeys {
    }

    /// Retrieve the Client Keys instance
-    pub fn get_global(cx: &App) -> &Self {
+    pub fn read_global(cx: &App) -> &Self {
        cx.global::<GlobalClientKeys>().0.read(cx)
    }

@@ -49,11 +52,21 @@ impl ClientKeys {
    }

    pub fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        // Prevent macOS from asking for password every time
+        // Only for debug builds
+        if cfg!(debug_assertions) && cfg!(target_os = "macos") {
+            log::warn!("Running debug build on macOS");
+            log::warn!("Skipping keychain access, generating new client keys");
+            self.new_keys(cx);
+            return;
+        }
+
+        let app_state = app_state();
        let read_client_keys = cx.read_credentials(KEYRING_URL);

        cx.spawn_in(window, async move |this, cx| {
            if let Ok(Some((_, secret))) = read_client_keys.await {
-                // Update keys
+                // Update the client keys with the stored secret key from the keychain
                this.update(cx, |this, cx| {
                    let Ok(secret_key) = SecretKey::from_slice(&secret) else {
                        this.set_keys(None, false, true, cx);
@@ -63,8 +76,8 @@ impl ClientKeys {
                    this.set_keys(Some(keys), false, true, cx);
                })
                .ok();
-            } else if *first_run() {
-                // Generate a new keys and update
+            } else if app_state.is_first_run.load(Ordering::Acquire) {
+                // If this is the first run, generate new keys and use them for the client keys
                this.update(cx, |this, cx| {
                    this.new_keys(cx);
                })
@@ -102,6 +115,7 @@ impl ClientKeys {
        }

        self.keys = keys;
+
        // Notify GPUI to reload UI
        if notify {
            cx.notify();
@@ -118,8 +132,7 @@ impl ClientKeys {

    pub fn keys(&self) -> Keys {
        self.keys
-            .as_ref()
-            .cloned()
+            .clone()
            .expect("Keys should always be initialized")
    }

--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -19,6 +19,6 @@ smol.workspace = true
 futures.workspace = true
 reqwest.workspace = true
 log.workspace = true
+webbrowser.workspace = true

-webbrowser = "1.0.4"
-qrcode-generator = "5.0.0"
+qrcode = "0.14.1"
--- a/crates/common/src/display.rs
+++ b/crates/common/src/display.rs
@@ -1,51 +1,107 @@
 use std::sync::Arc;

 use anyhow::{anyhow, Error};
+use chrono::{Local, TimeZone};
 use global::constants::IMAGE_RESIZE_SERVICE;
-use gpui::{Image, ImageFormat, SharedString};
+use gpui::{Image, ImageFormat, SharedString, SharedUri};
 use nostr_sdk::prelude::*;
-use qrcode_generator::QrCodeEcc;
+use qrcode::render::svg;
+use qrcode::QrCode;

+const NOW: &str = "now";
+const SECONDS_IN_MINUTE: i64 = 60;
+const MINUTES_IN_HOUR: i64 = 60;
+const HOURS_IN_DAY: i64 = 24;
+const DAYS_IN_MONTH: i64 = 30;
 const FALLBACK_IMG: &str = "https://image.nostr.build/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png";

-pub trait DisplayProfile {
-    fn avatar_url(&self, proxy: bool) -> SharedString;
+pub trait RenderedProfile {
+    fn avatar(&self, proxy: bool) -> SharedUri;
    fn display_name(&self) -> SharedString;
 }

-impl DisplayProfile for Profile {
-    fn avatar_url(&self, proxy: bool) -> SharedString {
+impl RenderedProfile for Profile {
+    fn avatar(&self, proxy: bool) -> SharedUri {
        self.metadata()
            .picture
            .as_ref()
            .filter(|picture| !picture.is_empty())
            .map(|picture| {
                if proxy {
-                    format!(
+                    let url = format!(
                        "{IMAGE_RESIZE_SERVICE}/?url={picture}&w=100&h=100&fit=cover&mask=circle&default={FALLBACK_IMG}&n=-1"
-                    )
-                    .into()
+                    );
+
+                    SharedUri::from(url)
                } else {
-                    picture.into()
+                    SharedUri::from(picture)
                }
            })
-            .unwrap_or_else(|| "brand/avatar.png".into())
+            .unwrap_or_else(|| SharedUri::from("brand/avatar.png"))
    }

    fn display_name(&self) -> SharedString {
        if let Some(display_name) = self.metadata().display_name.as_ref() {
            if !display_name.is_empty() {
-                return display_name.into();
+                return SharedString::from(display_name);
            }
        }

        if let Some(name) = self.metadata().name.as_ref() {
            if !name.is_empty() {
-                return name.into();
+                return SharedString::from(name);
            }
        }

-        shorten_pubkey(self.public_key(), 4)
+        SharedString::from(shorten_pubkey(self.public_key(), 4))
+    }
+}
+
+pub trait RenderedTimestamp {
+    fn to_human_time(&self) -> SharedString;
+    fn to_ago(&self) -> SharedString;
+}
+
+impl RenderedTimestamp for Timestamp {
+    fn to_human_time(&self) -> SharedString {
+        let input_time = match Local.timestamp_opt(self.as_u64() as i64, 0) {
+            chrono::LocalResult::Single(time) => time,
+            _ => return SharedString::from("9999"),
+        };
+
+        let now = Local::now();
+        let input_date = input_time.date_naive();
+        let now_date = now.date_naive();
+        let yesterday_date = (now - chrono::Duration::days(1)).date_naive();
+        let time_format = input_time.format("%H:%M %p");
+
+        match input_date {
+            date if date == now_date => SharedString::from(format!("Today at {time_format}")),
+            date if date == yesterday_date => {
+                SharedString::from(format!("Yesterday at {time_format}"))
+            }
+            _ => SharedString::from(format!("{}, {time_format}", input_time.format("%d/%m/%y"))),
+        }
+    }
+
+    fn to_ago(&self) -> SharedString {
+        let input_time = match Local.timestamp_opt(self.as_u64() as i64, 0) {
+            chrono::LocalResult::Single(time) => time,
+            _ => return SharedString::from("1m"),
+        };
+
+        let now = Local::now();
+        let duration = now.signed_duration_since(input_time);
+
+        match duration {
+            d if d.num_seconds() < SECONDS_IN_MINUTE => SharedString::from(NOW),
+            d if d.num_minutes() < MINUTES_IN_HOUR => {
+                SharedString::from(format!("{}m", d.num_minutes()))
+            }
+            d if d.num_hours() < HOURS_IN_DAY => SharedString::from(format!("{}h", d.num_hours())),
+            d if d.num_days() < DAYS_IN_MONTH => SharedString::from(format!("{}d", d.num_days())),
+            _ => SharedString::from(input_time.format("%b %d").to_string()),
+        }
    }
 }

@@ -54,49 +110,36 @@ pub trait TextUtils {
    fn to_qr(&self) -> Option<Arc<Image>>;
 }

-impl TextUtils for String {
+impl<T: AsRef<str>> TextUtils for T {
    fn to_public_key(&self) -> Result<PublicKey, Error> {
-        if self.starts_with("nprofile1") {
-            Ok(Nip19Profile::from_bech32(self)?.public_key)
-        } else if self.starts_with("npub1") {
-            Ok(PublicKey::parse(self)?)
+        let s = self.as_ref();
+        if s.starts_with("nprofile1") {
+            Ok(Nip19Profile::from_bech32(s)?.public_key)
+        } else if s.starts_with("npub1") {
+            Ok(PublicKey::parse(s)?)
        } else {
            Err(anyhow!("Invalid public key"))
        }
    }

    fn to_qr(&self) -> Option<Arc<Image>> {
-        let Ok(bytes) = qrcode_generator::to_png_to_vec_from_str(self, QrCodeEcc::Medium, 256)
-        else {
-            return None;
-        };
+        let s = self.as_ref();
+        let code = QrCode::new(s).unwrap();
+        let svg = code
+            .render()
+            .min_dimensions(256, 256)
+            .dark_color(svg::Color("#000000"))
+            .light_color(svg::Color("#FFFFFF"))
+            .build();

-        Some(Arc::new(Image::from_bytes(ImageFormat::Png, bytes)))
+        Some(Arc::new(Image::from_bytes(
+            ImageFormat::Svg,
+            svg.into_bytes(),
+        )))
    }
 }

-impl TextUtils for &str {
-    fn to_public_key(&self) -> Result<PublicKey, Error> {
-        if self.starts_with("nprofile1") {
-            Ok(Nip19Profile::from_bech32(self)?.public_key)
-        } else if self.starts_with("npub1") {
-            Ok(PublicKey::parse(self)?)
-        } else {
-            Err(anyhow!("Invalid public key"))
-        }
-    }
-
-    fn to_qr(&self) -> Option<Arc<Image>> {
-        let Ok(bytes) = qrcode_generator::to_png_to_vec_from_str(self, QrCodeEcc::Medium, 256)
-        else {
-            return None;
-        };
-
-        Some(Arc::new(Image::from_bytes(ImageFormat::Png, bytes)))
-    }
-}
-
-pub fn shorten_pubkey(public_key: PublicKey, len: usize) -> SharedString {
+pub fn shorten_pubkey(public_key: PublicKey, len: usize) -> String {
    let Ok(pubkey) = public_key.to_bech32();

    format!(
@@ -104,5 +147,4 @@ pub fn shorten_pubkey(public_key: PublicKey, len: usize) -> SharedString {
        &pubkey[0..(len + 1)],
        &pubkey[pubkey.len() - len..]
    )
-    .into()
 }
--- a/crates/common/src/event.rs
+++ b/crates/common/src/event.rs
@@ -1,4 +1,3 @@
-use std::collections::HashSet;
 use std::hash::{DefaultHasher, Hash, Hasher};

 use itertools::Itertools;
@@ -7,10 +6,26 @@ use nostr_sdk::prelude::*;
 pub trait EventUtils {
    fn uniq_id(&self) -> u64;
    fn all_pubkeys(&self) -> Vec<PublicKey>;
-    fn compare_pubkeys(&self, other: &[PublicKey]) -> bool;
 }

 impl EventUtils for Event {
+    fn uniq_id(&self) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        let mut pubkeys: Vec<PublicKey> = self.all_pubkeys();
+        pubkeys.sort();
+        pubkeys.hash(&mut hasher);
+        hasher.finish()
+    }
+
+    fn all_pubkeys(&self) -> Vec<PublicKey> {
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
+        public_keys.push(self.pubkey);
+
+        public_keys.into_iter().unique().collect()
+    }
+}
+
+impl EventUtils for UnsignedEvent {
    fn uniq_id(&self) -> u64 {
        let mut hasher = DefaultHasher::new();
        let mut pubkeys: Vec<PublicKey> = vec![];
@@ -36,12 +51,4 @@ impl EventUtils for Event {

        public_keys
    }
-
-    fn compare_pubkeys(&self, other: &[PublicKey]) -> bool {
-        let pubkeys = self.all_pubkeys();
-        let a: HashSet<_> = pubkeys.iter().collect();
-        let b: HashSet<_> = other.iter().collect();
-
-        a == b
-    }
 }
--- a/crates/common/src/handle_auth.rs
+++ b/crates/common/src/handle_auth.rs
@@ -1,14 +0,0 @@
-use nostr_connect::prelude::*;
-
-#[derive(Debug, Clone)]
-pub struct CoopAuthUrlHandler;
-
-impl AuthUrlHandler for CoopAuthUrlHandler {
-    fn on_auth_url(&self, auth_url: Url) -> BoxedFuture<Result<()>> {
-        Box::pin(async move {
-            log::info!("Received Auth URL: {auth_url}");
-            webbrowser::open(auth_url.as_str())?;
-            Ok(())
-        })
-    }
-}
--- a/crates/common/src/lib.rs
+++ b/crates/common/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod debounced_delay;
 pub mod display;
 pub mod event;
-pub mod handle_auth;
 pub mod nip05;
 pub mod nip96;
--- a/crates/coop/Cargo.toml
+++ b/crates/coop/Cargo.toml
@@ -14,7 +14,7 @@ product-name = "Coop"
 description = "Chat Freely, Stay Private on Nostr"
 identifier = "su.reya.coop"
 category = "SocialNetworking"
-version = "0.2.1"
+version = "0.2.11"
 out-dir = "../../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]
@@ -30,7 +30,6 @@ icons = [
 assets = { path = "../assets" }
 ui = { path = "../ui" }
 title_bar = { path = "../title_bar" }
-identity = { path = "../identity" }
 theme = { path = "../theme" }
 common = { path = "../common" }
 global = { path = "../global" }
@@ -38,6 +37,7 @@ registry = { path = "../registry" }
 settings = { path = "../settings" }
 client_keys = { path = "../client_keys" }
 auto_update = { path = "../auto_update" }
+signer_proxy = { path = "../signer_proxy" }

 rust-i18n.workspace = true
 i18n.workspace = true
@@ -59,5 +59,8 @@ smallvec.workspace = true
 smol.workspace = true
 futures.workspace = true
 oneshot.workspace = true
+flume.workspace = true
+webbrowser.workspace = true

+indexset = "0.12.3"
 tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
--- a/crates/coop/resources/flatpak/manifest-template.json
+++ b/crates/coop/resources/flatpak/manifest-template.json
@@ -1,7 +1,7 @@
 {
  "id": "$APP_ID",
  "runtime": "org.freedesktop.Platform",
-  "runtime-version": "23.08",
+  "runtime-version": "24.08",
  "sdk": "org.freedesktop.Sdk",
  "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"],
  "command": "coop",
--- a/crates/coop/src/actions.rs
+++ b/crates/coop/src/actions.rs
@@ -0,0 +1,49 @@
+use std::sync::Mutex;
+
+use gpui::{actions, App};
+use nostr_connect::prelude::*;
+
+actions!(coop, [ReloadMetadata, DarkMode, Settings, Logout, Quit]);
+actions!(sidebar, [Reload, RelayStatus]);
+
+#[derive(Debug, Clone)]
+pub struct CoopAuthUrlHandler;
+
+impl AuthUrlHandler for CoopAuthUrlHandler {
+    fn on_auth_url(&self, auth_url: Url) -> BoxedFuture<Result<()>> {
+        Box::pin(async move {
+            log::info!("Received Auth URL: {auth_url}");
+            webbrowser::open(auth_url.as_str())?;
+            Ok(())
+        })
+    }
+}
+
+pub fn load_embedded_fonts(cx: &App) {
+    let asset_source = cx.asset_source();
+    let font_paths = asset_source.list("fonts").unwrap();
+    let embedded_fonts = Mutex::new(Vec::new());
+    let executor = cx.background_executor();
+
+    executor.block(executor.scoped(|scope| {
+        for font_path in &font_paths {
+            if !font_path.ends_with(".ttf") {
+                continue;
+            }
+
+            scope.spawn(async {
+                let font_bytes = asset_source.load(font_path).unwrap().unwrap();
+                embedded_fonts.lock().unwrap().push(font_bytes);
+            });
+        }
+    }));
+
+    cx.text_system()
+        .add_fonts(embedded_fonts.into_inner().unwrap())
+        .unwrap();
+}
+
+pub fn quit(_: &Quit, cx: &mut App) {
+    log::info!("Gracefully quitting the application . . .");
+    cx.quit();
+}
--- a/crates/coop/src/chatspace.rs
+++ b/crates/coop/src/chatspace.rs
--- a/crates/coop/src/main.rs
+++ b/crates/coop/src/main.rs
@@ -1,176 +1,38 @@
-use std::collections::BTreeSet;
-use std::sync::{Arc, Mutex};
-use std::time::Duration;
+use std::sync::Arc;

-use anyhow::{anyhow, Error};
 use assets::Assets;
-use common::event::EventUtils;
-use global::constants::{
-    APP_ID, APP_NAME, BOOTSTRAP_RELAYS, METADATA_BATCH_LIMIT, METADATA_BATCH_TIMEOUT,
-    SEARCH_RELAYS, WAIT_FOR_FINISH,
-};
-use global::{gift_wrap_sub_id, nostr_client, starting_time, NostrSignal};
+use global::constants::{APP_ID, APP_NAME};
+use global::{app_state, nostr_client};
 use gpui::{
-    actions, point, px, size, App, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem,
-    SharedString, TitlebarOptions, WindowBackgroundAppearance, WindowBounds, WindowDecorations,
-    WindowKind, WindowOptions,
+    point, px, size, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem, SharedString,
+    TitlebarOptions, WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind,
+    WindowOptions,
 };
-use identity::Identity;
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use registry::Registry;
-use smol::channel::{self, Sender};
-use theme::Theme;
 use ui::Root;

-use crate::chatspace::ChatSpace;
+use crate::actions::{load_embedded_fonts, quit, Quit};

+pub(crate) mod actions;
 pub(crate) mod chatspace;
 pub(crate) mod views;

 i18n::init!();

-actions!(coop, [Quit]);
-
 fn main() {
    // Initialize logging
    tracing_subscriber::fmt::init();

-    // Initialize the Nostr Client
-    let client = nostr_client();
+    // Initialize the Nostr client
+    let _client = nostr_client();

-    // Initialize the starting time
-    let _ = starting_time();
+    // Initialize the coop simple storage
+    let _app_state = app_state();

    // Initialize the Application
    let app = Application::new()
        .with_assets(Assets)
        .with_http_client(Arc::new(reqwest_client::ReqwestClient::new()));

-    let (signal_tx, signal_rx) = channel::bounded::<NostrSignal>(2048);
-    let (mta_tx, mta_rx) = channel::bounded::<PublicKey>(1024);
-    let (event_tx, event_rx) = channel::bounded::<Event>(2048);
-
-    let signal_tx_clone = signal_tx.clone();
-    let mta_tx_clone = mta_tx.clone();
-
-    app.background_executor()
-        .spawn(async move {
-            // Subscribe for app updates from the bootstrap relays.
-            if let Err(e) = connect(client).await {
-                log::error!("Failed to connect to bootstrap relays: {e}");
-            }
-
-            // Handle Nostr notifications.
-            //
-            // Send the redefined signal back to GPUI via channel.
-            if let Err(e) =
-                handle_nostr_notifications(client, &signal_tx_clone, &mta_tx_clone, &event_tx).await
-            {
-                log::error!("Failed to handle Nostr notifications: {e}");
-            }
-        })
-        .detach();
-
-    app.background_executor()
-        .spawn(async move {
-            let duration = Duration::from_millis(METADATA_BATCH_TIMEOUT);
-            let mut batch: BTreeSet<PublicKey> = BTreeSet::new();
-
-            /// Internal events for the metadata batching system
-            enum BatchEvent {
-                NewKeys(PublicKey),
-                Timeout,
-                Closed,
-            }
-
-            loop {
-                let duration = smol::Timer::after(duration);
-
-                let recv = || async {
-                    if let Ok(public_key) = mta_rx.recv().await {
-                        BatchEvent::NewKeys(public_key)
-                    } else {
-                        BatchEvent::Closed
-                    }
-                };
-
-                let timeout = || async {
-                    duration.await;
-                    BatchEvent::Timeout
-                };
-
-                match smol::future::or(recv(), timeout()).await {
-                    BatchEvent::NewKeys(public_key) => {
-                        batch.insert(public_key);
-                        // Process immediately if batch limit reached
-                        if batch.len() >= METADATA_BATCH_LIMIT {
-                            sync_data_for_pubkeys(client, std::mem::take(&mut batch)).await;
-                        }
-                    }
-                    BatchEvent::Timeout => {
-                        if !batch.is_empty() {
-                            sync_data_for_pubkeys(client, std::mem::take(&mut batch)).await;
-                        }
-                    }
-                    BatchEvent::Closed => {
-                        if !batch.is_empty() {
-                            sync_data_for_pubkeys(client, std::mem::take(&mut batch)).await;
-                        }
-                        break;
-                    }
-                }
-            }
-        })
-        .detach();
-
-    app.background_executor()
-        .spawn(async move {
-            let mut counter = 0;
-
-            loop {
-                // Signer is unset, probably user is not ready to retrieve gift wrap events
-                if client.signer().await.is_err() {
-                    continue;
-                }
-
-                let duration = smol::Timer::after(Duration::from_secs(WAIT_FOR_FINISH));
-
-                let recv = || async {
-                    // no inline
-                    (event_rx.recv().await).ok()
-                };
-
-                let timeout = || async {
-                    duration.await;
-                    None
-                };
-
-                match smol::future::or(recv(), timeout()).await {
-                    Some(event) => {
-                        let cached = try_unwrap_event(&event, &signal_tx, &mta_tx).await;
-
-                        // Increment the total messages counter if message is not from cache
-                        if !cached {
-                            counter += 1;
-                        }
-
-                        // Send partial finish signal to GPUI
-                        if counter >= 20 {
-                            signal_tx.send(NostrSignal::PartialFinish).await.ok();
-                            // Reset counter
-                            counter = 0;
-                        }
-                    }
-                    None => {
-                        // Notify the UI that the processing is finished
-                        signal_tx.send(NostrSignal::Finish).await.ok();
-                    }
-                }
-            }
-        })
-        .detach();
-
    // Run application
    app.run(move |cx| {
        // Load embedded fonts in assets/fonts
@@ -213,329 +75,32 @@ fn main() {

        // Open a window with default options
        cx.open_window(opts, |window, cx| {
-            // Automatically sync theme with system appearance
-            window
-                .observe_window_appearance(|window, cx| {
-                    Theme::sync_system_appearance(Some(window), cx);
-                })
-                .detach();
+            // Bring the app to the foreground
+            cx.activate(true);

            // Root Entity
            cx.new(|cx| {
-                cx.activate(true);
                // Initialize the tokio runtime
                gpui_tokio::init(cx);
+
                // Initialize components
                ui::init(cx);
-                // Initialize app registry
-                registry::init(cx);
-                // Initialize settings
-                settings::init(cx);
+
                // Initialize client keys
                client_keys::init(cx);
-                // Initialize identity
-                identity::init(window, cx);
+
+                // Initialize app registry
+                registry::init(cx);
+
+                // Initialize settings
+                settings::init(cx);
+
                // Initialize auto update
                auto_update::init(cx);

-                // Spawn a task to handle events from nostr channel
-                cx.spawn_in(window, async move |_, cx| {
-                    while let Ok(signal) = signal_rx.recv().await {
-                        cx.update(|window, cx| {
-                            let registry = Registry::global(cx);
-                            let identity = Identity::read_global(cx);
-
-                            match signal {
-                                // Load chat rooms and stop the loading status
-                                NostrSignal::Finish => {
-                                    registry.update(cx, |this, cx| {
-                                        this.load_rooms(window, cx);
-                                        this.set_loading(false, cx);
-                                        // Send a signal to refresh all opened rooms' messages
-                                        if let Some(ids) = ChatSpace::all_panels(window, cx) {
-                                            this.refresh_rooms(ids, cx);
-                                        }
-                                    });
-                                }
-                                // Load chat rooms without setting as finished
-                                NostrSignal::PartialFinish => {
-                                    registry.update(cx, |this, cx| {
-                                        this.load_rooms(window, cx);
-                                        // Send a signal to refresh all opened rooms' messages
-                                        if let Some(ids) = ChatSpace::all_panels(window, cx) {
-                                            this.refresh_rooms(ids, cx);
-                                        }
-                                    });
-                                }
-                                // Load chat rooms without setting as finished
-                                NostrSignal::Eose(subscription_id) => {
-                                    // Only load chat rooms if the subscription matches the gift wrap subscription
-                                    if gift_wrap_sub_id() == &subscription_id {
-                                        registry.update(cx, |this, cx| {
-                                            this.load_rooms(window, cx);
-                                        });
-                                    }
-                                }
-                                // Add the new metadata to the registry or update the existing one
-                                NostrSignal::Metadata(event) => {
-                                    registry.update(cx, |this, cx| {
-                                        this.insert_or_update_person(event, cx);
-                                    });
-                                }
-                                // Convert the gift wrapped message to a message
-                                NostrSignal::GiftWrap(event) => {
-                                    if let Some(public_key) = identity.public_key() {
-                                        registry.update(cx, |this, cx| {
-                                            this.event_to_message(public_key, event, window, cx);
-                                        });
-                                    }
-                                }
-                                NostrSignal::Notice(_msg) => {
-                                    // window.push_notification(msg, cx);
-                                }
-                            };
-                        })
-                        .ok();
-                    }
-                })
-                .detach();
-
                Root::new(chatspace::init(window, cx).into(), window, cx)
            })
        })
        .expect("Failed to open window. Please restart the application.");
    });
 }
-
-fn load_embedded_fonts(cx: &App) {
-    let asset_source = cx.asset_source();
-    let font_paths = asset_source.list("fonts").unwrap();
-    let embedded_fonts = Mutex::new(Vec::new());
-    let executor = cx.background_executor();
-
-    executor.block(executor.scoped(|scope| {
-        for font_path in &font_paths {
-            if !font_path.ends_with(".ttf") {
-                continue;
-            }
-
-            scope.spawn(async {
-                let font_bytes = asset_source.load(font_path).unwrap().unwrap();
-                embedded_fonts.lock().unwrap().push(font_bytes);
-            });
-        }
-    }));
-
-    cx.text_system()
-        .add_fonts(embedded_fonts.into_inner().unwrap())
-        .unwrap();
-}
-
-fn quit(_: &Quit, cx: &mut App) {
-    log::info!("Gracefully quitting the application . . .");
-    cx.quit();
-}
-
-async fn connect(client: &Client) -> Result<(), Error> {
-    for relay in BOOTSTRAP_RELAYS.into_iter() {
-        client.add_relay(relay).await?;
-    }
-
-    log::info!("Connected to bootstrap relays");
-
-    for relay in SEARCH_RELAYS.into_iter() {
-        client.add_relay(relay).await?;
-    }
-
-    log::info!("Connected to search relays");
-
-    // Establish connection to relays
-    client.connect().await;
-
-    Ok(())
-}
-
-async fn handle_nostr_notifications(
-    client: &Client,
-    signal_tx: &Sender<NostrSignal>,
-    mta_tx: &Sender<PublicKey>,
-    event_tx: &Sender<Event>,
-) -> Result<(), Error> {
-    let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-    let mut notifications = client.notifications();
-    let mut processed_events: BTreeSet<EventId> = BTreeSet::new();
-    let mut processed_dm_relays: BTreeSet<PublicKey> = BTreeSet::new();
-
-    while let Ok(notification) = notifications.recv().await {
-        let RelayPoolNotification::Message { message, .. } = notification else {
-            continue;
-        };
-
-        match message {
-            RelayMessage::Event { event, .. } => {
-                if processed_events.contains(&event.id) {
-                    continue;
-                }
-                // Skip events that have already been processed
-                processed_events.insert(event.id);
-
-                match event.kind {
-                    Kind::GiftWrap => {
-                        event_tx.send(event.into_owned()).await.ok();
-                    }
-                    Kind::Metadata => {
-                        signal_tx
-                            .send(NostrSignal::Metadata(event.into_owned()))
-                            .await
-                            .ok();
-                    }
-                    Kind::ContactList => {
-                        if let Ok(true) = check_author(client, &event).await {
-                            for public_key in event.tags.public_keys().copied() {
-                                mta_tx.send(public_key).await.ok();
-                            }
-                        }
-                    }
-                    Kind::RelayList => {
-                        if processed_dm_relays.contains(&event.pubkey) {
-                            continue;
-                        }
-                        // Skip public keys that have already been processed
-                        processed_dm_relays.insert(event.pubkey);
-
-                        let filter = Filter::new()
-                            .author(event.pubkey)
-                            .kind(Kind::InboxRelays)
-                            .limit(1);
-
-                        client.subscribe(filter, Some(opts)).await.ok();
-                    }
-                    _ => {}
-                }
-            }
-            RelayMessage::EndOfStoredEvents(subscription_id) => {
-                signal_tx
-                    .send(NostrSignal::Eose(subscription_id.into_owned()))
-                    .await?;
-            }
-            _ => {}
-        }
-    }
-
-    Ok(())
-}
-
-async fn check_author(client: &Client, event: &Event) -> Result<bool, Error> {
-    let signer = client.signer().await?;
-    let public_key = signer.get_public_key().await?;
-
-    Ok(public_key == event.pubkey)
-}
-
-async fn sync_data_for_pubkeys(client: &Client, public_keys: BTreeSet<PublicKey>) {
-    let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-    let kinds = vec![Kind::Metadata, Kind::ContactList, Kind::RelayList];
-
-    let filter = Filter::new()
-        .limit(public_keys.len() * kinds.len())
-        .authors(public_keys)
-        .kinds(kinds);
-
-    if let Err(e) = client
-        .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
-        .await
-    {
-        log::error!("Failed to sync metadata: {e}");
-    }
-}
-
-/// Stores an unwrapped event in local database with reference to original
-async fn set_unwrapped(root: EventId, unwrapped: &Event) -> Result<(), Error> {
-    let client = nostr_client();
-
-    // Save unwrapped event
-    client.database().save_event(unwrapped).await?;
-
-    // Create a reference event pointing to the unwrapped event
-    let event = EventBuilder::new(Kind::ApplicationSpecificData, "")
-        .tags(vec![Tag::identifier(root), Tag::event(unwrapped.id)])
-        .sign(&Keys::generate())
-        .await?;
-
-    // Save reference event
-    client.database().save_event(&event).await?;
-
-    Ok(())
-}
-
-/// Retrieves a previously unwrapped event from local database
-async fn get_unwrapped(root: EventId) -> Result<Event, Error> {
-    let client = nostr_client();
-    let filter = Filter::new()
-        .kind(Kind::ApplicationSpecificData)
-        .identifier(root)
-        .limit(1);
-
-    if let Some(event) = client.database().query(filter).await?.first_owned() {
-        let target_id = event.tags.event_ids().collect_vec()[0];
-
-        if let Some(event) = client.database().event_by_id(target_id).await? {
-            Ok(event)
-        } else {
-            Err(anyhow!("Event not found."))
-        }
-    } else {
-        Err(anyhow!("Event is not cached yet."))
-    }
-}
-
-/// Unwraps a gift-wrapped event and processes its contents.
-async fn try_unwrap_event(
-    event: &Event,
-    signal_tx: &Sender<NostrSignal>,
-    mta_tx: &Sender<PublicKey>,
-) -> bool {
-    let client = nostr_client();
-    let mut is_cached = false;
-
-    let event = match get_unwrapped(event.id).await {
-        Ok(event) => {
-            is_cached = true;
-            event
-        }
-        Err(_) => {
-            match client.unwrap_gift_wrap(event).await {
-                Ok(unwrap) => {
-                    // Sign the unwrapped event with a RANDOM KEYS
-                    let Ok(unwrapped) = unwrap.rumor.sign_with_keys(&Keys::generate()) else {
-                        log::error!("Failed to sign event");
-                        return false;
-                    };
-
-                    // Save this event to the database for future use.
-                    if let Err(e) = set_unwrapped(event.id, &unwrapped).await {
-                        log::warn!("Failed to cache unwrapped event: {e}")
-                    }
-
-                    unwrapped
-                }
-                Err(e) => {
-                    log::error!("Failed to unwrap event: {e}");
-                    return false;
-                }
-            }
-        }
-    };
-
-    // Send all pubkeys to the metadata batch to sync data
-    for public_key in event.all_pubkeys() {
-        mta_tx.send(public_key).await.ok();
-    }
-
-    // Send a notify to GPUI if this is a new message
-    if starting_time() <= &event.created_at {
-        signal_tx.send(NostrSignal::GiftWrap(event)).await.ok();
-    }
-
-    is_cached
-}
--- a/crates/coop/src/views/account.rs
+++ b/crates/coop/src/views/account.rs
@@ -0,0 +1,447 @@
+use std::time::Duration;
+
+use anyhow::Error;
+use client_keys::ClientKeys;
+use common::display::RenderedProfile;
+use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
+use global::{app_state, nostr_client, SignalKind};
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, relative, rems, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter,
+    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
+    RetainAllImageCache, SharedString, StatefulInteractiveElement, Styled, Subscription, Task,
+    WeakEntity, Window,
+};
+use i18n::{shared_t, t};
+use nostr_connect::prelude::*;
+use nostr_sdk::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use theme::ActiveTheme;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::dock_area::panel::{Panel, PanelEvent};
+use ui::indicator::Indicator;
+use ui::input::{InputState, TextInput};
+use ui::notification::Notification;
+use ui::popup_menu::PopupMenu;
+use ui::{h_flex, v_flex, ContextModal, Sizable, StyledExt};
+
+use crate::actions::CoopAuthUrlHandler;
+use crate::chatspace::ChatSpace;
+
+pub fn init(
+    profile: Profile,
+    secret: String,
+    window: &mut Window,
+    cx: &mut App,
+) -> Entity<Account> {
+    cx.new(|cx| Account::new(secret, profile, window, cx))
+}
+
+pub struct Account {
+    profile: Profile,
+    stored_secret: String,
+    is_bunker: bool,
+    is_extension: bool,
+    loading: bool,
+
+    name: SharedString,
+    focus_handle: FocusHandle,
+    image_cache: Entity<RetainAllImageCache>,
+
+    _subscriptions: SmallVec<[Subscription; 1]>,
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl Account {
+    fn new(secret: String, profile: Profile, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let is_bunker = secret.starts_with("bunker://");
+        let is_extension = secret.starts_with("extension");
+
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Clear the local state when user closes the account panel
+            cx.on_release_in(window, move |this, window, cx| {
+                this.stored_secret.clear();
+                this.image_cache.update(cx, |this, cx| {
+                    this.clear(window, cx);
+                });
+            }),
+        );
+
+        Self {
+            profile,
+            is_bunker,
+            is_extension,
+            stored_secret: secret,
+            loading: false,
+            name: "Account".into(),
+            focus_handle: cx.focus_handle(),
+            image_cache: RetainAllImageCache::new(cx),
+            _subscriptions: subscriptions,
+            _tasks: smallvec![],
+        }
+    }
+
+    fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.set_loading(true, cx);
+
+        if self.is_bunker {
+            if let Ok(uri) = NostrConnectURI::parse(&self.stored_secret) {
+                self.nostr_connect(uri, window, cx);
+            }
+        } else if self.is_extension {
+            self.set_proxy(window, cx);
+        } else if let Ok(enc) = EncryptedSecretKey::from_bech32(&self.stored_secret) {
+            self.keys(enc, window, cx);
+        } else {
+            window.push_notification("Cannot continue with current account", cx);
+            self.set_loading(false, cx);
+        }
+    }
+
+    fn nostr_connect(&mut self, uri: NostrConnectURI, window: &mut Window, cx: &mut Context<Self>) {
+        let client_keys = ClientKeys::global(cx);
+        let app_keys = client_keys.read(cx).keys();
+
+        let timeout = Duration::from_secs(BUNKER_TIMEOUT);
+        let mut signer = NostrConnect::new(uri, app_keys, timeout, None).unwrap();
+
+        // Handle auth url with the default browser
+        signer.auth_url_handler(CoopAuthUrlHandler);
+
+        self._tasks.push(
+            // Handle connection in the background
+            cx.spawn_in(window, async move |this, cx| {
+                let client = nostr_client();
+
+                match signer.bunker_uri().await {
+                    Ok(_) => {
+                        // Set the client's signer with the current nostr connect instance
+                        client.set_signer(signer).await;
+                    }
+                    Err(e) => {
+                        this.update_in(cx, |this, window, cx| {
+                            this.set_loading(false, cx);
+                            window.push_notification(Notification::error(e.to_string()), cx);
+                        })
+                        .ok();
+                    }
+                }
+            }),
+        );
+    }
+
+    fn set_proxy(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        ChatSpace::proxy_signer(window, cx);
+    }
+
+    fn keys(&mut self, enc: EncryptedSecretKey, window: &mut Window, cx: &mut Context<Self>) {
+        let pwd_input: Entity<InputState> = cx.new(|cx| InputState::new(window, cx).masked(true));
+        let weak_input = pwd_input.downgrade();
+
+        let error: Entity<Option<SharedString>> = cx.new(|_| None);
+        let weak_error = error.downgrade();
+
+        let entity = cx.weak_entity();
+
+        window.open_modal(cx, move |this, _window, cx| {
+            let entity = entity.clone();
+            let entity_clone = entity.clone();
+            let weak_input = weak_input.clone();
+            let weak_error = weak_error.clone();
+
+            this.overlay_closable(false)
+                .show_close(false)
+                .keyboard(false)
+                .confirm()
+                .on_cancel(move |_, _window, cx| {
+                    entity
+                        .update(cx, |this, cx| {
+                            this.set_loading(false, cx);
+                        })
+                        .ok();
+
+                    // true to close the modal
+                    true
+                })
+                .on_ok(move |_, window, cx| {
+                    let weak_error = weak_error.clone();
+                    let password = weak_input
+                        .read_with(cx, |state, _cx| state.value().to_owned())
+                        .ok();
+
+                    entity_clone
+                        .update(cx, |this, cx| {
+                            this.verify_keys(enc, password, weak_error, window, cx);
+                        })
+                        .ok();
+
+                    // false to keep the modal open
+                    false
+                })
+                .child(
+                    div()
+                        .w_full()
+                        .flex()
+                        .flex_col()
+                        .gap_1()
+                        .text_sm()
+                        .child(shared_t!("login.password_to_decrypt"))
+                        .child(TextInput::new(&pwd_input).small())
+                        .when_some(error.read(cx).as_ref(), |this, error| {
+                            this.child(
+                                div()
+                                    .text_xs()
+                                    .italic()
+                                    .text_color(cx.theme().danger_foreground)
+                                    .child(error.clone()),
+                            )
+                        }),
+                )
+        });
+    }
+
+    fn verify_keys(
+        &mut self,
+        enc: EncryptedSecretKey,
+        password: Option<SharedString>,
+        error: WeakEntity<Option<SharedString>>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(password) = password else {
+            error
+                .update(cx, |this, cx| {
+                    *this = Some("Password is required".into());
+                    cx.notify();
+                })
+                .ok();
+            return;
+        };
+
+        if password.is_empty() {
+            error
+                .update(cx, |this, cx| {
+                    *this = Some("Password cannot be empty".into());
+                    cx.notify();
+                })
+                .ok();
+            return;
+        }
+
+        let task: Task<Result<SecretKey, Error>> = cx.background_spawn(async move {
+            let secret = enc.decrypt(&password)?;
+            Ok(secret)
+        });
+
+        cx.spawn_in(window, async move |_this, cx| {
+            match task.await {
+                Ok(secret) => {
+                    cx.update(|window, cx| {
+                        window.close_all_modals(cx);
+                    })
+                    .ok();
+
+                    let client = nostr_client();
+                    let keys = Keys::new(secret);
+
+                    // Set the client's signer with the current keys
+                    client.set_signer(keys).await
+                }
+                Err(e) => {
+                    error
+                        .update(cx, |this, cx| {
+                            *this = Some(e.to_string().into());
+                            cx.notify();
+                        })
+                        .ok();
+                }
+            };
+        })
+        .detach();
+    }
+
+    fn logout(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        self._tasks.push(
+            // Reset the nostr client in the background
+            cx.background_spawn(async move {
+                let client = nostr_client();
+                let app_state = app_state();
+
+                let filter = Filter::new()
+                    .kind(Kind::ApplicationSpecificData)
+                    .identifier(ACCOUNT_IDENTIFIER);
+
+                // Delete account
+                client.database().delete(filter).await.ok();
+
+                // Unset the client's signer
+                client.unset_signer().await;
+
+                // Notify the channel about the signer being unset
+                app_state.signal.send(SignalKind::SignerUnset).await;
+            }),
+        );
+    }
+
+    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.loading = status;
+        cx.notify();
+    }
+}
+
+impl Panel for Account {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+
+    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
+        menu.track_focus(&self.focus_handle)
+    }
+
+    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
+        vec![]
+    }
+}
+
+impl EventEmitter<PanelEvent> for Account {}
+
+impl Focusable for Account {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for Account {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .image_cache(self.image_cache.clone())
+            .relative()
+            .size_full()
+            .gap_10()
+            .items_center()
+            .justify_center()
+            .child(
+                v_flex()
+                    .items_center()
+                    .justify_center()
+                    .gap_4()
+                    .child(
+                        svg()
+                            .path("brand/coop.svg")
+                            .size_16()
+                            .text_color(cx.theme().elevated_surface_background),
+                    )
+                    .child(
+                        div()
+                            .text_center()
+                            .child(
+                                div()
+                                    .text_xl()
+                                    .font_semibold()
+                                    .line_height(relative(1.3))
+                                    .child(shared_t!("welcome.title")),
+                            )
+                            .child(
+                                div()
+                                    .text_color(cx.theme().text_muted)
+                                    .child(shared_t!("welcome.subtitle")),
+                            ),
+                    ),
+            )
+            .child(
+                v_flex()
+                    .gap_2()
+                    .child(
+                        div()
+                            .id("account")
+                            .h_10()
+                            .w_72()
+                            .bg(cx.theme().elevated_surface_background)
+                            .rounded_lg()
+                            .text_sm()
+                            .when(self.loading, |this| {
+                                this.child(
+                                    div()
+                                        .size_full()
+                                        .flex()
+                                        .items_center()
+                                        .justify_center()
+                                        .child(Indicator::new().small()),
+                                )
+                            })
+                            .when(!self.loading, |this| {
+                                let avatar = self.profile.avatar(true);
+                                let name = self.profile.display_name();
+
+                                this.child(
+                                    h_flex()
+                                        .h_full()
+                                        .justify_center()
+                                        .gap_2()
+                                        .child(
+                                            h_flex()
+                                                .gap_1()
+                                                .child(Avatar::new(avatar).size(rems(1.5)))
+                                                .child(div().pb_px().font_semibold().child(name)),
+                                        )
+                                        .child(
+                                            div()
+                                                .when(self.is_bunker, |this| {
+                                                    let label = SharedString::from("Nostr Connect");
+
+                                                    this.child(
+                                                        div()
+                                                            .py_0p5()
+                                                            .px_2()
+                                                            .text_xs()
+                                                            .bg(cx.theme().secondary_active)
+                                                            .text_color(
+                                                                cx.theme().secondary_foreground,
+                                                            )
+                                                            .rounded_full()
+                                                            .child(label),
+                                                    )
+                                                })
+                                                .when(self.is_extension, |this| {
+                                                    let label = SharedString::from("Extension");
+
+                                                    this.child(
+                                                        div()
+                                                            .py_0p5()
+                                                            .px_2()
+                                                            .text_xs()
+                                                            .bg(cx.theme().secondary_active)
+                                                            .text_color(
+                                                                cx.theme().secondary_foreground,
+                                                            )
+                                                            .rounded_full()
+                                                            .child(label),
+                                                    )
+                                                }),
+                                        ),
+                                )
+                            })
+                            .active(|this| this.bg(cx.theme().element_active))
+                            .hover(|this| this.bg(cx.theme().element_hover))
+                            .on_click(cx.listener(move |this, _e, window, cx| {
+                                this.login(window, cx);
+                            })),
+                    )
+                    .child(
+                        Button::new("logout")
+                            .label(t!("user.sign_out"))
+                            .ghost()
+                            .on_click(cx.listener(move |this, _e, window, cx| {
+                                this.logout(window, cx);
+                            })),
+                    ),
+            )
+    }
+}
--- a/crates/coop/src/views/backup_keys.rs
+++ b/crates/coop/src/views/backup_keys.rs
@@ -5,56 +5,14 @@ use dirs::document_dir;
 use gpui::prelude::FluentBuilder;
 use gpui::{
    div, AppContext, ClipboardItem, Context, Entity, Flatten, IntoElement, ParentElement, Render,
-    SharedString, Styled, Window,
+    SharedString, Styled, Task, Window,
 };
 use i18n::{shared_t, t};
-use identity::Identity;
 use nostr_sdk::prelude::*;
 use theme::ActiveTheme;
-use ui::button::{Button, ButtonRounded, ButtonVariants};
+use ui::button::{Button, ButtonVariants};
 use ui::input::{InputState, TextInput};
-use ui::modal::ModalButtonProps;
-use ui::{divider, h_flex, v_flex, ContextModal, Disableable, IconName, Sizable};
-
-pub fn backup_button(keys: Keys) -> impl IntoElement {
-    div().child(
-        Button::new("backup")
-            .icon(IconName::Info)
-            .label(t!("new_account.backup_label"))
-            .danger()
-            .xsmall()
-            .rounded(ButtonRounded::Full)
-            .on_click(move |_, window, cx| {
-                let title = SharedString::new(t!("new_account.backup_label"));
-                let keys = keys.clone();
-                let view = cx.new(|cx| BackupKeys::new(&keys, window, cx));
-                let weak_view = view.downgrade();
-
-                window.open_modal(cx, move |modal, _window, _cx| {
-                    let weak_view = weak_view.clone();
-
-                    modal
-                        .confirm()
-                        .title(title.clone())
-                        .child(view.clone())
-                        .button_props(
-                            ModalButtonProps::default()
-                                .cancel_text(t!("new_account.backup_skip"))
-                                .ok_text(t!("new_account.backup_download")),
-                        )
-                        .on_ok(move |_, window, cx| {
-                            weak_view
-                                .update(cx, |this, cx| {
-                                    this.download(window, cx);
-                                })
-                                .ok();
-                            // true to close the modal
-                            false
-                        })
-                })
-            }),
-    )
-}
+use ui::{divider, h_flex, v_flex, Disableable, IconName, Sizable};

 pub struct BackupKeys {
    password: Entity<InputState>,
@@ -92,6 +50,42 @@ impl BackupKeys {
        }
    }

+    pub fn password(&self, cx: &Context<Self>) -> String {
+        self.password.read(cx).value().to_string()
+    }
+
+    pub fn backup(&mut self, window: &mut Window, cx: &mut Context<Self>) -> Option<Task<()>> {
+        let document_dir = document_dir().expect("Failed to get document directory");
+        let password = self.password.read(cx).value().to_string();
+
+        if password.is_empty() {
+            self.set_error(t!("login.password_is_required"), window, cx);
+            return None;
+        };
+
+        let path = cx.prompt_for_new_path(&document_dir, Some("My Nostr Account"));
+        let nsec = self.secret_input.read(cx).value().to_string();
+
+        Some(cx.spawn_in(window, async move |this, cx| {
+            match Flatten::flatten(path.await.map_err(|e| e.into())) {
+                Ok(Ok(Some(path))) => {
+                    cx.update(|window, cx| {
+                        if let Err(e) = fs::write(&path, nsec) {
+                            this.update(cx, |this, cx| {
+                                this.set_error(e.to_string(), window, cx);
+                            })
+                            .ok();
+                        }
+                    })
+                    .ok();
+                }
+                _ => {
+                    log::error!("Failed to save backup keys");
+                }
+            };
+        }))
+    }
+
    fn copy_secret(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let item = ClipboardItem::new_string(self.secret_input.read(cx).value().to_string());
        cx.write_to_clipboard(item);
@@ -140,48 +134,6 @@ impl BackupKeys {
        })
        .detach();
    }
-
-    fn download(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let document_dir = document_dir().expect("Failed to get document directory");
-        let password = self.password.read(cx).value().to_string();
-
-        if password.is_empty() {
-            self.set_error(t!("login.password_is_required"), window, cx);
-            return;
-        };
-
-        let path = cx.prompt_for_new_path(&document_dir);
-        let nsec = self.secret_input.read(cx).value().to_string();
-
-        cx.spawn_in(window, async move |this, cx| {
-            match Flatten::flatten(path.await.map_err(|e| e.into())) {
-                Ok(Ok(Some(path))) => {
-                    cx.update(|window, cx| {
-                        match fs::write(&path, nsec) {
-                            Ok(_) => {
-                                Identity::global(cx).update(cx, |this, cx| {
-                                    this.clear_need_backup(password, cx);
-                                });
-                                // Close the current modal
-                                window.close_modal(cx);
-                            }
-                            Err(e) => {
-                                this.update(cx, |this, cx| {
-                                    this.set_error(e.to_string(), window, cx);
-                                })
-                                .ok();
-                            }
-                        };
-                    })
-                    .ok();
-                }
-                _ => {
-                    log::error!("Failed to save backup keys");
-                }
-            };
-        })
-        .detach();
-    }
 }

 impl Render for BackupKeys {
--- a/crates/coop/src/views/chat/mod.rs
+++ b/crates/coop/src/views/chat/mod.rs
--- a/crates/coop/src/views/chat/subject.rs
+++ b/crates/coop/src/views/chat/subject.rs
@@ -2,7 +2,7 @@ use gpui::{
    div, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString,
    Styled, Window,
 };
-use i18n::t;
+use i18n::{shared_t, t};
 use theme::ActiveTheme;
 use ui::input::{InputState, TextInput};
 use ui::{v_flex, Sizable};
@@ -28,8 +28,8 @@ impl Subject {
        cx.new(|_| Self { input })
    }

-    pub fn new_subject(&self, cx: &App) -> SharedString {
-        self.input.read(cx).value().clone()
+    pub fn new_subject(&self, cx: &App) -> String {
+        self.input.read(cx).value().to_string()
    }
 }

@@ -41,7 +41,7 @@ impl Render for Subject {
                div()
                    .text_sm()
                    .text_color(cx.theme().text_muted)
-                    .child(SharedString::new(t!("subject.title"))),
+                    .child(shared_t!("subject.title")),
            )
            .child(TextInput::new(&self.input).small())
            .child(
@@ -49,7 +49,7 @@ impl Render for Subject {
                    .text_xs()
                    .italic()
                    .text_color(cx.theme().text_placeholder)
-                    .child(SharedString::new(t!("subject.help_text"))),
+                    .child(shared_t!("subject.help_text")),
            )
    }
 }
--- a/crates/coop/src/views/compose.rs
+++ b/crates/coop/src/views/compose.rs
@@ -2,28 +2,28 @@ use std::ops::Range;
 use std::time::Duration;

 use anyhow::{anyhow, Error};
-use common::display::{DisplayProfile, TextUtils};
+use common::display::{RenderedProfile, TextUtils};
 use common::nip05::nip05_profile;
 use global::constants::BOOTSTRAP_RELAYS;
-use global::nostr_client;
+use global::{app_state, nostr_client};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, px, relative, rems, uniform_list, AppContext, Context, Entity, InteractiveElement,
-    IntoElement, ParentElement, Render, SharedString, StatefulInteractiveElement, Styled,
-    Subscription, Task, Window,
+    div, px, relative, rems, uniform_list, App, AppContext, Context, Entity, InteractiveElement,
+    IntoElement, ParentElement, Render, RetainAllImageCache, SharedString,
+    StatefulInteractiveElement, Styled, Subscription, Task, Window,
 };
-use i18n::t;
-use itertools::Itertools;
+use gpui_tokio::Tokio;
+use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
-use registry::room::{Room, RoomKind};
+use registry::room::Room;
 use registry::Registry;
 use settings::AppSettings;
 use smallvec::{smallvec, SmallVec};
-use smol::Timer;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonRounded, ButtonVariants};
+use ui::button::{Button, ButtonVariants};
 use ui::input::{InputEvent, InputState, TextInput};
+use ui::modal::ModalButtonProps;
 use ui::notification::Notification;
 use ui::{h_flex, v_flex, ContextModal, Disableable, Icon, IconName, Sizable, StyledExt};

@@ -34,22 +34,46 @@ pub fn compose_button() -> impl IntoElement {
            .ghost_alt()
            .cta()
            .small()
-            .rounded(ButtonRounded::Full)
+            .rounded()
            .on_click(move |_, window, cx| {
                let compose = cx.new(|cx| Compose::new(window, cx));
-                let title = SharedString::new(t!("sidebar.direct_messages"));
+                let weak_view = compose.downgrade();

-                window.open_modal(cx, move |modal, _window, _cx| {
-                    modal.title(title.clone()).child(compose.clone())
+                window.open_modal(cx, move |modal, _window, cx| {
+                    let weak_view = weak_view.clone();
+                    let label = if compose.read(cx).selected(cx).len() > 1 {
+                        shared_t!("compose.create_group_dm_button")
+                    } else {
+                        shared_t!("compose.create_dm_button")
+                    };
+
+                    modal
+                        .alert()
+                        .overlay_closable(true)
+                        .keyboard(true)
+                        .show_close(true)
+                        .button_props(ModalButtonProps::default().ok_text(label))
+                        .title(shared_t!("sidebar.direct_messages"))
+                        .child(compose.clone())
+                        .on_ok(move |_, window, cx| {
+                            weak_view
+                                .update(cx, |this, cx| {
+                                    this.submit(window, cx);
+                                })
+                                .ok();
+
+                            // false to prevent the modal from closing
+                            false
+                        })
                })
            }),
    )
 }

-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 struct Contact {
    public_key: PublicKey,
-    select: bool,
+    selected: bool,
 }

 impl AsRef<PublicKey> for Contact {
@@ -62,12 +86,12 @@ impl Contact {
    pub fn new(public_key: PublicKey) -> Self {
        Self {
            public_key,
-            select: false,
+            selected: false,
        }
    }

-    pub fn select(mut self) -> Self {
-        self.select = true;
+    pub fn selected(mut self) -> Self {
+        self.selected = true;
        self
    }
 }
@@ -75,188 +99,209 @@ impl Contact {
 pub struct Compose {
    /// Input for the room's subject
    title_input: Entity<InputState>,
+
    /// Input for the room's members
    user_input: Entity<InputState>,
-    /// The current user's contacts
-    contacts: Vec<Entity<Contact>>,
-    /// Input error message
+
+    /// User's contacts
+    contacts: Entity<Vec<Contact>>,
+
+    /// Error message
    error_message: Entity<Option<SharedString>>,
-    adding: bool,
-    submitting: bool,
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 1]>,
+
+    image_cache: Entity<RetainAllImageCache>,
+    _subscriptions: SmallVec<[Subscription; 2]>,
+    _tasks: SmallVec<[Task<()>; 1]>,
 }

 impl Compose {
    pub fn new(window: &mut Window, cx: &mut Context<'_, Self>) -> Self {
+        let contacts = cx.new(|_| vec![]);
+        let error_message = cx.new(|_| None);
+
        let user_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder(t!("compose.placeholder_npub")));
+            cx.new(|cx| InputState::new(window, cx).placeholder("npub or nprofile..."));

        let title_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder(t!("compose.placeholder_title")));
+            cx.new(|cx| InputState::new(window, cx).placeholder("Family...(Optional)"));

-        let error_message = cx.new(|_| None);
        let mut subscriptions = smallvec![];
-
-        // Handle Enter event for user input
-        subscriptions.push(cx.subscribe_in(
-            &user_input,
-            window,
-            move |this, _input, event, window, cx| {
-                if let InputEvent::PressEnter { .. } = event {
-                    this.add_and_select_contact(window, cx)
-                };
-            },
-        ));
+        let mut tasks = smallvec![];

        let get_contacts: Task<Result<Vec<Contact>, Error>> = cx.background_spawn(async move {
            let client = nostr_client();
            let signer = client.signer().await?;
            let public_key = signer.get_public_key().await?;
            let profiles = client.database().contacts(public_key).await?;
-            let contacts = profiles
+            let contacts: Vec<Contact> = profiles
                .into_iter()
                .map(|profile| Contact::new(profile.public_key()))
-                .collect_vec();
+                .collect();

            Ok(contacts)
        });

-        cx.spawn_in(window, async move |this, cx| {
-            match get_contacts.await {
-                Ok(contacts) => {
-                    this.update(cx, |this, cx| {
-                        this.extend_contacts(contacts, cx);
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(Notification::error(e.to_string()), cx);
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
+        tasks.push(
+            // Load all contacts
+            cx.spawn_in(window, async move |this, cx| {
+                match get_contacts.await {
+                    Ok(contacts) => {
+                        this.update(cx, |this, cx| {
+                            this.extend_contacts(contacts, cx);
+                        })
+                        .ok();
+                    }
+                    Err(e) => {
+                        cx.update(|window, cx| {
+                            window.push_notification(Notification::error(e.to_string()), cx);
+                        })
+                        .ok();
+                    }
+                };
+            }),
+        );
+
+        subscriptions.push(
+            // Clear the image cache when sidebar is closed
+            cx.on_release_in(window, move |this, window, cx| {
+                this.image_cache.update(cx, |this, cx| {
+                    this.clear(window, cx);
+                })
+            }),
+        );
+
+        subscriptions.push(
+            // Handle Enter event for user input
+            cx.subscribe_in(
+                &user_input,
+                window,
+                move |this, _input, event, window, cx| {
+                    if let InputEvent::PressEnter { .. } = event {
+                        this.add_and_select_contact(window, cx)
+                    };
+                },
+            ),
+        );

        Self {
-            adding: false,
-            submitting: false,
-            contacts: vec![],
            title_input,
            user_input,
            error_message,
-            subscriptions,
+            contacts,
+            image_cache: RetainAllImageCache::new(cx),
+            _subscriptions: subscriptions,
+            _tasks: tasks,
        }
    }

-    async fn request_metadata(client: &Client, public_key: PublicKey) -> Result<(), Error> {
-        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+    async fn request_metadata(public_key: PublicKey) -> Result<(), Error> {
+        let client = nostr_client();
+        let app_state = app_state();
        let kinds = vec![Kind::Metadata, Kind::ContactList, Kind::RelayList];
        let filter = Filter::new().author(public_key).kinds(kinds).limit(10);

        client
-            .subscribe_to(BOOTSTRAP_RELAYS, filter, Some(opts))
+            .subscribe_to(BOOTSTRAP_RELAYS, filter, app_state.auto_close_opts)
            .await?;

        Ok(())
    }

-    pub fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let public_keys: Vec<PublicKey> = self.selected(cx);
-
-        if public_keys.is_empty() {
-            self.set_error(Some(t!("compose.receiver_required").into()), cx);
-            return;
-        };
-
-        // Show loading spinner
-        self.set_submitting(true, cx);
-
-        // Convert selected pubkeys into Nostr tags
-        let mut tag_list: Vec<Tag> = public_keys.iter().map(|pk| Tag::public_key(*pk)).collect();
-
-        // Add subject if it is present
-        if !self.title_input.read(cx).value().is_empty() {
-            tag_list.push(Tag::custom(
-                TagKind::Subject,
-                vec![self.title_input.read(cx).value().to_string()],
-            ));
-        }
-
-        let event: Task<Result<Room, Error>> = cx.background_spawn(async move {
-            let signer = nostr_client().signer().await?;
-            let public_key = signer.get_public_key().await?;
-
-            let room = EventBuilder::private_msg_rumor(public_keys[0], "")
-                .tags(Tags::from_list(tag_list))
-                .build(public_key)
-                .sign(&Keys::generate())
-                .await
-                .map(|event| Room::new(&event).kind(RoomKind::Ongoing))?;
-
-            Ok(room)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match event.await {
-                Ok(room) => {
-                    cx.update(|window, cx| {
-                        let registry = Registry::global(cx);
-                        // Reset local state
-                        this.update(cx, |this, cx| {
-                            this.set_submitting(false, cx);
-                        })
-                        .ok();
-                        // Create and insert the new room into the registry
-                        registry.update(cx, |this, cx| {
-                            this.push_room(cx.new(|_| room), cx);
-                        });
-                        // Close the current modal
-                        window.close_modal(cx);
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    this.update(cx, |this, cx| {
-                        this.set_error(Some(e.to_string().into()), cx);
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
    fn extend_contacts<I>(&mut self, contacts: I, cx: &mut Context<Self>)
    where
        I: IntoIterator<Item = Contact>,
    {
-        self.contacts
-            .extend(contacts.into_iter().map(|contact| cx.new(|_| contact)));
-        cx.notify();
+        self.contacts.update(cx, |this, cx| {
+            this.extend(contacts);
+            cx.notify();
+        });
    }

-    fn push_contact(&mut self, contact: Contact, cx: &mut Context<Self>) {
-        if !self
-            .contacts
-            .iter()
-            .any(|e| e.read(cx).public_key == contact.public_key)
-        {
-            self.contacts.insert(0, cx.new(|_| contact));
-            cx.notify();
+    fn push_contact(&mut self, contact: Contact, window: &mut Window, cx: &mut Context<Self>) {
+        let pk = contact.public_key;
+
+        if !self.contacts.read(cx).iter().any(|c| c.public_key == pk) {
+            self._tasks.push(cx.background_spawn(async move {
+                Self::request_metadata(pk).await.ok();
+            }));
+
+            cx.defer_in(window, |this, window, cx| {
+                this.contacts.update(cx, |this, cx| {
+                    this.insert(0, contact);
+                    cx.notify();
+                });
+                this.user_input.update(cx, |this, cx| {
+                    this.set_value("", window, cx);
+                    this.set_loading(false, cx);
+                });
+            });
        } else {
-            self.set_error(Some(t!("compose.contact_existed").into()), cx);
+            self.set_error(t!("compose.contact_existed"), cx);
        }
    }

-    fn selected(&self, cx: &Context<Self>) -> Vec<PublicKey> {
+    fn select_contact(&mut self, public_key: PublicKey, cx: &mut Context<Self>) {
+        self.contacts.update(cx, |this, cx| {
+            if let Some(contact) = this.iter_mut().find(|c| c.public_key == public_key) {
+                contact.selected = true;
+            }
+            cx.notify();
+        });
+    }
+
+    fn add_and_select_contact(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let content = self.user_input.read(cx).value().to_string();
+
+        // Show loading indicator in the input
+        self.user_input.update(cx, |this, cx| {
+            this.set_loading(true, cx);
+        });
+
+        if let Ok(public_key) = content.to_public_key() {
+            let contact = Contact::new(public_key).selected();
+            self.push_contact(contact, window, cx);
+        } else if content.contains("@") {
+            let task = Tokio::spawn(cx, async move {
+                if let Ok(profile) = nip05_profile(&content).await {
+                    let public_key = profile.public_key;
+                    let contact = Contact::new(public_key).selected();
+
+                    Ok(contact)
+                } else {
+                    Err(anyhow!("Not found"))
+                }
+            });
+
+            cx.spawn_in(window, async move |this, cx| {
+                match task.await {
+                    Ok(Ok(contact)) => {
+                        this.update_in(cx, |this, window, cx| {
+                            this.push_contact(contact, window, cx);
+                        })
+                        .ok();
+                    }
+                    Ok(Err(e)) => {
+                        this.update(cx, |this, cx| {
+                            this.set_error(e.to_string(), cx);
+                        })
+                        .ok();
+                    }
+                    Err(e) => {
+                        log::error!("Tokio error: {e}");
+                    }
+                };
+            })
+            .detach();
+        }
+    }
+
+    fn selected(&self, cx: &App) -> Vec<PublicKey> {
        self.contacts
+            .read(cx)
            .iter()
            .filter_map(|contact| {
-                if contact.read(cx).select {
-                    Some(contact.read(cx).public_key)
+                if contact.selected {
+                    Some(contact.public_key)
                } else {
                    None
                }
@@ -264,84 +309,40 @@ impl Compose {
            .collect()
    }

-    fn add_and_select_contact(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let content = self.user_input.read(cx).value().to_string();
+    fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let registry = Registry::global(cx);
+        let receivers: Vec<PublicKey> = self.selected(cx);
+        let subject_input = self.title_input.read(cx).value();
+        let subject = (!subject_input.is_empty()).then(|| subject_input.to_string());

-        // Prevent multiple requests
-        self.set_adding(true, cx);
-
-        // Show loading indicator in the input
-        self.user_input.update(cx, |this, cx| {
-            this.set_loading(true, cx);
-        });
-
-        let task: Task<Result<Contact, Error>> = if content.contains("@") {
-            cx.background_spawn(async move {
-                let (tx, rx) = oneshot::channel::<Option<Nip05Profile>>();
-
-                nostr_sdk::async_utility::task::spawn(async move {
-                    let profile = nip05_profile(&content).await.ok();
-                    tx.send(profile).ok();
-                });
-
-                if let Ok(Some(profile)) = rx.await {
-                    let client = nostr_client();
-                    let public_key = profile.public_key;
-                    let contact = Contact::new(public_key).select();
-
-                    Self::request_metadata(client, public_key).await?;
-
-                    Ok(contact)
-                } else {
-                    Err(anyhow!(t!("common.not_found")))
-                }
-            })
-        } else if let Ok(public_key) = content.to_public_key() {
-            cx.background_spawn(async move {
-                let client = nostr_client();
-                let contact = Contact::new(public_key).select();
-
-                Self::request_metadata(client, public_key).await?;
-
-                Ok(contact)
-            })
-        } else {
-            self.set_error(Some(t!("common.pubkey_invalid").into()), cx);
+        if !self.user_input.read(cx).value().is_empty() {
+            self.add_and_select_contact(window, cx);
            return;
        };

        cx.spawn_in(window, async move |this, cx| {
-            match task.await {
-                Ok(contact) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.push_contact(contact, cx);
-                            this.set_adding(false, cx);
-                            this.user_input.update(cx, |this, cx| {
-                                this.set_value("", window, cx);
-                                this.set_loading(false, cx);
-                            });
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    this.update(cx, |this, cx| {
-                        this.set_error(Some(e.to_string().into()), cx);
-                    })
-                    .ok();
-                }
-            };
+            let result = Room::new(subject, receivers).await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(room) => {
+                        registry.update(cx, |this, cx| {
+                            this.push_room(cx.new(|_| room), cx);
+                        });
+
+                        window.close_modal(cx);
+                    }
+                    Err(e) => {
+                        this.set_error(e.to_string(), cx);
+                    }
+                };
+            })
+            .ok();
        })
        .detach();
    }

-    fn set_error(&mut self, error: impl Into<Option<SharedString>>, cx: &mut Context<Self>) {
-        if self.adding {
-            self.set_adding(false, cx);
-        }
-
+    fn set_error(&mut self, error: impl Into<SharedString>, cx: &mut Context<Self>) {
        // Unlock the user input
        self.user_input.update(cx, |this, cx| {
            this.set_loading(false, cx);
@@ -349,63 +350,54 @@ impl Compose {

        // Update error message
        self.error_message.update(cx, |this, cx| {
-            *this = error.into();
+            *this = Some(error.into());
            cx.notify();
        });

        // Dismiss error after 2 seconds
        cx.spawn(async move |this, cx| {
-            Timer::after(Duration::from_secs(2)).await;
+            cx.background_executor().timer(Duration::from_secs(2)).await;
+
            this.update(cx, |this, cx| {
-                this.set_error(None, cx);
+                this.error_message.update(cx, |this, cx| {
+                    *this = None;
+                    cx.notify();
+                });
            })
            .ok();
        })
        .detach();
    }

-    fn set_adding(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.adding = status;
-        cx.notify();
-    }
-
-    fn set_submitting(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.submitting = status;
-        cx.notify();
-    }
-
    fn list_items(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
        let proxy = AppSettings::get_proxy_user_avatars(cx);
        let registry = Registry::read_global(cx);
-        let mut items = Vec::with_capacity(self.contacts.len());
+        let mut items = Vec::with_capacity(self.contacts.read(cx).len());

        for ix in range {
-            let Some(entity) = self.contacts.get(ix).cloned() else {
+            let Some(contact) = self.contacts.read(cx).get(ix) else {
                continue;
            };

-            let public_key = entity.read(cx).as_ref();
-            let profile = registry.get_person(public_key, cx);
-            let selected = entity.read(cx).select;
+            let public_key = contact.public_key;
+            let profile = registry.get_person(&public_key, cx);

            items.push(
                h_flex()
                    .id(ix)
-                    .px_1()
-                    .h_9()
+                    .px_2()
+                    .h_11()
                    .w_full()
                    .justify_between()
                    .rounded(cx.theme().radius)
                    .child(
-                        div()
-                            .flex()
-                            .items_center()
+                        h_flex()
                            .gap_1p5()
                            .text_sm()
-                            .child(Avatar::new(profile.avatar_url(proxy)).size(rems(1.75)))
+                            .child(Avatar::new(profile.avatar(proxy)).size(rems(1.75)))
                            .child(profile.display_name()),
                    )
-                    .when(selected, |this| {
+                    .when(contact.selected, |this| {
                        this.child(
                            Icon::new(IconName::CheckCircleFill)
                                .small()
@@ -413,11 +405,8 @@ impl Compose {
                        )
                    })
                    .hover(|this| this.bg(cx.theme().elevated_surface_background))
-                    .on_click(cx.listener(move |_this, _event, _window, cx| {
-                        entity.update(cx, |this, cx| {
-                            this.select = !this.select;
-                            cx.notify();
-                        });
+                    .on_click(cx.listener(move |this, _, _window, cx| {
+                        this.select_contact(public_key, cx);
                    })),
            );
        }
@@ -428,24 +417,18 @@ impl Compose {

 impl Render for Compose {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let label = if self.submitting {
-            t!("compose.creating_dm_button")
-        } else if self.selected(cx).len() > 1 {
-            t!("compose.create_group_dm_button")
-        } else {
-            t!("compose.create_dm_button")
-        };
-
        let error = self.error_message.read(cx).as_ref();
+        let loading = self.user_input.read(cx).loading;
+        let contacts = self.contacts.read(cx);

        v_flex()
-            .mb_4()
+            .image_cache(self.image_cache.clone())
            .gap_2()
            .child(
                div()
                    .text_sm()
                    .text_color(cx.theme().text_muted)
-                    .child(SharedString::new(t!("compose.description"))),
+                    .child(shared_t!("compose.description")),
            )
            .when_some(error, |this, msg| {
                this.child(
@@ -466,13 +449,13 @@ impl Render for Compose {
                        div()
                            .text_sm()
                            .font_semibold()
-                            .child(SharedString::new(t!("compose.subject_label"))),
+                            .child(shared_t!("compose.subject_label")),
                    )
                    .child(TextInput::new(&self.title_input).small().appearance(false)),
            )
            .child(
                v_flex()
-                    .my_1()
+                    .pt_1()
                    .gap_2()
                    .child(
                        v_flex()
@@ -481,22 +464,18 @@ impl Render for Compose {
                                div()
                                    .text_sm()
                                    .font_semibold()
-                                    .child(SharedString::new(t!("compose.to_label"))),
+                                    .child(shared_t!("compose.to_label")),
                            )
                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .child(
-                                        TextInput::new(&self.user_input)
-                                            .small()
-                                            .disabled(self.adding),
-                                    )
-                                    .child(
+                                TextInput::new(&self.user_input)
+                                    .small()
+                                    .disabled(loading)
+                                    .suffix(
                                        Button::new("add")
                                            .icon(IconName::PlusCircleFill)
-                                            .ghost()
-                                            .loading(self.adding)
-                                            .disabled(self.adding)
+                                            .transparent()
+                                            .small()
+                                            .disabled(loading)
                                            .on_click(cx.listener(move |this, _, window, cx| {
                                                this.add_and_select_contact(window, cx);
                                            })),
@@ -504,7 +483,7 @@ impl Render for Compose {
                            ),
                    )
                    .map(|this| {
-                        if self.contacts.is_empty() {
+                        if contacts.is_empty() {
                            this.child(
                                v_flex()
                                    .h_24()
@@ -512,48 +491,32 @@ impl Render for Compose {
                                    .items_center()
                                    .justify_center()
                                    .text_center()
+                                    .text_xs()
                                    .child(
                                        div()
-                                            .text_xs()
                                            .font_semibold()
                                            .line_height(relative(1.2))
-                                            .child(SharedString::new(t!(
-                                                "compose.no_contacts_message"
-                                            ))),
+                                            .child(shared_t!("compose.no_contacts_message")),
                                    )
                                    .child(
-                                        div().text_xs().text_color(cx.theme().text_muted).child(
-                                            SharedString::new(t!(
-                                                "compose.no_contacts_description"
-                                            )),
-                                        ),
+                                        div()
+                                            .text_color(cx.theme().text_muted)
+                                            .child(shared_t!("compose.no_contacts_description")),
                                    ),
                            )
                        } else {
                            this.child(
                                uniform_list(
                                    "contacts",
-                                    self.contacts.len(),
+                                    contacts.len(),
                                    cx.processor(move |this, range, _window, cx| {
                                        this.list_items(range, cx)
                                    }),
                                )
-                                .min_h(px(300.)),
+                                .h(px(300.)),
                            )
                        }
                    }),
            )
-            .child(
-                Button::new("create_dm_btn")
-                    .label(label)
-                    .primary()
-                    .small()
-                    .w_full()
-                    .loading(self.submitting)
-                    .disabled(self.submitting || self.adding)
-                    .on_click(cx.listener(move |this, _event, window, cx| {
-                        this.submit(window, cx);
-                    })),
-            )
    }
 }
--- a/crates/coop/src/views/edit_profile.rs
+++ b/crates/coop/src/views/edit_profile.rs
@@ -8,7 +8,7 @@ use gpui::{
    div, img, App, AppContext, Context, Entity, Flatten, IntoElement, ParentElement,
    PathPromptOptions, Render, SharedString, Styled, Task, Window,
 };
-use i18n::t;
+use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
 use settings::AppSettings;
 use smol::fs;
@@ -69,32 +69,29 @@ impl EditProfile {

            cx.spawn_in(window, async move |this, cx| {
                if let Ok(Some(metadata)) = task.await {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this: &mut EditProfile, cx| {
-                            this.avatar_input.update(cx, |this, cx| {
-                                if let Some(avatar) = metadata.picture.as_ref() {
-                                    this.set_value(avatar, window, cx);
-                                }
-                            });
-                            this.bio_input.update(cx, |this, cx| {
-                                if let Some(bio) = metadata.about.as_ref() {
-                                    this.set_value(bio, window, cx);
-                                }
-                            });
-                            this.name_input.update(cx, |this, cx| {
-                                if let Some(display_name) = metadata.display_name.as_ref() {
-                                    this.set_value(display_name, window, cx);
-                                }
-                            });
-                            this.website_input.update(cx, |this, cx| {
-                                if let Some(website) = metadata.website.as_ref() {
-                                    this.set_value(website, window, cx);
-                                }
-                            });
-                            this.profile = Some(metadata);
-                            cx.notify();
-                        })
-                        .ok();
+                    this.update_in(cx, |this: &mut EditProfile, window, cx| {
+                        this.avatar_input.update(cx, |this, cx| {
+                            if let Some(avatar) = metadata.picture.as_ref() {
+                                this.set_value(avatar, window, cx);
+                            }
+                        });
+                        this.bio_input.update(cx, |this, cx| {
+                            if let Some(bio) = metadata.about.as_ref() {
+                                this.set_value(bio, window, cx);
+                            }
+                        });
+                        this.name_input.update(cx, |this, cx| {
+                            if let Some(display_name) = metadata.display_name.as_ref() {
+                                this.set_value(display_name, window, cx);
+                            }
+                        });
+                        this.website_input.update(cx, |this, cx| {
+                            if let Some(website) = metadata.website.as_ref() {
+                                this.set_value(website, window, cx);
+                            }
+                        });
+                        this.profile = Some(metadata);
+                        cx.notify();
                    })
                    .ok();
                }
@@ -112,6 +109,7 @@ impl EditProfile {
            files: true,
            directories: false,
            multiple: false,
+            prompt: None,
        });

        // Show loading spinner
@@ -166,7 +164,7 @@ impl EditProfile {
        .detach();
    }

-    pub fn set_metadata(&mut self, cx: &mut Context<Self>) -> Task<Result<Option<Event>, Error>> {
+    pub fn set_metadata(&mut self, cx: &mut Context<Self>) -> Task<Result<Option<Profile>, Error>> {
        let avatar = self.avatar_input.read(cx).value().to_string();
        let name = self.name_input.read(cx).value().to_string();
        let bio = self.bio_input.read(cx).value().to_string();
@@ -191,7 +189,14 @@ impl EditProfile {
        cx.background_spawn(async move {
            let client = nostr_client();
            let output = client.set_metadata(&new_metadata).await?;
-            let event = client.database().event_by_id(&output.val).await?;
+            let event = client
+                .database()
+                .event_by_id(&output.val)
+                .await?
+                .map(|event| {
+                    let metadata = Metadata::from_json(&event.content).unwrap_or_default();
+                    Profile::new(event.pubkey, metadata)
+                });

            Ok(event)
        })
@@ -255,7 +260,7 @@ impl Render for EditProfile {
                    .flex_col()
                    .gap_1()
                    .text_sm()
-                    .child(SharedString::new(t!("profile.label_name")))
+                    .child(shared_t!("profile.label_name"))
                    .child(TextInput::new(&self.name_input).small()),
            )
            .child(
@@ -264,7 +269,7 @@ impl Render for EditProfile {
                    .flex_col()
                    .gap_1()
                    .text_sm()
-                    .child(SharedString::new(t!("profile.label_website")))
+                    .child(shared_t!("profile.label_website"))
                    .child(TextInput::new(&self.website_input).small()),
            )
            .child(
@@ -273,7 +278,7 @@ impl Render for EditProfile {
                    .flex_col()
                    .gap_1()
                    .text_sm()
-                    .child(SharedString::new(t!("profile.label_bio")))
+                    .child(shared_t!("profile.label_bio"))
                    .child(TextInput::new(&self.bio_input).small()),
            )
    }
--- a/crates/coop/src/views/login.rs
+++ b/crates/coop/src/views/login.rs
@@ -1,38 +1,32 @@
-use std::sync::Arc;
 use std::time::Duration;

 use client_keys::ClientKeys;
-use common::display::TextUtils;
-use common::handle_auth::CoopAuthUrlHandler;
-use global::constants::{APP_NAME, NOSTR_CONNECT_RELAY, NOSTR_CONNECT_TIMEOUT};
+use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
+use global::nostr_client;
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, img, red, relative, AnyElement, App, AppContext, ClipboardItem, Context, Entity,
-    EventEmitter, FocusHandle, Focusable, Image, InteractiveElement, IntoElement, ParentElement,
-    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Window,
+    div, relative, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
+    Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task,
+    Window,
 };
 use i18n::{shared_t, t};
-use identity::Identity;
 use nostr_connect::prelude::*;
 use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::input::{InputEvent, InputState, TextInput};
-use ui::notification::Notification;
 use ui::popup_menu::PopupMenu;
-use ui::{ContextModal, Disableable, Sizable, StyledExt};
+use ui::{v_flex, ContextModal, Disableable, Sizable, StyledExt};
+
+use crate::actions::CoopAuthUrlHandler;

 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Login> {
    Login::new(window, cx)
 }

 pub struct Login {
-    key_input: Entity<InputState>,
-    relay_input: Entity<InputState>,
-    connection_string: Entity<NostrConnectURI>,
-    qr_image: Entity<Option<Arc<Image>>>,
-    // Error for the key input
+    input: Entity<InputState>,
    error: Entity<Option<SharedString>>,
    countdown: Entity<Option<u64>>,
    logging_in: bool,
@@ -40,7 +34,7 @@ pub struct Login {
    name: SharedString,
    focus_handle: FocusHandle,
    #[allow(unused)]
-    subscriptions: SmallVec<[Subscription; 3]>,
+    subscriptions: SmallVec<[Subscription; 1]>,
 }

 impl Login {
@@ -49,110 +43,29 @@ impl Login {
    }

    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        // nsec or bunker_uri (NIP46: https://github.com/nostr-protocol/nips/blob/master/46.md)
-        let key_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder("nsec... or bunker://..."));
-
-        let relay_input = cx.new(|cx| {
-            InputState::new(window, cx)
-                .default_value(NOSTR_CONNECT_RELAY)
-                .placeholder(NOSTR_CONNECT_RELAY)
-        });
-
-        // NIP46: https://github.com/nostr-protocol/nips/blob/master/46.md
-        //
-        // Direct connection initiated by the client
-        let connection_string = cx.new(|cx| {
-            let relay = RelayUrl::parse(NOSTR_CONNECT_RELAY).unwrap();
-            let client_keys = ClientKeys::get_global(cx).keys();
-
-            NostrConnectURI::client(client_keys.public_key(), vec![relay], APP_NAME)
-        });
-
-        let qr_image = cx.new(|_| None);
+        let input = cx.new(|cx| InputState::new(window, cx).placeholder("nsec... or bunker://..."));
        let error = cx.new(|_| None);
        let countdown = cx.new(|_| None);
+
        let mut subscriptions = smallvec![];

        // Subscribe to key input events and process login when the user presses enter
        subscriptions.push(
-            cx.subscribe_in(&key_input, window, |this, _, event, window, cx| {
+            cx.subscribe_in(&input, window, |this, _e, event, window, cx| {
                if let InputEvent::PressEnter { .. } = event {
                    this.login(window, cx);
                }
            }),
        );

-        // Subscribe to relay input events and change relay when the user presses enter
-        subscriptions.push(
-            cx.subscribe_in(&relay_input, window, |this, _, event, window, cx| {
-                if let InputEvent::PressEnter { .. } = event {
-                    this.change_relay(window, cx);
-                }
-            }),
-        );
-
-        // Observe changes to the Nostr Connect URI and wait for a connection
-        subscriptions.push(cx.observe_in(
-            &connection_string,
-            window,
-            |this, entity, window, cx| {
-                let connection_string = entity.read(cx).clone();
-                let client_keys = ClientKeys::get_global(cx).keys();
-
-                // Update the QR Image with the new connection string
-                this.qr_image.update(cx, |this, cx| {
-                    *this = connection_string.to_string().to_qr();
-                    cx.notify();
-                });
-
-                match NostrConnect::new(
-                    connection_string,
-                    client_keys,
-                    Duration::from_secs(NOSTR_CONNECT_TIMEOUT),
-                    None,
-                ) {
-                    Ok(mut signer) => {
-                        // Automatically open auth url
-                        signer.auth_url_handler(CoopAuthUrlHandler);
-                        // Wait for connection in the background
-                        this.wait_for_connection(signer, window, cx);
-                    }
-                    Err(e) => {
-                        window.push_notification(
-                            Notification::error(e.to_string()).title("Nostr Connect"),
-                            cx,
-                        );
-                    }
-                }
-            },
-        ));
-
-        // Create a Nostr Connect URI and QR Code 800ms after opening the login screen
-        cx.spawn_in(window, async move |this, cx| {
-            cx.background_executor()
-                .timer(Duration::from_millis(800))
-                .await;
-            this.update(cx, |this, cx| {
-                this.connection_string.update(cx, |_, cx| {
-                    cx.notify();
-                })
-            })
-            .ok();
-        })
-        .detach();
-
        Self {
+            input,
+            error,
+            countdown,
+            subscriptions,
            name: "Login".into(),
            focus_handle: cx.focus_handle(),
            logging_in: false,
-            countdown,
-            key_input,
-            relay_input,
-            connection_string,
-            qr_image,
-            error,
-            subscriptions,
        }
    }

@@ -160,17 +73,18 @@ impl Login {
        if self.logging_in {
            return;
        };
+
        // Prevent duplicate login requests
        self.set_logging_in(true, cx);

        // Disable the input
-        self.key_input.update(cx, |this, cx| {
+        self.input.update(cx, |this, cx| {
            this.set_loading(true, cx);
            this.set_disabled(true, cx);
        });

        // Content can be secret key or bunker://
-        match self.key_input.read(cx).value().to_string() {
+        match self.input.read(cx).value().to_string() {
            s if s.starts_with("nsec1") => self.ask_for_password(s, window, cx),
            s if s.starts_with("ncryptsec1") => self.ask_for_password(s, window, cx),
            s if s.starts_with("bunker://") => self.login_with_bunker(s, window, cx),
@@ -314,7 +228,8 @@ impl Login {
    }

    fn login_with_keys(&mut self, password: String, window: &mut Window, cx: &mut Context<Self>) {
-        let value = self.key_input.read(cx).value().to_string();
+        let value = self.input.read(cx).value().to_string();
+
        let secret_key = if value.starts_with("nsec1") {
            SecretKey::parse(&value).ok()
        } else if value.starts_with("ncryptsec1") {
@@ -328,10 +243,15 @@ impl Login {
        if let Some(secret_key) = secret_key {
            let keys = Keys::new(secret_key);

-            Identity::global(cx).update(cx, |this, cx| {
-                this.write_keys(&keys, password, cx);
-                this.set_signer(keys, window, cx);
-            });
+            // Encrypt and save user secret key to disk
+            self.write_keys_to_disk(&keys, password, cx);
+
+            // Set the client's signer with the current keys
+            cx.background_spawn(async move {
+                let client = nostr_client();
+                client.set_signer(keys).await;
+            })
+            .detach();
        } else {
            self.set_error(t!("login.key_invalid"), window, cx);
        }
@@ -343,16 +263,18 @@ impl Login {
            return;
        };

-        let client_keys = ClientKeys::get_global(cx).keys();
-        let timeout = Duration::from_secs(NOSTR_CONNECT_TIMEOUT / 8);
-        // .unwrap() is fine here because there's no error handling for bunker uri
-        let mut signer = NostrConnect::new(uri, client_keys, timeout, None).unwrap();
+        let client_keys = ClientKeys::global(cx);
+        let app_keys = client_keys.read(cx).keys();
+
+        let timeout = Duration::from_secs(BUNKER_TIMEOUT);
+        let mut signer = NostrConnect::new(uri, app_keys, timeout, None).unwrap();
+
        // Handle auth url with the default browser
        signer.auth_url_handler(CoopAuthUrlHandler);

        // Start countdown
        cx.spawn_in(window, async move |this, cx| {
-            for i in (0..=NOSTR_CONNECT_TIMEOUT / 8).rev() {
+            for i in (0..=BUNKER_TIMEOUT).rev() {
                if i == 0 {
                    this.update(cx, |this, cx| {
                        this.set_countdown(None, cx);
@@ -372,84 +294,94 @@ impl Login {
        // Handle connection
        cx.spawn_in(window, async move |this, cx| {
            match signer.bunker_uri().await {
-                Ok(bunker_uri) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(t!("login.logging_in"), cx);
-                        Identity::global(cx).update(cx, |this, cx| {
-                            this.write_bunker(&bunker_uri, cx);
-                            this.set_signer(signer, window, cx);
-                        });
+                Ok(uri) => {
+                    this.update(cx, |this, cx| {
+                        this.write_uri_to_disk(signer, uri, cx);
                    })
                    .ok();
                }
                Err(error) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            // Force reset the client keys without notify UI
-                            ClientKeys::global(cx).update(cx, |this, cx| {
-                                log::info!("Timeout occurred. Reset client keys");
-                                this.force_new_keys(cx);
-                            });
-                            this.set_error(error.to_string(), window, cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-            }
-        })
-        .detach();
-    }
-
-    fn wait_for_connection(
-        &mut self,
-        signer: NostrConnect,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        cx.spawn_in(window, async move |this, cx| {
-            match signer.bunker_uri().await {
-                Ok(uri) => {
-                    cx.update(|window, cx| {
-                        Identity::global(cx).update(cx, |this, cx| {
-                            this.write_bunker(&uri, cx);
-                            this.set_signer(signer, window, cx);
+                    this.update_in(cx, |this, window, cx| {
+                        this.set_error(error.to_string(), window, cx);
+                        // Force reset the client keys
+                        //
+                        // This step is necessary to ensure that user can retry the connection
+                        client_keys.update(cx, |this, cx| {
+                            this.force_new_keys(cx);
                        });
                    })
                    .ok();
                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        // Only send notifications on the login screen
-                        this.update(cx, |_, cx| {
-                            window.push_notification(
-                                Notification::error(e.to_string()).title("Nostr Connect"),
-                                cx,
-                            );
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
            }
        })
        .detach();
    }

-    fn change_relay(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Ok(relay_url) = RelayUrl::parse(self.relay_input.read(cx).value().to_string().as_str())
-        else {
-            window.push_notification(Notification::error(t!("relays.invalid")), cx);
-            return;
-        };
+    fn write_uri_to_disk(
+        &mut self,
+        signer: NostrConnect,
+        uri: NostrConnectURI,
+        cx: &mut Context<Self>,
+    ) {
+        let mut uri_without_secret = uri.to_string();

-        let client_keys = ClientKeys::get_global(cx).keys();
-        let uri = NostrConnectURI::client(client_keys.public_key(), vec![relay_url], "Coop");
+        // Clear the secret parameter in the URI if it exists
+        if let Some(secret) = uri.secret() {
+            uri_without_secret = uri_without_secret.replace(secret, "");
+        }

-        self.connection_string.update(cx, |this, cx| {
-            *this = uri;
-            cx.notify();
+        let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
+            let client = nostr_client();
+
+            // Update the client's signer
+            client.set_signer(signer).await;
+
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            let event = EventBuilder::new(Kind::ApplicationSpecificData, uri_without_secret)
+                .tags(vec![Tag::identifier(ACCOUNT_IDENTIFIER)])
+                .build(public_key)
+                .sign(&Keys::generate())
+                .await?;
+
+            // Save the event to the database
+            client.database().save_event(&event).await?;
+
+            Ok(())
        });
+
+        task.detach();
+    }
+
+    pub fn write_keys_to_disk(&self, keys: &Keys, password: String, cx: &mut Context<Self>) {
+        let keys = keys.to_owned();
+        let public_key = keys.public_key();
+
+        cx.background_spawn(async move {
+            if let Ok(enc_key) =
+                EncryptedSecretKey::new(keys.secret_key(), &password, 8, KeySecurity::Unknown)
+            {
+                let client = nostr_client();
+                let value = enc_key.to_bech32().unwrap();
+                let keys = Keys::generate();
+                let tags = vec![Tag::identifier(ACCOUNT_IDENTIFIER)];
+                let kind = Kind::ApplicationSpecificData;
+
+                let builder = EventBuilder::new(kind, value)
+                    .tags(tags)
+                    .build(public_key)
+                    .sign(&keys)
+                    .await;
+
+                if let Ok(event) = builder {
+                    if let Err(e) = client.database().save_event(&event).await {
+                        log::error!("Failed to save event: {e}");
+                    };
+                }
+            }
+        })
+        .detach();
    }

    fn set_error(
@@ -471,7 +403,7 @@ impl Login {
        });

        // Re enable the input
-        self.key_input.update(cx, |this, cx| {
+        self.input.update(cx, |this, cx| {
            this.set_value("", window, cx);
            this.set_loading(false, cx);
            this.set_disabled(false, cx);
@@ -533,162 +465,64 @@ impl Focusable for Login {

 impl Render for Login {
    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .size_full()
+        v_flex()
            .relative()
-            .flex()
+            .size_full()
+            .items_center()
+            .justify_center()
            .child(
-                div()
-                    .h_full()
-                    .flex_1()
-                    .flex()
-                    .items_center()
-                    .justify_center()
+                v_flex()
+                    .w_96()
+                    .gap_10()
                    .child(
                        div()
-                            .w_80()
-                            .flex()
-                            .flex_col()
-                            .gap_8()
+                            .text_center()
                            .child(
                                div()
-                                    .text_center()
-                                    .child(
-                                        div()
-                                            .text_center()
-                                            .text_xl()
-                                            .font_semibold()
-                                            .line_height(relative(1.3))
-                                            .child(shared_t!("login.title")),
-                                    )
-                                    .child(
-                                        div()
-                                            .text_color(cx.theme().text_muted)
-                                            .child(shared_t!("login.key_description")),
-                                    ),
+                                    .text_xl()
+                                    .font_semibold()
+                                    .line_height(relative(1.3))
+                                    .child(shared_t!("login.title")),
                            )
                            .child(
                                div()
-                                    .flex()
-                                    .flex_col()
-                                    .gap_3()
-                                    .child(TextInput::new(&self.key_input))
-                                    .child(
-                                        Button::new("login")
-                                            .label(t!("common.continue"))
-                                            .primary()
-                                            .loading(self.logging_in)
-                                            .disabled(self.logging_in)
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                this.login(window, cx);
-                                            })),
-                                    )
-                                    .when_some(self.countdown.read(cx).as_ref(), |this, i| {
-                                        this.child(
-                                            div()
-                                                .text_xs()
-                                                .text_center()
-                                                .text_color(cx.theme().text_muted)
-                                                .child(shared_t!("login.approve_message", i = i)),
-                                        )
-                                    })
-                                    .when_some(self.error.read(cx).clone(), |this, error| {
-                                        this.child(
-                                            div()
-                                                .text_xs()
-                                                .text_center()
-                                                .text_color(red())
-                                                .child(error),
-                                        )
-                                    }),
+                                    .text_color(cx.theme().text_muted)
+                                    .child(shared_t!("login.key_description")),
                            ),
-                    ),
-            )
-            .child(
-                div().flex_1().p_1().child(
-                    div()
-                        .size_full()
-                        .flex()
-                        .items_center()
-                        .justify_center()
-                        .bg(cx.theme().surface_background)
-                        .rounded(cx.theme().radius)
-                        .child(
-                            div()
-                                .flex()
-                                .flex_col()
-                                .items_center()
-                                .justify_center()
-                                .gap_3()
-                                .text_center()
-                                .child(
+                    )
+                    .child(
+                        v_flex()
+                            .gap_3()
+                            .child(TextInput::new(&self.input))
+                            .child(
+                                Button::new("login")
+                                    .label(t!("common.continue"))
+                                    .primary()
+                                    .loading(self.logging_in)
+                                    .disabled(self.logging_in)
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.login(window, cx);
+                                    })),
+                            )
+                            .when_some(self.countdown.read(cx).as_ref(), |this, i| {
+                                this.child(
                                    div()
+                                        .text_xs()
                                        .text_center()
-                                        .child(
-                                            div()
-                                                .font_semibold()
-                                                .line_height(relative(1.2))
-                                                .text_color(cx.theme().text)
-                                                .child(shared_t!("login.nostr_connect")),
-                                        )
-                                        .child(
-                                            div()
-                                                .text_sm()
-                                                .text_color(cx.theme().text_muted)
-                                                .child(shared_t!("login.scan_qr")),
-                                        ),
+                                        .text_color(cx.theme().text_muted)
+                                        .child(shared_t!("login.approve_message", i = i)),
                                )
-                                .when_some(self.qr_image.read(cx).clone(), |this, qr| {
-                                    this.child(
-                                        div()
-                                            .id("")
-                                            .mb_2()
-                                            .p_2()
-                                            .size_72()
-                                            .flex()
-                                            .flex_col()
-                                            .items_center()
-                                            .justify_center()
-                                            .gap_2()
-                                            .rounded_2xl()
-                                            .shadow_md()
-                                            .when(cx.theme().mode.is_dark(), |this| {
-                                                this.shadow_none()
-                                                    .border_1()
-                                                    .border_color(cx.theme().border)
-                                            })
-                                            .bg(cx.theme().background)
-                                            .child(img(qr).h_64())
-                                            .on_click(cx.listener(move |this, _, window, cx| {
-                                                cx.write_to_clipboard(ClipboardItem::new_string(
-                                                    this.connection_string.read(cx).to_string(),
-                                                ));
-                                                window.push_notification(t!("common.copied"), cx);
-                                            })),
-                                    )
-                                })
-                                .child(
+                            })
+                            .when_some(self.error.read(cx).clone(), |this, error| {
+                                this.child(
                                    div()
-                                        .w_full()
-                                        .flex()
-                                        .items_center()
-                                        .justify_center()
-                                        .gap_1()
-                                        .child(TextInput::new(&self.relay_input).xsmall())
-                                        .child(
-                                            Button::new("change")
-                                                .label(t!("common.change"))
-                                                .ghost()
-                                                .xsmall()
-                                                .on_click(cx.listener(
-                                                    move |this, _, window, cx| {
-                                                        this.change_relay(window, cx);
-                                                    },
-                                                )),
-                                        ),
-                                ),
-                        ),
-                ),
+                                        .text_xs()
+                                        .text_center()
+                                        .text_color(cx.theme().danger_foreground)
+                                        .child(error),
+                                )
+                            }),
+                    ),
            )
    }
 }
--- a/crates/coop/src/views/mod.rs
+++ b/crates/coop/src/views/mod.rs
@@ -1,14 +1,14 @@
+pub mod account;
 pub mod backup_keys;
 pub mod chat;
 pub mod compose;
 pub mod edit_profile;
 pub mod login;
-pub mod messaging_relays;
 pub mod new_account;
 pub mod onboarding;
 pub mod preferences;
 pub mod screening;
+pub mod setup_relay;
 pub mod sidebar;
-pub mod startup;
 pub mod user_profile;
 pub mod welcome;
--- a/crates/coop/src/views/new_account.rs
+++ b/crates/coop/src/views/new_account.rs
@@ -1,5 +1,6 @@
 use anyhow::anyhow;
 use common::nip96::nip96_upload;
+use global::constants::{ACCOUNT_IDENTIFIER, NIP17_RELAYS, NIP65_RELAYS};
 use global::nostr_client;
 use gpui::{
    div, relative, rems, AnyElement, App, AppContext, AsyncWindowContext, Context, Entity,
@@ -7,19 +8,21 @@ use gpui::{
    Render, SharedString, Styled, WeakEntity, Window,
 };
 use gpui_tokio::Tokio;
-use i18n::t;
-use identity::Identity;
+use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
 use settings::AppSettings;
 use smol::fs;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonRounded, ButtonVariants};
+use ui::button::{Button, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::input::{InputState, TextInput};
+use ui::modal::ModalButtonProps;
 use ui::popup_menu::PopupMenu;
 use ui::{divider, v_flex, ContextModal, Disableable, IconName, Sizable, StyledExt};

+use crate::views::backup_keys::BackupKeys;
+
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<NewAccount> {
    NewAccount::new(window, cx)
 }
@@ -27,12 +30,11 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<NewAccount> {
 pub struct NewAccount {
    name_input: Entity<InputState>,
    avatar_input: Entity<InputState>,
-    is_uploading: bool,
-    is_submitting: bool,
+    temp_keys: Entity<Keys>,
+    uploading: bool,
+    submitting: bool,
    // Panel
    name: SharedString,
-    closable: bool,
-    zoomable: bool,
    focus_handle: FocusHandle,
 }

@@ -42,43 +44,157 @@ impl NewAccount {
    }

    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let name_input = cx.new(|cx| {
-            InputState::new(window, cx)
-                .placeholder(SharedString::new(t!("profile.placeholder_name")))
-        });
-
-        let avatar_input =
-            cx.new(|cx| InputState::new(window, cx).placeholder("https://example.com/avatar.png"));
+        let temp_keys = cx.new(|_| Keys::generate());
+        let name_input = cx.new(|cx| InputState::new(window, cx).placeholder("Alice"));
+        let avatar_input = cx.new(|cx| InputState::new(window, cx));

        Self {
            name_input,
            avatar_input,
-            is_uploading: false,
-            is_submitting: false,
+            temp_keys,
+            uploading: false,
+            submitting: false,
            name: "New Account".into(),
-            closable: true,
-            zoomable: true,
            focus_handle: cx.focus_handle(),
        }
    }

-    fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn create(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        self.submitting(true, cx);

-        let identity = Identity::global(cx);
+        let keys = self.temp_keys.read(cx).clone();
+        let view = cx.new(|cx| BackupKeys::new(&keys, window, cx));
+        let weak_view = view.downgrade();
+        let current_view = cx.entity().downgrade();
+
+        window.open_modal(cx, move |modal, _window, _cx| {
+            let weak_view = weak_view.clone();
+            let current_view = current_view.clone();
+
+            modal
+                .alert()
+                .title(shared_t!("new_account.backup_label"))
+                .child(view.clone())
+                .button_props(
+                    ModalButtonProps::default().ok_text(t!("new_account.backup_download")),
+                )
+                .on_ok(move |_, window, cx| {
+                    weak_view
+                        .update(cx, |this, cx| {
+                            let password = this.password(cx);
+                            let current_view = current_view.clone();
+
+                            if let Some(task) = this.backup(window, cx) {
+                                cx.spawn_in(window, async move |_, cx| {
+                                    task.await;
+
+                                    cx.update(|window, cx| {
+                                        current_view
+                                            .update(cx, |this, cx| {
+                                                this.set_signer(password, window, cx);
+                                            })
+                                            .ok();
+                                    })
+                                    .ok()
+                                })
+                                .detach();
+                            }
+                        })
+                        .ok();
+                    // true to close the modal
+                    false
+                })
+        })
+    }
+
+    fn set_signer(&mut self, password: String, window: &mut Window, cx: &mut Context<Self>) {
+        window.close_modal(cx);
+
+        let keys = self.temp_keys.read(cx).clone();
        let avatar = self.avatar_input.read(cx).value().to_string();
        let name = self.name_input.read(cx).value().to_string();
-
-        // Build metadata
        let mut metadata = Metadata::new().display_name(name.clone()).name(name);

        if let Ok(url) = Url::parse(&avatar) {
            metadata = metadata.picture(url);
        };

-        identity.update(cx, |this, cx| {
-            this.new_identity(metadata, window, cx);
-        });
+        // Encrypt and save user secret key to disk
+        self.write_keys_to_disk(&keys, password, cx);
+
+        // Set the client's signer with the current keys
+        cx.background_spawn(async move {
+            let client = nostr_client();
+
+            // Set the client's signer with the current keys
+            client.set_signer(keys).await;
+
+            // Set metadata
+            if let Err(e) = client.set_metadata(&metadata).await {
+                log::error!("Failed to set metadata: {e}");
+            }
+
+            // Set NIP-65 relays
+            let builder = EventBuilder::new(Kind::RelayList, "").tags(
+                NIP65_RELAYS.into_iter().filter_map(|url| {
+                    if let Ok(url) = RelayUrl::parse(url) {
+                        Some(Tag::relay_metadata(url, None))
+                    } else {
+                        None
+                    }
+                }),
+            );
+
+            if let Err(e) = client.send_event_builder(builder).await {
+                log::error!("Failed to send NIP-65 relay list event: {e}");
+            }
+
+            // Set NIP-17 relays
+            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(
+                NIP17_RELAYS.into_iter().filter_map(|url| {
+                    if let Ok(url) = RelayUrl::parse(url) {
+                        Some(Tag::relay(url))
+                    } else {
+                        None
+                    }
+                }),
+            );
+
+            if let Err(e) = client.send_event_builder(builder).await {
+                log::error!("Failed to send messaging relay list event: {e}");
+            };
+        })
+        .detach();
+    }
+
+    fn write_keys_to_disk(&self, keys: &Keys, password: String, cx: &mut Context<Self>) {
+        let keys = keys.to_owned();
+        let public_key = keys.public_key();
+
+        cx.background_spawn(async move {
+            if let Ok(enc_key) =
+                EncryptedSecretKey::new(keys.secret_key(), &password, 8, KeySecurity::Unknown)
+            {
+                let client = nostr_client();
+                let value = enc_key.to_bech32().unwrap();
+                let keys = Keys::generate();
+                let tags = vec![Tag::identifier(ACCOUNT_IDENTIFIER)];
+                let kind = Kind::ApplicationSpecificData;
+
+                let builder = EventBuilder::new(kind, value)
+                    .tags(tags)
+                    .build(public_key)
+                    .sign(&keys)
+                    .await;
+
+                if let Ok(event) = builder {
+                    if let Err(e) = client.database().save_event(&event).await {
+                        log::error!("Failed to save event: {e}");
+                    };
+                }
+            }
+        })
+        .detach();
    }

    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -92,6 +208,7 @@ impl NewAccount {
            files: true,
            directories: false,
            multiple: false,
+            prompt: None,
        });

        let task = Tokio::spawn(cx, async move {
@@ -114,14 +231,11 @@ impl NewAccount {
        cx.spawn_in(window, async move |this, cx| {
            match Flatten::flatten(task.await.map_err(|e| e.into())) {
                Ok(Ok(url)) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.uploading(false, cx);
-                            this.avatar_input.update(cx, |this, cx| {
-                                this.set_value(url.to_string(), window, cx);
-                            });
-                        })
-                        .ok();
+                    this.update_in(cx, |this, window, cx| {
+                        this.uploading(false, cx);
+                        this.avatar_input.update(cx, |this, cx| {
+                            this.set_value(url.to_string(), window, cx);
+                        });
                    })
                    .ok();
                }
@@ -149,12 +263,12 @@ impl NewAccount {
    }

    fn submitting(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.is_submitting = status;
+        self.submitting = status;
        cx.notify();
    }

    fn uploading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.is_uploading = status;
+        self.uploading = status;
        cx.notify();
    }
 }
@@ -168,14 +282,6 @@ impl Panel for NewAccount {
        self.name.clone().into_any_element()
    }

-    fn closable(&self, _cx: &App) -> bool {
-        self.closable
-    }
-
-    fn zoomable(&self, _cx: &App) -> bool {
-        self.zoomable
-    }
-
    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
        menu.track_focus(&self.focus_handle)
    }
@@ -207,7 +313,7 @@ impl Render for NewAccount {
                    .text_center()
                    .font_semibold()
                    .line_height(relative(1.3))
-                    .child(SharedString::new(t!("new_account.title"))),
+                    .child(shared_t!("new_account.title")),
            )
            .child(
                v_flex()
@@ -217,17 +323,13 @@ impl Render for NewAccount {
                        v_flex()
                            .gap_1()
                            .text_sm()
-                            .child(SharedString::new(t!("new_account.name")))
+                            .child(shared_t!("new_account.name"))
                            .child(TextInput::new(&self.name_input).small()),
                    )
                    .child(
                        v_flex()
                            .gap_1()
-                            .child(
-                                div()
-                                    .text_sm()
-                                    .child(SharedString::new(t!("new_account.avatar"))),
-                            )
+                            .child(div().text_sm().child(shared_t!("new_account.avatar")))
                            .child(
                                v_flex()
                                    .p_1()
@@ -250,9 +352,9 @@ impl Render for NewAccount {
                                            .label(t!("common.upload"))
                                            .ghost()
                                            .small()
-                                            .rounded(ButtonRounded::Full)
-                                            .disabled(self.is_submitting)
-                                            .loading(self.is_uploading)
+                                            .rounded()
+                                            .disabled(self.submitting || self.uploading)
+                                            .loading(self.uploading)
                                            .on_click(cx.listener(move |this, _, window, cx| {
                                                this.upload(window, cx);
                                            })),
@@ -262,12 +364,12 @@ impl Render for NewAccount {
                    .child(divider(cx))
                    .child(
                        Button::new("submit")
-                            .label(SharedString::new(t!("common.continue")))
+                            .label(t!("common.continue"))
                            .primary()
-                            .loading(self.is_submitting)
-                            .disabled(self.is_submitting || self.is_uploading)
+                            .loading(self.submitting)
+                            .disabled(self.submitting || self.uploading)
                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.submit(window, cx);
+                                this.create(window, cx);
                            })),
                    ),
            )
--- a/crates/coop/src/views/onboarding.rs
+++ b/crates/coop/src/views/onboarding.rs
@@ -1,40 +1,73 @@
-use anyhow::anyhow;
-use common::display::DisplayProfile;
-use global::constants::ACCOUNT_D;
+use std::sync::Arc;
+use std::time::Duration;
+
+use client_keys::ClientKeys;
+use common::display::TextUtils;
+use global::constants::{ACCOUNT_IDENTIFIER, APP_NAME, NOSTR_CONNECT_RELAY, NOSTR_CONNECT_TIMEOUT};
 use global::nostr_client;
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, relative, rems, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter,
-    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render, SharedString,
-    StatefulInteractiveElement, Styled, Window,
+    div, img, px, relative, svg, AnyElement, App, AppContext, ClipboardItem, Context, Entity,
+    EventEmitter, FocusHandle, Focusable, Image, InteractiveElement, IntoElement, ParentElement,
+    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Task, Window,
 };
-use i18n::t;
-use identity::Identity;
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use settings::AppSettings;
+use i18n::{shared_t, t};
+use nostr_connect::prelude::*;
+use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
-use ui::avatar::Avatar;
-use ui::button::{Button, ButtonRounded, ButtonVariants};
-use ui::checkbox::Checkbox;
+use ui::button::{Button, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
-use ui::indicator::Indicator;
+use ui::notification::Notification;
 use ui::popup_menu::PopupMenu;
-use ui::{Disableable, Icon, IconName, Sizable, StyledExt};
+use ui::{divider, h_flex, v_flex, ContextModal, Icon, IconName, Sizable, StyledExt};

-use crate::chatspace;
+use crate::chatspace::{self, ChatSpace};

 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Onboarding> {
    Onboarding::new(window, cx)
 }

+#[derive(Debug, Clone)]
+pub enum NostrConnectApp {
+    Nsec(String),
+    Amber(String),
+    Aegis(String),
+}
+
+impl NostrConnectApp {
+    pub fn all() -> Vec<Self> {
+        vec![
+            NostrConnectApp::Nsec("https://nsec.app".to_string()),
+            NostrConnectApp::Amber("https://github.com/greenart7c3/Amber".to_string()),
+            NostrConnectApp::Aegis("https://github.com/ZharlieW/Aegis".to_string()),
+        ]
+    }
+
+    pub fn url(&self) -> &str {
+        match self {
+            Self::Nsec(url) | Self::Amber(url) | Self::Aegis(url) => url,
+        }
+    }
+
+    pub fn as_str(&self) -> String {
+        match self {
+            NostrConnectApp::Nsec(_) => "nsec.app (Desktop)".into(),
+            NostrConnectApp::Amber(_) => "Amber (Android)".into(),
+            NostrConnectApp::Aegis(_) => "Aegis (iOS)".into(),
+        }
+    }
+}
+
 pub struct Onboarding {
+    nostr_connect_uri: Entity<NostrConnectURI>,
+    nostr_connect: Entity<Option<NostrConnect>>,
+    qr_code: Entity<Option<Arc<Image>>>,
+    connecting: bool,
+    // Panel
    name: SharedString,
-    local_account: Entity<Option<Profile>>,
-    loading: bool,
-    closable: bool,
-    zoomable: bool,
    focus_handle: FocusHandle,
+    _subscriptions: SmallVec<[Subscription; 2]>,
+    _tasks: SmallVec<[Task<()>; 1]>,
 }

 impl Onboarding {
@@ -43,63 +76,181 @@ impl Onboarding {
    }

    fn view(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let local_account = cx.new(|_| None);
+        let nostr_connect = cx.new(|_| None);
+        let qr_code = cx.new(|_| None);

-        let task = cx.background_spawn(async move {
-            let filter = Filter::new()
-                .kind(Kind::ApplicationSpecificData)
-                .identifier(ACCOUNT_D)
-                .limit(1);
-
-            if let Some(event) = nostr_client().database().query(filter).await?.first_owned() {
-                let public_key = event
-                    .tags
-                    .public_keys()
-                    .copied()
-                    .collect_vec()
-                    .first()
-                    .cloned()
-                    .unwrap();
-
-                let metadata = nostr_client()
-                    .database()
-                    .metadata(public_key)
-                    .await?
-                    .unwrap_or_default();
-
-                Ok(Profile::new(public_key, metadata))
-            } else {
-                Err(anyhow!("Not found"))
-            }
+        // NIP46: https://github.com/nostr-protocol/nips/blob/master/46.md
+        //
+        // Direct connection initiated by the client
+        let nostr_connect_uri = cx.new(|cx| {
+            let relay = RelayUrl::parse(NOSTR_CONNECT_RELAY).unwrap();
+            let app_keys = ClientKeys::read_global(cx).keys();
+            NostrConnectURI::client(app_keys.public_key(), vec![relay], APP_NAME)
        });

-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(profile) = task.await {
-                this.update(cx, |this, cx| {
-                    this.local_account.update(cx, |this, cx| {
-                        *this = Some(profile);
-                        cx.notify();
-                    });
-                })
-                .ok();
-            }
-        })
-        .detach();
+        let mut subscriptions = smallvec![];
+
+        // Clean up when the current view is released
+        subscriptions.push(cx.on_release_in(window, |this, window, cx| {
+            this.shutdown_nostr_connect(window, cx);
+        }));
+
+        // Set Nostr Connect after the view is initialized
+        cx.defer_in(window, |this, window, cx| {
+            this.set_connect(window, cx);
+        });

        Self {
-            local_account,
+            nostr_connect,
+            nostr_connect_uri,
+            qr_code,
+            connecting: false,
            name: "Onboarding".into(),
-            loading: false,
-            closable: true,
-            zoomable: true,
            focus_handle: cx.focus_handle(),
+            _subscriptions: subscriptions,
+            _tasks: smallvec![],
        }
    }

-    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.loading = status;
+    fn set_connecting(&mut self, cx: &mut Context<Self>) {
+        self.connecting = true;
        cx.notify();
    }
+
+    fn set_connect(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let uri = self.nostr_connect_uri.read(cx).clone();
+        let app_keys = ClientKeys::read_global(cx).keys();
+        let timeout = Duration::from_secs(NOSTR_CONNECT_TIMEOUT);
+
+        self.qr_code.update(cx, |this, cx| {
+            *this = uri.to_string().to_qr();
+            cx.notify();
+        });
+
+        self.nostr_connect.update(cx, |this, cx| {
+            *this = NostrConnect::new(uri, app_keys, timeout, None).ok();
+            cx.notify();
+        });
+
+        self._tasks.push(
+            // Wait for Nostr Connect approval
+            cx.spawn_in(window, async move |this, cx| {
+                let connect = this.read_with(cx, |this, cx| this.nostr_connect.read(cx).clone());
+
+                if let Ok(Some(signer)) = connect {
+                    match signer.bunker_uri().await {
+                        Ok(uri) => {
+                            this.update(cx, |this, cx| {
+                                this.set_connecting(cx);
+                                this.write_uri_to_disk(signer, uri, cx);
+                            })
+                            .ok();
+                        }
+                        Err(e) => {
+                            this.update_in(cx, |_, window, cx| {
+                                window.push_notification(
+                                    Notification::error(e.to_string()).title("Nostr Connect"),
+                                    cx,
+                                );
+                            })
+                            .ok();
+                        }
+                    };
+                }
+            }),
+        )
+    }
+
+    fn set_proxy(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        ChatSpace::proxy_signer(window, cx);
+    }
+
+    fn write_uri_to_disk(
+        &mut self,
+        signer: NostrConnect,
+        uri: NostrConnectURI,
+        cx: &mut Context<Self>,
+    ) {
+        let mut uri_without_secret = uri.to_string();
+
+        // Clear the secret parameter in the URI if it exists
+        if let Some(secret) = uri.secret() {
+            uri_without_secret = uri_without_secret.replace(secret, "");
+        }
+
+        let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
+            let client = nostr_client();
+
+            // Update the client's signer
+            client.set_signer(signer).await;
+
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            let event = EventBuilder::new(Kind::ApplicationSpecificData, uri_without_secret)
+                .tags(vec![Tag::identifier(ACCOUNT_IDENTIFIER)])
+                .build(public_key)
+                .sign(&Keys::generate())
+                .await?;
+
+            // Save the event to the database
+            client.database().save_event(&event).await?;
+
+            Ok(())
+        });
+
+        task.detach();
+    }
+
+    fn copy_uri(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        cx.write_to_clipboard(ClipboardItem::new_string(
+            self.nostr_connect_uri.read(cx).to_string(),
+        ));
+        window.push_notification(t!("common.copied"), cx);
+    }
+
+    fn shutdown_nostr_connect(&mut self, _window: &mut Window, cx: &mut App) {
+        if !self.connecting {
+            if let Some(signer) = self.nostr_connect.read(cx).clone() {
+                cx.background_spawn(async move {
+                    log::info!("Shutting down Nostr Connect");
+                    signer.shutdown().await;
+                })
+                .detach();
+            }
+        }
+    }
+
+    fn render_apps(&self, cx: &Context<Self>) -> impl IntoIterator<Item = impl IntoElement> {
+        let all_apps = NostrConnectApp::all();
+        let mut items = Vec::with_capacity(all_apps.len());
+
+        for (ix, item) in all_apps.into_iter().enumerate() {
+            items.push(self.render_app(ix, item.as_str(), item.url(), cx));
+        }
+
+        items
+    }
+
+    fn render_app<T>(&self, ix: usize, label: T, url: &str, cx: &Context<Self>) -> impl IntoElement
+    where
+        T: Into<SharedString>,
+    {
+        div()
+            .id(ix)
+            .flex_1()
+            .rounded_md()
+            .py_0p5()
+            .px_2()
+            .bg(cx.theme().ghost_element_background_alt)
+            .child(label.into())
+            .on_click({
+                let url = url.to_owned();
+                move |_e, _window, cx| {
+                    cx.open_url(&url);
+                }
+            })
+    }
 }

 impl Panel for Onboarding {
@@ -111,14 +262,6 @@ impl Panel for Onboarding {
        self.name.clone().into_any_element()
    }

-    fn closable(&self, _cx: &App) -> bool {
-        self.closable
-    }
-
-    fn zoomable(&self, _cx: &App) -> bool {
-        self.zoomable
-    }
-
    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
        menu.track_focus(&self.focus_handle)
    }
@@ -134,159 +277,167 @@ impl Focusable for Onboarding {

 impl Render for Onboarding {
    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let auto_login = AppSettings::get_auto_login(cx);
-        let proxy = AppSettings::get_proxy_user_avatars(cx);
-
-        div()
-            .py_4()
+        h_flex()
            .size_full()
-            .flex()
-            .flex_col()
-            .items_center()
-            .justify_center()
            .child(
-                div()
-                    .mb_10()
-                    .flex()
-                    .flex_col()
+                v_flex()
+                    .flex_1()
+                    .h_full()
+                    .gap_10()
                    .items_center()
-                    .gap_4()
+                    .justify_center()
                    .child(
-                        svg()
-                            .path("brand/coop.svg")
-                            .size_16()
-                            .text_color(cx.theme().elevated_surface_background),
-                    )
-                    .child(
-                        div()
-                            .text_center()
+                        v_flex()
+                            .items_center()
+                            .justify_center()
+                            .gap_4()
                            .child(
-                                div()
-                                    .text_xl()
-                                    .font_semibold()
-                                    .line_height(relative(1.3))
-                                    .child(SharedString::new(t!("welcome.title"))),
+                                svg()
+                                    .path("brand/coop.svg")
+                                    .size_16()
+                                    .text_color(cx.theme().elevated_surface_background),
                            )
                            .child(
                                div()
-                                    .text_color(cx.theme().text_muted)
-                                    .child(SharedString::new(t!("welcome.subtitle"))),
+                                    .text_center()
+                                    .child(
+                                        div()
+                                            .text_xl()
+                                            .font_semibold()
+                                            .line_height(relative(1.3))
+                                            .child(shared_t!("welcome.title")),
+                                    )
+                                    .child(
+                                        div()
+                                            .text_color(cx.theme().text_muted)
+                                            .child(shared_t!("welcome.subtitle")),
+                                    ),
                            ),
-                    ),
-            )
-            .map(|this| {
-                if let Some(profile) = self.local_account.read(cx).as_ref() {
-                    this.relative()
-                        .child(
-                            div()
-                                .id("account")
-                                .mb_3()
-                                .h_10()
-                                .w_72()
-                                .bg(cx.theme().element_background)
-                                .text_color(cx.theme().element_foreground)
-                                .rounded_lg()
-                                .text_sm()
-                                .map(|this| {
-                                    if self.loading {
-                                        this.child(
-                                            div()
-                                                .size_full()
-                                                .flex()
-                                                .items_center()
-                                                .justify_center()
-                                                .child(Indicator::new().small()),
-                                        )
-                                    } else {
-                                        this.child(
-                                            div()
-                                                .h_full()
-                                                .flex()
-                                                .items_center()
-                                                .justify_center()
-                                                .gap_2()
-                                                .child(SharedString::new(t!(
-                                                    "onboarding.choose_account"
-                                                )))
-                                                .child(
-                                                    div()
-                                                        .flex()
-                                                        .items_center()
-                                                        .gap_1()
-                                                        .font_semibold()
-                                                        .child(
-                                                            Avatar::new(profile.avatar_url(proxy))
-                                                                .size(rems(1.5)),
-                                                        )
-                                                        .child(
-                                                            div()
-                                                                .pb_px()
-                                                                .child(profile.display_name()),
-                                                        ),
-                                                ),
-                                        )
-                                    }
-                                })
-                                .hover(|this| this.bg(cx.theme().element_hover))
-                                .on_click(cx.listener(|this, _, window, cx| {
-                                    this.set_loading(true, cx);
-                                    Identity::global(cx).update(cx, |this, cx| {
-                                        this.load(window, cx);
-                                    });
-                                })),
-                        )
-                        .child(
-                            Checkbox::new("auto_login")
-                                .label(SharedString::new(t!("onboarding.auto_login")))
-                                .checked(auto_login)
-                                .on_click(move |_, _window, cx| {
-                                    AppSettings::update_auto_login(!auto_login, cx);
-                                }),
-                        )
-                        .child(
-                            div().w_24().absolute().bottom_2().right_2().child(
-                                Button::new("logout")
-                                    .icon(IconName::Logout)
-                                    .label(SharedString::new(t!("user.sign_out")))
-                                    .danger()
-                                    .xsmall()
-                                    .rounded(ButtonRounded::Full)
-                                    .disabled(self.loading)
-                                    .on_click(|_, window, cx| {
-                                        Identity::global(cx).update(cx, |this, cx| {
-                                            this.unload(window, cx);
-                                        });
-                                    }),
-                            ),
-                        )
-                } else {
-                    this.child(
-                        div()
-                            .w_72()
-                            .flex()
-                            .flex_col()
-                            .gap_2()
+                    )
+                    .child(
+                        v_flex()
+                            .w_80()
+                            .gap_3()
                            .child(
                                Button::new("continue_btn")
                                    .icon(Icon::new(IconName::ArrowRight))
-                                    .label(SharedString::new(t!("onboarding.start_messaging")))
+                                    .label(shared_t!("onboarding.start_messaging"))
                                    .primary()
+                                    .large()
+                                    .bold()
                                    .reverse()
                                    .on_click(cx.listener(move |_, _, window, cx| {
                                        chatspace::new_account(window, cx);
                                    })),
                            )
                            .child(
-                                Button::new("login_btn")
-                                    .label(SharedString::new(t!("onboarding.already_have_account")))
-                                    .ghost()
-                                    .underline()
+                                h_flex()
+                                    .my_1()
+                                    .gap_1()
+                                    .child(divider(cx))
+                                    .child(
+                                        div()
+                                            .text_sm()
+                                            .text_color(cx.theme().text_muted)
+                                            .child(shared_t!("onboarding.divider")),
+                                    )
+                                    .child(divider(cx)),
+                            )
+                            .child(
+                                Button::new("key")
+                                    .label(t!("onboarding.key_login"))
+                                    .ghost_alt()
                                    .on_click(cx.listener(move |_, _, window, cx| {
                                        chatspace::login(window, cx);
                                    })),
+                            )
+                            .child(
+                                v_flex()
+                                    .gap_1()
+                                    .child(
+                                        Button::new("ext")
+                                            .label(t!("onboarding.ext_login"))
+                                            .ghost_alt()
+                                            .on_click(cx.listener(move |this, _, window, cx| {
+                                                this.set_proxy(window, cx);
+                                            })),
+                                    )
+                                    .child(
+                                        div()
+                                            .italic()
+                                            .text_xs()
+                                            .text_center()
+                                            .text_color(cx.theme().text_muted)
+                                            .child(shared_t!("onboarding.ext_login_note")),
+                                    ),
                            ),
-                    )
-                }
-            })
+                    ),
+            )
+            .child(
+                div()
+                    .relative()
+                    .p_2()
+                    .flex_1()
+                    .h_full()
+                    .rounded_2xl()
+                    .child(
+                        v_flex()
+                            .size_full()
+                            .justify_center()
+                            .bg(cx.theme().surface_background)
+                            .rounded_2xl()
+                            .child(
+                                v_flex()
+                                    .gap_5()
+                                    .items_center()
+                                    .justify_center()
+                                    .when_some(self.qr_code.read(cx).as_ref(), |this, qr| {
+                                        this.child(
+                                            div()
+                                                .id("")
+                                                .child(
+                                                    img(qr.clone())
+                                                        .size(px(256.))
+                                                        .rounded_xl()
+                                                        .shadow_lg()
+                                                        .border_1()
+                                                        .border_color(cx.theme().element_active),
+                                                )
+                                                .on_click(cx.listener(
+                                                    move |this, _e, window, cx| {
+                                                        this.copy_uri(window, cx)
+                                                    },
+                                                )),
+                                        )
+                                    })
+                                    .child(
+                                        v_flex()
+                                            .justify_center()
+                                            .items_center()
+                                            .text_center()
+                                            .child(
+                                                div()
+                                                    .font_semibold()
+                                                    .line_height(relative(1.3))
+                                                    .child(shared_t!("onboarding.nostr_connect")),
+                                            )
+                                            .child(
+                                                div()
+                                                    .text_sm()
+                                                    .text_color(cx.theme().text_muted)
+                                                    .child(shared_t!("onboarding.scan_qr")),
+                                            )
+                                            .child(
+                                                h_flex()
+                                                    .mt_2()
+                                                    .gap_1()
+                                                    .text_xs()
+                                                    .justify_center()
+                                                    .children(self.render_apps(cx)),
+                                            ),
+                                    ),
+                            ),
+                    ),
+            )
    }
 }
--- a/crates/coop/src/views/preferences.rs
+++ b/crates/coop/src/views/preferences.rs
@@ -1,12 +1,12 @@
-use common::display::DisplayProfile;
+use common::display::RenderedProfile;
 use gpui::http_client::Url;
 use gpui::prelude::FluentBuilder;
 use gpui::{
    div, px, relative, rems, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
    ParentElement, Render, SharedString, StatefulInteractiveElement, Styled, Window,
 };
-use i18n::t;
-use identity::Identity;
+use i18n::{shared_t, t};
+use nostr_sdk::prelude::*;
 use registry::Registry;
 use settings::AppSettings;
 use theme::ActiveTheme;
@@ -15,12 +15,12 @@ use ui::button::{Button, ButtonVariants};
 use ui::input::{InputState, TextInput};
 use ui::modal::ModalButtonProps;
 use ui::switch::Switch;
-use ui::{v_flex, ContextModal, IconName, Sizable, Size, StyledExt};
+use ui::{h_flex, v_flex, ContextModal, IconName, Sizable, Size, StyledExt};

-use crate::views::{edit_profile, messaging_relays};
+use crate::views::{edit_profile, setup_relay};

 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Preferences> {
-    Preferences::new(window, cx)
+    cx.new(|cx| Preferences::new(window, cx))
 }

 pub struct Preferences {
@@ -28,44 +28,42 @@ pub struct Preferences {
 }

 impl Preferences {
-    pub fn new(window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| {
-            let media_server = AppSettings::get_media_server(cx).to_string();
-            let media_input = cx.new(|cx| {
-                InputState::new(window, cx)
-                    .default_value(media_server.clone())
-                    .placeholder(media_server)
-            });
+    pub fn new(window: &mut Window, cx: &mut App) -> Self {
+        let media_server = AppSettings::get_media_server(cx).to_string();
+        let media_input = cx.new(|cx| {
+            InputState::new(window, cx)
+                .default_value(media_server.clone())
+                .placeholder(media_server)
+        });

-            Self { media_input }
-        })
+        Self { media_input }
    }

    fn open_edit_profile(&self, window: &mut Window, cx: &mut Context<Self>) {
        let view = edit_profile::init(window, cx);
        let weak_view = view.downgrade();
-        let title = SharedString::new(t!("profile.title"));

        window.open_modal(cx, move |modal, _window, _cx| {
            let weak_view = weak_view.clone();

            modal
                .confirm()
-                .title(title.clone())
+                .title(shared_t!("profile.title"))
                .child(view.clone())
                .button_props(ModalButtonProps::default().ok_text(t!("common.update")))
                .on_ok(move |_, window, cx| {
                    weak_view
                        .update(cx, |this, cx| {
                            let set_metadata = this.set_metadata(cx);
+                            let registry = Registry::global(cx);

                            cx.spawn_in(window, async move |_, cx| {
                                match set_metadata.await {
-                                    Ok(event) => {
-                                        if let Some(event) = event {
+                                    Ok(profile) => {
+                                        if let Some(profile) = profile {
                                            cx.update(|_, cx| {
-                                                Registry::global(cx).update(cx, |this, cx| {
-                                                    this.insert_or_update_person(event, cx);
+                                                registry.update(cx, |this, cx| {
+                                                    this.insert_or_update_person(profile, cx);
                                                });
                                            })
                                            .ok();
@@ -89,15 +87,14 @@ impl Preferences {
    }

    fn open_relays(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let title = SharedString::new(t!("relays.modal_title"));
-        let view = messaging_relays::init(window, cx);
+        let view = setup_relay::init(Kind::InboxRelays, window, cx);
        let weak_view = view.downgrade();

        window.open_modal(cx, move |this, _window, _cx| {
            let weak_view = weak_view.clone();

            this.confirm()
-                .title(title.clone())
+                .title(shared_t!("relays.modal"))
                .child(view.clone())
                .button_props(ModalButtonProps::default().ok_text(t!("common.update")))
                .on_ok(move |_, window, cx| {
@@ -115,64 +112,58 @@ impl Preferences {

 impl Render for Preferences {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let input_state = self.media_input.downgrade();
-        let profile = Identity::read_global(cx)
-            .public_key()
-            .map(|pk| Registry::read_global(cx).get_person(&pk, cx));
-
-        let backup_messages = AppSettings::get_backup_messages(cx);
+        let auto_auth = AppSettings::get_auto_auth(cx);
+        let backup = AppSettings::get_backup_messages(cx);
        let screening = AppSettings::get_screening(cx);
-        let contact_bypass = AppSettings::get_contact_bypass(cx);
-        let proxy_avatar = AppSettings::get_proxy_user_avatars(cx);
-        let hide_avatar = AppSettings::get_hide_user_avatars(cx);
+        let bypass = AppSettings::get_contact_bypass(cx);
+        let proxy = AppSettings::get_proxy_user_avatars(cx);
+        let hide = AppSettings::get_hide_user_avatars(cx);
+
+        let registry = Registry::read_global(cx);
+        let input_state = self.media_input.downgrade();

        v_flex()
            .child(
                v_flex()
-                    .py_2()
+                    .pb_2()
                    .gap_2()
                    .child(
                        div()
                            .text_sm()
                            .text_color(cx.theme().text_placeholder)
                            .font_semibold()
-                            .child(SharedString::new(t!("preferences.account_header"))),
+                            .child(shared_t!("preferences.account_header")),
                    )
-                    .when_some(profile, |this, profile| {
+                    .when_some(registry.signer_pubkey(), |this, public_key| {
+                        let profile = registry.get_person(&public_key, cx);
+
                        this.child(
-                            div()
+                            h_flex()
                                .w_full()
-                                .flex()
                                .justify_between()
-                                .items_center()
                                .child(
-                                    div()
-                                        .id("current-user")
-                                        .flex()
-                                        .items_center()
+                                    h_flex()
+                                        .id("user")
                                        .gap_2()
-                                        .child(
-                                            Avatar::new(profile.avatar_url(proxy_avatar))
-                                                .size(rems(2.4)),
-                                        )
+                                        .child(Avatar::new(profile.avatar(proxy)).size(rems(2.4)))
                                        .child(
                                            div()
                                                .flex_1()
                                                .text_sm()
                                                .child(
                                                    div()
-                                                        .line_height(relative(1.3))
                                                        .font_semibold()
+                                                        .line_height(relative(1.3))
                                                        .child(profile.display_name()),
                                                )
                                                .child(
                                                    div()
-                                                        .line_height(relative(1.3))
                                                        .text_xs()
                                                        .text_color(cx.theme().text_muted)
-                                                        .child(SharedString::new(t!(
-                                                            "preferences.see_your_profile"
-                                                        ))),
+                                                        .line_height(relative(1.3))
+                                                        .child(shared_t!(
+                                                            "preferences.account_btn"
+                                                        )),
                                                ),
                                        )
                                        .on_click(cx.listener(move |this, _e, window, cx| {
@@ -182,8 +173,9 @@ impl Render for Preferences {
                                .child(
                                    Button::new("relays")
                                        .label("Messaging Relays")
-                                        .ghost()
-                                        .small()
+                                        .xsmall()
+                                        .ghost_alt()
+                                        .rounded()
                                        .on_click(cx.listener(move |this, _e, window, cx| {
                                            this.open_relays(window, cx);
                                        })),
@@ -201,39 +193,48 @@ impl Render for Preferences {
                            .text_sm()
                            .text_color(cx.theme().text_placeholder)
                            .font_semibold()
-                            .child(SharedString::new(t!("preferences.media_server_header"))),
+                            .child(shared_t!("preferences.relay_and_media")),
                    )
                    .child(
-                        div()
+                        v_flex()
                            .my_1()
-                            .flex()
-                            .items_start()
                            .gap_1()
-                            .child(TextInput::new(&self.media_input).xsmall())
                            .child(
-                                Button::new("update")
-                                    .icon(IconName::CheckCircleFill)
-                                    .ghost()
-                                    .with_size(Size::Size(px(26.)))
-                                    .on_click(move |_, window, cx| {
-                                        if let Some(input) = input_state.upgrade() {
-                                            let Ok(url) = Url::parse(input.read(cx).value()) else {
-                                                window.push_notification(
-                                                    t!("preferences.url_not_valid"),
-                                                    cx,
-                                                );
-                                                return;
-                                            };
-                                            AppSettings::update_media_server(url, cx);
-                                        }
-                                    }),
+                                h_flex()
+                                    .gap_1()
+                                    .child(TextInput::new(&self.media_input).xsmall())
+                                    .child(
+                                        Button::new("update")
+                                            .icon(IconName::Check)
+                                            .ghost()
+                                            .with_size(Size::Size(px(26.)))
+                                            .on_click(move |_, _window, cx| {
+                                                if let Some(input) = input_state.upgrade() {
+                                                    let Ok(url) =
+                                                        Url::parse(&input.read(cx).value())
+                                                    else {
+                                                        return;
+                                                    };
+                                                    AppSettings::update_media_server(url, cx);
+                                                }
+                                            }),
+                                    ),
+                            )
+                            .child(
+                                div()
+                                    .text_xs()
+                                    .text_color(cx.theme().text_muted)
+                                    .child(shared_t!("preferences.media_description")),
                            ),
                    )
                    .child(
-                        div()
-                            .text_xs()
-                            .text_color(cx.theme().text_muted)
-                            .child(SharedString::new(t!("preferences.media_description"))),
+                        Switch::new("auth")
+                            .label(t!("preferences.auto_auth"))
+                            .description(t!("preferences.auto_auth_description"))
+                            .checked(auto_auth)
+                            .on_click(move |_, _window, cx| {
+                                AppSettings::update_auto_auth(!auto_auth, cx);
+                            }),
                    ),
            )
            .child(
@@ -247,7 +248,7 @@ impl Render for Preferences {
                            .text_sm()
                            .text_color(cx.theme().text_placeholder)
                            .font_semibold()
-                            .child(SharedString::new(t!("preferences.messages_header"))),
+                            .child(shared_t!("preferences.messages_header")),
                    )
                    .child(
                        v_flex()
@@ -265,18 +266,18 @@ impl Render for Preferences {
                                Switch::new("bypass")
                                    .label(t!("preferences.bypass_label"))
                                    .description(t!("preferences.bypass_description"))
-                                    .checked(contact_bypass)
+                                    .checked(bypass)
                                    .on_click(move |_, _window, cx| {
-                                        AppSettings::update_contact_bypass(!contact_bypass, cx);
+                                        AppSettings::update_contact_bypass(!bypass, cx);
                                    }),
                            )
                            .child(
-                                Switch::new("backup_messages")
-                                    .label(t!("preferences.backup_messages_label"))
+                                Switch::new("backup")
+                                    .label(t!("preferences.backup_label"))
                                    .description(t!("preferences.backup_description"))
-                                    .checked(backup_messages)
+                                    .checked(backup)
                                    .on_click(move |_, _window, cx| {
-                                        AppSettings::update_backup_messages(!backup_messages, cx);
+                                        AppSettings::update_backup_messages(!backup, cx);
                                    }),
                            ),
                    ),
@@ -292,27 +293,27 @@ impl Render for Preferences {
                            .text_sm()
                            .text_color(cx.theme().text_placeholder)
                            .font_semibold()
-                            .child(SharedString::new(t!("preferences.display_header"))),
+                            .child(shared_t!("preferences.display_header")),
                    )
                    .child(
                        v_flex()
                            .gap_2()
                            .child(
-                                Switch::new("hide_user_avatars")
+                                Switch::new("hide_avatar")
                                    .label(t!("preferences.hide_avatars_label"))
                                    .description(t!("preferences.hide_avatar_description"))
-                                    .checked(hide_avatar)
+                                    .checked(hide)
                                    .on_click(move |_, _window, cx| {
-                                        AppSettings::update_hide_user_avatars(!hide_avatar, cx);
+                                        AppSettings::update_hide_user_avatars(!hide, cx);
                                    }),
                            )
                            .child(
-                                Switch::new("proxy_user_avatars")
+                                Switch::new("proxy_avatar")
                                    .label(t!("preferences.proxy_avatars_label"))
                                    .description(t!("preferences.proxy_description"))
-                                    .checked(proxy_avatar)
+                                    .checked(proxy)
                                    .on_click(move |_, _window, cx| {
-                                        AppSettings::update_proxy_user_avatars(!proxy_avatar, cx);
+                                        AppSettings::update_proxy_user_avatars(!proxy, cx);
                                    }),
                            ),
                    ),
--- a/crates/coop/src/views/screening.rs
+++ b/crates/coop/src/views/screening.rs
@@ -1,78 +1,90 @@
-use common::display::{shorten_pubkey, DisplayProfile};
+use std::time::Duration;
+
+use common::display::{shorten_pubkey, RenderedProfile, RenderedTimestamp};
 use common::nip05::nip05_verify;
+use global::constants::BOOTSTRAP_RELAYS;
 use global::nostr_client;
+use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, relative, rems, App, AppContext, Context, Div, Entity, IntoElement, ParentElement, Render,
-    SharedString, Styled, Task, Window,
+    div, px, relative, rems, uniform_list, App, AppContext, Context, Div, Entity,
+    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Task, Window,
 };
 use gpui_tokio::Tokio;
 use i18n::{shared_t, t};
-use identity::Identity;
 use nostr_sdk::prelude::*;
 use registry::Registry;
 use settings::AppSettings;
+use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonRounded, ButtonVariants};
+use ui::button::{Button, ButtonVariants};
+use ui::indicator::Indicator;
 use ui::{h_flex, v_flex, ContextModal, Icon, IconName, Sizable, StyledExt};

 pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<Screening> {
-    Screening::new(public_key, window, cx)
+    cx.new(|cx| Screening::new(public_key, window, cx))
 }

 pub struct Screening {
-    public_key: PublicKey,
+    profile: Profile,
    verified: bool,
    followed: bool,
-    dm_relays: bool,
-    mutual_contacts: usize,
+    last_active: Option<Timestamp>,
+    mutual_contacts: Vec<Profile>,
+    _tasks: SmallVec<[Task<()>; 3]>,
 }

 impl Screening {
-    pub fn new(public_key: PublicKey, _window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|_| Self {
-            public_key,
-            verified: false,
-            followed: false,
-            dm_relays: false,
-            mutual_contacts: 0,
-        })
-    }
+    pub fn new(public_key: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let registry = Registry::read_global(cx);
+        let profile = registry.get_person(&public_key, cx);

-    pub fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // Skip if user isn't logged in
-        let Some(identity) = Identity::read_global(cx).public_key() else {
-            return;
-        };
-        let public_key = self.public_key;
+        let mut tasks = smallvec![];

-        let check_trust_score: Task<(bool, usize, bool)> = cx.background_spawn(async move {
+        let contact_check: Task<Result<(bool, Vec<Profile>), Error>> =
+            cx.background_spawn(async move {
+                let client = nostr_client();
+                let signer = client.signer().await?;
+                let signer_pubkey = signer.get_public_key().await?;
+
+                // Check if user is in contact list
+                let contacts = client.database().contacts_public_keys(signer_pubkey).await;
+                let followed = contacts.unwrap_or_default().contains(&public_key);
+
+                // Check mutual contacts
+                let contact_list = Filter::new().kind(Kind::ContactList).pubkey(public_key);
+                let mut mutual_contacts = vec![];
+
+                if let Ok(events) = client.database().query(contact_list).await {
+                    for event in events.into_iter().filter(|ev| ev.pubkey != signer_pubkey) {
+                        if let Ok(metadata) = client.database().metadata(event.pubkey).await {
+                            let profile = Profile::new(event.pubkey, metadata.unwrap_or_default());
+                            mutual_contacts.push(profile);
+                        }
+                    }
+                }
+
+                Ok((followed, mutual_contacts))
+            });
+
+        let activity_check = cx.background_spawn(async move {
            let client = nostr_client();
+            let filter = Filter::new().author(public_key).limit(1);
+            let mut activity: Option<Timestamp> = None;

-            let follow = Filter::new()
-                .kind(Kind::ContactList)
-                .author(identity)
-                .pubkey(public_key)
-                .limit(1);
+            if let Ok(mut stream) = client
+                .stream_events_from(BOOTSTRAP_RELAYS, filter, Duration::from_secs(2))
+                .await
+            {
+                while let Some(event) = stream.next().await {
+                    activity = Some(event.created_at);
+                }
+            }

-            let contacts = Filter::new()
-                .kind(Kind::ContactList)
-                .pubkey(public_key)
-                .limit(1);
-
-            let relays = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
-
-            let is_follow = client.database().count(follow).await.unwrap_or(0) >= 1;
-            let mutual_contacts = client.database().count(contacts).await.unwrap_or(0);
-            let dm_relays = client.database().count(relays).await.unwrap_or(0) >= 1;
-
-            (is_follow, mutual_contacts, dm_relays)
+            activity
        });

-        let verify_nip05 = if let Some(address) = self.address(cx) {
+        let addr_check = if let Some(address) = profile.metadata().nip05 {
            Some(Tokio::spawn(cx, async move {
                nip05_verify(public_key, &address).await.unwrap_or(false)
            }))
@@ -80,47 +92,70 @@ impl Screening {
            None
        };

-        cx.spawn_in(window, async move |this, cx| {
-            let (followed, mutual_contacts, dm_relays) = check_trust_score.await;
-
-            this.update(cx, |this, cx| {
-                this.followed = followed;
-                this.mutual_contacts = mutual_contacts;
-                this.dm_relays = dm_relays;
-                cx.notify();
-            })
-            .ok();
-
-            // Update the NIP05 verification status if user has NIP05 address
-            if let Some(task) = verify_nip05 {
-                if let Ok(verified) = task.await {
+        tasks.push(
+            // Run the contact check in the background
+            cx.spawn_in(window, async move |this, cx| {
+                if let Ok((followed, mutual_contacts)) = contact_check.await {
                    this.update(cx, |this, cx| {
-                        this.verified = verified;
+                        this.followed = followed;
+                        this.mutual_contacts = mutual_contacts;
                        cx.notify();
                    })
                    .ok();
                }
-            }
-        })
-        .detach();
+            }),
+        );
+
+        tasks.push(
+            // Run the activity check in the background
+            cx.spawn_in(window, async move |this, cx| {
+                let active = activity_check.await;
+
+                this.update(cx, |this, cx| {
+                    this.last_active = active;
+                    cx.notify();
+                })
+                .ok();
+            }),
+        );
+
+        tasks.push(
+            // Run the NIP-05 verification in the background
+            cx.spawn_in(window, async move |this, cx| {
+                if let Some(task) = addr_check {
+                    if let Ok(verified) = task.await {
+                        this.update(cx, |this, cx| {
+                            this.verified = verified;
+                            cx.notify();
+                        })
+                        .ok();
+                    }
+                }
+            }),
+        );
+
+        Self {
+            profile,
+            verified: false,
+            followed: false,
+            last_active: None,
+            mutual_contacts: vec![],
+            _tasks: tasks,
+        }
    }

-    fn profile(&self, cx: &Context<Self>) -> Profile {
-        let registry = Registry::read_global(cx);
-        registry.get_person(&self.public_key, cx)
-    }
-
-    fn address(&self, cx: &Context<Self>) -> Option<String> {
-        self.profile(cx).metadata().nip05
+    fn address(&self, _cx: &Context<Self>) -> Option<String> {
+        self.profile.metadata().nip05
    }

    fn open_njump(&mut self, _window: &mut Window, cx: &mut App) {
-        let Ok(bech32) = self.public_key.to_bech32();
+        let Ok(bech32) = self.profile.public_key().to_bech32();
        cx.open_url(&format!("https://njump.me/{bech32}"));
    }

    fn report(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let public_key = self.public_key;
+        let public_key = self.profile.public_key();
+
        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
            let client = nostr_client();
            let builder = EventBuilder::report(
@@ -143,13 +178,53 @@ impl Screening {
        })
        .detach();
    }
+
+    fn mutual_contacts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let contacts = self.mutual_contacts.clone();
+
+        window.open_modal(cx, move |this, _window, _cx| {
+            let contacts = contacts.clone();
+            let total = contacts.len();
+
+            this.title(shared_t!("screening.mutual_label")).child(
+                v_flex().gap_1().pb_4().child(
+                    uniform_list("contacts", total, move |range, _window, cx| {
+                        let mut items = Vec::with_capacity(total);
+
+                        for ix in range {
+                            if let Some(contact) = contacts.get(ix) {
+                                items.push(
+                                    h_flex()
+                                        .h_11()
+                                        .w_full()
+                                        .px_2()
+                                        .gap_1p5()
+                                        .rounded(cx.theme().radius)
+                                        .text_sm()
+                                        .hover(|this| {
+                                            this.bg(cx.theme().elevated_surface_background)
+                                        })
+                                        .child(Avatar::new(contact.avatar(true)).size(rems(1.75)))
+                                        .child(contact.display_name()),
+                                );
+                            }
+                        }
+
+                        items
+                    })
+                    .h(px(300.)),
+                ),
+            )
+        });
+    }
 }

 impl Render for Screening {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let proxy = AppSettings::get_proxy_user_avatars(cx);
-        let profile = self.profile(cx);
-        let shorten_pubkey = shorten_pubkey(profile.public_key(), 8);
+        let shorten_pubkey = shorten_pubkey(self.profile.public_key(), 8);
+        let total_mutuals = self.mutual_contacts.len();
+        let last_active = self.last_active.map(|_| true);

        v_flex()
            .gap_4()
@@ -159,24 +234,22 @@ impl Render for Screening {
                    .items_center()
                    .justify_center()
                    .text_center()
-                    .child(Avatar::new(profile.avatar_url(proxy)).size(rems(4.)))
+                    .child(Avatar::new(self.profile.avatar(proxy)).size(rems(4.)))
                    .child(
                        div()
                            .font_semibold()
                            .line_height(relative(1.25))
-                            .child(profile.display_name()),
+                            .child(self.profile.display_name()),
                    ),
            )
            .child(
                h_flex()
                    .gap_3()
                    .child(
-                        div()
+                        h_flex()
                            .p_1()
                            .flex_1()
                            .h_7()
-                            .flex()
-                            .items_center()
                            .justify_center()
                            .rounded_full()
                            .bg(cx.theme().surface_background)
@@ -195,7 +268,7 @@ impl Render for Screening {
                                    .label(t!("profile.njump"))
                                    .secondary()
                                    .small()
-                                    .rounded(ButtonRounded::Full)
+                                    .rounded()
                                    .on_click(cx.listener(move |this, _e, window, cx| {
                                        this.open_njump(window, cx);
                                    })),
@@ -205,7 +278,7 @@ impl Render for Screening {
                                    .tooltip(t!("screening.report"))
                                    .icon(IconName::Report)
                                    .danger()
-                                    .rounded(ButtonRounded::Full)
+                                    .rounded()
                                    .on_click(cx.listener(move |this, _e, window, cx| {
                                        this.report(window, cx);
                                    })),
@@ -220,25 +293,70 @@ impl Render for Screening {
                            .items_start()
                            .gap_2()
                            .text_sm()
-                            .child(status_badge(self.followed, cx))
+                            .child(status_badge(Some(self.followed), cx))
                            .child(
                                v_flex()
                                    .text_sm()
                                    .child(shared_t!("screening.contact_label"))
-                                    .child(div().text_color(cx.theme().text_muted).child({
-                                        if self.followed {
-                                            shared_t!("screening.contact")
-                                        } else {
-                                            shared_t!("screening.not_contact")
-                                        }
-                                    })),
+                                    .child(
+                                        div()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .child({
+                                                if self.followed {
+                                                    shared_t!("screening.contact")
+                                                } else {
+                                                    shared_t!("screening.not_contact")
+                                                }
+                                            }),
+                                    ),
                            ),
                    )
                    .child(
                        h_flex()
                            .items_start()
                            .gap_2()
-                            .child(status_badge(self.verified, cx))
+                            .text_sm()
+                            .child(status_badge(last_active, cx))
+                            .child(
+                                v_flex()
+                                    .text_sm()
+                                    .child(
+                                        h_flex()
+                                            .gap_0p5()
+                                            .child(shared_t!("screening.active_label"))
+                                            .child(
+                                                Button::new("active")
+                                                    .icon(IconName::Info)
+                                                    .xsmall()
+                                                    .ghost()
+                                                    .rounded()
+                                                    .tooltip(t!("screening.active_tooltip")),
+                                            ),
+                                    )
+                                    .child(
+                                        div()
+                                            .w_full()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .map(|this| {
+                                                if let Some(date) = self.last_active {
+                                                    this.child(shared_t!(
+                                                        "screening.active_at",
+                                                        d = date.to_human_time()
+                                                    ))
+                                                } else {
+                                                    this.child(shared_t!("screening.no_active"))
+                                                }
+                                            }),
+                                    ),
+                            ),
+                    )
+                    .child(
+                        h_flex()
+                            .items_start()
+                            .gap_2()
+                            .child(status_badge(Some(self.verified), cx))
                            .child(
                                v_flex()
                                    .text_sm()
@@ -249,77 +367,83 @@ impl Render for Screening {
                                            shared_t!("screening.nip05_label")
                                        }
                                    })
-                                    .child(div().text_color(cx.theme().text_muted).child({
-                                        if self.address(cx).is_some() {
-                                            if self.verified {
-                                                shared_t!("screening.nip05_ok")
-                                            } else {
-                                                shared_t!("screening.nip05_failed")
-                                            }
-                                        } else {
-                                            shared_t!("screening.nip05_empty")
-                                        }
-                                    })),
+                                    .child(
+                                        div()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .child({
+                                                if self.address(cx).is_some() {
+                                                    if self.verified {
+                                                        shared_t!("screening.nip05_ok")
+                                                    } else {
+                                                        shared_t!("screening.nip05_failed")
+                                                    }
+                                                } else {
+                                                    shared_t!("screening.nip05_empty")
+                                                }
+                                            }),
+                                    ),
                            ),
                    )
                    .child(
                        h_flex()
                            .items_start()
                            .gap_2()
-                            .child(status_badge(self.mutual_contacts > 0, cx))
+                            .child(status_badge(Some(total_mutuals > 0), cx))
                            .child(
                                v_flex()
                                    .text_sm()
-                                    .child(shared_t!("screening.mutual_label"))
-                                    .child(div().text_color(cx.theme().text_muted).child({
-                                        if self.mutual_contacts > 0 {
-                                            shared_t!("screening.mutual", u = self.mutual_contacts)
-                                        } else {
-                                            shared_t!("screening.no_mutual")
-                                        }
-                                    })),
-                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .items_start()
-                            .gap_2()
-                            .child(status_badge(self.dm_relays, cx))
-                            .child(
-                                v_flex()
-                                    .w_full()
-                                    .text_sm()
-                                    .child({
-                                        if self.dm_relays {
-                                            shared_t!("screening.relay_found")
-                                        } else {
-                                            shared_t!("screening.relay_empty")
-                                        }
-                                    })
-                                    .child(div().w_full().text_color(cx.theme().text_muted).child(
-                                        {
-                                            if self.dm_relays {
-                                                shared_t!("screening.relay_found_desc")
-                                            } else {
-                                                shared_t!("screening.relay_empty_desc")
-                                            }
-                                        },
-                                    )),
+                                    .child(
+                                        h_flex()
+                                            .gap_0p5()
+                                            .child(shared_t!("screening.mutual_label"))
+                                            .child(
+                                                Button::new("mutuals")
+                                                    .icon(IconName::Info)
+                                                    .xsmall()
+                                                    .ghost()
+                                                    .rounded()
+                                                    .on_click(cx.listener(
+                                                        move |this, _, window, cx| {
+                                                            this.mutual_contacts(window, cx);
+                                                        },
+                                                    )),
+                                            ),
+                                    )
+                                    .child(
+                                        div()
+                                            .line_clamp(1)
+                                            .text_color(cx.theme().text_muted)
+                                            .child({
+                                                if total_mutuals > 0 {
+                                                    shared_t!("screening.mutual", u = total_mutuals)
+                                                } else {
+                                                    shared_t!("screening.no_mutual")
+                                                }
+                                            }),
+                                    ),
                            ),
                    ),
            )
    }
 }

-fn status_badge(status: bool, cx: &App) -> Div {
-    div()
-        .pt_1()
+fn status_badge(status: Option<bool>, cx: &App) -> Div {
+    h_flex()
+        .size_6()
+        .justify_center()
        .flex_shrink_0()
-        .child(Icon::new(IconName::CheckCircleFill).small().text_color({
-            if status {
-                cx.theme().icon_accent
+        .map(|this| {
+            if let Some(status) = status {
+                this.child(Icon::new(IconName::CheckCircleFill).small().text_color({
+                    if status {
+                        cx.theme().icon_accent
+                    } else {
+                        cx.theme().icon_muted
+                    }
+                }))
            } else {
-                cx.theme().icon_muted
+                this.child(Indicator::new().small())
            }
-        }))
+        })
 }
--- a/crates/coop/src/views/messaging_relays.rs
+++ b/crates/coop/src/views/messaging_relays.rs
@@ -1,8 +1,8 @@
 use std::time::Duration;

 use anyhow::{anyhow, Error};
-use global::constants::{GIFT_WRAP_SUB_ID, NIP17_RELAYS};
-use global::nostr_client;
+use global::constants::NIP17_RELAYS;
+use global::{app_state, nostr_client};
 use gpui::prelude::FluentBuilder;
 use gpui::{
    div, px, uniform_list, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
@@ -10,31 +10,31 @@ use gpui::{
    TextAlign, UniformList, Window,
 };
 use i18n::{shared_t, t};
-use identity::Identity;
-use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
-use ui::button::{Button, ButtonRounded, ButtonVariants};
+use ui::button::{Button, ButtonVariants};
 use ui::input::{InputEvent, InputState, TextInput};
 use ui::modal::ModalButtonProps;
 use ui::{h_flex, v_flex, ContextModal, IconName, Sizable, StyledExt};

-pub fn init(window: &mut Window, cx: &mut App) -> Entity<MessagingRelays> {
-    cx.new(|cx| MessagingRelays::new(window, cx))
+pub fn init(kind: Kind, window: &mut Window, cx: &mut App) -> Entity<SetupRelay> {
+    cx.new(|cx| SetupRelay::new(kind, window, cx))
 }

-pub fn relay_button() -> impl IntoElement {
+pub fn setup_nip17_relay<T>(label: T) -> impl IntoElement
+where
+    T: Into<SharedString>,
+{
    div().child(
-        Button::new("dm-relays")
+        Button::new("setup-relays")
            .icon(IconName::Info)
-            .label(t!("relays.button_label"))
+            .label(label)
            .warning()
            .xsmall()
-            .rounded(ButtonRounded::Full)
+            .rounded()
            .on_click(move |_, window, cx| {
-                let title = SharedString::new(t!("relays.modal_title"));
-                let view = cx.new(|cx| MessagingRelays::new(window, cx));
+                let view = cx.new(|cx| SetupRelay::new(Kind::InboxRelays, window, cx));
                let weak_view = view.downgrade();

                window.open_modal(cx, move |modal, _window, _cx| {
@@ -42,7 +42,7 @@ pub fn relay_button() -> impl IntoElement {

                    modal
                        .confirm()
-                        .title(title.clone())
+                        .title(shared_t!("relays.modal"))
                        .child(view.clone())
                        .button_props(ModalButtonProps::default().ok_text(t!("common.update")))
                        .on_ok(move |_, window, cx| {
@@ -59,60 +59,43 @@ pub fn relay_button() -> impl IntoElement {
    )
 }

-pub struct MessagingRelays {
+pub struct SetupRelay {
    input: Entity<InputState>,
    relays: Vec<RelayUrl>,
    error: Option<SharedString>,
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 2]>,
+    _subscriptions: SmallVec<[Subscription; 1]>,
+    _tasks: SmallVec<[Task<()>; 1]>,
 }

-impl MessagingRelays {
-    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+impl SetupRelay {
+    pub fn new(kind: Kind, window: &mut Window, cx: &mut Context<Self>) -> Self {
        let input = cx.new(|cx| InputState::new(window, cx).placeholder("wss://example.com"));
+
        let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];

-        subscriptions.push(cx.observe_new::<Self>(move |this, window, cx| {
-            if let Some(window) = window {
-                this.load(window, cx);
-            }
-        }));
-
-        subscriptions.push(cx.subscribe_in(
-            &input,
-            window,
-            move |this: &mut Self, _, event, window, cx| {
-                if let InputEvent::PressEnter { .. } = event {
-                    this.add(window, cx);
-                }
-            },
-        ));
-
-        Self {
-            input,
-            subscriptions,
-            relays: vec![],
-            error: None,
-        }
-    }
-
-    fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let task: Task<Result<Vec<RelayUrl>, Error>> = cx.background_spawn(async move {
+        let load_relay = cx.background_spawn(async move {
            let client = nostr_client();
            let signer = client.signer().await?;
            let public_key = signer.get_public_key().await?;

-            let filter = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
+            let filter = Filter::new().kind(kind).author(public_key).limit(1);

            if let Some(event) = client.database().query(filter).await?.first() {
-                let relays = event
+                let relays: Vec<RelayUrl> = event
                    .tags
-                    .filter(TagKind::Relay)
-                    .filter_map(|tag| RelayUrl::parse(tag.content()?).ok())
-                    .collect::<Vec<_>>();
+                    .iter()
+                    .filter_map(|tag| tag.as_standardized())
+                    .filter_map(|tag| {
+                        if let TagStandard::RelayMetadata { relay_url, .. } = tag {
+                            Some(relay_url.to_owned())
+                        } else if let TagStandard::Relay(url) = tag {
+                            Some(url.to_owned())
+                        } else {
+                            None
+                        }
+                    })
+                    .collect();

                Ok(relays)
            } else {
@@ -120,16 +103,39 @@ impl MessagingRelays {
            }
        });

-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok(relays) = task.await {
-                this.update(cx, |this, cx| {
-                    this.relays = relays;
-                    cx.notify();
-                })
-                .ok();
-            }
-        })
-        .detach();
+        tasks.push(
+            // Load user's relays in the local database
+            cx.spawn_in(window, async move |this, cx| {
+                if let Ok(relays) = load_relay.await {
+                    this.update(cx, |this, cx| {
+                        this.relays = relays;
+                        cx.notify();
+                    })
+                    .ok();
+                }
+            }),
+        );
+
+        subscriptions.push(
+            // Subscribe to user's input events
+            cx.subscribe_in(
+                &input,
+                window,
+                move |this: &mut Self, _, event, window, cx| {
+                    if let InputEvent::PressEnter { .. } = event {
+                        this.add(window, cx);
+                    }
+                },
+            ),
+        );
+
+        Self {
+            input,
+            relays: vec![],
+            error: None,
+            _subscriptions: subscriptions,
+            _tasks: tasks,
+        }
    }

    fn add(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -192,30 +198,37 @@ impl MessagingRelays {
            let signer = client.signer().await?;
            let public_key = signer.get_public_key().await?;

-            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(
-                relays
-                    .iter()
-                    .map(|relay| Tag::relay(relay.clone()))
-                    .collect_vec(),
-            );
+            let tags: Vec<Tag> = relays
+                .iter()
+                .map(|relay| Tag::relay(relay.clone()))
+                .collect();
+
+            let event = EventBuilder::new(Kind::InboxRelays, "")
+                .tags(tags)
+                .build(public_key)
+                .sign(&signer)
+                .await?;

            // Set messaging relays
-            client.send_event_builder(builder).await?;
+            client.send_event(&event).await?;

            // Connect to messaging relays
-            for relay in relays.into_iter() {
-                _ = client.add_relay(&relay).await;
-                _ = client.connect_relay(&relay).await;
+            for relay in relays.iter() {
+                _ = client.add_relay(relay).await;
+                _ = client.connect_relay(relay).await;
            }

-            let id = SubscriptionId::new(GIFT_WRAP_SUB_ID);
-            let new_messages = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
+            // Fetch gift wrap events
+            let sub_id = app_state().gift_wrap_sub_id.clone();
+            let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);

-            // Close old subscriptions
-            client.unsubscribe(&id).await;
-
-            // Subscribe to new messages
-            client.subscribe_with_id(id, new_messages, None).await?;
+            if client
+                .subscribe_with_id_to(relays.clone(), sub_id, filter, None)
+                .await
+                .is_ok()
+            {
+                log::info!("Subscribed to messages in: {relays:?}");
+            };

            Ok(())
        });
@@ -224,20 +237,13 @@ impl MessagingRelays {
            match task.await {
                Ok(_) => {
                    cx.update(|window, cx| {
-                        Identity::global(cx).update(cx, |this, cx| {
-                            this.verify_dm_relays(window, cx);
-                        });
-                        // Close the current modal
                        window.close_modal(cx);
                    })
                    .ok();
                }
                Err(e) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.set_error(e.to_string(), window, cx);
-                        })
-                        .ok();
+                    this.update_in(cx, |this, window, cx| {
+                        this.set_error(e.to_string(), window, cx);
                    })
                    .ok();
                }
@@ -301,11 +307,11 @@ impl MessagingRelays {
            .justify_center()
            .text_sm()
            .text_align(TextAlign::Center)
-            .child(SharedString::new(t!("relays.add_some_relays")))
+            .child(shared_t!("relays.help_text"))
    }
 }

-impl Render for MessagingRelays {
+impl Render for SetupRelay {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
            .gap_3()
@@ -341,7 +347,7 @@ impl Render for MessagingRelays {
                                    .text_xs()
                                    .font_semibold()
                                    .text_color(cx.theme().text_muted)
-                                    .child(shared_t!("relays.recommended")),
+                                    .child(shared_t!("common.recommended")),
                            )
                            .child(h_flex().gap_1().children({
                                NIP17_RELAYS.iter().map(|&relay| {
--- a/crates/coop/src/views/sidebar/list_item.rs
+++ b/crates/coop/src/views/sidebar/list_item.rs
@@ -2,8 +2,8 @@ use std::rc::Rc;

 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, rems, App, ClickEvent, Div, InteractiveElement, IntoElement, ParentElement as _,
-    RenderOnce, SharedString, StatefulInteractiveElement, Styled, Window,
+    div, rems, App, ClickEvent, InteractiveElement, IntoElement, ParentElement as _, RenderOnce,
+    SharedString, SharedUri, StatefulInteractiveElement, Styled, Window,
 };
 use i18n::t;
 use nostr_sdk::prelude::*;
@@ -11,10 +11,11 @@ use registry::room::RoomKind;
 use registry::Registry;
 use settings::AppSettings;
 use theme::ActiveTheme;
-use ui::actions::OpenProfile;
+use ui::actions::{CopyPublicKey, OpenPublicKey};
 use ui::avatar::Avatar;
 use ui::context_menu::ContextMenuExt;
 use ui::modal::ModalButtonProps;
+use ui::skeleton::Skeleton;
 use ui::{h_flex, ContextModal, StyledExt};

 use crate::views::screening;
@@ -22,60 +23,114 @@ use crate::views::screening;
 #[derive(IntoElement)]
 pub struct RoomListItem {
    ix: usize,
-    base: Div,
-    room_id: u64,
-    public_key: PublicKey,
-    name: SharedString,
-    avatar: SharedString,
-    created_at: SharedString,
-    kind: RoomKind,
+    room_id: Option<u64>,
+    public_key: Option<PublicKey>,
+    name: Option<SharedString>,
+    avatar: Option<SharedUri>,
+    created_at: Option<SharedString>,
+    kind: Option<RoomKind>,
    #[allow(clippy::type_complexity)]
-    handler: Rc<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
+    handler: Option<Rc<dyn Fn(&ClickEvent, &mut Window, &mut App)>>,
 }

 impl RoomListItem {
-    pub fn new(
-        ix: usize,
-        room_id: u64,
-        public_key: PublicKey,
-        name: SharedString,
-        avatar: SharedString,
-        created_at: SharedString,
-        kind: RoomKind,
-    ) -> Self {
+    pub fn new(ix: usize) -> Self {
        Self {
            ix,
-            public_key,
-            room_id,
-            name,
-            avatar,
-            created_at,
-            kind,
-            base: h_flex().h_9().w_full().px_1p5(),
-            handler: Rc::new(|_, _, _| {}),
+            room_id: None,
+            public_key: None,
+            name: None,
+            avatar: None,
+            created_at: None,
+            kind: None,
+            handler: None,
        }
    }

+    pub fn room_id(mut self, room_id: u64) -> Self {
+        self.room_id = Some(room_id);
+        self
+    }
+
+    pub fn public_key(mut self, public_key: PublicKey) -> Self {
+        self.public_key = Some(public_key);
+        self
+    }
+
+    pub fn name(mut self, name: impl Into<SharedString>) -> Self {
+        self.name = Some(name.into());
+        self
+    }
+
+    pub fn avatar(mut self, avatar: impl Into<SharedUri>) -> Self {
+        self.avatar = Some(avatar.into());
+        self
+    }
+
+    pub fn created_at(mut self, created_at: impl Into<SharedString>) -> Self {
+        self.created_at = Some(created_at.into());
+        self
+    }
+
+    pub fn kind(mut self, kind: RoomKind) -> Self {
+        self.kind = Some(kind);
+        self
+    }
+
    pub fn on_click(
        mut self,
        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
    ) -> Self {
-        self.handler = Rc::new(handler);
+        self.handler = Some(Rc::new(handler));
        self
    }
 }

 impl RenderOnce for RoomListItem {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let public_key = self.public_key;
-        let room_id = self.room_id;
-        let kind = self.kind;
-        let handler = self.handler.clone();
        let hide_avatar = AppSettings::get_hide_user_avatars(cx);
        let require_screening = AppSettings::get_screening(cx);

-        self.base
+        let (
+            Some(public_key),
+            Some(room_id),
+            Some(name),
+            Some(avatar),
+            Some(created_at),
+            Some(kind),
+            Some(handler),
+        ) = (
+            self.public_key,
+            self.room_id,
+            self.name,
+            self.avatar,
+            self.created_at,
+            self.kind,
+            self.handler,
+        )
+        else {
+            return h_flex()
+                .id(self.ix)
+                .h_9()
+                .w_full()
+                .px_1p5()
+                .gap_2()
+                .child(Skeleton::new().flex_shrink_0().size_6().rounded_full())
+                .child(
+                    div()
+                        .flex_1()
+                        .flex()
+                        .justify_between()
+                        .child(Skeleton::new().w_32().h_2p5().rounded_sm())
+                        .child(Skeleton::new().w_6().h_2p5().rounded_sm()),
+                );
+        };
+
+        h_flex()
            .id(self.ix)
+            .h_9()
+            .w_full()
+            .px_1p5()
            .gap_2()
            .text_sm()
            .rounded(cx.theme().radius)
@@ -86,7 +141,7 @@ impl RenderOnce for RoomListItem {
                        .size_6()
                        .rounded_full()
                        .overflow_hidden()
-                        .child(Avatar::new(self.avatar).size(rems(1.5))),
+                        .child(Avatar::new(avatar).size(rems(1.5))),
                )
            })
            .child(
@@ -102,21 +157,21 @@ impl RenderOnce for RoomListItem {
                            .text_ellipsis()
                            .truncate()
                            .font_medium()
-                            .child(self.name),
+                            .child(name),
                    )
                    .child(
                        div()
                            .flex_shrink_0()
                            .text_xs()
                            .text_color(cx.theme().text_placeholder)
-                            .child(self.created_at),
+                            .child(created_at),
                    ),
            )
-            .context_menu(move |this, _window, _cx| {
-                // TODO: add share chat room
-                this.menu(t!("profile.view"), Box::new(OpenProfile(public_key)))
-            })
            .hover(|this| this.bg(cx.theme().elevated_surface_background))
+            .context_menu(move |this, _window, _cx| {
+                this.menu(t!("profile.view"), Box::new(OpenPublicKey(public_key)))
+                    .menu(t!("profile.copy"), Box::new(CopyPublicKey(public_key)))
+            })
            .on_click(move |event, window, cx| {
                handler(event, window, cx);

--- a/crates/coop/src/views/sidebar/mod.rs
+++ b/crates/coop/src/views/sidebar/mod.rs
@@ -4,33 +4,32 @@ use std::time::Duration;

 use anyhow::{anyhow, Error};
 use common::debounced_delay::DebouncedDelay;
-use common::display::TextUtils;
+use common::display::{RenderedTimestamp, TextUtils};
 use global::constants::{BOOTSTRAP_RELAYS, SEARCH_RELAYS};
-use global::nostr_client;
+use global::{app_state, nostr_client, UnwrappingStatus};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity, EventEmitter,
-    FocusHandle, Focusable, IntoElement, ParentElement, Render, RetainAllImageCache, SharedString,
-    Styled, Subscription, Task, Window,
+    deferred, div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
+    RetainAllImageCache, SharedString, Styled, Subscription, Task, Window,
 };
 use gpui_tokio::Tokio;
-use i18n::t;
-use identity::Identity;
+use i18n::{shared_t, t};
 use itertools::Itertools;
 use list_item::RoomListItem;
 use nostr_sdk::prelude::*;
 use registry::room::{Room, RoomKind};
-use registry::{Registry, RegistrySignal};
+use registry::{Registry, RegistryEvent};
 use settings::AppSettings;
 use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
-use ui::button::{Button, ButtonRounded, ButtonVariants};
+use ui::button::{Button, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
-use ui::indicator::Indicator;
 use ui::input::{InputEvent, InputState, TextInput};
-use ui::popup_menu::PopupMenu;
-use ui::skeleton::Skeleton;
-use ui::{v_flex, ContextModal, IconName, Selectable, Sizable, StyledExt};
+use ui::popup_menu::{PopupMenu, PopupMenuExt};
+use ui::{h_flex, v_flex, ContextModal, Icon, IconName, Selectable, Sizable, StyledExt};
+
+use crate::actions::{RelayStatus, Reload};

 mod list_item;

@@ -57,7 +56,7 @@ pub struct Sidebar {
    focus_handle: FocusHandle,
    image_cache: Entity<RetainAllImageCache>,
    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 2]>,
+    subscriptions: SmallVec<[Subscription; 3]>,
 }

 impl Sidebar {
@@ -72,35 +71,41 @@ impl Sidebar {
        let global_result = cx.new(|_| None);
        let cancel_handle = cx.new(|_| None);

-        let find_input = cx.new(|cx| {
-            InputState::new(window, cx).placeholder(t!("sidebar.find_or_start_conversation"))
-        });
+        let find_input =
+            cx.new(|cx| InputState::new(window, cx).placeholder(t!("sidebar.search_label")));

-        let chats = Registry::global(cx);
+        let registry = Registry::global(cx);
        let mut subscriptions = smallvec![];

-        subscriptions.push(cx.subscribe_in(
-            &chats,
-            window,
-            move |this, _chats, event, _window, cx| {
-                if let RegistrySignal::NewRequest(kind) = event {
+        subscriptions.push(
+            // Clear the image cache when sidebar is closed
+            cx.on_release_in(window, move |this, window, cx| {
+                this.image_cache.update(cx, |this, cx| {
+                    this.clear(window, cx);
+                })
+            }),
+        );
+
+        subscriptions.push(
+            // Subscribe for registry new events
+            cx.subscribe_in(&registry, window, move |this, _, event, _window, cx| {
+                if let RegistryEvent::NewRequest(kind) = event {
                    this.indicator.update(cx, |this, cx| {
                        *this = Some(kind.to_owned());
                        cx.notify();
                    });
                }
-            },
-        ));
+            }),
+        );

-        subscriptions.push(cx.subscribe_in(
-            &find_input,
-            window,
-            |this, _state, event, window, cx| {
+        subscriptions.push(
+            // Subscribe for find input events
+            cx.subscribe_in(&find_input, window, |this, state, event, window, cx| {
                match event {
                    InputEvent::PressEnter { .. } => this.search(window, cx),
-                    InputEvent::Change(text) => {
+                    InputEvent::Change => {
                        // Clear the result when input is empty
-                        if text.is_empty() {
+                        if state.read(cx).value().is_empty() {
                            this.clear_search_results(window, cx);
                        } else {
                            // Run debounced search
@@ -114,8 +119,8 @@ impl Sidebar {
                    }
                    _ => {}
                }
-            },
-        ));
+            }),
+        );

        Self {
            name: "Sidebar".into(),
@@ -133,7 +138,8 @@ impl Sidebar {
        }
    }

-    async fn request_metadata(client: &Client, public_key: PublicKey) -> Result<(), Error> {
+    async fn request_metadata(public_key: PublicKey) -> Result<(), Error> {
+        let client = nostr_client();
        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
        let kinds = vec![Kind::Metadata, Kind::ContactList, Kind::RelayList];
        let filter = Filter::new().author(public_key).kinds(kinds).limit(10);
@@ -147,23 +153,21 @@ impl Sidebar {
        Ok(())
    }

-    async fn create_temp_room(identity: PublicKey, public_key: PublicKey) -> Result<Room, Error> {
-        let client = nostr_client();
-        let keys = Keys::generate();
-        let builder = EventBuilder::private_msg_rumor(public_key, "");
-        let event = builder.build(identity).sign(&keys).await?;
-
+    async fn create_temp_room(receiver: PublicKey) -> Result<Room, Error> {
        // Request to get user's metadata
-        Self::request_metadata(client, public_key).await?;
+        Self::request_metadata(receiver).await?;

        // Create a temporary room
-        let room = Room::new(&event).rearrange_by(identity);
+        let room = Room::new(None, vec![receiver]).await?;

        Ok(room)
    }

-    async fn nip50(identity: PublicKey, query: &str) -> BTreeSet<Room> {
+    async fn nip50(query: &str) -> Result<BTreeSet<Room>, Error> {
        let client = nostr_client();
+        let signer = client.signer().await?;
+        let public_key = signer.get_public_key().await?;
+
        let timeout = Duration::from_secs(2);
        let mut rooms: BTreeSet<Room> = BTreeSet::new();

@@ -179,27 +183,24 @@ impl Sidebar {
            // Process to verify the search results
            for event in events.into_iter().unique_by(|event| event.pubkey) {
                // Skip if author is match current user
-                if event.pubkey == identity {
+                if event.pubkey == public_key {
                    continue;
                }

                // Return a temporary room
-                if let Ok(room) = Self::create_temp_room(identity, event.pubkey).await {
+                if let Ok(room) = Self::create_temp_room(event.pubkey).await {
                    rooms.insert(room);
                }
            }
        }

-        rooms
+        Ok(rooms)
    }

    fn debounced_search(&self, window: &mut Window, cx: &mut Context<Self>) -> Task<()> {
        cx.spawn_in(window, async move |this, cx| {
-            cx.update(|window, cx| {
-                this.update(cx, |this, cx| {
-                    this.search(window, cx);
-                })
-                .ok();
+            this.update_in(cx, |this, window, cx| {
+                this.search(window, cx);
            })
            .ok();
        })
@@ -212,21 +213,11 @@ impl Sidebar {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let Some(identity) = Identity::read_global(cx).public_key() else {
-            // User is not logged in. Stop searching
-            self.set_finding(false, window, cx);
-            self.set_cancel_handle(None, cx);
-            return;
-        };
-
        let query = query.to_owned();
        let query_cloned = query.clone();

        let task = smol::future::or(
-            Tokio::spawn(cx, async move {
-                let rooms = Self::nip50(identity, &query).await;
-                Some(rooms)
-            }),
+            Tokio::spawn(cx, async move { Self::nip50(&query).await.ok() }),
            Tokio::spawn(cx, async move {
                let _ = rx.recv().await.is_ok();
                None
@@ -236,18 +227,15 @@ impl Sidebar {
        cx.spawn_in(window, async move |this, cx| {
            match task.await {
                Ok(Some(results)) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            let msg = t!("sidebar.empty", query = query_cloned);
-                            let rooms = results.into_iter().map(|r| cx.new(|_| r)).collect_vec();
+                    this.update_in(cx, |this, window, cx| {
+                        let msg = t!("sidebar.empty", query = query_cloned);
+                        let rooms = results.into_iter().map(|r| cx.new(|_| r)).collect_vec();

-                            if rooms.is_empty() {
-                                window.push_notification(msg, cx);
-                            }
+                        if rooms.is_empty() {
+                            window.push_notification(msg, cx);
+                        }

-                            this.results(rooms, true, window, cx);
-                        })
-                        .ok();
+                        this.results(rooms, true, window, cx);
                    })
                    .ok();
                }
@@ -263,12 +251,10 @@ impl Sidebar {
                }
                // Async task failed
                Err(e) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            window.push_notification(e.to_string(), cx);
-                            this.set_finding(false, window, cx);
-                            this.set_cancel_handle(None, cx);
-                        })
+                    this.update_in(cx, |this, window, cx| {
+                        window.push_notification(e.to_string(), cx);
+                        this.set_finding(false, window, cx);
+                        this.set_cancel_handle(None, cx);
                    })
                    .ok();
                }
@@ -278,18 +264,11 @@ impl Sidebar {
    }

    fn search_by_nip05(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(identity) = Identity::read_global(cx).public_key() else {
-            // User is not logged in. Stop searching
-            self.set_finding(false, window, cx);
-            self.set_cancel_handle(None, cx);
-            return;
-        };
-
        let address = query.to_owned();

        let task = Tokio::spawn(cx, async move {
            if let Ok(profile) = common::nip05::nip05_profile(&address).await {
-                Self::create_temp_room(identity, profile.public_key).await
+                Self::create_temp_room(profile.public_key).await
            } else {
                Err(anyhow!(t!("sidebar.addr_error")))
            }
@@ -338,15 +317,9 @@ impl Sidebar {
            return;
        };

-        let Some(identity) = Identity::read_global(cx).public_key() else {
-            // User is not logged in. Stop searching
-            self.set_finding(false, window, cx);
-            return;
-        };
-
        let task: Task<Result<Room, Error>> = cx.background_spawn(async move {
            // Create a gift wrap event to represent as room
-            Self::create_temp_room(identity, public_key).await
+            Self::create_temp_room(public_key).await
        });

        cx.spawn_in(window, async move |this, cx| {
@@ -547,58 +520,86 @@ impl Sidebar {
        });
    }

-    fn open_loading_modal(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let title = SharedString::new(t!("sidebar.loading_modal_title"));
-        let text_1 = SharedString::new(t!("sidebar.loading_modal_body_1"));
-        let text_2 = SharedString::new(t!("sidebar.loading_modal_body_2"));
-        let desc = SharedString::new(t!("sidebar.loading_modal_description"));
-
-        window.open_modal(cx, move |this, _window, cx| {
-            this.show_close(true)
-                .keyboard(true)
-                .title(title.clone())
-                .child(
-                    v_flex()
-                        .pb_4()
-                        .gap_2()
-                        .child(
-                            div()
-                                .flex()
-                                .flex_col()
-                                .gap_2()
-                                .text_sm()
-                                .child(text_1.clone())
-                                .child(text_2.clone()),
-                        )
-                        .child(
-                            div()
-                                .text_xs()
-                                .text_color(cx.theme().text_muted)
-                                .child(desc.clone()),
-                        ),
-                )
+    fn on_reload(&mut self, _ev: &Reload, window: &mut Window, cx: &mut Context<Self>) {
+        Registry::global(cx).update(cx, |this, cx| {
+            this.load_rooms(window, cx);
        });
+        window.push_notification(t!("common.refreshed"), cx);
    }

-    fn skeletons(&self, total: i32) -> impl IntoIterator<Item = impl IntoElement> {
-        (0..total).map(|_| {
-            div()
-                .h_9()
-                .w_full()
-                .px_1p5()
-                .flex()
-                .items_center()
-                .gap_2()
-                .child(Skeleton::new().flex_shrink_0().size_6().rounded_full())
-                .child(
-                    div()
-                        .flex_1()
-                        .flex()
-                        .justify_between()
-                        .child(Skeleton::new().w_32().h_2p5().rounded_sm())
-                        .child(Skeleton::new().w_6().h_2p5().rounded_sm()),
-                )
+    fn on_manage(&mut self, _ev: &RelayStatus, window: &mut Window, cx: &mut Context<Self>) {
+        let task: Task<Result<Vec<Relay>, Error>> = cx.background_spawn(async move {
+            let client = nostr_client();
+            let app_state = app_state();
+            let subscription = client.subscription(&app_state.gift_wrap_sub_id).await;
+            let mut relays: Vec<Relay> = vec![];
+
+            for (url, _filter) in subscription.into_iter() {
+                relays.push(client.pool().relay(url).await?);
+            }
+
+            Ok(relays)
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            if let Ok(relays) = task.await {
+                this.update_in(cx, |this, window, cx| {
+                    this.manage_relays(relays, window, cx);
+                })
+                .ok();
+            }
        })
+        .detach();
+    }
+
+    fn manage_relays(&mut self, relays: Vec<Relay>, window: &mut Window, cx: &mut Context<Self>) {
+        window.open_modal(cx, move |this, _window, cx| {
+            this.show_close(true)
+                .overlay_closable(true)
+                .keyboard(true)
+                .title(shared_t!("manage_relays.modal"))
+                .child(v_flex().pb_4().gap_2().children({
+                    let mut items = Vec::with_capacity(relays.len());
+
+                    for relay in relays.clone().into_iter() {
+                        let url = relay.url().to_string();
+                        let time = relay.stats().connected_at().to_ago();
+                        let connected = relay.is_connected();
+
+                        items.push(
+                            h_flex()
+                                .h_8()
+                                .px_2()
+                                .justify_between()
+                                .text_xs()
+                                .bg(cx.theme().elevated_surface_background)
+                                .rounded(cx.theme().radius)
+                                .child(
+                                    h_flex()
+                                        .gap_1()
+                                        .font_semibold()
+                                        .child(
+                                            Icon::new(IconName::Signal)
+                                                .small()
+                                                .text_color(cx.theme().danger_active)
+                                                .when(connected, |this| {
+                                                    this.text_color(gpui::green().alpha(0.75))
+                                                }),
+                                        )
+                                        .child(url),
+                                )
+                                .child(
+                                    div()
+                                        .text_right()
+                                        .text_color(cx.theme().text_muted)
+                                        .child(shared_t!("manage_relays.time", t = time)),
+                                ),
+                        );
+                    }
+
+                    items
+                }))
+        });
    }

    fn list_items(
@@ -621,17 +622,17 @@ impl Sidebar {
                });

                items.push(
-                    RoomListItem::new(
-                        ix,
-                        room_id,
-                        this.members[0],
-                        this.display_name(cx),
-                        this.display_image(proxy, cx),
-                        this.ago(),
-                        this.kind,
-                    )
-                    .on_click(handler),
+                    RoomListItem::new(ix)
+                        .room_id(room_id)
+                        .name(this.display_name(cx))
+                        .avatar(this.display_image(proxy, cx))
+                        .created_at(this.created_at.to_ago())
+                        .public_key(this.members[0])
+                        .kind(this.kind)
+                        .on_click(handler),
                )
+            } else {
+                items.push(RoomListItem::new(ix));
            }
        }

@@ -668,6 +669,7 @@ impl Focusable for Sidebar {
 impl Render for Sidebar {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let registry = Registry::read_global(cx);
+        let loading = registry.unwrapping_status.read(cx) != &UnwrappingStatus::Complete;

        // Get rooms from either search results or the chat registry
        let rooms = if let Some(results) = self.local_result.read(cx).as_ref() {
@@ -683,7 +685,17 @@ impl Render for Sidebar {
            }
        };

+        // Get total rooms count
+        let mut total_rooms = rooms.len();
+
+        // Add 3 dummy rooms to display as skeletons
+        if loading {
+            total_rooms += 3
+        }
+
        v_flex()
+            .on_action(cx.listener(Self::on_reload))
+            .on_action(cx.listener(Self::on_manage))
            .image_cache(self.image_cache.clone())
            .size_full()
            .relative()
@@ -703,10 +715,11 @@ impl Render for Sidebar {
                            .small()
                            .cleanable()
                            .appearance(true)
+                            .text_xs()
                            .suffix(
                                Button::new("find")
                                    .icon(IconName::Search)
-                                    .tooltip(t!("sidebar.press_enter_to_search"))
+                                    .tooltip(t!("sidebar.search_tooltip"))
                                    .transparent()
                                    .small(),
                            ),
@@ -722,86 +735,133 @@ impl Render for Sidebar {
                    .overflow_y_hidden()
                    .child(
                        div()
-                            .flex_none()
                            .px_1()
-                            .w_full()
-                            .h_9()
-                            .flex()
-                            .items_center()
-                            .justify_between()
+                            .h_flex()
+                            .gap_2()
+                            .flex_none()
                            .child(
-                                div()
-                                    .flex()
+                                Button::new("all")
+                                    .label(t!("sidebar.all_button"))
+                                    .tooltip(t!("sidebar.all_conversations_tooltip"))
+                                    .when_some(self.indicator.read(cx).as_ref(), |this, kind| {
+                                        this.when(kind == &RoomKind::Ongoing, |this| {
+                                            this.child(deferred(
+                                                div().size_1().rounded_full().bg(cx.theme().cursor),
+                                            ))
+                                        })
+                                    })
+                                    .small()
+                                    .cta()
+                                    .bold()
+                                    .secondary()
+                                    .rounded()
+                                    .selected(self.filter(&RoomKind::Ongoing, cx))
+                                    .on_click(cx.listener(|this, _, _, cx| {
+                                        this.set_filter(RoomKind::Ongoing, cx);
+                                    })),
+                            )
+                            .child(
+                                Button::new("requests")
+                                    .label(t!("sidebar.requests_button"))
+                                    .tooltip(t!("sidebar.requests_tooltip"))
+                                    .when_some(self.indicator.read(cx).as_ref(), |this, kind| {
+                                        this.when(kind != &RoomKind::Ongoing, |this| {
+                                            this.child(deferred(
+                                                div().size_1().rounded_full().bg(cx.theme().cursor),
+                                            ))
+                                        })
+                                    })
+                                    .small()
+                                    .cta()
+                                    .bold()
+                                    .secondary()
+                                    .rounded()
+                                    .selected(!self.filter(&RoomKind::Ongoing, cx))
+                                    .on_click(cx.listener(|this, _, _, cx| {
+                                        this.set_filter(RoomKind::default(), cx);
+                                    })),
+                            )
+                            .child(
+                                h_flex()
+                                    .flex_1()
+                                    .w_full()
+                                    .justify_end()
                                    .items_center()
-                                    .gap_2()
+                                    .text_xs()
                                    .child(
-                                        Button::new("all")
-                                            .label(t!("sidebar.all_button"))
-                                            .tooltip(t!("sidebar.all_conversations_tooltip"))
-                                            .when_some(
-                                                self.indicator.read(cx).as_ref(),
-                                                |this, kind| {
-                                                    this.when(kind == &RoomKind::Ongoing, |this| {
-                                                        this.child(
-                                                            div()
-                                                                .size_1()
-                                                                .rounded_full()
-                                                                .bg(cx.theme().cursor),
-                                                        )
-                                                    })
-                                                },
-                                            )
-                                            .small()
-                                            .bold()
-                                            .secondary()
-                                            .rounded(ButtonRounded::Full)
-                                            .selected(self.filter(&RoomKind::Ongoing, cx))
-                                            .on_click(cx.listener(|this, _, _, cx| {
-                                                this.set_filter(RoomKind::Ongoing, cx);
-                                            })),
-                                    )
-                                    .child(
-                                        Button::new("requests")
-                                            .label(t!("sidebar.requests_button"))
-                                            .tooltip(t!("sidebar.requests_tooltip"))
-                                            .when_some(
-                                                self.indicator.read(cx).as_ref(),
-                                                |this, kind| {
-                                                    this.when(kind != &RoomKind::Ongoing, |this| {
-                                                        this.child(
-                                                            div()
-                                                                .size_1()
-                                                                .rounded_full()
-                                                                .bg(cx.theme().cursor),
-                                                        )
-                                                    })
-                                                },
-                                            )
-                                            .small()
-                                            .bold()
-                                            .secondary()
-                                            .rounded(ButtonRounded::Full)
-                                            .selected(!self.filter(&RoomKind::Ongoing, cx))
-                                            .on_click(cx.listener(|this, _, _, cx| {
-                                                this.set_filter(RoomKind::default(), cx);
-                                            })),
+                                        Button::new("option")
+                                            .icon(IconName::Ellipsis)
+                                            .xsmall()
+                                            .ghost()
+                                            .rounded()
+                                            .popup_menu(move |this, _window, _cx| {
+                                                this.menu(
+                                                    t!("sidebar.reload_menu"),
+                                                    Box::new(Reload),
+                                                )
+                                                .menu(
+                                                    t!("sidebar.status_menu"),
+                                                    Box::new(RelayStatus),
+                                                )
+                                            }),
                                    ),
                            ),
                    )
-                    .when(registry.loading, |this| {
-                        this.child(
-                            div()
-                                .flex_1()
-                                .flex()
-                                .flex_col()
-                                .gap_1()
-                                .children(self.skeletons(1)),
-                        )
+                    .when(!loading && total_rooms == 0, |this| {
+                        this.map(|this| {
+                            if self.filter(&RoomKind::Ongoing, cx) {
+                                this.child(deferred(
+                                    v_flex()
+                                        .py_2()
+                                        .gap_1p5()
+                                        .items_center()
+                                        .justify_center()
+                                        .text_center()
+                                        .child(
+                                            div()
+                                                .text_sm()
+                                                .font_semibold()
+                                                .line_height(relative(1.25))
+                                                .child(shared_t!("sidebar.no_conversations")),
+                                        )
+                                        .child(
+                                            div()
+                                                .text_xs()
+                                                .text_color(cx.theme().text_muted)
+                                                .line_height(relative(1.25))
+                                                .child(shared_t!("sidebar.no_conversations_label")),
+                                        ),
+                                ))
+                            } else {
+                                this.child(deferred(
+                                    v_flex()
+                                        .py_2()
+                                        .gap_1p5()
+                                        .items_center()
+                                        .justify_center()
+                                        .text_center()
+                                        .child(
+                                            div()
+                                                .text_sm()
+                                                .font_semibold()
+                                                .line_height(relative(1.25))
+                                                .child(shared_t!("sidebar.no_requests")),
+                                        )
+                                        .child(
+                                            div()
+                                                .text_xs()
+                                                .text_color(cx.theme().text_muted)
+                                                .line_height(relative(1.25))
+                                                .child(shared_t!("sidebar.no_requests_label")),
+                                        ),
+                                ))
+                            }
+                        })
                    })
                    .child(
                        uniform_list(
                            "rooms",
-                            rooms.len(),
+                            total_rooms,
                            cx.processor(move |this, range, _window, cx| {
                                this.list_items(&rooms, range, cx)
                            }),
@@ -809,59 +869,5 @@ impl Render for Sidebar {
                        .h_full(),
                    ),
            )
-            .when(registry.loading, |this| {
-                let title = SharedString::new(t!("sidebar.retrieving_messages"));
-                let desc = SharedString::new(t!("sidebar.retrieving_messages_description"));
-
-                this.child(
-                    div().absolute().bottom_3().px_3().w_full().child(
-                        div()
-                            .p_1()
-                            .w_full()
-                            .rounded_full()
-                            .flex()
-                            .items_center()
-                            .justify_between()
-                            .bg(cx.theme().panel_background)
-                            .shadow_sm()
-                            // Loading
-                            .child(div().flex_shrink_0().pl_1().child(Indicator::new().small()))
-                            // Title
-                            .child(
-                                v_flex()
-                                    .flex_1()
-                                    .items_center()
-                                    .justify_center()
-                                    .text_center()
-                                    .child(
-                                        div()
-                                            .text_sm()
-                                            .font_semibold()
-                                            .line_height(relative(1.2))
-                                            .child(title.clone()),
-                                    )
-                                    .child(
-                                        div()
-                                            .text_xs()
-                                            .text_color(cx.theme().text_muted)
-                                            .child(desc.clone()),
-                                    ),
-                            )
-                            // Info button
-                            .child(
-                                Button::new("help")
-                                    .icon(IconName::Info)
-                                    .tooltip(t!("sidebar.why_seeing_this_tooltip"))
-                                    .small()
-                                    .ghost()
-                                    .rounded(ButtonRounded::Full)
-                                    .flex_shrink_0()
-                                    .on_click(cx.listener(move |this, _, window, cx| {
-                                        this.open_loading_modal(window, cx)
-                                    })),
-                            ),
-                    ),
-                )
-            })
    }
 }
--- a/crates/coop/src/views/startup.rs
+++ b/crates/coop/src/views/startup.rs
@@ -1,131 +0,0 @@
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    IntoElement, ParentElement, Render, SharedString, Styled, Window,
-};
-use i18n::t;
-use identity::Identity;
-use theme::ActiveTheme;
-use ui::button::{Button, ButtonVariants};
-use ui::dock_area::panel::{Panel, PanelEvent};
-use ui::indicator::Indicator;
-use ui::popup_menu::PopupMenu;
-use ui::{Sizable, StyledExt};
-
-pub fn init(window: &mut Window, cx: &mut App) -> Entity<Startup> {
-    Startup::new(window, cx)
-}
-
-pub struct Startup {
-    name: SharedString,
-    focus_handle: FocusHandle,
-}
-
-impl Startup {
-    fn new(_window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| Self {
-            name: "Startup".into(),
-            focus_handle: cx.focus_handle(),
-        })
-    }
-}
-
-impl Panel for Startup {
-    fn panel_id(&self) -> SharedString {
-        self.name.clone()
-    }
-
-    fn title(&self, _cx: &App) -> AnyElement {
-        self.name.clone().into_any_element()
-    }
-
-    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
-        menu.track_focus(&self.focus_handle)
-    }
-
-    fn toolbar_buttons(&self, _window: &Window, _cx: &App) -> Vec<Button> {
-        vec![]
-    }
-}
-
-impl EventEmitter<PanelEvent> for Startup {}
-
-impl Focusable for Startup {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Startup {
-    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let identity = Identity::global(cx);
-        let logging_in = identity.read(cx).logging_in();
-
-        div()
-            .relative()
-            .size_full()
-            .flex()
-            .items_center()
-            .justify_center()
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .items_center()
-                    .justify_center()
-                    .text_center()
-                    .gap_6()
-                    .child(
-                        svg()
-                            .path("brand/coop.svg")
-                            .size_12()
-                            .text_color(cx.theme().elevated_surface_background),
-                    )
-                    .child(
-                        div()
-                            .w_24()
-                            .flex()
-                            .items_center()
-                            .justify_center()
-                            .gap_2()
-                            .when(logging_in, |this| {
-                                this.child(
-                                    div().text_sm().text_color(cx.theme().text).child(
-                                        SharedString::new(t!("startup.auto_login_in_progress")),
-                                    ),
-                                )
-                            })
-                            .child(Indicator::new().small()),
-                    ),
-            )
-            .child(
-                div().absolute().bottom_3().right_3().child(
-                    div()
-                        .flex()
-                        .items_center()
-                        .justify_end()
-                        .gap_1p5()
-                        .child(
-                            div()
-                                .text_xs()
-                                .font_semibold()
-                                .text_color(cx.theme().text_muted)
-                                .child(SharedString::new(t!("startup.stuck"))),
-                        )
-                        .child(
-                            Button::new("reset")
-                                .label(SharedString::new(t!("startup.reset")))
-                                .small()
-                                .ghost()
-                                .on_click(|_, window, cx| {
-                                    Identity::global(cx).update(cx, |this, cx| {
-                                        this.unload(window, cx);
-                                        // Restart application
-                                        cx.restart(None);
-                                    });
-                                }),
-                        ),
-                ),
-            )
-    }
-}
--- a/crates/coop/src/views/user_profile.rs
+++ b/crates/coop/src/views/user_profile.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;

-use common::display::DisplayProfile;
+use common::display::RenderedProfile;
 use common::nip05::nip05_verify;
 use global::nostr_client;
 use gpui::prelude::FluentBuilder;
@@ -9,99 +9,92 @@ use gpui::{
    ParentElement, Render, SharedString, Styled, Task, Window,
 };
 use gpui_tokio::Tokio;
-use i18n::t;
-use identity::Identity;
+use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
 use registry::Registry;
 use settings::AppSettings;
+use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
-use ui::{h_flex, v_flex, Disableable, Icon, IconName, Sizable, StyledExt};
+use ui::{h_flex, v_flex, Icon, IconName, Sizable, StyledExt};

 pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<UserProfile> {
-    UserProfile::new(public_key, window, cx)
+    cx.new(|cx| UserProfile::new(public_key, window, cx))
 }

 pub struct UserProfile {
-    public_key: PublicKey,
+    profile: Profile,
    followed: bool,
    verified: bool,
    copied: bool,
+    _tasks: SmallVec<[Task<()>; 1]>,
 }

 impl UserProfile {
-    pub fn new(public_key: PublicKey, _window: &mut Window, cx: &mut App) -> Entity<Self> {
-        cx.new(|_| Self {
-            public_key,
-            followed: false,
-            verified: false,
-            copied: false,
-        })
-    }
+    pub fn new(target: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let registry = Registry::read_global(cx);
+        let profile = registry.get_person(&target, cx);

-    pub fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // Skip if user isn't logged in
-        let Some(identity) = Identity::read_global(cx).public_key() else {
-            return;
-        };
+        let mut tasks = smallvec![];

-        let public_key = self.public_key;
-
-        let check_follow: Task<bool> = cx.background_spawn(async move {
+        let check_follow: Task<Result<bool, Error>> = cx.background_spawn(async move {
            let client = nostr_client();
-            let filter = Filter::new()
-                .kind(Kind::ContactList)
-                .author(identity)
-                .pubkey(public_key)
-                .limit(1);
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+            let contact_list = client.database().contacts_public_keys(public_key).await?;

-            client.database().count(filter).await.unwrap_or(0) >= 1
+            Ok(contact_list.contains(&target))
        });

-        let verify_nip05 = if let Some(address) = self.address(cx) {
+        let verify_nip05 = if let Some(address) = profile.metadata().nip05 {
            Some(Tokio::spawn(cx, async move {
-                nip05_verify(public_key, &address).await.unwrap_or(false)
+                nip05_verify(target, &address).await.unwrap_or(false)
            }))
        } else {
            None
        };

-        cx.spawn_in(window, async move |this, cx| {
-            let followed = check_follow.await;
+        tasks.push(
+            // Load user profile data
+            cx.spawn_in(window, async move |this, cx| {
+                let followed = check_follow.await.unwrap_or(false);

-            // Update the followed status
-            this.update(cx, |this, cx| {
-                this.followed = followed;
-                cx.notify();
-            })
-            .ok();
+                // Update the followed status
+                this.update(cx, |this, cx| {
+                    this.followed = followed;
+                    cx.notify();
+                })
+                .ok();

-            // Update the NIP05 verification status if user has NIP05 address
-            if let Some(task) = verify_nip05 {
-                if let Ok(verified) = task.await {
-                    this.update(cx, |this, cx| {
-                        this.verified = verified;
-                        cx.notify();
-                    })
-                    .ok();
+                // Update the NIP05 verification status if user has NIP05 address
+                if let Some(task) = verify_nip05 {
+                    if let Ok(verified) = task.await {
+                        this.update(cx, |this, cx| {
+                            this.verified = verified;
+                            cx.notify();
+                        })
+                        .ok();
+                    }
                }
-            }
-        })
-        .detach();
+            }),
+        );
+
+        Self {
+            profile,
+            followed: false,
+            verified: false,
+            copied: false,
+            _tasks: tasks,
+        }
    }

-    fn profile(&self, cx: &Context<Self>) -> Profile {
-        let registry = Registry::read_global(cx);
-        registry.get_person(&self.public_key, cx)
-    }
-
-    fn address(&self, cx: &Context<Self>) -> Option<String> {
-        self.profile(cx).metadata().nip05
+    fn address(&self, _cx: &Context<Self>) -> Option<String> {
+        self.profile.metadata().nip05
    }

    fn copy_pubkey(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Ok(bech32) = self.public_key.to_bech32();
+        let Ok(bech32) = self.profile.public_key().to_bech32();
        let item = ClipboardItem::new_string(bech32);
        cx.write_to_clipboard(item);

@@ -132,27 +125,26 @@ impl UserProfile {
 impl Render for UserProfile {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let proxy = AppSettings::get_proxy_user_avatars(cx);
-        let profile = self.profile(cx);
-
-        let Ok(bech32) = profile.public_key().to_bech32();
-        let shared_bech32 = SharedString::new(bech32);
+        let bech32 = self.profile.public_key().to_bech32().unwrap();
+        let shared_bech32 = SharedString::from(bech32);

        v_flex()
            .gap_4()
+            .text_sm()
            .child(
                v_flex()
                    .gap_3()
                    .items_center()
                    .justify_center()
                    .text_center()
-                    .child(Avatar::new(profile.avatar_url(proxy)).size(rems(4.)))
+                    .child(Avatar::new(self.profile.avatar(proxy)).size(rems(4.)))
                    .child(
                        v_flex()
                            .child(
                                div()
                                    .font_semibold()
                                    .line_height(relative(1.25))
-                                    .child(profile.display_name()),
+                                    .child(self.profile.display_name()),
                            )
                            .when_some(self.address(cx), |this, address| {
                                this.child(
@@ -187,19 +179,17 @@ impl Render for UserProfile {
                                .bg(cx.theme().elevated_surface_background)
                                .text_xs()
                                .font_semibold()
-                                .child(SharedString::new(t!("profile.unknown"))),
+                                .child(shared_t!("profile.unknown")),
                        )
                    }),
            )
            .child(
                v_flex()
                    .gap_1()
-                    .text_sm()
                    .child(
                        div()
-                            .block()
                            .text_color(cx.theme().text_muted)
-                            .child("Public Key:"),
+                            .child(SharedString::from("Public Key:")),
                    )
                    .child(
                        h_flex()
@@ -207,12 +197,13 @@ impl Render for UserProfile {
                            .child(
                                div()
                                    .p_2()
-                                    .h_9()
+                                    .h_7()
                                    .rounded_md()
                                    .bg(cx.theme().elevated_surface_background)
                                    .truncate()
                                    .text_ellipsis()
                                    .line_clamp(1)
+                                    .line_height(relative(1.))
                                    .child(shared_bech32),
                            )
                            .child(
@@ -224,8 +215,8 @@ impl Render for UserProfile {
                                            IconName::Copy
                                        }
                                    })
-                                    .ghost()
-                                    .disabled(self.copied)
+                                    .cta()
+                                    .ghost_alt()
                                    .on_click(cx.listener(move |this, _e, window, cx| {
                                        this.copy_pubkey(window, cx);
                                    })),
@@ -235,11 +226,10 @@ impl Render for UserProfile {
            .child(
                v_flex()
                    .gap_1()
-                    .text_sm()
                    .child(
                        div()
                            .text_color(cx.theme().text_muted)
-                            .child(SharedString::new(t!("profile.label_bio"))),
+                            .child(shared_t!("profile.label_bio")),
                    )
                    .child(
                        div()
@@ -247,10 +237,11 @@ impl Render for UserProfile {
                            .rounded_md()
                            .bg(cx.theme().elevated_surface_background)
                            .child(
-                                profile
+                                self.profile
                                    .metadata()
                                    .about
-                                    .unwrap_or(t!("profile.no_bio").to_string()),
+                                    .map(SharedString::from)
+                                    .unwrap_or(shared_t!("profile.no_bio")),
                            ),
                    ),
            )
--- a/crates/coop/src/views/welcome.rs
+++ b/crates/coop/src/views/welcome.rs
@@ -1,12 +1,13 @@
 use gpui::{
    div, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    IntoElement, ParentElement, Render, SharedString, Styled, Window,
+    InteractiveElement, IntoElement, ParentElement, Render, SharedString,
+    StatefulInteractiveElement, Styled, Window,
 };
 use theme::ActiveTheme;
 use ui::button::Button;
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::popup_menu::PopupMenu;
-use ui::StyledExt;
+use ui::{v_flex, StyledExt};

 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Welcome> {
    Welcome::new(window, cx)
@@ -14,8 +15,7 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<Welcome> {

 pub struct Welcome {
    name: SharedString,
-    closable: bool,
-    zoomable: bool,
+    version: SharedString,
    focus_handle: FocusHandle,
 }

@@ -25,10 +25,11 @@ impl Welcome {
    }

    fn view(_window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let version = SharedString::from(format!("Version: {}", env!("CARGO_PKG_VERSION")));
+
        Self {
+            version,
            name: "Welcome".into(),
-            closable: true,
-            zoomable: true,
            focus_handle: cx.focus_handle(),
        }
    }
@@ -39,16 +40,15 @@ impl Panel for Welcome {
        self.name.clone()
    }

-    fn title(&self, _cx: &App) -> AnyElement {
-        "👋".into_any_element()
-    }
-
-    fn closable(&self, _cx: &App) -> bool {
-        self.closable
-    }
-
-    fn zoomable(&self, _cx: &App) -> bool {
-        self.zoomable
+    fn title(&self, cx: &App) -> AnyElement {
+        div()
+            .child(
+                svg()
+                    .path("brand/coop.svg")
+                    .size_4()
+                    .text_color(cx.theme().element_background),
+            )
+            .into_any_element()
    }

    fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
@@ -76,11 +76,10 @@ impl Render for Welcome {
            .items_center()
            .justify_center()
            .child(
-                div()
-                    .flex()
-                    .flex_col()
+                v_flex()
+                    .gap_2()
                    .items_center()
-                    .gap_1()
+                    .justify_center()
                    .child(
                        svg()
                            .path("brand/coop.svg")
@@ -88,11 +87,26 @@ impl Render for Welcome {
                            .text_color(cx.theme().elevated_surface_background),
                    )
                    .child(
-                        div()
-                            .child("coop on nostr")
-                            .text_color(cx.theme().text_placeholder)
-                            .font_semibold()
-                            .text_sm(),
+                        v_flex()
+                            .items_center()
+                            .justify_center()
+                            .text_center()
+                            .child(
+                                div()
+                                    .font_semibold()
+                                    .text_color(cx.theme().text_muted)
+                                    .child(SharedString::from("coop on nostr")),
+                            )
+                            .child(
+                                div()
+                                    .id("version")
+                                    .text_color(cx.theme().text_placeholder)
+                                    .text_xs()
+                                    .child(self.version.clone())
+                                    .on_click(|_, _window, cx| {
+                                        cx.open_url("https://github.com/lumehq/coop/releases");
+                                    }),
+                            ),
                    ),
            )
    }
--- a/crates/global/Cargo.toml
+++ b/crates/global/Cargo.toml
@@ -5,11 +5,10 @@ edition.workspace = true
 publish.workspace = true

 [dependencies]
-nostr-connect.workspace = true
 nostr-sdk.workspace = true
 dirs.workspace = true
 smol.workspace = true
-futures.workspace = true
+flume.workspace = true
 log.workspace = true
 anyhow.workspace = true

--- a/crates/global/src/constants.rs
+++ b/crates/global/src/constants.rs
@@ -4,20 +4,20 @@ pub const APP_PUBKEY: &str = "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZX
 pub const APP_UPDATER_ENDPOINT: &str = "https://coop-updater.reya.su/";
 pub const KEYRING_URL: &str = "Coop Safe Storage";

-pub const ACCOUNT_D: &str = "coop:account";
-pub const SETTINGS_D: &str = "coop:settings";
+pub const ACCOUNT_IDENTIFIER: &str = "coop:user";
+pub const SETTINGS_IDENTIFIER: &str = "coop:settings";

 /// Bootstrap Relays.
 pub const BOOTSTRAP_RELAYS: [&str; 5] = [
    "wss://relay.damus.io",
    "wss://relay.primal.net",
-    "wss://nostr.Wine",
+    "wss://relay.nos.social",
    "wss://user.kindpag.es",
    "wss://purplepag.es",
 ];

 /// Search Relays.
-pub const SEARCH_RELAYS: [&str; 2] = ["wss://search.nos.today", "wss://relay.nostr.band"];
+pub const SEARCH_RELAYS: [&str; 1] = ["wss://relay.nostr.band"];

 /// NIP65 Relays. Used for new account
 pub const NIP65_RELAYS: [&str; 4] = [
@@ -28,31 +28,31 @@ pub const NIP65_RELAYS: [&str; 4] = [
 ];

 /// Messaging Relays. Used for new account
-pub const NIP17_RELAYS: [&str; 2] = ["wss://nip17.com", "wss://relay.0xchat.com"];
+pub const NIP17_RELAYS: [&str; 2] = ["wss://nip17.com", "wss://auth.nostr1.com"];

 /// Default relay for Nostr Connect
 pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nsec.app";

+/// Default retry count for fetching NIP-17 relays
+pub const RELAY_RETRY: u64 = 2;
+
+/// Default retry count for sending messages
+pub const SEND_RETRY: u64 = 10;
+
 /// Default timeout (in seconds) for Nostr Connect
 pub const NOSTR_CONNECT_TIMEOUT: u64 = 200;

-/// Unique ID for all gift wraps subscription.
-pub const GIFT_WRAP_SUB_ID: &str = "listen_for_giftwraps";
+/// Default timeout (in seconds) for Nostr Connect (Bunker)
+pub const BUNKER_TIMEOUT: u64 = 30;

 /// Total metadata requests will be grouped.
 pub const METADATA_BATCH_LIMIT: usize = 100;

-/// Maximum timeout for grouping metadata requests.
-pub const METADATA_BATCH_TIMEOUT: u64 = 400;
-
-/// Maximum timeout for waiting for finish (seconds)
-pub const WAIT_FOR_FINISH: u64 = 60;
-
-/// Default width for all modals.
-pub const DEFAULT_MODAL_WIDTH: f32 = 420.;
+/// Maximum timeout for grouping metadata requests. (milliseconds)
+pub const METADATA_BATCH_TIMEOUT: u64 = 300;

 /// Default width of the sidebar.
-pub const DEFAULT_SIDEBAR_WIDTH: f32 = 280.;
+pub const DEFAULT_SIDEBAR_WIDTH: f32 = 240.;

 /// Image Resize Service
 pub const IMAGE_RESIZE_SERVICE: &str = "https://wsrv.nl";
--- a/crates/global/src/lib.rs
+++ b/crates/global/src/lib.rs
@@ -1,42 +1,223 @@
+use std::collections::{HashMap, HashSet};
+use std::sync::atomic::AtomicBool;
 use std::sync::OnceLock;
 use std::time::Duration;

-use nostr_connect::prelude::*;
+use flume::{Receiver, Sender};
 use nostr_sdk::prelude::*;
 use paths::nostr_file;
+use smol::lock::RwLock;

-use crate::constants::GIFT_WRAP_SUB_ID;
 use crate::paths::support_dir;

 pub mod constants;
 pub mod paths;

-/// Signals sent through the global event channel to notify UI components
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AuthRequest {
+    pub url: RelayUrl,
+    pub challenge: String,
+    pub sending: bool,
+}
+
+impl AuthRequest {
+    pub fn new(challenge: impl Into<String>, url: RelayUrl) -> Self {
+        Self {
+            challenge: challenge.into(),
+            sending: false,
+            url,
+        }
+    }
+}
+
 #[derive(Debug, Clone)]
-pub enum NostrSignal {
-    /// Received a new metadata event from Relay Pool
-    Metadata(Event),
+pub enum Notice {
+    RelayFailed(RelayUrl),
+    AuthFailed(RelayUrl),
+    Custom(String),
+}

-    /// Received a new gift wrap event from Relay Pool
-    GiftWrap(Event),
+impl Notice {
+    pub fn as_str(&self) -> String {
+        match self {
+            Notice::AuthFailed(url) => format!("Authenticate failed for relay {url}"),
+            Notice::RelayFailed(url) => format!("Failed to connect the relay {url}"),
+            Notice::Custom(msg) => msg.into(),
+        }
+    }
+}

-    /// Finished processing all gift wrap events
-    Finish,
+#[derive(Debug, Clone, Default, PartialEq, Eq, PartialOrd, Ord)]
+pub enum UnwrappingStatus {
+    #[default]
+    Initialized,
+    Processing,
+    Complete,
+}

-    /// Partially finished processing all gift wrap events
-    PartialFinish,
+/// Signals sent through the global event channel to notify UI
+#[derive(Debug)]
+pub enum SignalKind {
+    /// A signal to notify UI that the client's signer has been set
+    SignerSet(PublicKey),

-    /// Receives EOSE response from relay pool
-    Eose(SubscriptionId),
+    /// A signal to notify UI that the client's signer has been unset
+    SignerUnset,

-    /// Notice from Relay Pool
-    Notice(String),
+    /// A signal to notify UI that the relay requires authentication
+    Auth(AuthRequest),
+
+    /// A signal to notify UI that the browser proxy service is down
+    ProxyDown,
+
+    /// A signal to notify UI that a new profile has been received
+    NewProfile(Profile),
+
+    /// A signal to notify UI that a new gift wrap event has been received
+    NewMessage((EventId, Event)),
+
+    /// A signal to notify UI that no DM relays for current user was found
+    RelaysNotFound,
+
+    /// A signal to notify UI that gift wrap status has changed
+    GiftWrapStatus(UnwrappingStatus),
+
+    /// A signal to notify UI that there are errors or notices occurred
+    Notice(Notice),
+}
+
+#[derive(Debug)]
+pub struct Signal {
+    rx: Receiver<SignalKind>,
+    tx: Sender<SignalKind>,
+}
+
+impl Default for Signal {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Signal {
+    pub fn new() -> Self {
+        let (tx, rx) = flume::bounded::<SignalKind>(2048);
+        Self { rx, tx }
+    }
+
+    pub fn receiver(&self) -> &Receiver<SignalKind> {
+        &self.rx
+    }
+
+    pub async fn send(&self, kind: SignalKind) {
+        if let Err(e) = self.tx.send_async(kind).await {
+            log::error!("Failed to send signal: {e}");
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Ingester {
+    rx: Receiver<PublicKey>,
+    tx: Sender<PublicKey>,
+}
+
+impl Default for Ingester {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Ingester {
+    pub fn new() -> Self {
+        let (tx, rx) = flume::bounded::<PublicKey>(1024);
+        Self { rx, tx }
+    }
+
+    pub fn receiver(&self) -> &Receiver<PublicKey> {
+        &self.rx
+    }
+
+    pub async fn send(&self, public_key: PublicKey) {
+        if let Err(e) = self.tx.send_async(public_key).await {
+            log::error!("Failed to send public key: {e}");
+        }
+    }
+}
+
+/// A simple storage to store all states that using across the application.
+#[derive(Debug)]
+pub struct AppState {
+    /// The timestamp when the application was initialized.
+    pub init_at: Timestamp,
+
+    /// The timestamp when the application was last used.
+    pub last_used_at: Option<Timestamp>,
+
+    /// Whether this is the first run of the application.
+    pub is_first_run: AtomicBool,
+
+    /// Subscription ID for listening to gift wrap events from relays.
+    pub gift_wrap_sub_id: SubscriptionId,
+
+    /// Auto-close options for relay subscriptions
+    pub auto_close_opts: Option<SubscribeAutoCloseOptions>,
+
+    /// Whether gift wrap processing is in progress.
+    pub gift_wrap_processing: AtomicBool,
+
+    /// Tracking events sent by Coop in the current session
+    pub sent_ids: RwLock<HashSet<EventId>>,
+
+    /// Tracking events seen on which relays in the current session
+    pub seen_on_relays: RwLock<HashMap<EventId, HashSet<RelayUrl>>>,
+
+    /// Tracking events that have been resent by Coop in the current session
+    pub resent_ids: RwLock<Vec<Output<EventId>>>,
+
+    /// Temporarily store events that need to be resent later
+    pub resend_queue: RwLock<HashMap<EventId, RelayUrl>>,
+
+    /// Signal channel for communication between Nostr and GPUI
+    pub signal: Signal,
+
+    /// Ingester channel for processing public keys
+    pub ingester: Ingester,
+}
+
+impl Default for AppState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl AppState {
+    pub fn new() -> Self {
+        let init_at = Timestamp::now();
+        let first_run = first_run();
+        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+
+        let signal = Signal::default();
+        let ingester = Ingester::default();
+
+        Self {
+            init_at,
+            signal,
+            ingester,
+            last_used_at: None,
+            is_first_run: AtomicBool::new(first_run),
+            gift_wrap_sub_id: SubscriptionId::new("inbox"),
+            gift_wrap_processing: AtomicBool::new(false),
+            auto_close_opts: Some(opts),
+            sent_ids: RwLock::new(HashSet::new()),
+            seen_on_relays: RwLock::new(HashMap::new()),
+            resent_ids: RwLock::new(Vec::new()),
+            resend_queue: RwLock::new(HashMap::new()),
+        }
+    }
 }

 static NOSTR_CLIENT: OnceLock<Client> = OnceLock::new();
-static GIFT_WRAP_ID: OnceLock<SubscriptionId> = OnceLock::new();
-static CURRENT_TIMESTAMP: OnceLock<Timestamp> = OnceLock::new();
-static FIRST_RUN: OnceLock<bool> = OnceLock::new();
+static APP_STATE: OnceLock<AppState> = OnceLock::new();

 pub fn nostr_client() -> &'static Client {
    NOSTR_CLIENT.get_or_init(|| {
@@ -50,39 +231,30 @@ pub fn nostr_client() -> &'static Client {
        let lmdb = NostrLMDB::open(nostr_file()).expect("Database is NOT initialized");

        let opts = ClientOptions::new()
-            // Coop isn't social client,
-            // but it needs this option because it needs user's NIP65 Relays to fetch NIP17 Relays.
            .gossip(true)
-            // TODO: Coop should handle authentication by itself
-            .automatic_authentication(true)
-            // Sleep after idle for 5 seconds
+            .automatic_authentication(false)
+            .verify_subscriptions(false)
            .sleep_when_idle(SleepWhenIdle::Enabled {
-                timeout: Duration::from_secs(10),
+                timeout: Duration::from_secs(600),
            });

        ClientBuilder::default().database(lmdb).opts(opts).build()
    })
 }

-pub fn gift_wrap_sub_id() -> &'static SubscriptionId {
-    GIFT_WRAP_ID.get_or_init(|| SubscriptionId::new(GIFT_WRAP_SUB_ID))
+pub fn app_state() -> &'static AppState {
+    APP_STATE.get_or_init(AppState::new)
 }

-pub fn starting_time() -> &'static Timestamp {
-    CURRENT_TIMESTAMP.get_or_init(Timestamp::now)
-}
+fn first_run() -> bool {
+    let flag = support_dir().join(format!(".{}-first_run", env!("CARGO_PKG_VERSION")));

-pub fn first_run() -> &'static bool {
-    FIRST_RUN.get_or_init(|| {
-        let flag = support_dir().join(format!(".{}-first_run", env!("CARGO_PKG_VERSION")));
-
-        if !flag.exists() {
-            if std::fs::write(&flag, "").is_err() {
-                return false;
-            }
-            true // First run
-        } else {
-            false // Not first run
+    if !flag.exists() {
+        if std::fs::write(&flag, "").is_err() {
+            return false;
        }
-    })
+        true // First run
+    } else {
+        false // Not first run
+    }
 }
--- a/crates/i18n/src/lib.rs
+++ b/crates/i18n/src/lib.rs
@@ -29,10 +29,10 @@ macro_rules! init {
 #[macro_export]
 macro_rules! shared_t {
    ($key:expr) => {
-        SharedString::new(t!($key))
+        SharedString::from(t!($key))
    };
    ($key:expr, $($param:ident = $value:expr),+) => {
-        SharedString::new(t!($key, $($param = $value),+))
+        SharedString::from(t!($key, $($param = $value),+))
    };
 }

--- a/crates/identity/Cargo.toml
+++ b/crates/identity/Cargo.toml
@@ -1,20 +0,0 @@
-[package]
-name = "identity"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-ui = { path = "../ui" }
-global = { path = "../global" }
-common = { path = "../common" }
-client_keys = { path = "../client_keys" }
-settings = { path = "../settings" }
-
-nostr-sdk.workspace = true
-nostr-connect.workspace = true
-oneshot.workspace = true
-gpui.workspace = true
-anyhow.workspace = true
-log.workspace = true
-smallvec.workspace = true
--- a/crates/identity/src/lib.rs
+++ b/crates/identity/src/lib.rs
@@ -1,666 +0,0 @@
-use std::time::Duration;
-
-use anyhow::{anyhow, Error};
-use client_keys::ClientKeys;
-use common::handle_auth::CoopAuthUrlHandler;
-use global::constants::{ACCOUNT_D, NIP17_RELAYS, NIP65_RELAYS, NOSTR_CONNECT_TIMEOUT};
-use global::{gift_wrap_sub_id, nostr_client};
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    div, red, App, AppContext, Context, Entity, Global, ParentElement, SharedString, Styled,
-    Subscription, Task, WeakEntity, Window,
-};
-use nostr_connect::prelude::*;
-use nostr_sdk::prelude::*;
-use settings::AppSettings;
-use smallvec::{smallvec, SmallVec};
-use ui::input::{InputState, TextInput};
-use ui::notification::Notification;
-use ui::{ContextModal, Sizable};
-
-pub fn init(window: &mut Window, cx: &mut App) {
-    Identity::set_global(cx.new(|cx| Identity::new(window, cx)), cx);
-}
-
-struct GlobalIdentity(Entity<Identity>);
-
-impl Global for GlobalIdentity {}
-
-pub struct Identity {
-    public_key: Option<PublicKey>,
-    logging_in: bool,
-    relay_ready: Option<bool>,
-    need_backup: Option<Keys>,
-    need_onboarding: bool,
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 1]>,
-}
-
-impl Identity {
-    /// Retrieve the Global Identity instance
-    pub fn global(cx: &App) -> Entity<Self> {
-        cx.global::<GlobalIdentity>().0.clone()
-    }
-
-    /// Retrieve the Identity instance
-    pub fn read_global(cx: &App) -> &Self {
-        cx.global::<GlobalIdentity>().0.read(cx)
-    }
-
-    /// Set the Global Identity instance
-    pub(crate) fn set_global(state: Entity<Self>, cx: &mut App) {
-        cx.set_global(GlobalIdentity(state));
-    }
-
-    pub(crate) fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let client_keys = ClientKeys::global(cx);
-        let mut subscriptions = smallvec![];
-
-        subscriptions.push(
-            cx.observe_in(&client_keys, window, |this, state, window, cx| {
-                let auto_login = AppSettings::get_auto_login(cx);
-                let has_client_keys = state.read(cx).has_keys();
-
-                // Skip auto login if the user hasn't enabled auto login
-                if has_client_keys && auto_login {
-                    this.set_logging_in(true, cx);
-                    this.load(window, cx);
-                } else {
-                    this.set_public_key(None, window, cx);
-                }
-            }),
-        );
-
-        Self {
-            public_key: None,
-            relay_ready: None,
-            need_backup: None,
-            need_onboarding: false,
-            logging_in: false,
-            subscriptions,
-        }
-    }
-
-    pub fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let task = cx.background_spawn(async move {
-            let filter = Filter::new()
-                .kind(Kind::ApplicationSpecificData)
-                .identifier(ACCOUNT_D)
-                .limit(1);
-
-            if let Some(event) = nostr_client().database().query(filter).await?.first_owned() {
-                let secret = event.content;
-                let is_bunker = secret.starts_with("bunker://");
-
-                Ok((secret, is_bunker))
-            } else {
-                Err(anyhow!("Not found"))
-            }
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            if let Ok((secret, is_bunker)) = task.await {
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.login(&secret, is_bunker, window, cx);
-                    })
-                    .ok();
-                })
-                .ok();
-            } else {
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.set_public_key(None, window, cx);
-                    })
-                    .ok();
-                })
-                .ok();
-            }
-        })
-        .detach();
-    }
-
-    pub fn unload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let filter = Filter::new()
-                .kind(Kind::ApplicationSpecificData)
-                .identifier(ACCOUNT_D);
-
-            // Unset signer
-            client.unset_signer().await;
-            // Delete account
-            client.database().delete(filter).await?;
-
-            Ok(())
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match task.await {
-                Ok(_) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.set_public_key(None, window, cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(Notification::error(e.to_string()), cx);
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
-    pub(crate) fn login(
-        &mut self,
-        secret: &str,
-        is_bunker: bool,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if is_bunker {
-            if let Ok(uri) = NostrConnectURI::parse(secret) {
-                self.login_with_bunker(uri, window, cx);
-            } else {
-                window.push_notification(Notification::error("Bunker URI is invalid"), cx);
-                self.set_public_key(None, window, cx);
-            }
-        } else if let Ok(enc) = EncryptedSecretKey::from_bech32(secret) {
-            self.login_with_keys(enc, window, cx);
-        } else {
-            window.push_notification(Notification::error("Secret Key is invalid"), cx);
-            self.set_public_key(None, window, cx);
-        }
-    }
-
-    pub(crate) fn login_with_bunker(
-        &mut self,
-        uri: NostrConnectURI,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let timeout = Duration::from_secs(NOSTR_CONNECT_TIMEOUT / 10);
-        let client_keys = ClientKeys::get_global(cx).keys();
-
-        let Ok(mut signer) = NostrConnect::new(uri, client_keys, timeout, None) else {
-            window.push_notification(
-                Notification::error("Bunker URI is invalid").title("Nostr Connect"),
-                cx,
-            );
-            self.set_public_key(None, window, cx);
-            return;
-        };
-        // Automatically open auth url
-        signer.auth_url_handler(CoopAuthUrlHandler);
-
-        cx.spawn_in(window, async move |this, cx| {
-            // Call .bunker_uri() to verify the connection
-            match signer.bunker_uri().await {
-                Ok(_) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.set_signer(signer, window, cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(Notification::error(e.to_string()), cx);
-                        this.update(cx, |this, cx| {
-                            this.set_public_key(None, window, cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
-    pub(crate) fn login_with_keys(
-        &mut self,
-        enc: EncryptedSecretKey,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let pwd_input: Entity<InputState> = cx.new(|cx| InputState::new(window, cx).masked(true));
-        let weak_input = pwd_input.downgrade();
-
-        let error: Entity<Option<SharedString>> = cx.new(|_| None);
-        let weak_error = error.downgrade();
-
-        let entity = cx.weak_entity();
-
-        window.open_modal(cx, move |this, _window, cx| {
-            let entity = entity.clone();
-            let entity_clone = entity.clone();
-            let weak_input = weak_input.clone();
-            let weak_error = weak_error.clone();
-
-            this.overlay_closable(false)
-                .show_close(false)
-                .keyboard(false)
-                .confirm()
-                .on_cancel(move |_, window, cx| {
-                    entity
-                        .update(cx, |this, cx| {
-                            this.set_public_key(None, window, cx);
-                        })
-                        .ok();
-                    // Close modal
-                    true
-                })
-                .on_ok(move |_, window, cx| {
-                    let weak_error = weak_error.clone();
-                    let password = weak_input
-                        .read_with(cx, |state, _cx| state.value().to_owned())
-                        .ok();
-
-                    entity_clone
-                        .update(cx, |this, cx| {
-                            this.verify_keys(enc, password, weak_error, window, cx);
-                        })
-                        .ok();
-
-                    false
-                })
-                .child(
-                    div()
-                        .w_full()
-                        .flex()
-                        .flex_col()
-                        .gap_1()
-                        .text_sm()
-                        .child("Password to decrypt your key *")
-                        .child(TextInput::new(&pwd_input).small())
-                        .when_some(error.read(cx).as_ref(), |this, error| {
-                            this.child(
-                                div()
-                                    .text_xs()
-                                    .italic()
-                                    .text_color(red())
-                                    .child(error.clone()),
-                            )
-                        }),
-                )
-        });
-    }
-
-    pub(crate) fn verify_keys(
-        &mut self,
-        enc: EncryptedSecretKey,
-        password: Option<SharedString>,
-        error: WeakEntity<Option<SharedString>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(password) = password else {
-            _ = error.update(cx, |this, cx| {
-                *this = Some("Password is required".into());
-                cx.notify();
-            });
-            return;
-        };
-
-        if password.is_empty() {
-            _ = error.update(cx, |this, cx| {
-                *this = Some("Password cannot be empty".into());
-                cx.notify();
-            });
-            return;
-        }
-
-        // Decrypt the password in the background to prevent blocking the main thread
-        let task: Task<Option<SecretKey>> =
-            cx.background_spawn(async move { enc.decrypt(&password).ok() });
-
-        cx.spawn_in(window, async move |this, cx| {
-            if let Some(secret) = task.await {
-                cx.update(|window, cx| {
-                    window.close_modal(cx);
-                    // Update user's signer with decrypted secret key
-                    this.update(cx, |this, cx| {
-                        this.set_signer(Keys::new(secret), window, cx);
-                    })
-                    .ok();
-                })
-                .ok();
-            } else {
-                _ = error.update(cx, |this, cx| {
-                    *this = Some("Invalid password".into());
-                    cx.notify();
-                });
-            }
-        })
-        .detach();
-    }
-
-    /// Sets a new signer for the client and updates user identity
-    pub fn set_signer<S>(&self, signer: S, window: &mut Window, cx: &mut Context<Self>)
-    where
-        S: NostrSigner + 'static,
-    {
-        let task: Task<Result<PublicKey, Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let public_key = signer.get_public_key().await?;
-
-            // Update signer
-            client.set_signer(signer).await;
-
-            // Subscribe for user metadata
-            Self::subscribe(client, public_key).await?;
-
-            Ok(public_key)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match task.await {
-                Ok(public_key) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.set_public_key(Some(public_key), window, cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(Notification::error(e.to_string()), cx);
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
-    /// Creates a new identity with the given metadata
-    pub fn new_identity(
-        &mut self,
-        metadata: Metadata,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let keys = Keys::generate();
-        let async_keys = keys.clone();
-
-        let task: Task<Result<PublicKey, Error>> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let public_key = async_keys.public_key();
-
-            // Update signer
-            client.set_signer(async_keys).await;
-
-            // Set metadata
-            client.set_metadata(&metadata).await?;
-
-            // Create relay list
-            let relay_list = EventBuilder::new(Kind::RelayList, "").tags(
-                NIP65_RELAYS
-                    .into_iter()
-                    .filter_map(|url| RelayUrl::parse(url).ok())
-                    .map(|url| Tag::relay_metadata(url, None)),
-            );
-
-            // Create messaging relay list
-            let dm_relay = EventBuilder::new(Kind::InboxRelays, "").tags(
-                NIP17_RELAYS
-                    .into_iter()
-                    .filter_map(|url| RelayUrl::parse(url).ok())
-                    .map(Tag::relay),
-            );
-
-            // Set user's NIP65 relays
-            client.send_event_builder(relay_list).await?;
-            // Set user's NIP17 relays
-            client.send_event_builder(dm_relay).await?;
-
-            // Subscribe for user metadata
-            Self::subscribe(client, public_key).await?;
-
-            Ok(public_key)
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            match task.await {
-                Ok(public_key) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, cx| {
-                            this.set_public_key(Some(public_key), window, cx);
-                            this.set_need_backup(Some(keys), cx);
-                            this.set_need_onboarding(cx);
-                        })
-                        .ok();
-                    })
-                    .ok();
-                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(Notification::error(e.to_string()), cx);
-                    })
-                    .ok();
-                }
-            };
-        })
-        .detach();
-    }
-
-    /// Clear the user's need backup status
-    pub fn clear_need_backup(&mut self, password: String, cx: &mut Context<Self>) {
-        if let Some(keys) = self.need_backup.as_ref() {
-            // Encrypt the keys then writing them to keychain
-            self.write_keys(keys, password, cx);
-            // Clear the needed backup keys
-            self.need_backup = None;
-            cx.notify();
-        }
-    }
-
-    /// Set the user's need backup status
-    pub(crate) fn set_need_backup(&mut self, keys: Option<Keys>, cx: &mut Context<Self>) {
-        self.need_backup = keys;
-        cx.notify();
-    }
-
-    /// Set the user's need onboarding status
-    pub(crate) fn set_need_onboarding(&mut self, cx: &mut Context<Self>) {
-        self.need_onboarding = true;
-        cx.notify();
-    }
-
-    /// Returns true if the user needs backup their keys
-    pub fn need_backup(&self) -> Option<&Keys> {
-        self.need_backup.as_ref()
-    }
-
-    /// Returns true if the user needs onboarding
-    pub fn need_onboarding(&self) -> bool {
-        self.need_onboarding
-    }
-
-    /// Writes the bunker uri to the database
-    pub fn write_bunker(&self, uri: &NostrConnectURI, cx: &mut Context<Self>) {
-        let mut value = uri.to_string();
-
-        let Some(public_key) = uri.remote_signer_public_key().cloned() else {
-            log::error!("Remote Signer's public key not found");
-            return;
-        };
-
-        // Remove the secret param if it exists
-        if let Some(secret) = uri.secret() {
-            value = value.replace(secret, "");
-        }
-
-        cx.background_spawn(async move {
-            let client = nostr_client();
-            let keys = Keys::generate();
-
-            let builder = EventBuilder::new(Kind::ApplicationSpecificData, value).tags(vec![
-                Tag::identifier(ACCOUNT_D),
-                Tag::public_key(public_key),
-            ]);
-
-            if let Ok(event) = builder.sign(&keys).await {
-                if let Err(e) = client.database().save_event(&event).await {
-                    log::error!("Failed to save event: {e}");
-                };
-            }
-        })
-        .detach();
-    }
-
-    /// Writes the keys to the database
-    pub fn write_keys(&self, keys: &Keys, password: String, cx: &mut Context<Self>) {
-        let keys = keys.to_owned();
-        let public_key = keys.public_key();
-
-        cx.background_spawn(async move {
-            if let Ok(enc_key) =
-                EncryptedSecretKey::new(keys.secret_key(), &password, 8, KeySecurity::Unknown)
-            {
-                let client = nostr_client();
-                let content = enc_key.to_bech32().unwrap();
-
-                let builder = EventBuilder::new(Kind::ApplicationSpecificData, content).tags(vec![
-                    Tag::identifier(ACCOUNT_D),
-                    Tag::public_key(public_key),
-                ]);
-
-                if let Ok(event) = builder.sign(&Keys::generate()).await {
-                    if let Err(e) = client.database().save_event(&event).await {
-                        log::error!("Failed to save event: {e}");
-                    };
-                }
-            }
-        })
-        .detach();
-    }
-
-    pub fn verify_dm_relays(&self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(public_key) = self.public_key() else {
-            return;
-        };
-
-        let task: Task<bool> = cx.background_spawn(async move {
-            let client = nostr_client();
-            let filter = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
-
-            let Ok(events) = client.database().query(filter).await else {
-                return false;
-            };
-
-            let Some(event) = events.first() else {
-                return false;
-            };
-
-            let relays: Vec<RelayUrl> = event
-                .tags
-                .filter(TagKind::Relay)
-                .filter_map(|tag| RelayUrl::parse(tag.content()?).ok())
-                .collect();
-
-            !relays.is_empty()
-        });
-
-        cx.spawn_in(window, async move |this, cx| {
-            let result = task.await;
-
-            this.update(cx, |this, cx| {
-                this.relay_ready = Some(result);
-                cx.notify();
-            })
-            .ok();
-        })
-        .detach();
-    }
-
-    /// Sets the public key of the identity
-    pub(crate) fn set_public_key(
-        &mut self,
-        public_key: Option<PublicKey>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.public_key = public_key;
-        cx.notify();
-        // Run verify user's dm relays task
-        cx.defer_in(window, |this, window, cx| {
-            this.verify_dm_relays(window, cx);
-        });
-    }
-
-    /// Returns the current identity's public key
-    pub fn public_key(&self) -> Option<PublicKey> {
-        self.public_key
-    }
-
-    /// Returns true if a signer is currently set
-    pub fn has_signer(&self) -> bool {
-        self.public_key.is_some()
-    }
-
-    pub fn relay_ready(&self) -> Option<bool> {
-        self.relay_ready
-    }
-
-    /// Returns true if the identity is currently logging in
-    pub fn logging_in(&self) -> bool {
-        self.logging_in
-    }
-
-    /// Sets the logging in status of the identity
-    pub(crate) fn set_logging_in(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.logging_in = status;
-        cx.notify();
-    }
-
-    pub(crate) async fn subscribe(client: &Client, public_key: PublicKey) -> Result<(), Error> {
-        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
-
-        client
-            .subscribe_with_id(
-                gift_wrap_sub_id().to_owned(),
-                Filter::new().kind(Kind::GiftWrap).pubkey(public_key),
-                None,
-            )
-            .await?;
-
-        client
-            .subscribe(
-                Filter::new()
-                    .author(public_key)
-                    .kinds(vec![Kind::Metadata, Kind::ContactList, Kind::RelayList])
-                    .since(Timestamp::now()),
-                None,
-            )
-            .await?;
-
-        client
-            .subscribe(
-                Filter::new()
-                    .kinds(vec![Kind::Metadata, Kind::ContactList, Kind::RelayList])
-                    .author(public_key)
-                    .limit(10),
-                Some(opts),
-            )
-            .await?;
-
-        log::info!("Getting all user's metadata and messages...");
-
-        Ok(())
-    }
-}
--- a/crates/registry/Cargo.toml
+++ b/crates/registry/Cargo.toml
@@ -9,17 +9,13 @@ common = { path = "../common" }
 global = { path = "../global" }
 settings = { path = "../settings" }

-rust-i18n.workspace = true
-i18n.workspace = true
 gpui.workspace = true
 nostr.workspace = true
 nostr-sdk.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
-chrono.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-oneshot.workspace = true
 log.workspace = true

 fuzzy-matcher = "0.3.7"
--- a/crates/registry/src/lib.rs
+++ b/crates/registry/src/lib.rs
@@ -1,14 +1,12 @@
 use std::cmp::Reverse;
-use std::collections::{BTreeMap, BTreeSet, HashMap};
+use std::collections::{HashMap, HashSet};

 use anyhow::Error;
 use common::event::EventUtils;
 use fuzzy_matcher::skim::SkimMatcherV2;
 use fuzzy_matcher::FuzzyMatcher;
-use global::nostr_client;
-use gpui::{
-    App, AppContext, Context, Entity, EventEmitter, Global, Subscription, Task, WeakEntity, Window,
-};
+use global::{nostr_client, UnwrappingStatus};
+use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Task, WeakEntity, Window};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use room::RoomKind;
@@ -20,8 +18,6 @@ use crate::room::Room;
 pub mod message;
 pub mod room;

-i18n::init!();
-
 pub fn init(cx: &mut App) {
    Registry::set_global(cx.new(Registry::new), cx);
 }
@@ -31,7 +27,7 @@ struct GlobalRegistry(Entity<Registry>);
 impl Global for GlobalRegistry {}

 #[derive(Debug)]
-pub enum RegistrySignal {
+pub enum RegistryEvent {
    Open(WeakEntity<Room>),
    Close(u64),
    NewRequest(RoomKind),
@@ -43,19 +39,19 @@ pub struct Registry {
    pub rooms: Vec<Entity<Room>>,

    /// Collection of all persons (user profiles)
-    pub persons: BTreeMap<PublicKey, Entity<Profile>>,
+    pub persons: HashMap<PublicKey, Entity<Profile>>,

-    /// Indicates if rooms are currently being loaded
-    ///
-    /// Always equal to `true` when the app starts
-    pub loading: bool,
+    /// Status of the unwrapping process
+    pub unwrapping_status: Entity<UnwrappingStatus>,

-    /// Subscriptions for observing changes
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 2]>,
+    /// Public key of the currently activated signer
+    signer_pubkey: Option<PublicKey>,
+
+    /// Tasks for asynchronous operations
+    _tasks: SmallVec<[Task<()>; 1]>,
 }

-impl EventEmitter<RegistrySignal> for Registry {}
+impl EventEmitter<RegistryEvent> for Registry {}

 impl Registry {
    /// Retrieve the Global Registry state
@@ -75,68 +71,67 @@ impl Registry {

    /// Create a new Registry instance
    pub(crate) fn new(cx: &mut Context<Self>) -> Self {
-        let mut subscriptions = smallvec![];
+        let unwrapping_status = cx.new(|_| UnwrappingStatus::default());
+        let mut tasks = smallvec![];

-        // Load all user profiles from the database when the Registry is created
-        subscriptions.push(cx.observe_new::<Self>(|this, _window, cx| {
-            let task = this.load_local_person(cx);
-            this.set_persons_from_task(task, cx);
-        }));
+        let load_local_persons: Task<Result<Vec<Profile>, Error>> =
+            cx.background_spawn(async move {
+                let client = nostr_client();
+                let filter = Filter::new().kind(Kind::Metadata).limit(200);
+                let events = client.database().query(filter).await?;
+                let mut profiles = vec![];

-        // When any Room is created, load members metadata
-        subscriptions.push(cx.observe_new::<Room>(|this, _window, cx| {
-            let state = Self::global(cx);
-            let task = this.load_metadata(cx);
+                for event in events.into_iter() {
+                    let metadata = Metadata::from_json(event.content).unwrap_or_default();
+                    let profile = Profile::new(event.pubkey, metadata);
+                    profiles.push(profile);
+                }

-            state.update(cx, |this, cx| {
-                this.set_persons_from_task(task, cx);
+                Ok(profiles)
            });
-        }));
+
+        tasks.push(
+            // Load all user profiles from the database when the Registry is created
+            cx.spawn(async move |this, cx| {
+                if let Ok(profiles) = load_local_persons.await {
+                    this.update(cx, |this, cx| {
+                        this.set_persons(profiles, cx);
+                    })
+                    .ok();
+                }
+            }),
+        );

        Self {
+            unwrapping_status,
            rooms: vec![],
-            persons: BTreeMap::new(),
-            loading: true,
-            subscriptions,
+            persons: HashMap::new(),
+            signer_pubkey: None,
+            _tasks: tasks,
        }
    }

-    pub(crate) fn set_persons_from_task(
-        &mut self,
-        task: Task<Result<Vec<Profile>, Error>>,
-        cx: &mut Context<Self>,
-    ) {
-        cx.spawn(async move |this, cx| {
-            if let Ok(profiles) = task.await {
-                this.update(cx, |this, cx| {
-                    for profile in profiles {
-                        this.persons
-                            .insert(profile.public_key(), cx.new(|_| profile));
-                    }
-                    cx.notify();
-                })
-                .ok();
-            }
-        })
-        .detach();
+    /// Returns the public key of the currently activated signer.
+    pub fn signer_pubkey(&self) -> Option<PublicKey> {
+        self.signer_pubkey
    }

-    pub(crate) fn load_local_person(&self, cx: &App) -> Task<Result<Vec<Profile>, Error>> {
-        cx.background_spawn(async move {
-            let filter = Filter::new().kind(Kind::Metadata).limit(100);
-            let events = nostr_client().database().query(filter).await?;
-            let mut profiles = vec![];
-
-            for event in events.into_iter() {
-                let metadata = Metadata::from_json(event.content).unwrap_or_default();
-                let profile = Profile::new(event.pubkey, metadata);
-                profiles.push(profile);
-            }
-
-            Ok(profiles)
-        })
+    /// Update the public key of the currently activated signer.
+    pub fn set_signer_pubkey(&mut self, public_key: PublicKey, cx: &mut Context<Self>) {
+        self.signer_pubkey = Some(public_key);
+        cx.notify();
    }

+    /// Insert batch of persons
+    pub fn set_persons(&mut self, profiles: Vec<Profile>, cx: &mut Context<Self>) {
+        for profile in profiles.into_iter() {
+            self.persons
+                .insert(profile.public_key(), cx.new(|_| profile));
+        }
+        cx.notify();
+    }
+
+    /// Get single person
    pub fn get_person(&self, public_key: &PublicKey, cx: &App) -> Profile {
        self.persons
            .get(public_key)
@@ -145,6 +140,7 @@ impl Registry {
            .unwrap_or(Profile::new(public_key.to_owned(), Metadata::default()))
    }

+    /// Get group of persons
    pub fn get_group_person(&self, public_keys: &[PublicKey], cx: &App) -> Vec<Profile> {
        let mut profiles = vec![];

@@ -156,21 +152,20 @@ impl Registry {
        profiles
    }

-    pub fn insert_or_update_person(&mut self, event: Event, cx: &mut App) {
-        let public_key = event.pubkey;
-        let Ok(metadata) = Metadata::from_json(event.content) else {
-            // Invalid metadata, no need to process further.
-            return;
-        };
+    /// Insert or update a person
+    pub fn insert_or_update_person(&mut self, profile: Profile, cx: &mut App) {
+        let public_key = profile.public_key();

-        if let Some(person) = self.persons.get(&public_key) {
-            person.update(cx, |this, cx| {
-                *this = Profile::new(public_key, metadata);
-                cx.notify();
-            });
-        } else {
-            self.persons
-                .insert(public_key, cx.new(|_| Profile::new(public_key, metadata)));
+        match self.persons.get(&public_key) {
+            Some(person) => {
+                person.update(cx, |this, cx| {
+                    *this = profile;
+                    cx.notify();
+                });
+            }
+            None => {
+                self.persons.insert(public_key, cx.new(|_| profile));
+            }
        }
    }

@@ -209,7 +204,7 @@ impl Registry {
    /// Close a room.
    pub fn close_room(&mut self, id: u64, cx: &mut Context<Self>) {
        if self.rooms.iter().any(|r| r.read(cx).id == id) {
-            cx.emit(RegistrySignal::Close(id));
+            cx.emit(RegistryEvent::Close(id));
        }
    }

@@ -244,8 +239,24 @@ impl Registry {
    }

    /// Set the loading status of the registry.
-    pub fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
-        self.loading = status;
+    pub fn set_unwrapping_status(&mut self, status: UnwrappingStatus, cx: &mut Context<Self>) {
+        self.unwrapping_status.update(cx, |this, cx| {
+            *this = status;
+            cx.notify();
+        });
+    }
+
+    /// Reset the registry.
+    pub fn reset(&mut self, cx: &mut Context<Self>) {
+        // Reset the unwrapping status
+        self.set_unwrapping_status(UnwrappingStatus::default(), cx);
+
+        // Clear the current identity
+        self.signer_pubkey = None;
+
+        // Clear all current rooms
+        self.rooms.clear();
+
        cx.notify();
    }

@@ -254,15 +265,16 @@ impl Registry {
        log::info!("Starting to load chat rooms...");

        // Get the contact bypass setting
-        let contact_bypass = AppSettings::get_contact_bypass(cx);
+        let bypass_setting = AppSettings::get_contact_bypass(cx);

-        let task: Task<Result<BTreeSet<Room>, Error>> = cx.background_spawn(async move {
+        let task: Task<Result<HashSet<Room>, Error>> = cx.background_spawn(async move {
            let client = nostr_client();
            let signer = client.signer().await?;
            let public_key = signer.get_public_key().await?;
+            let contacts = client.database().contacts_public_keys(public_key).await?;

            // Get messages sent by the user
-            let send = Filter::new()
+            let sent = Filter::new()
                .kind(Kind::PrivateDirectMessage)
                .author(public_key);

@@ -271,11 +283,11 @@ impl Registry {
                .kind(Kind::PrivateDirectMessage)
                .pubkey(public_key);

-            let send_events = client.database().query(send).await?;
+            let sent_events = client.database().query(sent).await?;
            let recv_events = client.database().query(recv).await?;
-            let events = send_events.merge(recv_events);
+            let events = sent_events.merge(recv_events);

-            let mut rooms: BTreeSet<Room> = BTreeSet::new();
+            let mut rooms: HashSet<Room> = HashSet::new();

            // Process each event and group by room hash
            for event in events
@@ -283,21 +295,25 @@ impl Registry {
                .sorted_by_key(|event| Reverse(event.created_at))
                .filter(|ev| ev.tags.public_keys().peekable().peek().is_some())
            {
-                if rooms.iter().any(|room| room.id == event.uniq_id()) {
+                // Parse the room from the nostr event
+                let room = Room::from(&event);
+
+                // Skip if the room is already in the set
+                if rooms.iter().any(|r| r.id == room.id) {
                    continue;
                }

-                // Get all public keys from the event
-                let public_keys = event.all_pubkeys();
+                // Get all public keys from the event's tags
+                let mut public_keys: Vec<PublicKey> = room.members().to_vec();
+                public_keys.retain(|pk| pk != &public_key);

                // Bypass screening flag
-                let mut bypass = false;
+                let mut bypassed = false;

-                // If user enabled bypass screening for contacts
-                // Check if room's members are in contact with current user
-                if contact_bypass {
-                    let contacts = client.database().contacts_public_keys(public_key).await?;
-                    bypass = public_keys.iter().any(|k| contacts.contains(k));
+                // If the user has enabled bypass screening in settings,
+                // check if any of the room's members are contacts of the current user
+                if bypass_setting {
+                    bypassed = public_keys.iter().any(|k| contacts.contains(k));
                }

                // Check if the current user has sent at least one message to this room
@@ -309,10 +325,7 @@ impl Registry {
                // If current user has sent a message at least once, mark as ongoing
                let is_ongoing = client.database().count(filter).await.unwrap_or(1) >= 1;

-                // Create a new room
-                let room = Room::new(&event).rearrange_by(public_key);
-
-                if is_ongoing || bypass {
+                if is_ongoing || bypassed {
                    rooms.insert(room.kind(RoomKind::Ongoing));
                } else {
                    rooms.insert(room);
@@ -325,9 +338,11 @@ impl Registry {
        cx.spawn_in(window, async move |this, cx| {
            match task.await {
                Ok(rooms) => {
-                    this.update(cx, |this, cx| {
-                        this.extend_rooms(rooms, cx);
-                        this.sort(cx);
+                    this.update_in(cx, move |_, window, cx| {
+                        cx.defer_in(window, move |this, _window, cx| {
+                            this.extend_rooms(rooms, cx);
+                            this.sort(cx);
+                        });
                    })
                    .ok();
                }
@@ -339,24 +354,29 @@ impl Registry {
        .detach();
    }

-    pub(crate) fn extend_rooms(&mut self, rooms: BTreeSet<Room>, cx: &mut Context<Self>) {
-        let mut room_map: HashMap<u64, usize> = HashMap::with_capacity(self.rooms.len());
-
-        for (index, room) in self.rooms.iter().enumerate() {
-            room_map.insert(room.read(cx).id, index);
-        }
+    pub(crate) fn extend_rooms(&mut self, rooms: HashSet<Room>, cx: &mut Context<Self>) {
+        let mut room_map: HashMap<u64, usize> = self
+            .rooms
+            .iter()
+            .enumerate()
+            .map(|(idx, room)| (room.read(cx).id, idx))
+            .collect();

        for new_room in rooms.into_iter() {
            // Check if we already have a room with this ID
            if let Some(&index) = room_map.get(&new_room.id) {
                self.rooms[index].update(cx, |this, cx| {
-                    *this = new_room;
-                    cx.notify();
+                    if new_room.created_at > this.created_at {
+                        *this = new_room;
+                        cx.notify();
+                    }
                });
            } else {
-                let new_index = self.rooms.len();
-                room_map.insert(new_room.id, new_index);
+                let new_room_id = new_room.id;
                self.rooms.push(cx.new(|_| new_room));
+
+                let new_index = self.rooms.len();
+                room_map.insert(new_room_id, new_index);
            }
        }
    }
@@ -376,16 +396,18 @@ impl Registry {
            weak_room
        };

-        cx.emit(RegistrySignal::Open(weak_room));
+        cx.emit(RegistryEvent::Open(weak_room));
    }

    /// Refresh messages for a room in the global registry
-    pub fn refresh_rooms(&mut self, ids: Vec<u64>, cx: &mut Context<Self>) {
-        for room in self.rooms.iter() {
-            if ids.contains(&room.read(cx).id) {
-                room.update(cx, |this, cx| {
-                    this.emit_refresh(cx);
-                });
+    pub fn refresh_rooms(&mut self, ids: Option<Vec<u64>>, cx: &mut Context<Self>) {
+        if let Some(ids) = ids {
+            for room in self.rooms.iter() {
+                if ids.contains(&room.read(cx).id) {
+                    room.update(cx, |this, cx| {
+                        this.emit_refresh(cx);
+                    });
+                }
            }
        }
    }
@@ -396,7 +418,7 @@ impl Registry {
    /// Updates room ordering based on the most recent messages.
    pub fn event_to_message(
        &mut self,
-        identity: PublicKey,
+        gift_wrap: EventId,
        event: Event,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -404,35 +426,43 @@ impl Registry {
        let id = event.uniq_id();
        let author = event.pubkey;

+        let Some(public_key) = self.signer_pubkey else {
+            return;
+        };
+
        if let Some(room) = self.rooms.iter().find(|room| room.read(cx).id == id) {
+            let is_new_event = event.created_at > room.read(cx).created_at;
+
            // Update room
            room.update(cx, |this, cx| {
-                this.created_at(event.created_at, cx);
+                if is_new_event {
+                    this.set_created_at(event.created_at, cx);
+                }

                // Set this room is ongoing if the new message is from current user
-                if author == identity {
+                if author == public_key {
                    this.set_ongoing(cx);
                }

                // Emit the new message to the room
-                cx.defer_in(window, |this, window, cx| {
-                    this.emit_message(event, window, cx);
+                cx.defer_in(window, move |this, _window, cx| {
+                    this.emit_message(gift_wrap, event, cx);
                });
            });

-            // Re-sort the rooms registry by their created at
-            self.sort(cx);
+            // Resort all rooms in the registry by their created at (after updated)
+            if is_new_event {
+                cx.defer_in(window, |this, _window, cx| {
+                    this.sort(cx);
+                });
+            }
        } else {
-            let room = Room::new(&event)
-                .kind(RoomKind::default())
-                .rearrange_by(identity);
-
            // Push the new room to the front of the list
-            self.add_room(cx.new(|_| room), cx);
+            self.add_room(cx.new(|_| Room::from(&event)), cx);

            // Notify the UI about the new room
            cx.defer_in(window, move |_this, _window, cx| {
-                cx.emit(RegistrySignal::NewRequest(RoomKind::default()));
+                cx.emit(RegistryEvent::NewRequest(RoomKind::default()));
            });
        }
    }
--- a/crates/registry/src/message.rs
+++ b/crates/registry/src/message.rs
@@ -1,45 +1,47 @@
 use std::hash::Hash;
-use std::iter::IntoIterator;

-use chrono::{Local, TimeZone};
-use gpui::SharedString;
 use nostr_sdk::prelude::*;

-use crate::room::SendError;
-
-/// Represents a message in the chat system.
-///
-/// Contains information about the message content, author, creation time,
-/// mentions, replies, and any errors that occurred during sending.
-#[derive(Debug, Clone)]
-pub struct Message {
-    /// Unique identifier of the message (EventId from nostr_sdk)
-    pub id: EventId,
-    /// Author's public key
-    pub author: PublicKey,
-    /// The content/text of the message
-    pub content: SharedString,
-    /// When the message was created
-    pub created_at: Timestamp,
-    /// List of mentioned public keys in the message
-    pub mentions: Vec<PublicKey>,
-    /// List of EventIds this message is replying to
-    pub replies_to: Option<Vec<EventId>>,
-    /// Any errors that occurred while sending this message
-    pub errors: Option<Vec<SendError>>,
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
+pub enum Message {
+    User(RenderedMessage),
+    Warning(String, Timestamp),
+    System(Timestamp),
 }

-impl Eq for Message {}
+impl Message {
+    pub fn user(user: impl Into<RenderedMessage>) -> Self {
+        Self::User(user.into())
+    }

-impl PartialEq for Message {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
+    pub fn warning(content: impl Into<String>) -> Self {
+        Self::Warning(content.into(), Timestamp::now())
+    }
+
+    pub fn system() -> Self {
+        Self::System(Timestamp::default())
+    }
+
+    fn timestamp(&self) -> &Timestamp {
+        match self {
+            Message::User(msg) => &msg.created_at,
+            Message::Warning(_, ts) => ts,
+            Message::System(ts) => ts,
+        }
    }
 }

 impl Ord for Message {
    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.created_at.cmp(&other.created_at)
+        match (self, other) {
+            // System always comes first
+            (Message::System(_), Message::System(_)) => self.timestamp().cmp(other.timestamp()),
+            (Message::System(_), _) => std::cmp::Ordering::Less,
+            (_, Message::System(_)) => std::cmp::Ordering::Greater,
+
+            // For non-system messages, compare by timestamp
+            _ => self.timestamp().cmp(other.timestamp()),
+        }
    }
 }

@@ -49,131 +51,122 @@ impl PartialOrd for Message {
    }
 }

-impl Hash for Message {
+#[derive(Debug, Clone)]
+pub struct RenderedMessage {
+    pub id: EventId,
+    /// Author's public key
+    pub author: PublicKey,
+    /// The content/text of the message
+    pub content: String,
+    /// Message created time as unix timestamp
+    pub created_at: Timestamp,
+    /// List of mentioned public keys in the message
+    pub mentions: Vec<PublicKey>,
+    /// List of event of the message this message is a reply to
+    pub replies_to: Vec<EventId>,
+}
+
+impl From<Event> for RenderedMessage {
+    fn from(inner: Event) -> Self {
+        let mentions = extract_mentions(&inner.content);
+        let replies_to = extract_reply_ids(&inner.tags);
+
+        Self {
+            id: inner.id,
+            author: inner.pubkey,
+            content: inner.content,
+            created_at: inner.created_at,
+            mentions,
+            replies_to,
+        }
+    }
+}
+
+impl From<UnsignedEvent> for RenderedMessage {
+    fn from(inner: UnsignedEvent) -> Self {
+        let mentions = extract_mentions(&inner.content);
+        let replies_to = extract_reply_ids(&inner.tags);
+
+        Self {
+            // Event ID must be known
+            id: inner.id.unwrap(),
+            author: inner.pubkey,
+            content: inner.content,
+            created_at: inner.created_at,
+            mentions,
+            replies_to,
+        }
+    }
+}
+
+impl From<Box<Event>> for RenderedMessage {
+    fn from(inner: Box<Event>) -> Self {
+        (*inner).into()
+    }
+}
+
+impl From<&Box<Event>> for RenderedMessage {
+    fn from(inner: &Box<Event>) -> Self {
+        inner.to_owned().into()
+    }
+}
+
+impl Eq for RenderedMessage {}
+
+impl PartialEq for RenderedMessage {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl Ord for RenderedMessage {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.created_at.cmp(&other.created_at)
+    }
+}
+
+impl PartialOrd for RenderedMessage {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Hash for RenderedMessage {
    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
        self.id.hash(state);
    }
 }

-/// Builder pattern implementation for constructing Message objects.
-#[derive(Debug)]
-pub struct MessageBuilder {
-    id: EventId,
-    author: PublicKey,
-    content: Option<SharedString>,
-    created_at: Option<Timestamp>,
-    mentions: Vec<PublicKey>,
-    replies_to: Option<Vec<EventId>>,
-    errors: Option<Vec<SendError>>,
-}
+fn extract_mentions(content: &str) -> Vec<PublicKey> {
+    let parser = NostrParser::new();
+    let tokens = parser.parse(content);

-impl MessageBuilder {
-    /// Creates a new MessageBuilder with default values
-    pub fn new(id: EventId, author: PublicKey) -> Self {
-        Self {
-            id,
-            author,
-            content: None,
-            created_at: None,
-            mentions: vec![],
-            replies_to: None,
-            errors: None,
-        }
-    }
-
-    /// Sets the message content
-    pub fn content(mut self, content: impl Into<SharedString>) -> Self {
-        self.content = Some(content.into());
-        self
-    }
-
-    /// Sets the creation timestamp
-    pub fn created_at(mut self, created_at: Timestamp) -> Self {
-        self.created_at = Some(created_at);
-        self
-    }
-
-    /// Adds a single mention to the message
-    pub fn mention(mut self, mention: PublicKey) -> Self {
-        self.mentions.push(mention);
-        self
-    }
-
-    /// Adds multiple mentions to the message
-    pub fn mentions<I>(mut self, mentions: I) -> Self
-    where
-        I: IntoIterator<Item = PublicKey>,
-    {
-        self.mentions.extend(mentions);
-        self
-    }
-
-    /// Sets a single message this is replying to
-    pub fn reply_to(mut self, reply_to: EventId) -> Self {
-        self.replies_to = Some(vec![reply_to]);
-        self
-    }
-
-    /// Sets multiple messages this is replying to
-    pub fn replies_to<I>(mut self, replies_to: I) -> Self
-    where
-        I: IntoIterator<Item = EventId>,
-    {
-        let replies: Vec<EventId> = replies_to.into_iter().collect();
-        if !replies.is_empty() {
-            self.replies_to = Some(replies);
-        }
-        self
-    }
-
-    /// Adds errors that occurred during sending
-    pub fn errors<I>(mut self, errors: I) -> Self
-    where
-        I: IntoIterator<Item = SendError>,
-    {
-        self.errors = Some(errors.into_iter().collect());
-        self
-    }
-
-    /// Builds the message
-    pub fn build(self) -> Result<Message, String> {
-        Ok(Message {
-            id: self.id,
-            author: self.author,
-            content: self.content.ok_or("Content is required")?,
-            created_at: self.created_at.unwrap_or_else(Timestamp::now),
-            mentions: self.mentions,
-            replies_to: self.replies_to,
-            errors: self.errors,
+    tokens
+        .filter_map(|token| match token {
+            Token::Nostr(nip21) => match nip21 {
+                Nip21::Pubkey(pubkey) => Some(pubkey),
+                Nip21::Profile(profile) => Some(profile.public_key),
+                _ => None,
+            },
+            _ => None,
        })
-    }
+        .collect::<Vec<_>>()
 }

-impl Message {
-    /// Creates a new MessageBuilder
-    pub fn builder(id: EventId, author: PublicKey) -> MessageBuilder {
-        MessageBuilder::new(id, author)
-    }
+fn extract_reply_ids(inner: &Tags) -> Vec<EventId> {
+    let mut replies_to = vec![];

-    /// Returns a human-readable string representing how long ago the message was created
-    pub fn ago(&self) -> SharedString {
-        let input_time = match Local.timestamp_opt(self.created_at.as_u64() as i64, 0) {
-            chrono::LocalResult::Single(time) => time,
-            _ => return "Invalid timestamp".into(),
-        };
-
-        let now = Local::now();
-        let input_date = input_time.date_naive();
-        let now_date = now.date_naive();
-        let yesterday_date = (now - chrono::Duration::days(1)).date_naive();
-
-        let time_format = input_time.format("%H:%M %p");
-
-        match input_date {
-            date if date == now_date => format!("Today at {time_format}"),
-            date if date == yesterday_date => format!("Yesterday at {time_format}"),
-            _ => format!("{}, {time_format}", input_time.format("%d/%m/%y")),
+    for tag in inner.filter(TagKind::e()) {
+        if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
+            replies_to.push(id);
        }
-        .into()
    }
+
+    for tag in inner.filter(TagKind::q()) {
+        if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
+            replies_to.push(id);
+        }
+    }
+
+    replies_to
 }
--- a/crates/registry/src/room.rs
+++ b/crates/registry/src/room.rs
--- a/crates/settings/src/lib.rs
+++ b/crates/settings/src/lib.rs
@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use global::constants::SETTINGS_D;
+use global::constants::SETTINGS_IDENTIFIER;
 use global::nostr_client;
 use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task};
 use nostr_sdk::prelude::*;
@@ -11,7 +11,7 @@ pub fn init(cx: &mut App) {

    // Observe for state changes and save settings to database
    state.update(cx, |this, cx| {
-        this.subscriptions
+        this._subscriptions
            .push(cx.observe(&state, |this, _state, cx| {
                this.set_settings(cx);
            }));
@@ -49,6 +49,7 @@ setting_accessors! {
    pub screening: bool,
    pub contact_bypass: bool,
    pub auto_login: bool,
+    pub auto_auth: bool,
 }

 #[derive(Serialize, Deserialize)]
@@ -60,6 +61,8 @@ pub struct Settings {
    pub screening: bool,
    pub contact_bypass: bool,
    pub auto_login: bool,
+    pub auto_auth: bool,
+    pub authenticated_relays: Vec<RelayUrl>,
 }

 impl Default for Settings {
@@ -72,6 +75,8 @@ impl Default for Settings {
            screening: true,
            contact_bypass: true,
            auto_login: false,
+            auto_auth: true,
+            authenticated_relays: vec![],
        }
    }
 }
@@ -88,8 +93,7 @@ impl Global for GlobalAppSettings {}

 pub struct AppSettings {
    setting_values: Settings,
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 1]>,
+    _subscriptions: SmallVec<[Subscription; 1]>,
 }

 impl AppSettings {
@@ -108,29 +112,26 @@ impl AppSettings {
        cx.set_global(GlobalAppSettings(state));
    }

-    fn new(cx: &mut Context<Self>) -> Self {
-        let setting_values = Settings::default();
-        let mut subscriptions = smallvec![];
-
-        subscriptions.push(cx.observe_new::<Self>(move |this, _window, cx| {
-            this.get_settings_from_db(cx);
-        }));
-
+    fn new(_cx: &mut Context<Self>) -> Self {
        Self {
-            setting_values,
-            subscriptions,
+            setting_values: Settings::default(),
+            _subscriptions: smallvec![],
        }
    }

-    pub(crate) fn get_settings_from_db(&self, cx: &mut Context<Self>) {
+    pub fn load_settings(&self, cx: &mut Context<Self>) {
        let task: Task<Result<Settings, anyhow::Error>> = cx.background_spawn(async move {
+            let client = nostr_client();
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
            let filter = Filter::new()
                .kind(Kind::ApplicationSpecificData)
-                .identifier(SETTINGS_D)
+                .identifier(SETTINGS_IDENTIFIER)
+                .author(public_key)
                .limit(1);

-            if let Some(event) = nostr_client().database().query(filter).await?.first_owned() {
-                log::info!("Successfully loaded settings from database");
+            if let Some(event) = client.database().query(filter).await?.first_owned() {
                Ok(serde_json::from_str(&event.content).unwrap_or(Settings::default()))
            } else {
                Err(anyhow!("Not found"))
@@ -149,22 +150,42 @@ impl AppSettings {
        .detach();
    }

-    pub(crate) fn set_settings(&self, cx: &mut Context<Self>) {
+    pub fn set_settings(&self, cx: &mut Context<Self>) {
        if let Ok(content) = serde_json::to_string(&self.setting_values) {
-            cx.background_spawn(async move {
-                if let Ok(event) = EventBuilder::new(Kind::ApplicationSpecificData, content)
-                    .tags(vec![Tag::identifier(SETTINGS_D)])
+            let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
+                let client = nostr_client();
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;
+
+                let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
+                    .tag(Tag::identifier(SETTINGS_IDENTIFIER))
+                    .build(public_key)
                    .sign(&Keys::generate())
-                    .await
-                {
-                    if let Err(e) = nostr_client().database().save_event(&event).await {
-                        log::error!("Failed to save user settings: {e}");
-                    } else {
-                        log::info!("New settings have been saved successfully");
-                    }
-                }
-            })
-            .detach();
+                    .await?;
+
+                client.database().save_event(&event).await?;
+
+                Ok(())
+            });
+
+            task.detach();
+        }
+    }
+
+    pub fn is_auto_auth(&self) -> bool {
+        !self.setting_values.authenticated_relays.is_empty() && self.setting_values.auto_auth
+    }
+
+    pub fn is_authenticated(&self, url: &RelayUrl) -> bool {
+        self.setting_values.authenticated_relays.contains(url)
+    }
+
+    pub fn push_relay(&mut self, relay_url: &RelayUrl, cx: &mut Context<Self>) {
+        if !self.is_authenticated(relay_url) {
+            self.setting_values
+                .authenticated_relays
+                .push(relay_url.to_owned());
+            cx.notify();
        }
    }
 }
--- a/crates/signer_proxy/Cargo.toml
+++ b/crates/signer_proxy/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "signer_proxy"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+global = { path = "../global" }
+
+nostr.workspace = true
+smol.workspace = true
+oneshot.workspace = true
+anyhow.workspace = true
+log.workspace = true
+futures.workspace = true
+smallvec.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+
+atomic-destructor = "0.3.0"
+uuid = { version = "1.17", features = ["serde", "v4"] }
+hyper = { version = "1.6", features = ["server", "http1"] }
+hyper-util = { version = "0.1", features = ["server"] }
+bytes = "1.10"
+http-body-util = "0.1"
--- a/crates/signer_proxy/index.html
+++ b/crates/signer_proxy/index.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <title>NIP-07 Proxy</title>
+        <link rel="stylesheet" href="style.css" />
+    </head>
+    <body>
+        <div class="container">
+            <h1>NIP-07 Proxy</h1>
+            <p>
+                This page acts as a proxy between your native application and
+                the NIP-07 browser extension.
+            </p>
+            <div class="status-box">
+                <strong>Status:</strong> <span id="status">Checking...</span>
+            </div>
+            <p>
+                <small
+                    >Keep this tab open while using your application. The page
+                    will automatically poll for requests from your native
+                    app.</small
+                >
+            </p>
+
+            <h3>Debug Info</h3>
+            <p>
+                <small
+                    >Check the browser console (F12) for detailed logs.</small
+                >
+            </p>
+        </div>
+
+        <script src="proxy.js"></script>
+    </body>
+</html>
--- a/crates/signer_proxy/proxy.js
+++ b/crates/signer_proxy/proxy.js
@@ -0,0 +1,151 @@
+let isPolling = false;
+
+async function pollForRequests() {
+  if (isPolling) return;
+  isPolling = true;
+
+  try {
+    const response = await fetch("/api/pending");
+    const data = await response.json();
+
+    console.log("Polled for requests, got:", data);
+
+    // Process any new requests
+    if (data.requests && data.requests.length > 0) {
+      console.log(`Processing ${data.requests.length} requests`);
+      for (const request of data.requests) {
+        await handleNip07Request(request);
+      }
+    }
+  } catch (error) {
+    console.error("Polling error:", error);
+    updateStatus("Error: " + error.message, "error");
+  }
+
+  isPolling = false;
+}
+
+async function handleNip07Request(request) {
+  console.log("Handling request:", request);
+
+  try {
+    let result;
+
+    if (!window.nostr) {
+      throw new Error("NIP-07 extension not available");
+    }
+
+    switch (request.method) {
+      case "get_public_key":
+        console.log("Calling nostr.getPublicKey()");
+        result = await window.nostr.getPublicKey();
+        console.log("Got public key:", result);
+        break;
+
+      case "sign_event":
+        console.log("Calling nostr.signEvent() with:", request.params);
+        result = await window.nostr.signEvent(request.params);
+        console.log("Got signed event:", result);
+        break;
+
+      case "nip04_encrypt":
+        console.log("Calling nostr.nip04.encrypt()");
+        result = await window.nostr.nip04.encrypt(
+          request.params.public_key,
+          request.params.content,
+        );
+        break;
+
+      case "nip04_decrypt":
+        console.log("Calling nostr.nip04.decrypt()");
+        result = await window.nostr.nip04.decrypt(
+          request.params.public_key,
+          request.params.content,
+        );
+        break;
+
+      case "nip44_encrypt":
+        console.log("Calling nostr.nip44.encrypt()");
+        result = await window.nostr.nip44.encrypt(
+          request.params.public_key,
+          request.params.content,
+        );
+        break;
+
+      case "nip44_decrypt":
+        console.log("Calling nostr.nip44.decrypt()");
+        result = await window.nostr.nip44.decrypt(
+          request.params.public_key,
+          request.params.content,
+        );
+        break;
+
+      default:
+        throw new Error(`Unknown method: ${request.method}`);
+    }
+
+    // Send response back to server
+    const responsePayload = {
+      id: request.id,
+      result: result,
+      error: null,
+    };
+
+    console.log("Sending response:", responsePayload);
+
+    await fetch("/api/response", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(responsePayload),
+    });
+
+    console.log("Response sent successfully");
+    updateStatus("Request processed successfully", "connected");
+  } catch (error) {
+    console.error("Error handling request:", error);
+
+    // Send error response back to server
+    const errorPayload = {
+      id: request.id,
+      result: null,
+      error: error.message,
+    };
+
+    console.log("Sending error response:", errorPayload);
+
+    await fetch("/api/response", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(errorPayload),
+    });
+
+    updateStatus("Error: " + error.message, "error");
+  }
+}
+
+function updateStatus(message, className) {
+  const statusEl = document.getElementById("status");
+  statusEl.textContent = message;
+  statusEl.className = className;
+}
+
+// Start polling when page loads
+window.addEventListener("load", () => {
+  console.log("NIP-07 Proxy loaded");
+
+  // Check if NIP-07 extension is available
+  if (window.nostr) {
+    console.log("NIP-07 extension detected");
+    updateStatus("Connected to NIP-07 extension - Ready", "connected");
+  } else {
+    console.log("NIP-07 extension not found");
+    updateStatus("NIP-07 extension not found", "error");
+  }
+
+  // Start polling every 500 ms
+  setInterval(pollForRequests, 500);
+});
--- a/crates/signer_proxy/src/error.rs
+++ b/crates/signer_proxy/src/error.rs
@@ -0,0 +1,73 @@
+use std::{fmt, io};
+
+use hyper::http;
+use nostr::event;
+use oneshot::RecvError;
+
+/// Error
+#[derive(Debug)]
+pub enum Error {
+    /// I/O error
+    Io(io::Error),
+    /// HTTP error
+    Http(http::Error),
+    /// Json error
+    Json(serde_json::Error),
+    /// Event error
+    Event(event::Error),
+    /// Oneshot channel receive error
+    OneShotRecv(RecvError),
+    /// Generic error
+    Generic(String),
+    /// Timeout
+    Timeout,
+    /// The server is shutdown
+    Shutdown,
+}
+
+impl std::error::Error for Error {}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Io(e) => write!(f, "{e}"),
+            Self::Http(e) => write!(f, "{e}"),
+            Self::Json(e) => write!(f, "{e}"),
+            Self::Event(e) => write!(f, "{e}"),
+            Self::OneShotRecv(e) => write!(f, "{e}"),
+            Self::Generic(e) => write!(f, "{e}"),
+            Self::Timeout => write!(f, "timeout"),
+            Self::Shutdown => write!(f, "server is shutdown"),
+        }
+    }
+}
+
+impl From<io::Error> for Error {
+    fn from(e: io::Error) -> Self {
+        Self::Io(e)
+    }
+}
+
+impl From<http::Error> for Error {
+    fn from(e: http::Error) -> Self {
+        Self::Http(e)
+    }
+}
+
+impl From<serde_json::Error> for Error {
+    fn from(e: serde_json::Error) -> Self {
+        Self::Json(e)
+    }
+}
+
+impl From<event::Error> for Error {
+    fn from(e: event::Error) -> Self {
+        Self::Event(e)
+    }
+}
+
+impl From<RecvError> for Error {
+    fn from(e: RecvError) -> Self {
+        Self::OneShotRecv(e)
+    }
+}
--- a/crates/signer_proxy/src/lib.rs
+++ b/crates/signer_proxy/src/lib.rs
@@ -0,0 +1,678 @@
+use std::collections::HashMap;
+use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4, TcpListener};
+use std::pin::Pin;
+use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
+use std::sync::Arc;
+use std::task::{Context, Poll};
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use atomic_destructor::{AtomicDestroyer, AtomicDestructor};
+use bytes::Bytes;
+use futures::FutureExt;
+use http_body_util::combinators::BoxBody;
+use http_body_util::{BodyExt, Full};
+use hyper::body::Incoming;
+use hyper::server::conn::http1;
+use hyper::service::service_fn;
+use hyper::{Method, Request, Response, StatusCode};
+use nostr::prelude::{BoxedFuture, SignerBackend};
+use nostr::{Event, NostrSigner, PublicKey, SignerError, UnsignedEvent};
+use serde::de::DeserializeOwned;
+use serde::{Deserialize, Serialize, Serializer};
+use serde_json::{json, Value};
+use smol::io::{AsyncRead, AsyncWrite};
+use smol::lock::Mutex;
+use uuid::Uuid;
+
+use crate::error::Error;
+
+mod error;
+
+const HTML: &str = include_str!("../index.html");
+const JS: &str = include_str!("../proxy.js");
+const CSS: &str = include_str!("../style.css");
+
+/// Wrapper to make smol::Async<TcpStream> compatible with hyper
+struct HyperIo<T> {
+    inner: T,
+}
+
+impl<T> HyperIo<T> {
+    fn new(inner: T) -> Self {
+        Self { inner }
+    }
+}
+
+impl<T: AsyncRead + Unpin> hyper::rt::Read for HyperIo<T> {
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        mut buf: hyper::rt::ReadBufCursor<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        let mut tbuf = vec![0; buf.remaining()];
+        match Pin::new(&mut self.inner).poll_read(cx, &mut tbuf) {
+            Poll::Ready(Ok(n)) => {
+                buf.put_slice(&tbuf[..n]);
+                Poll::Ready(Ok(()))
+            }
+            Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
+            Poll::Pending => Poll::Pending,
+        }
+    }
+}
+
+impl<T: AsyncWrite + Unpin> hyper::rt::Write for HyperIo<T> {
+    fn poll_write(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &[u8],
+    ) -> Poll<Result<usize, std::io::Error>> {
+        Pin::new(&mut self.inner).poll_write(cx, buf)
+    }
+
+    fn poll_flush(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        Pin::new(&mut self.inner).poll_flush(cx)
+    }
+
+    fn poll_shutdown(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Result<(), std::io::Error>> {
+        Pin::new(&mut self.inner).poll_close(cx)
+    }
+}
+
+type PendingResponseMap = HashMap<Uuid, oneshot::Sender<Result<Value, String>>>;
+
+#[derive(Debug, Deserialize)]
+struct Message {
+    id: Uuid,
+    error: Option<String>,
+    result: Option<Value>,
+}
+
+impl Message {
+    fn into_result(self) -> Result<Value, String> {
+        if let Some(error) = self.error {
+            Err(error)
+        } else {
+            Ok(self.result.unwrap_or(Value::Null))
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+enum RequestMethod {
+    GetPublicKey,
+    SignEvent,
+    Nip04Encrypt,
+    Nip04Decrypt,
+    Nip44Encrypt,
+    Nip44Decrypt,
+}
+
+impl RequestMethod {
+    fn as_str(&self) -> &str {
+        match self {
+            Self::GetPublicKey => "get_public_key",
+            Self::SignEvent => "sign_event",
+            Self::Nip04Encrypt => "nip04_encrypt",
+            Self::Nip04Decrypt => "nip04_decrypt",
+            Self::Nip44Encrypt => "nip44_encrypt",
+            Self::Nip44Decrypt => "nip44_decrypt",
+        }
+    }
+}
+
+impl Serialize for RequestMethod {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(self.as_str())
+    }
+}
+
+#[derive(Debug, Clone, Serialize)]
+struct RequestData {
+    id: Uuid,
+    method: RequestMethod,
+    params: Value,
+}
+
+impl RequestData {
+    #[inline]
+    fn new(method: RequestMethod, params: Value) -> Self {
+        Self {
+            id: Uuid::new_v4(),
+            method,
+            params,
+        }
+    }
+}
+
+#[derive(Serialize)]
+struct Requests<'a> {
+    requests: &'a [RequestData],
+}
+
+impl<'a> Requests<'a> {
+    #[inline]
+    fn new(requests: &'a [RequestData]) -> Self {
+        Self { requests }
+    }
+
+    #[inline]
+    fn len(&self) -> usize {
+        self.requests.len()
+    }
+}
+
+/// Params for NIP-04 and NIP-44 encryption/decryption
+#[derive(Serialize)]
+struct CryptoParams<'a> {
+    public_key: &'a PublicKey,
+    content: &'a str,
+}
+
+impl<'a> CryptoParams<'a> {
+    #[inline]
+    fn new(public_key: &'a PublicKey, content: &'a str) -> Self {
+        Self {
+            public_key,
+            content,
+        }
+    }
+}
+
+#[derive(Debug)]
+struct ProxyState {
+    /// Requests waiting to be picked up by browser
+    pub outgoing_requests: Mutex<Vec<RequestData>>,
+    /// Map of request ID to response sender
+    pub pending_responses: Mutex<PendingResponseMap>,
+    /// Last time the client ask for the pending requests
+    pub last_pending_request: Arc<AtomicU64>,
+    /// Notification for shutdown
+    pub shutdown_notify: smol::channel::Receiver<()>,
+    pub shutdown_sender: smol::channel::Sender<()>,
+}
+
+/// Configuration options for [`BrowserSignerProxy`].
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct BrowserSignerProxyOptions {
+    /// Request timeout for the signer extension. Default is 30 seconds.
+    pub timeout: Duration,
+    /// Proxy server IP address and port. Default is `127.0.0.1:7400`.
+    pub addr: SocketAddr,
+}
+
+#[derive(Debug, Clone)]
+struct InnerBrowserSignerProxy {
+    /// Configuration options for the proxy
+    options: BrowserSignerProxyOptions,
+    /// Internal state of the proxy including request queues
+    state: Arc<ProxyState>,
+    /// Flag to indicate if the server is shutdown
+    is_shutdown: Arc<AtomicBool>,
+    /// Flat indicating if the server is started
+    is_started: Arc<AtomicBool>,
+}
+
+impl AtomicDestroyer for InnerBrowserSignerProxy {
+    fn on_destroy(&self) {
+        self.shutdown();
+    }
+}
+
+impl InnerBrowserSignerProxy {
+    #[inline]
+    fn is_shutdown(&self) -> bool {
+        self.is_shutdown.load(Ordering::SeqCst)
+    }
+
+    fn shutdown(&self) {
+        // Mark the server as shutdown
+        self.is_shutdown.store(true, Ordering::SeqCst);
+
+        // Notify all waiters that the proxy is shutting down
+        let _ = self.state.shutdown_sender.try_send(());
+    }
+}
+
+/// Nostr Browser Signer Proxy
+///
+/// Proxy to use Nostr Browser signer (NIP-07) in native applications.
+#[derive(Debug, Clone)]
+pub struct BrowserSignerProxy {
+    inner: AtomicDestructor<InnerBrowserSignerProxy>,
+}
+
+impl Default for BrowserSignerProxyOptions {
+    fn default() -> Self {
+        Self {
+            timeout: Duration::from_secs(30),
+            // 7 for NIP-07 and 400 because the NIP title is 40 bytes :)
+            addr: SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, 7400)),
+        }
+    }
+}
+
+impl BrowserSignerProxyOptions {
+    /// Sets the timeout duration.
+    pub const fn timeout(mut self, timeout: Duration) -> Self {
+        self.timeout = timeout;
+        self
+    }
+
+    /// Sets the IP address.
+    pub const fn ip_addr(mut self, new_ip: IpAddr) -> Self {
+        self.addr = SocketAddr::new(new_ip, self.addr.port());
+        self
+    }
+
+    /// Sets the port number.
+    pub const fn port(mut self, new_port: u16) -> Self {
+        self.addr = SocketAddr::new(self.addr.ip(), new_port);
+        self
+    }
+}
+
+impl BrowserSignerProxy {
+    /// Construct a new browser signer proxy
+    pub fn new(options: BrowserSignerProxyOptions) -> Self {
+        let (shutdown_sender, shutdown_notify) = smol::channel::unbounded();
+        let state = ProxyState {
+            outgoing_requests: Mutex::new(Vec::new()),
+            pending_responses: Mutex::new(HashMap::new()),
+            last_pending_request: Arc::new(AtomicU64::new(0)),
+            shutdown_notify,
+            shutdown_sender,
+        };
+
+        Self {
+            inner: AtomicDestructor::new(InnerBrowserSignerProxy {
+                options,
+                state: Arc::new(state),
+                is_shutdown: Arc::new(AtomicBool::new(false)),
+                is_started: Arc::new(AtomicBool::new(false)),
+            }),
+        }
+    }
+
+    /// Indicates whether the server is currently running.
+    #[inline]
+    pub fn is_started(&self) -> bool {
+        self.inner.is_started.load(Ordering::SeqCst)
+    }
+
+    /// Checks if there is an open browser tap ready to respond to requests by
+    /// verifying the time since the last pending request.
+    #[inline]
+    pub fn is_session_active(&self) -> bool {
+        current_time() - self.inner.state.last_pending_request.load(Ordering::SeqCst) < 2
+    }
+
+    /// Get the signer proxy webpage URL
+    #[inline]
+    pub fn url(&self) -> String {
+        format!("http://{}", self.inner.options.addr)
+    }
+
+    /// Start the proxy
+    ///
+    /// If this is not called, will be automatically started on the first interaction with the signer.
+    pub async fn start(&self) -> Result<(), Error> {
+        // Ensure is not shutdown
+        if self.inner.is_shutdown() {
+            return Err(Error::Shutdown);
+        }
+
+        // Mark the proxy as started and check if was already started
+        let is_started: bool = self.inner.is_started.swap(true, Ordering::SeqCst);
+
+        // Immediately return if already started
+        if is_started {
+            return Ok(());
+        }
+
+        let listener = match smol::Async::<TcpListener>::bind(self.inner.options.addr) {
+            Ok(listener) => listener,
+            Err(e) => {
+                // Undo the started flag if binding fails
+                self.inner.is_started.store(false, Ordering::SeqCst);
+
+                // Propagate error
+                return Err(Error::from(e));
+            }
+        };
+
+        let addr: SocketAddr = self.inner.options.addr;
+        let state: Arc<ProxyState> = self.inner.state.clone();
+
+        smol::spawn(async move {
+            log::info!("Starting proxy server on {addr}");
+
+            loop {
+                futures::select! {
+                    accept_result = listener.accept().fuse() => {
+                        let (stream, _) = match accept_result {
+                            Ok(conn) => conn,
+                            Err(e) => {
+                                log::error!("Failed to accept connection: {e}");
+                                continue;
+                            }
+                        };
+
+                        let io = HyperIo::new(stream);
+                        let state: Arc<ProxyState> = state.clone();
+                        let shutdown_notify = state.shutdown_notify.clone();
+
+                        smol::spawn(async move {
+                            let service = service_fn(move |req| {
+                                handle_request(req, state.clone())
+                            });
+
+                            futures::select! {
+                                res = http1::Builder::new().serve_connection(io, service).fuse() => {
+                                    if let Err(e) = res {
+                                        log::error!("Error serving connection: {e}");
+                                    }
+                                }
+                                _ = shutdown_notify.recv().fuse() => {
+                                    log::debug!("Closing connection, proxy server is shutting down.");
+                                }
+                            }
+                        }).detach();
+                    },
+                    _ = state.shutdown_notify.recv().fuse() => {
+                        break;
+                    }
+                }
+            }
+
+            log::info!("Shutting down proxy server.");
+        }).detach();
+
+        Ok(())
+    }
+
+    #[inline]
+    async fn store_pending_response(&self, id: Uuid, tx: oneshot::Sender<Result<Value, String>>) {
+        let mut pending_responses = self.inner.state.pending_responses.lock().await;
+        pending_responses.insert(id, tx);
+    }
+
+    #[inline]
+    async fn store_outgoing_request(&self, request: RequestData) {
+        let mut outgoing_requests = self.inner.state.outgoing_requests.lock().await;
+        outgoing_requests.push(request);
+    }
+
+    async fn request<T>(&self, method: RequestMethod, params: Value) -> Result<T, Error>
+    where
+        T: DeserializeOwned,
+    {
+        // Start the proxy if not already started
+        self.start().await?;
+
+        // Construct the request
+        let request: RequestData = RequestData::new(method, params);
+
+        // Create a oneshot channel
+        let (tx, rx) = oneshot::channel();
+
+        // Store the response sender
+        self.store_pending_response(request.id, tx).await;
+
+        // Add to outgoing requests queue
+        self.store_outgoing_request(request).await;
+
+        // Wait for response
+        let timeout_fut = smol::Timer::after(self.inner.options.timeout);
+        let recv_fut = rx;
+
+        match futures::future::select(timeout_fut, recv_fut).await {
+            futures::future::Either::Left(_) => Err(Error::Timeout),
+            futures::future::Either::Right((recv_result, _)) => {
+                match recv_result.map_err(|_| Error::Generic("Channel closed".to_string()))? {
+                    Ok(res) => Ok(serde_json::from_value(res)?),
+                    Err(error) => Err(Error::Generic(error)),
+                }
+            }
+        }
+    }
+
+    #[inline]
+    async fn _get_public_key(&self) -> Result<PublicKey, Error> {
+        self.request(RequestMethod::GetPublicKey, json!({})).await
+    }
+
+    #[inline]
+    async fn _sign_event(&self, event: UnsignedEvent) -> Result<Event, Error> {
+        let event: Event = self
+            .request(RequestMethod::SignEvent, serde_json::to_value(event)?)
+            .await?;
+        event.verify()?;
+        Ok(event)
+    }
+
+    #[inline]
+    async fn _nip04_encrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
+        let params = CryptoParams::new(public_key, content);
+        self.request(RequestMethod::Nip04Encrypt, serde_json::to_value(params)?)
+            .await
+    }
+
+    #[inline]
+    async fn _nip04_decrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
+        let params = CryptoParams::new(public_key, content);
+        self.request(RequestMethod::Nip04Decrypt, serde_json::to_value(params)?)
+            .await
+    }
+
+    #[inline]
+    async fn _nip44_encrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
+        let params = CryptoParams::new(public_key, content);
+        self.request(RequestMethod::Nip44Encrypt, serde_json::to_value(params)?)
+            .await
+    }
+
+    #[inline]
+    async fn _nip44_decrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
+        let params = CryptoParams::new(public_key, content);
+        self.request(RequestMethod::Nip44Decrypt, serde_json::to_value(params)?)
+            .await
+    }
+}
+
+impl NostrSigner for BrowserSignerProxy {
+    fn backend(&self) -> SignerBackend {
+        SignerBackend::BrowserExtension
+    }
+
+    #[inline]
+    fn get_public_key(&self) -> BoxedFuture<Result<PublicKey, SignerError>> {
+        Box::pin(async move { self._get_public_key().await.map_err(SignerError::backend) })
+    }
+
+    #[inline]
+    fn sign_event(&self, unsigned: UnsignedEvent) -> BoxedFuture<Result<Event, SignerError>> {
+        Box::pin(async move {
+            self._sign_event(unsigned)
+                .await
+                .map_err(SignerError::backend)
+        })
+    }
+
+    #[inline]
+    fn nip04_encrypt<'a>(
+        &'a self,
+        public_key: &'a PublicKey,
+        content: &'a str,
+    ) -> BoxedFuture<'a, Result<String, SignerError>> {
+        Box::pin(async move {
+            self._nip04_encrypt(public_key, content)
+                .await
+                .map_err(SignerError::backend)
+        })
+    }
+
+    #[inline]
+    fn nip04_decrypt<'a>(
+        &'a self,
+        public_key: &'a PublicKey,
+        encrypted_content: &'a str,
+    ) -> BoxedFuture<'a, Result<String, SignerError>> {
+        Box::pin(async move {
+            self._nip04_decrypt(public_key, encrypted_content)
+                .await
+                .map_err(SignerError::backend)
+        })
+    }
+
+    #[inline]
+    fn nip44_encrypt<'a>(
+        &'a self,
+        public_key: &'a PublicKey,
+        content: &'a str,
+    ) -> BoxedFuture<'a, Result<String, SignerError>> {
+        Box::pin(async move {
+            self._nip44_encrypt(public_key, content)
+                .await
+                .map_err(SignerError::backend)
+        })
+    }
+
+    #[inline]
+    fn nip44_decrypt<'a>(
+        &'a self,
+        public_key: &'a PublicKey,
+        payload: &'a str,
+    ) -> BoxedFuture<'a, Result<String, SignerError>> {
+        Box::pin(async move {
+            self._nip44_decrypt(public_key, payload)
+                .await
+                .map_err(SignerError::backend)
+        })
+    }
+}
+
+async fn handle_request(
+    req: Request<Incoming>,
+    state: Arc<ProxyState>,
+) -> Result<Response<BoxBody<Bytes, Error>>, Error> {
+    match (req.method(), req.uri().path()) {
+        // Serve the HTML proxy page
+        (&Method::GET, "/") => Ok(Response::builder()
+            .header("Content-Type", "text/html")
+            .body(full(HTML))?),
+        // Serve the CSS page style
+        (&Method::GET, "/style.css") => Ok(Response::builder()
+            .header("Content-Type", "text/css")
+            .body(full(CSS))?),
+        // Serve the JS proxy script
+        (&Method::GET, "/proxy.js") => Ok(Response::builder()
+            .header("Content-Type", "application/javascript")
+            .body(full(JS))?),
+        // Browser polls this endpoint to get pending requests
+        (&Method::GET, "/api/pending") => {
+            state
+                .last_pending_request
+                .store(current_time(), Ordering::SeqCst);
+
+            let mut outgoing = state.outgoing_requests.lock().await;
+
+            let requests: Requests<'_> = Requests::new(&outgoing);
+            let json: String = serde_json::to_string(&requests)?;
+
+            log::debug!("Sending {} pending requests to browser", requests.len());
+
+            // Clear the outgoing requests after sending them
+            outgoing.clear();
+
+            Ok(Response::builder()
+                .header("Content-Type", "application/json")
+                .header("Access-Control-Allow-Origin", "*")
+                .body(full(json))?)
+        }
+        // Get response
+        (&Method::POST, "/api/response") => {
+            // Correctly collect the body bytes from the stream
+            let body_bytes: Bytes = match req.into_body().collect().await {
+                Ok(collected) => collected.to_bytes(),
+                Err(e) => {
+                    log::error!("Failed to read body: {e}");
+                    let response = Response::builder()
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(full("Failed to read body"))?;
+                    return Ok(response);
+                }
+            };
+
+            // Handle responses from the browser extension
+            let message: Message = match serde_json::from_slice(&body_bytes) {
+                Ok(json) => json,
+                Err(_) => {
+                    let response = Response::builder()
+                        .status(StatusCode::BAD_REQUEST)
+                        .body(full("Invalid JSON"))?;
+                    return Ok(response);
+                }
+            };
+
+            log::debug!("Received response from browser: {message:?}");
+
+            let id: Uuid = message.id;
+            let mut pending = state.pending_responses.lock().await;
+
+            match pending.remove(&id) {
+                Some(sender) => {
+                    let _ = sender.send(message.into_result());
+                }
+                None => log::warn!("No pending request found for {id}"),
+            }
+
+            let response = Response::builder()
+                .header("Access-Control-Allow-Origin", "*")
+                .body(full("OK"))?;
+            Ok(response)
+        }
+        (&Method::OPTIONS, _) => {
+            // Handle CORS preflight requests
+            let response = Response::builder()
+                .header("Access-Control-Allow-Origin", "*")
+                .header("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
+                .header("Access-Control-Allow-Headers", "Content-Type")
+                .body(full(""))?;
+            Ok(response)
+        }
+        // 404 - not found
+        _ => {
+            let response = Response::builder()
+                .status(StatusCode::NOT_FOUND)
+                .body(full("Not Found"))?;
+            Ok(response)
+        }
+    }
+}
+
+#[inline]
+fn full<T: Into<Bytes>>(chunk: T) -> BoxBody<Bytes, Error> {
+    Full::new(chunk.into())
+        .map_err(|never| match never {})
+        .boxed()
+}
+
+/// Gets the current time in seconds since the Unix epoch (1970-01-01). If the
+/// time is before the epoch, returns 0.
+#[inline]
+fn current_time() -> u64 {
+    SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|d| d.as_secs())
+        .unwrap_or_default()
+}
--- a/crates/signer_proxy/style.css
+++ b/crates/signer_proxy/style.css
@@ -0,0 +1,30 @@
+body {
+    font-family:
+        -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans,
+        Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+    padding: 20px;
+    background-color: #f0f0f0;
+}
+.container {
+    max-width: 600px;
+    margin: 0 auto;
+    background: white;
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+}
+.connected {
+    color: green;
+    font-weight: bold;
+}
+.error {
+    color: red;
+    font-weight: bold;
+}
+.status-box {
+    background: #f9f9f9;
+    padding: 10px;
+    border-radius: 4px;
+    margin: 10px 0;
+    border-left: 4px solid #ccc;
+}
--- a/crates/title_bar/src/lib.rs
+++ b/crates/title_bar/src/lib.rs
@@ -118,14 +118,14 @@ impl Render for TitleBar {
                    .w_full()
                    .when(cx.theme().platform_kind.is_mac(), |this| {
                        this.on_click(|event, window, _| {
-                            if event.up.click_count == 2 {
+                            if event.click_count() == 2 {
                                window.titlebar_double_click();
                            }
                        })
                    })
                    .when(cx.theme().platform_kind.is_linux(), |this| {
                        this.on_click(|event, window, _| {
-                            if event.up.click_count == 2 {
+                            if event.click_count() == 2 {
                                window.zoom_window();
                            }
                        })
--- a/crates/title_bar/src/platforms/mac.rs
+++ b/crates/title_bar/src/platforms/mac.rs
@@ -3,4 +3,4 @@
 ///
 /// Magic number: There is one extra pixel of padding on the left side due to
 /// the 1px border around the window on macOS apps.
-pub const TRAFFIC_LIGHT_PADDING: f32 = 71.;
+pub const TRAFFIC_LIGHT_PADDING: f32 = 80.;
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -28,3 +28,6 @@ uuid = "1.10"
 once_cell = "1.19.0"
 image = "0.25.1"
 linkify = "0.10.0"
+lsp-types = "0.97.0"
+rope = { git = "https://github.com/zed-industries/zed.git" }
+sum_tree = { git = "https://github.com/zed-industries/zed.git" }
--- a/crates/ui/src/actions.rs
+++ b/crates/ui/src/actions.rs
@@ -2,10 +2,15 @@ use gpui::{actions, Action};
 use nostr_sdk::prelude::PublicKey;
 use serde::Deserialize;

-/// Define a open profile action
+/// Define a open public key action
 #[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
-#[action(namespace = profile, no_json)]
-pub struct OpenProfile(pub PublicKey);
+#[action(namespace = pubkey, no_json)]
+pub struct OpenPublicKey(pub PublicKey);
+
+/// Define a copy inline public key action
+#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
+#[action(namespace = pubkey, no_json)]
+pub struct CopyPublicKey(pub PublicKey);

 /// Define a custom confirm action
 #[derive(Clone, Action, PartialEq, Eq, Deserialize)]
--- a/crates/ui/src/button.rs
+++ b/crates/ui/src/button.rs
@@ -1,8 +1,8 @@
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
    div, relative, AnyElement, App, ClickEvent, Div, ElementId, Hsla, InteractiveElement,
-    IntoElement, MouseButton, ParentElement, RenderOnce, SharedString,
-    StatefulInteractiveElement as _, Styled, Window,
+    IntoElement, MouseButton, ParentElement, RenderOnce, SharedString, Stateful,
+    StatefulInteractiveElement as _, StyleRefinement, Styled, Window,
 };
 use theme::ActiveTheme;

@@ -10,11 +10,6 @@ use crate::indicator::Indicator;
 use crate::tooltip::Tooltip;
 use crate::{h_flex, Disableable, Icon, Selectable, Sizable, Size, StyledExt};

-pub enum ButtonRounded {
-    Normal,
-    Full,
-}
-
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub struct ButtonCustomVariant {
    color: Hsla,
@@ -121,8 +116,8 @@ type OnClick = Option<Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>>
 /// A Button element.
 #[derive(IntoElement)]
 pub struct Button {
-    pub base: Div,
-    id: ElementId,
+    base: Stateful<Div>,
+    style: StyleRefinement,

    icon: Option<Icon>,
    label: Option<SharedString>,
@@ -130,7 +125,7 @@ pub struct Button {
    children: Vec<AnyElement>,

    variant: ButtonVariant,
-    rounded: ButtonRounded,
+    rounded: bool,
    size: Size,

    disabled: bool,
@@ -156,14 +151,14 @@ impl From<Button> for AnyElement {
 impl Button {
    pub fn new(id: impl Into<ElementId>) -> Self {
        Self {
-            base: div().flex_shrink_0(),
-            id: id.into(),
+            base: div().id(id.into()).flex_shrink_0(),
+            style: StyleRefinement::default(),
            icon: None,
            label: None,
            disabled: false,
            selected: false,
            variant: ButtonVariant::default(),
-            rounded: ButtonRounded::Normal,
+            rounded: false,
            size: Size::Medium,
            tooltip: None,
            on_click: None,
@@ -177,9 +172,9 @@ impl Button {
        }
    }

-    /// Set the border radius of the Button.
-    pub fn rounded(mut self, rounded: impl Into<ButtonRounded>) -> Self {
-        self.rounded = rounded.into();
+    /// Make the button rounded.
+    pub fn rounded(mut self) -> Self {
+        self.rounded = true;
        self
    }

@@ -255,14 +250,14 @@ impl Disableable for Button {
 }

 impl Selectable for Button {
-    fn element_id(&self) -> &ElementId {
-        &self.id
-    }
-
    fn selected(mut self, selected: bool) -> Self {
        self.selected = selected;
        self
    }
+
+    fn is_selected(&self) -> bool {
+        self.selected
+    }
 }

 impl Sizable for Button {
@@ -280,8 +275,8 @@ impl ButtonVariants for Button {
 }

 impl Styled for Button {
-    fn style(&mut self) -> &mut gpui::StyleRefinement {
-        self.base.style()
+    fn style(&mut self) -> &mut StyleRefinement {
+        &mut self.style
    }
 }

@@ -308,15 +303,15 @@ impl RenderOnce for Button {
        };

        self.base
-            .id(self.id)
+            .flex_shrink_0()
            .flex()
            .items_center()
            .justify_center()
-            .cursor_pointer()
+            .cursor_default()
            .overflow_hidden()
            .map(|this| match self.rounded {
-                ButtonRounded::Normal => this.rounded(cx.theme().radius),
-                ButtonRounded::Full => this.rounded_full(),
+                false => this.rounded(cx.theme().radius),
+                true => this.rounded_full(),
            })
            .map(|this| {
                if self.label.is_none() && self.children.is_empty() {
@@ -359,6 +354,8 @@ impl RenderOnce for Button {
                        Size::XSmall => {
                            if self.icon.is_some() {
                                this.h_6().pl_2().pr_2p5()
+                            } else if self.cta {
+                                this.h_6().px_4()
                            } else {
                                this.h_6().px_2()
                            }
@@ -366,6 +363,8 @@ impl RenderOnce for Button {
                        Size::Small => {
                            if self.icon.is_some() {
                                this.h_7().pl_2().pr_2p5()
+                            } else if self.cta {
+                                this.h_7().px_4()
                            } else {
                                this.h_7().px_2()
                            }
@@ -388,10 +387,6 @@ impl RenderOnce for Button {
                }
            })
            .text_color(normal_style.fg)
-            .when(self.selected, |this| {
-                let selected_style = style.selected(window, cx);
-                this.bg(selected_style.bg).text_color(selected_style.fg)
-            })
            .when(!self.disabled && !self.selected, |this| {
                this.bg(normal_style.bg)
                    .hover(|this| {
@@ -403,6 +398,10 @@ impl RenderOnce for Button {
                        this.bg(active_style.bg).text_color(active_style.fg)
                    })
            })
+            .when(self.selected, |this| {
+                let selected_style = style.selected(window, cx);
+                this.bg(selected_style.bg).text_color(selected_style.fg)
+            })
            .when(self.disabled, |this| {
                let disabled_style = style.disabled(window, cx);
                this.cursor_not_allowed()
@@ -410,6 +409,7 @@ impl RenderOnce for Button {
                    .text_color(disabled_style.fg)
                    .shadow_none()
            })
+            .refine_style(&self.style)
            .child({
                h_flex()
                    .id("label")
--- a/crates/ui/src/checkbox.rs
+++ b/crates/ui/src/checkbox.rs
@@ -54,13 +54,13 @@ impl Disableable for Checkbox {
 }

 impl Selectable for Checkbox {
-    fn element_id(&self) -> &ElementId {
-        &self.id
-    }
-
    fn selected(self, selected: bool) -> Self {
        self.checked(selected)
    }
+
+    fn is_selected(&self) -> bool {
+        self.checked
+    }
 }

 impl RenderOnce for Checkbox {
--- a/crates/ui/src/dock_area/tab_panel.rs
+++ b/crates/ui/src/dock_area/tab_panel.rs
@@ -412,16 +412,15 @@ impl TabPanel {
        let is_zoomed = self.is_zoomed && state.zoomable;
        let view = cx.entity().clone();
        let build_popup_menu = move |this, cx: &App| view.read(cx).popup_menu(this, cx);
+        let toolbar = self.toolbar_buttons(window, cx);
+        let has_toolbar = !toolbar.is_empty();

        h_flex()
+            .p_0p5()
            .gap_1()
            .occlude()
-            .items_center()
-            .children(
-                self.toolbar_buttons(window, cx)
-                    .into_iter()
-                    .map(|btn| btn.small().ghost()),
-            )
+            .rounded_full()
+            .children(toolbar.into_iter().map(|btn| btn.small().ghost().rounded()))
            .when(self.is_zoomed, |this| {
                this.child(
                    Button::new("zoom")
@@ -434,11 +433,16 @@ impl TabPanel {
                        })),
                )
            })
+            .when(has_toolbar, |this| {
+                this.bg(cx.theme().surface_background)
+                    .child(div().flex_shrink_0().h_4().w_px().bg(cx.theme().border))
+            })
            .child(
                Button::new("menu")
                    .icon(IconName::Ellipsis)
                    .small()
                    .ghost()
+                    .rounded()
                    .popup_menu({
                        let zoomable = state.zoomable;
                        let closable = state.closable;
@@ -647,7 +651,7 @@ impl TabPanel {
            .child(
                div()
                    .size_full()
-                    .rounded_lg()
+                    .rounded_xl()
                    .shadow_sm()
                    .when(cx.theme().mode.is_dark(), |this| this.shadow_lg())
                    .bg(cx.theme().panel_background)
@@ -667,7 +671,7 @@ impl TabPanel {
                            .p_1()
                            .child(
                                div()
-                                    .rounded_lg()
+                                    .rounded_xl()
                                    .border_1()
                                    .border_color(cx.theme().element_disabled)
                                    .bg(cx.theme().drop_target_background)
--- a/crates/ui/src/dropdown.rs
+++ b/crates/ui/src/dropdown.rs
@@ -223,7 +223,7 @@ where
                .justify_center()
                .py_6()
                .text_color(cx.theme().text_muted)
-                .child(Icon::new(IconName::Inbox).size(px(28.)))
+                .child(Icon::new(IconName::Loader).size(px(28.)))
                .into_any_element()
        }
    }
--- a/crates/ui/src/event.rs
+++ b/crates/ui/src/event.rs
@@ -10,7 +10,7 @@ pub trait InteractiveElementExt: InteractiveElement {
        Self: Sized,
    {
        self.interactivity().on_click(move |event, window, cx| {
-            if event.up.click_count == 2 {
+            if event.click_count() == 2 {
                listener(event, window, cx);
            }
        });
--- a/crates/ui/src/history.rs
+++ b/crates/ui/src/history.rs
@@ -22,10 +22,10 @@ pub struct History<I: HistoryItem> {
    redos: Vec<I>,
    last_changed_at: Instant,
    version: usize,
-    pub(crate) ignore: bool,
    max_undo: usize,
    group_interval: Option<Duration>,
    unique: bool,
+    pub ignore: bool,
 }

 impl<I> History<I>
--- a/crates/ui/src/icon.rs
+++ b/crates/ui/src/icon.rs
@@ -9,14 +9,11 @@ use crate::{Sizable, Size};

 #[derive(IntoElement, Clone)]
 pub enum IconName {
-    AddressBook,
    ArrowIn,
    ArrowDown,
    ArrowLeft,
    ArrowRight,
    ArrowUp,
-    ArrowUpCircle,
-    Bell,
    CaretUp,
    CaretDown,
    CaretDownFill,
@@ -28,18 +25,12 @@ pub enum IconName {
    CloseCircle,
    CloseCircleFill,
    Copy,
-    EditFill,
+    Edit,
    Ellipsis,
    Eye,
    EyeOff,
    EmojiFill,
-    Folder,
-    FolderFill,
-    Filter,
-    FilterFill,
-    Inbox,
    Info,
-    Language,
    Loader,
    Logout,
    Moon,
@@ -54,24 +45,23 @@ pub enum IconName {
    Plus,
    PlusFill,
    PlusCircleFill,
-    Relays,
+    Group,
    ResizeCorner,
    Reply,
    Report,
-    Forward,
+    Refresh,
+    Signal,
    Search,
-    SearchFill,
    Settings,
+    Server,
    SortAscending,
    SortDescending,
    Sun,
-    Toggle,
-    ToggleFill,
    ThumbsDown,
    ThumbsUp,
    Upload,
-    UsersThreeFill,
    OpenUrl,
+    Warning,
    WindowClose,
    WindowMaximize,
    WindowMinimize,
@@ -81,14 +71,11 @@ pub enum IconName {
 impl IconName {
    pub fn path(self) -> SharedString {
        match self {
-            Self::AddressBook => "icons/address-book.svg",
            Self::ArrowIn => "icons/arrows-in.svg",
            Self::ArrowDown => "icons/arrow-down.svg",
            Self::ArrowLeft => "icons/arrow-left.svg",
            Self::ArrowRight => "icons/arrow-right.svg",
            Self::ArrowUp => "icons/arrow-up.svg",
-            Self::ArrowUpCircle => "icons/arrow-up-circle.svg",
-            Self::Bell => "icons/bell.svg",
            Self::CaretRight => "icons/caret-right.svg",
            Self::CaretUp => "icons/caret-up.svg",
            Self::CaretDown => "icons/caret-down.svg",
@@ -100,18 +87,12 @@ impl IconName {
            Self::CloseCircle => "icons/close-circle.svg",
            Self::CloseCircleFill => "icons/close-circle-fill.svg",
            Self::Copy => "icons/copy.svg",
-            Self::EditFill => "icons/edit-fill.svg",
+            Self::Edit => "icons/edit.svg",
            Self::Ellipsis => "icons/ellipsis.svg",
            Self::Eye => "icons/eye.svg",
            Self::EmojiFill => "icons/emoji-fill.svg",
            Self::EyeOff => "icons/eye-off.svg",
-            Self::Folder => "icons/folder.svg",
-            Self::FolderFill => "icons/folder-fill.svg",
-            Self::Filter => "icons/filter.svg",
-            Self::FilterFill => "icons/filter-fill.svg",
-            Self::Inbox => "icons/inbox.svg",
            Self::Info => "icons/info.svg",
-            Self::Language => "icons/language.svg",
            Self::Loader => "icons/loader.svg",
            Self::Logout => "icons/logout.svg",
            Self::Moon => "icons/moon.svg",
@@ -126,24 +107,23 @@ impl IconName {
            Self::Plus => "icons/plus.svg",
            Self::PlusFill => "icons/plus-fill.svg",
            Self::PlusCircleFill => "icons/plus-circle-fill.svg",
-            Self::Relays => "icons/relays.svg",
+            Self::Group => "icons/group.svg",
            Self::ResizeCorner => "icons/resize-corner.svg",
            Self::Reply => "icons/reply.svg",
            Self::Report => "icons/report.svg",
-            Self::Forward => "icons/forward.svg",
+            Self::Refresh => "icons/refresh.svg",
+            Self::Signal => "icons/signal.svg",
            Self::Search => "icons/search.svg",
-            Self::SearchFill => "icons/search-fill.svg",
            Self::Settings => "icons/settings.svg",
+            Self::Server => "icons/server.svg",
            Self::SortAscending => "icons/sort-ascending.svg",
            Self::SortDescending => "icons/sort-descending.svg",
            Self::Sun => "icons/sun.svg",
-            Self::Toggle => "icons/toggle.svg",
-            Self::ToggleFill => "icons/toggle-fill.svg",
            Self::ThumbsDown => "icons/thumbs-down.svg",
            Self::ThumbsUp => "icons/thumbs-up.svg",
            Self::Upload => "icons/upload.svg",
-            Self::UsersThreeFill => "icons/users-three-fill.svg",
            Self::OpenUrl => "icons/open-url.svg",
+            Self::Warning => "icons/warning.svg",
            Self::WindowClose => "icons/window-close.svg",
            Self::WindowMaximize => "icons/window-maximize.svg",
            Self::WindowMinimize => "icons/window-minimize.svg",
--- a/crates/ui/src/indicator.rs
+++ b/crates/ui/src/indicator.rs
@@ -20,7 +20,7 @@ impl Indicator {
    pub fn new() -> Self {
        Self {
            size: Size::Small,
-            speed: Duration::from_secs_f64(0.8),
+            speed: Duration::from_secs(1),
            icon: Icon::new(IconName::Loader),
            color: None,
        }
@@ -52,17 +52,15 @@ impl Sizable for Indicator {

 impl RenderOnce for Indicator {
    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
-        div()
-            .child(
-                self.icon
-                    .with_size(self.size)
-                    .when_some(self.color, |this, color| this.text_color(color))
-                    .with_animation(
-                        "circle",
-                        Animation::new(self.speed).repeat().with_easing(ease_in_out),
-                        |this, delta| this.transform(Transformation::rotate(percentage(delta))),
-                    ),
-            )
-            .into_element()
+        div().child(
+            self.icon
+                .with_size(self.size)
+                .when_some(self.color, |this, color| this.text_color(color))
+                .with_animation(
+                    "circle",
+                    Animation::new(self.speed).repeat().with_easing(ease_in_out),
+                    |this, delta| this.transform(Transformation::rotate(percentage(delta))),
+                ),
+        )
    }
 }
--- a/crates/ui/src/input/blink_cursor.rs
+++ b/crates/ui/src/input/blink_cursor.rs
@@ -1,9 +1,10 @@
 use std::time::Duration;

-use gpui::{Context, Timer};
+use gpui::{px, Context, Pixels, Timer};

 static INTERVAL: Duration = Duration::from_millis(500);
 static PAUSE_DELAY: Duration = Duration::from_millis(300);
+pub(super) const CURSOR_WIDTH: Pixels = px(1.5);

 /// To manage the Input cursor blinking.
 ///
@@ -11,7 +12,7 @@ static PAUSE_DELAY: Duration = Duration::from_millis(300);
 /// Every loop will notify the view to update the `visible`, and Input will observe this update to touch repaint.
 ///
 /// The input painter will check if this in visible state, then it will draw the cursor.
-pub(crate) struct BlinkCursor {
+pub struct BlinkCursor {
    visible: bool,
    paused: bool,
    epoch: usize,
@@ -52,10 +53,8 @@ impl BlinkCursor {

        // Schedule the next blink
        let epoch = self.next_epoch();
-
        cx.spawn(async move |this, cx| {
            Timer::after(INTERVAL).await;
-
            if let Some(this) = this.upgrade() {
                this.update(cx, |this, cx| this.blink(epoch, cx)).ok();
            }
@@ -71,11 +70,11 @@ impl BlinkCursor {
    /// Pause the blinking, and delay 500ms to resume the blinking.
    pub fn pause(&mut self, cx: &mut Context<Self>) {
        self.paused = true;
+        self.visible = true;
        cx.notify();

        // delay 500ms to start the blinking
        let epoch = self.next_epoch();
-
        cx.spawn(async move |this, cx| {
            Timer::after(PAUSE_DELAY).await;

@@ -90,3 +89,9 @@ impl BlinkCursor {
        .detach();
    }
 }
+
+impl Default for BlinkCursor {
+    fn default() -> Self {
+        Self::new()
+    }
+}
--- a/crates/ui/src/input/change.rs
+++ b/crates/ui/src/input/change.rs
@@ -1,28 +1,28 @@
 use std::fmt::Debug;
-use std::ops::Range;

 use crate::history::HistoryItem;
+use crate::input::cursor::Selection;

 #[derive(Debug, PartialEq, Clone)]
 pub struct Change {
-    pub(crate) old_range: Range<usize>,
+    pub(crate) old_range: Selection,
    pub(crate) old_text: String,
-    pub(crate) new_range: Range<usize>,
+    pub(crate) new_range: Selection,
    pub(crate) new_text: String,
    version: usize,
 }

 impl Change {
    pub fn new(
-        old_range: Range<usize>,
+        old_range: impl Into<Selection>,
        old_text: &str,
-        new_range: Range<usize>,
+        new_range: impl Into<Selection>,
        new_text: &str,
    ) -> Self {
        Self {
-            old_range,
+            old_range: old_range.into(),
            old_text: old_text.to_string(),
-            new_range,
+            new_range: new_range.into(),
            new_text: new_text.to_string(),
            version: 0,
        }
--- a/crates/ui/src/input/clear_button.rs
+++ b/crates/ui/src/input/clear_button.rs
@@ -1,16 +1,15 @@
 use gpui::{App, Styled};
-use i18n::t;
 use theme::ActiveTheme;

-use crate::button::{Button, ButtonVariants as _};
-use crate::{Icon, IconName, Sizable as _};
+use crate::button::{Button, ButtonVariants};
+use crate::{Icon, IconName, Sizable};

 #[inline]
 pub(crate) fn clear_button(cx: &App) -> Button {
    Button::new("clean")
        .icon(Icon::new(IconName::CloseCircle))
-        .tooltip(t!("common.clear"))
+        .tooltip("Clear")
        .small()
-        .text_color(cx.theme().text_muted)
        .transparent()
+        .text_color(cx.theme().text_muted)
 }
--- a/crates/ui/src/input/cursor.rs
+++ b/crates/ui/src/input/cursor.rs
@@ -0,0 +1,46 @@
+use std::ops::Range;
+
+/// A selection in the text, represented by start and end byte indices.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
+pub struct Selection {
+    pub start: usize,
+    pub end: usize,
+}
+
+impl Selection {
+    pub fn new(start: usize, end: usize) -> Self {
+        Self { start, end }
+    }
+
+    pub fn len(&self) -> usize {
+        self.end.saturating_sub(self.start)
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.start == self.end
+    }
+
+    /// Clears the selection, setting start and end to 0.
+    pub fn clear(&mut self) {
+        self.start = 0;
+        self.end = 0;
+    }
+
+    /// Checks if the given offset is within the selection range.
+    pub fn contains(&self, offset: usize) -> bool {
+        offset >= self.start && offset < self.end
+    }
+}
+
+impl From<Range<usize>> for Selection {
+    fn from(value: Range<usize>) -> Self {
+        Self::new(value.start, value.end)
+    }
+}
+impl From<Selection> for Range<usize> {
+    fn from(value: Selection) -> Self {
+        value.start..value.end
+    }
+}
+
+pub type Position = lsp_types::Position;
--- a/crates/ui/src/input/element.rs
+++ b/crates/ui/src/input/element.rs
@@ -1,29 +1,34 @@
-use std::{ops::Range, rc::Rc};
+use std::ops::Range;
+use std::rc::Rc;

 use gpui::{
    fill, point, px, relative, size, App, Bounds, Corners, Element, ElementId, ElementInputHandler,
-    Entity, GlobalElementId, IntoElement, LayoutId, MouseButton, MouseMoveEvent, Path, Pixels,
-    Point, SharedString, Size, Style, TextAlign, TextRun, UnderlineStyle, Window, WrappedLine,
+    Entity, GlobalElementId, Half, Hitbox, IntoElement, LayoutId, MouseButton, MouseMoveEvent,
+    Path, Pixels, Point, ShapedLine, SharedString, Size, Style, TextAlign, TextRun, UnderlineStyle,
+    Window,
 };
+use rope::Rope;
 use smallvec::SmallVec;
 use theme::ActiveTheme;

-use super::{InputState, LastLayout};
+use super::blink_cursor::CURSOR_WIDTH;
+use super::rope_ext::RopeExt;
+use super::state::{InputState, LastLayout};
 use crate::Root;

-const CURSOR_THICKNESS: Pixels = px(2.);
-const RIGHT_MARGIN: Pixels = px(5.);
-const BOTTOM_MARGIN_ROWS: usize = 1;
+const BOTTOM_MARGIN_ROWS: usize = 3;
+pub(super) const RIGHT_MARGIN: Pixels = px(10.);
+pub(super) const LINE_NUMBER_RIGHT_MARGIN: Pixels = px(10.);

 pub(super) struct TextElement {
-    input: Entity<InputState>,
+    pub(crate) state: Entity<InputState>,
    placeholder: SharedString,
 }

 impl TextElement {
-    pub(super) fn new(input: Entity<InputState>) -> Self {
+    pub(super) fn new(state: Entity<InputState>) -> Self {
        Self {
-            input,
+            state,
            placeholder: SharedString::default(),
        }
    }
@@ -36,12 +41,12 @@ impl TextElement {

    fn paint_mouse_listeners(&mut self, window: &mut Window, _: &mut App) {
        window.on_mouse_event({
-            let input = self.input.clone();
+            let state = self.state.clone();

            move |event: &MouseMoveEvent, _, window, cx| {
                if event.pressed_button == Some(MouseButton::Left) {
-                    input.update(cx, |input, cx| {
-                        input.on_drag_move(event, window, cx);
+                    state.update(cx, |state, cx| {
+                        state.on_drag_move(event, window, cx);
                    });
                }
            }
@@ -52,33 +57,44 @@ impl TextElement {
    ///
    /// - cursor bounds
    /// - scroll offset
-    /// - current line index
+    /// - current row index (No only the visible lines, but all lines)
+    ///
+    /// This method also will update for track scroll to cursor.
    fn layout_cursor(
        &self,
-        lines: &[WrappedLine],
-        line_height: Pixels,
+        last_layout: &LastLayout,
        bounds: &mut Bounds<Pixels>,
-        line_number_width: Pixels,
-        window: &mut Window,
+        _: &mut Window,
        cx: &mut App,
    ) -> (Option<Bounds<Pixels>>, Point<Pixels>, Option<usize>) {
-        let input = self.input.read(cx);
-        let mut selected_range = input.selected_range.clone();
-        if let Some(marked_range) = &input.marked_range {
-            selected_range = marked_range.end..marked_range.end;
+        let state = self.state.read(cx);
+
+        let line_height = last_layout.line_height;
+        let visible_range = &last_layout.visible_range;
+        let lines = &last_layout.lines;
+        let text_wrapper = &state.text_wrapper;
+        let line_number_width = last_layout.line_number_width;
+
+        let mut selected_range = state.selected_range;
+        if let Some(ime_marked_range) = &state.ime_marked_range {
+            selected_range = (ime_marked_range.end..ime_marked_range.end).into();
        }

-        let cursor_offset = input.cursor_offset();
-        let mut current_line_index = None;
-        let mut scroll_offset = input.scroll_handle.offset();
+        let cursor = state.cursor();
+        let mut current_row = None;
+        let mut scroll_offset = state.scroll_handle.offset();
        let mut cursor_bounds = None;

        // If the input has a fixed height (Otherwise is auto-grow), we need to add a bottom margin to the input.
-        let bottom_margin = if input.is_auto_grow() {
-            px(0.) + line_height
+        let top_bottom_margin = if state.mode.is_auto_grow() {
+            #[allow(clippy::if_same_then_else)]
+            line_height
+        } else if visible_range.len() < BOTTOM_MARGIN_ROWS * 8 {
+            line_height
        } else {
-            BOTTOM_MARGIN_ROWS * line_height + line_height
+            BOTTOM_MARGIN_ROWS * line_height
        };
+
        // The cursor corresponds to the current cursor position in the text no only the line.
        let mut cursor_pos = None;
        let mut cursor_start = None;
@@ -86,68 +102,98 @@ impl TextElement {

        let mut prev_lines_offset = 0;
        let mut offset_y = px(0.);
-        for (line_ix, line) in lines.iter().enumerate() {
+
+        for (ix, wrap_line) in text_wrapper.lines.iter().enumerate() {
+            let row = ix;
+            let line_origin = point(px(0.), offset_y);
+
            // break loop if all cursor positions are found
            if cursor_pos.is_some() && cursor_start.is_some() && cursor_end.is_some() {
                break;
            }

-            let line_origin = point(px(0.), offset_y);
-            if cursor_pos.is_none() {
-                let offset = cursor_offset.saturating_sub(prev_lines_offset);
-                if let Some(pos) = line.position_for_index(offset, line_height) {
-                    current_line_index = Some(line_ix);
-                    cursor_pos = Some(line_origin + pos);
+            let in_visible_range = ix >= visible_range.start;
+            if let Some(line) = in_visible_range
+                .then(|| lines.get(ix.saturating_sub(visible_range.start)))
+                .flatten()
+            {
+                // If in visible range lines
+                if cursor_pos.is_none() {
+                    let offset = cursor.saturating_sub(prev_lines_offset);
+                    if let Some(pos) = line.position_for_index(offset, line_height) {
+                        current_row = Some(row);
+                        cursor_pos = Some(line_origin + pos);
+                    }
                }
-            }
-            if cursor_start.is_none() {
-                let offset = selected_range.start.saturating_sub(prev_lines_offset);
-                if let Some(pos) = line.position_for_index(offset, line_height) {
-                    cursor_start = Some(line_origin + pos);
+                if cursor_start.is_none() {
+                    let offset = selected_range.start.saturating_sub(prev_lines_offset);
+                    if let Some(pos) = line.position_for_index(offset, line_height) {
+                        cursor_start = Some(line_origin + pos);
+                    }
                }
-            }
-            if cursor_end.is_none() {
-                let offset = selected_range.end.saturating_sub(prev_lines_offset);
-                if let Some(pos) = line.position_for_index(offset, line_height) {
-                    cursor_end = Some(line_origin + pos);
+                if cursor_end.is_none() {
+                    let offset = selected_range.end.saturating_sub(prev_lines_offset);
+                    if let Some(pos) = line.position_for_index(offset, line_height) {
+                        cursor_end = Some(line_origin + pos);
+                    }
                }
-            }

-            offset_y += line.size(line_height).height;
-            // +1 for skip the last `\n`
-            prev_lines_offset += line.len() + 1;
+                offset_y += line.size(line_height).height;
+                // +1 for the last `\n`
+                prev_lines_offset += line.len() + 1;
+            } else {
+                // If not in the visible range.
+
+                // Just increase the offset_y and prev_lines_offset.
+                // This will let the scroll_offset to track the cursor position correctly.
+                if prev_lines_offset >= cursor && cursor_pos.is_none() {
+                    current_row = Some(row);
+                    cursor_pos = Some(line_origin);
+                }
+                if prev_lines_offset >= selected_range.start && cursor_start.is_none() {
+                    cursor_start = Some(line_origin);
+                }
+                if prev_lines_offset >= selected_range.end && cursor_end.is_none() {
+                    cursor_end = Some(line_origin);
+                }
+
+                offset_y += wrap_line.height(line_height);
+                // +1 for the last `\n`
+                prev_lines_offset += wrap_line.len() + 1;
+            }
        }

        if let (Some(cursor_pos), Some(cursor_start), Some(cursor_end)) =
            (cursor_pos, cursor_start, cursor_end)
        {
-            let cursor_moved = input.last_cursor_offset != Some(cursor_offset);
-            let selection_changed = input.last_selected_range != Some(selected_range.clone());
-
-            if cursor_moved || selection_changed {
-                scroll_offset.x =
-                    if scroll_offset.x + cursor_pos.x > (bounds.size.width - RIGHT_MARGIN) {
-                        // cursor is out of right
-                        bounds.size.width - RIGHT_MARGIN - cursor_pos.x
-                    } else if scroll_offset.x + cursor_pos.x < px(0.) {
-                        // cursor is out of left
-                        scroll_offset.x - cursor_pos.x
-                    } else {
-                        scroll_offset.x
-                    };
-                scroll_offset.y = if scroll_offset.y + cursor_pos.y + line_height
-                    > bounds.size.height - bottom_margin
+            let selection_changed = state.last_selected_range != Some(selected_range);
+            if selection_changed {
+                scroll_offset.x = if scroll_offset.x + cursor_pos.x
+                    > (bounds.size.width - line_number_width - RIGHT_MARGIN)
                {
-                    // cursor is out of bottom
-                    bounds.size.height - bottom_margin - cursor_pos.y
-                } else if scroll_offset.y + cursor_pos.y < px(0.) {
-                    // cursor is out of top
-                    scroll_offset.y - cursor_pos.y
+                    // cursor is out of right
+                    bounds.size.width - line_number_width - RIGHT_MARGIN - cursor_pos.x
+                } else if scroll_offset.x + cursor_pos.x < px(0.) {
+                    // cursor is out of left
+                    scroll_offset.x - cursor_pos.x
                } else {
-                    scroll_offset.y
+                    scroll_offset.x
                };

-                if input.selection_reversed {
+                // If we change the scroll_offset.y, GPUI will render and trigger the next run loop.
+                // So, here we just adjust offset by `line_height` for move smooth.
+                scroll_offset.y =
+                    if scroll_offset.y + cursor_pos.y > bounds.size.height - top_bottom_margin {
+                        // cursor is out of bottom
+                        scroll_offset.y - line_height
+                    } else if scroll_offset.y + cursor_pos.y < top_bottom_margin {
+                        // cursor is out of top
+                        (scroll_offset.y + line_height).min(px(0.))
+                    } else {
+                        scroll_offset.y
+                    };
+
+                if state.selection_reversed {
                    if scroll_offset.x + cursor_start.x < px(0.) {
                        // selection start is out of left
                        scroll_offset.x = -cursor_start.x;
@@ -168,54 +214,55 @@ impl TextElement {
                }
            }

-            if input.show_cursor(window, cx) {
-                // cursor blink
-                let cursor_height = line_height;
-                cursor_bounds = Some(Bounds::new(
-                    point(
-                        bounds.left() + cursor_pos.x + line_number_width + scroll_offset.x,
-                        bounds.top() + cursor_pos.y + ((line_height - cursor_height) / 2.),
-                    ),
-                    size(CURSOR_THICKNESS, cursor_height),
-                ));
-            };
+            // cursor bounds
+            let cursor_height = line_height;
+            cursor_bounds = Some(Bounds::new(
+                point(
+                    bounds.left() + cursor_pos.x + line_number_width + scroll_offset.x,
+                    bounds.top() + cursor_pos.y + ((line_height - cursor_height) / 2.),
+                ),
+                size(CURSOR_WIDTH, cursor_height),
+            ));
+        }
+
+        if let Some(deferred_scroll_offset) = state.deferred_scroll_offset {
+            scroll_offset = deferred_scroll_offset;
        }

        bounds.origin += scroll_offset;

-        (cursor_bounds, scroll_offset, current_line_index)
+        (cursor_bounds, scroll_offset, current_row)
    }

-    fn layout_selections(
-        &self,
-        lines: &[WrappedLine],
-        line_height: Pixels,
+    /// Layout the match range to a Path.
+    pub(crate) fn layout_match_range(
+        range: Range<usize>,
+        last_layout: &LastLayout,
        bounds: &mut Bounds<Pixels>,
-        line_number_width: Pixels,
-        _: &mut Window,
-        cx: &mut App,
    ) -> Option<Path<Pixels>> {
-        let input = self.input.read(cx);
-        let mut selected_range = input.selected_range.clone();
-        if let Some(marked_range) = &input.marked_range {
-            if !marked_range.is_empty() {
-                selected_range = marked_range.end..marked_range.end;
-            }
-        }
-        if selected_range.is_empty() {
+        if range.is_empty() {
            return None;
        }

-        let (start_ix, end_ix) = if selected_range.start < selected_range.end {
-            (selected_range.start, selected_range.end)
-        } else {
-            (selected_range.end, selected_range.start)
-        };
+        if range.start < last_layout.visible_range_offset.start
+            || range.end > last_layout.visible_range_offset.end
+        {
+            return None;
+        }

-        let mut prev_lines_offset = 0;
+        let line_height = last_layout.line_height;
+        let visible_top = last_layout.visible_top;
+        let visible_start_offset = last_layout.visible_range_offset.start;
+        let lines = &last_layout.lines;
+        let line_number_width = last_layout.line_number_width;
+
+        let start_ix = range.start;
+        let end_ix = range.end;
+
+        let mut prev_lines_offset = visible_start_offset;
+        let mut offset_y = visible_top;
        let mut line_corners = vec![];

-        let mut offset_y = px(0.);
        for line in lines.iter() {
            let line_size = line.size(line_height);
            let line_wrap_width = line_size.width;
@@ -239,7 +286,6 @@ impl TextElement {
                    (end.y / line_height).ceil() as usize - (start.y / line_height).ceil() as usize;

                let mut end_x = end.x;
-
                if wrapped_lines > 0 {
                    end_x = line_wrap_width;
                }
@@ -322,39 +368,79 @@ impl TextElement {
        builder.build().ok()
    }

+    fn layout_selections(
+        &self,
+        last_layout: &LastLayout,
+        bounds: &mut Bounds<Pixels>,
+        cx: &mut App,
+    ) -> Option<Path<Pixels>> {
+        let state = self.state.read(cx);
+        let mut selected_range = state.selected_range;
+        if let Some(ime_marked_range) = &state.ime_marked_range {
+            if !ime_marked_range.is_empty() {
+                selected_range = (ime_marked_range.end..ime_marked_range.end).into();
+            }
+        }
+        if selected_range.is_empty() {
+            return None;
+        }
+
+        let (start_ix, end_ix) = if selected_range.start < selected_range.end {
+            (selected_range.start, selected_range.end)
+        } else {
+            (selected_range.end, selected_range.start)
+        };
+
+        let range = start_ix.max(last_layout.visible_range_offset.start)
+            ..end_ix.min(last_layout.visible_range_offset.end);
+
+        Self::layout_match_range(range, last_layout, bounds)
+    }
+
    /// Calculate the visible range of lines in the viewport.
    ///
-    /// The visible range is based on unwrapped lines (Zero based).
+    /// Returns
+    ///
+    /// - visible_range: The visible range is based on unwrapped lines (Zero based).
+    /// - visible_top: The top position of the first visible line in the scroll viewport.
    fn calculate_visible_range(
        &self,
        state: &InputState,
        line_height: Pixels,
        input_height: Pixels,
-    ) -> Range<usize> {
-        if state.is_single_line() {
-            return 0..1;
+    ) -> (Range<usize>, Pixels) {
+        // Add extra rows to avoid showing empty space when scroll to bottom.
+        let extra_rows = 1;
+        let mut visible_top = px(0.);
+        if state.mode.is_single_line() {
+            return (0..1, visible_top);
        }

-        let scroll_top = -state.scroll_handle.offset().y;
-        let total_lines = state.text_wrapper.lines.len();
+        let total_lines = state.text_wrapper.len();
+        let scroll_top = if let Some(deferred_scroll_offset) = state.deferred_scroll_offset {
+            deferred_scroll_offset.y
+        } else {
+            state.scroll_handle.offset().y
+        };

        let mut visible_range = 0..total_lines;
-        let mut line_top = px(0.);
-
+        let mut line_bottom = px(0.);
        for (ix, line) in state.text_wrapper.lines.iter().enumerate() {
-            line_top += line.height(line_height);
+            let wrapped_height = line.height(line_height);
+            line_bottom += wrapped_height;

-            if line_top < scroll_top {
+            if line_bottom < -scroll_top {
+                visible_top = line_bottom - wrapped_height;
                visible_range.start = ix;
            }

-            if line_top > scroll_top + input_height {
-                visible_range.end = (ix + 1).min(total_lines);
+            if line_bottom + scroll_top >= input_height {
+                visible_range.end = (ix + extra_rows).min(total_lines);
                break;
            }
        }

-        visible_range
+        (visible_range, visible_top)
    }
 }

@@ -362,13 +448,17 @@ pub(super) struct PrepaintState {
    /// The lines of entire lines.
    last_layout: LastLayout,
    /// The lines only contains the visible lines in the viewport, based on `visible_range`.
-    line_numbers: Option<Vec<SmallVec<[WrappedLine; 1]>>>,
-    line_number_width: Pixels,
+    ///
+    /// The child is the soft lines.
+    line_numbers: Option<Vec<SmallVec<[ShapedLine; 1]>>>,
    /// Size of the scrollable area by entire lines.
    scroll_size: Size<Pixels>,
    cursor_bounds: Option<Bounds<Pixels>>,
    cursor_scroll_offset: Point<Pixels>,
    selection_path: Option<Path<Pixels>>,
+    hover_highlight_path: Option<Path<Pixels>>,
+    search_match_paths: Vec<(Path<Pixels>, bool)>,
+    hover_definition_hitbox: Option<Hitbox>,
    bounds: Bounds<Pixels>,
 }

@@ -380,34 +470,9 @@ impl IntoElement for TextElement {
    }
 }

-/// A debug function to print points as SVG path.
-#[allow(unused)]
-fn print_points_as_svg_path(line_corners: &Vec<Corners<Point<Pixels>>>, points: &[Point<Pixels>]) {
-    for corners in line_corners {
-        println!(
-            "tl: ({}, {}), tr: ({}, {}), bl: ({}, {}), br: ({}, {})",
-            corners.top_left.x.0 as i32,
-            corners.top_left.y.0 as i32,
-            corners.top_right.x.0 as i32,
-            corners.top_right.y.0 as i32,
-            corners.bottom_left.x.0 as i32,
-            corners.bottom_left.y.0 as i32,
-            corners.bottom_right.x.0 as i32,
-            corners.bottom_right.y.0 as i32,
-        );
-    }
-
-    if !points.is_empty() {
-        println!("M{},{}", points[0].x.0 as i32, points[0].y.0 as i32);
-        for p in points.iter().skip(1) {
-            println!("L{},{}", p.x.0 as i32, p.y.0 as i32);
-        }
-    }
-}
-
 impl Element for TextElement {
-    type RequestLayoutState = ();
    type PrepaintState = PrepaintState;
+    type RequestLayoutState = ();

    fn id(&self) -> Option<ElementId> {
        None
@@ -424,19 +489,20 @@ impl Element for TextElement {
        window: &mut Window,
        cx: &mut App,
    ) -> (LayoutId, Self::RequestLayoutState) {
-        let input = self.input.read(cx);
+        let state = self.state.read(cx);
        let line_height = window.line_height();

        let mut style = Style::default();
        style.size.width = relative(1.).into();
-        if self.input.read(cx).is_multi_line() {
+        if state.mode.is_multi_line() {
            style.flex_grow = 1.0;
-            if let Some(h) = input.mode.height() {
-                style.size.height = h.into();
-                style.min_size.height = line_height.into();
+            style.size.height = relative(1.).into();
+            if state.mode.is_auto_grow() {
+                // Auto grow to let height match to rows, but not exceed max rows.
+                let rows = state.mode.max_rows().min(state.mode.rows());
+                style.min_size.height = (rows * line_height).into();
            } else {
-                style.size.height = relative(1.).into();
-                style.min_size.height = (input.mode.rows() * line_height).into();
+                style.min_size.height = line_height.into();
            }
        } else {
            // For single-line inputs, the minimum height should be the line height
@@ -455,11 +521,19 @@ impl Element for TextElement {
        window: &mut Window,
        cx: &mut App,
    ) -> Self::PrepaintState {
+        let state = self.state.read(cx);
        let line_height = window.line_height();
-        let input = self.input.read(cx);
-        let multi_line = input.is_multi_line();
-        let visible_range = self.calculate_visible_range(input, line_height, bounds.size.height);
-        let text = input.text.clone();
+
+        let (visible_range, visible_top) =
+            self.calculate_visible_range(state, line_height, bounds.size.height);
+        let visible_start_offset = state.text.line_start_offset(visible_range.start);
+        let visible_end_offset = state
+            .text
+            .line_end_offset(visible_range.end.saturating_sub(1));
+
+        let state = self.state.read(cx);
+        let multi_line = state.mode.is_multi_line();
+        let text = state.text.clone();
        let is_empty = text.is_empty();
        let placeholder = self.placeholder.clone();
        let style = window.text_style();
@@ -467,9 +541,9 @@ impl Element for TextElement {
        let mut bounds = bounds;

        let (display_text, text_color) = if is_empty {
-            (placeholder, cx.theme().text_muted)
-        } else if input.masked {
-            ("*".repeat(text.chars().count()).into(), cx.theme().text)
+            (Rope::from(placeholder.as_str()), cx.theme().text_muted)
+        } else if state.masked {
+            (Rope::from("*".repeat(text.chars_count())), cx.theme().text)
        } else {
            (text.clone(), cx.theme().text)
        };
@@ -500,20 +574,20 @@ impl Element for TextElement {

        let runs = if !is_empty {
            vec![run]
-        } else if let Some(marked_range) = &input.marked_range {
+        } else if let Some(ime_marked_range) = &state.ime_marked_range {
            // IME marked text
            vec![
                TextRun {
-                    len: marked_range.start,
+                    len: ime_marked_range.start,
                    ..run.clone()
                },
                TextRun {
-                    len: marked_range.end - marked_range.start,
+                    len: ime_marked_range.end - ime_marked_range.start,
                    underline: marked_run.underline,
                    ..run.clone()
                },
                TextRun {
-                    len: display_text.len() - marked_range.end,
+                    len: display_text.len() - ime_marked_range.end,
                    ..run.clone()
                },
            ]
@@ -524,35 +598,76 @@ impl Element for TextElement {
            vec![run]
        };

-        let wrap_width = if multi_line {
+        let wrap_width = if multi_line && state.soft_wrap {
            Some(bounds.size.width - line_number_width - RIGHT_MARGIN)
        } else {
            None
        };

+        // NOTE: Here 50 lines about 150µs
+        // let measure = crate::Measure::new("shape_text");
+        let visible_text = display_text
+            .slice_rows(visible_range.start as u32..visible_range.end as u32)
+            .to_string();
+
        let lines = window
            .text_system()
-            .shape_text(display_text, font_size, &runs, wrap_width, None)
+            .shape_text(visible_text.into(), font_size, &runs, wrap_width, None)
            .expect("failed to shape text");
+        // measure.end();

-        let total_wrapped_lines = lines
-            .iter()
-            .map(|line| {
-                // +1 is the first line, `wrap_boundaries` is the wrapped lines after the `\n`.
-                1 + line.wrap_boundaries.len()
-            })
-            .sum::<usize>();
+        let mut longest_line_width = wrap_width.unwrap_or(px(0.));
+        if state.mode.is_multi_line() && !state.soft_wrap && lines.len() > 1 {
+            let longtest_line: SharedString = state
+                .text
+                .line(state.text.summary().longest_row as usize)
+                .to_string()
+                .into();
+            longest_line_width = window
+                .text_system()
+                .shape_line(
+                    longtest_line.clone(),
+                    font_size,
+                    &[TextRun {
+                        len: longtest_line.len(),
+                        font: style.font(),
+                        color: gpui::black(),
+                        background_color: None,
+                        underline: None,
+                        strikethrough: None,
+                    }],
+                    wrap_width,
+                )
+                .width;
+        }

-        let max_line_width = lines
-            .iter()
-            .map(|line| line.width())
-            .max()
-            .unwrap_or(bounds.size.width);
+        let total_wrapped_lines = state.text_wrapper.len();
+        let empty_bottom_height = bounds
+            .size
+            .height
+            .half()
+            .max(BOTTOM_MARGIN_ROWS * line_height);
        let scroll_size = size(
-            max_line_width + line_number_width + RIGHT_MARGIN,
-            (total_wrapped_lines as f32 * line_height).max(bounds.size.height),
+            if longest_line_width + line_number_width + RIGHT_MARGIN > bounds.size.width {
+                longest_line_width + line_number_width + RIGHT_MARGIN
+            } else {
+                longest_line_width
+            },
+            (total_wrapped_lines as f32 * line_height + empty_bottom_height)
+                .max(bounds.size.height),
        );

+        let mut last_layout = LastLayout {
+            visible_range,
+            visible_top,
+            visible_range_offset: visible_start_offset..visible_end_offset,
+            line_height,
+            wrap_width,
+            line_number_width,
+            lines: Rc::new(lines),
+            cursor_bounds: None,
+        };
+
        // `position_for_index` for example
        //
        // #### text
@@ -584,37 +699,27 @@ impl Element for TextElement {

        // Calculate the scroll offset to keep the cursor in view

-        let (cursor_bounds, cursor_scroll_offset, _) = self.layout_cursor(
-            &lines,
-            line_height,
-            &mut bounds,
-            line_number_width,
-            window,
-            cx,
-        );
+        let (cursor_bounds, cursor_scroll_offset, _) =
+            self.layout_cursor(&last_layout, &mut bounds, window, cx);
+        last_layout.cursor_bounds = cursor_bounds;

-        let selection_path = self.layout_selections(
-            &lines,
-            line_height,
-            &mut bounds,
-            line_number_width,
-            window,
-            cx,
-        );
+        let selection_path = self.layout_selections(&last_layout, &mut bounds, cx);
+        let search_match_paths = vec![];
+        let hover_highlight_path = None;
+        let line_numbers = None;
+        let hover_definition_hitbox = None;

        PrepaintState {
            bounds,
-            last_layout: LastLayout {
-                lines: Rc::new(lines),
-                line_height,
-                visible_range,
-            },
+            last_layout,
            scroll_size,
-            line_numbers: None,
-            line_number_width,
+            line_numbers,
            cursor_bounds,
            cursor_scroll_offset,
            selection_path,
+            search_match_paths,
+            hover_highlight_path,
+            hover_definition_hitbox,
        }
    }

@@ -628,21 +733,21 @@ impl Element for TextElement {
        window: &mut Window,
        cx: &mut App,
    ) {
-        let focus_handle = self.input.read(cx).focus_handle.clone();
+        let focus_handle = self.state.read(cx).focus_handle.clone();
+        let show_cursor = self.state.read(cx).show_cursor(window, cx);
        let focused = focus_handle.is_focused(window);
        let bounds = prepaint.bounds;
-        let selected_range = self.input.read(cx).selected_range.clone();
-        let visible_range = &prepaint.last_layout.visible_range;
+        let selected_range = self.state.read(cx).selected_range;

        window.handle_input(
            &focus_handle,
-            ElementInputHandler::new(bounds, self.input.clone()),
+            ElementInputHandler::new(bounds, self.state.clone()),
            cx,
        );

        // Set Root focused_input when self is focused
        if focused {
-            let state = self.input.clone();
+            let state = self.state.clone();
            if Root::read(window, cx).focused_input.as_ref() != Some(&state) {
                Root::update(window, cx, |root, _, cx| {
                    root.focused_input = Some(state);
@@ -653,7 +758,7 @@ impl Element for TextElement {

        // And reset focused_input when next_frame start
        window.on_next_frame({
-            let state = self.input.clone();
+            let state = self.state.clone();
            move |window, cx| {
                if !focused && Root::read(window, cx).focused_input.as_ref() == Some(&state) {
                    Root::update(window, cx, |root, _, cx| {
@@ -668,13 +773,10 @@ impl Element for TextElement {
        let line_height = window.line_height();
        let origin = bounds.origin;

-        let mut invisible_top_padding = px(0.);
-        for line in prepaint.last_layout.lines.iter().take(visible_range.start) {
-            invisible_top_padding += line.size(line_height).height;
-        }
+        let invisible_top_padding = prepaint.last_layout.visible_top;

        let mut mask_offset_y = px(0.);
-        if self.input.read(cx).masked {
+        if self.state.read(cx).masked {
            // Move down offset for vertical centering the *****
            if cfg!(target_os = "macos") {
                mask_offset_y = px(3.);
@@ -683,60 +785,105 @@ impl Element for TextElement {
            }
        }

+        // Paint active line
        let mut offset_y = px(0.);
        if let Some(line_numbers) = prepaint.line_numbers.as_ref() {
            offset_y += invisible_top_padding;

            // Each item is the normal lines.
            for lines in line_numbers.iter() {
-                for line in lines {
-                    let p = point(origin.x, origin.y + offset_y);
-                    let line_size = line.size(line_height);
-                    _ = line.paint(p, line_height, TextAlign::Left, None, window, cx);
-                    offset_y += line_size.height;
-                }
+                let height = line_height * lines.len() as f32;
+                offset_y += height;
            }
        }

        // Paint selections
-        if let Some(path) = prepaint.selection_path.take() {
-            window.paint_path(path, cx.theme().selection);
+        if window.is_window_active() {
+            let secondary_selection = cx.theme().selection;
+            for (path, is_active) in prepaint.search_match_paths.iter() {
+                window.paint_path(path.clone(), secondary_selection);
+
+                if *is_active {
+                    window.paint_path(path.clone(), cx.theme().selection);
+                }
+            }
+
+            if let Some(path) = prepaint.selection_path.take() {
+                window.paint_path(path, cx.theme().selection);
+            }
+
+            // Paint hover highlight
+            if let Some(path) = prepaint.hover_highlight_path.take() {
+                window.paint_path(path, secondary_selection);
+            }
        }

        // Paint text
        let mut offset_y = mask_offset_y + invisible_top_padding;
-        for line in prepaint
-            .last_layout
-            .iter()
-            .skip(visible_range.start)
-            .take(visible_range.len())
-        {
-            let p = point(origin.x + prepaint.line_number_width, origin.y + offset_y);
+        for line in prepaint.last_layout.lines.iter() {
+            let p = point(
+                origin.x + prepaint.last_layout.line_number_width,
+                origin.y + offset_y,
+            );
            _ = line.paint(p, line_height, TextAlign::Left, None, window, cx);
            offset_y += line.size(line_height).height;
        }

-        if focused {
+        // Paint blinking cursor
+        if focused && show_cursor {
            if let Some(mut cursor_bounds) = prepaint.cursor_bounds.take() {
                cursor_bounds.origin.y += prepaint.cursor_scroll_offset.y;
                window.paint_quad(fill(cursor_bounds, cx.theme().cursor));
            }
        }

-        self.input.update(cx, |input, cx| {
-            input.last_layout = Some(prepaint.last_layout.clone());
-            input.last_bounds = Some(bounds);
-            input.last_cursor_offset = Some(input.cursor_offset());
-            input.set_input_bounds(input_bounds, cx);
-            input.last_selected_range = Some(selected_range);
-            input.scroll_size = prepaint.scroll_size;
-            input.line_number_width = prepaint.line_number_width;
-            input
+        // Paint line numbers
+        let mut offset_y = px(0.);
+        if let Some(line_numbers) = prepaint.line_numbers.as_ref() {
+            offset_y += invisible_top_padding;
+
+            // Paint line number background
+            window.paint_quad(fill(
+                Bounds {
+                    origin: input_bounds.origin,
+                    size: size(
+                        prepaint.last_layout.line_number_width - LINE_NUMBER_RIGHT_MARGIN,
+                        input_bounds.size.height,
+                    ),
+                },
+                cx.theme().background,
+            ));
+
+            // Each item is the normal lines.
+            for lines in line_numbers.iter() {
+                let p = point(input_bounds.origin.x, origin.y + offset_y);
+
+                for line in lines {
+                    _ = line.paint(p, line_height, window, cx);
+                    offset_y += line_height;
+                }
+            }
+        }
+
+        self.state.update(cx, |state, cx| {
+            state.last_layout = Some(prepaint.last_layout.clone());
+            state.last_bounds = Some(bounds);
+            state.last_cursor = Some(state.cursor());
+            state.set_input_bounds(input_bounds, cx);
+            state.last_selected_range = Some(selected_range);
+            state.scroll_size = prepaint.scroll_size;
+            state
                .scroll_handle
                .set_offset(prepaint.cursor_scroll_offset);
+            state.deferred_scroll_offset = None;
+
            cx.notify();
        });

+        if let Some(hitbox) = prepaint.hover_definition_hitbox.as_ref() {
+            window.set_cursor_style(gpui::CursorStyle::PointingHand, hitbox);
+        }
+
        self.paint_mouse_listeners(window, cx);
    }
 }
--- a/crates/ui/src/input/mask_pattern.rs
+++ b/crates/ui/src/input/mask_pattern.rs
@@ -1,378 +1,410 @@
-use gpui::SharedString;
-
-#[derive(Clone, PartialEq, Debug)]
-pub enum MaskToken {
-    /// Digit, equivalent to `[0-9]`
-    Digit,
-    /// Letter, equivalent to `[a-zA-Z]`
-    Letter,
-    /// Letter or digit, equivalent to `[a-zA-Z0-9]`
-    LetterOrDigit,
-    /// Separator
-    Sep(char),
-    /// Any character
-    Any,
-}
-
-#[allow(unused)]
-impl MaskToken {
-    /// Check if the token is any character.
-    pub fn is_any(&self) -> bool {
-        matches!(self, MaskToken::Any)
-    }
-
-    /// Check if the token is a match for the given character.
-    ///
-    /// The separator is always a match any input character.
-    fn is_match(&self, ch: char) -> bool {
-        match self {
-            MaskToken::Digit => ch.is_ascii_digit(),
-            MaskToken::Letter => ch.is_ascii_alphabetic(),
-            MaskToken::LetterOrDigit => ch.is_ascii_alphanumeric(),
-            MaskToken::Any => true,
-            MaskToken::Sep(c) => *c == ch,
-        }
-    }
-
-    /// Is the token a separator (Can be ignored)
-    fn is_sep(&self) -> bool {
-        matches!(self, MaskToken::Sep(_))
-    }
-
-    /// Check if the token is a number.
-    pub fn is_number(&self) -> bool {
-        matches!(self, MaskToken::Digit)
-    }
-
-    pub fn placeholder(&self) -> char {
-        match self {
-            MaskToken::Sep(c) => *c,
-            _ => '_',
-        }
-    }
-
-    fn mask_char(&self, ch: char) -> char {
-        match self {
-            MaskToken::Digit | MaskToken::LetterOrDigit | MaskToken::Letter => ch,
-            MaskToken::Sep(c) => *c,
-            MaskToken::Any => ch,
-        }
-    }
-
-    fn unmask_char(&self, ch: char) -> Option<char> {
-        match self {
-            MaskToken::Digit => Some(ch),
-            MaskToken::Letter => Some(ch),
-            MaskToken::LetterOrDigit => Some(ch),
-            MaskToken::Any => Some(ch),
-            _ => None,
-        }
-    }
-}
-
-#[derive(Clone, Default)]
-pub enum MaskPattern {
-    #[default]
-    None,
-    Pattern {
-        pattern: SharedString,
-        tokens: Vec<MaskToken>,
-    },
-    Number {
-        /// Group separator, e.g. "," or " "
-        separator: Option<char>,
-        /// Number of fraction digits, e.g. 2 for 123.45
-        fraction: Option<usize>,
-    },
-}
-
-impl From<&str> for MaskPattern {
-    fn from(pattern: &str) -> Self {
-        Self::new(pattern)
-    }
-}
-
-impl MaskPattern {
-    /// Create a new mask pattern
-    ///
-    /// - `9` - Digit
-    /// - `A` - Letter
-    /// - `#` - Letter or Digit
-    /// - `*` - Any character
-    /// - other characters - Separator
-    ///
-    /// For example:
-    ///
-    /// - `(999)999-9999` - US phone number: (123)456-7890
-    /// - `99999-9999` - ZIP code: 12345-6789
-    /// - `AAAA-99-####` - Custom pattern: ABCD-12-3AB4
-    /// - `*999*` - Custom pattern: (123) or [123]
-    pub fn new(pattern: &str) -> Self {
-        let tokens = pattern
-            .chars()
-            .map(|ch| match ch {
-                // '0' => MaskToken::Digit0,
-                '9' => MaskToken::Digit,
-                'A' => MaskToken::Letter,
-                '#' => MaskToken::LetterOrDigit,
-                '*' => MaskToken::Any,
-                _ => MaskToken::Sep(ch),
-            })
-            .collect();
-
-        Self::Pattern {
-            pattern: pattern.to_owned().into(),
-            tokens,
-        }
-    }
-
-    #[allow(unused)]
-    fn tokens(&self) -> Option<&Vec<MaskToken>> {
-        match self {
-            Self::Pattern { tokens, .. } => Some(tokens),
-            Self::Number { .. } => None,
-            Self::None => None,
-        }
-    }
-
-    /// Create a new mask pattern with group separator, e.g. "," or " "
-    pub fn number(sep: Option<char>) -> Self {
-        Self::Number {
-            separator: sep,
-            fraction: None,
-        }
-    }
-
-    pub fn placeholder(&self) -> Option<String> {
-        match self {
-            Self::Pattern { tokens, .. } => {
-                Some(tokens.iter().map(|token| token.placeholder()).collect())
-            }
-            Self::Number { .. } => None,
-            Self::None => None,
-        }
-    }
-
-    /// Return true if the mask pattern is None or no any pattern.
-    pub fn is_none(&self) -> bool {
-        match self {
-            Self::Pattern { tokens, .. } => tokens.is_empty(),
-            Self::Number { .. } => false,
-            Self::None => true,
-        }
-    }
-
-    /// Check is the mask text is valid.
-    ///
-    /// If the mask pattern is None, always return true.
-    pub fn is_valid(&self, mask_text: &str) -> bool {
-        if self.is_none() {
-            return true;
-        }
-
-        let mut text_index = 0;
-        let mask_text_chars: Vec<char> = mask_text.chars().collect();
-        match self {
-            Self::Pattern { tokens, .. } => {
-                for token in tokens {
-                    if text_index >= mask_text_chars.len() {
-                        break;
-                    }
-
-                    let ch = mask_text_chars[text_index];
-                    if token.is_match(ch) {
-                        text_index += 1;
-                    }
-                }
-                text_index == mask_text.len()
-            }
-            Self::Number { separator, .. } => {
-                if mask_text.is_empty() {
-                    return true;
-                }
-
-                // check if the text is valid number
-                let mut parts = mask_text.split('.');
-                let int_part = parts.next().unwrap_or("");
-                let frac_part = parts.next();
-
-                if int_part.is_empty() {
-                    return false;
-                }
-
-                // check if the integer part is valid
-                if !int_part
-                    .chars()
-                    .all(|ch| ch.is_ascii_digit() || Some(ch) == *separator)
-                {
-                    return false;
-                }
-
-                // check if the fraction part is valid
-                if let Some(frac) = frac_part {
-                    if !frac
-                        .chars()
-                        .all(|ch| ch.is_ascii_digit() || Some(ch) == *separator)
-                    {
-                        return false;
-                    }
-                }
-
-                true
-            }
-            Self::None => true,
-        }
-    }
-
-    /// Check if valid input char at the given position.
-    pub fn is_valid_at(&self, ch: char, pos: usize) -> bool {
-        if self.is_none() {
-            return true;
-        }
-
-        match self {
-            Self::Pattern { tokens, .. } => {
-                if let Some(token) = tokens.get(pos) {
-                    if token.is_match(ch) {
-                        return true;
-                    }
-
-                    if token.is_sep() {
-                        // If next token is match, it's valid
-                        if let Some(next_token) = tokens.get(pos + 1) {
-                            if next_token.is_match(ch) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-
-                false
-            }
-            Self::Number { .. } => true,
-            Self::None => true,
-        }
-    }
-
-    /// Format the text according to the mask pattern
-    ///
-    /// For example:
-    ///
-    /// - pattern: (999)999-999
-    /// - text: 123456789
-    /// - mask_text: (123)456-789
-    pub fn mask(&self, text: &str) -> SharedString {
-        if self.is_none() {
-            return text.to_owned().into();
-        }
-
-        match self {
-            Self::Number {
-                separator,
-                fraction,
-            } => {
-                if let Some(sep) = *separator {
-                    // Remove the existing group separator
-                    let text = text.replace(sep, "");
-
-                    let mut parts = text.split('.');
-                    let int_part = parts.next().unwrap_or("");
-
-                    // Limit the fraction part to the given range, if not enough, pad with 0
-                    let frac_part = parts.next().map(|part| {
-                        part.chars()
-                            .take(fraction.unwrap_or(usize::MAX))
-                            .collect::<String>()
-                    });
-
-                    // Reverse the integer part for easier grouping
-                    let chars: Vec<char> = int_part.chars().rev().collect();
-                    let mut result = String::new();
-                    for (i, ch) in chars.iter().enumerate() {
-                        if i > 0 && i % 3 == 0 {
-                            result.push(sep);
-                        }
-                        result.push(*ch);
-                    }
-                    let int_with_sep: String = result.chars().rev().collect();
-
-                    let final_str = if let Some(frac) = frac_part {
-                        if fraction == &Some(0) {
-                            int_with_sep
-                        } else {
-                            format!("{int_with_sep}.{frac}")
-                        }
-                    } else {
-                        int_with_sep
-                    };
-                    return final_str.into();
-                }
-
-                text.to_owned().into()
-            }
-            Self::Pattern { tokens, .. } => {
-                let mut result = String::new();
-                let mut text_index = 0;
-                let text_chars: Vec<char> = text.chars().collect();
-                for (pos, token) in tokens.iter().enumerate() {
-                    if text_index >= text_chars.len() {
-                        break;
-                    }
-                    let ch = text_chars[text_index];
-                    // Break if expected char is not match
-                    if !token.is_sep() && !self.is_valid_at(ch, pos) {
-                        break;
-                    }
-                    let mask_ch = token.mask_char(ch);
-                    result.push(mask_ch);
-                    if ch == mask_ch {
-                        text_index += 1;
-                        continue;
-                    }
-                }
-                result.into()
-            }
-            Self::None => text.to_owned().into(),
-        }
-    }
-
-    /// Extract original text from masked text
-    pub fn unmask(&self, mask_text: &str) -> String {
-        match self {
-            Self::Number { separator, .. } => {
-                if let Some(sep) = *separator {
-                    let mut result = String::new();
-                    for ch in mask_text.chars() {
-                        if ch == sep {
-                            continue;
-                        }
-                        result.push(ch);
-                    }
-
-                    if result.contains('.') {
-                        result = result.trim_end_matches('0').to_string();
-                    }
-                    return result;
-                }
-
-                mask_text.to_owned()
-            }
-            Self::Pattern { tokens, .. } => {
-                let mut result = String::new();
-                let mask_text_chars: Vec<char> = mask_text.chars().collect();
-                for (text_index, token) in tokens.iter().enumerate() {
-                    if text_index >= mask_text_chars.len() {
-                        break;
-                    }
-                    let ch = mask_text_chars[text_index];
-                    let unmask_ch = token.unmask_char(ch);
-                    if let Some(ch) = unmask_ch {
-                        result.push(ch);
-                    }
-                }
-                result
-            }
-            Self::None => mask_text.to_owned(),
-        }
-    }
-}
+use gpui::SharedString;
+
+#[derive(Clone, PartialEq, Debug)]
+pub enum MaskToken {
+    /// 0 Digit, equivalent to `[0]`
+    // Digit0,
+    /// Digit, equivalent to `[0-9]`
+    Digit,
+    /// Letter, equivalent to `[a-zA-Z]`
+    Letter,
+    /// Letter or digit, equivalent to `[a-zA-Z0-9]`
+    LetterOrDigit,
+    /// Separator
+    Sep(char),
+    /// Any character
+    Any,
+}
+
+#[allow(unused)]
+impl MaskToken {
+    /// Check if the token is any character.
+    pub fn is_any(&self) -> bool {
+        matches!(self, MaskToken::Any)
+    }
+
+    /// Check if the token is a match for the given character.
+    ///
+    /// The separator is always a match any input character.
+    fn is_match(&self, ch: char) -> bool {
+        match self {
+            MaskToken::Digit => ch.is_ascii_digit(),
+            MaskToken::Letter => ch.is_ascii_alphabetic(),
+            MaskToken::LetterOrDigit => ch.is_ascii_alphanumeric(),
+            MaskToken::Any => true,
+            MaskToken::Sep(c) => *c == ch,
+        }
+    }
+
+    /// Is the token a separator (Can be ignored)
+    fn is_sep(&self) -> bool {
+        matches!(self, MaskToken::Sep(_))
+    }
+
+    /// Check if the token is a number.
+    pub fn is_number(&self) -> bool {
+        matches!(self, MaskToken::Digit)
+    }
+
+    pub fn placeholder(&self) -> char {
+        match self {
+            MaskToken::Sep(c) => *c,
+            _ => '_',
+        }
+    }
+
+    fn mask_char(&self, ch: char) -> char {
+        match self {
+            MaskToken::Digit | MaskToken::LetterOrDigit | MaskToken::Letter => ch,
+            MaskToken::Sep(c) => *c,
+            MaskToken::Any => ch,
+        }
+    }
+
+    fn unmask_char(&self, ch: char) -> Option<char> {
+        match self {
+            MaskToken::Digit => Some(ch),
+            MaskToken::Letter => Some(ch),
+            MaskToken::LetterOrDigit => Some(ch),
+            MaskToken::Any => Some(ch),
+            _ => None,
+        }
+    }
+}
+
+#[derive(Clone, Default)]
+pub enum MaskPattern {
+    #[default]
+    None,
+    Pattern {
+        pattern: SharedString,
+        tokens: Vec<MaskToken>,
+    },
+    Number {
+        /// Group separator, e.g. "," or " "
+        separator: Option<char>,
+        /// Number of fraction digits, e.g. 2 for 123.45
+        fraction: Option<usize>,
+    },
+}
+
+impl From<&str> for MaskPattern {
+    fn from(pattern: &str) -> Self {
+        Self::new(pattern)
+    }
+}
+
+impl MaskPattern {
+    /// Create a new mask pattern
+    ///
+    /// - `9` - Digit
+    /// - `A` - Letter
+    /// - `#` - Letter or Digit
+    /// - `*` - Any character
+    /// - other characters - Separator
+    ///
+    /// For example:
+    ///
+    /// - `(999)999-9999` - US phone number: (123)456-7890
+    /// - `99999-9999` - ZIP code: 12345-6789
+    /// - `AAAA-99-####` - Custom pattern: ABCD-12-3AB4
+    /// - `*999*` - Custom pattern: (123) or [123]
+    pub fn new(pattern: &str) -> Self {
+        let tokens = pattern
+            .chars()
+            .map(|ch| match ch {
+                // '0' => MaskToken::Digit0,
+                '9' => MaskToken::Digit,
+                'A' => MaskToken::Letter,
+                '#' => MaskToken::LetterOrDigit,
+                '*' => MaskToken::Any,
+                _ => MaskToken::Sep(ch),
+            })
+            .collect();
+
+        Self::Pattern {
+            pattern: pattern.to_owned().into(),
+            tokens,
+        }
+    }
+
+    #[allow(unused)]
+    fn tokens(&self) -> Option<&Vec<MaskToken>> {
+        match self {
+            Self::Pattern { tokens, .. } => Some(tokens),
+            Self::Number { .. } => None,
+            Self::None => None,
+        }
+    }
+
+    /// Create a new mask pattern with group separator, e.g. "," or " "
+    pub fn number(sep: Option<char>) -> Self {
+        Self::Number {
+            separator: sep,
+            fraction: None,
+        }
+    }
+
+    pub fn placeholder(&self) -> Option<String> {
+        match self {
+            Self::Pattern { tokens, .. } => {
+                Some(tokens.iter().map(|token| token.placeholder()).collect())
+            }
+            Self::Number { .. } => None,
+            Self::None => None,
+        }
+    }
+
+    /// Return true if the mask pattern is None or no any pattern.
+    pub fn is_none(&self) -> bool {
+        match self {
+            Self::Pattern { tokens, .. } => tokens.is_empty(),
+            Self::Number { .. } => false,
+            Self::None => true,
+        }
+    }
+
+    /// Check is the mask text is valid.
+    ///
+    /// If the mask pattern is None, always return true.
+    pub fn is_valid(&self, mask_text: &str) -> bool {
+        if self.is_none() {
+            return true;
+        }
+
+        let mut text_index = 0;
+        let mask_text_chars: Vec<char> = mask_text.chars().collect();
+        match self {
+            Self::Pattern { tokens, .. } => {
+                for token in tokens {
+                    if text_index >= mask_text_chars.len() {
+                        break;
+                    }
+
+                    let ch = mask_text_chars[text_index];
+                    if token.is_match(ch) {
+                        text_index += 1;
+                    }
+                }
+                text_index == mask_text.len()
+            }
+            Self::Number { separator, .. } => {
+                if mask_text.is_empty() {
+                    return true;
+                }
+
+                // check if the text is valid number
+                let mut parts = mask_text.split('.');
+                let int_part = parts.next().unwrap_or("");
+                let frac_part = parts.next();
+
+                if int_part.is_empty() {
+                    return false;
+                }
+
+                let sign_positions: Vec<usize> = int_part
+                    .chars()
+                    .enumerate()
+                    .filter_map(|(i, ch)| match is_sign(&ch) {
+                        true => Some(i),
+                        false => None,
+                    })
+                    .collect();
+
+                // only one sign is valid
+                // sign is only valid at the beginning of the string
+                if sign_positions.len() > 1 || sign_positions.first() > Some(&0) {
+                    return false;
+                }
+
+                // check if the integer part is valid
+                if !int_part.chars().enumerate().all(|(i, ch)| {
+                    ch.is_ascii_digit() || is_sign(&ch) && i == 0 || Some(ch) == *separator
+                }) {
+                    return false;
+                }
+
+                // check if the fraction part is valid
+                if let Some(frac) = frac_part {
+                    if !frac
+                        .chars()
+                        .all(|ch| ch.is_ascii_digit() || Some(ch) == *separator)
+                    {
+                        return false;
+                    }
+                }
+
+                true
+            }
+            Self::None => true,
+        }
+    }
+
+    /// Check if valid input char at the given position.
+    pub fn is_valid_at(&self, ch: char, pos: usize) -> bool {
+        if self.is_none() {
+            return true;
+        }
+
+        match self {
+            Self::Pattern { tokens, .. } => {
+                if let Some(token) = tokens.get(pos) {
+                    if token.is_match(ch) {
+                        return true;
+                    }
+
+                    if token.is_sep() {
+                        // If next token is match, it's valid
+                        if let Some(next_token) = tokens.get(pos + 1) {
+                            if next_token.is_match(ch) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+
+                false
+            }
+            Self::Number { .. } => true,
+            Self::None => true,
+        }
+    }
+
+    /// Format the text according to the mask pattern
+    ///
+    /// For example:
+    ///
+    /// - pattern: (999)999-999
+    /// - text: 123456789
+    /// - mask_text: (123)456-789
+    pub fn mask(&self, text: &str) -> SharedString {
+        if self.is_none() {
+            return text.to_owned().into();
+        }
+
+        match self {
+            Self::Number {
+                separator,
+                fraction,
+            } => {
+                if let Some(sep) = *separator {
+                    // Remove the existing group separator
+                    let text = text.replace(sep, "");
+
+                    let mut parts = text.split('.');
+                    let int_part = parts.next().unwrap_or("");
+
+                    // Limit the fraction part to the given range, if not enough, pad with 0
+                    let frac_part = parts.next().map(|part| {
+                        part.chars()
+                            .take(fraction.unwrap_or(usize::MAX))
+                            .collect::<String>()
+                    });
+
+                    // Reverse the integer part for easier grouping
+                    let mut chars: Vec<char> = int_part.chars().rev().collect();
+
+                    // Removing the sign from formatting to avoid cases such as: -,123
+                    let maybe_signed = chars.iter().position(is_sign).map(|pos| chars.remove(pos));
+
+                    let mut result = String::new();
+                    for (i, ch) in chars.iter().enumerate() {
+                        if i > 0 && i % 3 == 0 {
+                            result.push(sep);
+                        }
+                        result.push(*ch);
+                    }
+                    let int_with_sep: String = result.chars().rev().collect();
+
+                    let final_str = if let Some(frac) = frac_part {
+                        if fraction == &Some(0) {
+                            int_with_sep
+                        } else {
+                            format!("{int_with_sep}.{frac}")
+                        }
+                    } else {
+                        int_with_sep
+                    };
+
+                    let final_str = if let Some(sign) = maybe_signed {
+                        format!("{sign}{final_str}")
+                    } else {
+                        final_str
+                    };
+
+                    return final_str.into();
+                }
+
+                text.to_owned().into()
+            }
+            Self::Pattern { tokens, .. } => {
+                let mut result = String::new();
+                let mut text_index = 0;
+                let text_chars: Vec<char> = text.chars().collect();
+                for (pos, token) in tokens.iter().enumerate() {
+                    if text_index >= text_chars.len() {
+                        break;
+                    }
+                    let ch = text_chars[text_index];
+                    // Break if expected char is not match
+                    if !token.is_sep() && !self.is_valid_at(ch, pos) {
+                        break;
+                    }
+                    let mask_ch = token.mask_char(ch);
+                    result.push(mask_ch);
+                    if ch == mask_ch {
+                        text_index += 1;
+                        continue;
+                    }
+                }
+                result.into()
+            }
+            Self::None => text.to_owned().into(),
+        }
+    }
+
+    /// Extract original text from masked text
+    pub fn unmask(&self, mask_text: &str) -> String {
+        match self {
+            Self::Number { separator, .. } => {
+                if let Some(sep) = *separator {
+                    let mut result = String::new();
+                    for ch in mask_text.chars() {
+                        if ch == sep {
+                            continue;
+                        }
+                        result.push(ch);
+                    }
+
+                    if result.contains('.') {
+                        result = result.trim_end_matches('0').to_string();
+                    }
+                    return result;
+                }
+
+                mask_text.to_owned()
+            }
+            Self::Pattern { tokens, .. } => {
+                let mut result = String::new();
+                let mask_text_chars: Vec<char> = mask_text.chars().collect();
+                for (text_index, token) in tokens.iter().enumerate() {
+                    if text_index >= mask_text_chars.len() {
+                        break;
+                    }
+                    let ch = mask_text_chars[text_index];
+                    let unmask_ch = token.unmask_char(ch);
+                    if let Some(ch) = unmask_ch {
+                        result.push(ch);
+                    }
+                }
+                result
+            }
+            Self::None => mask_text.to_owned(),
+        }
+    }
+}
+
+#[inline]
+fn is_sign(ch: &char) -> bool {
+    matches!(ch, '+' | '-')
+}
--- a/crates/ui/src/input/mod.rs
+++ b/crates/ui/src/input/mod.rs
@@ -1,13 +1,15 @@
 mod blink_cursor;
 mod change;
+mod cursor;
 mod element;
 mod mask_pattern;
+mod mode;
+mod rope_ext;
 mod state;
 mod text_input;
 mod text_wrapper;

 pub(crate) mod clear_button;

-#[allow(ambiguous_glob_reexports)]
 pub use state::*;
 pub use text_input::*;
--- a/crates/ui/src/input/mode.rs
+++ b/crates/ui/src/input/mode.rs
@@ -0,0 +1,129 @@
+use gpui::SharedString;
+
+use super::text_wrapper::TextWrapper;
+
+#[derive(Debug, Copy, Clone)]
+pub struct TabSize {
+    /// Default is 2
+    pub tab_size: usize,
+    /// Set true to use `\t` as tab indent, default is false
+    pub hard_tabs: bool,
+}
+
+impl Default for TabSize {
+    fn default() -> Self {
+        Self {
+            tab_size: 2,
+            hard_tabs: false,
+        }
+    }
+}
+
+impl TabSize {
+    pub(super) fn to_string(self) -> SharedString {
+        if self.hard_tabs {
+            "\t".into()
+        } else {
+            " ".repeat(self.tab_size).into()
+        }
+    }
+}
+
+#[derive(Default, Clone)]
+pub enum InputMode {
+    #[default]
+    SingleLine,
+    MultiLine {
+        tab: TabSize,
+        rows: usize,
+    },
+    AutoGrow {
+        rows: usize,
+        min_rows: usize,
+        max_rows: usize,
+    },
+}
+
+#[allow(unused)]
+impl InputMode {
+    #[inline]
+    pub(super) fn is_single_line(&self) -> bool {
+        matches!(self, InputMode::SingleLine)
+    }
+
+    #[inline]
+    pub(super) fn is_auto_grow(&self) -> bool {
+        matches!(self, InputMode::AutoGrow { .. })
+    }
+
+    #[inline]
+    pub(super) fn is_multi_line(&self) -> bool {
+        matches!(
+            self,
+            InputMode::MultiLine { .. } | InputMode::AutoGrow { .. }
+        )
+    }
+
+    pub(super) fn set_rows(&mut self, new_rows: usize) {
+        match self {
+            InputMode::MultiLine { rows, .. } => {
+                *rows = new_rows;
+            }
+            InputMode::AutoGrow {
+                rows,
+                min_rows,
+                max_rows,
+            } => {
+                *rows = new_rows.clamp(*min_rows, *max_rows);
+            }
+            _ => {}
+        }
+    }
+
+    pub(super) fn update_auto_grow(&mut self, text_wrapper: &TextWrapper) {
+        if self.is_single_line() {
+            return;
+        }
+
+        let wrapped_lines = text_wrapper.len();
+        self.set_rows(wrapped_lines);
+    }
+
+    /// At least 1 row be return.
+    pub(super) fn rows(&self) -> usize {
+        match self {
+            InputMode::MultiLine { rows, .. } => *rows,
+            InputMode::AutoGrow { rows, .. } => *rows,
+            _ => 1,
+        }
+        .max(1)
+    }
+
+    /// At least 1 row be return.
+    #[allow(unused)]
+    pub(super) fn min_rows(&self) -> usize {
+        match self {
+            InputMode::MultiLine { .. } => 1,
+            InputMode::AutoGrow { min_rows, .. } => *min_rows,
+            _ => 1,
+        }
+        .max(1)
+    }
+
+    #[allow(unused)]
+    pub(super) fn max_rows(&self) -> usize {
+        match self {
+            InputMode::MultiLine { .. } => usize::MAX,
+            InputMode::AutoGrow { max_rows, .. } => *max_rows,
+            _ => 1,
+        }
+    }
+
+    #[inline]
+    pub(super) fn tab_size(&self) -> Option<&TabSize> {
+        match self {
+            InputMode::MultiLine { tab, .. } => Some(tab),
+            _ => None,
+        }
+    }
+}
--- a/crates/ui/src/input/rope_ext.rs
+++ b/crates/ui/src/input/rope_ext.rs
@@ -0,0 +1,207 @@
+use std::ops::Range;
+
+use rope::{Point, Rope};
+
+use super::cursor::Position;
+
+/// An extension trait for `Rope` to provide additional utility methods.
+pub trait RopeExt {
+    /// Get the line at the given row (0-based) index, including the `\r` at the end, but not `\n`.
+    ///
+    /// Return empty rope if the row (0-based) is out of bounds.
+    fn line(&self, row: usize) -> Rope;
+
+    /// Start offset of the line at the given row (0-based) index.
+    fn line_start_offset(&self, row: usize) -> usize;
+
+    /// Line the end offset (including `\n`) of the line at the given row (0-based) index.
+    ///
+    /// Return the end of the rope if the row is out of bounds.
+    fn line_end_offset(&self, row: usize) -> usize;
+
+    /// Return the number of lines in the rope.
+    fn lines_len(&self) -> usize;
+
+    /// Return the lines iterator.
+    ///
+    /// Each line is including the `\r` at the end, but not `\n`.
+    fn lines(&self) -> RopeLines;
+
+    /// Check is equal to another rope.
+    fn eq(&self, other: &Rope) -> bool;
+
+    /// Total number of characters in the rope.
+    fn chars_count(&self) -> usize;
+
+    /// Get char at the given offset (byte).
+    ///
+    /// If the offset is in the middle of a multi-byte character will panic.
+    ///
+    /// If the offset is out of bounds, return None.
+    fn char_at(&self, offset: usize) -> Option<char>;
+
+    /// Get the byte offset from the given line, column [`Position`] (0-based).
+    fn position_to_offset(&self, line_col: &Position) -> usize;
+
+    /// Get the line, column [`Position`] (0-based) from the given byte offset.
+    fn offset_to_position(&self, offset: usize) -> Position;
+
+    /// Get the word byte range at the given offset (byte).
+    fn word_range(&self, offset: usize) -> Option<Range<usize>>;
+
+    /// Get word at the given offset (byte).
+    #[allow(dead_code)]
+    fn word_at(&self, offset: usize) -> String;
+}
+
+/// An iterator over the lines of a `Rope`.
+pub struct RopeLines {
+    row: usize,
+    end_row: usize,
+    rope: Rope,
+}
+
+impl RopeLines {
+    /// Create a new `RopeLines` iterator.
+    pub fn new(rope: Rope) -> Self {
+        let end_row = rope.lines_len();
+        Self {
+            row: 0,
+            end_row,
+            rope,
+        }
+    }
+}
+
+impl Iterator for RopeLines {
+    type Item = Rope;
+
+    #[inline]
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.row >= self.end_row {
+            return None;
+        }
+
+        let line = self.rope.line(self.row);
+        self.row += 1;
+        Some(line)
+    }
+
+    #[inline]
+    fn nth(&mut self, n: usize) -> Option<Self::Item> {
+        self.row = self.row.saturating_add(n);
+        self.next()
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.end_row - self.row;
+        (len, Some(len))
+    }
+}
+
+impl std::iter::ExactSizeIterator for RopeLines {}
+impl std::iter::FusedIterator for RopeLines {}
+
+impl RopeExt for Rope {
+    fn line(&self, row: usize) -> Rope {
+        let start = self.line_start_offset(row);
+        let end = start + self.line_len(row as u32) as usize;
+        self.slice(start..end)
+    }
+
+    fn line_start_offset(&self, row: usize) -> usize {
+        let row = row as u32;
+        self.point_to_offset(Point::new(row, 0))
+    }
+
+    fn position_to_offset(&self, pos: &Position) -> usize {
+        let line = self.line(pos.line as usize);
+        self.line_start_offset(pos.line as usize)
+            + line
+                .chars()
+                .take(pos.character as usize)
+                .map(|c| c.len_utf8())
+                .sum::<usize>()
+    }
+
+    fn offset_to_position(&self, offset: usize) -> Position {
+        let point = self.offset_to_point(offset);
+        let line = self.line(point.row as usize);
+        let column = line.clip_offset(point.column as usize, sum_tree::Bias::Left);
+        let character = line.slice(0..column).chars().count();
+        Position::new(point.row, character as u32)
+    }
+
+    fn line_end_offset(&self, row: usize) -> usize {
+        if row > self.max_point().row as usize {
+            return self.len();
+        }
+
+        self.line_start_offset(row) + self.line_len(row as u32) as usize
+    }
+
+    fn lines_len(&self) -> usize {
+        self.max_point().row as usize + 1
+    }
+
+    fn lines(&self) -> RopeLines {
+        RopeLines::new(self.clone())
+    }
+
+    fn eq(&self, other: &Rope) -> bool {
+        self.summary() == other.summary()
+    }
+
+    fn chars_count(&self) -> usize {
+        self.chars().count()
+    }
+
+    fn char_at(&self, offset: usize) -> Option<char> {
+        if offset > self.len() {
+            return None;
+        }
+
+        let offset = self.clip_offset(offset, sum_tree::Bias::Left);
+        self.slice(offset..self.len()).chars().next()
+    }
+
+    fn word_range(&self, offset: usize) -> Option<Range<usize>> {
+        if offset >= self.len() {
+            return None;
+        }
+
+        let offset = self.clip_offset(offset, sum_tree::Bias::Left);
+
+        let mut left = String::new();
+        for c in self.reversed_chars_at(offset) {
+            if c.is_alphanumeric() || c == '_' {
+                left.insert(0, c);
+            } else {
+                break;
+            }
+        }
+        let start = offset.saturating_sub(left.len());
+
+        let right = self
+            .chars_at(offset)
+            .take_while(|c| c.is_alphanumeric() || *c == '_')
+            .collect::<String>();
+
+        let end = offset + right.len();
+
+        if start == end {
+            None
+        } else {
+            Some(start..end)
+        }
+    }
+
+    fn word_at(&self, offset: usize) -> String {
+        if let Some(range) = self.word_range(offset) {
+            self.slice(range).to_string()
+        } else {
+            String::new()
+        }
+    }
+}
--- a/crates/ui/src/input/state.rs
+++ b/crates/ui/src/input/state.rs
--- a/crates/ui/src/input/text_input.rs
+++ b/crates/ui/src/input/text_input.rs
@@ -6,11 +6,10 @@ use gpui::{
 };
 use theme::ActiveTheme;

-use super::InputState;
-use crate::button::{Button, ButtonVariants as _};
+use super::clear_button::clear_button;
+use super::state::{InputState, CONTEXT};
+use crate::button::{Button, ButtonVariants};
 use crate::indicator::Indicator;
-use crate::input::clear_button::clear_button;
-use crate::scroll::{Scrollbar, ScrollbarAxis};
 use crate::{h_flex, IconName, Sizable, Size, StyleSized, StyledExt};

 #[derive(IntoElement)]
@@ -18,7 +17,6 @@ pub struct TextInput {
    state: Entity<InputState>,
    style: StyleRefinement,
    size: Size,
-    no_gap: bool,
    prefix: Option<AnyElement>,
    suffix: Option<AnyElement>,
    height: Option<DefiniteLength>,
@@ -26,6 +24,8 @@ pub struct TextInput {
    cleanable: bool,
    mask_toggle: bool,
    disabled: bool,
+    bordered: bool,
+    focus_bordered: bool,
 }

 impl Sizable for TextInput {
@@ -40,9 +40,8 @@ impl TextInput {
    pub fn new(state: &Entity<InputState>) -> Self {
        Self {
            state: state.clone(),
-            style: StyleRefinement::default(),
            size: Size::default(),
-            no_gap: false,
+            style: StyleRefinement::default(),
            prefix: None,
            suffix: None,
            height: None,
@@ -50,6 +49,8 @@ impl TextInput {
            cleanable: false,
            mask_toggle: false,
            disabled: false,
+            bordered: true,
+            focus_bordered: true,
        }
    }

@@ -75,12 +76,24 @@ impl TextInput {
        self
    }

-    /// Set the appearance of the input field.
+    /// Set the appearance of the input field, if false the input field will no border, background.
    pub fn appearance(mut self, appearance: bool) -> Self {
        self.appearance = appearance;
        self
    }

+    /// Set the bordered for the input, default: true
+    pub fn bordered(mut self, bordered: bool) -> Self {
+        self.bordered = bordered;
+        self
+    }
+
+    /// Set focus border for the input, default is true.
+    pub fn focus_bordered(mut self, bordered: bool) -> Self {
+        self.focus_bordered = bordered;
+        self
+    }
+
    /// Set true to show the clear button when the input field is not empty.
    pub fn cleanable(mut self) -> Self {
        self.cleanable = true;
@@ -99,15 +112,6 @@ impl TextInput {
        self
    }

-    /// Set true to not use gap between input and prefix, suffix, and clear button.
-    ///
-    /// Default: false
-    #[allow(dead_code)]
-    pub(super) fn no_gap(mut self) -> Self {
-        self.no_gap = true;
-        self
-    }
-
    fn render_toggle_mask_button(state: Entity<InputState>) -> impl IntoElement {
        Button::new("toggle-mask")
            .icon(IconName::Eye)
@@ -132,44 +136,51 @@ impl TextInput {
    }
 }

+impl Styled for TextInput {
+    fn style(&mut self) -> &mut StyleRefinement {
+        &mut self.style
+    }
+}
+
 impl RenderOnce for TextInput {
    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
        const LINE_HEIGHT: Rems = Rems(1.25);
+        let font = window.text_style().font();
+        let font_size = window.text_style().font_size.to_pixels(window.rem_size());

-        self.state.update(cx, |state, _| {
-            state.mode.set_height(self.height);
+        self.state.update(cx, |state, cx| {
+            state.text_wrapper.set_font(font, font_size, cx);
            state.disabled = self.disabled;
        });

        let state = self.state.read(cx);
-        let focused = state.focus_handle.is_focused(window);

-        let mut gap_x = match self.size {
+        let gap_x = match self.size {
            Size::Small => px(4.),
            Size::Large => px(8.),
            _ => px(4.),
        };

-        if self.no_gap {
-            gap_x = px(0.);
-        }
-
-        let prefix = self.prefix;
-        let suffix = self.suffix;
-
-        let show_clear_button =
-            self.cleanable && !state.loading && !state.text.is_empty() && state.is_single_line();
-
        let bg = if state.disabled {
            cx.theme().surface_background
        } else {
            cx.theme().elevated_surface_background
        };

+        let prefix = self.prefix;
+        let suffix = self.suffix;
+
+        let show_clear_button = self.cleanable
+            && !state.loading
+            && !state.text.is_empty()
+            && state.mode.is_single_line();
+
+        let has_suffix = suffix.is_some() || state.loading || self.mask_toggle || show_clear_button;
+
        div()
            .id(("input", self.state.entity_id()))
            .flex()
-            .key_context(crate::input::CONTEXT)
+            .key_context(CONTEXT)
            .track_focus(&state.focus_handle)
            .when(!state.disabled, |this| {
                this.on_action(window.listener_for(&self.state, InputState::backspace))
@@ -182,17 +193,31 @@ impl RenderOnce for TextInput {
                    .on_action(window.listener_for(&self.state, InputState::delete_next_word))
                    .on_action(window.listener_for(&self.state, InputState::enter))
                    .on_action(window.listener_for(&self.state, InputState::escape))
+                    .on_action(window.listener_for(&self.state, InputState::paste))
+                    .on_action(window.listener_for(&self.state, InputState::cut))
+                    .on_action(window.listener_for(&self.state, InputState::undo))
+                    .on_action(window.listener_for(&self.state, InputState::redo))
+                    .when(state.mode.is_multi_line(), |this| {
+                        this.on_action(window.listener_for(&self.state, InputState::indent_inline))
+                            .on_action(window.listener_for(&self.state, InputState::outdent_inline))
+                            .on_action(window.listener_for(&self.state, InputState::indent_block))
+                            .on_action(window.listener_for(&self.state, InputState::outdent_block))
+                            .on_action(
+                                window.listener_for(&self.state, InputState::shift_to_new_line),
+                            )
+                    })
            })
            .on_action(window.listener_for(&self.state, InputState::left))
            .on_action(window.listener_for(&self.state, InputState::right))
            .on_action(window.listener_for(&self.state, InputState::select_left))
            .on_action(window.listener_for(&self.state, InputState::select_right))
-            .when(state.is_multi_line(), |this| {
+            .when(state.mode.is_multi_line(), |this| {
                this.on_action(window.listener_for(&self.state, InputState::up))
                    .on_action(window.listener_for(&self.state, InputState::down))
                    .on_action(window.listener_for(&self.state, InputState::select_up))
                    .on_action(window.listener_for(&self.state, InputState::select_down))
-                    .on_action(window.listener_for(&self.state, InputState::shift_to_new_line))
+                    .on_action(window.listener_for(&self.state, InputState::page_up))
+                    .on_action(window.listener_for(&self.state, InputState::page_down))
            })
            .on_action(window.listener_for(&self.state, InputState::select_all))
            .on_action(window.listener_for(&self.state, InputState::select_to_start_of_line))
@@ -209,90 +234,69 @@ impl RenderOnce for TextInput {
            .on_action(window.listener_for(&self.state, InputState::select_to_end))
            .on_action(window.listener_for(&self.state, InputState::show_character_palette))
            .on_action(window.listener_for(&self.state, InputState::copy))
-            .on_action(window.listener_for(&self.state, InputState::paste))
-            .on_action(window.listener_for(&self.state, InputState::cut))
-            .on_action(window.listener_for(&self.state, InputState::undo))
-            .on_action(window.listener_for(&self.state, InputState::redo))
            .on_key_down(window.listener_for(&self.state, InputState::on_key_down))
            .on_mouse_down(
                MouseButton::Left,
                window.listener_for(&self.state, InputState::on_mouse_down),
            )
            .on_mouse_down(
-                MouseButton::Middle,
+                MouseButton::Right,
                window.listener_for(&self.state, InputState::on_mouse_down),
            )
            .on_mouse_up(
                MouseButton::Left,
                window.listener_for(&self.state, InputState::on_mouse_up),
            )
+            .on_mouse_up(
+                MouseButton::Right,
+                window.listener_for(&self.state, InputState::on_mouse_up),
+            )
            .on_scroll_wheel(window.listener_for(&self.state, InputState::on_scroll_wheel))
            .size_full()
            .line_height(LINE_HEIGHT)
-            .cursor_text()
+            .input_px(self.size)
            .input_py(self.size)
            .input_h(self.size)
-            .when(state.is_multi_line(), |this| {
+            .cursor_text()
+            .text_size(font_size)
+            .items_center()
+            .when(state.mode.is_multi_line(), |this| {
                this.h_auto()
                    .when_some(self.height, |this, height| this.h(height))
            })
            .when(self.appearance, |this| {
-                this.bg(bg)
-                    .rounded(cx.theme().radius)
-                    .when(focused, |this| this.border_color(cx.theme().ring))
+                this.bg(bg).rounded(cx.theme().radius)
            })
-            .when(prefix.is_none(), |this| this.input_pl(self.size))
-            .input_pr(self.size)
            .items_center()
            .gap(gap_x)
-            .children(prefix)
-            // TODO: Define height here, and use it in the input element
-            .child(self.state.clone())
-            .child(
-                h_flex()
-                    .id("suffix")
-                    .absolute()
-                    .gap(gap_x)
-                    .when(self.appearance, |this| this.bg(bg))
-                    .items_center()
-                    .when(suffix.is_none(), |this| this.pr_1())
-                    .right_0()
-                    .when(state.loading, |this| {
-                        this.child(Indicator::new().color(cx.theme().text_muted))
-                    })
-                    .when(self.mask_toggle, |this| {
-                        this.child(Self::render_toggle_mask_button(self.state.clone()))
-                    })
-                    .when(show_clear_button, |this| {
-                        this.child(clear_button(cx).on_click({
-                            let state = self.state.clone();
-                            move |_, window, cx| {
-                                state.update(cx, |state, cx| {
-                                    state.clean(window, cx);
-                                })
-                            }
-                        }))
-                    })
-                    .children(suffix),
-            )
-            .when(state.is_multi_line(), |this| {
-                if state.last_layout.is_some() {
-                    this.relative().child(
-                        div()
-                            .absolute()
-                            .top_0()
-                            .left_0()
-                            .right(px(1.))
-                            .bottom_0()
-                            .child(
-                                Scrollbar::vertical(&state.scrollbar_state, &state.scroll_handle)
-                                    .axis(ScrollbarAxis::Vertical),
-                            ),
-                    )
-                } else {
-                    this
-                }
-            })
            .refine_style(&self.style)
+            .children(prefix)
+            .child(self.state.clone())
+            .when(has_suffix, |this| {
+                this.pr_2().child(
+                    h_flex()
+                        .id("suffix")
+                        .gap(gap_x)
+                        .when(self.appearance, |this| this.bg(bg))
+                        .items_center()
+                        .when(state.loading, |this| {
+                            this.child(Indicator::new().color(cx.theme().text_muted))
+                        })
+                        .when(self.mask_toggle, |this| {
+                            this.child(Self::render_toggle_mask_button(self.state.clone()))
+                        })
+                        .when(show_clear_button, |this| {
+                            this.child(clear_button(cx).on_click({
+                                let state = self.state.clone();
+                                move |_, window, cx| {
+                                    state.update(cx, |state, cx| {
+                                        state.clean(window, cx);
+                                    })
+                                }
+                            }))
+                        })
+                        .children(suffix),
+                )
+            })
    }
 }
--- a/crates/ui/src/input/text_wrapper.rs
+++ b/crates/ui/src/input/text_wrapper.rs
@@ -1,99 +1,215 @@
-use std::ops::Range;
-
-use gpui::{App, Font, LineFragment, Pixels, SharedString};
-
-#[allow(unused)]
-pub(super) struct LineWrap {
-    /// The number of soft wrapped lines of this line (Not include first line.)
-    pub(super) wrap_lines: usize,
-    /// The range of the line text in the entire text.
-    pub(super) range: Range<usize>,
-}
-
-impl LineWrap {
-    pub(super) fn height(&self, line_height: Pixels) -> Pixels {
-        line_height * (self.wrap_lines + 1)
-    }
-}
-
-/// Used to prepare the text with soft_wrap to be get lines to displayed in the TextArea
-///
-/// After use lines to calculate the scroll size of the TextArea
-pub(super) struct TextWrapper {
-    pub(super) text: SharedString,
-    /// The wrapped lines, value is start and end index of the line (by split \n).
-    pub(super) wrapped_lines: Vec<Range<usize>>,
-    /// The lines by split \n
-    pub(super) lines: Vec<LineWrap>,
-    pub(super) font: Font,
-    pub(super) font_size: Pixels,
-    /// If is none, it means the text is not wrapped
-    pub(super) wrap_width: Option<Pixels>,
-}
-
-#[allow(unused)]
-impl TextWrapper {
-    pub(super) fn new(font: Font, font_size: Pixels, wrap_width: Option<Pixels>) -> Self {
-        Self {
-            text: SharedString::default(),
-            font,
-            font_size,
-            wrap_width,
-            wrapped_lines: Vec::new(),
-            lines: Vec::new(),
-        }
-    }
-
-    pub(super) fn set_wrap_width(&mut self, wrap_width: Option<Pixels>, cx: &mut App) {
-        self.wrap_width = wrap_width;
-        self.update(&self.text.clone(), true, cx);
-    }
-
-    pub(super) fn set_font(&mut self, font: Font, font_size: Pixels, cx: &mut App) {
-        self.font = font;
-        self.font_size = font_size;
-        self.update(&self.text.clone(), true, cx);
-    }
-
-    pub(super) fn update(&mut self, text: &SharedString, force: bool, cx: &mut App) {
-        if &self.text == text && !force {
-            return;
-        }
-
-        let mut wrapped_lines = vec![];
-        let mut lines = vec![];
-        let wrap_width = self.wrap_width.unwrap_or(Pixels::MAX);
-        let mut line_wrapper = cx
-            .text_system()
-            .line_wrapper(self.font.clone(), self.font_size);
-
-        let mut prev_line_ix = 0;
-        for line in text.split('\n') {
-            let mut line_wraps = vec![];
-            let mut prev_boundary_ix = 0;
-
-            // Here only have wrapped line, if there is no wrap meet, the `line_wraps` result will empty.
-            for boundary in line_wrapper.wrap_line(&[LineFragment::text(line)], wrap_width) {
-                line_wraps.push(prev_boundary_ix..boundary.ix);
-                prev_boundary_ix = boundary.ix;
-            }
-
-            lines.push(LineWrap {
-                wrap_lines: line_wraps.len(),
-                range: prev_line_ix..prev_line_ix + line.len(),
-            });
-
-            wrapped_lines.extend(line_wraps);
-            // Reset of the line
-            if !line[prev_boundary_ix..].is_empty() || prev_boundary_ix == 0 {
-                wrapped_lines.push(prev_line_ix + prev_boundary_ix..prev_line_ix + line.len());
-            }
-
-            prev_line_ix += line.len() + 1;
-        }
-
-        self.text = text.clone();
-        self.wrapped_lines = wrapped_lines;
-        self.lines = lines;
-    }
-}
+use std::ops::Range;
+
+use gpui::{App, Font, LineFragment, Pixels};
+use rope::Rope;
+
+use super::rope_ext::RopeExt;
+
+/// A line with soft wrapped lines info.
+#[derive(Clone)]
+pub(super) struct LineItem {
+    /// The original line text.
+    line: Rope,
+    /// The soft wrapped lines relative byte range (0..line.len) of this line (Include first line).
+    ///
+    /// FIXME: Here in somecase, the `line_wrapper.wrap_line` has returned different
+    /// like the `window.text_system().shape_text`. So, this value may not equal
+    /// the actual rendered lines.
+    wrapped_lines: Vec<Range<usize>>,
+}
+
+impl LineItem {
+    /// Get the bytes length of this line.
+    #[inline]
+    pub(super) fn len(&self) -> usize {
+        self.line.len()
+    }
+
+    /// Get number of soft wrapped lines of this line (include the first line).
+    #[inline]
+    pub(super) fn lines_len(&self) -> usize {
+        self.wrapped_lines.len()
+    }
+
+    /// Get the height of this line item with given line height.
+    pub(super) fn height(&self, line_height: Pixels) -> Pixels {
+        self.lines_len() as f32 * line_height
+    }
+}
+
+/// Used to prepare the text with soft wrap to be get lines to displayed in the Editor.
+///
+/// After use lines to calculate the scroll size of the Editor.
+pub(super) struct TextWrapper {
+    text: Rope,
+    /// Total wrapped lines (Inlucde the first line), value is start and end index of the line.
+    soft_lines: usize,
+    font: Font,
+    font_size: Pixels,
+    /// If is none, it means the text is not wrapped
+    wrap_width: Option<Pixels>,
+    /// The lines by split \n
+    pub(super) lines: Vec<LineItem>,
+}
+
+#[allow(unused)]
+impl TextWrapper {
+    pub(super) fn new(font: Font, font_size: Pixels, wrap_width: Option<Pixels>) -> Self {
+        Self {
+            text: Rope::new(),
+            font,
+            font_size,
+            wrap_width,
+            soft_lines: 0,
+            lines: Vec::new(),
+        }
+    }
+
+    #[inline]
+    pub(super) fn set_default_text(&mut self, text: &Rope) {
+        self.text = text.clone();
+    }
+
+    /// Get the total number of lines including wrapped lines.
+    #[inline]
+    pub(super) fn len(&self) -> usize {
+        self.soft_lines
+    }
+
+    /// Get the line item by row index.
+    #[inline]
+    pub(super) fn line(&self, row: usize) -> Option<&LineItem> {
+        self.lines.get(row)
+    }
+
+    pub(super) fn set_wrap_width(&mut self, wrap_width: Option<Pixels>, cx: &mut App) {
+        if wrap_width == self.wrap_width {
+            return;
+        }
+
+        self.wrap_width = wrap_width;
+        self.update_all(&self.text.clone(), true, cx);
+    }
+
+    pub(super) fn set_font(&mut self, font: Font, font_size: Pixels, cx: &mut App) {
+        if self.font.eq(&font) && self.font_size == font_size {
+            return;
+        }
+
+        self.font = font;
+        self.font_size = font_size;
+        self.update_all(&self.text.clone(), true, cx);
+    }
+
+    /// Update the text wrapper and recalculate the wrapped lines.
+    ///
+    /// If the `text` is the same as the current text, do nothing.
+    ///
+    /// - `changed_text`: The text [`Rope`] that has changed.
+    /// - `range`: The `selected_range` before change.
+    /// - `new_text`: The inserted text.
+    /// - `force`: Whether to force the update, if false, the update will be skipped if the text is the same.
+    /// - `cx`: The application context.
+    pub(super) fn update(
+        &mut self,
+        changed_text: &Rope,
+        range: &Range<usize>,
+        new_text: &Rope,
+        force: bool,
+        cx: &mut App,
+    ) {
+        let mut line_wrapper = cx
+            .text_system()
+            .line_wrapper(self.font.clone(), self.font_size);
+        self._update(
+            changed_text,
+            range,
+            new_text,
+            force,
+            &mut |line_str, wrap_width| {
+                line_wrapper
+                    .wrap_line(&[LineFragment::text(line_str)], wrap_width)
+                    .collect()
+            },
+        );
+    }
+
+    fn _update<F>(
+        &mut self,
+        changed_text: &Rope,
+        range: &Range<usize>,
+        new_text: &Rope,
+        force: bool,
+        wrap_line: &mut F,
+    ) where
+        F: FnMut(&str, Pixels) -> Vec<gpui::Boundary>,
+    {
+        if self.text.eq(changed_text) && !force {
+            return;
+        }
+
+        // Remove the old changed lines.
+        let start_row = self.text.offset_to_point(range.start).row as usize;
+        let start_row = start_row.min(self.lines.len().saturating_sub(1));
+        let end_row = self.text.offset_to_point(range.end).row as usize;
+        let end_row = end_row.min(self.lines.len().saturating_sub(1));
+        let rows_range = start_row..=end_row;
+
+        // To add the new lines.
+        let new_start_row = changed_text.offset_to_point(range.start).row as usize;
+        let new_start_offset = changed_text.line_start_offset(new_start_row);
+        let new_end_row = changed_text
+            .offset_to_point(range.start + new_text.len())
+            .row as usize;
+        let new_end_offset = changed_text.line_end_offset(new_end_row);
+        let new_range = new_start_offset..new_end_offset;
+
+        let mut new_lines = vec![];
+
+        let wrap_width = self.wrap_width;
+
+        for line in changed_text.slice(new_range).lines() {
+            let line_str = line.to_string();
+            let mut wrapped_lines = vec![];
+            let mut prev_boundary_ix = 0;
+
+            // If wrap_width is Pixels::MAX, skip wrapping to disable word wrap
+            if let Some(wrap_width) = wrap_width {
+                // Here only have wrapped line, if there is no wrap meet, the `line_wraps` result will empty.
+                for boundary in wrap_line(&line_str, wrap_width) {
+                    wrapped_lines.push(prev_boundary_ix..boundary.ix);
+                    prev_boundary_ix = boundary.ix;
+                }
+            }
+
+            // Reset of the line
+            if !line_str[prev_boundary_ix..].is_empty() || prev_boundary_ix == 0 {
+                wrapped_lines.push(prev_boundary_ix..line.len());
+            }
+
+            new_lines.push(LineItem {
+                line: line.clone(),
+                wrapped_lines,
+            });
+        }
+
+        // dbg!(&new_lines.len());
+        // dbg!(self.lines.len());
+        if self.lines.is_empty() {
+            self.lines = new_lines;
+        } else {
+            self.lines.splice(rows_range, new_lines);
+        }
+
+        // dbg!(self.lines.len());
+        self.text = changed_text.clone();
+        self.soft_lines = self.lines.iter().map(|l| l.lines_len()).sum();
+    }
+
+    /// Update the text wrapper and recalculate the wrapped lines.
+    ///
+    /// If the `text` is the same as the current text, do nothing.
+    pub(crate) fn update_all(&mut self, text: &Rope, force: bool, cx: &mut App) {
+        self.update(text, &(0..text.len()), text, force, cx);
+    }
+}
--- a/crates/ui/src/list/list.rs
+++ b/crates/ui/src/list/list.rs
@@ -299,14 +299,16 @@ where

    fn on_query_input_event(
        &mut self,
-        _: &Entity<InputState>,
+        state: &Entity<InputState>,
        event: &InputEvent,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        match event {
-            InputEvent::Change(text) => {
+            InputEvent::Change => {
+                let text = state.read(cx).value();
                let text = text.trim().to_string();
+
                if Some(&text) == self.last_query.as_ref() {
                    return;
                }
@@ -347,7 +349,7 @@ where
        }
    }

-    fn set_querying(&mut self, querying: bool, _: &mut Window, cx: &mut Context<Self>) {
+    fn set_querying(&mut self, querying: bool, _window: &mut Window, cx: &mut Context<Self>) {
        self.querying = querying;
        if let Some(input) = &self.query_input {
            input.update(cx, |input, cx| input.set_loading(querying, cx))
--- a/crates/ui/src/list/list_item.rs
+++ b/crates/ui/src/list/list_item.rs
@@ -15,7 +15,6 @@ type Suffix = Option<Box<dyn Fn(&mut Window, &mut App) -> AnyElement + 'static>>

 #[derive(IntoElement)]
 pub struct ListItem {
-    id: ElementId,
    base: Stateful<Div>,
    disabled: bool,
    selected: bool,
@@ -30,8 +29,8 @@ pub struct ListItem {
 impl ListItem {
    pub fn new(id: impl Into<ElementId>) -> Self {
        let id: ElementId = id.into();
+
        Self {
-            id: id.clone(),
            base: h_flex().id(id).gap_x_1().py_1().px_2().text_base(),
            disabled: false,
            selected: false,
@@ -104,14 +103,14 @@ impl Disableable for ListItem {
 }

 impl Selectable for ListItem {
-    fn element_id(&self) -> &ElementId {
-        &self.id
-    }
-
    fn selected(mut self, selected: bool) -> Self {
        self.selected = selected;
        self
    }
+
+    fn is_selected(&self) -> bool {
+        self.selected
+    }
 }

 impl Styled for ListItem {
--- a/crates/ui/src/notification.rs
+++ b/crates/ui/src/notification.rs
@@ -1,15 +1,15 @@
 use std::any::TypeId;
 use std::borrow::Cow;
 use std::collections::{HashMap, VecDeque};
-use std::sync::Arc;
+use std::rc::Rc;
 use std::time::Duration;

 use gpui::prelude::FluentBuilder;
 use gpui::{
-    blue, div, green, px, red, yellow, Animation, AnimationExt, App, AppContext, ClickEvent,
-    Context, DismissEvent, ElementId, Entity, EventEmitter, InteractiveElement as _, IntoElement,
-    ParentElement as _, Render, SharedString, StatefulInteractiveElement, Styled, Subscription,
-    Window,
+    div, px, Animation, AnimationExt, AnyElement, App, AppContext, ClickEvent, Context,
+    DismissEvent, ElementId, Entity, EventEmitter, InteractiveElement as _, IntoElement,
+    ParentElement as _, Render, SharedString, StatefulInteractiveElement, StyleRefinement, Styled,
+    Subscription, Window,
 };
 use smol::Timer;
 use theme::ActiveTheme;
@@ -18,13 +18,26 @@ use crate::animation::cubic_bezier;
 use crate::button::{Button, ButtonVariants as _};
 use crate::{h_flex, v_flex, Icon, IconName, Sizable as _, StyledExt};

+#[derive(Debug, Clone, Copy, Default)]
 pub enum NotificationType {
+    #[default]
    Info,
    Success,
    Warning,
    Error,
 }

+impl NotificationType {
+    fn icon(&self, cx: &App) -> Icon {
+        match self {
+            Self::Info => Icon::new(IconName::Info).text_color(cx.theme().element_foreground),
+            Self::Success => Icon::new(IconName::Info).text_color(cx.theme().secondary_foreground),
+            Self::Warning => Icon::new(IconName::Warning).text_color(cx.theme().warning_foreground),
+            Self::Error => Icon::new(IconName::Warning).text_color(cx.theme().danger_foreground),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Clone, Hash, Eq)]
 pub(crate) enum NotificationId {
    Id(TypeId),
@@ -43,8 +56,6 @@ impl From<(TypeId, ElementId)> for NotificationId {
    }
 }

-type OnClick = Option<Arc<dyn Fn(&ClickEvent, &mut Window, &mut App)>>;
-
 /// A notification element.
 pub struct Notification {
    /// The id is used make the notification unique.
@@ -52,48 +63,54 @@ pub struct Notification {
    ///
    /// None means the notification will be added to the end of the list.
    id: NotificationId,
-    kind: NotificationType,
+    style: StyleRefinement,
+    type_: Option<NotificationType>,
    title: Option<SharedString>,
-    message: SharedString,
+    message: Option<SharedString>,
    icon: Option<Icon>,
    autohide: bool,
-    on_click: OnClick,
+    #[allow(clippy::type_complexity)]
+    action_builder: Option<Rc<dyn Fn(&mut Window, &mut Context<Self>) -> Button>>,
+    #[allow(clippy::type_complexity)]
+    content_builder: Option<Rc<dyn Fn(&mut Window, &mut Context<Self>) -> AnyElement>>,
+    #[allow(clippy::type_complexity)]
+    on_click: Option<Rc<dyn Fn(&ClickEvent, &mut Window, &mut App)>>,
    closing: bool,
 }

 impl From<String> for Notification {
    fn from(s: String) -> Self {
-        Self::new(s)
+        Self::new().message(s)
    }
 }

 impl From<Cow<'static, str>> for Notification {
    fn from(s: Cow<'static, str>) -> Self {
-        Self::new(s)
+        Self::new().message(s)
    }
 }

 impl From<SharedString> for Notification {
    fn from(s: SharedString) -> Self {
-        Self::new(s)
+        Self::new().message(s)
    }
 }

 impl From<&'static str> for Notification {
    fn from(s: &'static str) -> Self {
-        Self::new(s)
+        Self::new().message(s)
    }
 }

 impl From<(NotificationType, &'static str)> for Notification {
    fn from((type_, content): (NotificationType, &'static str)) -> Self {
-        Self::new(content).with_type(type_)
+        Self::new().message(content).with_type(type_)
    }
 }

 impl From<(NotificationType, SharedString)> for Notification {
    fn from((type_, content): (NotificationType, SharedString)) -> Self {
-        Self::new(content).with_type(type_)
+        Self::new().message(content).with_type(type_)
    }
 }

@@ -103,36 +120,52 @@ impl Notification {
    /// Create a new notification with the given content.
    ///
    /// default width is 320px.
-    pub fn new(message: impl Into<SharedString>) -> Self {
+    pub fn new() -> Self {
        let id: SharedString = uuid::Uuid::new_v4().to_string().into();
        let id = (TypeId::of::<DefaultIdType>(), id.into());

        Self {
            id: id.into(),
+            style: StyleRefinement::default(),
            title: None,
-            message: message.into(),
-            kind: NotificationType::Info,
+            message: None,
+            type_: None,
            icon: None,
            autohide: true,
+            action_builder: None,
+            content_builder: None,
            on_click: None,
            closing: false,
        }
    }

+    pub fn message(mut self, message: impl Into<SharedString>) -> Self {
+        self.message = Some(message.into());
+        self
+    }
+
    pub fn info(message: impl Into<SharedString>) -> Self {
-        Self::new(message).with_type(NotificationType::Info)
+        Self::new()
+            .message(message)
+            .with_type(NotificationType::Info)
    }

    pub fn success(message: impl Into<SharedString>) -> Self {
-        Self::new(message).with_type(NotificationType::Success)
+        Self::new()
+            .message(message)
+            .with_type(NotificationType::Success)
    }

    pub fn warning(message: impl Into<SharedString>) -> Self {
-        Self::new(message).with_type(NotificationType::Warning)
+        Self::new()
+            .message(message)
+            .with_type(NotificationType::Warning)
    }

    pub fn error(message: impl Into<SharedString>) -> Self {
-        Self::new(message).with_type(NotificationType::Error)
+        Self::new()
+            .message(message)
+            .with_type(NotificationType::Error)
    }

    /// Set the type for unique identification of the notification.
@@ -147,8 +180,8 @@ impl Notification {
    }

    /// Set the type and id of the notification, used to uniquely identify the notification.
-    pub fn id1<T: Sized + 'static>(mut self, key: impl Into<ElementId>) -> Self {
-        self.id = (TypeId::of::<T>(), key.into()).into();
+    pub fn custom_id(mut self, key: impl Into<ElementId>) -> Self {
+        self.id = (TypeId::of::<DefaultIdType>(), key.into()).into();
        self
    }

@@ -170,7 +203,7 @@ impl Notification {

    /// Set the type of the notification, default is NotificationType::Info.
    pub fn with_type(mut self, type_: NotificationType) -> Self {
-        self.kind = type_;
+        self.type_ = Some(type_);
        self
    }

@@ -185,11 +218,21 @@ impl Notification {
        mut self,
        on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
    ) -> Self {
-        self.on_click = Some(Arc::new(on_click));
+        self.on_click = Some(Rc::new(on_click));
        self
    }

-    fn dismiss(&mut self, _: &ClickEvent, _window: &mut Window, cx: &mut Context<Self>) {
+    /// Set the action button of the notification.
+    pub fn action<F>(mut self, action: F) -> Self
+    where
+        F: Fn(&mut Window, &mut Context<Self>) -> Button + 'static,
+    {
+        self.action_builder = Some(Rc::new(action));
+        self
+    }
+
+    /// Dismiss the notification.
+    pub fn dismiss(&mut self, _: &mut Window, cx: &mut Context<Self>) {
        self.closing = true;
        cx.notify();

@@ -207,84 +250,119 @@ impl Notification {
        })
        .detach()
    }
+
+    /// Set the content of the notification.
+    pub fn content(
+        mut self,
+        content: impl Fn(&mut Window, &mut Context<Self>) -> AnyElement + 'static,
+    ) -> Self {
+        self.content_builder = Some(Rc::new(content));
+        self
+    }
+}
+
+impl Default for Notification {
+    fn default() -> Self {
+        Self::new()
+    }
 }

 impl EventEmitter<DismissEvent> for Notification {}

 impl FluentBuilder for Notification {}

+impl Styled for Notification {
+    fn style(&mut self) -> &mut StyleRefinement {
+        &mut self.style
+    }
+}
+
 impl Render for Notification {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let closing = self.closing;
-        let icon = match self.icon.clone() {
-            Some(icon) => icon,
-            None => match self.kind {
-                NotificationType::Info => Icon::new(IconName::Info).text_color(blue()),
-                NotificationType::Warning => Icon::new(IconName::Info).text_color(yellow()),
-                NotificationType::Error => Icon::new(IconName::CloseCircle).text_color(red()),
-                NotificationType::Success => Icon::new(IconName::CheckCircle).text_color(green()),
-            },
+        let icon = match self.type_ {
+            None => self.icon.clone(),
+            Some(type_) => Some(type_.icon(cx)),
        };

-        div()
+        h_flex()
            .id("notification")
+            .refine_style(&self.style)
            .group("")
            .occlude()
            .relative()
-            .w_72()
+            .w_96()
            .border_1()
            .border_color(cx.theme().border)
            .bg(cx.theme().surface_background)
-            .rounded(cx.theme().radius)
+            .rounded(cx.theme().radius * 1.6)
            .shadow_md()
            .p_2()
            .gap_3()
-            .child(div().absolute().top_2p5().left_2().child(icon))
+            .justify_start()
+            .items_start()
+            .when_some(icon, |this, icon| {
+                this.child(div().flex_shrink_0().pt_1().child(icon))
+            })
            .child(
                v_flex()
-                    .pl_6()
+                    .flex_1()
                    .gap_1()
-                    .when_some(self.title.clone(), |this, title| {
-                        this.child(div().text_xs().font_semibold().child(title))
-                    })
                    .overflow_hidden()
-                    .child(div().text_xs().child(self.message.clone())),
+                    .when_some(self.title.clone(), |this, title| {
+                        this.child(div().text_sm().font_semibold().child(title))
+                    })
+                    .when_some(self.message.clone(), |this, message| {
+                        this.child(div().text_sm().child(message))
+                    })
+                    .when_some(self.content_builder.clone(), |this, child_builder| {
+                        this.child(child_builder(window, cx))
+                    })
+                    .when_some(self.action_builder.clone(), |this, action_builder| {
+                        this.child(action_builder(window, cx).small().w_full().my_2())
+                    }),
+            )
+            .child(
+                div()
+                    .absolute()
+                    .top_2p5()
+                    .right_2p5()
+                    .invisible()
+                    .group_hover("", |this| this.visible())
+                    .child(
+                        Button::new("close")
+                            .icon(IconName::Close)
+                            .ghost()
+                            .xsmall()
+                            .on_click(cx.listener(|this, _, window, cx| {
+                                this.dismiss(window, cx);
+                            })),
+                    ),
            )
            .when_some(self.on_click.clone(), |this, on_click| {
-                this.cursor_pointer()
-                    .on_click(cx.listener(move |view, event, window, cx| {
-                        view.dismiss(event, window, cx);
-                        on_click(event, window, cx);
-                    }))
-            })
-            .when(!self.autohide, |this| {
-                this.child(
-                    h_flex()
-                        .absolute()
-                        .top_1()
-                        .right_1()
-                        .invisible()
-                        .group_hover("", |this| this.visible())
-                        .child(
-                            Button::new("close")
-                                .icon(IconName::Close)
-                                .ghost()
-                                .xsmall()
-                                .on_click(cx.listener(Self::dismiss)),
-                        ),
-                )
+                this.on_click(cx.listener(move |view, event, window, cx| {
+                    view.dismiss(window, cx);
+                    on_click(event, window, cx);
+                }))
            })
            .with_animation(
                ElementId::NamedInteger("slide-down".into(), closing as u64),
-                Animation::new(Duration::from_secs_f64(0.15))
+                Animation::new(Duration::from_secs_f64(0.25))
                    .with_easing(cubic_bezier(0.4, 0., 0.2, 1.)),
                move |this, delta| {
                    if closing {
                        let x_offset = px(0.) + delta * px(45.);
-                        this.left(px(0.) + x_offset).opacity(1. - delta)
+                        let opacity = 1. - delta;
+                        this.left(px(0.) + x_offset)
+                            .shadow_none()
+                            .opacity(opacity)
+                            .when(opacity < 0.85, |this| this.shadow_none())
                    } else {
                        let y_offset = px(-45.) + delta * px(45.);
-                        this.top(px(0.) + y_offset).opacity(delta)
+                        let opacity = delta;
+                        this.top(px(0.) + y_offset)
+                            .opacity(opacity)
+                            .when(opacity < 0.85, |this| this.shadow_none())
                    }
                },
            )
@@ -296,7 +374,7 @@ pub struct NotificationList {
    /// Notifications that will be auto hidden.
    pub(crate) notifications: VecDeque<Entity<Notification>>,
    expanded: bool,
-    subscriptions: HashMap<NotificationId, Subscription>,
+    _subscriptions: HashMap<NotificationId, Subscription>,
 }

 impl NotificationList {
@@ -304,16 +382,14 @@ impl NotificationList {
        Self {
            notifications: VecDeque::new(),
            expanded: false,
-            subscriptions: HashMap::new(),
+            _subscriptions: HashMap::new(),
        }
    }

-    pub fn push(
-        &mut self,
-        notification: impl Into<Notification>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+    pub fn push<T>(&mut self, notification: T, window: &mut Window, cx: &mut Context<Self>)
+    where
+        T: Into<Notification>,
+    {
        let notification = notification.into();
        let id = notification.id.clone();
        let autohide = notification.autohide;
@@ -323,28 +399,47 @@ impl NotificationList {

        let notification = cx.new(|_| notification);

-        self.subscriptions.insert(
+        self._subscriptions.insert(
            id.clone(),
            cx.subscribe(&notification, move |view, _, _: &DismissEvent, cx| {
                view.notifications.retain(|note| id != note.read(cx).id);
-                view.subscriptions.remove(&id);
+                view._subscriptions.remove(&id);
            }),
        );

        self.notifications.push_back(notification.clone());
+
        if autohide {
-            // Sleep for 3 seconds to autohide the notification
+            // Sleep for 5 seconds to autohide the notification
            cx.spawn_in(window, async move |_, cx| {
-                Timer::after(Duration::from_secs(3)).await;
-                _ = notification.update_in(cx, |note, window, cx| {
-                    note.dismiss(&ClickEvent::default(), window, cx)
-                });
+                Timer::after(Duration::from_secs(5)).await;
+
+                if let Err(error) =
+                    notification.update_in(cx, |note, window, cx| note.dismiss(window, cx))
+                {
+                    log::error!("Failed to auto hide notification: {error}");
+                }
            })
            .detach();
        }
        cx.notify();
    }

+    pub(crate) fn close<T>(&mut self, key: T, window: &mut Window, cx: &mut Context<Self>)
+    where
+        T: Into<ElementId>,
+    {
+        let id = (TypeId::of::<DefaultIdType>(), key.into()).into();
+
+        if let Some(n) = self.notifications.iter().find(|n| n.read(cx).id == id) {
+            n.update(cx, |note, cx| {
+                note.dismiss(window, cx);
+            });
+        }
+
+        cx.notify();
+    }
+
    pub fn clear(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
        self.notifications.clear();
        cx.notify();
@@ -356,24 +451,25 @@ impl NotificationList {
 }

 impl Render for NotificationList {
-    fn render(
-        &mut self,
-        window: &mut gpui::Window,
-        cx: &mut gpui::Context<Self>,
-    ) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let size = window.viewport_size();
        let items = self.notifications.iter().rev().take(10).rev().cloned();

-        div().absolute().top_4().right_4().child(
-            v_flex()
-                .id("notification-list")
-                .h(size.height - px(8.))
-                .on_hover(cx.listener(|view, hovered, _, cx| {
-                    view.expanded = *hovered;
-                    cx.notify()
-                }))
-                .gap_3()
-                .children(items),
-        )
+        div()
+            .id("notification-wrapper")
+            .absolute()
+            .top_4()
+            .right_4()
+            .child(
+                v_flex()
+                    .id("notification-list")
+                    .h(size.height - px(8.))
+                    .gap_3()
+                    .children(items)
+                    .on_hover(cx.listener(|view, hovered, _, cx| {
+                        view.expanded = *hovered;
+                        cx.notify()
+                    })),
+            )
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
reya	6e7f63d79a	chore: release version 0.2.11	2025-10-01 13:50:57 +07:00
reya	ee693aa503	chore: update the release script	2025-10-01 13:49:39 +07:00
reya	ebcc60cd92	chore: follow up on #172 (#173 ) * clean up * wip * clean up * remove unused picture field	2025-10-01 13:45:13 +07:00
reya	0db48bc003	chore: refactor message sending (#172 ) * refactor send message * refactor resend * fix * refactor * clean up	2025-09-30 08:59:38 +07:00
reya	880ba30d20	chore: bump version	2025-09-28 08:01:41 +07:00
reya	d889f9b25d	chore: always call get_public_key on nip46 (#171 ) * get public key on login * .	2025-09-28 07:57:04 +07:00
reya	0de1b20951	feat: add context menu for quick profile viewing (#170 ) * add profile context menu * add context menu for avatar	2025-09-27 15:15:00 +07:00
reya	338a947b57	chore: fix duplicate reply (#169 ) * prevent duplicate reply * .	2025-09-27 08:02:16 +07:00
reya	98ce928f0c	chore: fix double message on sent (#166 ) * . * fix * update	2025-09-26 14:17:31 +07:00
reya	61cad5dd96	chore: refactor the input component (#165 ) * refactor the input component * fix clippy * clean up	2025-09-25 08:03:14 +07:00
reya	a87184214f	chore: add release script	2025-09-23 09:36:49 +07:00
reya	fff3a44f62	chore: bump version	2025-09-23 09:05:35 +07:00
reya	9abcc25f32	chore: optimize resource usage (#162 ) * avoid string allocation * cache image * . * . * . * fix	2025-09-23 09:03:48 +07:00
reya	fb3da096f8	chore: improve the media uploader (#161 ) * refactor upload * . * .	2025-09-22 07:30:32 +07:00
reya	1de3045505	chore: update deps	2025-09-19 08:42:08 +07:00
reya	9f369bf57f	chore: improve auth handling in startup screen (#160 ) * cancel auth * .	2025-09-18 20:01:10 +07:00
reya	4164651342	chore: refactor the compose modal (#156 ) * . * update * clean up	2025-09-18 08:39:24 +07:00
reya	c12856cda0	chore: bump version	2025-09-16 20:31:10 +07:00
reya	c67b223a53	chore: add missing ui elements (#153 ) * add empty state * . * update welcome panel	2025-09-16 19:59:03 +07:00
reya	9880a3ed3d	chore: follow up on #151 (#152 ) * improve ui * . * clean up	2025-09-15 20:53:25 +07:00
reya	d13ffd5a54	feat: detect user dm relays when opening chat panel (#151 ) * preconnect to user messaging relays * .	2025-09-15 19:34:48 +07:00
reya	cc79f0ed1c	chore: clean up	2025-09-15 09:10:37 +07:00
reya	5127eaadbb	feat: add seen-on-relays viewer per message (#149 ) * chore: bump version * add seen on * seen on menu	2025-09-14 11:50:14 +07:00
reya	d38e70ecbf	chore: update deps	2025-09-13 07:51:33 +07:00
reya	b142982ab1	chore: refactor event fetching (#148 ) * use stream for nip65 and nip17 relays fetching * .	2025-09-13 07:42:17 +07:00
reya	2ea2519e8b	feat: resend failed messages (#147 ) * . * . * fix * fix * update * fix * . * .	2025-09-12 17:07:57 +07:00
reya	2ea5feaf4b	chore: improve handling of user profiles (#146 ) * resubscribe metadata for all pubkeys * .	2025-09-10 10:06:45 +07:00
reya	4ec7530b91	chore: update deps	2025-09-10 08:21:43 +07:00
reya	df82861101	chore: bump version	2025-09-10 07:25:15 +07:00
reya	fc99ef4dfe	chore: improve the activity check (#145 ) * better check for activity * .	2025-09-09 10:23:40 +07:00
reya	d0f7a1abd3	feat: extended screening (#144 ) * improve mutual contacts check * . * .	2025-09-08 17:11:29 +07:00
reya	71140beb52	feat: relay status viewer (#143 ) * add relay status * .	2025-09-07 14:54:28 +07:00
reya	e177facef4	chore: better handle async tasks (#142 ) * improve some codes * .	2025-09-07 08:33:21 +07:00
reya	60bca49200	chore: update deps and refactor the event loop	2025-09-06 20:55:11 +07:00
reya	ede41c41c3	chore: improve the event loop (#141 ) * improve wait for signer * refactor gift wrap processor * . * . * . * . * .	2025-09-05 19:01:26 +07:00
reya	70e235dcc2	chore: minor ui components improvements (#140 ) * improve ui * . * .	2025-09-04 07:30:03 +07:00
reya	b11b0e0115	chore: update deps	2025-09-03 12:12:40 +07:00
reya	d8edac0bb9	chore: fix rooms out of order while loading (#139 ) * fix room out of order while loading * . * .	2025-09-03 09:16:36 +07:00
reya	d392602ed6	feat: resend messages after authentication (#137 ) * resend failed message * update settings	2025-09-02 18:19:53 +07:00
reya	5a36354cc8	chore: fix handling of ongoing room kind incorrectly (#136 )	2025-09-01 19:44:23 +07:00
reya	a1df66e176	chore: bump hotfix version	2025-09-01 17:31:34 +07:00
reya	78d913ae38	chore: fix high cpu usage and incorrect use of list indices (#135 ) * . * fix cpu usage	2025-09-01 17:30:33 +07:00
reya	b4691aa689	chore: temporary disable room's announcement	2025-09-01 10:16:48 +07:00
reya	c49530b030	chore: bump hotfix version	2025-09-01 08:24:10 +07:00
reya	e7ffe7627c	chore: fix double messages on load (#134 )	2025-09-01 08:22:04 +07:00
reya	6a5304514f	chore: bump version	2025-08-31 19:08:37 +07:00
reya	f2be8fca08	feat: add setting for relay authentication (#133 ) * remember auth relay * . * .	2025-08-31 18:06:04 +07:00
reya	807851518a	feat: manually handle NIP-42 auth request (#132 ) * improve fetch relays * . * . * . * refactor * refactor * remove identity * manually auth * auth * prevent duplicate message * clean up	2025-08-30 14:38:00 +07:00
reya	49a3dedd9c	chore: clean up	2025-08-25 13:46:46 +07:00
reya	b19bb01003	feat: support triple-click to select entire line	2025-08-25 12:37:20 +07:00
reya	3a6fc2bcc5	chore: fix messages not loading	2025-08-25 12:13:45 +07:00
reya	5edcc97ada	chore: rework login and identity (#129 ) * . * redesign onboarding screen * . * add signer proxy * . * . * . * . * fix proxy * clean up * fix new account	2025-08-25 09:22:09 +07:00
reya	a8ccda259c	chore: update deps	2025-08-20 11:50:56 +07:00
reya	23ad28e96e	fix cpu spike (#127 )	2025-08-19 14:31:13 +07:00
reya	07a2f6980e	chore: update deps	2025-08-18 14:24:13 +07:00
reya	c2b276f3f3	chore: improve chat panel (#121 ) * . * . * . * skip sent message * improve sent reports * . * . * .	2025-08-18 13:20:29 +07:00
reya	5bef1a2c6c	chore: fix flatpak	2025-08-10 14:58:59 +07:00
reya	cd26244538	chore: bump version	2025-08-10 12:50:52 +07:00
reya	ca622d1262	chore: improve logout behavior (#118 ) * resubscribe on logout * . * .	2025-08-10 10:43:28 +07:00
reya	5011becacb	chore: use a newer flatpak runtime (#117 ) * use newer flatpak runtime * .	2025-08-10 07:40:13 +07:00
reya	17f92d767e	chore: improve ui consistency (#115 ) * . * .	2025-08-09 14:58:01 +07:00
reya	be660cb14b	chore: update deps	2025-08-08 13:14:11 +07:00
reya	8fca202c05	chore: refactor subscription (#113 ) * fix duplicate set signer request * refactor * .	2025-08-07 20:53:21 +07:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M104,152a8,8,0,0,1-8,8H56a8,8,0,0,1,0-16H96A8,8,0,0,1,104,152ZM168,32h24a8,8,0,0,0,0-16H160a8,8,0,0,0-8,8V56h16Zm72,84v60a16,16,0,0,1-16,16H136v32a8,8,0,0,1-16,0V192H32a16,16,0,0,1-16-16V116A60.07,60.07,0,0,1,76,56h76v88a8,8,0,0,0,16,0V56h12A60.07,60.07,0,0,1,240,116Zm-120,0a44,44,0,0,0-88,0v60h88Z"></path></svg>`
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M64.12,147.8a4,4,0,0,1-4,4.2H16a8,8,0,0,1-7.8-6.17,8.35,8.35,0,0,1,1.62-6.93A67.79,67.79,0,0,1,37,117.51a40,40,0,1,1,66.46-35.8,3.94,3.94,0,0,1-2.27,4.18A64.08,64.08,0,0,0,64,144C64,145.28,64,146.54,64.12,147.8Zm182-8.91A67.76,67.76,0,0,0,219,117.51a40,40,0,1,0-66.46-35.8,3.94,3.94,0,0,0,2.27,4.18A64.08,64.08,0,0,1,192,144c0,1.28,0,2.54-.12,3.8a4,4,0,0,0,4,4.2H240a8,8,0,0,0,7.8-6.17A8.33,8.33,0,0,0,246.17,138.89Zm-89,43.18a48,48,0,1,0-58.37,0A72.13,72.13,0,0,0,65.07,212,8,8,0,0,0,72,224H184a8,8,0,0,0,6.93-12A72.15,72.15,0,0,0,157.19,182.07Z"></path></svg>