chore: bump version

* get public key on login

* .

.github/workflows/release.yml

@@ -157,7 +157,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.version.outputs.tag }}
-          name: Release ${{ steps.version.outputs.tag }}
+          name: ${{ steps.version.outputs.tag }}
           draft: true
           prerelease: false
           generate_release_notes: true

Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*"]
 default-members = ["crates/coop"]
 
 [workspace.package]
-version = "0.2.6"
+version = "0.2.10"
 edition = "2021"
 publish = false
 
@@ -58,3 +58,7 @@ opt-level = "z"
 lto = true
 codegen-units = 1
 panic = "abort"
+
+[profile.profiling]
+inherits = "release"
+debug = true

assets/icons/group.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17.75 19.25h2.596c1.163 0 2.106-1.001 1.788-2.12-.733-2.573-2.465-4.38-5.134-4.38-.446 0-.866.05-1.26.147M11.25 7a3.25 3.25 0 1 1-6.5 0 3.25 3.25 0 0 1 6.5 0Zm8.5.5a2.75 2.75 0 1 1-5.5 0 2.75 2.75 0 0 1 5.5 0ZM2.08 18.126c.78-3.14 2.78-5.376 5.92-5.376s5.14 2.237 5.918 5.376c.28 1.128-.658 2.124-1.82 2.124H3.901c-1.162 0-2.1-.996-1.82-2.124Z"/>
+</svg>

assets/icons/server.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.5" d="M21.25 12V6.75a2 2 0 0 0-2-2H4.75a2 2 0 0 0-2 2V12m18.5 0H2.75m18.5 0v5.25a2 2 0 0 1-2 2H4.75a2 2 0 0 1-2-2V12"/>
+  <path fill="currentColor" stroke="currentColor" stroke-width=".5" d="M6.5 14.875a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5Zm0-7.25a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5Z"/>
+</svg>

crates/client_keys/src/lib.rs

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

crates/common/src/display.rs

