Skip to content

fix: prevent window.close() from closing PWA on Android #5257

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
rebelchris merged 3 commits into from
Jan 13, 2026
Merged

fix: prevent window.close() from closing PWA on Android #5257

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2fa061
fix: prevent window.close() from closing PWA on Android
github-actions[bot] Jan 7, 2026
77f56d5
Merge branch 'main' into claude/issue-5256-20260107-1008
rebelchris Jan 9, 2026
ec95025
Merge branch 'main' into claude/issue-5256-20260107-1008
rebelchris Jan 13, 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: 4 additions & 1 deletion packages/webapp/pages/callback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
broadcastMessage,
postWindowMessage,
isPWA,
} from '@dailydotdev/shared/src/lib/func';
import { AuthEvent } from '@dailydotdev/shared/src/lib/kratos';
import type { ReactElement } from 'react';
Expand Down Expand Up @@ -66,7 +67,9 @@ function CallbackPage(): ReactElement {
postWindowMessage(eventKey, params);
}

window.close();
if (!isPWA()) {
window.close();
}
} catch (err) {
const url = `${process.env.NEXT_PUBLIC_WEBAPP_URL}?${search}`;
window.location.replace(url);
Expand Down
6 changes: 4 additions & 2 deletions packages/webapp/pages/error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { postWindowMessage } from '@dailydotdev/shared/src/lib/func';
import { postWindowMessage, isPWA } from '@dailydotdev/shared/src/lib/func';
import { AuthEvent } from '@dailydotdev/shared/src/lib/kratos';
import type { ReactElement } from 'react';
import { useEffect } from 'react';
Expand All @@ -8,7 +8,9 @@ function ErrorPage(): ReactElement {
const urlSearchParams = new URLSearchParams(window.location.search);
const params = Object.fromEntries(urlSearchParams.entries());
postWindowMessage(AuthEvent.Error, params);
window.close();
if (!isPWA()) {
window.close();
}
}, []);

return null;
Expand Down
6 changes: 4 additions & 2 deletions packages/webapp/pages/popup/notifications/enable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { useEffect } from 'react';
import classNames from 'classnames';
import NotificationToggleIcon from '@dailydotdev/shared/src/components/icons/NotificationToggle/primary.svg';
import classed from '@dailydotdev/shared/src/lib/classed';
import { postWindowMessage } from '@dailydotdev/shared/src/lib/func';
import { postWindowMessage, isPWA } from '@dailydotdev/shared/src/lib/func';
import { ENABLE_NOTIFICATION_WINDOW_KEY } from '@dailydotdev/shared/src/hooks/useNotificationPermissionPopup';
import { useRouter } from 'next/router';
import type { NotificationPromptSource } from '@dailydotdev/shared/src/lib/log';
Expand Down Expand Up @@ -52,7 +52,9 @@ function Enable(): React.ReactElement {
const checkPermission = async () => {
const closeWindow = () => {
sendBeacon();
window.close();
if (!isPWA()) {
window.close();
}
};

if (isSubscribed) {
Expand Down