Skip to content

fix: prefer close over back in iframe header #2441

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
broody merged 3 commits into from
Feb 25, 2026
Merged

fix: prefer close over back in iframe header #2441

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e72cd01
fix: prefer close over back in iframe header
broody Feb 25, 2026
edef5b6
chore: keep update-session routing out of iframe nav PR
broody Feb 25, 2026
b70b0fd
fix
broody Feb 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
6 changes: 4 additions & 2 deletions packages/keychain/src/components/NavigationHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ export function NavigationHeader({
// Check if we're in an iframe
const isInIframe = window.self !== window.top;

// Determine which button to show based on navigation state
// Determine which button to show based on navigation state.
// In iframe/popup context, prefer close over back by default.
const shouldShowBack =
forceShowBack || (canGoBack && !forceShowClose && !showClose);
forceShowBack ||
(!isInIframe && canGoBack && !forceShowClose && !showClose);
const shouldShowClose =
isInIframe && (forceShowClose || showClose || !shouldShowBack);

Expand Down
Loading