@@ -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 {
+pub trait RenderedProfile {
-    fn avatar_url(&self, proxy: bool) -> String;
+    fn avatar(&self, proxy: bool) -> SharedUri;
-    fn display_name(&self) -> String;
+    fn display_name(&self) -> SharedString;
 }
 
-impl ReadableProfile for Profile {
+impl RenderedProfile for Profile {
-    fn avatar_url(&self, proxy: bool) -> String {
+    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 {
+pub trait RenderedTimestamp {
-    fn to_human_time(&self) -> String;
+    fn to_human_time(&self) -> SharedString;
-    fn to_ago(&self) -> String;
+    fn to_ago(&self) -> SharedString;
 }
 
-impl ReadableTimestamp for Timestamp {
+impl RenderedTimestamp for Timestamp {
-    fn to_human_time(&self) -> String {
+    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 == now_date => SharedString::from(format!("Today at {time_format}")),
-            date if date == yesterday_date => format!("Yesterday at {time_format}"),
+            date if date == yesterday_date => {
-            _ => format!("{}, {time_format}", input_time.format("%d/%m/%y")),
+                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_seconds() < SECONDS_IN_MINUTE => SharedString::from(NOW),
-            d if d.num_minutes() < MINUTES_IN_HOUR => format!("{}m", d.num_minutes()),
+            d if d.num_minutes() < MINUTES_IN_HOUR => {
-            d if d.num_hours() < HOURS_IN_DAY => format!("{}h", d.num_hours()),
+                SharedString::from(format!("{}m", d.num_minutes()))
-            d if d.num_days() < DAYS_IN_MONTH => format!("{}d", d.num_days()),
+            }
-            _ => input_time.format("%b %d").to_string(),
+            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()),
         }
     }
 }

crates/common/src/event.rs

@@ -45,3 +45,39 @@ impl EventUtils for Event {
         a == b
     }
 }
+
+impl EventUtils for UnsignedEvent {
+    fn uniq_id(&self) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        let mut pubkeys: Vec<PublicKey> = vec![];
+
+        // Add all public keys from event
+        pubkeys.push(self.pubkey);
+        pubkeys.extend(self.tags.public_keys().collect::<Vec<_>>());
+
+        // Generate unique hash
+        pubkeys
+            .into_iter()
+            .unique()
+            .sorted()
+            .collect::<Vec<_>>()
+            .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
+    }
+
+    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
+    }
+}

crates/common/src/handle_auth.rs

@@ -1,14 +0,0 @@
-use nostr_connect::prelude::*;
-
-#[derive(Debug, Clone)]
-pub struct CoopAuthUrlHandler;
-
-impl AuthUrlHandler for CoopAuthUrlHandler {
-    fn on_auth_url(&self, auth_url: Url) -> BoxedFuture<Result<()>> {
-        Box::pin(async move {
-            log::info!("Received Auth URL: {auth_url}");
-            webbrowser::open(auth_url.as_str())?;
-            Ok(())
-        })
-    }
-}

crates/common/src/lib.rs

@@ -1,6 +1,5 @@
 pub mod debounced_delay;
 pub mod display;
 pub mod event;
-pub mod handle_auth;
 pub mod nip05;
 pub mod nip96;

crates/coop/Cargo.toml

@@ -14,7 +14,7 @@ product-name = "Coop"
 description = "Chat Freely, Stay Private on Nostr"
 identifier = "su.reya.coop"
 category = "SocialNetworking"
-version = "0.2.6"
+version = "0.2.10"
 out-dir = "../../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]
@@ -62,5 +62,5 @@ oneshot.workspace = true
 flume.workspace = true
 webbrowser.workspace = true
 
-tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
 indexset = "0.12.3"
+tracing-subscriber = { version = "0.3.18", features = ["fmt"] }

crates/coop/src/actions.rs

@@ -1,10 +1,24 @@
 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();
     let font_paths = asset_source.list("fonts").unwrap();

crates/coop/src/chatspace.rs

@@ -7,19 +7,18 @@ use std::time::Duration;
 use anyhow::{anyhow, Error};
 use auto_update::AutoUpdater;
 use client_keys::ClientKeys;
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use common::event::EventUtils;
-use flume::{Receiver, Sender};
 use global::constants::{
     ACCOUNT_IDENTIFIER, BOOTSTRAP_RELAYS, DEFAULT_SIDEBAR_WIDTH, METADATA_BATCH_LIMIT,
     METADATA_BATCH_TIMEOUT, SEARCH_RELAYS,
 };
-use global::{css, ingester, nostr_client, AuthRequest, Notice, Signal, UnwrappingStatus};
+use global::{app_state, nostr_client, AuthRequest, Notice, SignalKind, UnwrappingStatus};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, px, rems, App, AppContext, AsyncWindowContext, Axis, Context, Entity, InteractiveElement,
+    deferred, div, px, rems, App, AppContext, AsyncWindowContext, Axis, ClipboardItem, Context,
-    IntoElement, ParentElement, Render, SharedString, StatefulInteractiveElement, Styled,
+    Entity, InteractiveElement, IntoElement, ParentElement, Render, SharedString,
-    Subscription, Task, WeakEntity, Window,
+    StatefulInteractiveElement, Styled, Subscription, Task, WeakEntity, Window,
 };
 use i18n::{shared_t, t};
 use itertools::Itertools;
@@ -31,7 +30,7 @@ use signer_proxy::{BrowserSignerProxy, BrowserSignerProxyOptions};
 use smallvec::{smallvec, SmallVec};
 use theme::{ActiveTheme, Theme, ThemeMode};
 use title_bar::TitleBar;
-use ui::actions::OpenProfile;
+use ui::actions::{CopyPublicKey, OpenPublicKey};
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::dock_area::dock::DockPlacement;
@@ -42,7 +41,7 @@ use ui::notification::Notification;
 use ui::popup_menu::PopupMenuExt;
 use ui::{h_flex, v_flex, ContextModal, Disableable, IconName, Root, Sizable, StyledExt};
 
-use crate::actions::{DarkMode, Logout, Settings};
+use crate::actions::{DarkMode, Logout, ReloadMetadata, Settings};
 use crate::views::compose::compose_button;
 use crate::views::setup_relay::setup_nip17_relay;
 use crate::views::{
@@ -64,18 +63,22 @@ pub fn new_account(window: &mut Window, cx: &mut App) {
 }
 
 pub struct ChatSpace {
-    // Workspace
+    // App's Title Bar
     title_bar: Entity<TitleBar>,
+
+    // App's Dock Area
     dock: Entity<DockArea>,
 
-    // Temporarily store all authentication requests
+    // All authentication requests
-    auth_requests: HashMap<AuthRequest, bool>,
+    auth_requests: Entity<HashMap<RelayUrl, AuthRequest>>,
 
     // Local state to determine if the user has set up NIP-17 relays
-    has_nip17_relays: bool,
+    nip17_relays: bool,
 
-    // System
+    // All subscriptions for observing the app state
-    _subscriptions: SmallVec<[Subscription; 3]>,
+    _subscriptions: SmallVec<[Subscription; 4]>,
+
+    // All long running tasks
     _tasks: SmallVec<[Task<()>; 5]>,
 }
 
@@ -87,11 +90,18 @@ impl ChatSpace {
 
         let title_bar = cx.new(|_| TitleBar::new());
         let dock = cx.new(|cx| DockArea::new(window, cx));
+        let auth_requests = cx.new(|_| HashMap::new());
 
-        let (pubkey_tx, pubkey_rx) = flume::bounded::<PublicKey>(1024);
         let mut subscriptions = smallvec![];
         let mut tasks = smallvec![];
 
+        subscriptions.push(
+            // Automatically sync theme with system appearance
+            window.observe_window_appearance(|window, cx| {
+                Theme::sync_system_appearance(Some(window), cx);
+            }),
+        );
+
         subscriptions.push(
             // Observe the client keys and show an alert modal if they fail to initialize
             cx.observe_in(&client_keys, window, |this, keys, window, cx| {
@@ -143,7 +153,7 @@ impl ChatSpace {
                     .await
                     .expect("Failed connect the bootstrap relays. Please restart the application.");
 
-                Self::process_nostr_events(&pubkey_tx)
+                Self::process_nostr_events()
                     .await
                     .expect("Failed to handle nostr events. Please restart the application.");
             }),
@@ -167,7 +177,7 @@ impl ChatSpace {
         tasks.push(
             // Listen all metadata requests then batch them into single subscription
             cx.background_spawn(async move {
-                Self::process_batching_metadata(&pubkey_rx).await;
+                Self::process_batching_metadata().await;
             }),
         );
 
@@ -181,8 +191,8 @@ impl ChatSpace {
         Self {
             dock,
             title_bar,
-            auth_requests: HashMap::new(),
+            auth_requests,
-            has_nip17_relays: true,
+            nip17_relays: true,
             _subscriptions: subscriptions,
             _tasks: tasks,
         }
@@ -211,75 +221,83 @@ impl ChatSpace {
 
     async fn observe_signer() {
         let client = nostr_client();
-        let ingester = ingester();
+        let app_state = app_state();
+        let stream_timeout = Duration::from_secs(5);
         let loop_duration = Duration::from_secs(1);
-        let mut is_sent_signal = false;
-        let mut identity: Option<PublicKey> = None;
 
         loop {
-            if let Some(public_key) = identity {
+            let Ok(signer) = client.signer().await else {
-                let nip65 = Filter::new().kind(Kind::RelayList).author(public_key);
+                smol::Timer::after(loop_duration).await;
+                continue;
+            };
 
-                if client.database().count(nip65).await.unwrap_or(0) > 0 {
+            let Ok(public_key) = signer.get_public_key().await else {
-                    let dm_relays = Filter::new().kind(Kind::InboxRelays).author(public_key);
+                smol::Timer::after(loop_duration).await;
+                continue;
+            };
 
-                    match client.database().query(dm_relays).await {
+            // Notify the app that the signer has been set.
-                        Ok(events) => {
+            app_state
-                            if let Some(event) = events.first_owned() {
+                .signal
-                                let relay_urls = nip17::extract_relay_list(&event).collect_vec();
+                .send(SignalKind::SignerSet(public_key))
+                .await;
 
-                                if relay_urls.is_empty() {
+            // Subscribe to the NIP-65 relays for the public key.
-                                    if !is_sent_signal {
+            let filter = Filter::new()
-                                        ingester.send(Signal::DmRelayNotFound).await;
+                .kind(Kind::RelayList)
-                                        is_sent_signal = true;
+                .author(public_key)
-                                    }
+                .limit(1);
-                                } else {
-                                    break;
-                                }
-                            } else if !is_sent_signal {
-                                ingester.send(Signal::DmRelayNotFound).await;
-                                is_sent_signal = true;
-                            } else {
-                                break;
-                            }
-                        }
-                        Err(e) => {
-                            log::error!("Database query error: {e}");
-                            if !is_sent_signal {
-                                ingester.send(Signal::DmRelayNotFound).await;
-                                is_sent_signal = true;
-                            }
-                        }
-                    }
-                } else {
-                    log::error!("Database error.");
-                    break;
-                }
-            } else {
-                // Wait for signer set
-                if let Ok(signer) = client.signer().await {
-                    if let Ok(public_key) = signer.get_public_key().await {
-                        identity = Some(public_key);
 
-                        // Notify the app that the signer has been set.
+            let mut nip65_found = false;
-                        ingester.send(Signal::SignerSet(public_key)).await;
 
-                        // Subscribe to the NIP-65 relays for the public key.
+            match client
-                        if let Err(e) = Self::fetch_nip65_relays(public_key).await {
+                .stream_events_from(BOOTSTRAP_RELAYS, filter, stream_timeout)
-                            log::error!("Failed to fetch NIP-65 relays: {e}");
+                .await
-                        }
+            {
+                Ok(mut stream) => {
+                    if stream.next().await.is_some() {
+                        nip65_found = true;
+                    } else {
+                        // Timeout
+                        app_state.signal.send(SignalKind::RelaysNotFound).await;
                     }
                 }
+                Err(e) => {
+                    log::error!("Error fetching NIP-65 Relay: {e:?}");
+                    app_state.signal.send(SignalKind::RelaysNotFound).await;
+                }
+            };
+
+            if nip65_found {
+                // Subscribe to the NIP-17 relays for the public key.
+                let filter = Filter::new()
+                    .kind(Kind::InboxRelays)
+                    .author(public_key)
+                    .limit(1);
+
+                match client.stream_events(filter, stream_timeout).await {
+                    Ok(mut stream) => {
+                        if stream.next().await.is_some() {
+                            break;
+                        } else {
+                            // Timeout
+                            app_state.signal.send(SignalKind::RelaysNotFound).await;
+                        }
+                    }
+                    Err(e) => {
+                        log::error!("Error fetching NIP-17 Relay: {e:?}");
+                        app_state.signal.send(SignalKind::RelaysNotFound).await;
+                    }
+                };
             }
 
-            smol::Timer::after(loop_duration).await;
+            break;
         }
     }
 
     async fn observe_giftwrap() {
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
-        let ingester = ingester();
         let loop_duration = Duration::from_secs(20);
         let mut is_start_processing = false;
         let mut total_loops = 0;
@@ -288,25 +306,25 @@ impl ChatSpace {
             if client.has_signer().await {
                 total_loops += 1;
 
-                if css.gift_wrap_processing.load(Ordering::Acquire) {
+                if app_state.gift_wrap_processing.load(Ordering::Acquire) {
                     is_start_processing = true;
 
                     // Reset gift wrap processing flag
-                    let _ = css.gift_wrap_processing.compare_exchange(
+                    let _ = app_state.gift_wrap_processing.compare_exchange(
                         true,
                         false,
                         Ordering::Release,
                         Ordering::Relaxed,
                     );
 
-                    let signal = Signal::GiftWrapProcess(UnwrappingStatus::Processing);
+                    let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Processing);
-                    ingester.send(signal).await;
+                    app_state.signal.send(signal).await;
                 } else {
                     // Only run further if we are already processing
                     // Wait until after 2 loops to prevent exiting early while events are still being processed
                     if is_start_processing && total_loops >= 2 {
-                        let signal = Signal::GiftWrapProcess(UnwrappingStatus::Complete);
+                        let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Complete);
-                        ingester.send(signal).await;
+                        app_state.signal.send(signal).await;
 
                         // Reset the counter
                         is_start_processing = false;
@@ -319,7 +337,8 @@ impl ChatSpace {
         }
     }
 
-    async fn process_batching_metadata(rx: &Receiver<PublicKey>) {
+    async fn process_batching_metadata() {
+        let app_state = app_state();
         let timeout = Duration::from_millis(METADATA_BATCH_TIMEOUT);
         let mut processed_pubkeys: HashSet<PublicKey> = HashSet::new();
         let mut batch: HashSet<PublicKey> = HashSet::new();
@@ -334,7 +353,7 @@ impl ChatSpace {
         loop {
             let futs = smol::future::or(
                 async move {
-                    if let Ok(public_key) = rx.recv_async().await {
+                    if let Ok(public_key) = app_state.ingester.receiver().recv_async().await {
                         BatchEvent::PublicKey(public_key)
                     } else {
                         BatchEvent::Closed
@@ -369,10 +388,9 @@ impl ChatSpace {
         }
     }
 
-    async fn process_nostr_events(pubkey_tx: &Sender<PublicKey>) -> Result<(), Error> {
+    async fn process_nostr_events() -> Result<(), Error> {
         let client = nostr_client();
-        let ingester = ingester();
+        let app_state = app_state();
-        let css = css();
 
         let mut processed_events: HashSet<EventId> = HashSet::new();
         let mut challenges: HashSet<Cow<'_, str>> = HashSet::new();
@@ -385,6 +403,15 @@ impl ChatSpace {
 
             match message {
                 RelayMessage::Event { event, .. } => {
+                    // Keep track of which relays have seen this event
+                    app_state
+                        .seen_on_relays
+                        .write()
+                        .await
+                        .entry(event.id)
+                        .or_insert_with(HashSet::new)
+                        .insert(relay_url);
+
                     // Skip events that have already been processed
                     if !processed_events.insert(event.id) {
                         continue;
@@ -398,9 +425,6 @@ impl ChatSpace {
 
                                 // Fetch user's contact list event
                                 Self::fetch_single_event(Kind::ContactList, event.pubkey).await;
-
-                                // Fetch user's inbox relays event
-                                Self::fetch_single_event(Kind::InboxRelays, event.pubkey).await;
                             }
                         }
                         Kind::InboxRelays => {
@@ -411,16 +435,18 @@ impl ChatSpace {
                                     for relay in relays.clone().into_iter() {
                                         if client.add_relay(relay).await.is_err() {
                                             let notice = Notice::RelayFailed(relay.clone());
-                                            ingester.send(Signal::Notice(notice)).await;
+                                            app_state.signal.send(SignalKind::Notice(notice)).await;
                                         }
                                         if client.connect_relay(relay).await.is_err() {
                                             let notice = Notice::RelayFailed(relay.clone());
-                                            ingester.send(Signal::Notice(notice)).await;
+                                            app_state.signal.send(SignalKind::Notice(notice)).await;
                                         }
                                     }
 
                                     // Subscribe to gift wrap events only in the current user's NIP-17 relays
                                     Self::fetch_gift_wrap(relays, event.pubkey).await;
+                                } else {
+                                    app_state.signal.send(SignalKind::RelaysNotFound).await;
                                 }
                             }
                         }
@@ -433,43 +459,54 @@ impl ChatSpace {
                                     Filter::new().limit(limit).authors(public_keys).kinds(kinds);
 
                                 client
-                                    .subscribe_to(BOOTSTRAP_RELAYS, filter, css.auto_close_opts)
+                                    .subscribe_to(
+                                        BOOTSTRAP_RELAYS,
+                                        filter,
+                                        app_state.auto_close_opts,
+                                    )
                                     .await
                                     .ok();
                             }
                         }
                         Kind::Metadata => {
-                            ingester.send(Signal::Metadata(event.into_owned())).await;
+                            let metadata = Metadata::from_json(&event.content).unwrap_or_default();
+                            let profile = Profile::new(event.pubkey, metadata);
+
+                            app_state.signal.send(SignalKind::NewProfile(profile)).await;
                         }
                         Kind::GiftWrap => {
-                            Self::unwrap_gift_wrap(&event, pubkey_tx).await;
+                            Self::unwrap_gift_wrap(&event).await;
                         }
                         _ => {}
                     }
                 }
                 RelayMessage::EndOfStoredEvents(subscription_id) => {
-                    if *subscription_id == css.gift_wrap_sub_id {
+                    if *subscription_id == app_state.gift_wrap_sub_id {
-                        let signal = Signal::GiftWrapProcess(UnwrappingStatus::Processing);
+                        let signal = SignalKind::GiftWrapStatus(UnwrappingStatus::Processing);
-                        ingester.send(signal).await;
+                        app_state.signal.send(signal).await;
                     }
                 }
                 RelayMessage::Auth { challenge } => {
                     if challenges.insert(challenge.clone()) {
                         let req = AuthRequest::new(challenge, relay_url);
                         // Send a signal to the ingester to handle the auth request
-                        ingester.send(Signal::Auth(req)).await;
+                        app_state.signal.send(SignalKind::Auth(req)).await;
                     }
                 }
                 RelayMessage::Ok {
                     event_id, message, ..
                 } => {
                     // Keep track of events sent by Coop
-                    css.sent_ids.write().await.insert(event_id);
+                    app_state.sent_ids.write().await.insert(event_id);
 
                     // Keep track of events that need to be resent
                     match MachineReadablePrefix::parse(&message) {
                         Some(MachineReadablePrefix::AuthRequired) => {
-                            css.resend_queue.write().await.insert(event_id, relay_url);
+                            app_state
+                                .resend_queue
+                                .write()
+                                .await
+                                .insert(event_id, relay_url);
                         }
                         Some(_) => {}
                         None => {}
@@ -483,17 +520,16 @@ impl ChatSpace {
     }
 
     async fn process_nostr_signals(view: WeakEntity<ChatSpace>, cx: &mut AsyncWindowContext) {
-        let ingester = ingester();
+        let app_state = app_state();
-        let signals = ingester.signals();
         let mut is_open_proxy_modal = false;
 
-        while let Ok(signal) = signals.recv_async().await {
+        while let Ok(signal) = app_state.signal.receiver().recv_async().await {
             cx.update(|window, cx| {
                 let registry = Registry::global(cx);
                 let settings = AppSettings::global(cx);
 
                 match signal {
-                    Signal::SignerSet(public_key) => {
+                    SignalKind::SignerSet(public_key) => {
                         window.close_modal(cx);
 
                         // Setup the default layout for current workspace
@@ -513,7 +549,7 @@ impl ChatSpace {
                             this.load_rooms(window, cx);
                         });
                     }
-                    Signal::SignerUnset => {
+                    SignalKind::SignerUnset => {
                         // Setup the onboarding layout for current workspace
                         view.update(cx, |this, cx| {
                             this.set_onboarding_layout(window, cx);
@@ -525,7 +561,7 @@ impl ChatSpace {
                             this.reset(cx);
                         });
                     }
-                    Signal::Auth(req) => {
+                    SignalKind::Auth(req) => {
                         let url = &req.url;
                         let auto_auth = AppSettings::get_auto_auth(cx);
                         let is_authenticated = AppSettings::read_global(cx).is_authenticated(url);
@@ -543,7 +579,7 @@ impl ChatSpace {
                         })
                         .ok();
                     }
-                    Signal::ProxyDown => {
+                    SignalKind::ProxyDown => {
                         if !is_open_proxy_modal {
                             is_open_proxy_modal = true;
 
@@ -553,28 +589,28 @@ impl ChatSpace {
                             .ok();
                         }
                     }
-                    Signal::GiftWrapProcess(status) => {
+                    SignalKind::GiftWrapStatus(status) => {
                         registry.update(cx, |this, cx| {
                             this.set_unwrapping_status(status, cx);
                         });
                     }
-                    Signal::Metadata(event) => {
+                    SignalKind::NewProfile(profile) => {
                         registry.update(cx, |this, cx| {
-                            this.insert_or_update_person(event, cx);
+                            this.insert_or_update_person(profile, cx);
                         });
                     }
-                    Signal::Message((gift_wrap_id, event)) => {
+                    SignalKind::NewMessage((gift_wrap_id, event)) => {
                         registry.update(cx, |this, cx| {
                             this.event_to_message(gift_wrap_id, event, window, cx);
                         });
                     }
-                    Signal::DmRelayNotFound => {
+                    SignalKind::RelaysNotFound => {
                         view.update(cx, |this, cx| {
-                            this.set_no_nip17_relays(cx);
+                            this.set_required_relays(cx);
                         })
                         .ok();
                     }
-                    Signal::Notice(msg) => {
+                    SignalKind::Notice(msg) => {
                         window.push_notification(msg.as_str(), cx);
                     }
                 };
@@ -595,21 +631,22 @@ impl ChatSpace {
     /// Fetches a single event by kind and public key
     pub async fn fetch_single_event(kind: Kind, public_key: PublicKey) {
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
         let filter = Filter::new().kind(kind).author(public_key).limit(1);
 
-        if let Err(e) = client.subscribe(filter, css.auto_close_opts).await {
+        if let Err(e) = client.subscribe(filter, app_state.auto_close_opts).await {
             log::info!("Failed to subscribe: {e}");
         }
     }
 
+    /// Fetches gift wrap events for a given public key and relays
     pub async fn fetch_gift_wrap(relays: Vec<&RelayUrl>, public_key: PublicKey) {
         let client = nostr_client();
-        let sub_id = css().gift_wrap_sub_id.clone();
+        let 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)
+            .subscribe_with_id_to(relays.clone(), id, filter, None)
             .await
             .is_ok()
         {
@@ -617,23 +654,6 @@ impl ChatSpace {
         }
     }
 
-    /// Fetches NIP-65 relay list for a given public key
-    pub async fn fetch_nip65_relays(public_key: PublicKey) -> Result<(), Error> {
-        let client = nostr_client();
-        let css = css();
-
-        let filter = Filter::new()
-            .kind(Kind::RelayList)
-            .author(public_key)
-            .limit(1);
-
-        client
-            .subscribe_to(BOOTSTRAP_RELAYS, filter, css.auto_close_opts)
-            .await?;
-
-        Ok(())
-    }
-
     /// Fetches metadata for a list of public keys
     async fn fetch_metadata_for_pubkeys(public_keys: HashSet<PublicKey>) {
         if public_keys.is_empty() {
@@ -641,7 +661,7 @@ impl ChatSpace {
         }
 
         let client = nostr_client();
-        let css = css();
+        let app_state = app_state();
 
         let kinds = vec![Kind::Metadata, Kind::ContactList, Kind::RelayList];
         let limit = public_keys.len() * kinds.len() + 20;
@@ -650,13 +670,13 @@ impl ChatSpace {
         let filter = Filter::new().authors(public_keys).kinds(kinds).limit(limit);
 
         client
-            .subscribe_to(BOOTSTRAP_RELAYS, filter, css.auto_close_opts)
+            .subscribe_to(BOOTSTRAP_RELAYS, filter, app_state.auto_close_opts)
             .await
             .ok();
     }
 
     /// Stores an unwrapped event in local database with reference to original
-    async fn set_unwrapped_event(root: EventId, unwrapped: &Event) -> Result<(), Error> {
+    async fn set_unwrapped_event(gift_wrap: EventId, unwrapped: &Event) -> Result<(), Error> {
         let client = nostr_client();
 
         // Save unwrapped event
@@ -664,7 +684,7 @@ impl ChatSpace {
 
         // Create a reference event pointing to the unwrapped event
         let event = EventBuilder::new(Kind::ApplicationSpecificData, "")
-            .tags(vec![Tag::identifier(root), Tag::event(unwrapped.id)])
+            .tags(vec![Tag::identifier(gift_wrap), Tag::event(unwrapped.id)])
             .sign(&Keys::generate())
             .await?;
 
@@ -696,10 +716,9 @@ impl ChatSpace {
     }
 
     /// Unwraps a gift-wrapped event and processes its contents.
-    async fn unwrap_gift_wrap(target: &Event, pubkey_tx: &Sender<PublicKey>) {
+    async fn unwrap_gift_wrap(target: &Event) {
         let client = nostr_client();
-        let ingester = ingester();
+        let app_state = app_state();
-        let css = css();
         let mut message: Option<Event> = None;
 
         if let Ok(event) = Self::get_unwrapped_event(target.id).await {
@@ -719,20 +738,22 @@ impl ChatSpace {
         if let Some(event) = message {
             // Send all pubkeys to the metadata batch to sync data
             for public_key in event.all_pubkeys() {
-                pubkey_tx.send_async(public_key).await.ok();
+                app_state.ingester.send(public_key).await;
             }
 
-            match event.created_at >= css.init_at {
+            match event.created_at >= app_state.init_at {
                 // New message: send a signal to notify the UI
                 true => {
-                    // Prevent notification if the event was sent by Coop
+                    app_state
-                    if !css.sent_ids.read().await.contains(&target.id) {
+                        .signal
-                        ingester.send(Signal::Message((target.id, event))).await;
+                        .send(SignalKind::NewMessage((target.id, event)))
-                    }
+                        .await;
                 }
                 // Old message: Coop is probably processing the user's messages during initial load
                 false => {
-                    css.gift_wrap_processing.store(true, Ordering::Release);
+                    app_state
+                        .gift_wrap_processing
+                        .store(true, Ordering::Release);
                 }
             }
         }
@@ -783,7 +804,7 @@ impl ChatSpace {
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             let client = nostr_client();
-            let css = css();
+            let app_state = app_state();
             let signer = client.signer().await?;
 
             // Construct event
@@ -814,7 +835,7 @@ impl ChatSpace {
                             relay.resubscribe().await?;
 
                             // Get all failed events that need to be resent
-                            let mut queue = css.resend_queue.write().await;
+                            let mut queue = app_state.resend_queue.write().await;
 
                             let ids: Vec<EventId> = queue
                                 .iter()
@@ -833,8 +854,8 @@ impl ChatSpace {
                                             success: HashSet::from([relay_url]),
                                         };
 
-                                        css.sent_ids.write().await.insert(event_id);
+                                        app_state.sent_ids.write().await.insert(event_id);
-                                        css.resent_ids.write().await.push(output);
+                                        app_state.resent_ids.write().await.push(output);
                                     }
                                 }
                             }
@@ -939,40 +960,47 @@ impl ChatSpace {
     }
 
     fn reopen_auth_request(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        for req in self.auth_requests.clone().into_iter() {
+        for (_, request) in self.auth_requests.read(cx).clone() {
-            self.open_auth_request(req.0, window, cx);
+            self.open_auth_request(request, window, cx);
         }
     }
 
     fn push_auth_request(&mut self, req: &AuthRequest, cx: &mut Context<Self>) {
-        self.auth_requests.insert(req.to_owned(), false);
+        self.auth_requests.update(cx, |this, cx| {
-        cx.notify();
+            this.insert(req.url.clone(), req.to_owned());
+            cx.notify();
+        });
     }
 
     fn sending_auth_request(&mut self, challenge: &str, cx: &mut Context<Self>) {
-        for (req, status) in self.auth_requests.iter_mut() {
+        self.auth_requests.update(cx, |this, cx| {
-            if req.challenge == challenge {
+            for (_, req) in this.iter_mut() {
-                *status = true;
+                if req.challenge == challenge {
-                cx.notify();
+                    req.sending = true;
+                    cx.notify();
+                }
             }
-        }
+        });
     }
 
-    fn is_sending_auth_request(&self, challenge: &str, _cx: &App) -> bool {
+    fn is_sending_auth_request(&self, challenge: &str, cx: &App) -> bool {
         if let Some(req) = self
             .auth_requests
+            .read(cx)
             .iter()
-            .find(|(req, _)| req.challenge == challenge)
+            .find(|(_, req)| req.challenge == challenge)
         {
-            req.1.to_owned()
+            req.1.sending
         } else {
             false
         }
     }
 
     fn remove_auth_request(&mut self, challenge: &str, cx: &mut Context<Self>) {
-        self.auth_requests.retain(|r, _| r.challenge != challenge);
+        self.auth_requests.update(cx, |this, cx| {
-        cx.notify();
+            this.retain(|_, r| r.challenge != challenge);
+            cx.notify();
+        });
     }
 
     fn set_onboarding_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -992,7 +1020,7 @@ impl ChatSpace {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let panel = Arc::new(account::init(secret, profile, window, cx));
+        let panel = Arc::new(account::init(profile, secret, window, cx));
         let center = DockItem::panel(panel);
 
         self.dock.update(cx, |this, cx| {
@@ -1023,8 +1051,8 @@ impl ChatSpace {
         });
     }
 
-    fn set_no_nip17_relays(&mut self, cx: &mut Context<Self>) {
+    fn set_required_relays(&mut self, cx: &mut Context<Self>) {
-        self.has_nip17_relays = false;
+        self.nip17_relays = false;
         cx.notify();
     }
 
@@ -1051,19 +1079,13 @@ impl ChatSpace {
 
         cx.spawn_in(window, async move |this, cx| {
             if let Ok((secret, profile)) = task.await {
-                cx.update(|window, cx| {
+                this.update_in(cx, |this, window, cx| {
-                    this.update(cx, |this, cx| {
+                    this.set_account_layout(secret, profile, window, cx);
-                        this.set_account_layout(secret, profile, window, cx);
-                    })
-                    .ok();
                 })
                 .ok();
             } else {
-                cx.update(|window, cx| {
+                this.update_in(cx, |this, window, cx| {
-                    this.update(cx, |this, cx| {
+                    this.set_onboarding_layout(window, cx);
-                        this.set_onboarding_layout(window, cx);
-                    })
-                    .ok();
                 })
                 .ok();
             }
@@ -1090,10 +1112,54 @@ impl ChatSpace {
         }
     }
 
+    fn on_reload_metadata(
+        &mut self,
+        _ev: &ReloadMetadata,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let client = nostr_client();
+            let app_state = app_state();
+
+            let filter = Filter::new().kind(Kind::PrivateDirectMessage);
+
+            let pubkeys: Vec<PublicKey> = client
+                .database()
+                .query(filter)
+                .await?
+                .into_iter()
+                .flat_map(|event| event.all_pubkeys())
+                .unique()
+                .collect();
+
+            let filter = Filter::new()
+                .kind(Kind::Metadata)
+                .limit(pubkeys.len())
+                .authors(pubkeys);
+
+            client
+                .subscribe_to(BOOTSTRAP_RELAYS, filter, app_state.auto_close_opts)
+                .await?;
+
+            Ok(())
+        });
+
+        cx.spawn_in(window, async move |_, cx| {
+            if task.await.is_ok() {
+                cx.update(|window, cx| {
+                    window.push_notification(t!("common.refreshed"), cx);
+                })
+                .ok();
+            }
+        })
+        .detach();
+    }
+
     fn on_sign_out(&mut self, _e: &Logout, _window: &mut Window, cx: &mut Context<Self>) {
         cx.background_spawn(async move {
             let client = nostr_client();
-            let ingester = ingester();
+            let app_state = app_state();
 
             let filter = Filter::new()
                 .kind(Kind::ApplicationSpecificData)
@@ -1106,12 +1172,12 @@ impl ChatSpace {
             client.reset().await;
 
             // Notify the channel about the signer being unset
-            ingester.send(Signal::SignerUnset).await;
+            app_state.signal.send(SignalKind::SignerUnset).await;
         })
         .detach();
     }
 
-    fn on_open_profile(&mut self, ev: &OpenProfile, window: &mut Window, cx: &mut Context<Self>) {
+    fn on_open_pubkey(&mut self, ev: &OpenPublicKey, window: &mut Window, cx: &mut Context<Self>) {
         let public_key = ev.0;
         let profile = user_profile::init(public_key, window, cx);
 
@@ -1129,6 +1195,12 @@ impl ChatSpace {
         });
     }
 
+    fn on_copy_pubkey(&mut self, ev: &CopyPublicKey, window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(bech32) = ev.0.to_bech32();
+        cx.write_to_clipboard(ClipboardItem::new_string(bech32));
+        window.push_notification(t!("common.copied"), cx);
+    }
+
     fn render_proxy_modal(&mut self, window: &mut Window, cx: &mut App) {
         window.open_modal(cx, |this, _window, _cx| {
             this.overlay_closable(false)
@@ -1216,7 +1288,7 @@ impl ChatSpace {
             .w_full()
             .child(compose_button())
             .when(status != &UnwrappingStatus::Complete, |this| {
-                this.child(
+                this.child(deferred(
                     h_flex()
                         .px_2()
                         .h_6()
@@ -1225,7 +1297,7 @@ impl ChatSpace {
                         .rounded_full()
                         .bg(cx.theme().surface_background)
                         .child(shared_t!("loading.label")),
-                )
+                ))
             })
     }
 
@@ -1236,10 +1308,9 @@ impl ChatSpace {
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
         let proxy = AppSettings::get_proxy_user_avatars(cx);
-        let is_auto_auth = AppSettings::read_global(cx).is_auto_auth();
         let updating = AutoUpdater::read_global(cx).status.is_updating();
         let updated = AutoUpdater::read_global(cx).status.is_updated();
-        let auth_requests = self.auth_requests.len();
+        let auth_requests = self.auth_requests.read(cx).len();
 
         h_flex()
             .gap_1()
@@ -1275,7 +1346,7 @@ impl ChatSpace {
                         }),
                 )
             })
-            .when(auth_requests > 0 && !is_auto_auth, |this| {
+            .when(auth_requests > 0, |this| {
                 this.child(
                     h_flex()
                         .id("requests")
@@ -1295,7 +1366,7 @@ impl ChatSpace {
                         })),
                 )
             })
-            .when(!self.has_nip17_relays, |this| {
+            .when(!self.nip17_relays, |this| {
                 this.child(setup_nip17_relay(t!("relays.button")))
             })
             .child(
@@ -1304,11 +1375,13 @@ impl ChatSpace {
                     .reverse()
                     .transparent()
                     .icon(IconName::CaretDown)
-                    .child(Avatar::new(profile.avatar_url(proxy)).size(rems(1.49)))
+                    .child(Avatar::new(profile.avatar(proxy)).size(rems(1.49)))
                     .popup_menu(|this, _window, _cx| {
                         this.menu(t!("user.dark_mode"), Box::new(DarkMode))
                             .menu(t!("user.settings"), Box::new(Settings))
                             .separator()
+                            .menu(t!("user.reload_metadata"), Box::new(ReloadMetadata))
+                            .separator()
                             .menu(t!("user.sign_out"), Box::new(Logout))
                     }),
             )
@@ -1329,7 +1402,7 @@ impl ChatSpace {
 
             this._tasks.push(cx.background_spawn(async move {
                 let client = nostr_client();
-                let ingester = ingester();
+                let app_state = app_state();
 
                 if proxy.start().await.is_ok() {
                     webbrowser::open(&url).ok();
@@ -1360,7 +1433,7 @@ impl ChatSpace {
 
                             break;
                         } else {
-                            ingester.send(Signal::ProxyDown).await;
+                            app_state.signal.send(SignalKind::ProxyDown).await;
                         }
                         smol::Timer::after(Duration::from_secs(1)).await;
                     }
@@ -1425,10 +1498,13 @@ impl Render for ChatSpace {
         }
 
         div()
+            .id(SharedString::from("chatspace"))
             .on_action(cx.listener(Self::on_settings))
             .on_action(cx.listener(Self::on_dark_mode))
             .on_action(cx.listener(Self::on_sign_out))
-            .on_action(cx.listener(Self::on_open_profile))
+            .on_action(cx.listener(Self::on_open_pubkey))
+            .on_action(cx.listener(Self::on_copy_pubkey))
+            .on_action(cx.listener(Self::on_reload_metadata))
             .relative()
             .size_full()
             .child(

crates/coop/src/main.rs

@@ -2,13 +2,12 @@ use std::sync::Arc;
 
 use assets::Assets;
 use global::constants::{APP_ID, APP_NAME};
-use global::{css, ingester, nostr_client};
+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,11 +25,8 @@ fn main() {
     // Initialize the Nostr client
     let _client = nostr_client();
 
-    // Initialize the ingester
-    let _ingester = ingester();
-
     // Initialize the coop simple storage
-    let _css = css();
+    let _app_state = app_state();
 
     // Initialize the Application
     let app = Application::new()
@@ -82,13 +78,6 @@ fn main() {
             // Bring the app to the foreground
             cx.activate(true);
 
-            // Automatically sync theme with system appearance
-            window
-                .observe_window_appearance(|window, cx| {
-                    Theme::sync_system_appearance(Some(window), cx);
-                })
-                .detach();
-
             // Root Entity
             cx.new(|cx| {
                 // Initialize the tokio runtime

crates/coop/src/views/account.rs

@@ -2,15 +2,15 @@ use std::time::Duration;
 
 use anyhow::Error;
 use client_keys::ClientKeys;
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
-use common::handle_auth::CoopAuthUrlHandler;
 use global::constants::{ACCOUNT_IDENTIFIER, BUNKER_TIMEOUT};
-use global::{ingester, nostr_client, Signal};
+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,
+    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
-    StatefulInteractiveElement, Styled, Task, WeakEntity, Window,
+    RetainAllImageCache, SharedString, StatefulInteractiveElement, Styled, Subscription, Task,
+    WeakEntity, Window,
 };
 use i18n::{shared_t, t};
 use nostr_connect::prelude::*;
@@ -22,18 +22,20 @@ 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 {
@@ -42,18 +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,
@@ -61,8 +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>) {
@@ -93,8 +112,8 @@ impl Account {
         signer.auth_url_handler(CoopAuthUrlHandler);
 
         self._tasks.push(
-            // Handle connection
+            // Handle connection in the background
-            cx.spawn_in(window, async move |_this, cx| {
+            cx.spawn_in(window, async move |this, cx| {
                 let client = nostr_client();
 
                 match signer.bunker_uri().await {
@@ -103,8 +122,9 @@ impl Account {
                         client.set_signer(signer).await;
                     }
                     Err(e) => {
-                        cx.update(|window, cx| {
+                        this.update_in(cx, |this, window, cx| {
-                            window.push_notification(e.to_string(), cx);
+                            this.set_loading(false, cx);
+                            window.push_notification(Notification::error(e.to_string()), cx);
                         })
                         .ok();
                     }
@@ -248,7 +268,7 @@ impl Account {
             // Reset the nostr client in the background
             cx.background_spawn(async move {
                 let client = nostr_client();
-                let ingester = ingester();
+                let app_state = app_state();
 
                 let filter = Filter::new()
                     .kind(Kind::ApplicationSpecificData)
@@ -261,7 +281,7 @@ impl Account {
                 client.unset_signer().await;
 
                 // Notify the channel about the signer being unset
-                ingester.send(Signal::SignerUnset).await;
+                app_state.signal.send(SignalKind::SignerUnset).await;
             }),
         );
     }
@@ -301,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()
@@ -342,46 +363,72 @@ impl Render for Account {
                             .id("account")
                             .h_10()
                             .w_72()
-                            .bg(cx.theme().element_background)
+                            .bg(cx.theme().elevated_surface_background)
-                            .text_color(cx.theme().element_foreground)
                             .rounded_lg()
                             .text_sm()
-                            .map(|this| {
+                            .when(self.loading, |this| {
-                                if self.loading {
+                                this.child(
-                                    this.child(
+                                    div()
-                                        div()
+                                        .size_full()
-                                            .size_full()
+                                        .flex()
-                                            .flex()
+                                        .items_center()
-                                            .items_center()
+                                        .justify_center()
-                                            .justify_center()
+                                        .child(Indicator::new().small()),
-                                            .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| {
+                                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);
@@ -391,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);
                             })),

crates/coop/src/views/chat/subject.rs

@@ -2,7 +2,7 @@ use gpui::{
     div, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString,
     Styled, Window,
 };
-use i18n::t;
+use i18n::{shared_t, t};
 use theme::ActiveTheme;
 use ui::input::{InputState, TextInput};
 use ui::{v_flex, Sizable};
@@ -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")),
             )
     }
 }

crates/coop/src/views/compose.rs

@@ -2,28 +2,29 @@ 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,
+    div, px, relative, rems, uniform_list, App, AppContext, Context, Entity, InteractiveElement,
-    IntoElement, ParentElement, Render, SharedString, StatefulInteractiveElement, Styled,
+    IntoElement, ParentElement, Render, RetainAllImageCache, SharedString,
-    Subscription, Task, Window,
+    StatefulInteractiveElement, Styled, Subscription, Task, Window,
 };
-use i18n::t;
+use gpui_tokio::Tokio;
-use itertools::Itertools;
+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 +35,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| {
+                window.open_modal(cx, move |modal, _window, cx| {
-                    modal.title(title.clone()).child(compose.clone())
+                    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 +87,12 @@ impl Contact {
     pub fn new(public_key: PublicKey) -> Self {
         Self {
             public_key,
-            select: false,
+            selected: false,
         }
     }
 
-    pub fn select(mut self) -> Self {
+    pub fn selected(mut self) -> Self {
-        self.select = true;
+        self.selected = true;
         self
     }
 }
@@ -75,188 +100,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>>,
+    /// User's contacts
-    /// Input error message
+    contacts: Entity<Vec<Contact>>,
+
+    /// Error message
     error_message: Entity<Option<SharedString>>,
-    adding: bool,
+
-    submitting: bool,
+    image_cache: Entity<RetainAllImageCache>,
-    #[allow(dead_code)]
+    _subscriptions: SmallVec<[Subscription; 2]>,
-    subscriptions: SmallVec<[Subscription; 1]>,
+    _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![];
-
+        let mut tasks = 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 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| {
+        tasks.push(
-            match get_contacts.await {
+            // Load all contacts
-                Ok(contacts) => {
+            cx.spawn_in(window, async move |this, cx| {
-                    this.update(cx, |this, cx| {
+                match get_contacts.await {
-                        this.extend_contacts(contacts, cx);
+                    Ok(contacts) => {
-                    })
+                        this.update(cx, |this, cx| {
-                    .ok();
+                            this.extend_contacts(contacts, cx);
-                }
+                        })
-                Err(e) => {
+                        .ok();
-                    cx.update(|window, cx| {
+                    }
-                        window.push_notification(Notification::error(e.to_string()), cx);
+                    Err(e) => {
-                    })
+                        cx.update(|window, cx| {
-                    .ok();
+                            window.push_notification(Notification::error(e.to_string()), cx);
-                }
+                        })
-            };
+                        .ok();
-        })
+                    }
-        .detach();
+                };
+            }),
+        );
+
+        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> {
+    async fn request_metadata(public_key: PublicKey) -> Result<(), Error> {
-        let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+        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
+        self.contacts.update(cx, |this, cx| {
-            .extend(contacts.into_iter().map(|contact| cx.new(|_| contact)));
+            this.extend(contacts);
-        cx.notify();
+            cx.notify();
+        });
     }
 
-    fn push_contact(&mut self, contact: Contact, cx: &mut Context<Self>) {
+    fn push_contact(&mut self, contact: Contact, window: &mut Window, cx: &mut Context<Self>) {
-        if !self
+        let pk = contact.public_key;
-            .contacts
+
-            .iter()
+        if !self.contacts.read(cx).iter().any(|c| c.public_key == pk) {
-            .any(|e| e.read(cx).public_key == contact.public_key)
+            self._tasks.push(cx.background_spawn(async move {
-        {
+                Self::request_metadata(pk).await.ok();
-            self.contacts.insert(0, cx.new(|_| contact));
+            }));
-            cx.notify();
+
+            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);
         }
     }
 
-    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(Some(e.to_string().into()), 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 {
+                if contact.selected {
-                    Some(contact.read(cx).public_key)
+                    Some(contact.public_key)
                 } else {
                     None
                 }
@@ -264,84 +310,49 @@ impl Compose {
             .collect()
     }
 
-    fn add_and_select_contact(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn submit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let content = self.user_input.read(cx).value().to_string();
+        let registry = Registry::global(cx);
+        let public_keys: Vec<PublicKey> = self.selected(cx);
 
-        // Prevent multiple requests
+        if !self.user_input.read(cx).value().is_empty() {
-        self.set_adding(true, cx);
+            self.add_and_select_contact(window, 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);
             return;
         };
 
-        cx.spawn_in(window, async move |this, cx| {
+        if public_keys.is_empty() {
-            match task.await {
+            self.set_error(Some(t!("compose.receiver_required").into()), cx);
-                Ok(contact) => {
+            return;
-                    cx.update(|window, cx| {
+        };
-                        this.update(cx, |this, cx| {
+
-                            this.push_contact(contact, cx);
+        // Convert selected pubkeys into Nostr tags
-                            this.set_adding(false, cx);
+        let mut tags: Tags = Tags::from_list(
-                            this.user_input.update(cx, |this, cx| {
+            public_keys
-                                this.set_value("", window, cx);
+                .iter()
-                                this.set_loading(false, cx);
+                .map(|pubkey| Tag::public_key(pubkey.to_owned()))
-                            });
+                .collect(),
-                        })
+        );
-                        .ok();
+
-                    })
+        // Add subject if it is present
-                    .ok();
+        if !self.title_input.read(cx).value().is_empty() {
-                }
+            tags.push(Tag::custom(
-                Err(e) => {
+                TagKind::Subject,
-                    this.update(cx, |this, cx| {
+                vec![self.title_input.read(cx).value().to_string()],
-                        this.set_error(Some(e.to_string().into()), cx);
+            ));
-                    })
+        }
-                    .ok();
+
-                }
+        // Create a new room
-            };
+        let room = Room::new(public_keys[0], tags, cx);
-        })
+
-        .detach();
+        // 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);
     }
 
     fn set_error(&mut self, error: impl Into<Option<SharedString>>, cx: &mut Context<Self>) {
-        if self.adding {
-            self.set_adding(false, cx);
-        }
-
         // Unlock the user input
         self.user_input.update(cx, |this, cx| {
             this.set_loading(false, cx);
@@ -364,48 +375,35 @@ impl Compose {
         .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 public_key = contact.public_key;
-            let profile = registry.get_person(public_key, cx);
+            let profile = registry.get_person(&public_key, cx);
-            let selected = entity.read(cx).select;
 
             items.push(
                 h_flex()
                     .id(ix)
-                    .px_1()
+                    .px_2()
-                    .h_9()
+                    .h_11()
                     .w_full()
                     .justify_between()
                     .rounded(cx.theme().radius)
                     .child(
-                        div()
+                        h_flex()
-                            .flex()
-                            .items_center()
                             .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 +411,8 @@ impl Compose {
                         )
                     })
                     .hover(|this| this.bg(cx.theme().elevated_surface_background))
-                    .on_click(cx.listener(move |_this, _event, _window, cx| {
+                    .on_click(cx.listener(move |this, _, _window, cx| {
-                        entity.update(cx, |this, cx| {
+                        this.select_contact(public_key, cx);
-                            this.select = !this.select;
-                            cx.notify();
-                        });
                     })),
             );
         }
@@ -428,24 +423,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 +455,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 +470,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()
+                                TextInput::new(&self.user_input)
-                                    .gap_1()
+                                    .small()
-                                    .child(
+                                    .disabled(loading)
-                                        TextInput::new(&self.user_input)
+                                    .suffix(
-                                            .small()
-                                            .disabled(self.adding),
-                                    )
-                                    .child(
                                         Button::new("add")
                                             .icon(IconName::PlusCircleFill)
-                                            .ghost()
+                                            .transparent()
-                                            .loading(self.adding)
+                                            .small()
-                                            .disabled(self.adding)
+                                            .disabled(loading)
                                             .on_click(cx.listener(move |this, _, window, cx| {
                                                 this.add_and_select_contact(window, cx);
                                             })),
@@ -504,7 +489,7 @@ impl Render for Compose {
                             ),
                     )
                     .map(|this| {
-                        if self.contacts.is_empty() {
+                        if contacts.is_empty() {
                             this.child(
                                 v_flex()
                                     .h_24()
@@ -512,48 +497,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!(
+                                            .child(shared_t!("compose.no_contacts_message")),
-                                                "compose.no_contacts_message"
-                                            ))),
                                     )
                                     .child(
-                                        div().text_xs().text_color(cx.theme().text_muted).child(
+                                        div()
-                                            SharedString::new(t!(
+                                            .text_color(cx.theme().text_muted)
-                                                "compose.no_contacts_description"
+                                            .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);
-                    })),
-            )
     }
 }

crates/coop/src/views/edit_profile.rs

@@ -8,7 +8,7 @@ use gpui::{
     div, img, App, AppContext, Context, Entity, Flatten, IntoElement, ParentElement,
     PathPromptOptions, Render, SharedString, Styled, Task, Window,
 };
-use i18n::t;
+use i18n::{shared_t, t};
 use nostr_sdk::prelude::*;
 use settings::AppSettings;
 use smol::fs;
@@ -164,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();
@@ -189,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)
         })
@@ -253,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(
@@ -262,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(
@@ -271,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()),
             )
     }

crates/coop/src/views/login.rs

@@ -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_in(cx, |this, window, cx| {
-                        this.update(cx, |this, cx| {
+                        this.set_error(error.to_string(), window, cx);
-                            this.set_error(error.to_string(), window, cx);
+                        // Force reset the client keys
-                            // Force reset the client keys
+                        //
-                            //
+                        // This step is necessary to ensure that user can retry the connection
-                            // This step is necessary to ensure that user can retry the connection
+                        client_keys.update(cx, |this, cx| {
-                            client_keys.update(cx, |this, cx| {
+                            this.force_new_keys(cx);
-                                this.force_new_keys(cx);
+                        });
-                            });
-                        })
-                        .ok();
                     })
                     .ok();
                 }
@@ -323,38 +317,41 @@ impl Login {
         .detach();
     }
 
-    fn write_uri_to_disk(&mut self, uri: &NostrConnectURI, cx: &mut Context<Self>) {
+    fn write_uri_to_disk(
-        let Some(public_key) = uri.remote_signer_public_key().cloned() else {
+        &mut self,
-            log::error!("Remote Signer's public key not found");
+        signer: NostrConnect,
-            return;
+        uri: NostrConnectURI,
-        };
+        cx: &mut Context<Self>,
+    ) {
+        let mut uri_without_secret = uri.to_string();
 
-        let mut value = uri.to_string();
+        // Clear the secret parameter in the URI if it exists
-
-        // Clear the secret param 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)
+            // Update the client's signer
-                .tags(tags)
+            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)
+                .sign(&Keys::generate())
-                .await;
+                .await?;
 
-            if let Ok(event) = builder {
+            // Save the event to the database
-                if let Err(e) = client.database().save_event(&event).await {
+            client.database().save_event(&event).await?;
-                    log::error!("Failed to save event: {e}");
+
-                };
+            Ok(())
-            }
+        });
-        })
+
-        .detach();
+        task.detach();
     }
 
     pub fn write_keys_to_disk(&self, keys: &Keys, password: String, cx: &mut Context<Self>) {

crates/coop/src/views/new_account.rs

@@ -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;
@@ -352,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| {

crates/coop/src/views/onboarding.rs

@@ -135,7 +135,6 @@ impl Onboarding {
         self._tasks.push(
             // Wait for Nostr Connect approval
             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());
 
                 if let Ok(Some(signer)) = connect {
@@ -143,12 +142,9 @@ impl Onboarding {
                         Ok(uri) => {
                             this.update(cx, |this, cx| {
                                 this.set_connecting(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(e) => {
                             this.update_in(cx, |_, window, cx| {
@@ -169,38 +165,41 @@ impl Onboarding {
         ChatSpace::proxy_signer(window, cx);
     }
 
-    fn write_uri_to_disk(&mut self, uri: &NostrConnectURI, cx: &mut Context<Self>) {
+    fn write_uri_to_disk(
-        let Some(public_key) = uri.remote_signer_public_key().cloned() else {
+        &mut self,
-            log::error!("Remote Signer's public key not found");
+        signer: NostrConnect,
-            return;
+        uri: NostrConnectURI,
-        };
+        cx: &mut Context<Self>,
+    ) {
+        let mut uri_without_secret = uri.to_string();
 
-        let mut value = uri.to_string();
+        // Clear the secret parameter in the URI if it exists
-
-        // Clear the secret param 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)
+            // Update the client's signer
-                .tags(tags)
+            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)
+                .sign(&Keys::generate())
-                .await;
+                .await?;
 
-            if let Ok(event) = builder {
+            // Save the event to the database
-                if let Err(e) = client.database().save_event(&event).await {
+            client.database().save_event(&event).await?;
-                    log::error!("Failed to save event: {e}");
+
-                };
+            Ok(())
-            }
+        });
-        })
+
-        .detach();
+        task.detach();
     }
 
     fn copy_uri(&mut self, window: &mut Window, cx: &mut Context<Self>) {

crates/coop/src/views/preferences.rs

@@ -1,4 +1,4 @@
-use common::display::ReadableProfile;
+use common::display::RenderedProfile;
 use gpui::http_client::Url;
 use gpui::{
     div, px, relative, rems, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
@@ -10,7 +10,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 +41,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) => {
+                                    Ok(profile) => {
-                                        if let Some(event) = event {
+                                        if let Some(profile) = profile {
                                             cx.update(|_, cx| {
-                                                Registry::global(cx).update(cx, |this, cx| {
+                                                registry.update(cx, |this, cx| {
-                                                    this.insert_or_update_person(event, cx);
+                                                    this.insert_or_update_person(profile, cx);
                                                 });
                                             })
                                             .ok();
@@ -141,7 +141,7 @@ impl Render for Preferences {
                                 h_flex()
                                     .id("user")
                                     .gap_2()
-                                    .child(Avatar::new(profile.avatar_url(proxy)).size(rems(2.4)))
+                                    .child(Avatar::new(profile.avatar(proxy)).size(rems(2.4)))
                                     .child(
                                         div()
                                             .flex_1()
@@ -169,7 +169,7 @@ impl Render for Preferences {
                                     .label("Messaging Relays")
                                     .xsmall()
                                     .ghost_alt()
-                                    .rounded(ButtonRounded::Full)
+                                    .rounded()
                                     .on_click(cx.listener(move |this, _e, window, cx| {
                                         this.open_relays(window, cx);
                                     })),
@@ -204,7 +204,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;
                                                     };

crates/coop/src/views/screening.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use common::display::{shorten_pubkey, ReadableProfile, ReadableTimestamp};
+use common::display::{shorten_pubkey, RenderedProfile, RenderedTimestamp};
 use common::nip05::nip05_verify;
 use global::constants::BOOTSTRAP_RELAYS;
 use global::nostr_client;
@@ -17,7 +17,7 @@ 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};
 
@@ -29,10 +29,9 @@ pub struct Screening {
     profile: Profile,
     verified: bool,
     followed: bool,
-    dm_relays: Option<bool>,
     last_active: Option<Timestamp>,
     mutual_contacts: Vec<Profile>,
-    _tasks: SmallVec<[Task<()>; 4]>,
+    _tasks: SmallVec<[Task<()>; 3]>,
 }
 
 impl Screening {
@@ -83,24 +82,6 @@ impl Screening {
             activity
         });
 
-        let relay_check = cx.background_spawn(async move {
-            let client = nostr_client();
-            let mut relay = false;
-
-            let filter = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
-
-            if let Ok(mut stream) = client.stream_events(filter, Duration::from_secs(2)).await {
-                while stream.next().await.is_some() {
-                    relay = true
-                }
-            }
-
-            relay
-        });
-
         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)
@@ -136,19 +117,6 @@ impl Screening {
             }),
         );
 
-        tasks.push(
-            // Run the relay check in the background
-            cx.spawn_in(window, async move |this, cx| {
-                let relay = relay_check.await;
-
-                this.update(cx, |this, cx| {
-                    this.dm_relays = Some(relay);
-                    cx.notify();
-                })
-                .ok();
-            }),
-        );
-
         tasks.push(
             // Run the NIP-05 verification in the background
             cx.spawn_in(window, async move |this, cx| {
@@ -168,7 +136,6 @@ impl Screening {
             profile,
             verified: false,
             followed: false,
-            dm_relays: None,
             last_active: None,
             mutual_contacts: vec![],
             _tasks: tasks,
@@ -235,9 +202,7 @@ impl Screening {
                                         .hover(|this| {
                                             this.bg(cx.theme().elevated_surface_background)
                                         })
-                                        .child(
+                                        .child(Avatar::new(contact.avatar(true)).size(rems(1.75)))
-                                            Avatar::new(contact.avatar_url(true)).size(rems(1.75)),
-                                        )
                                         .child(contact.display_name()),
                                 );
                             }
@@ -267,7 +232,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()
@@ -301,7 +266,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);
                                     })),
@@ -311,7 +276,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);
                                     })),
@@ -363,7 +328,7 @@ impl Render for Screening {
                                                     .icon(IconName::Info)
                                                     .xsmall()
                                                     .ghost()
-                                                    .rounded(ButtonRounded::Full)
+                                                    .rounded()
                                                     .tooltip(t!("screening.active_tooltip")),
                                             ),
                                     )
@@ -435,7 +400,7 @@ impl Render for Screening {
                                                     .icon(IconName::Info)
                                                     .xsmall()
                                                     .ghost()
-                                                    .rounded(ButtonRounded::Full)
+                                                    .rounded()
                                                     .on_click(cx.listener(
                                                         move |this, _, window, cx| {
                                                             this.mutual_contacts(window, cx);
@@ -456,37 +421,6 @@ impl Render for Screening {
                                             }),
                                     ),
                             ),
-                    )
-                    .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 == Some(true) {
-                                            shared_t!("screening.relay_found")
-                                        } else {
-                                            shared_t!("screening.relay_empty")
-                                        }
-                                    })
-                                    .child(
-                                        div()
-                                            .w_full()
-                                            .line_clamp(1)
-                                            .text_color(cx.theme().text_muted)
-                                            .child({
-                                                if self.dm_relays == Some(true) {
-                                                    shared_t!("screening.relay_found_desc")
-                                                } else {
-                                                    shared_t!("screening.relay_empty_desc")
-                                                }
-                                            }),
-                                    ),
-                            ),
                     ),
             )
     }

crates/coop/src/views/setup_relay.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use anyhow::{anyhow, Error};
 use global::constants::NIP17_RELAYS;
-use global::{css, nostr_client};
+use global::{app_state, nostr_client};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     div, px, uniform_list, App, AppContext, Context, Entity, InteractiveElement, IntoElement,
@@ -14,7 +14,7 @@ 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};
@@ -33,7 +33,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();
@@ -218,7 +218,7 @@ impl SetupRelay {
             }
 
             // Fetch gift wrap events
-            let sub_id = css().gift_wrap_sub_id.clone();
+            let sub_id = app_state().gift_wrap_sub_id.clone();
             let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
 
             if client

crates/coop/src/views/sidebar/list_item.rs

@@ -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,7 +11,9 @@ use registry::room::RoomKind;
 use registry::Registry;
 use settings::AppSettings;
 use theme::ActiveTheme;
+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};
@@ -24,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)]
@@ -60,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
     }
@@ -166,6 +168,10 @@ impl RenderOnce for RoomListItem {
                     ),
             )
             .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);
 

crates/coop/src/views/sidebar/mod.rs

@@ -4,14 +4,14 @@ 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::{css, nostr_client, UnwrappingStatus};
+use global::{app_state, nostr_client, UnwrappingStatus};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, uniform_list, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
+    deferred, div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity,
-    Focusable, InteractiveElement, IntoElement, ParentElement, Render, RetainAllImageCache,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render,
-    SharedString, Styled, Subscription, Task, Window,
+    RetainAllImageCache, SharedString, Styled, Subscription, Task, Window,
 };
 use gpui_tokio::Tokio;
 use i18n::{shared_t, t};
@@ -23,7 +23,7 @@ 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, PopupMenuExt};
@@ -56,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 {
@@ -77,28 +77,35 @@ impl Sidebar {
         let registry = Registry::global(cx);
         let mut subscriptions = smallvec![];
 
-        subscriptions.push(cx.subscribe_in(
+        subscriptions.push(
-            &registry,
+            // Clear the image cache when sidebar is closed
-            window,
+            cx.on_release_in(window, move |this, window, cx| {
-            move |this, _, event, _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(
+        subscriptions.push(
-            &find_input,
+            // Subscribe for find input events
-            window,
+            cx.subscribe_in(&find_input, window, |this, state, event, window, cx| {
-            |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
@@ -112,8 +119,8 @@ impl Sidebar {
                     }
                     _ => {}
                 }
-            },
+            }),
-        ));
+        );
 
         Self {
             name: "Sidebar".into(),
@@ -155,7 +162,7 @@ impl Sidebar {
         Self::request_metadata(client, public_key).await?;
 
         // Create a temporary room
-        let room = Room::new(&event).rearrange_by(identity);
+        let room = Room::from(&event).current_user(identity);
 
         Ok(room)
     }
@@ -530,8 +537,8 @@ impl Sidebar {
     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 css = css();
+            let app_state = app_state();
-            let subscription = client.subscription(&css.gift_wrap_sub_id).await;
+            let subscription = client.subscription(&app_state.gift_wrap_sub_id).await;
             let mut relays: Vec<Relay> = vec![];
 
             for (url, _filter) in subscription.into_iter() {
@@ -669,6 +676,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() {
@@ -688,7 +696,7 @@ impl Render for Sidebar {
         let mut total_rooms = rooms.len();
 
         // Add 3 dummy rooms to display as skeletons
-        if registry.unwrapping_status.read(cx) != &UnwrappingStatus::Complete {
+        if loading {
             total_rooms += 3
         }
 
@@ -714,6 +722,7 @@ impl Render for Sidebar {
                             .small()
                             .cleanable()
                             .appearance(true)
+                            .text_xs()
                             .suffix(
                                 Button::new("find")
                                     .icon(IconName::Search)
@@ -743,16 +752,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);
@@ -764,16 +773,16 @@ 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);
@@ -791,7 +800,7 @@ impl Render for Sidebar {
                                             .icon(IconName::Ellipsis)
                                             .xsmall()
                                             .ghost()
-                                            .rounded(ButtonRounded::Full)
+                                            .rounded()
                                             .popup_menu(move |this, _window, _cx| {
                                                 this.menu(
                                                     t!("sidebar.reload_menu"),
@@ -805,6 +814,57 @@ impl Render for Sidebar {
                                     ),
                             ),
                     )
+                    .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",

crates/coop/src/views/user_profile.rs

@@ -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(&target, cx);
-        let profile = registry.get_person(&public_key, 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()
+            let signer = client.signer().await?;
-                .kind(Kind::ContactList)
+            let public_key = signer.get_public_key().await?;
-                .author(identity)
+            let contact_list = client.database().contacts_public_keys(public_key).await?;
-                .pubkey(public_key)
-                .limit(1);
 
-            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 bech32 = self.profile.public_key().to_bech32().unwrap();
-        let Ok(bech32) = self.profile.public_key().to_bech32();
+        let shared_bech32 = SharedString::from(bech32);
-        let shared_bech32 = SharedString::new(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()
+                                    .cta()
-                                    .disabled(self.copied)
+                                    .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")),
                             ),
                     ),
             )

crates/coop/src/views/welcome.rs

@@ -1,12 +1,13 @@
 use gpui::{
     div, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    IntoElement, ParentElement, Render, SharedString, Styled, Window,
+    InteractiveElement, IntoElement, ParentElement, Render, SharedString,
+    StatefulInteractiveElement, Styled, Window,
 };
 use theme::ActiveTheme;
 use ui::button::Button;
 use ui::dock_area::panel::{Panel, PanelEvent};
 use ui::popup_menu::PopupMenu;
-use ui::StyledExt;
+use ui::{v_flex, StyledExt};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Welcome> {
     Welcome::new(window, cx)
@@ -14,8 +15,7 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<Welcome> {
 
 pub struct Welcome {
     name: SharedString,
-    closable: bool,
+    version: SharedString,
-    zoomable: bool,
     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 {
+    fn title(&self, cx: &App) -> AnyElement {
-        "👋".into_any_element()
+        div()
-    }
+            .child(
-
+                svg()
-    fn closable(&self, _cx: &App) -> bool {
+                    .path("brand/coop.svg")
-        self.closable
+                    .size_4()
-    }
+                    .text_color(cx.theme().element_background),
-
+            )
-    fn zoomable(&self, _cx: &App) -> bool {
+            .into_any_element()
-        self.zoomable
     }
 
     fn popup_menu(&self, menu: PopupMenu, _cx: &App) -> PopupMenu {
@@ -76,11 +76,10 @@ impl Render for Welcome {
             .items_center()
             .justify_center()
             .child(
-                div()
+                v_flex()
-                    .flex()
+                    .gap_2()
-                    .flex_col()
                     .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()
+                        v_flex()
-                            .child("coop on nostr")
+                            .items_center()
-                            .text_color(cx.theme().text_placeholder)
+                            .justify_center()
-                            .font_semibold()
+                            .text_center()
-                            .text_sm(),
+                            .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");
+                                    }),
+                            ),
                     ),
             )
     }

crates/global/src/constants.rs

@@ -37,7 +37,7 @@ pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nsec.app";
 pub const RELAY_RETRY: u64 = 2;
 
 /// Default retry count for sending messages
-pub const SEND_RETRY: u64 = 5;
+pub const SEND_RETRY: u64 = 10;
 
 /// Default timeout (in seconds) for Nostr Connect
 pub const NOSTR_CONNECT_TIMEOUT: u64 = 200;

crates/global/src/lib.rs

@@ -13,16 +13,18 @@ use crate::paths::support_dir;
 pub mod constants;
 pub mod paths;
 
-#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct AuthRequest {
-    pub challenge: String,
     pub url: RelayUrl,
+    pub challenge: String,
+    pub sending: bool,
 }
 
 impl AuthRequest {
     pub fn new(challenge: impl Into<String>, url: RelayUrl) -> Self {
         Self {
             challenge: challenge.into(),
+            sending: false,
             url,
         }
     }
@@ -55,7 +57,7 @@ pub enum UnwrappingStatus {
 
 /// Signals sent through the global event channel to notify UI
 #[derive(Debug)]
-pub enum Signal {
+pub enum SignalKind {
     /// A signal to notify UI that the client's signer has been set
     SignerSet(PublicKey),
 
@@ -68,26 +70,55 @@ pub enum Signal {
     /// 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
+    /// A signal to notify UI that a new profile has been received
-    Metadata(Event),
+    NewProfile(Profile),
 
     /// A signal to notify UI that a new gift wrap event has been received
-    Message((EventId, Event)),
+    NewMessage((EventId, Event)),
 
-    /// A signal to notify UI that gift wrap process status has changed
+    /// A signal to notify UI that no DM relays for current user was found
-    GiftWrapProcess(UnwrappingStatus),
+    RelaysNotFound,
 
-    /// A signal to notify UI that no DM relay for current user was found
+    /// A signal to notify UI that gift wrap status has changed
-    DmRelayNotFound,
+    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<Signal>,
+    rx: Receiver<PublicKey>,
-    tx: Sender<Signal>,
+    tx: Sender<PublicKey>,
 }
 
 impl Default for Ingester {
@@ -98,49 +129,75 @@ impl Default for Ingester {
 
 impl Ingester {
     pub fn new() -> Self {
-        let (tx, rx) = flume::bounded::<Signal>(2048);
+        let (tx, rx) = flume::bounded::<PublicKey>(1024);
         Self { rx, tx }
     }
 
-    pub fn signals(&self) -> &Receiver<Signal> {
+    pub fn receiver(&self) -> &Receiver<PublicKey> {
         &self.rx
     }
 
-    pub async fn send(&self, signal: Signal) {
+    pub async fn send(&self, public_key: PublicKey) {
-        if let Err(e) = self.tx.send_async(signal).await {
+        if let Err(e) = self.tx.send_async(public_key).await {
-            log::error!("Failed to send signal: {e}");
+            log::error!("Failed to send public key: {e}");
         }
     }
 }
 
-/// A simple storage to store all runtime states that using across the application.
+/// A simple storage to store all states that using across the application.
 #[derive(Debug)]
-pub struct CoopSimpleStorage {
+pub struct AppState {
     pub init_at: Timestamp,
+
+    pub last_used_at: Option<Timestamp>,
+
+    pub is_first_run: AtomicBool,
+
     pub gift_wrap_sub_id: SubscriptionId,
+
     pub gift_wrap_processing: AtomicBool,
+
     pub auto_close_opts: Option<SubscribeAutoCloseOptions>,
+
     pub sent_ids: RwLock<HashSet<EventId>>,
+
+    pub seen_on_relays: RwLock<HashMap<EventId, HashSet<RelayUrl>>>,
+
     pub resent_ids: RwLock<Vec<Output<EventId>>>,
+
     pub resend_queue: RwLock<HashMap<EventId, RelayUrl>>,
+
+    pub signal: Signal,
+
+    pub ingester: Ingester,
 }
 
-impl Default for CoopSimpleStorage {
+impl Default for AppState {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl CoopSimpleStorage {
+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: Timestamp::now(),
+            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(
+            auto_close_opts: Some(opts),
-                SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE),
-            ),
             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()),
         }
@@ -148,9 +205,7 @@ impl CoopSimpleStorage {
 }
 
 static NOSTR_CLIENT: OnceLock<Client> = OnceLock::new();
-static INGESTER: OnceLock<Ingester> = OnceLock::new();
+static APP_STATE: OnceLock<AppState> = OnceLock::new();
-static COOP_SIMPLE_STORAGE: OnceLock<CoopSimpleStorage> = OnceLock::new();
-static FIRST_RUN: OnceLock<bool> = OnceLock::new();
 
 pub fn nostr_client() -> &'static Client {
     NOSTR_CLIENT.get_or_init(|| {
@@ -168,32 +223,26 @@ pub fn nostr_client() -> &'static Client {
             .automatic_authentication(false)
             .verify_subscriptions(false)
             .sleep_when_idle(SleepWhenIdle::Enabled {
-                timeout: Duration::from_secs(30),
+                timeout: Duration::from_secs(300),
             });
 
         ClientBuilder::default().database(lmdb).opts(opts).build()
     })
 }
 
-pub fn ingester() -> &'static Ingester {
+pub fn app_state() -> &'static AppState {
-    INGESTER.get_or_init(Ingester::new)
+    APP_STATE.get_or_init(AppState::new)
 }
 
-pub fn css() -> &'static CoopSimpleStorage {
+fn first_run() -> bool {
-    COOP_SIMPLE_STORAGE.get_or_init(CoopSimpleStorage::new)
+    let flag = support_dir().join(format!(".{}-first_run", env!("CARGO_PKG_VERSION")));
-}
 
-pub fn first_run() -> &'static bool {
+    if !flag.exists() {
-    FIRST_RUN.get_or_init(|| {
+        if std::fs::write(&flag, "").is_err() {
-        let flag = support_dir().join(format!(".{}-first_run", env!("CARGO_PKG_VERSION")));
+            return false;
-
-        if !flag.exists() {
-            if std::fs::write(&flag, "").is_err() {
-                return false;
-            }
-            true // First run
-        } else {
-            false // Not first run
         }
-    })
+        true // First run
+    } else {
+        false // Not first run
+    }
 }

crates/i18n/src/lib.rs

@@ -29,10 +29,10 @@ macro_rules! init {
 #[macro_export]
 macro_rules! shared_t {
     ($key:expr) => {
-        SharedString::new(t!($key))
+        SharedString::from(t!($key))
     };
     ($key:expr, $($param:ident = $value:expr),+) => {
-        SharedString::new(t!($key, $($param = $value),+))
+        SharedString::from(t!($key, $($param = $value),+))
     };
 }
 

crates/registry/src/lib.rs

@@ -155,21 +155,19 @@ impl Registry {
     }
 
     /// Insert or update a person
-    pub fn insert_or_update_person(&mut self, event: Event, cx: &mut App) {
+    pub fn insert_or_update_person(&mut self, profile: Profile, cx: &mut App) {
-        let public_key = event.pubkey;
+        let public_key = profile.public_key();
-        let Ok(metadata) = Metadata::from_json(event.content) else {
-            // Invalid metadata, no need to process further.
-            return;
-        };
 
-        if let Some(person) = self.persons.get(&public_key) {
+        match self.persons.get(&public_key) {
-            person.update(cx, |this, cx| {
+            Some(person) => {
-                *this = Profile::new(public_key, metadata);
+                person.update(cx, |this, cx| {
-                cx.notify();
+                    *this = profile;
-            });
+                    cx.notify();
-        } else {
+                });
-            self.persons
+            }
-                .insert(public_key, cx.new(|_| Profile::new(public_key, metadata)));
+            None => {
+                self.persons.insert(public_key, cx.new(|_| profile));
+            }
         }
     }
 
@@ -326,7 +324,7 @@ impl Registry {
                 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);
+                let room = Room::from(&event).current_user(public_key);
 
                 if is_ongoing || bypassed {
                     rooms.insert(room.kind(RoomKind::Ongoing));
@@ -460,9 +458,7 @@ impl Registry {
                 });
             }
         } else {
-            let room = Room::new(&event)
+            let room = Room::from(&event).current_user(identity);
-                .kind(RoomKind::default())
-                .rearrange_by(identity);
 
             // Push the new room to the front of the list
             self.add_room(cx.new(|_| room), cx);

crates/registry/src/message.rs

@@ -5,6 +5,7 @@ use nostr_sdk::prelude::*;
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub enum Message {
     User(RenderedMessage),
+    Warning(String, Timestamp),
     System(Timestamp),
 }
 
@@ -13,18 +14,33 @@ impl Message {
         Self::User(user.into())
     }
 
+    pub fn warning(content: String) -> Self {
+        Self::Warning(content, 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) {
-            (Message::User(a), Message::User(b)) => a.cmp(b),
+            // System always comes first
-            (Message::System(a), Message::System(b)) => a.cmp(b),
+            (Message::System(_), Message::System(_)) => self.timestamp().cmp(other.timestamp()),
-            (Message::User(a), Message::System(b)) => a.created_at.cmp(b),
+            (Message::System(_), _) => std::cmp::Ordering::Less,
-            (Message::System(a), Message::User(b)) => a.cmp(&b.created_at),
+            (_, Message::System(_)) => std::cmp::Ordering::Greater,
+
+            // For non-system messages, compare by timestamp
+            _ => self.timestamp().cmp(other.timestamp()),
         }
     }
 }
@@ -141,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 Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
-            if let Ok(id) = EventId::from_hex(content) {
+            replies_to.push(id);
-                replies_to.push(id);
-            }
         }
     }
 
     for tag in inner.filter(TagKind::q()) {
-        if let Some(content) = tag.content() {
+        if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
-            if let Ok(id) = EventId::from_hex(content) {
+            replies_to.push(id);
-                replies_to.push(id);
-            }
         }
     }
 

crates/registry/src/room.rs

@@ -1,13 +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 common::display::RenderedProfile;
 use common::event::EventUtils;
 use global::constants::SEND_RETRY;
-use global::{css, nostr_client};
+use global::{app_state, nostr_client};
-use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
+use gpui::{App, AppContext, Context, EventEmitter, SharedString, SharedUri, Task};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 
@@ -16,45 +17,51 @@ use crate::Registry;
 #[derive(Debug, Clone)]
 pub struct SendReport {
     pub receiver: PublicKey,
-    pub output: Option<Output<EventId>>,
+    pub tags: Option<Vec<Tag>>,
-    pub local_error: Option<SharedString>,
+    pub status: Option<Output<EventId>>,
-    pub nip17_relays_not_found: bool,
+    pub error: Option<SharedString>,
+    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),
+            status: None,
-            local_error: None,
+            error: None,
-            nip17_relays_not_found: false,
+            tags: None,
+            relays_not_found: false,
         }
     }
 
-    pub fn error(receiver: PublicKey, error: impl Into<SharedString>) -> Self {
+    pub fn not_found(mut self) -> Self {
-        Self {
+        self.relays_not_found = true;
-            receiver,
+        self
-            output: None,
-            local_error: Some(error.into()),
-            nip17_relays_not_found: false,
-        }
     }
 
-    pub fn nip17_relays_not_found(receiver: PublicKey) -> Self {
+    pub fn error(mut self, error: impl Into<SharedString>) -> Self {
-        Self {
+        self.error = Some(error.into());
-            receiver,
+        self.relays_not_found = false;
-            output: None,
+        self
-            local_error: None,
+    }
-            nip17_relays_not_found: true,
+
-        }
+    pub fn status(mut self, output: Output<EventId>) -> Self {
+        self.status = Some(output);
+        self.relays_not_found = false;
+        self
+    }
+
+    pub fn tags(mut self, tags: &Vec<Tag>) -> Self {
+        self.tags = Some(tags.to_owned());
+        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
@@ -117,13 +124,13 @@ impl Eq for Room {}
 
 impl EventEmitter<RoomSignal> for Room {}
 
-impl Room {
+impl From<&Event> for Room {
-    pub fn new(event: &Event) -> Self {
+    fn from(val: &Event) -> Self {
-        let id = event.uniq_id();
+        let id = val.uniq_id();
-        let created_at = event.created_at;
+        let created_at = val.created_at;
 
         // Get the members from the event's tags and event's pubkey
-        let members = event
+        let members = val
             .all_pubkeys()
             .into_iter()
             .unique()
@@ -131,20 +138,20 @@ impl Room {
             .collect_vec();
 
         // Get the subject from the event's tags
-        let subject = if let Some(tag) = event.tags.find(TagKind::Subject) {
+        let subject = if let Some(tag) = val.tags.find(TagKind::Subject) {
             tag.content().map(|s| s.to_owned())
         } else {
             None
         };
 
         // Get the picture from the event's tags
-        let picture = if let Some(tag) = event.tags.find(TagKind::custom("picture")) {
+        let picture = if let Some(tag) = val.tags.find(TagKind::custom("picture")) {
             tag.content().map(|s| s.to_owned())
         } else {
             None
         };
 
-        Self {
+        Room {
             id,
             created_at,
             subject,
@@ -153,47 +160,82 @@ impl Room {
             kind: RoomKind::default(),
         }
     }
+}
 
-    /// Sets the kind of the room and returns the modified room
+impl From<&UnsignedEvent> for Room {
-    ///
+    fn from(val: &UnsignedEvent) -> Self {
-    /// This is a builder-style method that allows chaining room modifications.
+        let id = val.uniq_id();
-    ///
+        let created_at = val.created_at;
-    /// # Arguments
+
-    ///
+        // Get the members from the event's tags and event's pubkey
-    /// * `kind` - The RoomKind to set for this room
+        let members = val
-    ///
+            .all_pubkeys()
-    /// # Returns
+            .into_iter()
-    ///
+            .unique()
-    /// The modified Room instance with the new kind
+            .sorted()
-    pub fn kind(mut self, kind: RoomKind) -> Self {
+            .collect_vec();
-        self.kind = kind;
+
-        self
+        // Get the subject from the event's tags
+        let subject = if let Some(tag) = val.tags.find(TagKind::Subject) {
+            tag.content().map(|s| s.to_owned())
+        } else {
+            None
+        };
+
+        // Get the picture from the event's tags
+        let picture = if let Some(tag) = val.tags.find(TagKind::custom("picture")) {
+            tag.content().map(|s| s.to_owned())
+        } else {
+            None
+        };
+
+        Room {
+            id,
+            created_at,
+            subject,
+            picture,
+            members,
+            kind: RoomKind::default(),
+        }
+    }
+}
+
+impl Room {
+    /// Constructs a new room instance with a given receiver.
+    pub fn new(receiver: PublicKey, tags: Tags, cx: &App) -> Self {
+        let identity = Registry::read_global(cx).identity(cx);
+
+        let mut event = EventBuilder::private_msg_rumor(receiver, "")
+            .tags(tags)
+            .build(identity.public_key());
+
+        // Ensure event ID is generated
+        event.ensure_id();
+
+        Room::from(&event).current_user(identity.public_key())
     }
 
-    /// Sets the rearrange_by field of the room and returns the modified room
+    /// Constructs a new room instance from an nostr event.
-    ///
+    pub fn from(event: impl Into<Room>) -> Self {
-    /// This is a builder-style method that allows chaining room modifications.
+        event.into()
-    ///
+    }
-    /// # Arguments
+
-    ///
+    /// Call this function to ensure the current user is always at the bottom of the members list
-    /// * `rearrange_by` - The PublicKey to set for rearranging the member list
+    pub fn current_user(mut self, public_key: PublicKey) -> Self {
-    ///
-    /// # 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.iter().partition(|&key| key != &public_key);
         self.members = not_match;
         self.members.extend(matches);
         self
     }
 
+    /// Sets the kind of the room and returns the modified room
+    pub fn kind(mut self, kind: RoomKind) -> Self {
+        self.kind = kind;
+        self
+    }
+
     /// Set the room kind to ongoing
-    ///
-    /// # Arguments
-    ///
-    /// * `cx` - The context to notify about the update
     pub fn set_ongoing(&mut self, cx: &mut Context<Self>) {
         if self.kind != RoomKind::Ongoing {
             self.kind = RoomKind::Ongoing;
@@ -202,89 +244,45 @@ 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>) {
         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>) {
         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();
     }
 
     /// Gets the display name for the room
-    ///
+    pub fn display_name(&self, cx: &App) -> SharedString {
-    /// 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 {
         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
-    ///
+    pub fn display_image(&self, proxy: bool, cx: &App) -> SharedUri {
-    /// 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()
+            SharedUri::from(picture)
         } else if !self.is_group() {
-            self.first_member(cx).avatar_url(proxy)
+            self.first_member(cx).avatar(proxy)
         } else {
-            "brand/group.png".into()
+            SharedUri::from("brand/group.png")
         }
     }
 
@@ -297,7 +295,7 @@ impl Room {
     }
 
     /// Merge the names of the first two members of the room.
-    pub(crate) fn merge_name(&self, cx: &App) -> String {
+    pub(crate) fn merged_name(&self, cx: &App) -> SharedString {
         let registry = Registry::read_global(cx);
 
         if self.is_group() {
@@ -310,7 +308,7 @@ impl Room {
             let mut name = profiles
                 .iter()
                 .take(2)
-                .map(|p| p.display_name())
+                .map(|p| p.name())
                 .collect::<Vec<_>>()
                 .join(", ");
 
@@ -318,54 +316,105 @@ impl Room {
                 name = format!("{}, +{}", name, profiles.len() - 2);
             }
 
-            name
+            SharedString::from(name)
         } else {
             self.first_member(cx).display_name()
         }
     }
 
+    /// Connects to all members' messaging relays
+    pub fn connect_relays(
+        &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 timeout = Duration::from_secs(3);
+            let mut processed = HashSet::new();
+            let mut relays: HashMap<PublicKey, Vec<RelayUrl>> = HashMap::new();
+
+            if let Some((_, members)) = members.split_last() {
+                for member in members.iter() {
+                    relays.insert(member.to_owned(), vec![]);
+
+                    let filter = Filter::new()
+                        .kind(Kind::InboxRelays)
+                        .author(member.to_owned())
+                        .limit(1);
+
+                    if let Ok(mut stream) = client.stream_events(filter, timeout).await {
+                        if let Some(event) = stream.next().await {
+                            if processed.insert(event.id) {
+                                let urls = nip17::extract_owned_relay_list(event).collect_vec();
+                                relays.entry(member.to_owned()).or_default().extend(urls);
+                            }
+                        }
+                    }
+                }
+            };
+
+            Ok(relays)
+        })
+    }
+
     /// 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
+            let sent_events = client.database().query(filter).await?;
-                .database()
+
-                .query(filter)
+            // Get events that received by current user
-                .await?
+            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)
         })
     }
 
-    /// Emits a new message signal to the current room
-    pub fn emit_message(&self, gift_wrap_id: EventId, event: Event, cx: &mut Context<Self>) {
-        cx.emit(RoomSignal::NewMessage((gift_wrap_id, Box::new(event))));
-    }
-
-    /// Emits a signal to refresh the current room's messages.
-    pub fn emit_refresh(&mut self, cx: &mut Context<Self>) {
-        cx.emit(RoomSignal::Refresh);
-    }
-
     /// Creates a temporary message for optimistic updates
     ///
     /// The event must not been published to relays.
@@ -392,23 +441,14 @@ impl Room {
         }
 
         let mut event = builder.tags(tags).build(receiver);
+
         // Ensure event ID is set
         event.ensure_id();
 
         event
     }
 
-    /// Sends a message to all members in the background task
+    /// Create a task to sends a message to all members in the background
-    ///
-    /// # 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(
         &self,
         content: &str,
@@ -422,20 +462,21 @@ impl Room {
         let mut public_keys = 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
+            let mut tags: Vec<Tag> = public_keys
                 .iter()
-                .filter_map(|pubkey| {
+                .filter_map(|&this| {
-                    if pubkey != &public_key {
+                    if this != public_key {
-                        Some(Tag::public_key(*pubkey))
+                        Some(Tag::public_key(this))
                     } else {
                         None
                     }
                 })
-                .collect_vec();
+                .collect();
 
             // Add event reference if it's present (replying to another event)
             if replies.len() == 1 {
@@ -468,44 +509,45 @@ impl Room {
             // Stored all send errors
             let mut reports = vec![];
 
-            for receiver in public_keys.into_iter() {
+            for pubkey in public_keys.into_iter() {
                 match client
-                    .send_private_msg(receiver, &content, tags.clone())
+                    .send_private_msg(pubkey, &content, tags.clone())
                     .await
                 {
                     Ok(output) => {
-                        if output
+                        let id = output.id().to_owned();
-                            .failed
+                        let auth_required = output.failed.iter().any(|m| m.1.starts_with("auth-"));
-                            .iter()
+                        let report = SendReport::new(pubkey).status(output).tags(&tags);
-                            .any(|(_, msg)| msg.starts_with("auth-required:"))
-                        {
-                            let id = output.id();
 
+                        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) =
+                                if let Some(output) = ids.iter().find(|e| e.id() == &id).cloned() {
-                                    css().resent_ids.read().await.iter().find(|o| o.id() == id)
+                                    let output = SendReport::new(pubkey).status(output).tags(&tags);
-                                {
+                                    reports.push(output);
-                                    reports.push(SendReport::output(receiver, output.to_owned()));
                                     break;
                                 }
 
+                                // Check if retry limit exceeded
                                 if attempt == SEND_RETRY {
+                                    reports.push(report);
                                     break;
                                 }
 
-                                smol::Timer::after(Duration::from_secs(1)).await;
+                                smol::Timer::after(Duration::from_millis(1200)).await;
                             }
                         } else {
-                            reports.push(SendReport::output(receiver, output));
+                            reports.push(report);
                         }
                     }
                     Err(e) => {
                         if let nostr_sdk::client::Error::PrivateMsgRelaysNotFound = e {
-                            reports.push(SendReport::nip17_relays_not_found(receiver));
+                            reports.push(SendReport::new(pubkey).not_found().tags(&tags));
                         } else {
-                            reports.push(SendReport::error(receiver, e.to_string()));
+                            reports.push(SendReport::new(pubkey).error(e.to_string()).tags(&tags));
                         }
                     }
                 }
@@ -518,13 +560,14 @@ impl Room {
                     .await
                 {
                     Ok(output) => {
-                        reports.push(SendReport::output(public_key, output));
+                        reports.push(SendReport::new(public_key).status(output).tags(&tags));
                     }
                     Err(e) => {
                         if let nostr_sdk::client::Error::PrivateMsgRelaysNotFound = e {
-                            reports.push(SendReport::nip17_relays_not_found(public_key));
+                            reports.push(SendReport::new(public_key).not_found());
                         } else {
-                            reports.push(SendReport::error(public_key, e.to_string()));
+                            reports
+                                .push(SendReport::new(public_key).error(e.to_string()).tags(&tags));
                         }
                     }
                 }
@@ -533,4 +576,67 @@ impl Room {
             Ok(reports)
         })
     }
+
+    /// Create a task to resend a failed message
+    pub fn resend(
+        &self,
+        reports: Vec<SendReport>,
+        message: String,
+        backup: bool,
+        cx: &App,
+    ) -> Task<Result<Vec<SendReport>, Error>> {
+        cx.background_spawn(async move {
+            let client = nostr_client();
+            let mut resend_reports = vec![];
+            let mut resend_tag = vec![];
+
+            for report in reports.into_iter() {
+                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(report.receiver).status(resent));
+                        }
+
+                        if let Some(tags) = report.tags {
+                            resend_tag.extend(tags);
+                        }
+                    }
+                }
+            }
+
+            // Only send a backup message to current user if sent successfully to others
+            if backup && !resend_reports.is_empty() {
+                let signer = client.signer().await?;
+                let public_key = signer.get_public_key().await?;
+                let output = client
+                    .send_private_msg(public_key, message, resend_tag)
+                    .await?;
+
+                resend_reports.push(SendReport::new(public_key).status(output));
+            }
+
+            Ok(resend_reports)
+        })
+    }
+
+    /// Emits a new message signal to the current room
+    pub fn emit_message(&self, gift_wrap_id: EventId, event: Event, cx: &mut Context<Self>) {
+        cx.emit(RoomSignal::NewMessage((gift_wrap_id, Box::new(event))));
+    }
+
+    /// Emits a signal to refresh the current room's messages.
+    pub fn emit_refresh(&mut self, cx: &mut Context<Self>) {
+        cx.emit(RoomSignal::Refresh);
+    }
 }

crates/title_bar/src/platforms/mac.rs

@@ -3,4 +3,4 @@
 ///
 /// Magic number: There is one extra pixel of padding on the left side due to
 /// the 1px border around the window on macOS apps.
-pub const TRAFFIC_LIGHT_PADDING: f32 = 71.;
+pub const TRAFFIC_LIGHT_PADDING: f32 = 80.;

crates/ui/Cargo.toml

@@ -28,3 +28,6 @@ uuid = "1.10"
 once_cell = "1.19.0"
 image = "0.25.1"
 linkify = "0.10.0"
+lsp-types = "0.97.0"
+rope = { git = "https://github.com/zed-industries/zed.git" }
+sum_tree = { git = "https://github.com/zed-industries/zed.git" }

crates/ui/src/actions.rs

@@ -2,10 +2,15 @@ use gpui::{actions, Action};
 use nostr_sdk::prelude::PublicKey;
 use serde::Deserialize;
 
-/// Define a open profile action
+/// Define a open public key action
 #[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
-#[action(namespace = profile, no_json)]
+#[action(namespace = pubkey, no_json)]
-pub struct OpenProfile(pub PublicKey);
+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)]

crates/ui/src/button.rs

@@ -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,
@@ -130,7 +125,7 @@ pub struct Button {
     children: Vec<AnyElement>,
 
     variant: ButtonVariant,
-    rounded: ButtonRounded,
+    rounded: bool,
     size: Size,
 
     disabled: bool,
@@ -163,7 +158,7 @@ impl Button {
             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.
+    /// Make the button rounded.
-    pub fn rounded(mut self, rounded: impl Into<ButtonRounded>) -> Self {
+    pub fn rounded(mut self) -> Self {
-        self.rounded = rounded.into();
+        self.rounded = true;
         self
     }
 
@@ -315,8 +310,8 @@ impl RenderOnce for Button {
             .cursor_default()
             .overflow_hidden()
             .map(|this| match self.rounded {
-                ButtonRounded::Normal => this.rounded(cx.theme().radius),
+                false => this.rounded(cx.theme().radius),
-                ButtonRounded::Full => this.rounded_full(),
+                true => this.rounded_full(),
             })
             .map(|this| {
                 if self.label.is_none() && self.children.is_empty() {

crates/ui/src/dock_area/tab_panel.rs

@@ -412,16 +412,15 @@ impl TabPanel {
         let is_zoomed = self.is_zoomed && state.zoomable;
         let view = cx.entity().clone();
         let build_popup_menu = move |this, cx: &App| view.read(cx).popup_menu(this, cx);
+        let toolbar = self.toolbar_buttons(window, cx);
+        let has_toolbar = !toolbar.is_empty();
 
         h_flex()
+            .p_0p5()
             .gap_1()
             .occlude()
-            .items_center()
+            .rounded_full()
-            .children(
+            .children(toolbar.into_iter().map(|btn| btn.small().ghost().rounded()))
-                self.toolbar_buttons(window, cx)
-                    .into_iter()
-                    .map(|btn| btn.small().ghost()),
-            )
             .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)

crates/ui/src/history.rs

@@ -22,10 +22,10 @@ pub struct History<I: HistoryItem> {
     redos: Vec<I>,
     last_changed_at: Instant,
     version: usize,
-    pub(crate) ignore: bool,
     max_undo: usize,
     group_interval: Option<Duration>,
     unique: bool,
+    pub ignore: bool,
 }
 
 impl<I> History<I>

crates/ui/src/icon.rs

@@ -45,6 +45,7 @@ pub enum IconName {
     Plus,
     PlusFill,
     PlusCircleFill,
+    Group,
     ResizeCorner,
     Reply,
     Report,
@@ -52,6 +53,7 @@ pub enum IconName {
     Signal,
     Search,
     Settings,
+    Server,
     SortAscending,
     SortDescending,
     Sun,
@@ -105,6 +107,7 @@ 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",
@@ -112,6 +115,7 @@ impl IconName {
             Self::Signal => "icons/signal.svg",
             Self::Search => "icons/search.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",

crates/ui/src/input/blink_cursor.rs

@@ -1,9 +1,10 @@
 use std::time::Duration;
 
-use gpui::{Context, Timer};
+use gpui::{px, Context, Pixels, Timer};
 
 static INTERVAL: Duration = Duration::from_millis(500);
 static PAUSE_DELAY: Duration = Duration::from_millis(300);
+pub(super) const CURSOR_WIDTH: Pixels = px(1.5);
 
 /// To manage the Input cursor blinking.
 ///
@@ -11,7 +12,7 @@ static PAUSE_DELAY: Duration = Duration::from_millis(300);
 /// Every loop will notify the view to update the `visible`, and Input will observe this update to touch repaint.
 ///
 /// The input painter will check if this in visible state, then it will draw the cursor.
-pub(crate) struct BlinkCursor {
+pub struct BlinkCursor {
     visible: bool,
     paused: bool,
     epoch: usize,
@@ -52,10 +53,8 @@ impl BlinkCursor {
 
         // Schedule the next blink
         let epoch = self.next_epoch();
-
         cx.spawn(async move |this, cx| {
             Timer::after(INTERVAL).await;
-
             if let Some(this) = this.upgrade() {
                 this.update(cx, |this, cx| this.blink(epoch, cx)).ok();
             }
@@ -71,11 +70,11 @@ impl BlinkCursor {
     /// Pause the blinking, and delay 500ms to resume the blinking.
     pub fn pause(&mut self, cx: &mut Context<Self>) {
         self.paused = true;
+        self.visible = true;
         cx.notify();
 
         // delay 500ms to start the blinking
         let epoch = self.next_epoch();
-
         cx.spawn(async move |this, cx| {
             Timer::after(PAUSE_DELAY).await;
 
@@ -90,3 +89,9 @@ impl BlinkCursor {
         .detach();
     }
 }
+
+impl Default for BlinkCursor {
+    fn default() -> Self {
+        Self::new()
+    }
+}

crates/ui/src/input/change.rs

@@ -1,28 +1,28 @@
 use std::fmt::Debug;
-use std::ops::Range;
 
 use crate::history::HistoryItem;
+use crate::input::cursor::Selection;
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct Change {
-    pub(crate) old_range: Range<usize>,
+    pub(crate) old_range: Selection,
     pub(crate) old_text: String,
-    pub(crate) new_range: Range<usize>,
+    pub(crate) new_range: Selection,
     pub(crate) new_text: String,
     version: usize,
 }
 
 impl Change {
     pub fn new(
-        old_range: Range<usize>,
+        old_range: impl Into<Selection>,
         old_text: &str,
-        new_range: Range<usize>,
+        new_range: impl Into<Selection>,
         new_text: &str,
     ) -> Self {
         Self {
-            old_range,
+            old_range: old_range.into(),
             old_text: old_text.to_string(),
-            new_range,
+            new_range: new_range.into(),
             new_text: new_text.to_string(),
             version: 0,
         }

crates/ui/src/input/clear_button.rs

@@ -1,16 +1,15 @@
 use gpui::{App, Styled};
-use i18n::t;
 use theme::ActiveTheme;
 
-use crate::button::{Button, ButtonVariants as _};
+use crate::button::{Button, ButtonVariants};
-use crate::{Icon, IconName, Sizable as _};
+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)
 }

crates/ui/src/input/cursor.rs

@@ -0,0 +1,46 @@
+use std::ops::Range;
+
+/// A selection in the text, represented by start and end byte indices.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
+pub struct Selection {
+    pub start: usize,
+    pub end: usize,
+}
+
+impl Selection {
+    pub fn new(start: usize, end: usize) -> Self {
+        Self { start, end }
+    }
+
+    pub fn len(&self) -> usize {
+        self.end.saturating_sub(self.start)
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.start == self.end
+    }
+
+    /// Clears the selection, setting start and end to 0.
+    pub fn clear(&mut self) {
+        self.start = 0;
+        self.end = 0;
+    }
+
+    /// Checks if the given offset is within the selection range.
+    pub fn contains(&self, offset: usize) -> bool {
+        offset >= self.start && offset < self.end
+    }
+}
+
+impl From<Range<usize>> for Selection {
+    fn from(value: Range<usize>) -> Self {
+        Self::new(value.start, value.end)
+    }
+}
+impl From<Selection> for Range<usize> {
+    fn from(value: Selection) -> Self {
+        value.start..value.end
+    }
+}
+
+pub type Position = lsp_types::Position;

crates/ui/src/input/element.rs

@@ -1,29 +1,34 @@
-use std::{ops::Range, rc::Rc};
+use std::ops::Range;
+use std::rc::Rc;
 
 use gpui::{
     fill, point, px, relative, size, App, Bounds, Corners, Element, ElementId, ElementInputHandler,
-    Entity, GlobalElementId, IntoElement, LayoutId, MouseButton, MouseMoveEvent, Path, Pixels,
+    Entity, GlobalElementId, Half, Hitbox, IntoElement, LayoutId, MouseButton, MouseMoveEvent,
-    Point, SharedString, Size, Style, TextAlign, TextRun, UnderlineStyle, Window, WrappedLine,
+    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 BOTTOM_MARGIN_ROWS: usize = 3;
-const RIGHT_MARGIN: Pixels = px(5.);
+pub(super) const RIGHT_MARGIN: Pixels = px(10.);
-const BOTTOM_MARGIN_ROWS: usize = 1;
+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| {
+                    state.update(cx, |state, cx| {
-                        input.on_drag_move(event, window, 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],
+        last_layout: &LastLayout,
-        line_height: Pixels,
         bounds: &mut Bounds<Pixels>,
-        line_number_width: Pixels,
+        _: &mut Window,
-        window: &mut Window,
         cx: &mut App,
     ) -> (Option<Bounds<Pixels>>, Point<Pixels>, Option<usize>) {
-        let input = self.input.read(cx);
+        let state = self.state.read(cx);
-        let mut selected_range = input.selected_range.clone();
+
-        if let Some(marked_range) = &input.marked_range {
+        let line_height = last_layout.line_height;
-            selected_range = marked_range.end..marked_range.end;
+        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 cursor = state.cursor();
-        let mut current_line_index = None;
+        let mut current_row = None;
-        let mut scroll_offset = input.scroll_handle.offset();
+        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() {
+        let top_bottom_margin = if state.mode.is_auto_grow() {
-            px(0.) + line_height
+            #[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);
+            let in_visible_range = ix >= visible_range.start;
-            if cursor_pos.is_none() {
+            if let Some(line) = in_visible_range
-                let offset = cursor_offset.saturating_sub(prev_lines_offset);
+                .then(|| lines.get(ix.saturating_sub(visible_range.start)))
-                if let Some(pos) = line.position_for_index(offset, line_height) {
+                .flatten()
-                    current_line_index = Some(line_ix);
+            {
-                    cursor_pos = Some(line_origin + pos);
+                // 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() {
-            if cursor_start.is_none() {
+                    let offset = selected_range.start.saturating_sub(prev_lines_offset);
-                let offset = selected_range.start.saturating_sub(prev_lines_offset);
+                    if let Some(pos) = line.position_for_index(offset, line_height) {
-                if let Some(pos) = line.position_for_index(offset, line_height) {
+                        cursor_start = Some(line_origin + pos);
-                    cursor_start = Some(line_origin + pos);
+                    }
                 }
-            }
+                if cursor_end.is_none() {
-            if cursor_end.is_none() {
+                    let offset = selected_range.end.saturating_sub(prev_lines_offset);
-                let offset = selected_range.end.saturating_sub(prev_lines_offset);
+                    if let Some(pos) = line.position_for_index(offset, line_height) {
-                if let Some(pos) = line.position_for_index(offset, line_height) {
+                        cursor_end = Some(line_origin + pos);
-                    cursor_end = Some(line_origin + pos);
+                    }
                 }
-            }
 
-            offset_y += line.size(line_height).height;
+                offset_y += line.size(line_height).height;
-            // +1 for skip the last `\n`
+                // +1 for the last `\n`
-            prev_lines_offset += line.len() + 1;
+                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 = state.last_selected_range != Some(selected_range);
-            let selection_changed = input.last_selected_range != Some(selected_range.clone());
+            if selection_changed {
-
+                scroll_offset.x = if scroll_offset.x + cursor_pos.x
-            if cursor_moved || selection_changed {
+                    > (bounds.size.width - line_number_width - RIGHT_MARGIN)
-                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
                 {
-                    // cursor is out of bottom
+                    // cursor is out of right
-                    bounds.size.height - bottom_margin - cursor_pos.y
+                    bounds.size.width - line_number_width - RIGHT_MARGIN - cursor_pos.x
-                } else if scroll_offset.y + cursor_pos.y < px(0.) {
+                } else if scroll_offset.x + cursor_pos.x < px(0.) {
-                    // cursor is out of top
+                    // cursor is out of left
-                    scroll_offset.y - cursor_pos.y
+                    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 bounds
-                // cursor blink
+            let cursor_height = line_height;
-                let cursor_height = line_height;
+            cursor_bounds = Some(Bounds::new(
-                cursor_bounds = Some(Bounds::new(
+                point(
-                    point(
+                    bounds.left() + cursor_pos.x + line_number_width + scroll_offset.x,
-                        bounds.left() + cursor_pos.x + line_number_width + scroll_offset.x,
+                    bounds.top() + cursor_pos.y + ((line_height - cursor_height) / 2.),
-                        bounds.top() + cursor_pos.y + ((line_height - cursor_height) / 2.),
+                ),
-                    ),
+                size(CURSOR_WIDTH, cursor_height),
-                    size(CURSOR_THICKNESS, 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(
+    /// Layout the match range to a Path.
-        &self,
+    pub(crate) fn layout_match_range(
-        lines: &[WrappedLine],
+        range: Range<usize>,
-        line_height: Pixels,
+        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);
+        if range.is_empty() {
-        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() {
             return None;
         }
 
-        let (start_ix, end_ix) = if selected_range.start < selected_range.end {
+        if range.start < last_layout.visible_range_offset.start
-            (selected_range.start, selected_range.end)
+            || range.end > last_layout.visible_range_offset.end
-        } else {
+        {
-            (selected_range.end, selected_range.start)
+            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> {
+    ) -> (Range<usize>, Pixels) {
-        if state.is_single_line() {
+        // Add extra rows to avoid showing empty space when scroll to bottom.
-            return 0..1;
+        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.len();
-        let total_lines = state.text_wrapper.lines.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 {
+            if line_bottom + scroll_top >= input_height {
-                visible_range.end = (ix + 1).min(total_lines);
+                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 = relative(1.).into();
-                style.size.height = h.into();
+            if state.mode.is_auto_grow() {
-                style.min_size.height = line_height.into();
+                // 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 = line_height.into();
-                style.min_size.height = (input.mode.rows() * 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, visible_top) =
-        let visible_range = self.calculate_visible_range(input, line_height, bounds.size.height);
+            self.calculate_visible_range(state, line_height, bounds.size.height);
-        let text = input.text.clone();
+        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)
+            (Rope::from(placeholder.as_str()), cx.theme().text_muted)
-        } else if input.masked {
+        } else if state.masked {
-            ("*".repeat(text.chars().count()).into(), cx.theme().text)
+            (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
+        let mut longest_line_width = wrap_width.unwrap_or(px(0.));
-            .iter()
+        if state.mode.is_multi_line() && !state.soft_wrap && lines.len() > 1 {
-            .map(|line| {
+            let longtest_line: SharedString = state
-                // +1 is the first line, `wrap_boundaries` is the wrapped lines after the `\n`.
+                .text
-                1 + line.wrap_boundaries.len()
+                .line(state.text.summary().longest_row as usize)
-            })
+                .to_string()
-            .sum::<usize>();
+                .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
+        let total_wrapped_lines = state.text_wrapper.len();
-            .iter()
+        let empty_bottom_height = bounds
-            .map(|line| line.width())
+            .size
-            .max()
+            .height
-            .unwrap_or(bounds.size.width);
+            .half()
+            .max(BOTTOM_MARGIN_ROWS * line_height);
         let scroll_size = size(
-            max_line_width + line_number_width + RIGHT_MARGIN,
+            if longest_line_width + line_number_width + RIGHT_MARGIN > bounds.size.width {
-            (total_wrapped_lines as f32 * line_height).max(bounds.size.height),
+                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(
+        let (cursor_bounds, cursor_scroll_offset, _) =
-            &lines,
+            self.layout_cursor(&last_layout, &mut bounds, window, cx);
-            line_height,
+        last_layout.cursor_bounds = cursor_bounds;
-            &mut bounds,
-            line_number_width,
-            window,
-            cx,
-        );
 
-        let selection_path = self.layout_selections(
+        let selection_path = self.layout_selections(&last_layout, &mut bounds, cx);
-            &lines,
+        let search_match_paths = vec![];
-            line_height,
+        let hover_highlight_path = None;
-            &mut bounds,
+        let line_numbers = None;
-            line_number_width,
+        let hover_definition_hitbox = None;
-            window,
-            cx,
-        );
 
         PrepaintState {
             bounds,
-            last_layout: LastLayout {
+            last_layout,
-                lines: Rc::new(lines),
-                line_height,
-                visible_range,
-            },
             scroll_size,
-            line_numbers: None,
+            line_numbers,
-            line_number_width,
             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 selected_range = self.state.read(cx).selected_range;
-        let visible_range = &prepaint.last_layout.visible_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.);
+        let invisible_top_padding = prepaint.last_layout.visible_top;
-        for line in prepaint.last_layout.lines.iter().take(visible_range.start) {
-            invisible_top_padding += line.size(line_height).height;
-        }
 
         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 height = line_height * lines.len() as f32;
-                    let p = point(origin.x, origin.y + offset_y);
+                offset_y += height;
-                    let line_size = line.size(line_height);
-                    _ = line.paint(p, line_height, TextAlign::Left, None, window, cx);
-                    offset_y += line_size.height;
-                }
             }
         }
 
         // Paint selections
-        if let Some(path) = prepaint.selection_path.take() {
+        if window.is_window_active() {
-            window.paint_path(path, cx.theme().selection);
+            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
+        for line in prepaint.last_layout.lines.iter() {
-            .last_layout
+            let p = point(
-            .iter()
+                origin.x + prepaint.last_layout.line_number_width,
-            .skip(visible_range.start)
+                origin.y + offset_y,
-            .take(visible_range.len())
+            );
-        {
-            let p = point(origin.x + prepaint.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| {
+        // Paint line numbers
-            input.last_layout = Some(prepaint.last_layout.clone());
+        let mut offset_y = px(0.);
-            input.last_bounds = Some(bounds);
+        if let Some(line_numbers) = prepaint.line_numbers.as_ref() {
-            input.last_cursor_offset = Some(input.cursor_offset());
+            offset_y += invisible_top_padding;
-            input.set_input_bounds(input_bounds, cx);
+
-            input.last_selected_range = Some(selected_range);
+            // Paint line number background
-            input.scroll_size = prepaint.scroll_size;
+            window.paint_quad(fill(
-            input.line_number_width = prepaint.line_number_width;
+                Bounds {
-            input
+                    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);
     }
 }

crates/ui/src/input/mask_pattern.rs

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

crates/ui/src/input/mod.rs

@@ -1,13 +1,15 @@
 mod blink_cursor;
 mod change;
+mod cursor;
 mod element;
 mod mask_pattern;
+mod mode;
+mod rope_ext;
 mod state;
 mod text_input;
 mod text_wrapper;
 
 pub(crate) mod clear_button;
 
-#[allow(ambiguous_glob_reexports)]
 pub use state::*;
 pub use text_input::*;

crates/ui/src/input/mode.rs

@@ -0,0 +1,129 @@
+use gpui::SharedString;
+
+use super::text_wrapper::TextWrapper;
+
+#[derive(Debug, Copy, Clone)]
+pub struct TabSize {
+    /// Default is 2
+    pub tab_size: usize,
+    /// Set true to use `\t` as tab indent, default is false
+    pub hard_tabs: bool,
+}
+
+impl Default for TabSize {
+    fn default() -> Self {
+        Self {
+            tab_size: 2,
+            hard_tabs: false,
+        }
+    }
+}
+
+impl TabSize {
+    pub(super) fn to_string(self) -> SharedString {
+        if self.hard_tabs {
+            "\t".into()
+        } else {
+            " ".repeat(self.tab_size).into()
+        }
+    }
+}
+
+#[derive(Default, Clone)]
+pub enum InputMode {
+    #[default]
+    SingleLine,
+    MultiLine {
+        tab: TabSize,
+        rows: usize,
+    },
+    AutoGrow {
+        rows: usize,
+        min_rows: usize,
+        max_rows: usize,
+    },
+}
+
+#[allow(unused)]
+impl InputMode {
+    #[inline]
+    pub(super) fn is_single_line(&self) -> bool {
+        matches!(self, InputMode::SingleLine)
+    }
+
+    #[inline]
+    pub(super) fn is_auto_grow(&self) -> bool {
+        matches!(self, InputMode::AutoGrow { .. })
+    }
+
+    #[inline]
+    pub(super) fn is_multi_line(&self) -> bool {
+        matches!(
+            self,
+            InputMode::MultiLine { .. } | InputMode::AutoGrow { .. }
+        )
+    }
+
+    pub(super) fn set_rows(&mut self, new_rows: usize) {
+        match self {
+            InputMode::MultiLine { rows, .. } => {
+                *rows = new_rows;
+            }
+            InputMode::AutoGrow {
+                rows,
+                min_rows,
+                max_rows,
+            } => {
+                *rows = new_rows.clamp(*min_rows, *max_rows);
+            }
+            _ => {}
+        }
+    }
+
+    pub(super) fn update_auto_grow(&mut self, text_wrapper: &TextWrapper) {
+        if self.is_single_line() {
+            return;
+        }
+
+        let wrapped_lines = text_wrapper.len();
+        self.set_rows(wrapped_lines);
+    }
+
+    /// At least 1 row be return.
+    pub(super) fn rows(&self) -> usize {
+        match self {
+            InputMode::MultiLine { rows, .. } => *rows,
+            InputMode::AutoGrow { rows, .. } => *rows,
+            _ => 1,
+        }
+        .max(1)
+    }
+
+    /// At least 1 row be return.
+    #[allow(unused)]
+    pub(super) fn min_rows(&self) -> usize {
+        match self {
+            InputMode::MultiLine { .. } => 1,
+            InputMode::AutoGrow { min_rows, .. } => *min_rows,
+            _ => 1,
+        }
+        .max(1)
+    }
+
+    #[allow(unused)]
+    pub(super) fn max_rows(&self) -> usize {
+        match self {
+            InputMode::MultiLine { .. } => usize::MAX,
+            InputMode::AutoGrow { max_rows, .. } => *max_rows,
+            _ => 1,
+        }
+    }
+
+    #[inline]
+    pub(super) fn tab_size(&self) -> Option<&TabSize> {
+        match self {
+            InputMode::MultiLine { tab, .. } => Some(tab),
+            _ => None,
+        }
+    }
+}

crates/ui/src/input/rope_ext.rs

@@ -0,0 +1,207 @@
+use std::ops::Range;
+
+use rope::{Point, Rope};
+
+use super::cursor::Position;
+
+/// An extension trait for `Rope` to provide additional utility methods.
+pub trait RopeExt {
+    /// Get the line at the given row (0-based) index, including the `\r` at the end, but not `\n`.
+    ///
+    /// Return empty rope if the row (0-based) is out of bounds.
+    fn line(&self, row: usize) -> Rope;
+
+    /// Start offset of the line at the given row (0-based) index.
+    fn line_start_offset(&self, row: usize) -> usize;
+
+    /// Line the end offset (including `\n`) of the line at the given row (0-based) index.
+    ///
+    /// Return the end of the rope if the row is out of bounds.
+    fn line_end_offset(&self, row: usize) -> usize;
+
+    /// Return the number of lines in the rope.
+    fn lines_len(&self) -> usize;
+
+    /// Return the lines iterator.
+    ///
+    /// Each line is including the `\r` at the end, but not `\n`.
+    fn lines(&self) -> RopeLines;
+
+    /// Check is equal to another rope.
+    fn eq(&self, other: &Rope) -> bool;
+
+    /// Total number of characters in the rope.
+    fn chars_count(&self) -> usize;
+
+    /// Get char at the given offset (byte).
+    ///
+    /// If the offset is in the middle of a multi-byte character will panic.
+    ///
+    /// If the offset is out of bounds, return None.
+    fn char_at(&self, offset: usize) -> Option<char>;
+
+    /// Get the byte offset from the given line, column [`Position`] (0-based).
+    fn position_to_offset(&self, line_col: &Position) -> usize;
+
+    /// Get the line, column [`Position`] (0-based) from the given byte offset.
+    fn offset_to_position(&self, offset: usize) -> Position;
+
+    /// Get the word byte range at the given offset (byte).
+    fn word_range(&self, offset: usize) -> Option<Range<usize>>;
+
+    /// Get word at the given offset (byte).
+    #[allow(dead_code)]
+    fn word_at(&self, offset: usize) -> String;
+}
+
+/// An iterator over the lines of a `Rope`.
+pub struct RopeLines {
+    row: usize,
+    end_row: usize,
+    rope: Rope,
+}
+
+impl RopeLines {
+    /// Create a new `RopeLines` iterator.
+    pub fn new(rope: Rope) -> Self {
+        let end_row = rope.lines_len();
+        Self {
+            row: 0,
+            end_row,
+            rope,
+        }
+    }
+}
+
+impl Iterator for RopeLines {
+    type Item = Rope;
+
+    #[inline]
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.row >= self.end_row {
+            return None;
+        }
+
+        let line = self.rope.line(self.row);
+        self.row += 1;
+        Some(line)
+    }
+
+    #[inline]
+    fn nth(&mut self, n: usize) -> Option<Self::Item> {
+        self.row = self.row.saturating_add(n);
+        self.next()
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.end_row - self.row;
+        (len, Some(len))
+    }
+}
+
+impl std::iter::ExactSizeIterator for RopeLines {}
+impl std::iter::FusedIterator for RopeLines {}
+
+impl RopeExt for Rope {
+    fn line(&self, row: usize) -> Rope {
+        let start = self.line_start_offset(row);
+        let end = start + self.line_len(row as u32) as usize;
+        self.slice(start..end)
+    }
+
+    fn line_start_offset(&self, row: usize) -> usize {
+        let row = row as u32;
+        self.point_to_offset(Point::new(row, 0))
+    }
+
+    fn position_to_offset(&self, pos: &Position) -> usize {
+        let line = self.line(pos.line as usize);
+        self.line_start_offset(pos.line as usize)
+            + line
+                .chars()
+                .take(pos.character as usize)
+                .map(|c| c.len_utf8())
+                .sum::<usize>()
+    }
+
+    fn offset_to_position(&self, offset: usize) -> Position {
+        let point = self.offset_to_point(offset);
+        let line = self.line(point.row as usize);
+        let column = line.clip_offset(point.column as usize, sum_tree::Bias::Left);
+        let character = line.slice(0..column).chars().count();
+        Position::new(point.row, character as u32)
+    }
+
+    fn line_end_offset(&self, row: usize) -> usize {
+        if row > self.max_point().row as usize {
+            return self.len();
+        }
+
+        self.line_start_offset(row) + self.line_len(row as u32) as usize
+    }
+
+    fn lines_len(&self) -> usize {
+        self.max_point().row as usize + 1
+    }
+
+    fn lines(&self) -> RopeLines {
+        RopeLines::new(self.clone())
+    }
+
+    fn eq(&self, other: &Rope) -> bool {
+        self.summary() == other.summary()
+    }
+
+    fn chars_count(&self) -> usize {
+        self.chars().count()
+    }
+
+    fn char_at(&self, offset: usize) -> Option<char> {
+        if offset > self.len() {
+            return None;
+        }
+
+        let offset = self.clip_offset(offset, sum_tree::Bias::Left);
+        self.slice(offset..self.len()).chars().next()
+    }
+
+    fn word_range(&self, offset: usize) -> Option<Range<usize>> {
+        if offset >= self.len() {
+            return None;
+        }
+
+        let offset = self.clip_offset(offset, sum_tree::Bias::Left);
+
+        let mut left = String::new();
+        for c in self.reversed_chars_at(offset) {
+            if c.is_alphanumeric() || c == '_' {
+                left.insert(0, c);
+            } else {
+                break;
+            }
+        }
+        let start = offset.saturating_sub(left.len());
+
+        let right = self
+            .chars_at(offset)
+            .take_while(|c| c.is_alphanumeric() || *c == '_')
+            .collect::<String>();
+
+        let end = offset + right.len();
+
+        if start == end {
+            None
+        } else {
+            Some(start..end)
+        }
+    }
+
+    fn word_at(&self, offset: usize) -> String {
+        if let Some(range) = self.word_range(offset) {
+            self.slice(range).to_string()
+        } else {
+            String::new()
+        }
+    }
+}

crates/ui/src/input/text_input.rs

@@ -6,11 +6,10 @@ use gpui::{
 };
 use theme::ActiveTheme;
 
-use super::InputState;
+use super::clear_button::clear_button;
-use crate::button::{Button, ButtonVariants as _};
+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, _| {
+        self.state.update(cx, |state, cx| {
-            state.mode.set_height(self.height);
+            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)
+                this.bg(bg).rounded(cx.theme().radius)
-                    .rounded(cx.theme().radius)
-                    .when(focused, |this| this.border_color(cx.theme().ring))
             })
-            .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),
+                )
+            })
     }
 }

crates/ui/src/input/text_wrapper.rs

@@ -1,99 +1,215 @@
-use std::ops::Range;
+use std::ops::Range;
-
+
-use gpui::{App, Font, LineFragment, Pixels, SharedString};
+use gpui::{App, Font, LineFragment, Pixels};
-
+use rope::Rope;
-#[allow(unused)]
+
-pub(super) struct LineWrap {
+use super::rope_ext::RopeExt;
-    /// The number of soft wrapped lines of this line (Not include first line.)
+
-    pub(super) wrap_lines: usize,
+/// A line with soft wrapped lines info.
-    /// The range of the line text in the entire text.
+#[derive(Clone)]
-    pub(super) range: Range<usize>,
+pub(super) struct LineItem {
-}
+    /// The original line text.
-
+    line: Rope,
-impl LineWrap {
+    /// The soft wrapped lines relative byte range (0..line.len) of this line (Include first line).
-    pub(super) fn height(&self, line_height: Pixels) -> Pixels {
+    ///
-        line_height * (self.wrap_lines + 1)
+    /// 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>>,
-/// 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
+impl LineItem {
-pub(super) struct TextWrapper {
+    /// Get the bytes length of this line.
-    pub(super) text: SharedString,
+    #[inline]
-    /// The wrapped lines, value is start and end index of the line (by split \n).
+    pub(super) fn len(&self) -> usize {
-    pub(super) wrapped_lines: Vec<Range<usize>>,
+        self.line.len()
-    /// The lines by split \n
+    }
-    pub(super) lines: Vec<LineWrap>,
+
-    pub(super) font: Font,
+    /// Get number of soft wrapped lines of this line (include the first line).
-    pub(super) font_size: Pixels,
+    #[inline]
-    /// If is none, it means the text is not wrapped
+    pub(super) fn lines_len(&self) -> usize {
-    pub(super) wrap_width: Option<Pixels>,
+        self.wrapped_lines.len()
-}
+    }
-
+
-#[allow(unused)]
+    /// Get the height of this line item with given line height.
-impl TextWrapper {
+    pub(super) fn height(&self, line_height: Pixels) -> Pixels {
-    pub(super) fn new(font: Font, font_size: Pixels, wrap_width: Option<Pixels>) -> Self {
+        self.lines_len() as f32 * line_height
-        Self {
+    }
-            text: SharedString::default(),
+}
-            font,
+
-            font_size,
+/// Used to prepare the text with soft wrap to be get lines to displayed in the Editor.
-            wrap_width,
+///
-            wrapped_lines: Vec::new(),
+/// After use lines to calculate the scroll size of the Editor.
-            lines: Vec::new(),
+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,
-    pub(super) fn set_wrap_width(&mut self, wrap_width: Option<Pixels>, cx: &mut App) {
+    font: Font,
-        self.wrap_width = wrap_width;
+    font_size: Pixels,
-        self.update(&self.text.clone(), true, cx);
+    /// If is none, it means the text is not wrapped
-    }
+    wrap_width: Option<Pixels>,
-
+    /// The lines by split \n
-    pub(super) fn set_font(&mut self, font: Font, font_size: Pixels, cx: &mut App) {
+    pub(super) lines: Vec<LineItem>,
-        self.font = font;
+}
-        self.font_size = font_size;
+
-        self.update(&self.text.clone(), true, cx);
+#[allow(unused)]
-    }
+impl TextWrapper {
-
+    pub(super) fn new(font: Font, font_size: Pixels, wrap_width: Option<Pixels>) -> Self {
-    pub(super) fn update(&mut self, text: &SharedString, force: bool, cx: &mut App) {
+        Self {
-        if &self.text == text && !force {
+            text: Rope::new(),
-            return;
+            font,
-        }
+            font_size,
-
+            wrap_width,
-        let mut wrapped_lines = vec![];
+            soft_lines: 0,
-        let mut lines = vec![];
+            lines: Vec::new(),
-        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);
+    #[inline]
-
+    pub(super) fn set_default_text(&mut self, text: &Rope) {
-        let mut prev_line_ix = 0;
+        self.text = text.clone();
-        for line in text.split('\n') {
+    }
-            let mut line_wraps = vec![];
+
-            let mut prev_boundary_ix = 0;
+    /// Get the total number of lines including wrapped lines.
-
+    #[inline]
-            // Here only have wrapped line, if there is no wrap meet, the `line_wraps` result will empty.
+    pub(super) fn len(&self) -> usize {
-            for boundary in line_wrapper.wrap_line(&[LineFragment::text(line)], wrap_width) {
+        self.soft_lines
-                line_wraps.push(prev_boundary_ix..boundary.ix);
+    }
-                prev_boundary_ix = boundary.ix;
+
-            }
+    /// Get the line item by row index.
-
+    #[inline]
-            lines.push(LineWrap {
+    pub(super) fn line(&self, row: usize) -> Option<&LineItem> {
-                wrap_lines: line_wraps.len(),
+        self.lines.get(row)
-                range: prev_line_ix..prev_line_ix + line.len(),
+    }
-            });
+
-
+    pub(super) fn set_wrap_width(&mut self, wrap_width: Option<Pixels>, cx: &mut App) {
-            wrapped_lines.extend(line_wraps);
+        if wrap_width == self.wrap_width {
-            // Reset of the line
+            return;
-            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());
+
-            }
+        self.wrap_width = wrap_width;
-
+        self.update_all(&self.text.clone(), true, cx);
-            prev_line_ix += line.len() + 1;
+    }
-        }
+
-
+    pub(super) fn set_font(&mut self, font: Font, font_size: Pixels, cx: &mut App) {
-        self.text = text.clone();
+        if self.font.eq(&font) && self.font_size == font_size {
-        self.wrapped_lines = wrapped_lines;
+            return;
-        self.lines = lines;
+        }
-    }
+
-}
+        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);
+    }
+}

crates/ui/src/list/list.rs

@@ -299,14 +299,16 @@ where
 
     fn on_query_input_event(
         &mut self,
-        _: &Entity<InputState>,
+        state: &Entity<InputState>,
         event: &InputEvent,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
         match event {
-            InputEvent::Change(text) => {
+            InputEvent::Change => {
+                let text = state.read(cx).value();
                 let text = text.trim().to_string();
+
                 if Some(&text) == self.last_query.as_ref() {
                     return;
                 }
@@ -347,7 +349,7 @@ where
         }
     }
 
-    fn set_querying(&mut self, querying: bool, _: &mut Window, cx: &mut Context<Self>) {
+    fn set_querying(&mut self, querying: bool, _window: &mut Window, cx: &mut Context<Self>) {
         self.querying = querying;
         if let Some(input) = &self.query_input {
             input.update(cx, |input, cx| input.set_loading(querying, cx))

crates/ui/src/resizable/panel.rs

@@ -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()

crates/ui/src/root.rs

@@ -194,7 +194,7 @@ impl Root {
         }
     }
 
-    // Render Notification layer.
+    /// Render Notification layer.
     pub fn render_notification_layer(
         window: &mut Window,
         cx: &mut App,

crates/ui/src/text.rs

@@ -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}"));

locales/app.yml

@@ -49,6 +49,10 @@ common:
     en: "Relay URL is not valid."
   recommended:
     en: "Recommended:"
+  resend:
+    en: "Resend"
+  seen_on:
+    en: "Seen on"
 
 auto_update:
   updating:
@@ -58,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"
 
@@ -266,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:
@@ -309,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:
@@ -395,6 +399,14 @@ 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:

script/release

@@ -0,0 +1,79 @@
+#!/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"
+
+# Create git tag
+TAG_NAME="v$NEW_VERSION"
+COMMIT_MSG="Release version $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 to origin (both commits and tags)
+echo "Pushing to origin..."
+if git push origin master && git push origin "$TAG_NAME"; then
+    echo "✓ Successfully pushed to origin"
+    echo "✓ Release $NEW_VERSION completed successfully!"
+else
+    echo "Error: Failed to push to origin"
+    exit 1
+fi