chore: adapt latest changes from GPUI and nostr-sdk

crates/app/src/views/chat/mod.rs

@@ -169,9 +169,11 @@ impl ChatPanel {
                                 .pubkey(author);
 
                             // Get all DM events in database
-                            let query = client.database().query(vec![recv, send]).await?;
+                            let recv_events = client.database().query(recv).await?;
+                            let send_events = client.database().query(send).await?;
+                            let events = recv_events.merge(send_events);
 
-                            Ok(query)
+                            Ok(events)
                         }
                     })
                     .await;

crates/app/src/views/sidebar/compose.rs

@@ -312,7 +312,7 @@ impl Render for Compose {
                         if let Some(contacts) = self.contacts.read(cx).clone() {
                             this.child(
                                 uniform_list(
-                                    cx.model().clone(),
+                                    cx.entity().clone(),
                                     "contacts",
                                     contacts.len(),
                                     move |this, range, window, cx| {

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

@@ -42,7 +42,7 @@ impl Sidebar {
             closeable: true,
             zoomable: true,
             focus_handle: cx.focus_handle(),
-            view_id: cx.model().entity_id(),
+            view_id: cx.entity().entity_id(),
             inbox,
         }
     }