From 349ea69fedb725077dec4ca7eb22667864a242a8 Mon Sep 17 00:00:00 2001
From: Khaled Emara <mail@KhaledEmara.dev>
Date: Sat, 16 Jan 2021 14:53:02 +0200
Subject: [PATCH] Fix onSubscriptionData naming confusion

---
 frontend/src/components/Chat.jsx              | 48 +++++++++----------
 frontend/src/components/NotificationsMenu.jsx | 10 ++--
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/Chat.jsx b/frontend/src/components/Chat.jsx
index 7bdc4af..8cde018 100644
--- a/frontend/src/components/Chat.jsx
+++ b/frontend/src/components/Chat.jsx
@@ -235,32 +235,28 @@ const Chat = (props) => {
     defaultMatches: true,
   });
 
-  const { data: subData, error: subError } = useSubscription(
-    MESSAGE_SUBSCRIPTION,
-    {
-      onSubscriptionData({ subscriptionData }) {
-        if (
-          subscriptionData &&
-          (messageArray.length == 0 ||
-            subscriptionData.newMessage.id !=
-              messageArray[messageArray.length - 1].id) &&
-          currentReceiver != "#" &&
-          subscriptionData.newMessage.from.id === currentReceiver
-        ) {
-          play();
-          setMessageArray((messageArray) => [
-            ...messageArray,
-            {
-              id: subData.newMessage.id,
-              createdAt: subData.newMessage.createdAt,
-              body: subData.newMessage.body,
-              sender: false,
-            },
-          ]);
-        }
-      },
-    }
-  );
+  const { error: subError } = useSubscription(MESSAGE_SUBSCRIPTION, {
+    onSubscriptionData({ subscriptionData: { data: subData } }) {
+      if (
+        subData &&
+        (messageArray.length == 0 ||
+          subData.newMessage.id != messageArray[messageArray.length - 1].id) &&
+        currentReceiver != "#" &&
+        subData.newMessage.from.id === currentReceiver
+      ) {
+        play();
+        setMessageArray((messageArray) => [
+          ...messageArray,
+          {
+            id: subData.newMessage.id,
+            createdAt: subData.newMessage.createdAt,
+            body: subData.newMessage.body,
+            sender: false,
+          },
+        ]);
+      }
+    },
+  });
 
   if (subError) console.error(subError);
 
diff --git a/frontend/src/components/NotificationsMenu.jsx b/frontend/src/components/NotificationsMenu.jsx
index b1dc2d2..5fb71ca 100644
--- a/frontend/src/components/NotificationsMenu.jsx
+++ b/frontend/src/components/NotificationsMenu.jsx
@@ -72,18 +72,18 @@ function NotificationsMenu(props) {
     },
   });
   useSubscription(NOTIFICATION_SUBSCRIPTION, {
-    onSubscriptionData({ subscriptionData }) {
+    onSubscriptionData({ subscriptionData: { data } }) {
       if (
-        subscriptionData &&
-        subscriptionData.newNotification &&
+        data &&
+        data.newNotification &&
         (notifications.length === 0 ||
-          subscriptionData.newNotification.id !== notifications[0].id)
+          data.newNotification.id !== notifications[0].id)
       ) {
         play();
 
         setNotifications((notifications) => [
           ...notifications,
-          subscriptionData.newNotification,
+          data.newNotification,
         ]);
         showSnackbar("info", "New Notification");
       }