@dubsdotapp/expo 0.2.60 → 0.2.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dubsdotapp/expo",
-  "version": "0.2.60",
+  "version": "0.2.61",
   "description": "React Native SDK for the Dubs betting platform",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/hooks/usePushNotifications.ts

@@ -42,17 +42,6 @@ export function usePushNotifications(): PushNotificationStatus {
     }
   }, []);
 
-  // Check existing permission on mount so UI reflects current state
-  useEffect(() => {
-    const Notifications = getNotificationsModule();
-    if (!Notifications) return;
-    Notifications.getPermissionsAsync()
-      .then(({ status }: { status: string }) => {
-        if (status === 'granted') setHasPermission(true);
-      })
-      .catch(() => {});
-  }, [getNotificationsModule]);
-
   const getDeviceName = useCallback((): string | null => {
     try {
       const Device = require('expo-device');
@@ -153,21 +142,29 @@ export function usePushNotifications(): PushNotificationStatus {
       const { status } = await Notifications.getPermissionsAsync();
       if (status !== 'granted') return;
 
-      setHasPermission(true);
-
       const tokenResult = await Notifications.getExpoPushTokenAsync();
       const token = tokenResult.data;
-      setExpoPushToken(token);
 
-      // Re-register silently
+      // Register with server — only mark as enabled if this succeeds
       await registerTokenWithServer(token);
+      setExpoPushToken(token);
+      setHasPermission(true);
       setupAndroidChannels(Notifications);
     } catch (err) {
-      // Silent failure — this is a background restore
+      // Server registration failed — don't show as enabled
+      setHasPermission(false);
       console.log('[usePushNotifications] Restore skipped:', err instanceof Error ? err.message : err);
     }
   }, [getNotificationsModule, registerTokenWithServer, setupAndroidChannels]);
 
+  // On mount, restore push state only if token is actually registered server-side
+  const didMount = useRef(false);
+  useEffect(() => {
+    if (didMount.current) return;
+    didMount.current = true;
+    restoreIfGranted();
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
   return {
     hasPermission,
     expoPushToken,