Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Avoid to send the snap notification id to the notifications server #25099

Merged
merged 4 commits into from
Jun 7, 2024
Merged

fix: Avoid to send the snap notification id to the notifications server #25099

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b9aa15
fix: :bug: avoid to send the snap notification id to the notification…
matteoscurati Jun 6, 2024
1440c8f
Merge branch 'develop' into fix/mark-all-as-read-button
matteoscurati Jun 6, 2024
3ff8b6b
Merge branch 'develop' into fix/mark-all-as-read-button
matteoscurati Jun 6, 2024
b8622ca
Merge branch 'develop' into fix/mark-all-as-read-button
matteoscurati Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions ui/pages/notifications/notifications-list-read-all-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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[];
Expand All @@ -28,38 +29,32 @@ 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 = () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, we did not need an effect! ❤️

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,
type: notification.type,
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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got really confused since we were filtering out snap notifications.

But yes this method (as the comment above mentions) is only for wallet notifications, so we can filter out these notifications.


// Mark all snap notifications as read
const unreadNotificationIds = unreadNotifications.map(({ id }) => id);
Expand Down