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
80 changed files with 6534 additions and 4333 deletions
@@ -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
@@ -4,7 +4,7 @@ members = ["crates/*"]
 default-members = ["crates/coop"]

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

@@ -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"] }
@@ -57,3 +58,7 @@ opt-level = "z"
 lto = true
 codegen-units = 1
 panic = "abort"
+
+[profile.profiling]
+inherits = "release"
+debug = true
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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="2" d="M3 17v2m6-6v6m6-10v10m6-14v14"/>
+</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>
@@ -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>
@@ -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 {
@@ -1,5 +1,7 @@
+use std::sync::atomic::Ordering;
+
+use global::app_state;
 use global::constants::KEYRING_URL;
-use global::first_run;
 use gpui::{App, AppContext, Context, Entity, Global, Subscription, Window};
 use nostr_sdk::prelude::*;
 use smallvec::{smallvec, SmallVec};
@@ -59,6 +61,7 @@ impl ClientKeys {
            return;
        }

+        let app_state = app_state();
        let read_client_keys = cx.read_credentials(KEYRING_URL);

        cx.spawn_in(window, async move |this, cx| {
@@ -73,7 +76,7 @@ impl ClientKeys {
                    this.set_keys(Some(keys), false, true, cx);
                })
                .ok();
-            } else if *first_run() {
+            } 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);
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::{anyhow, Error};
 use chrono::{Local, TimeZone};
 use global::constants::IMAGE_RESIZE_SERVICE;
-use gpui::{Image, ImageFormat};
+use gpui::{Image, ImageFormat, SharedString, SharedUri};
 use nostr_sdk::prelude::*;
 use qrcode::render::svg;
 use qrcode::QrCode;
@@ -15,87 +15,92 @@ const HOURS_IN_DAY: i64 = 24;
 const DAYS_IN_MONTH: i64 = 30;
 const FALLBACK_IMG: &str = "https://image.nostr.build/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png";

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

-impl ReadableProfile for Profile {
-    fn avatar_url(&self, proxy: bool) -> String {
+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"
-                    )
+                    );
+
+                    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) -> String {
+    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 ReadableTimestamp {
-    fn to_human_time(&self) -> String;
-    fn to_ago(&self) -> String;
+pub trait RenderedTimestamp {
+    fn to_human_time(&self) -> SharedString;
+    fn to_ago(&self) -> SharedString;
 }

-impl ReadableTimestamp for Timestamp {
-    fn to_human_time(&self) -> String {
+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 "9999".into(),
+            _ => 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 => format!("Today at {time_format}"),
-            date if date == yesterday_date => format!("Yesterday at {time_format}"),
-            _ => format!("{}, {time_format}", input_time.format("%d/%m/%y")),
+            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) -> String {
+    fn to_ago(&self) -> SharedString {
        let input_time = match Local.timestamp_opt(self.as_u64() as i64, 0) {
            chrono::LocalResult::Single(time) => time,
-            _ => return "1m".into(),
+            _ => 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 => NOW.into(),
-            d if d.num_minutes() < MINUTES_IN_HOUR => format!("{}m", d.num_minutes()),
-            d if d.num_hours() < HOURS_IN_DAY => format!("{}h", d.num_hours()),
-            d if d.num_days() < DAYS_IN_MONTH => format!("{}d", d.num_days()),
-            _ => input_time.format("%b %d").to_string(),
+            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()),
        }
    }
 }
@@ -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
-    }
 }
@@ -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(())
-        })
-    }
-}
@@ -1,6 +1,5 @@
 pub mod debounced_delay;
 pub mod display;
 pub mod event;
-pub mod handle_auth;
 pub mod nip05;
 pub mod nip96;
@@ -14,7 +14,7 @@ product-name = "Coop"
 description = "Chat Freely, Stay Private on Nostr"
 identifier = "su.reya.coop"
 category = "SocialNetworking"
-version = "0.2.5"
+version = "0.2.11"
 out-dir = "../../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]
@@ -59,6 +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"] }
@@ -1,8 +1,23 @@
 use std::sync::Mutex;

 use gpui::{actions, App};
+use nostr_connect::prelude::*;

-actions!(coop, [DarkMode, Settings, Logout, Quit]);
+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();
@@ -2,13 +2,12 @@ use std::sync::Arc;

 use assets::Assets;
 use global::constants::{APP_ID, APP_NAME};
-use global::{ingester, nostr_client, sent_ids, starting_time};
+use global::{app_state, nostr_client};
 use gpui::{
    point, px, size, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem, SharedString,
    TitlebarOptions, WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind,
    WindowOptions,
 };
-use theme::Theme;
 use ui::Root;

 use crate::actions::{load_embedded_fonts, quit, Quit};
@@ -26,14 +25,8 @@ fn main() {
    // Initialize the Nostr client
    let _client = nostr_client();

-    // Initialize the ingester
-    let _ingester = ingester();
-
-    // Initialize the starting time
-    let _starting_time = starting_time();
-
-    // Initialize the sent IDs storage
-    let _sent_ids = sent_ids();
+    // Initialize the coop simple storage
+    let _app_state = app_state();

    // Initialize the Application
    let app = Application::new()
@@ -82,16 +75,11 @@ 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);

@@ -2,37 +2,40 @@ use std::time::Duration;

 use anyhow::Error;
 use client_keys::ClientKeys;
-use common::display::ReadableProfile;
-use common::handle_auth::CoopAuthUrlHandler;
+use common::display::RenderedProfile;
 use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
-use global::{ingester, nostr_client, IngesterSignal};
+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, SharedString,
-    StatefulInteractiveElement, Styled, Task, WeakEntity, Window,
+    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, Disableable, Sizable, StyledExt};
+use ui::{h_flex, v_flex, ContextModal, Sizable, StyledExt};

+use crate::actions::CoopAuthUrlHandler;
 use crate::chatspace::ChatSpace;

 pub fn init(
-    secret: String,
    profile: Profile,
+    secret: String,
    window: &mut Window,
    cx: &mut App,
 ) -> Entity<Account> {
-    Account::new(secret, profile, window, cx)
+    cx.new(|cx| Account::new(secret, profile, window, cx))
 }

 pub struct Account {
@@ -41,17 +44,33 @@ pub struct Account {
    is_bunker: bool,
    is_extension: bool,
    loading: bool,
-    // Panel
+
    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 App) -> Entity<Self> {
+    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");

-        cx.new(|cx| Self {
+        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,
@@ -59,7 +78,10 @@ impl Account {
            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>) {
@@ -89,24 +111,26 @@ impl Account {
        // Handle auth url with the default browser
        signer.auth_url_handler(CoopAuthUrlHandler);

-        // Handle connection
-        cx.spawn_in(window, async move |_this, cx| {
-            let client = nostr_client();
+        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;
+                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();
+                    }
                }
-                Err(e) => {
-                    cx.update(|window, cx| {
-                        window.push_notification(e.to_string(), cx);
-                    })
-                    .ok();
-                }
-            }
-        })
-        .detach();
+            }),
+        );
    }

    fn set_proxy(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -240,24 +264,26 @@ impl Account {
    }

    fn logout(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
-        cx.background_spawn(async move {
-            let client = nostr_client();
-            let ingester = ingester();
+        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);
+                let filter = Filter::new()
+                    .kind(Kind::ApplicationSpecificData)
+                    .identifier(ACCOUNT_IDENTIFIER);

-            // Delete account
-            client.database().delete(filter).await.ok();
+                // Delete account
+                client.database().delete(filter).await.ok();

-            // Unset the client's signer
-            client.unset_signer().await;
+                // Unset the client's signer
+                client.unset_signer().await;

-            // Notify the channel about the signer being unset
-            ingester.send(IngesterSignal::SignerUnset).await;
-        })
-        .detach();
+                // 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>) {
@@ -295,6 +321,7 @@ impl Focusable for Account {
 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()
@@ -336,46 +363,72 @@ impl Render for Account {
                            .id("account")
                            .h_10()
                            .w_72()
-                            .bg(cx.theme().element_background)
-                            .text_color(cx.theme().element_foreground)
+                            .bg(cx.theme().elevated_surface_background)
                            .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(shared_t!("onboarding.choose_account"))
-                                            .child(
-                                                h_flex()
-                                                    .gap_1()
-                                                    .child(
-                                                        Avatar::new(self.profile.avatar_url(true))
-                                                            .size(rems(1.5)),
-                                                    )
-                                                    .child(
-                                                        div()
-                                                            .pb_px()
-                                                            .font_semibold()
-                                                            .child(self.profile.display_name()),
-                                                    ),
-                                            ),
-                                    )
-                                }
+                            .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);
@@ -385,7 +438,6 @@ impl Render for Account {
                        Button::new("logout")
                            .label(t!("user.sign_out"))
                            .ghost()
-                            .disabled(self.loading)
                            .on_click(cx.listener(move |this, _e, window, cx| {
                                this.logout(window, cx);
                            })),
@@ -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};
@@ -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")),
            )
    }
 }
@@ -2,28 +2,28 @@ use std::ops::Range;
 use std::time::Duration;

 use anyhow::{anyhow, Error};
-use common::display::{ReadableProfile, 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);
-                    })),
-            )
    }
 }
@@ -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();
                }
@@ -167,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();
@@ -192,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)
        })
@@ -256,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(
@@ -265,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(
@@ -274,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()),
            )
    }
@@ -1,13 +1,13 @@
 use std::time::Duration;

 use client_keys::ClientKeys;
-use common::handle_auth::CoopAuthUrlHandler;
 use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
 use global::nostr_client;
 use gpui::prelude::FluentBuilder;
 use gpui::{
    div, relative, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
-    Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Window,
+    Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task,
+    Window,
 };
 use i18n::{shared_t, t};
 use nostr_connect::prelude::*;
@@ -19,6 +19,8 @@ use ui::input::{InputEvent, InputState, TextInput};
 use ui::popup_menu::PopupMenu;
 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)
 }
