app

commit b235fbd1c4c2f00bb13dea4a9b28bd83706b8411
parent a944645940da2423472c2579d735159bd6160c16
Author: triesap <tyson@radroots.org>
Date:   Sun,  7 Jun 2026 11:09:07 -0700

app: refine settings account actions

Diffstat:
M
crates/desktop/src/window.rs
 | 
56
++++++++++++++++++++++++++++----------------------------
M
crates/i18n/src/lib.rs
 | 
4
++--
M
i18n/locales/en/messages.json
 | 
2
+-

3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/crates/desktop/src/window.rs b/crates/desktop/src/window.rs
@@ -6716,7 +6716,7 @@ impl SettingsWindowView {
                     ("settings-account-row", index),
                     account_display_name(account),
                     Some(SharedString::from(abbreviated_npub(account.npub.as_str()))),
-                    Some(account.account_id.as_str()) == selected_account_id,
+                    false,
                     cx.listener(|_, _, _, _| {}),
                     cx,
                 )
@@ -6933,6 +6933,32 @@ impl SettingsWindowView {
                                                     )),
                                             ),
                                     ))
+                                    .child(
+                                        div()
+                                            .w_full()
+                                            .flex()
+                                            .min_w_0()
+                                            .items_center()
+                                            .gap(px(APP_UI_THEME
+                                                .shells
+                                                .settings_account_action_row_gap_px))
+                                            .child(div().child(action_button(
+                                                "account-log-out",
+                                                app_shared_text(
+                                                    AppTextKey::SettingsAccountLogOutAction,
+                                                ),
+                                                cx.listener(|_, _, _, _| {}),
+                                                cx,
+                                            )))
+                                            .child(div().child(action_button(
+                                                "account-open-workspace",
+                                                app_shared_text(
+                                                    AppTextKey::SettingsAccountOpenWorkspaceAction,
+                                                ),
+                                                cx.listener(|_, _, _, _| {}),
+                                                cx,
+                                            ))),
+                                    )
                                     .child(app_detail_row(
                                         app_shared_label_text(
                                             AppTextKey::SettingsAccountCustodyLabel,
@@ -6978,33 +7004,7 @@ impl SettingsWindowView {
                                         this.child(home_body_text(app_shared_text(
                                             AppTextKey::SettingsAccountNoSelectionBody,
                                         )))
-                                    })
-                                    .child(
-                                        div()
-                                            .w_full()
-                                            .flex()
-                                            .min_w_0()
-                                            .items_center()
-                                            .gap(px(APP_UI_THEME
-                                                .shells
-                                                .settings_account_action_row_gap_px))
-                                            .child(div().child(action_button_primary(
-                                                "account-log-out",
-                                                app_shared_text(
-                                                    AppTextKey::SettingsAccountLogOutAction,
-                                                ),
-                                                cx.listener(|_, _, _, _| {}),
-                                                cx,
-                                            )))
-                                            .child(div().child(action_button_primary(
-                                                "account-open-workspace",
-                                                app_shared_text(
-                                                    AppTextKey::SettingsAccountOpenWorkspaceAction,
-                                                ),
-                                                cx.listener(|_, _, _, _| {}),
-                                                cx,
-                                            ))),
-                                    ),
+                                    }),
                             ),
                     ),
             )
diff --git a/crates/i18n/src/lib.rs b/crates/i18n/src/lib.rs
@@ -170,7 +170,7 @@ mod tests {
         );
         assert_eq!(
             app_text(AppTextKey::SettingsAccountOpenWorkspaceAction),
-            "Open Workspace..."
+            "Admin Console"
         );
     }
 
@@ -204,7 +204,7 @@ mod tests {
         assert_eq!(app_text(AppTextKey::SettingsAccountLogOutAction), "Log Out");
         assert_eq!(
             app_text(AppTextKey::SettingsAccountOpenWorkspaceAction),
-            "Open Workspace..."
+            "Admin Console"
         );
     }
 
diff --git a/i18n/locales/en/messages.json b/i18n/locales/en/messages.json
@@ -467,7 +467,7 @@
   "settings.account.action.add_account": "Add Account...",
   "settings.account.action.log_out": "Log Out",
   "settings.account.action.more_actions": "More Actions",
-  "settings.account.action.open_workspace": "Open Workspace...",
+  "settings.account.action.open_workspace": "Admin Console",
   "settings.view.account": "account",
   "settings.view.settings": "settings",
   "settings.view.about": "about",