From fecaa8d9743e6a7bbba34cd0a722b800cb4121e4 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Thu, 2 Nov 2023 04:28:14 -0700 Subject: [PATCH] Back out "Use isPWA utility function instead" Summary: Original commit changeset: 6bc0c942b3d9 Original Phabricator Diff: D50885337 There's an issue with the import, same reason we do: ``` require('flipper-ui-core').startFlipperDesktop(flipperServer); ``` Reviewed By: aigoncharov Differential Revision: D50926125 fbshipit-source-id: 04e1b920bcecab9f245924907637b36dac312f1f --- desktop/flipper-ui-browser/src/index.tsx | 3 +-- desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/desktop/flipper-ui-browser/src/index.tsx b/desktop/flipper-ui-browser/src/index.tsx index 126b07f30..fbbf974e4 100644 --- a/desktop/flipper-ui-browser/src/index.tsx +++ b/desktop/flipper-ui-browser/src/index.tsx @@ -15,7 +15,6 @@ import { import {init as initLogger} from './fb-stubs/Logger'; import {initializeRenderHost} from './initializeRenderHost'; import {createFlipperServer, FlipperServerState} from 'flipper-server-client'; -import {isPWA} from 'flipper-ui-core'; const loadingContainer = document.getElementById('loading'); if (loadingContainer) { @@ -168,7 +167,7 @@ start().catch((e) => { logger.track('success-rate', 'flipper-ui-browser-started', { value: 0, error: getStringFromErrorLike(e), - pwa: isPWA(), + pwa: window.matchMedia('(display-mode: standalone)').matches, }); window.flipperShowMessage?.('Failed to start UI with error: ' + e); }); diff --git a/desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx b/desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx index 9e3f648d6..84ce4f5d2 100644 --- a/desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx +++ b/desktop/flipper-ui-core/src/chrome/PWAppInstallationWizard.tsx @@ -12,7 +12,6 @@ import {Image, Modal, Button} from 'antd'; import {getFlipperLib, Layout, _NuxManagerContext} from 'flipper-plugin'; import {getRenderHostInstance} from 'flipper-frontend-core'; import isProduction from '../utils/isProduction'; -import {isPWA} from '../utils/pwa'; type Props = { onHide: () => void; @@ -56,7 +55,7 @@ export function shouldShowPWAInstallationWizard(): boolean { return false; } - if (isPWA()) { + if (window.matchMedia('(display-mode: standalone)').matches) { tracker.track('pwa-installation-wizard-should-show', { show: false, reason: 'Display mode is standalone, seems is already running as PWA',