@@ -291,30 +293,22 @@ impl Login {

        // Handle connection
        cx.spawn_in(window, async move |this, cx| {
-            let client = nostr_client();
-
            match signer.bunker_uri().await {
                Ok(uri) => {
                    this.update(cx, |this, cx| {
-                        this.write_uri_to_disk(&uri, cx);
+                        this.write_uri_to_disk(signer, uri, cx);
                    })
                    .ok();
-
-                    // Set the client's signer with the current nostr connect instance
-                    client.set_signer(signer).await;
                }
                Err(error) => {
-                    cx.update(|window, cx| {
-                        this.update(cx, |this, 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();
+                    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();
                }
@@ -323,38 +317,41 @@ impl Login {
        .detach();
    }

-    fn write_uri_to_disk(&mut self, uri: &NostrConnectURI, cx: &mut Context<Self>) {
-        let Some(public_key) = uri.remote_signer_public_key().cloned() else {
-            log::error!("Remote Signer's public key not found");
-            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 mut value = uri.to_string();
-
-        // Clear the secret param if it exists
+        // Clear the secret parameter in the URI if it exists
        if let Some(secret) = uri.secret() {
-            value = value.replace(secret, "");
+            uri_without_secret = uri_without_secret.replace(secret, "");
        }

-        cx.background_spawn(async move {
+        let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
            let client = nostr_client();
-            let keys = Keys::generate();
-            let tags = vec![Tag::identifier(ACCOUNT_IDENTIFIER)];
-            let kind = Kind::ApplicationSpecificData;

-            let builder = EventBuilder::new(kind, value)
-                .tags(tags)
+            // 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)
-                .await;
+                .sign(&Keys::generate())
+                .await?;

-            if let Ok(event) = builder {
-                if let Err(e) = client.database().save_event(&event).await {
-                    log::error!("Failed to save event: {e}");
-                };
-            }
-        })
-        .detach();
+            // 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>) {
@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use common::nip96::nip96_upload;
-use global::constants::ACCOUNT_IDENTIFIER;
+use global::constants::{ACCOUNT_IDENTIFIER, NIP17_RELAYS, NIP65_RELAYS};
 use global::nostr_client;
 use gpui::{
    div, relative, rems, AnyElement, App, AppContext, AsyncWindowContext, Context, Entity,
@@ -14,7 +14,7 @@ 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;
@@ -70,6 +70,7 @@ impl NewAccount {
        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"))
@@ -124,8 +125,44 @@ impl NewAccount {
        // 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;
-            client.set_metadata(&metadata).await.ok();
+
+            // 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();
    }
@@ -194,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();
                }
@@ -318,7 +352,7 @@ impl Render for NewAccount {
                                            .label(t!("common.upload"))
                                            .ghost()
                                            .small()
-                                            .rounded(ButtonRounded::Full)
+                                            .rounded()
                                            .disabled(self.submitting || self.uploading)
                                            .loading(self.uploading)
                                            .on_click(cx.listener(move |this, _, window, cx| {
@@ -9,7 +9,7 @@ use gpui::prelude::FluentBuilder;
 use gpui::{
    div, img, px, relative, svg, AnyElement, App, AppContext, ClipboardItem, Context, Entity,
    EventEmitter, FocusHandle, Focusable, Image, InteractiveElement, IntoElement, ParentElement,
-    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Window,
+    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Task, Window,
 };
 use i18n::{shared_t, t};
 use nostr_connect::prelude::*;
@@ -17,6 +17,7 @@ use smallvec::{smallvec, SmallVec};
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::dock_area::panel::{Panel, PanelEvent};
+use ui::notification::Notification;
 use ui::popup_menu::PopupMenu;
 use ui::{divider, h_flex, v_flex, ContextModal, Icon, IconName, Sizable, StyledExt};

@@ -65,8 +66,8 @@ pub struct Onboarding {
    // Panel
    name: SharedString,
    focus_handle: FocusHandle,
-    #[allow(dead_code)]
-    subscriptions: SmallVec<[Subscription; 2]>,
+    _subscriptions: SmallVec<[Subscription; 2]>,
+    _tasks: SmallVec<[Task<()>; 1]>,
 }

 impl Onboarding {
@@ -103,10 +104,11 @@ impl Onboarding {
            nostr_connect,
            nostr_connect_uri,
            qr_code,
-            subscriptions,
            connecting: false,
            name: "Onboarding".into(),
            focus_handle: cx.focus_handle(),
+            _subscriptions: subscriptions,
+            _tasks: smallvec![],
        }
    }

@@ -130,70 +132,74 @@ impl Onboarding {
            cx.notify();
        });

-        cx.spawn_in(window, async move |this, cx| {
-            let client = nostr_client();
-            let connect = this.read_with(cx, |this, cx| this.nostr_connect.read(cx).clone());
+        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(&uri, cx);
-                        })
-                        .ok();
-
-                        // Set the client's signer with the current nostr connect instance
-                        client.set_signer(signer).await;
-                    }
-                    Err(e) => {
-                        cx.update(|window, cx| {
-                            window.push_notification(e.to_string(), cx);
-                        })
-                        .ok();
-                    }
-                };
-            }
-        })
-        .detach();
+                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, uri: &NostrConnectURI, cx: &mut Context<Self>) {
-        let Some(public_key) = uri.remote_signer_public_key().cloned() else {
-            log::error!("Remote Signer's public key not found");
-            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 mut value = uri.to_string();
-
-        // Clear the secret param if it exists
+        // Clear the secret parameter in the URI if it exists
        if let Some(secret) = uri.secret() {
-            value = value.replace(secret, "");
+            uri_without_secret = uri_without_secret.replace(secret, "");
        }

-        cx.background_spawn(async move {
+        let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
            let client = nostr_client();
-            let keys = Keys::generate();
-            let tags = vec![Tag::identifier(ACCOUNT_IDENTIFIER)];
-            let kind = Kind::ApplicationSpecificData;

-            let builder = EventBuilder::new(kind, value)
-                .tags(tags)
+            // 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)
-                .await;
+                .sign(&Keys::generate())
+                .await?;

-            if let Ok(event) = builder {
-                if let Err(e) = client.database().save_event(&event).await {
-                    log::error!("Failed to save event: {e}");
-                };
-            }
-        })
-        .detach();
+            // 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>) {
@@ -1,5 +1,6 @@
-use common::display::ReadableProfile;
+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,
@@ -10,7 +11,7 @@ use registry::Registry;
 use settings::AppSettings;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::button::{Button, ButtonRounded, ButtonVariants};
+use ui::button::{Button, ButtonVariants};
 use ui::input::{InputState, TextInput};
 use ui::modal::ModalButtonProps;
 use ui::switch::Switch;
@@ -41,28 +42,28 @@ impl Preferences {
    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();
@@ -86,7 +87,6 @@ impl Preferences {
    }

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

@@ -94,7 +94,7 @@ impl Preferences {
            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| {
@@ -112,9 +112,6 @@ 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 = Registry::read_global(cx).identity(cx);
-
        let auto_auth = AppSettings::get_auto_auth(cx);
        let backup = AppSettings::get_backup_messages(cx);
        let screening = AppSettings::get_screening(cx);
@@ -122,6 +119,9 @@ impl Render for Preferences {
        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()
@@ -134,48 +134,54 @@ impl Render for Preferences {
                            .font_semibold()
                            .child(shared_t!("preferences.account_header")),
                    )
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .justify_between()
-                            .child(
-                                h_flex()
-                                    .id("user")
-                                    .gap_2()
-                                    .child(Avatar::new(profile.avatar_url(proxy)).size(rems(2.4)))
-                                    .child(
-                                        div()
-                                            .flex_1()
-                                            .text_sm()
-                                            .child(
-                                                div()
-                                                    .font_semibold()
-                                                    .line_height(relative(1.3))
-                                                    .child(profile.display_name()),
-                                            )
-                                            .child(
-                                                div()
-                                                    .text_xs()
-                                                    .text_color(cx.theme().text_muted)
-                                                    .line_height(relative(1.3))
-                                                    .child(shared_t!("preferences.account_btn")),
-                                            ),
-                                    )
-                                    .on_click(cx.listener(move |this, _e, window, cx| {
-                                        this.open_edit_profile(window, cx);
-                                    })),
-                            )
-                            .child(
-                                Button::new("relays")
-                                    .label("Messaging Relays")
-                                    .xsmall()
-                                    .ghost_alt()
-                                    .rounded(ButtonRounded::Full)
-                                    .on_click(cx.listener(move |this, _e, window, cx| {
-                                        this.open_relays(window, cx);
-                                    })),
-                            ),
-                    ),
+                    .when_some(registry.signer_pubkey(), |this, public_key| {
+                        let profile = registry.get_person(&public_key, cx);
+
+                        this.child(
+                            h_flex()
+                                .w_full()
+                                .justify_between()
+                                .child(
+                                    h_flex()
+                                        .id("user")
+                                        .gap_2()
+                                        .child(Avatar::new(profile.avatar(proxy)).size(rems(2.4)))
+                                        .child(
+                                            div()
+                                                .flex_1()
+                                                .text_sm()
+                                                .child(
+                                                    div()
+                                                        .font_semibold()
+                                                        .line_height(relative(1.3))
+                                                        .child(profile.display_name()),
+                                                )
+                                                .child(
+                                                    div()
+                                                        .text_xs()
+                                                        .text_color(cx.theme().text_muted)
+                                                        .line_height(relative(1.3))
+                                                        .child(shared_t!(
+                                                            "preferences.account_btn"
+                                                        )),
+                                                ),
+                                        )
+                                        .on_click(cx.listener(move |this, _e, window, cx| {
+                                            this.open_edit_profile(window, cx);
+                                        })),
+                                )
+                                .child(
+                                    Button::new("relays")
+                                        .label("Messaging Relays")
+                                        .xsmall()
+                                        .ghost_alt()
+                                        .rounded()
+                                        .on_click(cx.listener(move |this, _e, window, cx| {
+                                            this.open_relays(window, cx);
+                                        })),
+                                ),
+                        )
+                    }),
            )
            .child(
                v_flex()
@@ -205,7 +211,7 @@ impl Render for Preferences {
                                            .on_click(move |_, _window, cx| {
                                                if let Some(input) = input_state.upgrade() {
                                                    let Ok(url) =
-                                                        Url::parse(input.read(cx).value())
+                                                        Url::parse(&input.read(cx).value())
                                                    else {
                                                        return;
                                                    };
@@ -1,9 +1,13 @@
-use common::display::{shorten_pubkey, ReadableProfile};
+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};
@@ -13,7 +17,8 @@ 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> {
@@ -24,46 +29,62 @@ pub struct Screening {
    profile: Profile,
    verified: bool,
    followed: bool,
-    dm_relays: bool,
-    mutual_contacts: usize,
-    _tasks: SmallVec<[Task<()>; 1]>,
+    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 Context<Self>) -> Self {
        let registry = Registry::read_global(cx);
-        let identity = registry.identity(cx).public_key();
        let profile = registry.get_person(&public_key, cx);

        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) = profile.metadata().nip05 {
+        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)
            }))
@@ -72,20 +93,36 @@ impl Screening {
        };

        tasks.push(
-            // Load all necessary data
+            // Run the contact check in the background
            cx.spawn_in(window, async move |this, cx| {
-                let (followed, mutual_contacts, dm_relays) = check_trust_score.await;
+                if let Ok((followed, mutual_contacts)) = contact_check.await {
+                    this.update(cx, |this, cx| {
+                        this.followed = followed;
+                        this.mutual_contacts = mutual_contacts;
+                        cx.notify();
+                    })
+                    .ok();
+                }
+            }),
+        );
+
+        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.followed = followed;
-                    this.mutual_contacts = mutual_contacts;
-                    this.dm_relays = dm_relays;
+                    this.last_active = active;
                    cx.notify();
                })
                .ok();
+            }),
+        );

-                // Update the NIP05 verification status if user has NIP05 address
-                if let Some(task) = verify_nip05 {
+        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;
@@ -101,8 +138,8 @@ impl Screening {
            profile,
            verified: false,
            followed: false,
-            dm_relays: false,
-            mutual_contacts: 0,
+            last_active: None,
+            mutual_contacts: vec![],
            _tasks: tasks,
        }
    }
@@ -141,12 +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 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()
@@ -156,7 +234,7 @@ impl Render for Screening {
                    .items_center()
                    .justify_center()
                    .text_center()
-                    .child(Avatar::new(self.profile.avatar_url(proxy)).size(rems(4.)))
+                    .child(Avatar::new(self.profile.avatar(proxy)).size(rems(4.)))
                    .child(
                        div()
                            .font_semibold()
@@ -168,12 +246,10 @@ impl Render for Screening {
                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)
@@ -192,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);
                                    })),
@@ -202,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);
                                    })),
@@ -217,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()
@@ -246,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())
            }
