Fixed bugs

Author: SundeepChand

src/components/Notifications.js

@@ -55,7 +55,7 @@ const Notifications = () => {
     }
   }, [userId, notificationsSeen])
 
-  const markNotificationRead = async (notification) => {
+  const markNotificationAsRead = async (notification) => {
     const seenBy = notification.seenBy.map((seen) => seen.id)
     if (!seenBy.includes(userId)) {
       seenBy.push(userId)
@@ -66,16 +66,16 @@ const Notifications = () => {
   const markAllNotificationsAsRead = () => {
     if (notifications) {
       notifications.forEach(async (notification) => {
-        await markNotificationRead(notification)
+        await markNotificationAsRead(notification)
         setNotifications([])
         setNotificationCount(0)
         setNotificationsSeen(false)
       })
     }
   }
 
-  const markNotificationAsRead = async (notification) => {
-    await markNotificationRead(notification)
+  const onNotificationClick = async (notification) => {
+    await markNotificationAsRead(notification)
     navigate(`/${notification.link}`)
   }
 
@@ -112,7 +112,7 @@ const Notifications = () => {
               ? notifications.map((notification, key) => (
                   <li
                     className='dropdown-element'
-                    onClick={() => markNotificationAsRead(notification)}
+                    onClick={() => onNotificationClick(notification)}
                     key={key}
                   >
                     {notification.message}

src/pages/Home.js

@@ -217,7 +217,7 @@ const Home = () => {
   const acceptUpdatedPolicy = async () => {
     const seenBy = policyUpdate.seenBy.map((seen) => seen.id)
     seenBy.push(userId)
-    await userStory.updateNotifications(policyUpdate.id, seenBy)
+    await userStory.markNotificationAsRead(policyUpdate.id, seenBy)
     setModal(false)
   }
 

src/services/user_story.js

@@ -225,20 +225,23 @@ const userStory = {
   },
   markNotificationAsRead: (notificationId, seenBy) => {
     const markNotificationAsReadQuery = {
-      query: `mutation updateNotifications {
+      query: `mutation updateNotifications($seenBy: [ID]) {
         updateUserStoryNotification(input: {
           where: {
             id: "${notificationId}"
           }
           data: {
-            seenBy: "${seenBy}"
+            seenBy: $seenBy
           }
         }) {
           userStoryNotification {
             id
           }
         }
-      }`
+      }`,
+      variables: {
+        seenBy: seenBy
+      }
     }
     return apiCall('/graphql', markNotificationAsReadQuery)
   },