add failed message

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

.gitignore

@@ -21,3 +21,6 @@ dist/
 .DS_Store
 # Added by goreleaser init:
 .intentionally-empty-file.o
+
+.cargo/
+vendor/

Cargo.toml

@@ -4,8 +4,8 @@ members = ["crates/*"]
 default-members = ["crates/coop"]
 
 [workspace.package]
-version = "1.0.0-beta1"
-edition = "2021"
+version = "1.0.0-beta2"
+edition = "2024"
 publish = false
 
 [workspace.dependencies]
@@ -23,7 +23,7 @@ nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" }
 nostr-memory = { git = "https://github.com/rust-nostr/nostr" }
 nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
 nostr-blossom = { git = "https://github.com/rust-nostr/nostr" }
-nostr-gossip-sqlite = { git = "https://github.com/rust-nostr/nostr" }
+nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" }
 nostr-sdk = { git = "https://github.com/rust-nostr/nostr" }
 nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip96", "nip59", "nip49", "nip44" ] }
 

crates/chat/src/lib.rs

@@ -1,5 +1,5 @@
 use std::cmp::Reverse;
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeSet, HashMap, HashSet};
 use std::hash::{DefaultHasher, Hash, Hasher};
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
@@ -15,7 +15,8 @@ use gpui::{
 };
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
-use state::{DEVICE_GIFTWRAP, NostrRegistry, StateEvent, TIMEOUT, USER_GIFTWRAP};
+use smol::lock::RwLock;
+use state::{CoopSigner, DEVICE_GIFTWRAP, NostrRegistry, StateEvent, TIMEOUT, USER_GIFTWRAP};
 
 mod message;
 mod room;
