From 7b9aa1514efbdb6b3a497a0a8c627e322d92c554 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Thu, 6 Jun 2024 15:06:00 +0200
Subject: [PATCH] fix: :bug: avoid to send the snap notification id to the
 notifications server

---
 .../notifications-list-read-all-button.tsx      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/ui/pages/notifications/notifications-list-read-all-button.tsx b/ui/pages/notifications/notifications-list-read-all-button.tsx
index 0af80ef929d0..6fa200a772e9 100644
--- a/ui/pages/notifications/notifications-list-read-all-button.tsx
+++ b/ui/pages/notifications/notifications-list-read-all-button.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import {
@@ -16,6 +16,7 @@ import { markNotificationsAsRead } from '../../store/actions';
 import { Box, Button, ButtonVariant } from '../../components/component-library';
 import { BlockSize } from '../../helpers/constants/design-system';
 import type { NotificationType } from './notifications';
+import { SNAP } from './snap/types/types';
 
 export type NotificationsListReadAllButtonProps = {
   notifications: NotificationType[];
@@ -28,20 +29,17 @@ export const NotificationsListReadAllButton = ({
   const t = useI18nContext();
   const { markNotificationAsRead } = useMarkNotificationAsRead();
   const trackEvent = useContext(MetaMetricsContext);
-
   const unreadNotifications = useSelector(getUnreadNotifications);
 
-  const [notificationReadArray, setNotificationReadArray] =
-    useState<MarkAsReadNotificationsParam>([]);
-
-  useEffect(() => {
+  const handleOnClick = () => {
     let notificationsRead: MarkAsReadNotificationsParam = [];
 
     if (notifications && notifications.length > 0) {
       notificationsRead = notifications
         .filter(
           (notification): notification is Notification =>
-            (notification as Notification).id !== undefined,
+            (notification as Notification).id !== undefined &&
+            notification.type !== SNAP,
         )
         .map((notification: Notification) => ({
           id: notification.id,
@@ -49,17 +47,14 @@ export const NotificationsListReadAllButton = ({
           isRead: notification.isRead,
         }));
     }
-    setNotificationReadArray(notificationsRead);
-  }, [notifications]);
 
-  const handleOnClick = () => {
     trackEvent({
       category: MetaMetricsEventCategory.NotificationInteraction,
       event: MetaMetricsEventName.MarkAllNotificationsRead,
     });
 
     // Mark all metamask notifications as read
-    markNotificationAsRead(notificationReadArray);
+    markNotificationAsRead(notificationsRead);
 
     // Mark all snap notifications as read
     const unreadNotificationIds = unreadNotifications.map(({ id }) => id);