-        }))
+        })
 }
@@ -2,7 +2,7 @@ use std::time::Duration;

 use anyhow::{anyhow, Error};
 use global::constants::NIP17_RELAYS;
-use global::nostr_client;
+use global::{app_state, nostr_client};
 use gpui::prelude::FluentBuilder;
 use gpui::{
    div, px, uniform_list, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
@@ -10,12 +10,10 @@ use gpui::{
    TextAlign, UniformList, Window,
 };
 use i18n::{shared_t, t};
-use itertools::Itertools;
 use nostr_sdk::prelude::*;
-use registry::Registry;
 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};
@@ -34,7 +32,7 @@ where
            .label(label)
            .warning()
            .xsmall()
-            .rounded(ButtonRounded::Full)
+            .rounded()
            .on_click(move |_, window, cx| {
                let view = cx.new(|cx| SetupRelay::new(Kind::InboxRelays, window, cx));
                let weak_view = view.downgrade();
@@ -44,7 +42,7 @@ where

                    modal
                        .confirm()
-                        .title(shared_t!("relays.modal_title"))
+                        .title(shared_t!("relays.modal"))
                        .child(view.clone())
                        .button_props(ModalButtonProps::default().ok_text(t!("common.update")))
                        .on_ok(move |_, window, cx| {
@@ -71,7 +69,6 @@ pub struct SetupRelay {

 impl SetupRelay {
    pub fn new(kind: Kind, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let identity = Registry::read_global(cx).identity(cx).public_key();
        let input = cx.new(|cx| InputState::new(window, cx).placeholder("wss://example.com"));

        let mut subscriptions = smallvec![];
@@ -79,10 +76,13 @@ impl SetupRelay {

        let load_relay = cx.background_spawn(async move {
            let client = nostr_client();
-            let filter = Filter::new().kind(kind).author(identity).limit(1);
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            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
                    .iter()
                    .filter_map(|tag| tag.as_standardized())
@@ -95,7 +95,7 @@ impl SetupRelay {
                            None
                        }
                    })
-                    .collect_vec();
+                    .collect();

                Ok(relays)
            } else {
@@ -195,22 +195,41 @@ impl SetupRelay {

        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
            let client = nostr_client();
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
            let tags: Vec<Tag> = relays
                .iter()
                .map(|relay| Tag::relay(relay.clone()))
                .collect();

-            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(tags);
+            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;
            }

+            // Fetch gift wrap events
+            let sub_id = app_state().gift_wrap_sub_id.clone();
+            let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
+
+            if client
+                .subscribe_with_id_to(relays.clone(), sub_id, filter, None)
+                .await
+                .is_ok()
+            {
+                log::info!("Subscribed to messages in: {relays:?}");
+            };
+
            Ok(())
        });

@@ -223,11 +242,8 @@ impl SetupRelay {
                    .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();
                }
@@ -291,7 +307,7 @@ impl SetupRelay {
            .justify_center()
            .text_sm()
            .text_align(TextAlign::Center)
-            .child(shared_t!("relays.add_some_relays"))
+            .child(shared_t!("relays.help_text"))
    }
 }

@@ -331,7 +347,7 @@ impl Render for SetupRelay {
                                    .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| {
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use gpui::prelude::FluentBuilder;
 use gpui::{
    div, rems, App, ClickEvent, InteractiveElement, IntoElement, ParentElement as _, RenderOnce,
-    SharedString, StatefulInteractiveElement, Styled, Window,
+    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;
@@ -25,7 +26,7 @@ pub struct RoomListItem {
    room_id: Option<u64>,
    public_key: Option<PublicKey>,
    name: Option<SharedString>,
-    avatar: Option<SharedString>,
+    avatar: Option<SharedUri>,
    created_at: Option<SharedString>,
    kind: Option<RoomKind>,
    #[allow(clippy::type_complexity)]
@@ -61,7 +62,7 @@ impl RoomListItem {
        self
    }

-    pub fn avatar(mut self, avatar: impl Into<SharedString>) -> Self {
+    pub fn avatar(mut self, avatar: impl Into<SharedUri>) -> Self {
        self.avatar = Some(avatar.into());
        self
    }
@@ -108,7 +109,21 @@ impl RenderOnce for RoomListItem {
            self.handler,
        )
        else {
-            return div().id(self.ix);
+            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()
@@ -152,11 +167,11 @@ impl RenderOnce for RoomListItem {
                            .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);

@@ -4,17 +4,17 @@ use std::time::Duration;

 use anyhow::{anyhow, Error};
 use common::debounced_delay::DebouncedDelay;
-use common::display::{ReadableTimestamp, 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, 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 i18n::{shared_t, t};
 use itertools::Itertools;
 use list_item::RoomListItem;
 use nostr_sdk::prelude::*;
@@ -23,11 +23,13 @@ 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::input::{InputEvent, InputState, TextInput};
-use ui::popup_menu::PopupMenu;
-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;

@@ -54,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 {
@@ -69,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| {
+        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
@@ -111,8 +119,8 @@ impl Sidebar {
                    }
                    _ => {}
                }
-            },
-        ));
+            }),
+        );

        Self {
            name: "Sidebar".into(),
@@ -130,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);
@@ -144,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();

@@ -176,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();
        })
@@ -209,15 +213,11 @@ impl Sidebar {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let identity = Registry::read_global(cx).identity(cx).public_key();
        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
@@ -227,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();
                }
@@ -254,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();
                }
@@ -269,12 +264,11 @@ impl Sidebar {
    }

    fn search_by_nip05(&mut self, query: &str, window: &mut Window, cx: &mut Context<Self>) {
-        let identity = Registry::read_global(cx).identity(cx).public_key();
        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")))
            }
@@ -323,10 +317,9 @@ impl Sidebar {
            return;
        };

-        let identity = Registry::read_global(cx).identity(cx).public_key();
        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| {
@@ -527,6 +520,88 @@ impl Sidebar {
        });
    }

+    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 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(
        &self,
        rooms: &[Entity<Room>],
@@ -594,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() {
@@ -609,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()
@@ -629,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(),
                            ),
@@ -658,15 +745,16 @@ impl Render for Sidebar {
                                    .tooltip(t!("sidebar.all_conversations_tooltip"))
                                    .when_some(self.indicator.read(cx).as_ref(), |this, kind| {
                                        this.when(kind == &RoomKind::Ongoing, |this| {
-                                            this.child(
+                                            this.child(deferred(
                                                div().size_1().rounded_full().bg(cx.theme().cursor),
-                                            )
+                                            ))
                                        })
                                    })
                                    .small()
+                                    .cta()
                                    .bold()
                                    .secondary()
-                                    .rounded(ButtonRounded::Full)
+                                    .rounded()
                                    .selected(self.filter(&RoomKind::Ongoing, cx))
                                    .on_click(cx.listener(|this, _, _, cx| {
                                        this.set_filter(RoomKind::Ongoing, cx);
@@ -678,25 +766,102 @@ impl Render for Sidebar {
                                    .tooltip(t!("sidebar.requests_tooltip"))
                                    .when_some(self.indicator.read(cx).as_ref(), |this, kind| {
                                        this.when(kind != &RoomKind::Ongoing, |this| {
-                                            this.child(
+                                            this.child(deferred(
                                                div().size_1().rounded_full().bg(cx.theme().cursor),
-                                            )
+                                            ))
                                        })
                                    })
                                    .small()
+                                    .cta()
                                    .bold()
                                    .secondary()
-                                    .rounded(ButtonRounded::Full)
+                                    .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()
+                                    .text_xs()
+                                    .child(
+                                        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(!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)
                            }),
@@ -1,6 +1,6 @@
 use std::time::Duration;

-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use common::nip05::nip05_verify;
 use global::nostr_client;
 use gpui::prelude::FluentBuilder;
@@ -17,7 +17,7 @@ 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> {
    cx.new(|cx| UserProfile::new(public_key, window, cx))
@@ -32,27 +32,24 @@ pub struct UserProfile {
 }

 impl UserProfile {
-    pub fn new(public_key: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
+    pub fn new(target: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
        let registry = Registry::read_global(cx);
-        let identity = registry.identity(cx).public_key();
-        let profile = registry.get_person(&public_key, cx);
+        let profile = registry.get_person(&target, cx);

        let mut tasks = smallvec![];

-        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) = 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
@@ -61,7 +58,7 @@ impl UserProfile {
        tasks.push(
            // Load user profile data
            cx.spawn_in(window, async move |this, cx| {
-                let followed = check_follow.await;
+                let followed = check_follow.await.unwrap_or(false);

                // Update the followed status
                this.update(cx, |this, cx| {
@@ -128,19 +125,19 @@ 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 Ok(bech32) = self.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(self.profile.avatar_url(proxy)).size(rems(4.)))
+                    .child(Avatar::new(self.profile.avatar(proxy)).size(rems(4.)))
                    .child(
                        v_flex()
                            .child(
@@ -189,12 +186,10 @@ impl Render for UserProfile {
            .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()
@@ -202,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(
@@ -219,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);
                                    })),
@@ -230,7 +226,6 @@ impl Render for UserProfile {
            .child(
                v_flex()
                    .gap_1()
-                    .text_sm()
                    .child(
                        div()
                            .text_color(cx.theme().text_muted)
@@ -245,7 +240,8 @@ impl Render for UserProfile {
                                self.profile
                                    .metadata()
                                    .about
-                                    .unwrap_or(t!("profile.no_bio").to_string()),
+                                    .map(SharedString::from)
+                                    .unwrap_or(shared_t!("profile.no_bio")),
                            ),
                    ),
            )
@@ -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");
+                                    }),
+                            ),
                    ),
            )
    }
@@ -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

@@ -34,7 +34,10 @@ pub const NIP17_RELAYS: [&str; 2] = ["wss://nip17.com", "wss://auth.nostr1.com"]
 pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nsec.app";

 /// Default retry count for fetching NIP-17 relays
-pub const TOTAL_RETRY: u64 = 2;
+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;
@@ -48,9 +51,6 @@ pub const METADATA_BATCH_LIMIT: usize = 100;
 /// Maximum timeout for grouping metadata requests. (milliseconds)
 pub const METADATA_BATCH_TIMEOUT: u64 = 300;

-/// Maximum timeout for waiting for finish (seconds)
-pub const WAIT_FOR_FINISH: u64 = 60;
-
 /// Default width of the sidebar.
 pub const DEFAULT_SIDEBAR_WIDTH: f32 = 240.;

@@ -1,10 +1,11 @@
+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::channel::{Receiver, Sender};
 use smol::lock::RwLock;

 use crate::paths::support_dir;
@@ -12,16 +13,18 @@ use crate::paths::support_dir;
 pub mod constants;
 pub mod paths;

-#[derive(Debug, Clone)]
-pub struct AuthReq {
-    pub challenge: String,
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AuthRequest {
    pub url: RelayUrl,
+    pub challenge: String,
+    pub sending: bool,
 }

-impl AuthReq {
+impl AuthRequest {
    pub fn new(challenge: impl Into<String>, url: RelayUrl) -> Self {
        Self {
            challenge: challenge.into(),
+            sending: false,
            url,
        }
    }
@@ -44,9 +47,17 @@ impl Notice {
    }
 }

+#[derive(Debug, Clone, Default, PartialEq, Eq, PartialOrd, Ord)]
+pub enum UnwrappingStatus {
+    #[default]
+    Initialized,
+    Processing,
+    Complete,
+}
+
 /// Signals sent through the global event channel to notify UI
 #[derive(Debug)]
-pub enum IngesterSignal {
+pub enum SignalKind {
    /// A signal to notify UI that the client's signer has been set
    SignerSet(PublicKey),

@@ -54,34 +65,60 @@ pub enum IngesterSignal {
    SignerUnset,

    /// A signal to notify UI that the relay requires authentication
-    Auth(AuthReq),
+    Auth(AuthRequest),

    /// A signal to notify UI that the browser proxy service is down
    ProxyDown,

-    /// A signal to notify UI that a new metadata event has been received
-    Metadata(Event),
+    /// 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
-    GiftWrap((EventId, Event)),
+    NewMessage((EventId, Event)),

-    /// A signal to notify UI that all gift wrap events have been processed
-    Finish,
+    /// A signal to notify UI that no DM relays for current user was found
+    RelaysNotFound,

-    /// A signal to notify UI that partial processing of gift wrap events has been completed
-    PartialFinish,
-
-    /// A signal to notify UI that no DM relay for current user was found
-    DmRelayNotFound,
+    /// 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<IngesterSignal>,
-    tx: Sender<IngesterSignal>,
+    rx: Receiver<PublicKey>,
+    tx: Sender<PublicKey>,
 }

 impl Default for Ingester {
@@ -92,30 +129,95 @@ impl Default for Ingester {

 impl Ingester {
    pub fn new() -> Self {
-        let (tx, rx) = smol::channel::bounded::<IngesterSignal>(2048);
+        let (tx, rx) = flume::bounded::<PublicKey>(1024);
        Self { rx, tx }
    }

-    pub fn signals(&self) -> &Receiver<IngesterSignal> {
+    pub fn receiver(&self) -> &Receiver<PublicKey> {
        &self.rx
    }

-    pub async fn send(&self, signal: IngesterSignal) {
-        if let Err(e) = self.tx.send(signal).await {
-            log::error!("Failed to send signal: {e}");
+    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 INGESTER: OnceLock<Ingester> = OnceLock::new();
-
-static SENT_IDS: OnceLock<RwLock<Vec<EventId>>> = 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(|| {
@@ -132,38 +234,27 @@ pub fn nostr_client() -> &'static Client {
            .gossip(true)
            .automatic_authentication(false)
            .verify_subscriptions(false)
-            // Sleep after idle for 30 seconds
            .sleep_when_idle(SleepWhenIdle::Enabled {
-                timeout: Duration::from_secs(30),
+                timeout: Duration::from_secs(600),
            });

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

-pub fn ingester() -> &'static Ingester {
-    INGESTER.get_or_init(Ingester::new)
+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 sent_ids() -> &'static RwLock<Vec<EventId>> {
-    SENT_IDS.get_or_init(|| RwLock::new(Vec::new()))
-}
-
-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
+    }
 }
@@ -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),+))
    };
 }

@@ -19,4 +19,3 @@ smol.workspace = true
 log.workspace = true

 fuzzy-matcher = "0.3.7"
-hashbrown = "0.15"
@@ -1,12 +1,12 @@
 use std::cmp::Reverse;
+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 global::{nostr_client, UnwrappingStatus};
 use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Task, WeakEntity, Window};
-use hashbrown::{HashMap, HashSet};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use room::RoomKind;
@@ -41,13 +41,11 @@ pub struct Registry {
    /// Collection of all persons (user profiles)
    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>,

-    /// Public Key of the current user
-    pub identity: Option<PublicKey>,
+    /// Public key of the currently activated signer
+    signer_pubkey: Option<PublicKey>,

    /// Tasks for asynchronous operations
    _tasks: SmallVec<[Task<()>; 1]>,
@@ -73,6 +71,7 @@ impl Registry {

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

        let load_local_persons: Task<Result<Vec<Profile>, Error>> =
@@ -104,24 +103,22 @@ impl Registry {
        );

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

-    /// Returns the identity of the user.
-    ///
-    /// WARNING: This method will panic if user is not logged in.
-    pub fn identity(&self, cx: &App) -> Profile {
-        self.get_person(&self.identity.unwrap(), cx)
+    /// Returns the public key of the currently activated signer.
+    pub fn signer_pubkey(&self) -> Option<PublicKey> {
+        self.signer_pubkey
    }

-    /// Sets the identity of the user.
-    pub fn set_identity(&mut self, identity: PublicKey, cx: &mut Context<Self>) {
-        self.identity = Some(identity);
+    /// 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();
    }

@@ -156,21 +153,19 @@ impl Registry {
    }

    /// Insert or update a person
-    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;
-        };
+    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));
+            }
        }
    }

@@ -244,16 +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;
-        cx.notify();
+    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>) {
-        self.rooms = vec![];
-        self.loading = true;
-        self.identity = None;
+        // 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();
    }

@@ -262,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<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);

@@ -279,9 +283,9 @@ 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: HashSet<Room> = HashSet::new();

@@ -291,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
@@ -317,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);
@@ -333,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();
                }
@@ -348,23 +355,28 @@ impl Registry {
    }

    pub(crate) fn extend_rooms(&mut self, rooms: HashSet<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);
-        }
+        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);
            }
        }
    }
@@ -388,12 +400,14 @@ impl Registry {
    }

    /// 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);
+                    });
+                }
            }
        }
    }
