fix: unsupported push notifications (#3779)

dailydotdev · Nov 11, 2024 · 5997254 · 5997254
1 parent bb18e73
commit 5997254
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/shared/src/contexts/PushNotificationContext.tsx b/packages/shared/src/contexts/PushNotificationContext.tsx
@@ -157,7 +157,7 @@ export function PushNotificationContextProvider({
         isInitialized: !isEnabled || isFetched || !isSuccess,
         isLoading,
         isSubscribed,
-        isPushSupported: isPushSupported && isSuccess && isEnabled,
+        isPushSupported: !!(isPushSupported && isSuccess && isEnabled),
         onSourceChange,
         logPermissionGranted,
         shouldOpenPopup: false,

diff --git a/packages/webapp/pages/onboarding.tsx b/packages/webapp/pages/onboarding.tsx
@@ -57,6 +57,7 @@ import { getPathnameWithQuery } from '@dailydotdev/shared/src/lib';
 import { webappUrl } from '@dailydotdev/shared/src/lib/constants';
 import useMutateFilters from '@dailydotdev/shared/src/hooks/useMutateFilters';
 import dynamic from 'next/dynamic';
+import { usePushNotificationContext } from '@dailydotdev/shared/src/contexts/PushNotificationContext';
 import { defaultOpenGraph, defaultSeo } from '../next-seo';
 import { getTemplatedTitle } from '../components/layouts/utils';
 
@@ -124,6 +125,7 @@ export function OnboardPage(): ReactElement {
   const onboardingVisual: OnboardingVisual = useFeature(
     feature.onboardingVisual,
   );
+  const { isPushSupported } = usePushNotificationContext();
   const targetId: string = ExperimentWinner.OnboardingV4;
   const formRef = useRef<HTMLFormElement>();
   const [activeScreen, setActiveScreen] = useState(OnboardingStep.Intro);
@@ -187,7 +189,11 @@ export function OnboardPage(): ReactElement {
       return setActiveScreen(OnboardingStep.ContentTypes);
     }
 
-    if (activeScreen === OnboardingStep.ContentTypes && isMobile) {
+    if (
+      activeScreen === OnboardingStep.ContentTypes &&
+      isMobile &&
+      isPushSupported
+    ) {
       return setActiveScreen(OnboardingStep.ReadingReminder);
     }