Merge branch 'main' into jl/mmp-3725/caip-multichain-add-postMessage-stream-non-chromium

Author: jiexi

test/e2e/tests/swaps/shared.ts

@@ -74,8 +74,17 @@ export const reviewQuote = async (
     '[data-testid="exchange-rate-display-quote-rate"]',
   );
   const summaryText = await summary.getText();
-  assert.equal(summaryText.includes(options.swapFrom), true);
-  assert.equal(summaryText.includes(options.swapTo), true);
+
+  await driver.waitForSelector({
+    testId: 'prepare-swap-page-swap-from',
+    text: options.swapFrom,
+  });
+
+  await driver.waitForSelector({
+    testId: 'prepare-swap-page-swap-to',
+    text: options.swapTo,
+  });
+
   const quote = summaryText.split(`\n`);
 
   const elementSwapToAmount = await driver.findElement(
@@ -138,22 +147,20 @@ export const checkActivityTransaction = async (
   await driver.clickElement('[data-testid="account-overview__activity-tab"]');
   await driver.waitForSelector('.activity-list-item');
 
-  const transactionList = await driver.findElements(
-    '[data-testid="activity-list-item-action"]',
-  );
-  const transactionText = await transactionList[options.index].getText();
-  assert.equal(
-    transactionText,
-    `Swap ${options.swapFrom} to ${options.swapTo}`,
-    'Transaction not found',
-  );
+  await driver.waitForSelector({
+    tag: 'p',
+    text: `Swap ${options.swapFrom} to ${options.swapTo}`,
+  });
 
   await driver.findElement({
     css: '[data-testid="transaction-list-item-primary-currency"]',
     text: `-${options.amount} ${options.swapFrom}`,
   });
 
-  await transactionList[options.index].click();
+  await driver.clickElement({
+    tag: 'p',
+    text: `Swap ${options.swapFrom} to ${options.swapTo}`,
+  });
   await driver.delay(regularDelayMs);
 
   await driver.findElement({

ui/pages/notifications/notifications-list-read-all-button.test.tsx

@@ -1,26 +1,57 @@
 import React from 'react';
-import { render } from '@testing-library/react';
-import { Provider } from 'react-redux';
-import configureStore from 'redux-mock-store';
-import thunk from 'redux-thunk';
+import { fireEvent } from '@testing-library/react';
+import { createMockNotificationEthSent } from '@metamask/notification-services-controller/notification-services/mocks';
+import { processNotification } from '@metamask/notification-services-controller/notification-services';
+
+import * as UseNotificationModule from '../../hooks/metamask-notifications/useNotifications';
+import { renderWithProvider } from '../../../test/lib/render-helpers';
+import configureStore from '../../store/store';
+import mockState from '../../../test/data/mock-state.json';
 import { NotificationsListReadAllButton } from './notifications-list-read-all-button';
 
-const mockStore = configureStore([thunk]);
-const store = mockStore({
-  metamask: {
-    metamaskNotificationsList: [],
-  },
-});
+const mockNotification = (isRead: boolean) => {
+  const n = processNotification(createMockNotificationEthSent());
+  n.isRead = isRead;
+  return n;
+};
 
 describe('NotificationsListReadAllButton', () => {
+  const store = configureStore(mockState);
+
   it('renders correctly and handles click', () => {
-    const { getByTestId } = render(
-      <Provider store={store}>
-        <NotificationsListReadAllButton notifications={[]} />
-      </Provider>,
+    const { getByTestId } = renderWithProvider(
+      <NotificationsListReadAllButton notifications={[]} />,
+      store,
     );
 
     const button = getByTestId('notifications-list-read-all-button');
     expect(button).toBeInTheDocument();
   });
+
+  it('presses and marks all unread notifications as read', async () => {
+    const mockMarkAsReadCallback = jest.fn();
+    jest
+      .spyOn(UseNotificationModule, 'useMarkNotificationAsRead')
+      .mockReturnValue({ markNotificationAsRead: mockMarkAsReadCallback });
+
+    const notificationList = [
+      mockNotification(true),
+      mockNotification(false),
+      mockNotification(false),
+      mockNotification(false),
+      mockNotification(true),
+    ];
+
+    const { getByTestId } = renderWithProvider(
+      <NotificationsListReadAllButton notifications={notificationList} />,
+      store,
+    );
+
+    const button = getByTestId('notifications-list-read-all-button');
+    fireEvent.click(button);
+
+    expect(mockMarkAsReadCallback).toHaveBeenCalled();
+    const mockCall = mockMarkAsReadCallback.mock.lastCall[0];
+    expect(mockCall.length).toBe(3); // 3 unread notifications sent
+  });
 });

ui/pages/notifications/notifications-list-read-all-button.tsx

@@ -34,8 +34,8 @@ export const NotificationsListReadAllButton = ({
     if (notifications && notifications.length > 0) {
       notificationsRead = notifications
         .filter(
-          (notification): notification is Notification =>
-            (notification as Notification).id !== undefined,
+          (notification) =>
+            notification?.id !== undefined && !notification.isRead,
         )
         .map((notification: Notification) => ({
           id: notification.id,