chore: simplify import dialog & sidebar menu

.gitignore

@@ -24,3 +24,4 @@ dist/
 vendor/
 wasm/
 node_modules/
+.wrangler/

Cargo.lock

@@ -1653,9 +1653,9 @@ dependencies = [
 
 [[package]]
 name = "ctutils"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d28fb6aa7dd680b3ffd1a3e64e115c177bdba63c0ae7f9cd48129ff05c4fa0"
+checksum = "fe3e9d21d39e6f39ff46e03d5b621424f88ee23d8a1672c6bfc9ccc7f2da4f6a"
 dependencies = [
  "cmov",
 ]
@@ -5818,9 +5818,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "ordered-float"
-version = "5.5.0"
+version = "5.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0"
+checksum = "7f59006ce1e204c30956638535b74d317bca99477b9356dfaec54c37f6f600ab"
 dependencies = [
  "num-traits",
 ]

crates/workspace/src/dialogs/import.rs

@@ -29,8 +29,7 @@ pub fn open_unlock(window: &mut Window, cx: &mut App) {
     let import = cx.new(|cx| ImportIdentity::new_unlock(window, cx));
 
     window.open_dialog(cx, move |this, _window, _cx| {
-        this.width(px(450.))
-            .close_button(false)
+        this.close_button(false)
             .overlay_closable(false)
             .keyboard(false)
             .title("Unlock your identity")
@@ -322,7 +321,7 @@ impl Render for ImportIdentity {
                     }),
             )
             .child({
-                let content = v_flex().child(
+                let content = v_flex().gap_1().child(
                     Button::new("login")
                         .label(if is_unlock { "Unlock" } else { "Continue" })
                         .primary()
@@ -337,7 +336,7 @@ impl Render for ImportIdentity {
                 let content = content.when(!is_unlock, |this| {
                     this.child(
                         Button::new("proxy")
-                            .label("Connect via Web Extension (Experimental)")
+                            .label("Connect via Web Extension")
                             .ghost()
                             .disabled(self.loading)
                             .on_click(cx.listener(move |this, _ev, _window, cx| {
@@ -350,7 +349,7 @@ impl Render for ImportIdentity {
                 let content = content.when(!is_unlock, |this| {
                     this.child(
                         Button::new("extension")
-                            .label("Continue with Browser Extension (NIP-07)")
+                            .label("Continue with Browser Extension")
                             .ghost()
                             .disabled(self.loading)
                             .on_click(cx.listener(move |this, _ev, _window, cx| {

crates/workspace/src/sidebar/header.rs

@@ -13,7 +13,7 @@ use gpui_kit::component::dialog::DialogButtonProps;
 use gpui_kit::component::menu::{DropdownMenu, PopupMenuItem};
 use gpui_kit::component::{ActiveTheme, Icon, Selectable, Sizable, WindowExt, h_flex, v_flex};
 use nostr_sdk::prelude::*;
-use state::NostrRegistry;
+use state::{CLIENT_NAME, NostrRegistry};
 use ui::{Avatar, IconName};
 
 use super::Sidebar;
@@ -38,31 +38,28 @@ impl Sidebar {
             .h(TAB_BAR_HEIGHT)
             .flex_shrink_0()
             .justify_between()
-            .px_2()
+            .px_2p5()
             .when(cfg!(target_os = "macos"), |this| this.pl(px(80.)))
             .child(
-                Button::new("current-user")
+                Button::new("user")
                     .text()
                     .dropdown_caret(true)
                     .min_w_0()
                     .flex_shrink_1()
                     .child(Avatar::new(avatar).seed(profile.avatar_seed()).small())
                     .dropdown_menu(move |this, _window, _cx| {
-                        this.menu_with_icon(
-                            "Profile",
-                            IconName::Profile,
-                            Box::new(Command::ShowProfile),
-                        )
-                        .menu_with_icon("Relays", IconName::Relay, Box::new(Command::ShowRelayList))
-                        .separator()
-                        .item(
-                            PopupMenuItem::element(|_, cx| {
-                                div().text_color(cx.theme().danger).child("Log out")
-                            })
-                            .on_click(|_, window, cx| {
-                                open_logout_dialog(window, cx);
-                            }),
-                        )
+                        this.menu("Profile", Box::new(Command::ShowProfile))
+                            .menu("Relays", Box::new(Command::ShowRelayList))
+                            .separator()
+                            .label(format!("{CLIENT_NAME} {}", env!("CARGO_PKG_VERSION")))
+                            .item(
+                                PopupMenuItem::element(|_, cx| {
+                                    div().text_color(cx.theme().danger).child("Log out")
+                                })
+                                .on_click(|_, window, cx| {
+                                    open_logout_dialog(window, cx);
+                                }),
+                            )
                     }),
             )
             .child({