Merge pull request #43 from notificationapi-com/WHCxBqkW/3275-react-sdk-web-push-bug

Bump version from 1.1.3 to 1.1.4 in package.json and package-lock.json; refactor NotificationAPIProvider to improve web push opt-in logic

Author: mbasadi

lib/components/Provider/index.tsx

@@ -439,25 +439,28 @@ export const NotificationAPIProvider: React.FunctionComponent<
   }, [client, loadNotifications, askForWebPushPermission]);
 
   useEffect(() => {
-    if (
-      isClient &&
-      'Notification' in window &&
-      typeof Notification.requestPermission === 'function'
-    ) {
-      if (Notification.permission !== 'default') {
-        setWebPushOptInMessage(false);
-      }
-    }
     client.getUserAccountMetadata().then((res) => {
       setUserAccountMetaData(res);
-      setWebPushOptInMessage(res.userAccountMetadata.hasWebPushEnabled);
+      if (
+        isClient &&
+        'Notification' in window &&
+        typeof Notification.requestPermission === 'function'
+      ) {
+        if (Notification.permission !== 'default') {
+          setWebPushOptInMessage(false);
+        }
+      } else {
+        setWebPushOptInMessage(res.userAccountMetadata.hasWebPushEnabled);
+      }
     });
+  }, [client]);
+  useEffect(() => {
     if (webPushOptInMessage === 'AUTOMATIC') {
       setWebPushOptInMessage(
         localStorage.getItem('hideWebPushOptInMessage') !== 'true'
       );
     }
-  }, [client, webPushOptInMessage]);
+  }, [webPushOptInMessage]);
   useEffect(() => {
     if (webPushOptIn) {
       askForWebPushPermission();

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@notificationapi/react",
   "private": false,
-  "version": "1.1.3",
+  "version": "1.1.4",
   "type": "module",
   "overrides": {
     "esbuild": "^0.25.0",