Skip to content

Fix Sign out modal #991

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
nushea merged 2 commits into from
Jun 25, 2026
+51 −32
Merged

Fix Sign out modal #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e55182
fix abandn
nushea Jun 24, 2026
23e7a91
merge upstream
nushea Jun 25, 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
5 changes: 5 additions & 0 deletions .changeset/fix-abandn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

Fix leaving modal looking outsized
78 changes: 46 additions & 32 deletions src/app/pages/client/sidebar/AccountSwitcherTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import {
toRem,
Chip,
Spinner,
Overlay,
OverlayBackdrop,
OverlayCenter,
Line,
} from 'folds';
import FocusTrap from 'focus-trap-react';
Expand All @@ -38,7 +41,6 @@ import { useUserProfile } from '$hooks/useUserProfile';
import { useMediaAuthentication } from '$hooks/useMediaAuthentication';
import { useSessionProfiles } from '$hooks/useSessionProfiles';
import { useOpenSettings } from '$features/settings';
import { Modal500 } from '$components/Modal500';
import { createLogger } from '$utils/debug';
import { useClientConfig } from '$hooks/useClientConfig';
import { UnreadBadge, UnreadBadgeCenter } from '$components/unread-badge';
Expand Down Expand Up @@ -365,41 +367,53 @@ export function AccountSwitcherTab({ isBottom }: { isBottom?: boolean }) {
/>

{confirmSignOutSession && (
<Modal500 requestClose={() => setConfirmSignOutSession(undefined)}>
<Dialog variant="Surface">
<Header
style={{
padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
borderBottomWidth: config.borderWidth.B300,
<Overlay open backdrop={<OverlayBackdrop />}>
<OverlayCenter>
<FocusTrap
focusTrapOptions={{
initialFocus: false,
fallbackFocus: () => document.body,
clickOutsideDeactivates: true,
onDeactivate: () => setConfirmSignOutSession(undefined),
escapeDeactivates: stopPropagation,
}}
variant="Surface"
size="500"
>
<Box grow="Yes">
<Text size="H4">Sign out</Text>
</Box>
</Header>
<Box style={{ padding: config.space.S400 }} direction="Column" gap="400">
<Text priority="400">
Are you sure you want to sign out of <b>{confirmSignOutSession.userId}</b>?
</Text>
<Box direction="Column" gap="200">
<Button
variant="Critical"
onClick={() => {
handleSignOut(confirmSignOutSession);
setConfirmSignOutSession(undefined);
<Dialog variant="Surface">
<Header
style={{
padding: `0 ${config.space.S200} 0 ${config.space.S400}`,
borderBottomWidth: config.borderWidth.B300,
}}
variant="Surface"
size="500"
>
<Text size="B400">Sign out</Text>
</Button>
<Button variant="Secondary" onClick={() => setConfirmSignOutSession(undefined)}>
<Text size="B400">Cancel</Text>
</Button>
</Box>
</Box>
</Dialog>
</Modal500>
<Box grow="Yes">
<Text size="H4">Sign out</Text>
</Box>
</Header>
<Box style={{ padding: config.space.S400 }} direction="Column" gap="400">
<Text priority="400">
Are you sure you want to sign out of <b>{confirmSignOutSession.userId}</b>?
</Text>
<Box direction="Column" gap="200">
<Button
variant="Critical"
onClick={() => {
handleSignOut(confirmSignOutSession);
setConfirmSignOutSession(undefined);
}}
>
<Text size="B400">Sign out</Text>
</Button>
<Button variant="Secondary" onClick={() => setConfirmSignOutSession(undefined)}>
<Text size="B400">Cancel</Text>
</Button>
</Box>
</Box>
</Dialog>
</FocusTrap>
</OverlayCenter>
</Overlay>
)}
</SidebarItem>
);
Expand Down
Loading