feat: add relay tracking for gift wrap events (#21)

Reviewed-on: #21
Co-authored-by: Ren Amamiya <reya@lume.nu>
Co-committed-by: Ren Amamiya <reya@lume.nu>

Cargo.lock

@@ -238,7 +238,7 @@ dependencies = [
 
 [[package]]
 name = "assets"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "gpui",
@@ -535,7 +535,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "auto_update"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",
@@ -986,7 +986,7 @@ dependencies = [
 
 [[package]]
 name = "chat"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",
@@ -1009,7 +1009,7 @@ dependencies = [
 
 [[package]]
 name = "chat_ui"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "chat",
@@ -1240,7 +1240,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "bech32",
@@ -1325,7 +1325,7 @@ dependencies = [
 
 [[package]]
 name = "coop"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "assets",
@@ -1668,7 +1668,7 @@ dependencies = [
 
 [[package]]
 name = "device"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",
@@ -4823,7 +4823,7 @@ dependencies = [
 
 [[package]]
 name = "person"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",
@@ -5560,7 +5560,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "relay_auth"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",
@@ -6243,7 +6243,7 @@ dependencies = [
 
 [[package]]
 name = "settings"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",
@@ -6512,7 +6512,7 @@ dependencies = [
 
 [[package]]
 name = "state"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",
@@ -6851,7 +6851,7 @@ dependencies = [
 
 [[package]]
 name = "theme"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "gpui",
@@ -6988,7 +6988,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "title_bar"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",
@@ -7359,7 +7359,7 @@ dependencies = [
 
 [[package]]
 name = "ui"
-version = "1.0.0-beta"
+version = "1.0.0-beta1"
 dependencies = [
  "anyhow",
  "common",

Cargo.toml

@@ -5,7 +5,7 @@ default-members = ["crates/coop"]
 
 [workspace.package]
 version = "1.0.0-beta1"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [workspace.dependencies]

crates/chat/src/lib.rs

@@ -15,6 +15,7 @@ use gpui::{
 };
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
+use smol::lock::RwLock;
 use state::{DEVICE_GIFTWRAP, NostrRegistry, StateEvent, TIMEOUT, USER_GIFTWRAP};
 
 mod message;
@@ -60,9 +61,12 @@ enum Signal {
 /// Chat Registry
 #[derive(Debug)]
 pub struct ChatRegistry {
-    /// Collection of all chat rooms
+    /// Chat rooms
     rooms: Vec<Entity<Room>>,
 
+    /// Tracking events seen on which relays in the current session
+    seens: Arc<RwLock<HashMap<EventId, HashSet<RelayUrl>>>>,
+
     /// Tracking the status of unwrapping gift wrap events.
     tracking_flag: Arc<AtomicBool>,
 
@@ -101,12 +105,17 @@ impl ChatRegistry {
         subscriptions.push(
             // Subscribe to the signer event
             cx.subscribe(&nostr, |this, _state, event, cx| {
-                if let StateEvent::SignerSet = event {
+                match event {
+                    StateEvent::SignerSet => {
                         this.reset(cx);
                         this.get_rooms(cx);
+                    }
+                    StateEvent::RelayConnected => {
                         this.get_contact_list(cx);
                         this.get_messages(cx)
                     }
+                    _ => {}
+                };
             }),
         );
 
@@ -119,6 +128,7 @@ impl ChatRegistry {
 
         Self {
             rooms: vec![],
+            seens: Arc::new(RwLock::new(HashMap::default())),
             tracking_flag: Arc::new(AtomicBool::new(false)),
             signal_rx: rx,
             signal_tx: tx,
@@ -133,6 +143,7 @@ impl ChatRegistry {
         let client = nostr.read(cx).client();
         let signer = nostr.read(cx).signer();
         let status = self.tracking_flag.clone();
+        let seens = self.seens.clone();
 
         let initialized_at = Timestamp::now();
         let sub_id1 = SubscriptionId::new(DEVICE_GIFTWRAP);
@@ -148,20 +159,26 @@ impl ChatRegistry {
             let mut processed_events = HashSet::new();
 
             while let Some(notification) = notifications.next().await {
-                let ClientNotification::Message { message, .. } = notification else {
+                let ClientNotification::Message { message, relay_url } = notification else {
                     // Skip non-message notifications
                     continue;
                 };
 
                 match message {
                     RelayMessage::Event { event, .. } => {
+                        // Keep track of which relays have seen this event
+                        {
+                            let mut seens = seens.write().await;
+                            seens.entry(event.id).or_default().insert(relay_url);
+                        }
+
+                        // De-duplicate events by their ID
                         if !processed_events.insert(event.id) {
-                            // Skip if the event has already been processed
                             continue;
                         }
 
-                        if event.kind != Kind::GiftWrap {
                         // Skip non-gift wrap events
+                        if event.kind != Kind::GiftWrap {
                             continue;
                         }
 
@@ -169,26 +186,21 @@ impl ChatRegistry {
                         match extract_rumor(&client, &device_signer, event.as_ref()).await {
                             Ok(rumor) => {
                                 if rumor.tags.is_empty() {
-                                    let error: SharedString =
-                                        "Message doesn't belong to any rooms".into();
+                                    let error: SharedString = "No room for message".into();
                                     tx.send_async(Signal::Error(error)).await?;
                                 }
 
-                                match rumor.created_at >= initialized_at {
-                                    true => {
+                                if rumor.created_at >= initialized_at {
                                     let new_message = NewMessage::new(event.id, rumor);
                                     let signal = Signal::Message(new_message);
 
                                     tx.send_async(signal).await?;
-                                    }
-                                    false => {
+                                } else {
                                     status.store(true, Ordering::Release);
                                 }
                             }
-                            }
                             Err(e) => {
-                                let error: SharedString =
-                                    format!("Failed to unwrap the gift wrap event: {e}").into();
+                                let error: SharedString = format!("Failed to unwrap: {e}").into();
                                 tx.send_async(Signal::Error(error)).await?;
                             }
                         }
@@ -325,6 +337,7 @@ impl ChatRegistry {
 
             while let Some((_url, res)) = stream.next().await {
                 if let Ok(event) = res {
+                    log::debug!("Got event: {:?}", event);
                     let urls: Vec<RelayUrl> = nip17::extract_owned_relay_list(event).collect();
                     return Ok(urls);
                 }
@@ -399,6 +412,24 @@ impl ChatRegistry {
             .count()
     }
 
+    /// Count the number of messages seen by a given relay.
+    pub fn count_messages(&self, relay_url: &RelayUrl) -> usize {
+        self.seens
+            .read_blocking()
+            .values()
+            .filter(|seen| seen.contains(relay_url))
+            .count()
+    }
+
+    /// Get the relays that have seen a given message.
+    pub fn seen_on(&self, id: &EventId) -> HashSet<RelayUrl> {
+        self.seens
+            .read_blocking()
+            .get(id)
+            .cloned()
+            .unwrap_or_default()
+    }
+
     /// Add a new room to the start of list.
     pub fn add_room<I>(&mut self, room: I, cx: &mut Context<Self>)
     where
@@ -570,12 +601,12 @@ impl ChatRegistry {
 
             // Process each event and group by room hash
             for raw in events.into_iter() {
-                if let Ok(rumor) = UnsignedEvent::from_json(&raw.content) {
-                    if rumor.tags.public_keys().peekable().peek().is_some() {
+                if let Ok(rumor) = UnsignedEvent::from_json(&raw.content)
+                    && rumor.tags.public_keys().peekable().peek().is_some()
+                {
                     grouped.entry(rumor.uniq_id()).or_default().push(rumor);
                 }
             }
-            }
 
             for (_id, mut messages) in grouped.into_iter() {
                 messages.sort_by_key(|m| Reverse(m.created_at));
@@ -619,13 +650,12 @@ impl ChatRegistry {
         match self.rooms.iter().find(|e| e.read(cx).id == message.room) {
             Some(room) => {
                 room.update(cx, |this, cx| {
-                    if this.kind == RoomKind::Request {
-                        if let Some(public_key) = signer.public_key() {
-                            if message.rumor.pubkey == public_key {
+                    if this.kind == RoomKind::Request
+                        && let Some(public_key) = signer.public_key()
+                        && message.rumor.pubkey == public_key
+                    {
                         this.set_ongoing(cx);
                     }
-                        }
-                    }
                     this.push_message(message, cx);
                 });
                 self.sort(cx);
@@ -682,11 +712,11 @@ async fn try_unwrap(
     gift_wrap: &Event,
 ) -> Result<UnwrappedGift, Error> {
     // Try with the device signer first
-    if let Some(signer) = device_signer {
-        if let Ok(unwrapped) = try_unwrap_with(gift_wrap, signer).await {
+    if let Some(signer) = device_signer
+        && let Ok(unwrapped) = try_unwrap_with(gift_wrap, signer).await
+    {
         return Ok(unwrapped);
     };
-    };
 
     // Try with the user's signer
     let user_signer = client.signer().context("Signer not found")?;

crates/chat_ui/src/actions.rs

@@ -10,7 +10,6 @@ pub enum Command {
     ChangeSubject(String),
     ChangeSigner(SignerKind),
     ToggleBackup,
-    Subject,
     Copy(PublicKey),
     Relays(PublicKey),
     Njump(PublicKey),

crates/chat_ui/src/lib.rs

@@ -154,6 +154,7 @@ impl ChatPanel {
 
         // Define all functions that will run after the current cycle
         cx.defer_in(window, |this, window, cx| {
+            this.connect(cx);
             this.handle_notifications(cx);
             this.subscribe_room_events(window, cx);
             this.get_messages(window, cx);
@@ -179,6 +180,14 @@ impl ChatPanel {
         }
     }
 
+    /// Get messaging relays and announcement for each member
+    fn connect(&mut self, cx: &mut Context<Self>) {
+        if let Some(room) = self.room.upgrade() {
+            let task = room.read(cx).connect(cx);
+            self.tasks.push(task);
+        }
+    }
+
     /// Handle nostr notifications
     fn handle_notifications(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
@@ -247,11 +256,13 @@ impl ChatPanel {
         }));
     }
 
+    /// Subscribe to room events
     fn subscribe_room_events(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(room) = self.room.upgrade() {
-            self.subscriptions.push(
-                // Subscribe to room events
-                cx.subscribe_in(&room, window, move |this, _room, event, window, cx| {
+            self.subscriptions.push(cx.subscribe_in(
+                &room,
+                window,
+                move |this, _room, event, window, cx| {
                     match event {
                         RoomEvent::Incoming(message) => {
                             this.insert_message(message, false, cx);
@@ -260,8 +271,8 @@ impl ChatPanel {
                             this.get_messages(window, cx);
                         }
                     };
-                }),
-            );
+                },
+            ));
         }
     }
 
@@ -475,11 +486,11 @@ impl ChatPanel {
     /// Get a message by its ID
     fn message(&self, id: &EventId) -> Option<&RenderedMessage> {
         self.messages.iter().find_map(|msg| {
-            if let Message::User(rendered) = msg {
-                if &rendered.id == id {
+            if let Message::User(rendered) = msg
+                && &rendered.id == id
+            {
                 return Some(rendered);
             }
-            }
             None
         })
     }
@@ -645,9 +656,6 @@ impl ChatPanel {
                     );
                 }
             }
-            Command::Subject => {
-                self.open_subject(window, cx);
-            }
             Command::Copy(public_key) => {
                 self.copy_author(public_key, cx);
             }
@@ -660,47 +668,6 @@ impl ChatPanel {
         }
     }
 
-    fn open_subject(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let subject_input = self.subject_input.clone();
-
-        window.open_modal(cx, move |this, _window, cx| {
-            let subject = subject_input.read(cx).value();
-
-            this.title("Change subject")
-                .show_close(true)
-                .confirm()
-                .child(
-                    v_flex()
-                        .gap_2()
-                        .child(
-                            v_flex()
-                                .gap_1p5()
-                                .child(
-                                    div()
-                                        .text_sm()
-                                        .text_color(cx.theme().text_muted)
-                                        .child(SharedString::from("Subject:")),
-                                )
-                                .child(TextInput::new(&subject_input).small()),
-                        )
-                        .child(
-                            div()
-                                .italic()
-                                .text_xs()
-                                .text_color(cx.theme().text_placeholder)
-                                .child(SharedString::from(
-                                    "Subject will be updated when you send a new message.",
-                                )),
-                        ),
-                )
-                .on_ok(move |_ev, window, cx| {
-                    window
-                        .dispatch_action(Box::new(Command::ChangeSubject(subject.to_string())), cx);
-                    true
-                })
-        });
-    }
-
     fn open_relays(&mut self, public_key: &PublicKey, window: &mut Window, cx: &mut Context<Self>) {
         let profile = self.profile(public_key, cx);
 

crates/coop/src/sidebar/entry.rs

@@ -148,8 +148,10 @@ impl RenderOnce for RoomEntry {
                 this.on_click(move |event, window, cx| {
                     handler(event, window, cx);
 
-                    if let Some(public_key) = public_key {
-                        if self.kind != Some(RoomKind::Ongoing) && screening {
+                    if let Some(public_key) = public_key
+                        && self.kind != Some(RoomKind::Ongoing)
+                        && screening
+                    {
                         let screening = screening::init(public_key, window, cx);
 
                         window.open_modal(cx, move |this, _window, _cx| {
@@ -168,7 +170,6 @@ impl RenderOnce for RoomEntry {
                                 })
                         });
                     }
-                    }
                 })
             })
     }

crates/coop/src/sidebar/mod.rs

@@ -366,7 +366,11 @@ impl Sidebar {
         self.new_requests = false;
     }
 
-    fn render_list_items(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
+    fn render_list_items(
+        &self,
+        range: Range<usize>,
+        cx: &Context<Self>,
+    ) -> Vec<impl IntoElement + use<>> {
         let chat = ChatRegistry::global(cx);
         let rooms = chat.read(cx).rooms(self.filter.read(cx), cx);
 
@@ -398,7 +402,11 @@ impl Sidebar {
     }
 
     /// Render the contact list
-    fn render_results(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
+    fn render_results(
+        &self,
+        range: Range<usize>,
+        cx: &Context<Self>,
+    ) -> Vec<impl IntoElement + use<>> {
         let persons = PersonRegistry::global(cx);
 
         // Get the contact list
@@ -431,7 +439,11 @@ impl Sidebar {
     }
 
     /// Render the contact list
-    fn render_contacts(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
+    fn render_contacts(
+        &self,
+        range: Range<usize>,
+        cx: &Context<Self>,
+    ) -> Vec<impl IntoElement + use<>> {
         let persons = PersonRegistry::global(cx);
 
         // Get the contact list
@@ -641,7 +653,7 @@ impl Render for Sidebar {
                                             uniform_list(
                                                 "rooms",
                                                 results.len(),
-                                                cx.processor(|this, range, _window, cx| {
+                                                cx.processor(move |this, range, _window, cx| {
                                                     this.render_results(range, cx)
                                                 }),
                                             )
@@ -668,7 +680,7 @@ impl Render for Sidebar {
                                             uniform_list(
                                                 "contacts",
                                                 contacts.len(),
-                                                cx.processor(move |this, range, _window, cx| {
+                                                cx.processor(|this, range, _window, cx| {
                                                     this.render_contacts(range, cx)
                                                 }),
                                             )

crates/coop/src/workspace.rs

@@ -27,9 +27,9 @@ use crate::dialogs::{accounts, settings};
 use crate::panels::{backup, contact_list, greeter, messaging_relays, profile, relay_list};
 use crate::sidebar;
 
+const PREPARE_MSG: &str = "Coop is preparing a new identity for you. This may take a moment...";
 const ENC_MSG: &str = "Encryption Key is a special key that used to encrypt and decrypt your messages. \
                        Your identity is completely decoupled from all encryption processes to protect your privacy.";
-
 const ENC_WARN: &str = "By resetting your encryption key, you will lose access to \
                         all your encrypted messages before. This action cannot be undone.";
 
@@ -37,6 +37,7 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<Workspace> {
     cx.new(|cx| Workspace::new(window, cx))
 }
 
+struct SignerNotifcation;
 struct RelayNotifcation;
 
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
@@ -107,21 +108,37 @@ impl Workspace {
             // Subscribe to the signer events
             cx.subscribe_in(&nostr, window, move |this, _state, event, window, cx| {
                 match event {
+                    StateEvent::Creating => {
+                        let note = Notification::new()
+                            .id::<SignerNotifcation>()
+                            .title("Preparing a new identity")
+                            .message(PREPARE_MSG)
+                            .autohide(false)
+                            .with_kind(NotificationKind::Info);
+
+                        window.push_notification(note, cx);
+                    }
                     StateEvent::Connecting => {
                         let note = Notification::new()
                             .id::<RelayNotifcation>()
-                            .message("Connecting to the bootstrap relay...")
-                            .with_kind(NotificationKind::Info)
-                            .icon(IconName::Relay);
+                            .message("Connecting to the bootstrap relays...")
+                            .with_kind(NotificationKind::Info);
 
                         window.push_notification(note, cx);
                     }
                     StateEvent::Connected => {
                         let note = Notification::new()
                             .id::<RelayNotifcation>()
-                            .message("Connected to the bootstrap relay")
-                            .with_kind(NotificationKind::Success)
-                            .icon(IconName::Relay);
+                            .message("Connected to the bootstrap relays")
+                            .with_kind(NotificationKind::Success);
+
+                        window.push_notification(note, cx);
+                    }
+                    StateEvent::FetchingRelayList => {
+                        let note = Notification::new()
+                            .id::<RelayNotifcation>()
+                            .message("Getting relay list...")
+                            .with_kind(NotificationKind::Info);
 
                         window.push_notification(note, cx);
                     }
@@ -136,6 +153,8 @@ impl Workspace {
                         this.set_center_layout(window, cx);
                         this.set_relay_connected(false, cx);
                         this.set_inbox_connected(false, cx);
+                        // Clear the signer notification
+                        window.clear_notification::<SignerNotifcation>(cx);
                     }
                     _ => {}
                 };
@@ -228,8 +247,9 @@ impl Workspace {
     where
         P: PanelView,
     {
-        if let Some(root) = window.root::<Root>().flatten() {
-            if let Ok(workspace) = root.read(cx).view().clone().downcast::<Self>() {
+        if let Some(root) = window.root::<Root>().flatten()
+            && let Ok(workspace) = root.read(cx).view().clone().downcast::<Self>()
+        {
             workspace.update(cx, |this, cx| {
                 this.dock.update(cx, |this, cx| {
                     this.add_panel(Arc::new(panel), placement, window, cx);
@@ -237,7 +257,6 @@ impl Workspace {
             });
         }
     }
-    }
 
     /// Get all panel ids
     fn panel_ids(&self, cx: &App) -> Vec<u64> {
@@ -582,7 +601,7 @@ impl Workspace {
         window.push_notification(note, cx);
     }
 
-    fn titlebar_left(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn titlebar_left(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
         let nostr = NostrRegistry::global(cx);
         let signer = nostr.read(cx).signer();
         let current_user = signer.public_key();
@@ -661,7 +680,7 @@ impl Workspace {
             })
     }
 
-    fn titlebar_right(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn titlebar_right(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
         let relay_connected = self.relay_connected;
         let inbox_connected = self.inbox_connected;
 
@@ -728,28 +747,49 @@ impl Workspace {
                     })
                     .when(inbox_connected, |this| this.indicator())
                     .dropdown_menu(move |this, _window, cx| {
+                        let chat = ChatRegistry::global(cx);
                         let persons = PersonRegistry::global(cx);
                         let profile = persons.read(cx).get(&public_key, cx);
 
-                        let urls: Vec<SharedString> = profile
+                        let urls: Vec<(SharedString, SharedString)> = profile
                             .messaging_relays()
                             .iter()
-                            .map(|url| SharedString::from(url.to_string()))
+                            .map(|url| {
+                                (
+                                    SharedString::from(url.to_string()),
+                                    chat.read(cx).count_messages(url).to_string().into(),
+                                )
+                            })
                             .collect();
 
                         // Header
                         let menu = this.min_w(px(260.)).label("Messaging Relays");
 
                         // Content
-                        let menu = urls.into_iter().fold(menu, |this, url| {
-                            this.item(PopupMenuItem::element(move |_window, _cx| {
+                        let menu = urls.into_iter().fold(menu, |this, (url, count)| {
+                            this.item(PopupMenuItem::element(move |_window, cx| {
                                 h_flex()
                                     .px_1()
                                     .w_full()
-                                    .gap_2()
                                     .text_sm()
-                                    .child(div().size_1p5().rounded_full().bg(gpui::green()))
-                                    .child(url.clone())
+                                    .justify_between()
+                                    .child(
+                                        h_flex()
+                                            .gap_2()
+                                            .child(
+                                                div()
+                                                    .size_1p5()
+                                                    .rounded_full()
+                                                    .bg(cx.theme().icon_accent),
+                                            )
+                                            .child(url.clone()),
+                                    )
+                                    .child(
+                                        div()
+                                            .text_xs()
+                                            .text_color(cx.theme().text_muted)
+                                            .child(count.clone()),
+                                    )
                             }))
                         });
 
@@ -802,8 +842,8 @@ impl Render for Workspace {
         let notification_layer = Root::render_notification_layer(window, cx);
 
         // Titlebar elements
-        let left = self.titlebar_left(window, cx).into_any_element();
-        let right = self.titlebar_right(window, cx).into_any_element();
+        let left = self.titlebar_left(cx).into_any_element();
+        let right = self.titlebar_right(cx).into_any_element();
 
         // Update title bar children
         self.titlebar.update(cx, |this, _cx| {

crates/device/src/lib.rs

@@ -6,11 +6,13 @@ use std::time::Duration;
 use anyhow::{Context as AnyhowContext, Error, anyhow};
 use gpui::{
     App, AppContext, Context, Entity, EventEmitter, Global, IntoElement, ParentElement,
-    SharedString, Styled, Task, Window, div, relative,
+    SharedString, Styled, Subscription, Task, Window, div, relative,
 };
 use nostr_sdk::prelude::*;
 use person::PersonRegistry;
-use state::{Announcement, DEVICE_GIFTWRAP, DeviceState, NostrRegistry, TIMEOUT, app_name};
+use state::{
+    Announcement, DEVICE_GIFTWRAP, DeviceState, NostrRegistry, StateEvent, TIMEOUT, app_name,
+};
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
@@ -48,6 +50,9 @@ pub struct DeviceRegistry {
 
     /// Async tasks
     tasks: Vec<Task<Result<(), Error>>>,
+
+    /// Event subscription
+    _subscription: Option<Subscription>,
 }
 
 impl EventEmitter<DeviceEvent> for DeviceRegistry {}
@@ -65,16 +70,31 @@ impl DeviceRegistry {
 
     /// Create a new device registry instance
     fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
         let state = DeviceState::default();
 
+        let subscription = Some(cx.subscribe_in(
+            &nostr,
+            window,
+            |this, _state, event, _window, cx| match event {
+                StateEvent::SignerSet => {
+                    this.reset(cx);
+                }
+                StateEvent::RelayConnected => {
+                    this.get_announcement(cx);
+                }
+                _ => {}
+            },
+        ));
+
         cx.defer_in(window, |this, window, cx| {
             this.handle_notifications(window, cx);
-            this.get_announcement(cx);
         });
 
         Self {
             state,
             tasks: vec![],
+            _subscription: subscription,
         }
     }
 
@@ -254,9 +274,6 @@ impl DeviceRegistry {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        // Reset state before fetching announcement
-        self.reset(cx);
-
         let task: Task<Result<Event, Error>> = cx.background_spawn(async move {
             let signer = client.signer().context("Signer not found")?;
             let public_key = signer.get_public_key().await?;
@@ -358,7 +375,6 @@ impl DeviceRegistry {
                 if keys.public_key() != device_pubkey {
                     return Err(anyhow!("Key mismatch"));
                 };
-
                 Ok(keys)
             } else {
                 Err(anyhow!("Key not found"))
@@ -728,11 +744,11 @@ struct DeviceNotification;
 
 /// Verify the author of an event
 async fn verify_author(client: &Client, event: &Event) -> bool {
-    if let Some(signer) = client.signer() {
-        if let Ok(public_key) = signer.get_public_key().await {
+    if let Some(signer) = client.signer()
+        && let Ok(public_key) = signer.get_public_key().await
+    {
         return public_key == event.pubkey;
     }
-    }
     false
 }
 

crates/person/src/person.rs

@@ -123,17 +123,17 @@ impl Person {
 
     /// Get profile name
     pub fn name(&self) -> SharedString {
-        if let Some(display_name) = self.metadata().display_name.as_ref() {
-            if !display_name.is_empty() {
+        if let Some(display_name) = self.metadata().display_name.as_ref()
+            && !display_name.is_empty()
+        {
             return SharedString::from(display_name);
         }
-        }
 
-        if let Some(name) = self.metadata().name.as_ref() {
-            if !name.is_empty() {
+        if let Some(name) = self.metadata().name.as_ref()
+            && !name.is_empty()
+        {
             return SharedString::from(name);
         }
-        }
 
         SharedString::from(shorten_pubkey(self.public_key(), 4))
     }

crates/relay_auth/src/lib.rs

@@ -17,7 +17,7 @@ use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::notification::Notification;
-use ui::{Disableable, IconName, Sizable, WindowExtension, v_flex};
+use ui::{Disableable, IconName, Sizable, StyledExt, WindowExtension, v_flex};
 
 const AUTH_MESSAGE: &str =
     "Approve the authentication request to allow Coop to continue sending or receiving events.";
@@ -344,8 +344,9 @@ impl RelayAuth {
                             .px_1p5()
                             .rounded_sm()
                             .text_xs()
+                            .font_semibold()
                             .bg(cx.theme().elevated_surface_background)
-                            .text_color(cx.theme().text_accent)
+                            .text_color(cx.theme().text)
                             .child(url.clone()),
                     )
                     .into_any_element()

crates/state/src/lib.rs

@@ -44,10 +44,14 @@ impl Global for GlobalNostrRegistry {}
 /// Signer event.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum StateEvent {
+    /// Creating the signer
+    Creating,
     /// Connecting to the bootstrapping relay
     Connecting,
     /// Connected to the bootstrapping relay
     Connected,
+    /// Fetching the relay list
+    FetchingRelayList,
     /// User has not set up NIP-65 relays
     RelayNotConfigured,
     /// Connected to NIP-65 relays
@@ -58,6 +62,15 @@ pub enum StateEvent {
     Error(SharedString),
 }
 
+impl StateEvent {
+    pub fn error<T>(error: T) -> Self
+    where
+        T: Into<SharedString>,
+    {
+        Self::Error(error.into())
+    }
+}
+
 /// Nostr Registry
 #[derive(Debug)]
 pub struct NostrRegistry {
@@ -114,7 +127,7 @@ impl NostrRegistry {
             .gossip(gossip)
             .automatic_authentication(false)
             .verify_subscriptions(false)
-            .connect_timeout(Duration::from_secs(TIMEOUT))
+            .connect_timeout(Duration::from_secs(10))
             .sleep_when_idle(SleepWhenIdle::Enabled {
                 timeout: Duration::from_secs(600),
             });
@@ -204,7 +217,7 @@ impl NostrRegistry {
                 }
                 Err(e) => {
                     this.update(cx, |_this, cx| {
-                        cx.emit(StateEvent::Error(SharedString::from(e.to_string())));
+                        cx.emit(StateEvent::error(e.to_string()));
                     })
                     .ok();
                 }
@@ -269,7 +282,7 @@ impl NostrRegistry {
                 },
                 Err(e) => {
                     this.update(cx, |_this, cx| {
-                        cx.emit(StateEvent::Error(SharedString::from(e.to_string())));
+                        cx.emit(StateEvent::error(e.to_string()));
                     })
                     .ok();
                 }
@@ -289,6 +302,9 @@ impl NostrRegistry {
         // Create a write credential task
         let write_credential = cx.write_credentials(&username, &username, &secret);
 
+        // Emit creating event
+        cx.emit(StateEvent::Creating);
+
         // Run async tasks in background
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             let signer = async_keys.into_nostr_signer();
@@ -301,7 +317,7 @@ impl NostrRegistry {
             client
                 .send_event(&event)
                 .to(BOOTSTRAP_RELAYS)
-                .ok_timeout(Duration::from_secs(TIMEOUT))
+                .ack_policy(AckPolicy::none())
                 .await?;
 
             // Construct the default metadata
@@ -355,7 +371,7 @@ impl NostrRegistry {
                 }
                 Err(e) => {
                     this.update(cx, |_this, cx| {
-                        cx.emit(StateEvent::Error(SharedString::from(e.to_string())));
+                        cx.emit(StateEvent::error(e.to_string()));
                     })
                     .ok();
                 }
@@ -453,7 +469,7 @@ impl NostrRegistry {
                 }
                 Err(e) => {
                     this.update(cx, |_this, cx| {
-                        cx.emit(StateEvent::Error(SharedString::from(e.to_string())));
+                        cx.emit(StateEvent::error(e.to_string()));
                     })
                     .ok();
                 }
@@ -500,7 +516,7 @@ impl NostrRegistry {
                 }
                 Err(e) => {
                     this.update(cx, |_this, cx| {
-                        cx.emit(StateEvent::Error(SharedString::from(e.to_string())));
+                        cx.emit(StateEvent::error(e.to_string()));
                     })
                     .ok();
                 }
@@ -545,7 +561,7 @@ impl NostrRegistry {
                         }
                         Err(e) => {
                             this.update(cx, |_this, cx| {
-                                cx.emit(StateEvent::Error(SharedString::from(e.to_string())));
+                                cx.emit(StateEvent::error(e.to_string()));
                             })
                             .ok();
                         }
@@ -553,7 +569,7 @@ impl NostrRegistry {
                 }
                 Err(e) => {
                     this.update(cx, |_this, cx| {
-                        cx.emit(StateEvent::Error(SharedString::from(e.to_string())));
+                        cx.emit(StateEvent::error(e.to_string()));
                     })
                     .ok();
                 }
@@ -561,9 +577,72 @@ impl NostrRegistry {
         }));
     }
 
+    /// Ensure the relay list is fetched for the given public key
     pub fn ensure_relay_list(&mut self, public_key: &PublicKey, cx: &mut Context<Self>) {
         let task = self.get_event(public_key, Kind::RelayList, cx);
 
+        // Emit a fetching event before starting the task
+        cx.emit(StateEvent::FetchingRelayList);
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(event) => {
+                    this.update(cx, |this, cx| {
+                        this.ensure_connection(&event, cx);
+                    })
+                    .ok();
+                }
+                Err(e) => {
+                    this.update(cx, |_this, cx| {
+                        cx.emit(StateEvent::RelayNotConfigured);
+                        cx.emit(StateEvent::error(e.to_string()));
+                    })
+                    .ok();
+                }
+            };
+        }));
+    }
+
+    /// Ensure that the user is connected to the relay specified in the NIP-65 event.
+    pub fn ensure_connection(&mut self, event: &Event, cx: &mut Context<Self>) {
+        let client = self.client();
+        // Extract the relay list from the event
+        let relays: Vec<(RelayUrl, Option<RelayMetadata>)> = nip65::extract_relay_list(event)
+            .map(|(url, metadata)| (url.to_owned(), metadata.to_owned()))
+            .collect();
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            for (url, metadata) in relays.into_iter() {
+                match metadata {
+                    Some(RelayMetadata::Read) => {
+                        client
+                            .add_relay(url)
+                            .capabilities(RelayCapabilities::READ)
+                            .connect_timeout(Duration::from_secs(TIMEOUT))
+                            .and_connect()
+                            .await?;
+                    }
+                    Some(RelayMetadata::Write) => {
+                        client
+                            .add_relay(url)
+                            .capabilities(RelayCapabilities::WRITE)
+                            .connect_timeout(Duration::from_secs(TIMEOUT))
+                            .and_connect()
+                            .await?;
+                    }
+                    None => {
+                        client
+                            .add_relay(url)
+                            .capabilities(RelayCapabilities::NONE)
+                            .connect_timeout(Duration::from_secs(TIMEOUT))
+                            .and_connect()
+                            .await?;
+                    }
+                }
+            }
+            Ok(())
+        });
+
         self.tasks.push(cx.spawn(async move |this, cx| {
             match task.await {
                 Ok(_) => {
@@ -575,7 +654,7 @@ impl NostrRegistry {
                 Err(e) => {
                     this.update(cx, |_this, cx| {
                         cx.emit(StateEvent::RelayNotConfigured);
-                        cx.emit(StateEvent::Error(SharedString::from(e.to_string())));
+                        cx.emit(StateEvent::error(e.to_string()));
                     })
                     .ok();
                 }
@@ -657,12 +736,12 @@ impl NostrRegistry {
             let mut results: Vec<PublicKey> = Vec::with_capacity(FIND_LIMIT);
 
             // Return early if the query is a valid NIP-05 address
-            if let Some(task) = address_task {
-                if let Ok(public_key) = task.await {
+            if let Some(task) = address_task
+                && let Ok(public_key) = task.await
+            {
                 results.push(public_key);
                 return Ok(results);
             }
-            }
 
             // Return early if the query is a valid public key
             if let Ok(public_key) = PublicKey::parse(&query) {

crates/ui/src/dock/dock.rs

@@ -271,24 +271,24 @@ impl Dock {
         let mut right_dock_size = px(0.0);
 
         // Get the size of the left dock if it's open and not the current dock
-        if let Some(left_dock) = &dock_area.left_dock {
-            if left_dock.entity_id() != cx.entity().entity_id() {
+        if let Some(left_dock) = &dock_area.left_dock
+            && left_dock.entity_id() != cx.entity().entity_id()
+        {
             let left_dock_read = left_dock.read(cx);
             if left_dock_read.is_open() {
                 left_dock_size = left_dock_read.size;
             }
         }
-        }
 
         // Get the size of the right dock if it's open and not the current dock
-        if let Some(right_dock) = &dock_area.right_dock {
-            if right_dock.entity_id() != cx.entity().entity_id() {
+        if let Some(right_dock) = &dock_area.right_dock
+            && right_dock.entity_id() != cx.entity().entity_id()
+        {
             let right_dock_read = right_dock.read(cx);
             if right_dock_read.is_open() {
                 right_dock_size = right_dock_read.size;
             }
         }
-        }
 
         let size = match self.placement {
             DockPlacement::Left => mouse_position.x - area_bounds.left(),

crates/ui/src/dock/stack_panel.rs

@@ -70,11 +70,11 @@ impl StackPanel {
             return false;
         }
 
-        if let Some(parent) = &self.parent {
-            if let Some(parent) = parent.upgrade() {
+        if let Some(parent) = &self.parent
+            && let Some(parent) = parent.upgrade()
+        {
             return parent.read(cx).is_last_panel(cx);
         }
-        }
 
         true
     }
@@ -297,13 +297,12 @@ impl StackPanel {
 
     /// Find the first top left in the stack.
     pub fn left_top_tab_panel(&self, check_parent: bool, cx: &App) -> Option<Entity<TabPanel>> {
-        if check_parent {
-            if let Some(parent) = self.parent.as_ref().and_then(|parent| parent.upgrade()) {
-                if let Some(panel) = parent.read(cx).left_top_tab_panel(true, cx) {
+        if check_parent
+            && let Some(parent) = self.parent.as_ref().and_then(|parent| parent.upgrade())
+            && let Some(panel) = parent.read(cx).left_top_tab_panel(true, cx)
+        {
             return Some(panel);
         }
-            }
-        }
 
         let first_panel = self.panels.first();
         if let Some(view) = first_panel {
@@ -321,13 +320,12 @@ impl StackPanel {
 
     /// Find the first top right in the stack.
     pub fn right_top_tab_panel(&self, check_parent: bool, cx: &App) -> Option<Entity<TabPanel>> {
-        if check_parent {
-            if let Some(parent) = self.parent.as_ref().and_then(|parent| parent.upgrade()) {
-                if let Some(panel) = parent.read(cx).right_top_tab_panel(true, cx) {
+        if check_parent
+            && let Some(parent) = self.parent.as_ref().and_then(|parent| parent.upgrade())
+            && let Some(panel) = parent.read(cx).right_top_tab_panel(true, cx)
+        {
             return Some(panel);
         }
-            }
-        }
 
         let panel = if self.axis.is_vertical() {
             self.panels.first()

crates/ui/src/dock/tab_panel.rs

@@ -232,15 +232,14 @@ impl TabPanel {
             .any(|p| p.panel_id(cx) == panel.panel_id(cx))
         {
             // Set the active panel to the matched panel
-            if active {
-                if let Some(ix) = self
+            if active
+                && let Some(ix) = self
                     .panels
                     .iter()
                     .position(|p| p.panel_id(cx) == panel.panel_id(cx))
             {
                 self.set_active_ix(ix, window, cx);
             }
-            }
 
             return;
         }
@@ -372,13 +371,12 @@ impl TabPanel {
 
     /// Return true if self or parent only have last panel.
     fn is_last_panel(&self, cx: &App) -> bool {
-        if let Some(parent) = &self.stack_panel {
-            if let Some(stack_panel) = parent.upgrade() {
-                if !stack_panel.read(cx).is_last_panel(cx) {
+        if let Some(parent) = &self.stack_panel
+            && let Some(stack_panel) = parent.upgrade()
+            && !stack_panel.read(cx).is_last_panel(cx)
+        {
             return false;
         }
-            }
-        }
 
         self.panels.len() <= 1
     }
@@ -1103,13 +1101,13 @@ impl TabPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if self.panels.len() > 1 {
-            if let Some(panel) = self.active_panel(cx) {
+        if self.panels.len() > 1
+            && let Some(panel) = self.active_panel(cx)
+        {
             self.remove_panel(&panel, window, cx);
         }
     }
 }
-}
 
 impl Focusable for TabPanel {
     fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {

crates/ui/src/input/element.rs

@@ -2,10 +2,10 @@ use std::ops::Range;
 use std::rc::Rc;
 
 use gpui::{
-    fill, point, px, relative, size, App, Bounds, Corners, Element, ElementId, ElementInputHandler,
-    Entity, GlobalElementId, Hitbox, IntoElement, LayoutId, MouseButton, MouseMoveEvent, Path,
-    Pixels, Point, ShapedLine, SharedString, Size, Style, TextAlign, TextRun, UnderlineStyle,
-    Window,
+    App, Bounds, Corners, Element, ElementId, ElementInputHandler, Entity, GlobalElementId, Hitbox,
+    IntoElement, LayoutId, MouseButton, MouseMoveEvent, Path, Pixels, Point, ShapedLine,
+    SharedString, Size, Style, TextAlign, TextRun, UnderlineStyle, Window, fill, point, px,
+    relative, size,
 };
 use rope::Rope;
 use smallvec::SmallVec;
@@ -348,12 +348,12 @@ impl TextElement {
         let mut rev_line_corners = line_corners.iter().rev().peekable();
         while let Some(corners) = rev_line_corners.next() {
             points.push(corners.top_left);
-            if let Some(next) = rev_line_corners.peek() {
-                if next.top_left.x > corners.top_left.x {
+            if let Some(next) = rev_line_corners.peek()
+                && next.top_left.x > corners.top_left.x
+            {
                 points.push(point(next.top_left.x, corners.top_left.y));
             }
         }
-        }
 
         // print_points_as_svg_path(&line_corners, &points);
 
@@ -376,11 +376,11 @@ impl TextElement {
     ) -> 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() {
+        if let Some(ime_marked_range) = &state.ime_marked_range
+            && !ime_marked_range.is_empty()
+        {
             selected_range = (ime_marked_range.end..ime_marked_range.end).into();
         }
-        }
         if selected_range.is_empty() {
             return None;
         }
@@ -830,12 +830,13 @@ impl Element for TextElement {
         }
 
         // Paint blinking cursor
-        if focused && show_cursor {
-            if let Some(mut cursor_bounds) = prepaint.cursor_bounds.take() {
+        if focused
+            && show_cursor
+            && 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));
         }
-        }
 
         // Paint line numbers
         let mut offset_y = px(0.);

crates/ui/src/input/mask_pattern.rs

@@ -225,14 +225,13 @@ impl MaskPattern {
                 }
 
                 // check if the fraction part is valid
-                if let Some(frac) = frac_part {
-                    if !frac
+                if let Some(frac) = frac_part
+                    && !frac
                         .chars()
                         .all(|ch| ch.is_ascii_digit() || Some(ch) == *separator)
                 {
                     return false;
                 }
-                }
 
                 true
             }
@@ -255,13 +254,13 @@ impl MaskPattern {
 
                     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) {
+                        if let Some(next_token) = tokens.get(pos + 1)
+                            && next_token.is_match(ch)
+                        {
                             return true;
                         }
                     }
                 }
-                }
 
                 false
             }

crates/ui/src/input/state.rs

@@ -4,11 +4,11 @@ use std::time::Duration;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    actions, div, point, px, Action, App, AppContext, Bounds, ClipboardItem, Context, Entity,
-    EntityInputHandler, EventEmitter, FocusHandle, Focusable, InteractiveElement as _, IntoElement,
-    KeyBinding, KeyDownEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent,
-    ParentElement as _, Pixels, Point, Render, ScrollHandle, ScrollWheelEvent, SharedString,
-    Styled as _, Subscription, UTF16Selection, Window, WrappedLine,
+    Action, App, AppContext, Bounds, ClipboardItem, Context, Entity, EntityInputHandler,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement as _, IntoElement, KeyBinding,
+    KeyDownEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement as _,
+    Pixels, Point, Render, ScrollHandle, ScrollWheelEvent, SharedString, Styled as _, Subscription,
+    UTF16Selection, Window, WrappedLine, actions, div, point, px,
 };
 use lsp_types::Position;
 use rope::{OffsetUtf16, Rope};
@@ -25,9 +25,9 @@ use super::mask_pattern::MaskPattern;
 use super::mode::{InputMode, TabSize};
 use super::rope_ext::RopeExt;
 use super::text_wrapper::{LineItem, TextWrapper};
+use crate::Root;
 use crate::history::History;
 use crate::input::element::RIGHT_MARGIN;
-use crate::Root;
 
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
 #[action(namespace = input, no_json)]
@@ -521,19 +521,19 @@ impl InputState {
             let new_row = new_row as usize;
             if new_row >= last_layout.visible_range.start {
                 let visible_row = new_row.saturating_sub(last_layout.visible_range.start);
-                if let Some(line) = last_layout.lines.get(visible_row) {
-                    if let Ok(x) = line.closest_index_for_position(
+                if let Some(line) = last_layout.lines.get(visible_row)
+                    && let Ok(x) = line.closest_index_for_position(
                         Point {
                             x: preferred_x,
                             y: px(0.),
                         },
                         last_layout.line_height,
-                    ) {
+                    )
+                {
                     new_offset = line_start_offset + x;
                 }
             }
         }
-        }
         self.pause_blink_cursor(cx);
         self.move_to(new_offset, cx);
         // Set back the preferred_column
@@ -1355,11 +1355,11 @@ impl InputState {
     ) {
         // If there have IME marked range and is empty (Means pressed Esc to abort IME typing)
         // Clear the marked range.
-        if let Some(ime_marked_range) = &self.ime_marked_range {
-            if ime_marked_range.is_empty() {
+        if let Some(ime_marked_range) = &self.ime_marked_range
+            && ime_marked_range.is_empty()
+        {
             self.ime_marked_range = None;
         }
-        }
 
         self.selecting = true;
         let offset = self.index_for_mouse_position(event.position, window, cx);
@@ -1842,23 +1842,21 @@ impl InputState {
 
     fn previous_boundary(&self, offset: usize) -> usize {
         let mut offset = self.text.clip_offset(offset.saturating_sub(1), Bias::Left);
-        if let Some(ch) = self.text.char_at(offset) {
-            if ch == '\r' {
+        if let Some(ch) = self.text.char_at(offset)
+            && ch == '\r'
+        {
             offset -= 1;
         }
-        }
-
         offset
     }
 
     fn next_boundary(&self, offset: usize) -> usize {
         let mut offset = self.text.clip_offset(offset + 1, Bias::Right);
-        if let Some(ch) = self.text.char_at(offset) {
-            if ch == '\r' {
+        if let Some(ch) = self.text.char_at(offset)
+            && ch == '\r'
+        {
             offset += 1;
         }
-        }
-
         offset
     }
 
@@ -1927,11 +1925,11 @@ impl InputState {
             return true;
         }
 
-        if let Some(validate) = &self.validate {
-            if !validate(new_text, cx) {
+        if let Some(validate) = &self.validate
+            && !validate(new_text, cx)
+        {
             return false;
         }
-        }
 
         if !self.mask_pattern.is_valid(new_text) {
             return false;
@@ -1979,8 +1977,9 @@ impl InputState {
         self.input_bounds = new_bounds;
 
         // Update text_wrapper wrap_width if changed.
-        if let Some(last_layout) = self.last_layout.as_ref() {
-            if wrap_width_changed {
+        if let Some(last_layout) = self.last_layout.as_ref()
+            && wrap_width_changed
+        {
             let wrap_width = if !self.soft_wrap {
                 // None to disable wrapping (will use Pixels::MAX)
                 None
@@ -1993,7 +1992,6 @@ impl InputState {
             cx.notify();
         }
     }
-    }
 
     /// Replace text by [`lsp_types::Range`].
     ///
@@ -2209,21 +2207,19 @@ impl EntityInputHandler for InputState {
                 break;
             }
 
-            if start_origin.is_none() {
-                if let Some(p) =
+            if start_origin.is_none()
+                && let Some(p) =
                     line.position_for_index(range.start.saturating_sub(index_offset), line_height)
             {
                 start_origin = Some(p + point(px(0.), y_offset));
             }
-            }
 
-            if end_origin.is_none() {
-                if let Some(p) =
+            if end_origin.is_none()
+                && let Some(p) =
                     line.position_for_index(range.end.saturating_sub(index_offset), line_height)
             {
                 end_origin = Some(p + point(px(0.), y_offset));
             }
-            }
 
             index_offset += line.len() + 1;
             y_offset += line.size(line_height).height;

crates/ui/src/list/list.rs

@@ -3,21 +3,21 @@ use std::time::Duration;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    div, px, size, uniform_list, App, AppContext, AvailableSpace, ClickEvent, Context,
-    DefiniteLength, EdgesRefinement, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, KeyBinding, Length, ListSizingBehavior, MouseButton,
-    ParentElement, Render, RenderOnce, ScrollStrategy, SharedString, StatefulInteractiveElement,
-    StyleRefinement, Styled, Subscription, Task, UniformListScrollHandle, Window,
+    App, AppContext, AvailableSpace, ClickEvent, Context, DefiniteLength, EdgesRefinement, Entity,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, KeyBinding, Length,
+    ListSizingBehavior, MouseButton, ParentElement, Render, RenderOnce, ScrollStrategy,
+    SharedString, StatefulInteractiveElement, StyleRefinement, Styled, Subscription, Task,
+    UniformListScrollHandle, Window, div, px, size, uniform_list,
 };
 use smol::Timer;
 use theme::ActiveTheme;
 
 use crate::actions::{Cancel, Confirm, SelectDown, SelectUp};
 use crate::input::{InputEvent, InputState, TextInput};
-use crate::list::cache::{MeasuredEntrySize, RowEntry, RowsCache};
 use crate::list::ListDelegate;
+use crate::list::cache::{MeasuredEntrySize, RowEntry, RowsCache};
 use crate::scroll::{Scrollbar, ScrollbarHandle};
-use crate::{v_flex, Icon, IconName, IndexPath, Selectable, Sizable, Size, StyledExt};
+use crate::{Icon, IconName, IndexPath, Selectable, Sizable, Size, StyledExt, v_flex};
 
 pub(crate) fn init(cx: &mut App) {
     let context: Option<&str> = Some("List");
@@ -578,11 +578,11 @@ where
         self.prepare_items_if_needed(window, cx);
 
         // Scroll to the selected item if it is set.
-        if let Some((ix, strategy)) = self.deferred_scroll_to_index.take() {
-            if let Some(item_ix) = self.rows_cache.position_of(&ix) {
+        if let Some((ix, strategy)) = self.deferred_scroll_to_index.take()
+            && let Some(item_ix) = self.rows_cache.position_of(&ix)
+        {
             self.scroll_handle.scroll_to_item(item_ix, strategy);
         }
-        }
 
         let loading = self.delegate().loading(cx);
         let query_input = if self.searchable {

crates/ui/src/menu/popup_menu.rs

@@ -719,14 +719,14 @@ impl PopupMenu {
     }
 
     pub(crate) fn active_submenu(&self) -> Option<Entity<PopupMenu>> {
-        if let Some(ix) = self.selected_index {
-            if let Some(item) = self.menu_items.get(ix) {
+        if let Some(ix) = self.selected_index
+            && let Some(item) = self.menu_items.get(ix)
+        {
             return match item {
                 PopupMenuItem::Submenu { menu, .. } => Some(menu.clone()),
                 _ => None,
             };
         }
-        }
 
         None
     }
@@ -965,13 +965,12 @@ impl PopupMenu {
         cx: &mut Context<Self>,
     ) {
         // Do not dismiss, if click inside the parent menu
-        if let Some(parent) = self.parent_menu.as_ref() {
-            if let Some(parent) = parent.upgrade() {
-                if parent.read(cx).bounds.contains(position) {
+        if let Some(parent) = self.parent_menu.as_ref()
+            && let Some(parent) = parent.upgrade()
+            && parent.read(cx).bounds.contains(position)
+        {
             return;
         }
-            }
-        }
 
         self.dismiss(&Cancel, window, cx);
     }

crates/ui/src/modal.rs

@@ -296,11 +296,11 @@ impl RenderOnce for Modal {
                         let on_close = on_close.clone();
 
                         move |_, window, cx| {
-                            if let Some(on_ok) = &on_ok {
-                                if !on_ok(&ClickEvent::default(), window, cx) {
+                            if let Some(on_ok) = &on_ok
+                                && !on_ok(&ClickEvent::default(), window, cx)
+                            {
                                 return;
                             }
-                            }
 
                             on_close(&ClickEvent::default(), window, cx);
                             window.close_modal(cx);

crates/ui/src/notification.rs

@@ -14,7 +14,7 @@ use theme::{ActiveTheme, Anchor};
 
 use crate::animation::cubic_bezier;
 use crate::button::{Button, ButtonVariants as _};
-use crate::{Icon, IconName, Sizable as _, StyledExt, h_flex, v_flex};
+use crate::{Icon, IconName, Sizable as _, Size, StyledExt, h_flex, v_flex};
 
 #[derive(Debug, Clone, Copy, Default)]
 pub enum NotificationKind {
@@ -28,12 +28,18 @@ pub enum NotificationKind {
 impl NotificationKind {
     fn icon(&self, cx: &App) -> Icon {
         match self {
-            Self::Info => Icon::new(IconName::Info).text_color(cx.theme().icon),
-            Self::Success => Icon::new(IconName::CheckCircle).text_color(cx.theme().icon_accent),
-            Self::Warning => Icon::new(IconName::Warning).text_color(cx.theme().text_warning),
-            Self::Error => {
-                Icon::new(IconName::CloseCircle).text_color(cx.theme().danger_foreground)
-            }
+            Self::Info => Icon::new(IconName::Info)
+                .with_size(Size::Medium)
+                .text_color(cx.theme().icon),
+            Self::Success => Icon::new(IconName::CheckCircle)
+                .with_size(Size::Medium)
+                .text_color(cx.theme().icon_accent),
+            Self::Warning => Icon::new(IconName::Warning)
+                .with_size(Size::Medium)
+                .text_color(cx.theme().text_warning),
+            Self::Error => Icon::new(IconName::CloseCircle)
+                .with_size(Size::Medium)
+                .text_color(cx.theme().danger_foreground),
         }
     }
 }
@@ -284,9 +290,6 @@ impl Styled for Notification {
 }
 impl Render for Notification {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let closing = self.closing;
-        let placement = cx.theme().notification.placement;
-
         let content = self
             .content_builder
             .clone()
@@ -312,6 +315,11 @@ impl Render for Notification {
             _ => cx.theme().text,
         };
 
+        let closing = self.closing;
+        let has_title = self.title.is_some();
+        let only_message = !has_title && content.is_none() && action.is_none();
+        let placement = cx.theme().notification.placement;
+
         h_flex()
             .id("notification")
             .group("")
@@ -328,23 +336,38 @@ impl Render for Notification {
             .gap_2()
             .justify_start()
             .items_start()
+            .when(only_message, |this| this.items_center())
             .refine_style(&self.style)
             .when_some(icon, |this, icon| {
-                this.child(div().flex_shrink_0().child(icon))
+                this.child(div().flex_shrink_0().size_5().child(icon))
             })
             .child(
                 v_flex()
                     .flex_1()
+                    .gap_1()
                     .overflow_hidden()
                     .when_some(self.title.clone(), |this, title| {
-                        this.child(div().text_sm().font_semibold().child(title))
+                        this.child(h_flex().h_5().text_sm().font_semibold().child(title))
                     })
                     .when_some(self.message.clone(), |this, message| {
-                        this.child(div().text_sm().line_height(relative(1.25)).child(message))
+                        this.child(
+                            div()
+                                .text_sm()
+                                .when(has_title, |this| this.text_color(cx.theme().text_muted))
+                                .line_height(relative(1.3))
+                                .child(message),
+                        )
                     })
                     .when_some(content, |this, content| this.child(content))
                     .when_some(action, |this, action| {
-                        this.child(h_flex().flex_1().gap_1().justify_end().child(action))
+                        this.child(
+                            h_flex()
+                                .w_full()
+                                .flex_1()
+                                .gap_1()
+                                .justify_end()
+                                .child(action),
+                        )
                     }),
             )
             .child(

crates/ui/src/resizable/mod.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
 use gpui::{
-    px, Along, App, Axis, Bounds, Context, ElementId, EventEmitter, IsZero, Pixels, Window,
+    Along, App, Axis, Bounds, Context, ElementId, EventEmitter, IsZero, Pixels, Window, px,
 };
 
 mod panel;
@@ -142,11 +142,11 @@ impl ResizableState {
     pub(crate) fn remove_panel(&mut self, panel_ix: usize, cx: &mut Context<Self>) {
         self.panels.remove(panel_ix);
         self.sizes.remove(panel_ix);
-        if let Some(resizing_panel_ix) = self.resizing_panel_ix {
-            if resizing_panel_ix > panel_ix {
+        if let Some(resizing_panel_ix) = self.resizing_panel_ix
+            && resizing_panel_ix > panel_ix
+        {
             self.resizing_panel_ix = Some(resizing_panel_ix - 1);
         }
-        }
         self.adjust_to_container_size(cx);
     }
 

crates/ui/src/root.rs

@@ -92,7 +92,7 @@ impl Root {
     pub fn render_notification_layer(
         window: &mut Window,
         cx: &mut App,
-    ) -> Option<impl IntoElement> {
+    ) -> Option<impl IntoElement + use<>> {
         let root = window.root::<Root>()??;
 
         Some(
@@ -105,7 +105,10 @@ impl Root {
     }
 
     /// Render the modal layer.
-    pub fn render_modal_layer(window: &mut Window, cx: &mut App) -> Option<impl IntoElement> {
+    pub fn render_modal_layer(
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Option<impl IntoElement + use<>> {
         let root = window.root::<Root>()??;
         let active_modals = root.read(cx).active_modals.clone();
 
@@ -139,11 +142,11 @@ impl Root {
             })
             .collect::<Vec<_>>();
 
-        if let Some(ix) = show_overlay_ix {
-            if let Some(modal) = modals.get_mut(ix) {
+        if let Some(ix) = show_overlay_ix
+            && let Some(modal) = modals.get_mut(ix)
+        {
             modal.overlay_visible = true;
         }
-        }
 
         Some(div().children(modals))
     }