@@ -54,15 +55,38 @@ enum Signal {
     /// Eose received from relay pool
     Eose,
     /// An error occurred
-    Error(SharedString),
+    Error(FailedMessage),
+}
+
+impl Signal {
+    pub fn message(gift_wrap: EventId, rumor: UnsignedEvent) -> Self {
+        Self::Message(NewMessage::new(gift_wrap, rumor))
+    }
+
+    pub fn eose() -> Self {
+        Self::Eose
+    }
+
+    pub fn error<T>(event: &Event, reason: T) -> Self
+    where
+        T: Into<SharedString>,
+    {
+        Self::Error(FailedMessage::new(event, reason))
+    }
 }
 
 /// Chat Registry
 #[derive(Debug)]
 pub struct ChatRegistry {
-    /// Collection of all chat rooms
+    /// Chat rooms
     rooms: Vec<Entity<Room>>,
 
+    /// Events that failed to unwrap for any reason
+    trashes: Entity<BTreeSet<FailedMessage>>,
+
+    /// 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 +125,17 @@ impl ChatRegistry {
         subscriptions.push(
             // Subscribe to the signer event
             cx.subscribe(&nostr, |this, _state, event, cx| {
-                if let StateEvent::SignerSet = event {
-                    this.reset(cx);
-                    this.get_rooms(cx);
-                    this.get_contact_list(cx);
-                    this.get_messages(cx)
-                }
+                match event {
+                    StateEvent::SignerSet => {
+                        this.reset(cx);
+                        this.get_rooms(cx);
+                    }
+                    StateEvent::RelayConnected => {
+                        this.get_contact_list(cx);
+                        this.get_messages(cx)
+                    }
+                    _ => {}
+                };
             }),
         );
 
@@ -119,6 +148,8 @@ impl ChatRegistry {
 
         Self {
             rooms: vec![],
+            trashes: cx.new(|_| BTreeSet::default()),
+            seens: Arc::new(RwLock::new(HashMap::default())),
             tracking_flag: Arc::new(AtomicBool::new(false)),
             signal_rx: rx,
             signal_tx: tx,
@@ -133,6 +164,8 @@ 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 trashes = self.trashes.downgrade();
 
         let initialized_at = Timestamp::now();
         let sub_id1 = SubscriptionId::new(DEVICE_GIFTWRAP);
@@ -143,59 +176,61 @@ impl ChatRegistry {
         let rx = self.signal_rx.clone();
 
         self.tasks.push(cx.background_spawn(async move {
-            let device_signer = signer.get_encryption_signer().await;
             let mut notifications = client.notifications();
             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 {
+                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;
                         }
 
+                        // Skip non-gift wrap events
                         if event.kind != Kind::GiftWrap {
-                            // Skip non-gift wrap events
                             continue;
                         }
 
                         // Extract the rumor from the gift wrap event
-                        match extract_rumor(&client, &device_signer, event.as_ref()).await {
+                        match extract_rumor(&client, &signer, event.as_ref()).await {
                             Ok(rumor) => {
                                 if rumor.tags.is_empty() {
-                                    let error: SharedString =
-                                        "Message doesn't belong to any rooms".into();
-                                    tx.send_async(Signal::Error(error)).await?;
+                                    let signal =
+                                        Signal::error(event.as_ref(), "Recipient is missing");
+                                    tx.send_async(signal).await?;
+
+                                    continue;
                                 }
 
-                                match rumor.created_at >= initialized_at {
-                                    true => {
-                                        let new_message = NewMessage::new(event.id, rumor);
-                                        let signal = Signal::Message(new_message);
-
-                                        tx.send_async(signal).await?;
-                                    }
-                                    false => {
-                                        status.store(true, Ordering::Release);
-                                    }
+                                if rumor.created_at >= initialized_at {
+                                    let signal = Signal::message(event.id, rumor);
+                                    tx.send_async(signal).await?;
+                                } else {
+                                    status.store(true, Ordering::Release);
                                 }
                             }
                             Err(e) => {
-                                let error: SharedString =
-                                    format!("Failed to unwrap the gift wrap event: {e}").into();
-                                tx.send_async(Signal::Error(error)).await?;
+                                let reason = format!("Failed to extract rumor: {e}");
+                                let signal = Signal::error(event.as_ref(), reason);
+                                tx.send_async(signal).await?;
                             }
                         }
                     }
                     RelayMessage::EndOfStoredEvents(id) => {
                         if id.as_ref() == &sub_id1 || id.as_ref() == &sub_id2 {
-                            tx.send_async(Signal::Eose).await?;
+                            tx.send_async(Signal::eose()).await?;
                         }
                     }
                     _ => {}
@@ -218,9 +253,10 @@ impl ChatRegistry {
                             this.get_rooms(cx);
                         })?;
                     }
-                    Signal::Error(error) => {
-                        this.update(cx, |_this, cx| {
-                            cx.emit(ChatEvent::Error(error));
+                    Signal::Error(trash) => {
+                        trashes.update(cx, |this, cx| {
+                            this.insert(trash);
+                            cx.notify();
                         })?;
                     }
                 };
@@ -325,6 +361,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 +436,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,10 +625,10 @@ 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() {
-                        grouped.entry(rumor.uniq_id()).or_default().push(rumor);
-                    }
+                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);
                 }
             }
 
@@ -619,12 +674,11 @@ 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 {
-                                this.set_ongoing(cx);
-                            }
-                        }
+                    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);
                 });
@@ -652,16 +706,16 @@ impl ChatRegistry {
 /// Unwraps a gift-wrapped event and processes its contents.
 async fn extract_rumor(
     client: &Client,
-    device_signer: &Option<Arc<dyn NostrSigner>>,
+    signer: &Arc<CoopSigner>,
     gift_wrap: &Event,
 ) -> Result<UnsignedEvent, Error> {
     // Try to get cached rumor first
-    if let Ok(event) = get_rumor(client, gift_wrap.id).await {
-        return Ok(event);
+    if let Ok(rumor) = get_rumor(client, gift_wrap.id).await {
+        return Ok(rumor);
     }
 
     // Try to unwrap with the available signer
-    let unwrapped = try_unwrap(client, device_signer, gift_wrap).await?;
+    let unwrapped = try_unwrap(signer, gift_wrap).await?;
     let mut rumor = unwrapped.rumor;
 
     // Generate event id for the rumor if it doesn't have one
@@ -676,30 +730,27 @@ async fn extract_rumor(
 }
 
 /// Helper method to try unwrapping with different signers
-async fn try_unwrap(
-    client: &Client,
-    device_signer: &Option<Arc<dyn NostrSigner>>,
-    gift_wrap: &Event,
-) -> Result<UnwrappedGift, Error> {
+async fn try_unwrap(signer: &Arc<CoopSigner>, 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) = signer.get_encryption_signer().await {
+        log::info!("trying with encryption key");
+        if 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")?;
-    let unwrapped = try_unwrap_with(gift_wrap, user_signer).await?;
+    // Fallback to the user's signer
+    let user_signer = signer.get().await;
+    let unwrapped = try_unwrap_with(gift_wrap, &user_signer).await?;
 
     Ok(unwrapped)
 }
 
 /// Attempts to unwrap a gift wrap event with a given signer.
-async fn try_unwrap_with(
-    gift_wrap: &Event,
-    signer: &Arc<dyn NostrSigner>,
-) -> Result<UnwrappedGift, Error> {
+async fn try_unwrap_with<T>(gift_wrap: &Event, signer: &T) -> Result<UnwrappedGift, Error>
+where
+    T: NostrSigner + 'static,
+{
     // Get the sealed event
     let seal = signer
         .nip44_decrypt(&gift_wrap.pubkey, &gift_wrap.content)

crates/chat/src/message.rs

@@ -2,6 +2,7 @@ use std::hash::Hash;
 use std::ops::Range;
 
 use common::{EventUtils, NostrParser};
+use gpui::SharedString;
 use nostr_sdk::prelude::*;
 
 /// New message.
@@ -24,6 +25,25 @@ impl NewMessage {
     }
 }
 
+/// Trash message.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct FailedMessage {
+    pub raw_event: String,
+    pub reason: SharedString,
+}
+
+impl FailedMessage {
+    pub fn new<T>(event: &Event, reason: T) -> Self
+    where
+        T: Into<SharedString>,
+    {
+        Self {
+            raw_event: event.as_json(),
+            reason: reason.into(),
+        }
+    }
+}
+
 /// Message.
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub enum Message {

crates/chat/src/room.rs

@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
 use std::time::Duration;
 
-use anyhow::Error;
+use anyhow::{Error, anyhow};
 use common::EventUtils;
 use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
 use itertools::Itertools;
@@ -354,17 +354,7 @@ impl Room {
     pub fn connect(&self, cx: &App) -> Task<Result<(), Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-
-        let signer = nostr.read(cx).signer();
-        let sender = signer.public_key();
-
-        // Get all members, excluding the sender
-        let members: Vec<PublicKey> = self
-            .members
-            .iter()
-            .filter(|public_key| Some(**public_key) != sender)
-            .copied()
-            .collect();
+        let members = self.members();
 
         cx.background_spawn(async move {
             let opts = SubscribeAutoCloseOptions::default()
@@ -515,45 +505,46 @@ impl Room {
 
                 // Handle encryption signer requirements
                 if signer_kind.encryption() {
+                    // Receiver didn't set up a decoupled encryption key
                     if announcement.is_none() {
                         reports.push(SendReport::new(public_key).error(NO_DEKEY));
                         continue;
                     }
+
+                    // Sender didn't set up a decoupled encryption key
                     if encryption_signer.is_none() {
                         reports.push(SendReport::new(sender.public_key()).error(USER_NO_DEKEY));
                         continue;
                     }
                 }
 
-                // Determine receiver and signer
-                let (receiver, signer) = match signer_kind {
+                // Determine the signer to use
+                let signer = match signer_kind {
                     SignerKind::Auto => {
-                        if let Some(announcement) = announcement {
-                            if let Some(enc_signer) = encryption_signer.as_ref() {
-                                (announcement.public_key(), enc_signer.clone())
-                            } else {
-                                (member.public_key(), user_signer.clone())
-                            }
+                        if announcement.is_some()
+                            && let Some(encryption_signer) = encryption_signer.clone()
+                        {
+                            // Safe to unwrap due to earlier checks
+                            encryption_signer
                         } else {
-                            (member.public_key(), user_signer.clone())
+                            user_signer.clone()
                         }
                     }
                     SignerKind::Encryption => {
                         // Safe to unwrap due to earlier checks
-                        (
-                            announcement.unwrap().public_key(),
-                            encryption_signer.as_ref().unwrap().clone(),
-                        )
+                        encryption_signer.as_ref().unwrap().clone()
                     }
-                    SignerKind::User => (member.public_key(), user_signer.clone()),
+                    SignerKind::User => user_signer.clone(),
                 };
 
-                match send_gift_wrap(&client, &signer, &receiver, &rumor, public_key).await {
-                    Ok((report, _)) => {
+                // Send the gift wrap event and collect the report
+                match send_gift_wrap(&client, &signer, &member, &rumor, signer_kind).await {
+                    Ok(report) => {
                         reports.push(report);
                         sents += 1;
                     }
-                    Err(report) => {
+                    Err(error) => {
+                        let report = SendReport::new(public_key).error(error.to_string());
                         reports.push(report);
                     }
                 }
@@ -562,11 +553,32 @@ impl Room {
             // Send backup to current user if needed
             if backup && sents >= 1 {
                 let public_key = sender.public_key();
-                let signer = encryption_signer.as_ref().unwrap_or(&user_signer);
 
-                match send_gift_wrap(&client, signer, &public_key, &rumor, public_key).await {
-                    Ok((report, _)) => reports.push(report),
-                    Err(report) => reports.push(report),
+                // Determine the signer to use
+                let signer = match signer_kind {
+                    SignerKind::Auto => {
+                        if sender.announcement().is_some()
+                            && let Some(encryption_signer) = encryption_signer.clone()
+                        {
+                            // Safe to unwrap due to earlier checks
+                            encryption_signer
+                        } else {
+                            user_signer.clone()
+                        }
+                    }
+                    SignerKind::Encryption => {
+                        // Safe to unwrap due to earlier checks
+                        encryption_signer.as_ref().unwrap().clone()
+                    }
+                    SignerKind::User => user_signer.clone(),
+                };
+
+                match send_gift_wrap(&client, &signer, &sender, &rumor, signer_kind).await {
+                    Ok(report) => reports.push(report),
+                    Err(error) => {
+                        let report = SendReport::new(public_key).error(error.to_string());
+                        reports.push(report);
+                    }
                 }
             }
 
@@ -579,30 +591,50 @@ impl Room {
 async fn send_gift_wrap<T>(
     client: &Client,
     signer: &T,
-    receiver: &PublicKey,
+    receiver: &Person,
     rumor: &UnsignedEvent,
-    public_key: PublicKey,
-) -> Result<(SendReport, bool), SendReport>
+    config: &SignerKind,
+) -> Result<SendReport, Error>
 where
     T: NostrSigner + 'static,
 {
-    match EventBuilder::gift_wrap(signer, receiver, rumor.clone(), []).await {
-        Ok(event) => {
-            match client
-                .send_event(&event)
-                .to_nip17()
-                .ack_policy(AckPolicy::none())
-                .await
-            {
-                Ok(output) => Ok((
-                    SendReport::new(public_key)
-                        .gift_wrap_id(event.id)
-                        .output(output),
-                    true,
-                )),
-                Err(e) => Err(SendReport::new(public_key).error(e.to_string())),
+    let mut extra_tags = vec![];
+
+    // Determine the receiver public key based on the config
+    let receiver = match config {
+        SignerKind::Auto => {
+            if let Some(announcement) = receiver.announcement().as_ref() {
+                extra_tags.push(Tag::public_key(receiver.public_key()));
+                announcement.public_key()
+            } else {
+                receiver.public_key()
             }
         }
-        Err(e) => Err(SendReport::new(public_key).error(e.to_string())),
-    }
+        SignerKind::Encryption => {
+            if let Some(announcement) = receiver.announcement().as_ref() {
+                extra_tags.push(Tag::public_key(receiver.public_key()));
+                announcement.public_key()
+            } else {
+                return Err(anyhow!("User has no encryption announcement"));
+            }
+        }
+        SignerKind::User => receiver.public_key(),
+    };
+
+    // Construct the gift wrap event
+    let event = EventBuilder::gift_wrap(signer, &receiver, rumor.clone(), extra_tags).await?;
+
+    // Send the gift wrap event and collect the report
+    let report = client
+        .send_event(&event)
+        .to_nip17()
+        .ack_policy(AckPolicy::none())
+        .await
+        .map(|output| {
+            SendReport::new(receiver)
+                .gift_wrap_id(event.id)
+                .output(output)
+        })?;
+
+    Ok(report)
 }

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);
@@ -192,15 +201,12 @@ impl ChatPanel {
             let mut notifications = client.notifications();
 
             while let Some(notification) = notifications.next().await {
-                if let ClientNotification::Message {
-                    message:
-                        RelayMessage::Ok {
-                            event_id,
-                            status,
-                            message,
-                        },
-                    relay_url,
-                } = notification
+                if let ClientNotification::Message { message, relay_url } = notification
+                    && let RelayMessage::Ok {
+                        event_id,
+                        status,
+                        message,
+                    } = *message
                 {
                     let sent_ids = sent_ids.read().await;
 
@@ -247,11 +253,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 +268,8 @@ impl ChatPanel {
                             this.get_messages(window, cx);
                         }
                     };
-                }),
-            );
+                },
+            ));
         }
     }
 
@@ -368,9 +376,13 @@ impl ChatPanel {
     /// Send message in the background and wait for the response
     fn send_and_wait(&mut self, rumor: UnsignedEvent, window: &mut Window, cx: &mut Context<Self>) {
         let sent_ids = self.sent_ids.clone();
+
         // This can't fail, because we already ensured that the ID is set
         let id = rumor.id.unwrap();
 
+        // Add empty reports
+        self.insert_reports(id, vec![], cx);
+
         // Upgrade room reference
         let Some(room) = self.room.upgrade() else {
             return;
@@ -419,7 +431,7 @@ impl ChatPanel {
     /// Insert reports
     fn insert_reports(&mut self, id: EventId, reports: Vec<SendReport>, cx: &mut Context<Self>) {
         self.reports_by_id.update(cx, |this, cx| {
-            this.insert(id, reports);
+            this.entry(id).or_default().extend(reports);
             cx.notify();
         });
     }
@@ -454,14 +466,6 @@ impl ChatPanel {
         }
     }
 
-    /// Check if a message is pending
-    fn sent_pending(&self, id: &EventId, cx: &App) -> bool {
-        self.reports_by_id
-            .read(cx)
-            .get(id)
-            .is_some_and(|reports| reports.iter().all(|r| r.pending()))
-    }
-
     /// Check if a message has any reports
     fn has_reports(&self, id: &EventId, cx: &App) -> bool {
         self.reports_by_id.read(cx).get(id).is_some()
@@ -475,10 +479,10 @@ 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 {
-                    return Some(rendered);
-                }
+            if let Message::User(rendered) = msg
+                && &rendered.id == id
+            {
+                return Some(rendered);
             }
             None
         })
@@ -645,9 +649,6 @@ impl ChatPanel {
                     );
                 }
             }
-            Command::Subject => {
-                self.open_subject(window, cx);
-            }
             Command::Copy(public_key) => {
                 self.copy_author(public_key, cx);
             }
@@ -660,47 +661,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);
 
@@ -835,8 +795,6 @@ impl ChatPanel {
 
         let replies = message.replies_to.as_slice();
         let has_replies = !replies.is_empty();
-
-        let sent_pending = self.sent_pending(&id, cx);
         let has_reports = self.has_reports(&id, cx);
 
         // Hide avatar setting
@@ -884,9 +842,6 @@ impl ChatPanel {
                                             .child(author.name()),
                                     )
                                     .child(message.created_at.to_human_time())
-                                    .when(sent_pending, |this| {
-                                        this.child(SharedString::from("• Sending..."))
-                                    })
                                     .when(has_reports, |this| {
                                         this.child(deferred(self.render_sent_reports(&id, cx)))
                                     }),
@@ -970,20 +925,26 @@ impl ChatPanel {
     fn render_sent_reports(&self, id: &EventId, cx: &App) -> impl IntoElement {
         let reports = self.sent_reports(id, cx);
 
+        let pending = reports
+            .as_ref()
+            .is_some_and(|reports| reports.is_empty() || reports.iter().any(|r| r.pending()));
+
         let success = reports
             .as_ref()
-            .is_some_and(|reports| reports.iter().any(|r| r.success()));
+            .is_some_and(|reports| !reports.is_empty() && reports.iter().any(|r| r.success()));
 
         let failed = reports
             .as_ref()
-            .is_some_and(|reports| reports.iter().all(|r| r.failed()));
+            .is_some_and(|reports| !reports.is_empty() && reports.iter().all(|r| r.failed()));
 
         let label = if success {
             SharedString::from("• Sent")
         } else if failed {
-            SharedString::from("• Failed")
-        } else {
+            SharedString::from("• Error")
+        } else if pending {
             SharedString::from("• Sending...")
+        } else {
+            SharedString::from("• Unknown")
         };
 
         div()
@@ -991,22 +952,24 @@ impl ChatPanel {
             .child(label)
             .when(failed, |this| this.text_color(cx.theme().text_danger))
             .when_some(reports, |this, reports| {
-                this.on_click(move |_e, window, cx| {
-                    let reports = reports.clone();
+                this.when(!pending, |this| {
+                    this.on_click(move |_e, window, cx| {
+                        let reports = reports.clone();
 
-                    window.open_modal(cx, move |this, _window, cx| {
-                        this.title(SharedString::from("Sent Reports"))
-                            .show_close(true)
-                            .child(v_flex().gap_4().children({
-                                let mut items = Vec::with_capacity(reports.len());
+                        window.open_modal(cx, move |this, _window, cx| {
+                            this.title(SharedString::from("Sent Reports"))
+                                .show_close(true)
+                                .child(v_flex().gap_4().children({
+                                    let mut items = Vec::with_capacity(reports.len());
 
-                                for report in reports.iter() {
-                                    items.push(Self::render_report(report, cx))
-                                }
+                                    for report in reports.iter() {
+                                        items.push(Self::render_report(report, cx))
+                                    }
 
-                                items
-                            }))
-                    });
+                                    items
+                                }))
+                        });
+                    })
                 })
             })
     }

crates/common/src/paths.rs

@@ -7,6 +7,13 @@ pub fn home_dir() -> &'static PathBuf {
     HOME_DIR.get_or_init(|| dirs::home_dir().expect("failed to determine home directory"))
 }
 
+/// Returns the path to the user's download directory.
+pub fn download_dir() -> &'static PathBuf {
+    static DOWNLOAD_DIR: OnceLock<PathBuf> = OnceLock::new();
+    DOWNLOAD_DIR
+        .get_or_init(|| dirs::download_dir().expect("failed to determine download directory"))
+}
+
 /// Returns the path to the configuration directory used by Coop.
 pub fn config_dir() -> &'static PathBuf {
     static CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
@@ -56,9 +63,3 @@ pub fn support_dir() -> &'static PathBuf {
         config_dir().clone()
     })
 }
-
-/// Returns the path to the `nostr` file.
-pub fn nostr_file() -> &'static PathBuf {
-    static NOSTR_FILE: OnceLock<PathBuf> = OnceLock::new();
-    NOSTR_FILE.get_or_init(|| support_dir().join("nostr-db"))
-}

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 = "1.0.0-beta1"
+version = "1.0.0-beta2"
 out-dir = "../../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]

crates/coop/src/dialogs/import.rs

@@ -242,7 +242,6 @@ impl Render for ImportKey {
     fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
             .size_full()
-            .p_4()
             .gap_2()
             .text_sm()
             .child(

crates/coop/src/dialogs/mod.rs

@@ -1,6 +1,6 @@
 pub mod accounts;
+pub mod connect;
+pub mod import;
+pub mod restore;
 pub mod screening;
 pub mod settings;
-
-mod connect;
-mod import;

crates/coop/src/dialogs/restore.rs

@@ -0,0 +1,130 @@
+use std::time::Duration;
+
+use anyhow::Error;
+use device::DeviceRegistry;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString, Styled,
+    Subscription, Task, Window, div,
+};
+use nostr_connect::prelude::*;
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::input::{InputEvent, InputState, TextInput};
+use ui::{WindowExtension, v_flex};
+
+#[derive(Debug)]
+pub struct RestoreEncryption {
+    /// Secret key input
+    key_input: Entity<InputState>,
+
+    /// Error message
+    error: Entity<Option<SharedString>>,
+
+    /// Async tasks
+    tasks: Vec<Task<Result<(), Error>>>,
+
+    /// Event subscription
+    _subscription: Option<Subscription>,
+}
+
+impl RestoreEncryption {
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let key_input = cx.new(|cx| InputState::new(window, cx).masked(true));
+        let error = cx.new(|_| None);
+
+        let subscription =
+            cx.subscribe_in(&key_input, window, |this, _input, event, window, cx| {
+                if let InputEvent::PressEnter { .. } = event {
+                    this.restore(window, cx);
+                };
+            });
+
+        Self {
+            key_input,
+            error,
+            tasks: vec![],
+            _subscription: Some(subscription),
+        }
+    }
+
+    fn restore(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let device = DeviceRegistry::global(cx);
+        let content = self.key_input.read(cx).value();
+
+        if !content.is_empty() {
+            self.set_error("Secret Key cannot be empty.", cx);
+        }
+
+        let Ok(secret) = SecretKey::parse(&content) else {
+            self.set_error("Secret Key is invalid.", cx);
+            return;
+        };
+
+        device.update(cx, |this, cx| {
+            this.set_announcement(Keys::new(secret), cx);
+        });
+
+        // Close the current modal
+        window.close_modal(cx);
+    }
+
+    fn set_error<S>(&mut self, message: S, cx: &mut Context<Self>)
+    where
+        S: Into<SharedString>,
+    {
+        // Update error message
+        self.error.update(cx, |this, cx| {
+            *this = Some(message.into());
+            cx.notify();
+        });
+
+        // Clear the error message after 3 secs
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            cx.background_executor().timer(Duration::from_secs(3)).await;
+
+            this.update(cx, |this, cx| {
+                this.error.update(cx, |this, cx| {
+                    *this = None;
+                    cx.notify();
+                });
+            })?;
+
+            Ok(())
+        }));
+    }
+}
+
+impl Render for RestoreEncryption {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .gap_2()
+            .text_sm()
+            .child(
+                v_flex()
+                    .gap_1()
+                    .text_sm()
+                    .text_color(cx.theme().text_muted)
+                    .child("Secret Key")
+                    .child(TextInput::new(&self.key_input)),
+            )
+            .child(
+                Button::new("restore")
+                    .label("Restore")
+                    .primary()
+                    .on_click(cx.listener(move |this, _, window, cx| {
+                        this.restore(window, cx);
+                    })),
+            )
+            .when_some(self.error.read(cx).as_ref(), |this, error| {
+                this.child(
+                    div()
+                        .text_xs()
+                        .text_center()
+                        .text_color(cx.theme().text_danger)
+                        .child(error.clone()),
+                )
+            })
+    }
+}

crates/coop/src/main.rs

@@ -44,6 +44,7 @@ fn main() {
             cx.set_menus(vec![Menu {
                 name: "Coop".into(),
                 items: vec![MenuItem::action("Quit", Quit)],
+                disabled: false,
             }]);
 
             // Set up the window bounds

crates/coop/src/sidebar/entry.rs

@@ -148,26 +148,27 @@ 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 {
-                            let screening = screening::init(public_key, window, cx);
+                    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| {
-                                this.confirm()
-                                    .child(screening.clone())
-                                    .button_props(
-                                        ModalButtonProps::default()
-                                            .cancel_text("Ignore")
-                                            .ok_text("Response"),
-                                    )
-                                    .on_cancel(move |_event, window, cx| {
-                                        window.dispatch_action(Box::new(ClosePanel), cx);
-                                        // Prevent closing the modal on click
-                                        // modal will be automatically closed after closing panel
-                                        false
-                                    })
-                            });
-                        }
+                        window.open_modal(cx, move |this, _window, _cx| {
+                            this.confirm()
+                                .child(screening.clone())
+                                .button_props(
+                                    ModalButtonProps::default()
+                                        .cancel_text("Ignore")
+                                        .ok_text("Response"),
+                                )
+                                .on_cancel(move |_event, window, cx| {
+                                    window.dispatch_action(Box::new(ClosePanel), cx);
+                                    // Prevent closing the modal on click
+                                    // modal will be automatically closed after closing panel
+                                    false
+                                })
+                        });
                     }
                 })
             })

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

@@ -4,12 +4,14 @@ use std::sync::Arc;
 
 use ::settings::AppSettings;
 use chat::{ChatEvent, ChatRegistry};
+use common::download_dir;
 use device::{DeviceEvent, DeviceRegistry};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     Action, App, AppContext, Axis, Context, Entity, InteractiveElement, IntoElement, ParentElement,
     Render, SharedString, Styled, Subscription, Window, div, px,
 };