@@ -404,7 +418,7 @@ impl Registry {
    /// Updates room ordering based on the most recent messages.
    pub fn event_to_message(
        &mut self,
-        gift_wrap_id: EventId,
+        gift_wrap: EventId,
        event: Event,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -412,35 +426,39 @@ impl Registry {
        let id = event.uniq_id();
        let author = event.pubkey;

-        let Some(identity) = self.identity else {
+        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, move |this, _window, cx| {
-                    this.emit_message(gift_wrap_id, event, 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| {
@@ -2,16 +2,53 @@ use std::hash::Hash;

 use nostr_sdk::prelude::*;

-#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub enum Message {
    User(RenderedMessage),
-    System,
+    Warning(String, Timestamp),
+    System(Timestamp),
 }

 impl Message {
    pub fn user(user: impl Into<RenderedMessage>) -> Self {
        Self::User(user.into())
    }
+
+    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 {
+        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()),
+        }
+    }
+}
+
+impl PartialOrd for Message {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
 }

 #[derive(Debug, Clone)]
@@ -120,18 +157,14 @@ fn extract_reply_ids(inner: &Tags) -> Vec<EventId> {
    let mut replies_to = vec![];

    for tag in inner.filter(TagKind::e()) {
-        if let Some(content) = tag.content() {
-            if let Ok(id) = EventId::from_hex(content) {
-                replies_to.push(id);
-            }
+        if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
+            replies_to.push(id);
        }
    }

    for tag in inner.filter(TagKind::q()) {
-        if let Some(content) = tag.content() {
-            if let Ok(id) = EventId::from_hex(content) {
-                replies_to.push(id);
-            }
+        if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
+            replies_to.push(id);
        }
    }

@@ -1,11 +1,14 @@
 use std::cmp::Ordering;
+use std::collections::{HashMap, HashSet};
 use std::hash::{Hash, Hasher};
+use std::time::Duration;

-use anyhow::Error;
-use common::display::ReadableProfile;
+use anyhow::{anyhow, Error};
+use common::display::RenderedProfile;
 use common::event::EventUtils;
-use global::nostr_client;
-use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
+use global::constants::SEND_RETRY;
+use global::{app_state, nostr_client};
+use gpui::{App, AppContext, Context, EventEmitter, SharedString, SharedUri, Task};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;

@@ -14,45 +17,51 @@ use crate::Registry;
 #[derive(Debug, Clone)]
 pub struct SendReport {
    pub receiver: PublicKey,
-    pub output: Option<Output<EventId>>,
-    pub local_error: Option<SharedString>,
-    pub nip17_relays_not_found: bool,
+    pub status: Option<Output<EventId>>,
+    pub error: Option<SharedString>,
+    pub on_hold: Option<Event>,
+    pub relays_not_found: bool,
 }

 impl SendReport {
-    pub fn output(receiver: PublicKey, output: Output<EventId>) -> Self {
+    pub fn new(receiver: PublicKey) -> Self {
        Self {
            receiver,
-            output: Some(output),
-            local_error: None,
-            nip17_relays_not_found: false,
+            status: None,
+            error: None,
+            on_hold: None,
+            relays_not_found: false,
        }
    }

-    pub fn error(receiver: PublicKey, error: impl Into<SharedString>) -> Self {
-        Self {
-            receiver,
-            output: None,
-            local_error: Some(error.into()),
-            nip17_relays_not_found: false,
-        }
+    pub fn status(mut self, output: Output<EventId>) -> Self {
+        self.status = Some(output);
+        self.relays_not_found = false;
+        self
    }

-    pub fn nip17_relays_not_found(receiver: PublicKey) -> Self {
-        Self {
-            receiver,
-            output: None,
-            local_error: None,
-            nip17_relays_not_found: true,
-        }
+    pub fn error(mut self, error: impl Into<SharedString>) -> Self {
+        self.error = Some(error.into());
+        self.relays_not_found = false;
+        self
+    }
+
+    pub fn on_hold(mut self, event: Event) -> Self {
+        self.on_hold = Some(event);
+        self
+    }
+
+    pub fn not_found(mut self) -> Self {
+        self.relays_not_found = true;
+        self
    }

    pub fn is_relay_error(&self) -> bool {
-        self.local_error.is_some() || self.nip17_relays_not_found
+        self.error.is_some() || self.relays_not_found
    }

    pub fn is_sent_success(&self) -> bool {
-        if let Some(output) = self.output.as_ref() {
+        if let Some(output) = self.status.as_ref() {
            !output.success.is_empty()
        } else {
            false
@@ -79,8 +88,6 @@ pub struct Room {
    pub created_at: Timestamp,
    /// Subject of the room
    pub subject: Option<String>,
-    /// Picture of the room
-    pub picture: Option<String>,
    /// All members of the room
    pub members: Vec<PublicKey>,
    /// Kind
@@ -115,83 +122,97 @@ impl Eq for Room {}

 impl EventEmitter<RoomSignal> for Room {}

-impl Room {
-    pub fn new(event: &Event) -> Self {
-        let id = event.uniq_id();
-        let created_at = event.created_at;
+impl From<&Event> for Room {
+    fn from(val: &Event) -> Self {
+        let id = val.uniq_id();
+        let created_at = val.created_at;

        // Get the members from the event's tags and event's pubkey
-        let members = event
-            .all_pubkeys()
-            .into_iter()
-            .unique()
-            .sorted()
-            .collect_vec();
+        let members = val.all_pubkeys();

-        // Get the subject from the event's tags
-        let subject = if let Some(tag) = event.tags.find(TagKind::Subject) {
-            tag.content().map(|s| s.to_owned())
-        } else {
-            None
-        };
+        // Get subject from tags
+        let subject = val
+            .tags
+            .find(TagKind::Subject)
+            .and_then(|tag| tag.content().map(|s| s.to_owned()));

-        // Get the picture from the event's tags
-        let picture = if let Some(tag) = event.tags.find(TagKind::custom("picture")) {
-            tag.content().map(|s| s.to_owned())
-        } else {
-            None
-        };
-
-        Self {
+        Room {
            id,
            created_at,
            subject,
-            picture,
            members,
            kind: RoomKind::default(),
        }
    }
+}
+
+impl From<&UnsignedEvent> for Room {
+    fn from(val: &UnsignedEvent) -> Self {
+        let id = val.uniq_id();
+        let created_at = val.created_at;
+
+        // Get the members from the event's tags and event's pubkey
+        let members = val.all_pubkeys();
+
+        // Get subject from tags
+        let subject = val
+            .tags
+            .find(TagKind::Subject)
+            .and_then(|tag| tag.content().map(|s| s.to_owned()));
+
+        Room {
+            id,
+            created_at,
+            subject,
+            members,
+            kind: RoomKind::default(),
+        }
+    }
+}
+
+impl Room {
+    /// Constructs a new room instance for a private message with the given receiver and tags.
+    pub async fn new(subject: Option<String>, receivers: Vec<PublicKey>) -> Result<Self, Error> {
+        let client = nostr_client();
+        let signer = client.signer().await?;
+        let public_key = signer.get_public_key().await?;
+
+        if receivers.is_empty() {
+            return Err(anyhow!("You need to add at least one receiver"));
+        };
+
+        // Convert receiver's public keys into tags
+        let mut tags: Tags = Tags::from_list(
+            receivers
+                .iter()
+                .map(|pubkey| Tag::public_key(pubkey.to_owned()))
+                .collect(),
+        );
+
+        // Add subject if it is present
+        if let Some(subject) = subject {
+            tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                subject,
+            )));
+        }
+
+        let mut event = EventBuilder::new(Kind::PrivateDirectMessage, "")
+            .tags(tags)
+            .build(public_key);
+
+        // Generate event ID
+        event.ensure_id();
+
+        Ok(Room::from(&event))
+    }

    /// Sets the kind of the room and returns the modified room
-    ///
-    /// This is a builder-style method that allows chaining room modifications.
-    ///
-    /// # Arguments
-    ///
-    /// * `kind` - The RoomKind to set for this room
-    ///
-    /// # Returns
-    ///
-    /// The modified Room instance with the new kind
    pub fn kind(mut self, kind: RoomKind) -> Self {
        self.kind = kind;
        self
    }

-    /// Sets the rearrange_by field of the room and returns the modified room
-    ///
-    /// This is a builder-style method that allows chaining room modifications.
-    ///
-    /// # Arguments
-    ///
-    /// * `rearrange_by` - The PublicKey to set for rearranging the member list
-    ///
-    /// # Returns
-    ///
-    /// The modified Room instance with the new member list after rearrangement
-    pub fn rearrange_by(mut self, rearrange_by: PublicKey) -> Self {
-        let (not_match, matches): (Vec<PublicKey>, Vec<PublicKey>) =
-            self.members.iter().partition(|&key| key != &rearrange_by);
-        self.members = not_match;
-        self.members.extend(matches);
-        self
-    }
-
-    /// Set the room kind to ongoing
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The context to notify about the update
+    /// Sets this room is ongoing conversation
    pub fn set_ongoing(&mut self, cx: &mut Context<Self>) {
        if self.kind != RoomKind::Ongoing {
            self.kind = RoomKind::Ongoing;
@@ -199,116 +220,78 @@ impl Room {
        }
    }

-    /// Checks if the room is a group chat
-    ///
-    /// # Returns
-    ///
-    /// true if the room has more than 2 members, false otherwise
-    pub fn is_group(&self) -> bool {
-        self.members.len() > 2
-    }
-
    /// Updates the creation timestamp of the room
-    ///
-    /// # Arguments
-    ///
-    /// * `created_at` - The new Timestamp to set
-    /// * `cx` - The context to notify about the update
-    pub fn created_at(&mut self, created_at: impl Into<Timestamp>, cx: &mut Context<Self>) {
+    pub fn set_created_at(&mut self, created_at: impl Into<Timestamp>, cx: &mut Context<Self>) {
        self.created_at = created_at.into();
        cx.notify();
    }

    /// Updates the subject of the room
-    ///
-    /// # Arguments
-    ///
-    /// * `subject` - The new subject to set
-    /// * `cx` - The context to notify about the update
-    pub fn subject(&mut self, subject: String, cx: &mut Context<Self>) {
+    pub fn set_subject(&mut self, subject: String, cx: &mut Context<Self>) {
        self.subject = Some(subject);
        cx.notify();
    }

-    /// Updates the picture of the room
-    ///
-    /// # Arguments
-    ///
-    /// * `picture` - The new subject to set
-    /// * `cx` - The context to notify about the update
-    pub fn picture(&mut self, picture: String, cx: &mut Context<Self>) {
-        self.picture = Some(picture);
-        cx.notify();
+    /// Returns the members of the room
+    pub fn members(&self) -> &Vec<PublicKey> {
+        &self.members
+    }
+
+    /// Checks if the room has more than two members (group)
+    pub fn is_group(&self) -> bool {
+        self.members.len() > 2
    }

    /// Gets the display name for the room
-    ///
-    /// If the room has a subject set, that will be used as the display name.
-    /// Otherwise, it will generate a name based on the room members.
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The application context
-    ///
-    /// # Returns
-    ///
-    /// A string containing the display name
-    pub fn display_name(&self, cx: &App) -> String {
+    pub fn display_name(&self, cx: &App) -> SharedString {
        if let Some(subject) = self.subject.clone() {
-            subject
+            SharedString::from(subject)
        } else {
-            self.merge_name(cx)
+            self.merged_name(cx)
        }
    }

    /// Gets the display image for the room
-    ///
-    /// The image is determined by:
-    /// - The room's picture if set
-    /// - The first member's avatar for 1:1 chats
-    /// - A default group image for group chats
-    ///
-    /// # Arguments
-    ///
-    /// * `proxy` - Whether to use the proxy for the avatar URL
-    /// * `cx` - The application context
-    ///
-    /// # Returns
-    ///
-    /// A string containing the image path or URL
-    pub fn display_image(&self, proxy: bool, cx: &App) -> String {
-        if let Some(picture) = self.picture.as_ref() {
-            picture.clone()
-        } else if !self.is_group() {
-            self.first_member(cx).avatar_url(proxy)
+    pub fn display_image(&self, proxy: bool, cx: &App) -> SharedUri {
+        if !self.is_group() {
+            self.display_member(cx).avatar(proxy)
        } else {
-            "brand/group.png".into()
+            SharedUri::from("brand/group.png")
        }
    }

-    /// Get the first member of the room.
+    /// Get a single member to represent the room
    ///
-    /// First member is always different from the current user.
-    pub(crate) fn first_member(&self, cx: &App) -> Profile {
+    /// This member is always different from the current user.
+    fn display_member(&self, cx: &App) -> Profile {
        let registry = Registry::read_global(cx);
+
+        if let Some(public_key) = registry.signer_pubkey() {
+            for member in self.members() {
+                if member != &public_key {
+                    return registry.get_person(member, cx);
+                }
+            }
+        }
+
        registry.get_person(&self.members[0], cx)
    }

    /// Merge the names of the first two members of the room.
-    pub(crate) fn merge_name(&self, cx: &App) -> String {
+    fn merged_name(&self, cx: &App) -> SharedString {
        let registry = Registry::read_global(cx);

        if self.is_group() {
-            let profiles = self
+            let profiles: Vec<Profile> = self
                .members
                .iter()
-                .map(|pk| registry.get_person(pk, cx))
-                .collect::<Vec<_>>();
+                .map(|public_key| registry.get_person(public_key, cx))
+                .collect();

            let mut name = profiles
                .iter()
                .take(2)
-                .map(|p| p.display_name())
+                .map(|p| p.name())
                .collect::<Vec<_>>()
                .join(", ");

@@ -316,38 +299,127 @@ impl Room {
                name = format!("{}, +{}", name, profiles.len() - 2);
            }

-            name
+            SharedString::from(name)
        } else {
-            self.first_member(cx).display_name()
+            self.display_member(cx).display_name()
        }
    }

+    /// Connects to all members's messaging relays
+    pub fn connect(&self, cx: &App) -> Task<Result<HashMap<PublicKey, Vec<RelayUrl>>, Error>> {
+        let members = self.members.clone();
+
+        cx.background_spawn(async move {
+            let client = nostr_client();
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+
+            let mut relays = HashMap::new();
+            let mut processed = HashSet::new();
+
+            for member in members.into_iter() {
+                if member == public_key {
+                    continue;
+                };
+
+                relays.insert(member, vec![]);
+
+                let filter = Filter::new()
+                    .kind(Kind::InboxRelays)
+                    .author(member)
+                    .limit(1);
+
+                let mut stream = client
+                    .stream_events(filter, Duration::from_secs(10))
+                    .await?;
+
+                if let Some(event) = stream.next().await {
+                    if processed.insert(event.id) {
+                        let public_key = event.pubkey;
+                        let urls: Vec<RelayUrl> = nip17::extract_owned_relay_list(event).collect();
+
+                        // Check if at least one URL exists
+                        if urls.is_empty() {
+                            continue;
+                        }
+
+                        // Connect to relays
+                        for url in urls.iter() {
+                            client.add_relay(url).await?;
+                            client.connect_relay(url).await?;
+                        }
+
+                        relays.entry(public_key).and_modify(|v| v.extend(urls));
+                    }
+                }
+            }
+
+            Ok(relays)
+        })
+    }
+
+    pub fn disconnect(&self, relays: Vec<RelayUrl>, cx: &App) -> Task<Result<(), Error>> {
+        cx.background_spawn(async move {
+            let client = nostr_client();
+
+            for relay in relays.into_iter() {
+                client.disconnect_relay(relay).await?;
+            }
+
+            Ok(())
+        })
+    }
+
    /// Loads all messages for this room from the database
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// A Task that resolves to Result<Vec<Event>, Error> containing all messages for this room
    pub fn load_messages(&self, cx: &App) -> Task<Result<Vec<Event>, Error>> {
        let members = self.members.clone();

        cx.background_spawn(async move {
            let client = nostr_client();
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+            let sent_ids = app_state()
+                .sent_ids
+                .read()
+                .await
+                .iter()
+                .copied()
+                .collect_vec();

+            // Get seen events from database
+            let filter = Filter::new()
+                .kind(Kind::ApplicationSpecificData)
+                .identifiers(sent_ids);
+
+            let seen_events = client.database().query(filter).await?;
+
+            // Extract seen event IDs
+            let seen_ids: Vec<EventId> = seen_events
+                .into_iter()
+                .filter_map(|event| event.tags.event_ids().next().copied())
+                .collect();
+
+            // Get events that sent by current user
            let filter = Filter::new()
                .kind(Kind::PrivateDirectMessage)
-                .authors(members.clone())
+                .author(public_key)
                .pubkeys(members.clone());

-            let events: Vec<Event> = client
-                .database()
-                .query(filter)
-                .await?
+            let sent_events = client.database().query(filter).await?;
+
+            // Get events that received by current user
+            let filter = Filter::new()
+                .kind(Kind::PrivateDirectMessage)
+                .authors(members)
+                .pubkey(public_key);
+
+            let recv_events = client.database().query(filter).await?;
+
+            // Merge events
+            let events: Vec<Event> = sent_events
+                .merge(recv_events)
                .into_iter()
-                .filter(|ev| ev.compare_pubkeys(&members))
+                .filter(|event| !seen_ids.contains(&event.id))
                .collect();

            Ok(events)
@@ -364,24 +436,33 @@ impl Room {
        cx.emit(RoomSignal::Refresh);
    }

-    /// Creates a temporary message for optimistic updates
-    ///
-    /// The event must not been published to relays.
-    pub fn create_temp_message(
-        &self,
-        receiver: PublicKey,
-        content: &str,
-        replies: &[EventId],
-    ) -> UnsignedEvent {
-        let builder = EventBuilder::private_msg_rumor(receiver, content);
+    /// Create a new message event (unsigned)
+    pub fn create_message(&self, content: &str, replies: &[EventId], cx: &App) -> UnsignedEvent {
+        let public_key = Registry::read_global(cx).signer_pubkey().unwrap();
+        let subject = self.subject.clone();
+
        let mut tags = vec![];

-        // Add event reference if it's present (replying to another event)
+        // Add receivers
+        //
+        // NOTE: current user will be removed from the list of receivers
+        for member in self.members.iter() {
+            tags.push(Tag::public_key(member.to_owned()));
+        }
+
+        // Add subject tag if it's present
+        if let Some(subject) = subject {
+            tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                subject,
+            )));
+        }
+
+        // Add reply/quote tag
        if replies.len() == 1 {
            tags.push(Tag::event(replies[0]))
        } else {
-            for id in replies.iter() {
-                tags.push(Tag::from_standardized(TagStandard::Quote {
+            for id in replies {
+                tags.push(Tag::from_standardized_without_cell(TagStandard::Quote {
                    event_id: id.to_owned(),
                    relay_url: None,
                    public_key: None,
@@ -389,121 +470,195 @@ impl Room {
            }
        }

-        let mut event = builder.tags(tags).build(receiver);
-        // Ensure event ID is set
+        // Construct a direct message event
+        //
+        // WARNING: never send this event to relays
+        let mut event = EventBuilder::new(Kind::PrivateDirectMessage, content)
+            .tags(tags)
+            .build(public_key);
+
+        // Generate event ID
        event.ensure_id();

        event
    }

-    /// Sends a message to all members in the background task
-    ///
-    /// # Arguments
-    ///
-    /// * `content` - The content of the message to send
-    /// * `cx` - The App context
-    ///
-    /// # Returns
-    ///
-    /// A Task that resolves to Result<Vec<String>, Error> where the
-    /// strings contain error messages for any failed sends
-    pub fn send_in_background(
+    /// Create a task to send a message to all room members
+    pub fn send_message(
        &self,
-        content: &str,
-        replies: Vec<EventId>,
+        rumor: UnsignedEvent,
        backup: bool,
        cx: &App,
    ) -> Task<Result<Vec<SendReport>, Error>> {
-        let content = content.to_owned();
-        let subject = self.subject.clone();
-        let picture = self.picture.clone();
-        let mut public_keys = self.members.clone();
+        let mut members = self.members.clone();

        cx.background_spawn(async move {
+            let app_state = app_state();
            let client = nostr_client();
            let signer = client.signer().await?;
            let public_key = signer.get_public_key().await?;

-            let mut tags = public_keys
-                .iter()
-                .filter_map(|pubkey| {
-                    if pubkey != &public_key {
-                        Some(Tag::public_key(*pubkey))
-                    } else {
-                        None
-                    }
-                })
-                .collect_vec();
+            // Remove the current user's public key from the list of receivers
+            // Current user will be handled separately
+            members.retain(|&pk| pk != public_key);

-            // Add event reference if it's present (replying to another event)
-            if replies.len() == 1 {
-                tags.push(Tag::event(replies[0]))
-            } else {
-                for id in replies.iter() {
-                    tags.push(Tag::from_standardized(TagStandard::Quote {
-                        event_id: id.to_owned(),
-                        relay_url: None,
-                        public_key: None,
-                    }))
-                }
-            }
+            let mut reports: Vec<SendReport> = vec![];

-            // Add subject tag if it's present
-            if let Some(subject) = subject {
-                tags.push(Tag::from_standardized(TagStandard::Subject(
-                    subject.to_string(),
-                )));
-            }
+            for receiver in members.into_iter() {
+                let rumor = rumor.clone();
+                let event = EventBuilder::gift_wrap(&signer, &receiver, rumor, vec![]).await?;

-            // Add picture tag if it's present
-            if let Some(picture) = picture {
-                tags.push(Tag::custom(TagKind::custom("picture"), vec![picture]));
-            }
+                let Ok(relay_urls) = Self::messaging_relays(receiver).await else {
+                    reports.push(SendReport::new(receiver).not_found());
+                    continue;
+                };

-            // Remove the current public key from the list of receivers
-            public_keys.retain(|&pk| pk != public_key);
-
-            // Stored all send errors
-            let mut reports = vec![];
-
-            for receiver in public_keys.into_iter() {
-                match client
-                    .send_private_msg(receiver, &content, tags.clone())
-                    .await
-                {
+                match client.send_event_to(relay_urls, &event).await {
                    Ok(output) => {
-                        reports.push(SendReport::output(receiver, output));
-                    }
-                    Err(e) => {
-                        if let nostr_sdk::client::Error::PrivateMsgRelaysNotFound = e {
-                            reports.push(SendReport::nip17_relays_not_found(receiver));
+                        let id = output.id().to_owned();
+                        let auth_required = output.failed.iter().any(|m| m.1.starts_with("auth-"));
+                        let report = SendReport::new(receiver).status(output);
+
+                        if auth_required {
+                            // Wait for authenticated and resent event successfully
+                            for attempt in 0..=SEND_RETRY {
+                                let ids = app_state.resent_ids.read().await;
+
+                                // Check if event was successfully resent
+                                if let Some(output) = ids.iter().find(|e| e.id() == &id).cloned() {
+                                    let output = SendReport::new(receiver).status(output);
+                                    reports.push(output);
+                                    break;
+                                }
+
+                                // Check if retry limit exceeded
+                                if attempt == SEND_RETRY {
+                                    reports.push(report);
+                                    break;
+                                }
+
+                                smol::Timer::after(Duration::from_millis(1200)).await;
+                            }
                        } else {
-                            reports.push(SendReport::error(receiver, e.to_string()));
+                            reports.push(report);
                        }
                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(receiver).error(e.to_string()));
+                    }
                }
            }

+            // Construct a gift wrap to back up to current user's owned messaging relays
+            let rumor = rumor.clone();
+            let event = EventBuilder::gift_wrap(&signer, &public_key, rumor, vec![]).await?;
+
            // Only send a backup message to current user if sent successfully to others
            if reports.iter().all(|r| r.is_sent_success()) && backup {
-                match client
-                    .send_private_msg(public_key, &content, tags.clone())
-                    .await
-                {
-                    Ok(output) => {
-                        reports.push(SendReport::output(public_key, output));
-                    }
-                    Err(e) => {
-                        if let nostr_sdk::client::Error::PrivateMsgRelaysNotFound = e {
-                            reports.push(SendReport::nip17_relays_not_found(public_key));
-                        } else {
-                            reports.push(SendReport::error(public_key, e.to_string()));
+                if let Ok(relay_urls) = Self::messaging_relays(public_key).await {
+                    match client.send_event_to(relay_urls, &event).await {
+                        Ok(output) => {
+                            reports.push(SendReport::new(public_key).status(output));
+                        }
+                        Err(e) => {
+                            reports.push(SendReport::new(public_key).error(e.to_string()));
                        }
                    }
+                } else {
+                    reports.push(SendReport::new(public_key).not_found());
                }
+            } else {
+                reports.push(SendReport::new(public_key).on_hold(event));
            }

            Ok(reports)
        })
    }
+
+    /// Create a task to resend a failed message
+    pub fn resend_message(
+        &self,
+        reports: Vec<SendReport>,
+        cx: &App,
+    ) -> Task<Result<Vec<SendReport>, Error>> {
+        cx.background_spawn(async move {
+            let client = nostr_client();
+            let mut resend_reports = vec![];
+
+            for report in reports.into_iter() {
+                let receiver = report.receiver;
+
+                // Process failed events
+                if let Some(output) = report.status {
+                    let id = output.id();
+                    let urls: Vec<&RelayUrl> = output.failed.keys().collect();
+
+                    if let Some(event) = client.database().event_by_id(id).await? {
+                        for url in urls.into_iter() {
+                            let relay = client.pool().relay(url).await?;
+                            let id = relay.send_event(&event).await?;
+
+                            let resent: Output<EventId> = Output {
+                                val: id,
+                                success: HashSet::from([url.to_owned()]),
+                                failed: HashMap::new(),
+                            };
+
+                            resend_reports.push(SendReport::new(receiver).status(resent));
+                        }
+                    }
+                }
+
+                // Process the on hold event if it exists
+                if let Some(event) = report.on_hold {
+                    if let Ok(relay_urls) = Self::messaging_relays(receiver).await {
+                        match client.send_event_to(relay_urls, &event).await {
+                            Ok(output) => {
+                                resend_reports.push(SendReport::new(receiver).status(output));
+                            }
+                            Err(e) => {
+                                resend_reports.push(SendReport::new(receiver).error(e.to_string()));
+                            }
+                        }
+                    } else {
+                        resend_reports.push(SendReport::new(receiver).not_found());
+                    }
+                }
+            }
+
+            Ok(resend_reports)
+        })
+    }
+
+    /// Gets messaging relays for public key
+    async fn messaging_relays(public_key: PublicKey) -> Result<Vec<RelayUrl>, Error> {
+        let client = nostr_client();
+        let mut relay_urls = vec![];
+
+        let filter = Filter::new()
+            .kind(Kind::InboxRelays)
+            .author(public_key)
+            .limit(1);
+
+        if let Some(event) = client.database().query(filter).await?.first_owned() {
+            let urls: Vec<RelayUrl> = nip17::extract_owned_relay_list(event).collect();
+
+            // Check if at least one URL exists
+            if urls.is_empty() {
+                return Err(anyhow!("Not found"));
+            }
+
+            // Connect to relays
+            for url in urls.iter() {
+                client.add_relay(url).await?;
+                client.connect_relay(url).await?;
+            }
+
+            relay_urls.extend(urls.into_iter().take(3).unique());
+        } else {
+            return Err(anyhow!("Not found"));
+        }
+
+        Ok(relay_urls)
+    }
 }
@@ -94,7 +94,6 @@ impl Global for GlobalAppSettings {}
 pub struct AppSettings {
    setting_values: Settings,
    _subscriptions: SmallVec<[Subscription; 1]>,
-    _tasks: SmallVec<[Task<()>; 1]>,
 }

 impl AppSettings {
@@ -113,15 +112,23 @@ impl AppSettings {
        cx.set_global(GlobalAppSettings(state));
    }

-    fn new(cx: &mut Context<Self>) -> Self {
-        let setting_values = Settings::default();
-        let mut tasks = smallvec![];
+    fn new(_cx: &mut Context<Self>) -> Self {
+        Self {
+            setting_values: Settings::default(),
+            _subscriptions: smallvec![],
+        }
+    }

+    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_IDENTIFIER)
+                .author(public_key)
                .limit(1);

            if let Some(event) = client.database().query(filter).await?.first_owned() {
@@ -131,44 +138,37 @@ impl AppSettings {
            }
        });

-        tasks.push(
-            // Load settings from database
-            cx.spawn(async move |this, cx| {
-                if let Ok(settings) = task.await {
-                    this.update(cx, |this, cx| {
-                        this.setting_values = settings;
-                        cx.notify();
-                    })
-                    .ok();
-                }
-            }),
-        );
-
-        Self {
-            setting_values,
-            _subscriptions: smallvec![],
-            _tasks: tasks,
-        }
+        cx.spawn(async move |this, cx| {
+            if let Ok(settings) = task.await {
+                this.update(cx, |this, cx| {
+                    this.setting_values = settings;
+                    cx.notify();
+                })
+                .ok();
+            }
+        })
+        .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 {
+            let task: Task<Result<(), anyhow::Error>> = cx.background_spawn(async move {
                let client = nostr_client();
-                let builder = EventBuilder::new(Kind::ApplicationSpecificData, content)
-                    .tags(vec![Tag::identifier(SETTINGS_IDENTIFIER)])
-                    .sign(&Keys::generate())
-                    .await;
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;

-                if let Ok(event) = builder {
-                    if let Err(e) = client.database().save_event(&event).await {
-                        log::error!("Failed to save user settings: {e}");
-                    } else {
-                        log::info!("New settings have been saved successfully");
-                    }
-                }
-            })
-            .detach();
+                let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
+                    .tag(Tag::identifier(SETTINGS_IDENTIFIER))
+                    .build(public_key)
+                    .sign(&Keys::generate())
+                    .await?;
+
+                client.database().save_event(&event).await?;
+
+                Ok(())
+            });
+
+            task.detach();
        }
    }

@@ -176,12 +176,16 @@ impl AppSettings {
        !self.setting_values.authenticated_relays.is_empty() && self.setting_values.auto_auth
    }

-    pub fn auth_relays(&self) -> Vec<RelayUrl> {
-        self.setting_values.authenticated_relays.clone()
+    pub fn is_authenticated(&self, url: &RelayUrl) -> bool {
+        self.setting_values.authenticated_relays.contains(url)
    }

-    pub fn push_auth_relay(&mut self, relay_url: RelayUrl, cx: &mut Context<Self>) {
-        self.setting_values.authenticated_relays.push(relay_url);
-        cx.notify();
+    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();
+        }
    }
 }
@@ -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.;
@@ -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" }
@@ -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)]
@@ -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")
@@ -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 {
@@ -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)
@@ -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>
@@ -14,8 +14,6 @@ pub enum IconName {
    ArrowLeft,
    ArrowRight,
    ArrowUp,
-    ArrowUpCircle,
-    Bell,
    CaretUp,
    CaretDown,
    CaretDownFill,
@@ -28,7 +26,6 @@ pub enum IconName {
    CloseCircleFill,
    Copy,
    Edit,
-    EditFill,
    Ellipsis,
    Eye,
    EyeOff,
@@ -48,22 +45,23 @@ pub enum IconName {
    Plus,
    PlusFill,
    PlusCircleFill,
+    Group,
    ResizeCorner,
    Reply,
    Report,
    Refresh,
-    Forward,
+    Signal,
    Search,
-    SearchFill,
    Settings,
+    Server,
    SortAscending,
    SortDescending,
    Sun,
    ThumbsDown,
    ThumbsUp,
    Upload,
-    UsersThreeFill,
    OpenUrl,
+    Warning,
    WindowClose,
    WindowMaximize,
    WindowMinimize,
@@ -78,8 +76,6 @@ impl IconName {
            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",
@@ -92,7 +88,6 @@ impl IconName {
            Self::CloseCircleFill => "icons/close-circle-fill.svg",
            Self::Copy => "icons/copy.svg",
            Self::Edit => "icons/edit.svg",
-            Self::EditFill => "icons/edit-fill.svg",
            Self::Ellipsis => "icons/ellipsis.svg",
            Self::Eye => "icons/eye.svg",
            Self::EmojiFill => "icons/emoji-fill.svg",
@@ -112,22 +107,23 @@ impl IconName {
            Self::Plus => "icons/plus.svg",
            Self::PlusFill => "icons/plus-fill.svg",
            Self::PlusCircleFill => "icons/plus-circle-fill.svg",
+            Self::Group => "icons/group.svg",
            Self::ResizeCorner => "icons/resize-corner.svg",
            Self::Reply => "icons/reply.svg",
            Self::Report => "icons/report.svg",
            Self::Refresh => "icons/refresh.svg",
-            Self::Forward => "icons/forward.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::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",
@@ -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))),
+                ),
+        )
    }
 }
@@ -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()
+    }
+}
@@ -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,
        }
@@ -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)
 }
@@ -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;
@@ -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);
    }
 }
@@ -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, '+' | '-')
+}
@@ -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::*;
@@ -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,
+        }
+    }
+}
@@ -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()
+        }
+    }
+}
@@ -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),
+                )
+            })
    }
 }
@@ -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);
+    }
+}
@@ -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))
@@ -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 {
@@ -30,14 +30,10 @@ pub enum NotificationType {
 impl NotificationType {
    fn icon(&self, cx: &App) -> Icon {
        match self {
-            Self::Info => Icon::new(IconName::Info).text_color(cx.theme().element_active),
-            Self::Warning => Icon::new(IconName::Report).text_color(cx.theme().warning_foreground),
-            Self::Success => {
-                Icon::new(IconName::CheckCircle).text_color(cx.theme().element_foreground)
-            }
-            Self::Error => {
-                Icon::new(IconName::CloseCircle).text_color(cx.theme().danger_foreground)
-            }
+            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),
        }
    }
 }
@@ -299,7 +295,7 @@ impl Render for Notification {
            .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()
@@ -44,7 +44,7 @@ pub fn init(cx: &mut App) {
    ]);
 }

-pub trait PopupMenuExt: Styled + Selectable + IntoElement + 'static {
+pub trait PopupMenuExt: Styled + Selectable + InteractiveElement + IntoElement + 'static {
    /// Create a popup menu with the given items, anchored to the TopLeft corner
    fn popup_menu(
        self,
@@ -60,9 +60,9 @@ pub trait PopupMenuExt: Styled + Selectable + IntoElement + 'static {
        f: impl Fn(PopupMenu, &mut Window, &mut Context<PopupMenu>) -> PopupMenu + 'static,
    ) -> Popover<PopupMenu> {
        let style = self.style().clone();
-        let element_id = self.element_id();
+        let id = self.interactivity().element_id.clone();

-        Popover::new(SharedString::from(format!("popup-menu:{element_id:?}")))
+        Popover::new(SharedString::from(format!("popup-menu:{id:?}")))
            .no_style()
            .trigger(self)
            .trigger_style(style)
@@ -405,13 +405,14 @@ impl Render for ResizablePanel {
            return div();
        }

-        let view = cx.entity().clone();
        let total_size = self
            .group
            .as_ref()
            .and_then(|group| group.upgrade())
            .map(|group| group.read(cx).total_size());

+        let view = cx.entity();
+
        div()
            .flex()
            .flex_grow()
@@ -194,7 +194,7 @@ impl Root {
        }
    }

-    // Render Notification layer.
+    /// Render Notification layer.
    pub fn render_notification_layer(
        window: &mut Window,
        cx: &mut App,
@@ -56,7 +56,7 @@ impl RenderOnce for Skeleton {
            .bg(color)
            .with_animation(
                "skeleton",
-                Animation::new(Duration::from_secs(2))
+                Animation::new(Duration::from_secs(3))
                    .repeat()
                    .with_easing(bounce(ease_in_out)),
                move |this, delta| {
@@ -1,8 +1,6 @@
 use std::fmt::{self, Display, Formatter};

-use gpui::{
-    div, px, App, Axis, Div, Element, ElementId, Pixels, Refineable, StyleRefinement, Styled,
-};
+use gpui::{div, px, App, Axis, Div, Element, Pixels, Refineable, StyleRefinement, Styled};
 use serde::{Deserialize, Serialize};
 use theme::ActiveTheme;

@@ -105,9 +103,16 @@ impl From<Pixels> for Size {

 /// A trait for defining element that can be selected.
 pub trait Selectable: Sized {
-    fn element_id(&self) -> &ElementId;
    /// Set the selected state of the element.
    fn selected(self, selected: bool) -> Self;
+
+    /// Returns true if the element is selected.
+    fn is_selected(&self) -> bool;
+
+    /// Set is the element mouse right clicked, default do nothing.
+    fn secondary_selected(self, _: bool) -> Self {
+        self
+    }
 }

 /// A trait for defining element that can be disabled.
@@ -11,7 +11,6 @@ pub mod tab_bar;

 #[derive(IntoElement)]
 pub struct Tab {
-    id: ElementId,
    base: Stateful<Div>,
    label: AnyElement,
    prefix: Option<AnyElement>,
@@ -25,7 +24,6 @@ impl Tab {
        let id: ElementId = id.into();

        Self {
-            id: id.clone(),
            base: div().id(id),
            label: label.into_any_element(),
            disabled: false,
@@ -55,14 +53,14 @@ impl Tab {
 }

 impl Selectable for Tab {
-    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 InteractiveElement for Tab {
@@ -1,7 +1,7 @@
 use std::ops::Range;
 use std::sync::Arc;

-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use gpui::{
    AnyElement, AnyView, App, ElementId, HighlightStyle, InteractiveText, IntoElement,
    SharedString, StyledText, UnderlineStyle, Window,
@@ -13,7 +13,7 @@ use regex::Regex;
 use registry::Registry;
 use theme::ActiveTheme;

-use crate::actions::OpenProfile;
+use crate::actions::OpenPublicKey;

 static URL_REGEX: Lazy<Regex> = Lazy::new(|| {
    Regex::new(r"^(?:[a-zA-Z]+://)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(:\d+)?(/.*)?$").unwrap()
@@ -140,7 +140,7 @@ impl RenderedText {
                        log::error!("Failed to parse public key from: {clean_url}");
                        return;
                    };
-                    window.dispatch_action(Box::new(OpenProfile(public_key)), cx);
+                    window.dispatch_action(Box::new(OpenPublicKey(public_key)), cx);
                } else if is_url(token) {
                    if !token.starts_with("http") {
                        cx.open_url(&format!("https://{token}"));
@@ -45,6 +45,14 @@ common:
    en: "Ignore"
  relay:
    en: "Relay"
+  relay_invalid:
+    en: "Relay URL is not valid."
+  recommended:
+    en: "Recommended:"
+  resend:
+    en: "Resend"
+  seen_on:
+    en: "Seen on"

 auto_update:
  updating:
@@ -54,9 +62,11 @@ auto_update:

 user:
  dark_mode:
-    en: "Dark Mode"
+    en: "Dark mode"
  settings:
    en: "Settings"
+  reload_metadata:
+    en: "Reload metadata"
  sign_out:
    en: "Sign out"

@@ -96,9 +106,9 @@ auth:
  label:
    en: "Authentication Required"
  message:
-    en: "Approve the authentication request to allow Coop to continue getting your messages."
+    en: "Approve the authentication request to allow Coop to continue sending or receiving events."
  requests:
-    en: "You have %{u} total pending authentication requests"
+    en: "You have %{u} pending authentication requests"

 startup:
  client_keys_warning:
@@ -167,20 +177,22 @@ login:
    en: "Logging in..."

 relays:
-  button_label:
+  button:
    en: "Configure the Messaging Relays to receive messages"
-  modal_title:
+  modal:
    en: "Set Up Messaging Relays"
  description:
    en: "In order to receive messages from others, you need to set up at least one Messaging Relay."
-  add_some_relays:
+  help_text:
    en: "Please add some relays."
-  invalid:
-    en: "Relay URL is not valid."
  empty:
-    en: "You need to add at least 1 relay to receive messages."
-  recommended:
-    en: "Recommended:"
+    en: "You need to add at least 1 relay to receive messages from others."
+
+manage_relays:
+  modal:
+    en: "Messaging Relay Status"
+  time:
+    en: "Last activity: %{t}"

 subject:
  title:
@@ -213,6 +225,14 @@ screening:
    en: "This person is one of your contacts."
  not_contact:
    en: "This person is not one of your contacts."
+  active_label:
+    en: "Activity on Public Relays"
+  active_tooltip:
+    en: "This may be inaccurate if the user only publishes to their private relays."
+  no_active:
+    en: "This person hasn't had any activity."
+  active_at:
+    en: "Last active: %{d}."
  mutual_label:
    en: "Mutual contacts"
  mutual:
@@ -252,9 +272,11 @@ profile:
  unknown:
    en: "Unknown contact"
  njump:
-    en: "Open in njump.me"
+    en: "View on njump.me"
  no_bio:
    en: "No bio."
+  copy:
+    en: "Copy Public Key"

 preferences:
  account_header:
@@ -295,10 +317,6 @@ preferences:
    en: "Display"

 compose:
-  placeholder_npub:
-    en: "npub or nprofile..."
-  placeholder_title:
-    en: "Family...(Optional)"
  create_dm_button:
    en: "Create DM"
  creating_dm_button:
@@ -313,8 +331,6 @@ compose:
    en: "Your recently contacts will appear here."
  contact_existed:
    en: "Contact already added"
-  receiver_required:
-    en: "You need to add at least 1 receiver"
  description:
    en: "Start a conversation with someone using their npub or NIP-05 (like foo@bar.com)."
  subject_label:
@@ -353,9 +369,13 @@ chat:
    en: "%{u} has not set up Messaging Relays, so they won't receive your message."

 sidebar:
-  find_or_start_conversation:
+  reload_menu:
+    en: "Reload"
+  status_menu:
+    en: "Relay Status"
+  search_label:
    en: "Find or start a conversation"
-  press_enter_to_search:
+  search_tooltip:
    en: "Press Enter to search"
  empty:
    en: "There are no users matching query %{query}"
@@ -377,9 +397,17 @@ sidebar:
    en: "Incoming new conversations"
  trusted_contacts_tooltip:
    en: "Only show rooms from trusted contacts"
+  no_requests:
+    en: "No message requests"
+  no_requests_label:
+    en: "New message requests from people you don't know will appear here."
+  no_conversations:
+    en: "No conversations"
+  no_conversations_label:
+    en: "Start a conversation with someone to get started."

 loading:
  label:
-    en: "Downloading messages"
+    en: "Getting messages. This may take a while..."
  tooltip:
-    en: "This may take a while. Please be patient."
+    en: "The progress runs in the background. It doesn't affect your experience."
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# Script to release a new version of the application
+# Usage: ./release <new_version>
+
+set -e  # Exit on any error
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <new_version>"
+    echo "Example: $0 1.0.0"
+    exit 1
+fi
+
+NEW_VERSION="$1"
+WORKSPACE_CARGO="Cargo.toml"
+CRATE_CARGO="crates/coop/Cargo.toml"
+
+# Check if both Cargo.toml files exist
+if [ ! -f "$WORKSPACE_CARGO" ]; then
+    echo "Error: $WORKSPACE_CARGO not found in current directory"
+    exit 1
+fi
+
+if [ ! -f "$CRATE_CARGO" ]; then
+    echo "Error: $CRATE_CARGO not found"
+    exit 1
+fi
+
+# Function to update version in a Cargo.toml file
+update_version() {
+    local file="$1"
+    local backup="${file}.bak"
+
+    # Backup the original file
+    cp "$file" "$backup"
+
+    # Replace the version in Cargo.toml
+    if sed -i.bak -E "s/^version = \"[0-9]+\.[0-9]+\.[0-9]+\"/version = \"$NEW_VERSION\"/" "$file"; then
+        echo "✓ Updated version to $NEW_VERSION in $file"
+        # Remove backup created by sed
+        if [ -f "${file}.bak" ]; then
+            rm "${file}.bak"
+        fi
+    else
+        echo "Error: Failed to update version in $file"
+        # Restore original backup
+        mv "$backup" "$file"
+        exit 1
+    fi
+
+    # Remove the initial backup file
+    rm -f "$backup"
+}
+
+# Update both Cargo.toml files
+echo "Updating versions..."
+update_version "$WORKSPACE_CARGO"
+update_version "$CRATE_CARGO"
+
+# Check git status before committing
+echo "Checking git status..."
+if git status --porcelain | grep -q .; then
+    echo "Current uncommitted changes:"
+    git status --short
+
+    # Ask user if they want to commit all changes or just version files
+    echo ""
+    echo "Do you want to:"
+    echo "1) Commit all current changes (including the version updates)"
+    echo "2) Commit only the version file changes"
+    echo "3) Abort the release"
+    read -p "Enter choice (1/2/3): " choice
+
+    case $choice in
+        1)
+            echo "Committing all changes..."
+            git add .
+            ;;
+        2)
+            echo "Committing only version file changes..."
+            git add "$WORKSPACE_CARGO" "$CRATE_CARGO"
+            ;;
+        3)
+            echo "Release aborted by user"
+            exit 0
+            ;;
+        *)
+            echo "Invalid choice. Release aborted."
+            exit 1
+            ;;
+    esac
+else
+    # Only version files were modified, add them specifically
+    echo "Only version files were modified, adding them for commit..."
+    git add "$WORKSPACE_CARGO" "$CRATE_CARGO"
+fi
+
+# Commit the changes
+COMMIT_MSG="chore: release version $NEW_VERSION"
+
+if git commit -m "$COMMIT_MSG"; then
+    echo "✓ Committed version changes"
+else
+    echo "Error: Failed to commit version changes"
+    exit 1
+fi
+
+# Push version changes to origin
+echo "Pushing version changes to origin..."
+if git push origin master; then
+    echo "✓ Successfully pushed version changes to origin"
+else
+    echo "Error: Failed to push version changes to origin"
+    exit 1
+fi
+
+# Create git tag
+TAG_NAME="v$NEW_VERSION"
+
+if git tag -a "$TAG_NAME" -m "$COMMIT_MSG"; then
+    echo "✓ Created git tag: $TAG_NAME"
+else
+    echo "Error: Failed to create git tag"
+    exit 1
+fi
+
+# Push tag to origin
+echo "Pushing tag to origin..."
+if git push origin "$TAG_NAME"; then
+    echo "✓ Successfully pushed tag to origin"
+    echo "✓ Release $NEW_VERSION completed successfully!"
+else
+    echo "Error: Failed to push tag to origin"
+    exit 1
+fi
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
reyaandGitHub	ebcc60cd92	chore: follow up on #172 (#173 ) * clean up * wip * clean up * remove unused picture field	2025-10-01 13:45:13 +07:00
reyaandGitHub	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
reyaandGitHub	d889f9b25d	chore: always call get_public_key on nip46 (#171 ) * get public key on login * .	2025-09-28 07:57:04 +07:00
reyaandGitHub	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
reyaandGitHub	338a947b57	chore: fix duplicate reply (#169 ) * prevent duplicate reply * .	2025-09-27 08:02:16 +07:00
reyaandGitHub	98ce928f0c	chore: fix double message on sent (#166 ) * . * fix * update	2025-09-26 14:17:31 +07:00
reyaandGitHub	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
reyaandGitHub	9abcc25f32	chore: optimize resource usage (#162 ) * avoid string allocation * cache image * . * . * . * fix	2025-09-23 09:03:48 +07:00
reyaandGitHub	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
reyaandGitHub	9f369bf57f	chore: improve auth handling in startup screen (#160 ) * cancel auth * .	2025-09-18 20:01:10 +07:00
reyaandGitHub	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
reyaandGitHub	c67b223a53	chore: add missing ui elements (#153 ) * add empty state * . * update welcome panel	2025-09-16 19:59:03 +07:00
reyaandGitHub	9880a3ed3d	chore: follow up on #151 (#152 ) * improve ui * . * clean up	2025-09-15 20:53:25 +07:00
reyaandGitHub	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
reyaandGitHub	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
reyaandGitHub	b142982ab1	chore: refactor event fetching (#148 ) * use stream for nip65 and nip17 relays fetching * .	2025-09-13 07:42:17 +07:00
reyaandGitHub	2ea2519e8b	feat: resend failed messages (#147 ) * . * . * fix * fix * update * fix * . * .	2025-09-12 17:07:57 +07:00
reyaandGitHub	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
reyaandGitHub	fc99ef4dfe	chore: improve the activity check (#145 ) * better check for activity * .	2025-09-09 10:23:40 +07:00
reyaandGitHub	d0f7a1abd3	feat: extended screening (#144 ) * improve mutual contacts check * . * .	2025-09-08 17:11:29 +07:00
reyaandGitHub	71140beb52	feat: relay status viewer (#143 ) * add relay status * .	2025-09-07 14:54:28 +07:00
reyaandGitHub	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
reyaandGitHub	ede41c41c3	chore: improve the event loop (#141 ) * improve wait for signer * refactor gift wrap processor * . * . * . * . * .	2025-09-05 19:01:26 +07:00
reyaandGitHub	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
reyaandGitHub	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
reyaandGitHub	d392602ed6	feat: resend messages after authentication (#137 ) * resend failed message * update settings	2025-09-02 18:19:53 +07:00
reyaandGitHub	5a36354cc8	chore: fix handling of ongoing room kind incorrectly (#136 )	2025-09-01 19:44:23 +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="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>