fix: push notification

Author: derensdima22

public/firebase-messaging-sw.js

@@ -76,7 +76,7 @@ importScripts(
     if (messageId) params.set('messageId', messageId);
     params.set('fromPush', '1');
 
-    return `${APP_URL}/chat?${params.toString()}`;
+    return `${APP_URL}/app/chat?${params.toString()}`;
   }
 
   function isAnyClientVisible(windowClients) {

src/pages/Chat.tsx

@@ -30,27 +30,37 @@ const MemoizedChat = React.memo(function ChatComponent({
     httpTokens.refreshToken = refresh;
   };
 
-  const firebaseConfig = useMemo(() => {
-    const allowedDomains =
-      import.meta.env.VITE_APP_ALLOWED_DOMAINS?.split(',') || [];
-    const currentDomain = window.location.hostname;
+  const allowedDomains = import.meta.env.VITE_APP_ALLOWED_DOMAINS?.split(',') || [];
+  const currentDomain = window.location.hostname;
+  const pushEnabledByDomain = allowedDomains.includes(currentDomain);
 
-    if (!allowedDomains.includes(currentDomain)) {
+  const firebaseConfig = useMemo(() => {
+    if (!pushEnabledByDomain) {
       return undefined;
     }
 
-    console.log("currentDomain", currentDomain, allowedDomains.includes(currentDomain));
-
-    return ({
+    const fireConfig = {
       apiKey: import.meta.env.VITE_FIREBASE_API_KEY,
       authDomain: import.meta.env.VITE_FIREBASE_AUTH_DOMAIN,
       projectId: import.meta.env.VITE_FIREBASE_PROJECT_ID,
       storageBucket: import.meta.env.VITE_FIREBASE_STORAGE_BUCKET,
       messagingSenderId: import.meta.env.VITE_FIREBASE_MESSAGING_SENDER_ID,
       appId: import.meta.env.VITE_FIREBASE_APP_ID,
       measurementId: import.meta.env.VITE_FIREBASE_MEASUREMENT_ID,
-    })
-  }, []);
+    }
+
+    return fireConfig;
+  }, [pushEnabledByDomain]);
+
+  const hasFirebaseConfig = Boolean(
+    firebaseConfig?.apiKey &&
+      firebaseConfig?.authDomain &&
+      firebaseConfig?.projectId &&
+      firebaseConfig?.messagingSenderId &&
+      firebaseConfig?.appId
+  );
+
+  const pushEnabled = pushEnabledByDomain && hasFirebaseConfig;
 
   return (
     // @ts-ignore
@@ -100,10 +110,22 @@ const MemoizedChat = React.memo(function ChatComponent({
         setRoomJidInPath: true,
         enableRoomsRetry: { enabled: false, helperText: '' },
         pushNotifications: {
-          enabled: true,
+          enabled: pushEnabled,
           softAsk: false,
           firebaseConfig,
         },
+        inAppNotifications: {
+          enabled: true,
+          showInContext: true,
+          position: {
+            horizontal: 'right',
+            vertical: 'top',
+            offset: {
+              left: 20,
+              bottom: 20,
+            },
+          },
+        },
       }}
     />
   );