+use nostr_sdk::prelude::*;
 use person::PersonRegistry;
 use serde::Deserialize;
 use smallvec::{SmallVec, smallvec};
@@ -23,13 +25,14 @@ use ui::menu::{DropdownMenu, PopupMenuItem};
 use ui::notification::{Notification, NotificationKind};
 use ui::{Disableable, IconName, Root, Sizable, WindowExtension, h_flex, v_flex};
 
+use crate::dialogs::restore::RestoreEncryption;
 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.";
-
+                       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 +40,8 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<Workspace> {
     cx.new(|cx| Workspace::new(window, cx))
 }
 
+struct DeviceNotifcation;
+struct SignerNotifcation;
 struct RelayNotifcation;
 
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
@@ -45,9 +50,11 @@ enum Command {
     ToggleTheme,
     ToggleAccount,
 
-    RefreshEncryption,
     RefreshRelayList,
     RefreshMessagingRelays,
+    BackupEncryption,
+    ImportEncryption,
+    RefreshEncryption,
     ResetEncryption,
 
     ShowRelayList,
@@ -107,26 +114,42 @@ 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);
                     }
                     StateEvent::RelayNotConfigured => {
-                        this.relay_notification(window, cx);
+                        this.relay_warning(window, cx);
                     }
                     StateEvent::RelayConnected => {
                         window.clear_notification::<RelayNotifcation>(cx);
@@ -136,6 +159,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);
                     }
                     _ => {}
                 };
