Merge pull request #829 from aokiji233/fix/notifications-glitch

Fix/notifications glitch
lfglabs-dev · Aug 24, 2024 · d691210 · d691210
2 parents 44cc26c + 320ff72
commit d691210
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/components/UI/notifications/notificationDetail.tsx b/components/UI/notifications/notificationDetail.tsx
@@ -79,7 +79,7 @@ const NotificationDetail: FunctionComponent<NotificationDetailProps> = ({
     if (status !== notification.data.status) {
       updateNotificationStatus(notification.data.hash, status);
     }
-  }, [notification, isLoading, error, isError, data, status]);
+  }, [ isLoading, error, isError, data, status]);
 
   return (
     <div className={styles.notif_detail}>

diff --git a/hooks/useNotificationManager.ts b/hooks/useNotificationManager.ts
@@ -22,12 +22,20 @@ export function useNotificationManager() {
     txHash: string,
     status: "error" | "pending" | "success"
   ) => {
-    const index = notifications.findIndex(
-      (notification) => notification.data.hash === txHash
-    );
-    notifications[index].data.status = status;
-    setNotifications(notifications);
-    console.log("notifications", notifications);
+    const updatedNotifications = notifications.map((notification) => {
+      if (notification.data.hash === txHash) {
+        return {
+          ...notification,
+          data: {
+            ...notification.data,
+            status,
+          },
+        };
+      }
+      return notification;
+    });
+
+    setNotifications(updatedNotifications);
   };
 
   const checkTransactionStatus = async (txHash: string) => {