Skip to content

Move settings into the app shell #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wesbillman merged 3 commits into from
Jun 8, 2026
Merged

Move settings into the app shell #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4cf9dc
Move settings into app shell
klopez4212 Jun 7, 2026
210d159
Add profile heading to settings
klopez4212 Jun 7, 2026
a4e6bd8
Keep settings sidebar open
klopez4212 Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
348 changes: 173 additions & 175 deletions desktop/src/app/AppShell.tsx
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 5 additions & 19 deletions desktop/src/features/profile/ui/ProfilePopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export function ProfilePopover({
const [presenceMenuOpen, setPresenceMenuOpen] = React.useState(false);
const presenceHoverTimer = React.useRef<number | null>(null);
const hasUserStatus = Boolean(userStatusText || userStatusEmoji);
const preferencesShortcutLabel = isMacPlatform() ? "⌘," : "Ctrl+,";
const settingsShortcutLabel = isMacPlatform() ? "⌘," : "Ctrl+,";

function clearPresenceHoverTimer() {
if (presenceHoverTimer.current !== null) {
Expand Down Expand Up @@ -249,36 +249,22 @@ export function ProfilePopover({

<hr className="my-1 h-px border-0 bg-border" />

{/* ── Profile / preferences ──────────────────────────── */}
<button
className={MENU_ITEM_CLASS}
data-testid="profile-popover-profile"
onClick={() => {
closePopover();
window.requestAnimationFrame(() => {
onOpenSettings("profile");
});
}}
role="menuitem"
type="button"
>
<span className="flex-1">Profile</span>
</button>
{/* ── Settings ───────────────────────────────────────── */}
<button
className={MENU_ITEM_CLASS}
data-testid="profile-popover-settings"
onClick={() => {
closePopover();
window.requestAnimationFrame(() => {
onOpenSettings("appearance");
onOpenSettings();
});
}}
role="menuitem"
type="button"
>
<span className="flex-1">Preferences</span>
<span className="flex-1">Settings</span>
<kbd className="text-xs text-muted-foreground">
{preferencesShortcutLabel}
{settingsShortcutLabel}
</kbd>
</button>

Expand Down
2 changes: 2 additions & 0 deletions desktop/src/features/settings/ui/ProfileSettingsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ export function ProfileSettingsCard({
return (
<section className="min-w-0" data-testid="settings-profile">
<div className="space-y-6">
<h2 className="text-2xl font-semibold tracking-tight">Profile</h2>

{profileQuery.error instanceof Error ? (
<p className="rounded-xl border border-destructive/30 bg-destructive/10 px-3 py-2 text-sm text-destructive">
{profileQuery.error.message}
Expand Down
3 changes: 0 additions & 3 deletions desktop/src/features/settings/ui/SettingsScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ type SettingsScreenProps = {
currentPubkey?: string;
fallbackDisplayName?: string;
isUpdatingDesktopNotifications: boolean;
mode: "profile" | "preferences";
notificationErrorMessage: string | null;
notificationPermission: DesktopNotificationPermissionState;
notificationSettings: NotificationSettings;
Expand All @@ -25,7 +24,6 @@ export function SettingsScreen({
currentPubkey,
fallbackDisplayName,
isUpdatingDesktopNotifications,
mode,
notificationErrorMessage,
notificationPermission,
notificationSettings,
Expand All @@ -43,7 +41,6 @@ export function SettingsScreen({
currentPubkey={currentPubkey}
fallbackDisplayName={fallbackDisplayName}
isUpdatingDesktopNotifications={isUpdatingDesktopNotifications}
mode={mode}
notificationErrorMessage={notificationErrorMessage}
notificationPermission={notificationPermission}
notificationSettings={notificationSettings}
Expand Down
Loading