@@ -144,13 +169,55 @@ impl Workspace {
 
         subscriptions.push(
             // Observe all events emitted by the device registry
-            cx.subscribe_in(&device, window, |_this, _device, ev, window, cx| {
-                match ev {
+            cx.subscribe_in(&device, window, |_this, _device, event, window, cx| {
+                match event {
+                    DeviceEvent::Requesting => {
+                        const MSG: &str =
+                            "Please open the other client and approve the encryption key request";
+
+                        let note = Notification::new()
+                            .id::<DeviceNotifcation>()
+                            .title("Wait for approval")
+                            .message(MSG)
+                            .with_kind(NotificationKind::Info);
+
+                        window.push_notification(note, cx);
+                    }
+                    DeviceEvent::Creating => {
+                        let note = Notification::new()
+                            .id::<DeviceNotifcation>()
+                            .message("Creating encryption key")
+                            .with_kind(NotificationKind::Info);
+
+                        window.push_notification(note, cx);
+                    }
                     DeviceEvent::Set => {
-                        window.push_notification(
-                            Notification::success("Encryption Key has been set"),
-                            cx,
-                        );
+                        let note = Notification::new()
+                            .id::<DeviceNotifcation>()
+                            .message("Encryption Key has been set")
+                            .with_kind(NotificationKind::Success);
+
+                        window.push_notification(note, cx);
+                    }
+                    DeviceEvent::NotSet { reason } => {
+                        let note = Notification::new()
+                            .id::<DeviceNotifcation>()
+                            .title("Cannot setup the encryption key")
+                            .message(reason)
+                            .autohide(false)
+                            .with_kind(NotificationKind::Error);
+
+                        window.push_notification(note, cx);
+                    }
+                    DeviceEvent::NotSubscribe { reason } => {
+                        let note = Notification::new()
+                            .id::<DeviceNotifcation>()
+                            .title("Cannot getting messages")
+                            .message(reason)
+                            .autohide(false)
+                            .with_kind(NotificationKind::Error);
+
+                        window.push_notification(note, cx);
                     }
                     DeviceEvent::Error(error) => {
                         window.push_notification(Notification::error(error).autohide(false), cx);
@@ -228,14 +295,14 @@ impl Workspace {
     where
         P: PanelView,
     {
-        if let Some(root) = window.root::<Root>().flatten() {
-            if 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);
-                    });
+        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);
                 });
-            }
+            });
         }
     }
 
@@ -385,14 +452,57 @@ impl Workspace {
             Command::ToggleAccount => {
                 self.account_selector(window, cx);
             }
+            Command::BackupEncryption => {
+                let device = DeviceRegistry::global(cx).downgrade();
+                let save_dialog = cx.prompt_for_new_path(download_dir(), Some("encryption.txt"));
+
+                cx.spawn_in(window, async move |_this, cx| {
+                    // Get the output path from the save dialog
+                    let output_path = match save_dialog.await {
+                        Ok(Ok(Some(path))) => path,
+                        Ok(Ok(None)) | Err(_) => return Ok(()),
+                        Ok(Err(error)) => {
+                            cx.update(|window, cx| {
+                                let message = format!("Failed to pick save location: {error:#}");
+                                let note = Notification::error(message).autohide(false);
+                                window.push_notification(note, cx);
+                            })?;
+                            return Ok(());
+                        }
+                    };
+
+                    // Get the backup task
+                    let backup =
+                        device.read_with(cx, |this, cx| this.backup(output_path.clone(), cx))?;
+
+                    // Run the backup task
+                    backup.await?;
+
+                    // Open the backup file with the system's default application
+                    cx.update(|_window, cx| {
+                        cx.open_with_system(output_path.as_path());
+                    })?;
+
+                    Ok::<_, anyhow::Error>(())
+                })
+                .detach();
+            }
+            Command::ImportEncryption => {
+                self.import_encryption(window, cx);
+            }
         }
     }
 
     fn confirm_reset_encryption(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        window.open_modal(cx, |this, _window, cx| {
+        let device = DeviceRegistry::global(cx);
+        let ent = device.downgrade();
+
+        window.open_modal(cx, move |this, _window, cx| {
+            let ent = ent.clone();
+
             this.confirm()
                 .show_close(true)
-                .title("Reset Encryption Keys")
+                .title("Reset Encryption Key")
                 .child(
                     v_flex()
                         .gap_1()
@@ -401,43 +511,31 @@ impl Workspace {
                         .child(
                             div()
                                 .italic()
-                                .text_color(cx.theme().warning_active)
+                                .text_color(cx.theme().text_danger)
                                 .child(SharedString::from(ENC_WARN)),
                         ),
                 )
-                .on_ok(move |_ev, window, cx| {
-                    let device = DeviceRegistry::global(cx);
-                    let task = device.read(cx).create_encryption(cx);
-
-                    window
-                        .spawn(cx, async move |cx| {
-                            let result = task.await;
-
-                            cx.update(|window, cx| match result {
-                                Ok(keys) => {
-                                    device.update(cx, |this, cx| {
-                                        this.set_signer(keys, cx);
-                                        this.listen_request(cx);
-                                    });
-                                    window.close_modal(cx);
-                                }
-                                Err(e) => {
-                                    window.push_notification(
-                                        Notification::error(e.to_string()).autohide(false),
-                                        cx,
-                                    );
-                                }
-                            })
-                            .ok();
-                        })
-                        .detach();
-
-                    // false to keep modal open
-                    false
+                .on_ok(move |_ev, _window, cx| {
+                    ent.update(cx, |this, cx| {
+                        this.set_announcement(Keys::generate(), cx);
+                    })
+                    .ok();
+                    // true to close modal
+                    true
                 })
         });
     }
 
+    fn import_encryption(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let restore = cx.new(|cx| RestoreEncryption::new(window, cx));
+
+        window.open_modal(cx, move |this, _window, _cx| {
+            this.width(px(520.))
+                .title("Restore Encryption")
+                .child(restore.clone())
+        });
+    }
+
     fn account_selector(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let accounts = accounts::init(window, cx);
 
@@ -447,7 +545,6 @@ impl Workspace {
                 .show_close(false)
                 .keyboard(false)
                 .overlay_closable(false)
-                .pb_2()
                 .child(accounts.clone())
         });
     }
@@ -460,7 +557,6 @@ impl Workspace {
             this.width(px(520.))
                 .show_close(true)
                 .title("Select theme")
-                .pb_2()
                 .child(v_flex().gap_2().w_full().children({
                     let mut items = vec![];
 
@@ -533,7 +629,7 @@ impl Workspace {
         });
     }
 
-    fn relay_notification(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn relay_warning(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         const BODY: &str = "Coop cannot found your gossip relay list. \
                             Maybe you haven't set it yet or relay not responsed";
 
@@ -582,7 +678,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 +757,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;
 
@@ -683,27 +779,63 @@ impl Workspace {
                     .ghost()
                     .dropdown_menu(move |this, _window, cx| {
                         let device = DeviceRegistry::global(cx);
-                        let state = device.read(cx).state();
+                        let subscribing = device.read(cx).subscribing;
+                        let requesting = device.read(cx).requesting;
 
                         this.min_w(px(260.))
+                            .label("Encryption Key")
+                            .when(requesting, |this| {
+                                this.item(PopupMenuItem::element(move |_window, cx| {
+                                    h_flex()
+                                        .px_1()
+                                        .w_full()
+                                        .gap_2()
+                                        .text_sm()
+                                        .child(
+                                            div()
+                                                .size_1p5()
+                                                .rounded_full()
+                                                .bg(cx.theme().icon_accent),
+                                        )
+                                        .child(SharedString::from("Waiting for approval..."))
+                                }))
+                            })
                             .item(PopupMenuItem::element(move |_window, cx| {
                                 h_flex()
                                     .px_1()
                                     .w_full()
                                     .gap_2()
                                     .text_sm()
-                                    .child(
-                                        div()
-                                            .size_1p5()
-                                            .rounded_full()
-                                            .when(state.set(), |this| this.bg(gpui::green()))
-                                            .when(state.requesting(), |this| {
-                                                this.bg(cx.theme().icon_accent)
-                                            }),
-                                    )
-                                    .child(SharedString::from(state.to_string()))
+                                    .when(!subscribing, |this| {
+                                        this.text_color(cx.theme().text_muted)
+                                    })
+                                    .child(div().size_1p5().rounded_full().map(|this| {
+                                        if subscribing {
+                                            this.bg(cx.theme().icon_accent)
+                                        } else {
+                                            this.bg(cx.theme().icon_muted)
+                                        }
+                                    }))
+                                    .map(|this| {
+                                        if subscribing {
+                                            this.child("Listening for messages")
+                                        } else {
+                                            this.child("Idle")
+                                        }
+                                    })
                             }))
                             .separator()
+                            .menu_with_icon(
+                                "Backup",
+                                IconName::Shield,
+                                Box::new(Command::BackupEncryption),
+                            )
+                            .menu_with_icon(
+                                "Restore from secret key",
+                                IconName::Usb,
+                                Box::new(Command::ImportEncryption),
+                            )
+                            .separator()
                             .menu_with_icon(
                                 "Reload",
                                 IconName::Refresh,
@@ -724,32 +856,53 @@ impl Workspace {
                     .loading(!inbox_connected)
                     .disabled(!inbox_connected)
                     .when(!inbox_connected, |this| {
-                        this.tooltip("Connecting to user's messaging relays...")
+                        this.tooltip("Connecting to the user's messaging relays...")
                     })
                     .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()),
+                                    )
                             }))
                         });
 
@@ -775,7 +928,7 @@ impl Workspace {
                     .loading(!relay_connected)
                     .disabled(!relay_connected)
                     .when(!relay_connected, |this| {
-                        this.tooltip("Connecting to user's relay list...")
+                        this.tooltip("Connecting to the user's relay list...")
                     })
                     .when(relay_connected, |this| this.indicator())
                     .dropdown_menu(move |this, _window, _cx| {
@@ -802,8 +955,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

@@ -1,21 +1,22 @@
 use std::cell::Cell;
 use std::collections::{HashMap, HashSet};
+use std::path::PathBuf;
 use std::rc::Rc;
 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, NostrRegistry, StateEvent, TIMEOUT, app_name};
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::notification::Notification;
-use ui::{Disableable, IconName, Sizable, WindowExtension, h_flex, v_flex};
+use ui::{Disableable, IconName, Sizable, StyledExt, WindowExtension, h_flex, v_flex};
 
 const IDENTIFIER: &str = "coop:device";
 const MSG: &str = "You've requested an encryption key from another device. \
@@ -34,20 +35,64 @@ impl Global for GlobalDeviceRegistry {}
 pub enum DeviceEvent {
     /// A new encryption signer has been set
     Set,
+    /// The device is requesting an encryption key
+    Requesting,
+    /// The device is creating a new encryption key
+    Creating,
+    /// Encryption key is not set
+    NotSet { reason: SharedString },
+    /// An event to notify that Coop isn't subscribed to gift wrap events
+    NotSubscribe { reason: SharedString },
     /// An error occurred
     Error(SharedString),
 }
 
+impl DeviceEvent {
+    pub fn error<T>(error: T) -> Self
+    where
+        T: Into<SharedString>,
+    {
+        Self::Error(error.into())
+    }
+
+    pub fn not_subscribe<T>(reason: T) -> Self
+    where
+        T: Into<SharedString>,
+    {
+        Self::NotSubscribe {
+            reason: reason.into(),
+        }
+    }
+
+    pub fn not_set<T>(reason: T) -> Self
+    where
+        T: Into<SharedString>,
+    {
+        Self::NotSet {
+            reason: reason.into(),
+        }
+    }
+}
+
 /// Device Registry
 ///
 /// NIP-4e: https://github.com/nostr-protocol/nips/blob/per-device-keys/4e.md
 #[derive(Debug)]
 pub struct DeviceRegistry {
-    /// Device state
-    state: DeviceState,
+    /// Whether the registry is currently subscribing to gift wrap events
+    pub subscribing: bool,
+
+    /// Whether the registry is waiting for encryption key approval from other devices
+    pub requesting: bool,
+
+    /// Whether there is a pending request for encryption key approval
+    pub has_pending_request: bool,
 
     /// Async tasks
     tasks: Vec<Task<Result<(), Error>>>,
+
+    /// Event subscription
+    _subscription: Option<Subscription>,
 }
 
 impl EventEmitter<DeviceEvent> for DeviceRegistry {}
@@ -65,16 +110,32 @@ impl DeviceRegistry {
 
     /// Create a new device registry instance
     fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let state = DeviceState::default();
+        let nostr = NostrRegistry::global(cx);
+
+        // Get announcement when signer is set
+        let subscription = cx.subscribe_in(&nostr, window, |this, _e, event, _window, cx| {
+            match event {
+                StateEvent::SignerSet => {
+                    this.set_subscribing(false, cx);
+                    this.set_requesting(false, 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,
+            subscribing: false,
+            requesting: false,
+            has_pending_request: false,
             tasks: vec![],
+            _subscription: Some(subscription),
         }
     }
 
@@ -88,10 +149,8 @@ impl DeviceRegistry {
             let mut processed_events = HashSet::new();
 
             while let Some(notification) = notifications.next().await {
-                if let ClientNotification::Message {
-                    message: RelayMessage::Event { event, .. },
-                    ..
-                } = notification
+                if let ClientNotification::Message { message, .. } = notification
+                    && let RelayMessage::Event { event, .. } = *message
                 {
                     if !processed_events.insert(event.id) {
                         // Skip if the event has already been processed
@@ -120,13 +179,13 @@ impl DeviceRegistry {
         self.tasks.push(cx.spawn_in(window, async move |this, cx| {
             while let Ok(event) = rx.recv_async().await {
                 match event.kind {
-                    // New request event
+                    // New request event from other device
                     Kind::Custom(4454) => {
                         this.update_in(cx, |this, window, cx| {
                             this.ask_for_approval(event, window, cx);
                         })?;
                     }
-                    // New response event
+                    // New response event from the master device
                     Kind::Custom(4455) => {
                         this.update(cx, |this, cx| {
                             this.extract_encryption(event, cx);
@@ -135,24 +194,30 @@ impl DeviceRegistry {
                     _ => {}
                 }
             }
-
             Ok(())
         }));
     }
 
-    /// Get the device state
-    pub fn state(&self) -> DeviceState {
-        self.state.clone()
+    /// Set whether the registry is currently subscribing to gift wrap events
+    fn set_subscribing(&mut self, subscribing: bool, cx: &mut Context<Self>) {
+        self.subscribing = subscribing;
+        cx.notify();
     }
 
-    /// Set the device state
-    fn set_state(&mut self, state: DeviceState, cx: &mut Context<Self>) {
-        self.state = state;
+    /// Set whether the registry is waiting for encryption key approval from other devices
+    fn set_requesting(&mut self, requesting: bool, cx: &mut Context<Self>) {
+        self.requesting = requesting;
+        cx.notify();
+    }
+
+    /// Set whether there is a pending request for encryption key approval
+    fn set_has_pending_request(&mut self, pending: bool, cx: &mut Context<Self>) {
+        self.has_pending_request = pending;
         cx.notify();
     }
 
     /// Set the decoupled encryption key for the current user
-    pub fn set_signer<S>(&mut self, new: S, cx: &mut Context<Self>)
+    fn set_signer<S>(&mut self, new: S, cx: &mut Context<Self>)
     where
         S: NostrSigner + 'static,
     {
@@ -164,7 +229,7 @@ impl DeviceRegistry {
 
             // Update state
             this.update(cx, |this, cx| {
-                this.set_state(DeviceState::Set, cx);
+                cx.emit(DeviceEvent::Set);
                 this.get_messages(cx);
             })?;
 
@@ -172,12 +237,6 @@ impl DeviceRegistry {
         }));
     }
 
-    /// Reset the device state
-    fn reset(&mut self, cx: &mut Context<Self>) {
-        self.state = DeviceState::Idle;
-        cx.notify();
-    }
-
     /// Get all messages for encryption keys
     fn get_messages(&mut self, cx: &mut Context<Self>) {
         let task = self.subscribe_to_giftwrap_events(cx);
@@ -185,59 +244,50 @@ impl DeviceRegistry {
         self.tasks.push(cx.spawn(async move |this, cx| {
             if let Err(e) = task.await {
                 this.update(cx, |_this, cx| {
-                    cx.emit(DeviceEvent::Error(SharedString::from(e.to_string())));
+                    cx.emit(DeviceEvent::not_subscribe(e.to_string()));
+                })?;
+            } else {
+                this.update(cx, |this, cx| {
+                    this.set_subscribing(true, cx);
                 })?;
             }
             Ok(())
         }));
     }
 
-    /// Get the messaging relays for the current user
-    fn get_user_messaging_relays(&self, cx: &App) -> Task<Result<Vec<RelayUrl>, Error>> {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-        let signer = nostr.read(cx).signer();
-
-        cx.background_spawn(async move {
-            let public_key = signer.get_public_key().await?;
-            let filter = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
-
-            if let Some(event) = client.database().query(filter).await?.first_owned() {
-                // Extract relay URLs from the event
-                let urls: Vec<RelayUrl> = nip17::extract_owned_relay_list(event).collect();
-
-                // Ensure all relays are connected
-                for url in urls.iter() {
-                    client.add_relay(url).and_connect().await?;
-                }
-
-                Ok(urls)
-            } else {
-                Err(anyhow!("Relays not found"))
-            }
-        })
-    }
-
     /// Continuously get gift wrap events for the current user in their messaging relays
     fn subscribe_to_giftwrap_events(&self, cx: &App) -> Task<Result<(), Error>> {
+        let persons = PersonRegistry::global(cx);
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
         let signer = nostr.read(cx).signer();
-        let urls = self.get_user_messaging_relays(cx);
+
+        let Some(user) = signer.public_key() else {
+            return Task::ready(Err(anyhow!("User not found")));
+        };
+
+        let profile = persons.read(cx).get(&user, cx);
+        let relays = profile.messaging_relays().clone();
 
         cx.background_spawn(async move {
-            let urls = urls.await?;
             let encryption = signer.get_encryption_signer().await.context("not found")?;
             let public_key = encryption.get_public_key().await?;
 
             let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
             let id = SubscriptionId::new(DEVICE_GIFTWRAP);
 
+            // Ensure user has relays configured
+            if relays.is_empty() {
+                return Err(anyhow!("No messaging relays found"));
+            }
+
+            // Ensure relays are connected
+            for url in relays.iter() {
+                client.add_relay(url).and_connect().await?;
+            }
+
             // Construct target for subscription
-            let target: HashMap<RelayUrl, Filter> = urls
+            let target: HashMap<RelayUrl, Filter> = relays
                 .into_iter()
                 .map(|relay| (relay, filter.clone()))
                 .collect();
@@ -249,14 +299,26 @@ impl DeviceRegistry {
         })
     }
 
+    /// Backup the encryption's secret key to a file
+    pub fn backup(&self, path: PathBuf, cx: &App) -> Task<Result<(), Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        cx.background_spawn(async move {
+            let keys = get_keys(&client).await?;
+            let content = keys.secret_key().to_bech32()?;
+
+            smol::fs::write(path, &content).await?;
+
+            Ok(())
+        })
+    }
+
     /// Get device announcement for current user
     pub fn get_announcement(&mut self, cx: &mut Context<Self>) {
         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?;
@@ -285,13 +347,15 @@ impl DeviceRegistry {
         self.tasks.push(cx.spawn(async move |this, cx| {
             match task.await {
                 Ok(event) => {
+                    // Set encryption key from the announcement event
                     this.update(cx, |this, cx| {
-                        this.new_signer(&event, cx);
+                        this.set_encryption(&event, cx);
                     })?;
                 }
                 Err(_) => {
+                    // User has no announcement, create a new one
                     this.update(cx, |this, cx| {
-                        this.announce(cx);
+                        this.set_announcement(Keys::generate(), cx);
                     })?;
                 }
             }
@@ -300,26 +364,55 @@ impl DeviceRegistry {
         }));
     }
 
-    /// Create new encryption keys
-    pub fn create_encryption(&self, cx: &App) -> Task<Result<Keys, Error>> {
+    /// Create a new device signer and announce it to user's relay list
+    pub fn set_announcement(&mut self, keys: Keys, cx: &mut Context<Self>) {
+        let task = self.create_encryption(keys, cx);
+
+        // Notify that we're creating a new encryption key
+        cx.emit(DeviceEvent::Creating);
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(keys) => {
+                    this.update(cx, |this, cx| {
+                        this.set_signer(keys, cx);
+                        this.wait_for_request(cx);
+                    })?;
+                }
+                Err(e) => {
+                    this.update(cx, |_this, cx| {
+                        cx.emit(DeviceEvent::error(e.to_string()));
+                    })?;
+                }
+            }
+            Ok(())
+        }));
+    }
+
+    /// Create new encryption key and announce it to user's relay list
+    fn create_encryption(&self, keys: Keys, cx: &App) -> Task<Result<Keys, Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let keys = Keys::generate();
         let secret = keys.secret_key().to_secret_hex();
         let n = keys.public_key();
 
         cx.background_spawn(async move {
             // Construct an announcement event
-            let event = client
-                .sign_event_builder(EventBuilder::new(Kind::Custom(10044), "").tags(vec![
-                    Tag::custom(TagKind::custom("n"), vec![n]),
-                    Tag::client(app_name()),
-                ]))
-                .await?;
+            let builder = EventBuilder::new(Kind::Custom(10044), "").tags(vec![
+                Tag::custom(TagKind::custom("n"), vec![n]),
+                Tag::client(app_name()),
+            ]);
+
+            // Sign the event with user's signer
+            let event = client.sign_event_builder(builder).await?;
 
             // Publish announcement
-            client.send_event(&event).to_nip65().await?;
+            client
+                .send_event(&event)
+                .to_nip65()
+                .ack_policy(AckPolicy::none())
+                .await?;
 
             // Save device keys to the database
             set_keys(&client, &secret).await?;
@@ -328,40 +421,23 @@ impl DeviceRegistry {
         })
     }
 
-    /// Create a new device signer and announce it
-    fn announce(&mut self, cx: &mut Context<Self>) {
-        let task = self.create_encryption(cx);
-
-        self.tasks.push(cx.spawn(async move |this, cx| {
-            let keys = task.await?;
-
-            // Update signer
-            this.update(cx, |this, cx| {
-                this.set_signer(keys, cx);
-                this.listen_request(cx);
-            })?;
-
-            Ok(())
-        }));
-    }
-
-    /// Initialize device signer (decoupled encryption key) for the current user
-    pub fn new_signer(&mut self, event: &Event, cx: &mut Context<Self>) {
+    /// Set encryption key from the announcement event
+    fn set_encryption(&mut self, event: &Event, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
         let announcement = Announcement::from(event);
         let device_pubkey = announcement.public_key();
 
+        // Get encryption key from the database and compare with the announcement
         let task: Task<Result<Keys, Error>> = cx.background_spawn(async move {
             if let Ok(keys) = get_keys(&client).await {
                 if keys.public_key() != device_pubkey {
-                    return Err(anyhow!("Key mismatch"));
+                    return Err(anyhow!("Encryption Key doesn't match the announcement"));
                 };
-
                 Ok(keys)
             } else {
-                Err(anyhow!("Key not found"))
+                Err(anyhow!("Encryption Key not found. Please create a new key"))
             }
         });
 
@@ -370,74 +446,49 @@ impl DeviceRegistry {
                 Ok(keys) => {
                     this.update(cx, |this, cx| {
                         this.set_signer(keys, cx);
-                        this.listen_request(cx);
+                        this.wait_for_request(cx);
                     })?;
                 }
                 Err(e) => {
-                    log::warn!("Failed to initialize device signer: {e}");
-                    this.update(cx, |this, cx| {
-                        this.request(cx);
-                        this.listen_approval(cx);
+                    this.update(cx, |_this, cx| {
+                        cx.emit(DeviceEvent::not_set(e.to_string()));
                     })?;
                 }
             };
-
             Ok(())
         }));
     }
 
-    /// Listen for device key requests on user's write relays
-    pub fn listen_request(&mut self, cx: &mut Context<Self>) {
+    /// Wait for encryption key requests from now on
+    fn wait_for_request(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
         let signer = nostr.read(cx).signer();
 
-        let Some(public_key) = signer.public_key() else {
-            return;
-        };
+        self.tasks.push(cx.background_spawn(async move {
+            let public_key = signer.get_public_key().await?;
 
-        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            // Construct a filter for device key requests
-            let filter = Filter::new()
+            // Construct a filter for encryption key requests
+            let now = Filter::new()
                 .kind(Kind::Custom(4454))
                 .author(public_key)
                 .since(Timestamp::now());
 
-            // Subscribe to the device key requests on user's write relays
-            client.subscribe(filter).await?;
-
-            Ok(())
-        });
-
-        task.detach();
-    }
-
-    /// Listen for device key approvals on user's write relays
-    fn listen_approval(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-        let signer = nostr.read(cx).signer();
-
-        let Some(public_key) = signer.public_key() else {
-            return;
-        };
-
-        self.tasks.push(cx.background_spawn(async move {
-            // Construct a filter for device key requests
-            let filter = Filter::new()
-                .kind(Kind::Custom(4455))
+            // Construct a filter for the last encryption key request
+            let last = Filter::new()
+                .kind(Kind::Custom(4454))
                 .author(public_key)
-                .since(Timestamp::now());
+                .limit(1);
 
             // Subscribe to the device key requests on user's write relays
-            client.subscribe(filter).await?;
+            client.subscribe(vec![now, last]).await?;
 
             Ok(())
         }));
     }
 
     /// Request encryption keys from other device
-    fn request(&mut self, cx: &mut Context<Self>) {
+    pub fn request(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
         let signer = nostr.read(cx).signer();
@@ -445,9 +496,10 @@ impl DeviceRegistry {
         let app_keys = nostr.read(cx).keys();
         let app_pubkey = app_keys.public_key();
 
-        let task: Task<Result<Option<Keys>, Error>> = cx.background_spawn(async move {
+        let task: Task<Result<Option<Event>, Error>> = cx.background_spawn(async move {
             let public_key = signer.get_public_key().await?;
 
+            // Construct a filter to get the latest approval event
             let filter = Filter::new()
                 .kind(Kind::Custom(4455))
                 .author(public_key)
@@ -455,30 +507,18 @@ impl DeviceRegistry {
                 .limit(1);
 
             match client.database().query(filter).await?.first_owned() {
-                Some(event) => {
-                    let root_device = event
-                        .tags
-                        .find(TagKind::custom("P"))
-                        .and_then(|tag| tag.content())
-                        .and_then(|content| PublicKey::parse(content).ok())
-                        .context("Invalid event's tags")?;
-
-                    let payload = event.content.as_str();
-                    let decrypted = app_keys.nip44_decrypt(&root_device, payload).await?;
-
-                    let secret = SecretKey::from_hex(&decrypted)?;
-                    let keys = Keys::new(secret);
-
-                    Ok(Some(keys))
-                }
+                // Found an approval event
+                Some(event) => Ok(Some(event)),
+                // No approval event found, construct a request event
                 None => {
                     // Construct an event for device key request
-                    let event = client
-                        .sign_event_builder(EventBuilder::new(Kind::Custom(4454), "").tags(vec![
-                            Tag::client(app_name()),
-                            Tag::custom(TagKind::custom("P"), vec![app_pubkey]),
-                        ]))
-                        .await?;
+                    let builder = EventBuilder::new(Kind::Custom(4454), "").tags(vec![
+                        Tag::custom(TagKind::custom("P"), vec![app_pubkey]),
+                        Tag::client(app_name()),
+                    ]);
+
+                    // Sign the event with user's signer
+                    let event = client.sign_event_builder(builder).await?;
 
                     // Send the event to write relays
                     client.send_event(&event).to_nip65().await?;
@@ -490,32 +530,58 @@ impl DeviceRegistry {
 
         self.tasks.push(cx.spawn(async move |this, cx| {
             match task.await {
-                Ok(Some(keys)) => {
+                Ok(Some(event)) => {
                     this.update(cx, |this, cx| {
-                        this.set_signer(keys, cx);
+                        this.extract_encryption(event, cx);
                     })?;
                 }
                 Ok(None) => {
                     this.update(cx, |this, cx| {
-                        this.set_state(DeviceState::Requesting, cx);
+                        this.set_requesting(true, cx);
+                        this.wait_for_approval(cx);
+
+                        cx.emit(DeviceEvent::Requesting);
                     })?;
                 }
                 Err(e) => {
-                    log::error!("Failed to request the encryption key: {e}");
+                    this.update(cx, |_this, cx| {
+                        cx.emit(DeviceEvent::error(e.to_string()));
+                    })?;
                 }
             };
+            Ok(())
+        }));
+    }
+
+    /// Wait for encryption key approvals
+    fn wait_for_approval(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let signer = nostr.read(cx).signer();
+
+        self.tasks.push(cx.background_spawn(async move {
+            let public_key = signer.get_public_key().await?;
+
+            // Construct a filter for device key requests
+            let filter = Filter::new()
+                .kind(Kind::Custom(4455))
+                .author(public_key)
+                .since(Timestamp::now());
+
+            // Subscribe to the device key requests on user's write relays
+            client.subscribe(filter).await?;
 
             Ok(())
         }));
     }
 
-    /// Parse the response event for device keys from other devices
+    /// Parse the approval event to get encryption key then set it
     fn extract_encryption(&mut self, event: Event, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let app_keys = nostr.read(cx).keys();
 
         let task: Task<Result<Keys, Error>> = cx.background_spawn(async move {
-            let root_device = event
+            let master = event
                 .tags
                 .find(TagKind::custom("P"))
                 .and_then(|tag| tag.content())
@@ -523,7 +589,7 @@ impl DeviceRegistry {
                 .context("Invalid event's tags")?;
 
             let payload = event.content.as_str();
-            let decrypted = app_keys.nip44_decrypt(&root_device, payload).await?;
+            let decrypted = app_keys.nip44_decrypt(&master, payload).await?;
 
             let secret = SecretKey::from_hex(&decrypted)?;
             let keys = Keys::new(secret);
@@ -532,13 +598,19 @@ impl DeviceRegistry {
         });
 
         self.tasks.push(cx.spawn(async move |this, cx| {
-            let keys = task.await?;
-
-            // Update signer
-            this.update(cx, |this, cx| {
-                this.set_signer(keys, cx);
-            })?;
-
+            match task.await {
+                Ok(keys) => {
+                    this.update(cx, |this, cx| {
+                        this.set_signer(keys, cx);
+                        this.set_requesting(false, cx);
+                    })?;
+                }
+                Err(e) => {
+                    this.update(cx, |_this, cx| {
+                        cx.emit(DeviceEvent::not_set(e.to_string()));
+                    })?;
+                }
+            }
             Ok(())
         }));
     }
@@ -547,7 +619,6 @@ impl DeviceRegistry {
     fn approve(&mut self, event: &Event, window: &mut Window, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let signer = nostr.read(cx).signer();
 
         // Get user's write relays
         let event = event.clone();
@@ -567,14 +638,14 @@ impl DeviceRegistry {
                 .context("Target is not a valid public key")?;
 
             // Encrypt the device keys with the user's signer
-            let payload = signer.nip44_encrypt(&target, &secret).await?;
+            let payload = keys.nip44_encrypt(&target, &secret).await?;
 
             // Construct the response event
             //
             // P tag: the current device's public key
             // p tag: the requester's public key
             let builder = EventBuilder::new(Kind::Custom(4455), payload).tags(vec![
-                Tag::custom(TagKind::custom("P"), vec![keys.public_key()]),
+                Tag::custom(TagKind::custom("P"), vec![keys.public_key().to_hex()]),
                 Tag::public_key(target),
             ]);
 
@@ -611,15 +682,15 @@ impl DeviceRegistry {
 
     /// Handle encryption request
     fn ask_for_approval(&mut self, event: Event, window: &mut Window, cx: &mut Context<Self>) {
-        let notification = self.notification(event, cx);
+        // Ignore if there is already a pending request
+        if self.has_pending_request {
+            return;
+        }
+        self.set_has_pending_request(true, cx);
 
-        cx.spawn_in(window, async move |_this, cx| {
-            cx.update(|window, cx| {
-                window.push_notification(notification, cx);
-            })
-            .ok();
-        })
-        .detach();
+        // Show notification
+        let notification = self.notification(event, cx);
+        window.push_notification(notification, cx);
     }
 
     /// Build a notification for the encryption request.
@@ -656,13 +727,14 @@ impl DeviceRegistry {
                                     .text_sm()
                                     .child(
                                         div()
+                                            .font_semibold()
                                             .text_xs()
                                             .text_color(cx.theme().text_muted)
                                             .child(SharedString::from("Requester:")),
                                     )
                                     .child(
                                         div()
-                                            .h_7()
+                                            .h_8()
                                             .w_full()
                                             .px_2()
                                             .rounded(cx.theme().radius)
@@ -681,13 +753,14 @@ impl DeviceRegistry {
                                     .text_sm()
                                     .child(
                                         div()
+                                            .font_semibold()
                                             .text_xs()
                                             .text_color(cx.theme().text_muted)
                                             .child(SharedString::from("Client:")),
                                     )
                                     .child(
                                         div()
-                                            .h_7()
+                                            .h_8()
                                             .w_full()
                                             .px_2()
                                             .rounded(cx.theme().radius)
@@ -728,10 +801,10 @@ 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 {
-            return public_key == event.pubkey;
-        }
+    if let Some(signer) = client.signer()
+        && let Ok(public_key) = signer.get_public_key().await
+    {
+        return public_key == event.pubkey;
     }
     false
 }

crates/person/src/lib.rs

@@ -135,7 +135,7 @@ impl PersonRegistry {
                 continue;
             };
 
-            if let RelayMessage::Event { event, .. } = message {
+            if let RelayMessage::Event { event, .. } = *message {
                 // Skip if the event has already been processed
                 if !processed.insert(event.id) {
                     continue;

crates/person/src/person.rs

@@ -123,16 +123,16 @@ 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() {
-                return SharedString::from(display_name);
-            }
+        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() {
-                return SharedString::from(name);
-            }
+        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.";
@@ -100,7 +100,7 @@ impl RelayAuth {
 
             while let Some(notification) = notifications.next().await {
                 if let ClientNotification::Message { relay_url, message } = notification {
-                    match message {
+                    match *message {
                         RelayMessage::Auth { challenge } => {
                             if challenges.insert(challenge.clone()) {
                                 let request = Arc::new(AuthRequest::new(challenge, relay_url));
@@ -221,31 +221,31 @@ impl RelayAuth {
 
             while let Some(notification) = notifications.next().await {
                 match notification {
-                    RelayNotification::Message {
-                        message: RelayMessage::Ok { event_id, .. },
-                    } => {
-                        if id != event_id {
-                            continue;
-                        }
-
-                        // Get all subscriptions
-                        let subscriptions = relay.subscriptions().await;
-
-                        // Re-subscribe to previous subscriptions
-                        for (id, filters) in subscriptions.into_iter() {
-                            if !filters.is_empty() {
-                                relay.send_msg(ClientMessage::req(id, filters)).await?;
+                    RelayNotification::Message { message } => {
+                        if let RelayMessage::Ok { event_id, .. } = *message {
+                            if id != event_id {
+                                continue;
                             }
-                        }
 
-                        // Re-send pending events
-                        for id in pending_events {
-                            if let Some(event) = client.database().event_by_id(&id).await? {
-                                relay.send_event(&event).await?;
+                            // Get all subscriptions
+                            let subscriptions = relay.subscriptions().await;
+
+                            // Re-subscribe to previous subscriptions
+                            for (id, filters) in subscriptions.into_iter() {
+                                if !filters.is_empty() {
+                                    relay.send_msg(ClientMessage::req(id, filters)).await?;
+                                }
                             }
-                        }
 
-                        return Ok(());
+                            // Re-send pending events
+                            for id in pending_events {
+                                if let Some(event) = client.database().event_by_id(&id).await? {
+                                    relay.send_event(&event).await?;
+                                }
+                            }
+
+                            return Ok(());
+                        }
                     }
                     RelayNotification::AuthenticationFailed => break,
                     _ => {}
@@ -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/Cargo.toml

@@ -11,7 +11,7 @@ nostr.workspace = true
 nostr-sdk.workspace = true
 nostr-lmdb.workspace = true
 nostr-memory.workspace = true
-nostr-gossip-sqlite.workspace = true
+nostr-gossip-memory.workspace = true
 nostr-connect.workspace = true
 nostr-blossom.workspace = true
 

crates/state/src/constants.rs

@@ -36,14 +36,16 @@ pub const NOSTR_CONNECT_RELAY: &str = "wss://relay.nip46.com";
 /// Default vertex relays
 pub const WOT_RELAYS: [&str; 1] = ["wss://relay.vertexlab.io"];
 
+/// Default search relays
+pub const INDEXER_RELAYS: [&str; 1] = ["wss://indexer.coracle.social"];
+
 /// Default search relays
 pub const SEARCH_RELAYS: [&str; 2] = ["wss://antiprimal.net", "wss://search.nos.today"];
 
 /// Default bootstrap relays
-pub const BOOTSTRAP_RELAYS: [&str; 4] = [
+pub const BOOTSTRAP_RELAYS: [&str; 3] = [
     "wss://relay.damus.io",
     "wss://relay.primal.net",
-    "wss://indexer.coracle.social",
     "wss://user.kindpag.es",
 ];
 

crates/state/src/device.rs

@@ -1,40 +1,6 @@
-use std::fmt::Display;
-
 use gpui::SharedString;
 use nostr_sdk::prelude::*;
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
-pub enum DeviceState {
-    #[default]
-    Idle,
-    Requesting,
-    Set,
-}
-
-impl Display for DeviceState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            DeviceState::Idle => write!(f, "Idle"),
-            DeviceState::Requesting => write!(f, "Wait for approval"),
-            DeviceState::Set => write!(f, "Encryption Key is ready"),
-        }
-    }
-}
-
-impl DeviceState {
-    pub fn idle(&self) -> bool {
-        matches!(self, DeviceState::Idle)
-    }
-
-    pub fn requesting(&self) -> bool {
-        matches!(self, DeviceState::Requesting)
-    }
-
-    pub fn set(&self) -> bool {
-        matches!(self, DeviceState::Set)
-    }
-}
-
 /// Announcement
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Announcement {

crates/state/src/lib.rs

@@ -6,7 +6,7 @@ use anyhow::{Context as AnyhowContext, Error, anyhow};
 use common::config_dir;
 use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, SharedString, Task, Window};
 use nostr_connect::prelude::*;
-use nostr_gossip_sqlite::prelude::*;
+use nostr_gossip_memory::prelude::*;
 use nostr_lmdb::prelude::*;
 use nostr_memory::prelude::*;
 use nostr_sdk::prelude::*;
@@ -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 {
@@ -101,20 +114,19 @@ impl NostrRegistry {
         // Construct the nostr npubs entity
         let npubs = cx.new(|_| vec![]);
 
-        // Construct the nostr gossip instance
-        let gossip = cx.foreground_executor().block_on(async move {
-            NostrGossipSqlite::open(config_dir().join("gossip"))
-                .await
-                .expect("Failed to initialize gossip instance")
-        });
-
         // Construct the nostr client builder
         let mut builder = ClientBuilder::default()
             .signer(signer.clone())
-            .gossip(gossip)
+            .gossip(NostrGossipMemory::unbounded())
+            .gossip_config(
+                GossipConfig::default()
+                    .no_background_refresh()
+                    .sync_idle_timeout(Duration::from_secs(TIMEOUT))
+                    .sync_initial_timeout(Duration::from_millis(600)),
+            )
             .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),
             });
@@ -176,7 +188,18 @@ impl NostrRegistry {
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             // Add search relay to the relay pool
             for url in SEARCH_RELAYS.into_iter() {
-                client.add_relay(url).await?;
+                client
+                    .add_relay(url)
+                    .capabilities(RelayCapabilities::READ)
+                    .await?;
+            }
+
+            // Add indexer relay to the relay pool
+            for url in INDEXER_RELAYS.into_iter() {
+                client
+                    .add_relay(url)
+                    .capabilities(RelayCapabilities::DISCOVERY)
+                    .await?;
             }
 
             // Add bootstrap relay to the relay pool
@@ -185,7 +208,10 @@ impl NostrRegistry {
             }
 
             // Connect to all added relays
-            client.connect().await;
+            client
+                .connect()
+                .and_wait(Duration::from_secs(TIMEOUT))
+                .await;
 
             Ok(())
         });
@@ -204,7 +230,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 +295,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 +315,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 +330,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 +384,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 +482,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 +529,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 +574,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 +582,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 +590,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 +667,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,11 +749,11 @@ 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 {
-                    results.push(public_key);
-                    return Ok(results);
-                }
+            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

crates/ui/src/dock/dock.rs

@@ -271,22 +271,22 @@ 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() {
-                let left_dock_read = left_dock.read(cx);
-                if left_dock_read.is_open() {
-                    left_dock_size = left_dock_read.size;
-                }
+        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() {
-                let right_dock_read = right_dock.read(cx);
-                if right_dock_read.is_open() {
-                    right_dock_size = right_dock_read.size;
-                }
+        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;
             }
         }
 

crates/ui/src/dock/stack_panel.rs

@@ -70,10 +70,10 @@ impl StackPanel {
             return false;
         }
 
-        if let Some(parent) = &self.parent {
-            if let Some(parent) = parent.upgrade() {
-                return parent.read(cx).is_last_panel(cx);
-            }
+        if let Some(parent) = &self.parent
+            && let Some(parent) = parent.upgrade()
+        {
+            return parent.read(cx).is_last_panel(cx);
         }
 
         true
@@ -297,12 +297,11 @@ 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) {
-                    return Some(panel);
-                }
-            }
+        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();
@@ -321,12 +320,11 @@ 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) {
-                    return Some(panel);
-                }
-            }
+        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() {

crates/ui/src/dock/tab_panel.rs

@@ -232,14 +232,13 @@ 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);
-                }
+            {
+                self.set_active_ix(ix, window, cx);
             }
 
             return;
@@ -372,12 +371,11 @@ 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) {
-                    return false;
-                }
-            }
+        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,10 +1101,10 @@ impl TabPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        if self.panels.len() > 1 {
-            if let Some(panel) = self.active_panel(cx) {
-                self.remove_panel(&panel, window, cx);
-            }
+        if self.panels.len() > 1
+            && let Some(panel) = self.active_panel(cx)
+        {
+            self.remove_panel(&panel, window, cx);
         }
     }
 }

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,10 +348,10 @@ 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 {
-                    points.push(point(next.top_left.x, corners.top_left.y));
-                }
+            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));
             }
         }
 
@@ -376,10 +376,10 @@ 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() {
-                selected_range = (ime_marked_range.end..ime_marked_range.end).into();
-            }
+        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,11 +830,12 @@ impl Element for TextElement {
         }
 
         // 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));
-            }
+        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

crates/ui/src/input/mask_pattern.rs

@@ -225,13 +225,12 @@ 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;
-                    }
+                {
+                    return false;
                 }
 
                 true
@@ -255,10 +254,10 @@ 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) {
-                                return true;
-                            }
+                        if let Some(next_token) = tokens.get(pos + 1)
+                            && next_token.is_match(ch)
+                        {
+                            return true;
                         }
                     }
                 }

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,16 +521,16 @@ 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;
-                    }
+                    )
+                {
+                    new_offset = line_start_offset + x;
                 }
             }
         }
@@ -1355,10 +1355,10 @@ 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() {
-                self.ime_marked_range = None;
-            }
+        if let Some(ime_marked_range) = &self.ime_marked_range
+            && ime_marked_range.is_empty()
+        {
+            self.ime_marked_range = None;
         }
 
         self.selecting = true;
@@ -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' {
-                offset -= 1;
-            }
+        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' {
-                offset += 1;
-            }
+        if let Some(ch) = self.text.char_at(offset)
+            && ch == '\r'
+        {
+            offset += 1;
         }
-
         offset
     }
 
@@ -1927,10 +1925,10 @@ impl InputState {
             return true;
         }
 
-        if let Some(validate) = &self.validate {
-            if !validate(new_text, cx) {
-                return false;
-            }
+        if let Some(validate) = &self.validate
+            && !validate(new_text, cx)
+        {
+            return false;
         }
 
         if !self.mask_pattern.is_valid(new_text) {
@@ -1979,19 +1977,19 @@ 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 {
-                let wrap_width = if !self.soft_wrap {
-                    // None to disable wrapping (will use Pixels::MAX)
-                    None
-                } else {
-                    last_layout.wrap_width
-                };
+        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
+            } else {
+                last_layout.wrap_width
+            };
 
-                self.text_wrapper.set_wrap_width(wrap_width, cx);
-                self.mode.update_auto_grow(&self.text_wrapper);
-                cx.notify();
-            }
+            self.text_wrapper.set_wrap_width(wrap_width, cx);
+            self.mode.update_auto_grow(&self.text_wrapper);
+            cx.notify();
         }
     }
 
@@ -2209,20 +2207,18 @@ 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));
-                }
+            {
+                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));
-                }
+            {
+                end_origin = Some(p + point(px(0.), y_offset));
             }
 
             index_offset += line.len() + 1;

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,10 +578,10 @@ 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) {
-                self.scroll_handle.scroll_to_item(item_ix, strategy);
-            }
+        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);

crates/ui/src/menu/popup_menu.rs

@@ -719,13 +719,13 @@ 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) {
-                return match item {
-                    PopupMenuItem::Submenu { menu, .. } => Some(menu.clone()),
-                    _ => None,
-                };
-            }
+        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,12 +965,11 @@ 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) {
-                    return;
-                }
-            }
+        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,10 +296,10 @@ 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) {
-                                    return;
-                                }
+                            if let Some(on_ok) = &on_ok
+                                && !on_ok(&ClickEvent::default(), window, cx)
+                            {
+                                return;
                             }
 
                             on_close(&ClickEvent::default(), window, 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,10 +142,10 @@ 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 {
-                self.resizing_panel_ix = Some(resizing_panel_ix - 1);
-            }
+        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,10 +142,10 @@ impl Root {
             })
             .collect::<Vec<_>>();
 
-        if let Some(ix) = show_overlay_ix {
-            if let Some(modal) = modals.get_mut(ix) {
-                modal.overlay_visible = true;
-            }
+        if let Some(ix) = show_overlay_ix
+            && let Some(modal) = modals.get_mut(ix)
+        {
+            modal.overlay_visible = true;
         }
 
         Some(div().children(modals))

flathub/.gitignore

@@ -0,0 +1,14 @@
+# Generated files - do not commit to main repo
+# These are generated by prepare-flathub.sh
+vendor/
+vendor.tar.gz
+su.reya.coop.yml
+su.reya.coop.metainfo.xml
+release-info.xml
+cargo-config.toml
+build/
+repo/
+
+# Keep the README and this .gitignore
+!README.md
+!.gitignore

flathub/README.md

@@ -0,0 +1,129 @@
+# Flathub Submission for Coop
+
+This directory contains the files needed to submit Coop to Flathub.
+
+## Prerequisites
+
+- Flatpak installed
+- `flatpak-builder` installed
+- Rust/Cargo installed (for vendoring)
+
+## Quick Start
+
+Run the preparation script from the repo root:
+
+```bash
+./script/prepare-flathub.sh
+```
+
+This will:
+1. Vendor all Rust dependencies (crates.io + git)
+2. Generate the metainfo.xml with proper release info
+3. Create `su.reya.coop.yml` - the Flatpak manifest for Flathub
+
+## Files Generated
+
+| File | Purpose |
+|------|---------|
+| `su.reya.coop.yml` | Main Flatpak manifest (submit this to Flathub) |
+| `su.reya.coop.metainfo.xml` | AppStream metadata with release info |
+| `vendor.tar.gz` | Vendored Rust dependencies |
+| `cargo-config.toml` | Cargo configuration for offline builds |
+| `release-info.xml` | Release info snippet for metainfo |
+
+## Testing Locally
+
+Before submitting to Flathub, test the build:
+
+```bash
+cd flathub
+
+# Build and install locally
+flatpak-builder --user --install --force-clean build su.reya.coop.yml
+
+# Test the app
+flatpak run su.reya.coop
+
+# Run the Flathub linter (must pass!)
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest su.reya.coop.yml
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
+```
+
+## Submitting to Flathub
+
+### 1. Prepare Your Release
+
+Ensure you have:
+- [ ] Committed all changes
+- [ ] Tagged the release: `git tag -a v1.0.0-beta2 -m "Release v1.0.0-beta2"`
+- [ ] Pushed the tag: `git push origin v1.0.0-beta2`
+- [ ] Run `./script/prepare-flathub.sh` to regenerate files
+
+### 2. Fork and Submit
+
+```bash
+# Fork https://github.com/flathub/flathub on GitHub first
+
+# Clone your fork (use the new-pr branch!)
+git clone --branch=new-pr git@github.com:YOUR_USERNAME/flathub.git
+cd flathub
+
+# Create a new branch
+git checkout -b su.reya.coop
+
+# Copy ONLY the manifest file from your project
+cp /path/to/coop/flathub/su.reya.coop.yml .
+
+# Commit and push
+git add su.reya.coop.yml
+git commit -m "Add su.reya.coop"
+git push origin su.reya.coop
+```
+
+### 3. Open Pull Request
+
+1. Go to your fork on GitHub
+2. Click "Compare & pull request"
+3. **Important:** Set base branch to `new-pr` (not `master`!)
+4. Fill in the PR template
+5. Submit and wait for review
+
+## What Happens Next?
+
+1. Flathub's automated CI will build your app
+2. A maintainer will review your submission
+3. Once approved, a new repo `flathub/su.reya.coop` will be created
+4. You'll get write access to maintain the app
+5. Future updates: Push new commits to `flathub/su.reya.coop`
+
+## Updating the App
+
+To release a new version:
+
+1. Update version in workspace `Cargo.toml`
+2. Tag the new release: `git tag -a v1.0.0-beta3 -m "Release v1.0.0-beta3"`
+3. Push the tag: `git push origin v1.0.0-beta3`
+4. Run `./script/prepare-flathub.sh` to regenerate
+5. Clone the flathub repo: `git clone https://github.com/flathub/su.reya.coop.git`
+6. Update the manifest with new commit/tag and hashes
+7. Submit PR to `flathub/su.reya.coop`
+
+## Troubleshooting
+
+### Build fails with "network access not allowed"
+- Make sure `CARGO_NET_OFFLINE=true` is set in the manifest
+- Ensure `vendor.tar.gz` is properly extracted before building
+
+### Linter complains about metainfo
+- Ensure `su.reya.coop.metainfo.xml` has at least one `<release>` entry
+- Check that screenshots are accessible URLs
+
+### Missing dependencies
+- If new git dependencies are added, re-run `prepare-flathub.sh`
+- The script vendors all dependencies from `Cargo.lock`
+
+## Resources
+
+- [Flathub Submission Docs](https://docs.flathub.org/docs/for-app-authors/submission)
+- [Flatpak Manifest Reference](https://docs.flatpak.org/en/latest/manifests.html)
+- [AppStream Metainfo Guide](https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html)

script/prepare-flathub

@@ -0,0 +1,245 @@
+#!/usr/bin/env bash
+#
+# Prepare Flathub submission for Coop
+# This script:
+# 1. Vendors all Rust dependencies (crates.io + git)
+# 2. Generates release info for metainfo.xml
+# 3. Creates the Flathub manifest (su.reya.coop.yml)
+#
+# Usage: ./script/prepare-flathub [--release-date YYYY-MM-DD]
+
+set -euo pipefail
+cd "$(dirname "$0")/.."
+
+# Configuration
+APP_ID="su.reya.coop"
+APP_NAME="Coop"
+REPO_URL="https://git.reya.su/reya/coop"
+BRANDING_LIGHT="#FFE629"
+BRANDING_DARK="#FFE629"
+
+# Parse arguments
+RELEASE_DATE=""
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --release-date)
+            RELEASE_DATE="$2"
+            shift 2
+            ;;
+        -h|--help)
+            echo "Usage: ${0##*/} [options]"
+            echo ""
+            echo "Options:"
+            echo "  --release-date DATE    Release date in YYYY-MM-DD format (default: today)"
+            echo "  -h, --help            Display this help and exit"
+            exit 0
+            ;;
+        *)
+            echo "Unknown option: $1" >&2
+            exit 1
+            ;;
+    esac
+done
+
+# Get version from workspace
+VERSION=$(script/get-crate-version coop)
+if [[ -z "$RELEASE_DATE" ]]; then
+    RELEASE_DATE=$(date +%Y-%m-%d)
+fi
+
+echo "=== Preparing Flathub submission for $APP_NAME v$VERSION ==="
+echo ""
+
+# Create flathub directory
+mkdir -p flathub
+echo "[1/5] Created flathub/ directory"
+
+# Step 2: Vendor all dependencies
+echo "[2/5] Vendoring Rust dependencies..."
+if [[ -d vendor ]]; then
+    echo "      Removing old vendor directory..."
+    rm -rf vendor
+fi
+
+# Create cargo config for vendoring
+mkdir -p .cargo
+cat > .cargo/config.toml << 'EOF'
+[source.crates-io]
+replace-with = "vendored"
+
+[source.vendored]
+directory = "vendor"
+EOF
+
+# Vendor all dependencies (crates.io + git)
+cargo vendor --locked vendor/
+echo "      Vendored dependencies to vendor/"
+
+# Create tarball of vendored deps
+tar -czf flathub/vendor.tar.gz vendor/
+echo "      Created flathub/vendor.tar.gz"
+
+# Step 3: Generate release info for metainfo
+echo "[3/5] Generating release info..."
+cat > flathub/release-info.xml << EOF
+<release version="${VERSION}" date="${RELEASE_DATE}">
+  <description>
+    <p>Release version ${VERSION}</p>
+  </description>
+</release>
+EOF
+echo "      Created flathub/release-info.xml"
+
+# Step 4: Generate the metainfo file with release info
+echo "[4/5] Generating metainfo.xml..."
+export APP_ID APP_NAME BRANDING_LIGHT BRANDING_DARK
+cat crates/coop/resources/flatpak/coop.metainfo.xml.in | \
+    sed -e "/@release_info@/r flathub/release-info.xml" -e '/@release_info@/d' \
+    > flathub/${APP_ID}.metainfo.xml
+echo "      Created flathub/${APP_ID}.metainfo.xml"
+
+# Step 5: Generate the Flatpak manifest
+echo "[5/5] Generating Flatpak manifest..."
+
+# Get current commit hash
+COMMIT=$(git rev-parse HEAD)
+
+# Generate the YAML manifest
+cat > flathub/${APP_ID}.yml << 'MANIFEST_EOF'
+id: su.reya.coop
+runtime: org.freedesktop.Platform
+runtime-version: "24.08"
+sdk: org.freedesktop.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.rust-stable
+  - org.freedesktop.Sdk.Extension.llvm18
+command: coop
+finish-args:
+  - --talk-name=org.freedesktop.Flatpak
+  - --device=dri
+  - --share=ipc
+  - --share=network
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --socket=pulseaudio
+  - --filesystem=host
+
+build-options:
+  append-path: /usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin
+  env:
+    CC: clang
+    CXX: clang++
+
+modules:
+  - name: coop
+    buildsystem: simple
+    build-options:
+      env:
+        CARGO_HOME: /run/build/coop/cargo
+        CARGO_NET_OFFLINE: "true"
+        RELEASE_VERSION: "@VERSION@"
+    build-commands:
+      # Setup vendored dependencies
+      - mkdir -p .cargo
+      - cp cargo-config.toml .cargo/config.toml
+
+      # Extract vendored deps
+      - tar -xzf vendor.tar.gz
+
+      # Build the project (entire workspace, then install coop binary)
+      - cargo build --release --offline --package coop
+
+      # Install binary
+      - install -Dm755 target/release/coop /app/bin/coop
+
+      # Install icons
+      - install -Dm644 crates/coop/resources/icon.png /app/share/icons/hicolor/512x512/apps/su.reya.coop.png
+      - install -Dm644 crates/coop/resources/icon@2x.png /app/share/icons/hicolor/1024x1024/apps/su.reya.coop.png
+
+      # Install desktop file
+      - |
+        export APP_ID="su.reya.coop"
+        export APP_ICON="su.reya.coop"
+        export APP_NAME="Coop"
+        export APP_CLI="coop"
+        export APP_ARGS="%U"
+        export DO_STARTUP_NOTIFY="true"
+        envsubst < crates/coop/resources/coop.desktop.in > coop.desktop
+        install -Dm644 coop.desktop /app/share/applications/su.reya.coop.desktop
+
+      # Install metainfo (use pre-generated one with release info)
+      - install -Dm644 su.reya.coop.metainfo.xml /app/share/metainfo/su.reya.coop.metainfo.xml
+
+    sources:
+      # Main source code - specific commit
+      - type: git
+        url: https://git.reya.su/reya/coop.git
+        commit: "@COMMIT@"
+        tag: "v@VERSION@"
+
+      # Vendored dependencies tarball (generated by this script)
+      - type: file
+        path: vendor.tar.gz
+        sha256: "@VENDOR_SHA256@"
+
+      # Pre-generated metainfo with release info
+      - type: file
+        path: su.reya.coop.metainfo.xml
+        sha256: "@METAINFO_SHA256@"
+
+      # Cargo config for vendoring
+      - type: file
+        path: cargo-config.toml
+        sha256: "@CARGO_CONFIG_SHA256@"
+MANIFEST_EOF
+
+# Calculate SHA256 hashes
+VENDOR_SHA256=$(sha256sum flathub/vendor.tar.gz | cut -d' ' -f1)
+METAINFO_SHA256=$(sha256sum flathub/${APP_ID}.metainfo.xml | cut -d' ' -f1)
+
+# Create cargo-config.toml
+mkdir -p flathub
+cat > flathub/cargo-config.toml << 'EOF'
+[source.crates-io]
+replace-with = "vendored"
+
+[source.vendored]
+directory = "vendor"
+EOF
+CARGO_CONFIG_SHA256=$(sha256sum flathub/cargo-config.toml | cut -d' ' -f1)
+
+# Substitute values into the manifest
+sed -i \
+    -e "s/@VERSION@/${VERSION}/g" \
+    -e "s/@COMMIT@/${COMMIT}/g" \
+    -e "s/@VENDOR_SHA256@/${VENDOR_SHA256}/g" \
+    -e "s/@METAINFO_SHA256@/${METAINFO_SHA256}/g" \
+    -e "s/@CARGO_CONFIG_SHA256@/${CARGO_CONFIG_SHA256}/g" \
+    flathub/${APP_ID}.yml
+
+echo "      Created flathub/${APP_ID}.yml"
+
+echo ""
+echo "=== Flathub preparation complete! ==="
+echo ""
+echo "Files generated in flathub/:"
+echo "  - ${APP_ID}.yml           # Main Flatpak manifest (submit this to Flathub)"
+echo "  - ${APP_ID}.metainfo.xml  # AppStream metadata with release info"
+echo "  - vendor.tar.gz           # Vendored Rust dependencies"
+echo "  - cargo-config.toml       # Cargo configuration for vendoring"
+echo "  - release-info.xml        # Release info snippet"
+echo ""
+echo "Next steps:"
+echo "  1. Test the build locally:"
+echo "       cd flathub && flatpak-builder --user --install --force-clean build ${APP_ID}.yml"
+echo ""
+echo "  2. If build succeeds, submit to Flathub:"
+echo "     - Fork https://github.com/flathub/flathub"
+echo "     - Clone: git clone --branch=new-pr git@github.com:YOUR_USERNAME/flathub.git"
+echo "     - Copy ONLY ${APP_ID}.yml to the repo"
+echo "     - Submit PR against flathub/flathub:new-pr"
+echo ""
+echo "Note: Make sure you have:"
+echo "  - Committed all changes (commit: ${COMMIT})"
+echo "  - Tagged the release (tag: v${VERSION})"
+echo "  - Pushed the tag to GitHub"