From b1960f9c68e3533be300d89136cca30d48d8c1f6 Mon Sep 17 00:00:00 2001
From: Rita Anene <92169163+Camillarhi@users.noreply.github.com>
Date: Thu, 8 Aug 2024 12:13:34 +0100
Subject: [PATCH] [MM-59907] Migrate tooltips of
'components/threading/global_threads/thread_list/thread_list.tsx' to
WithTooltip (#27851)
---
.../thread_list/__snapshots__/thread_list.test.tsx.snap | 7 ++++---
.../global_threads/thread_list/thread_list.test.tsx | 2 +-
.../threading/global_threads/thread_list/thread_list.tsx | 9 +++++----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/webapp/channels/src/components/threading/global_threads/thread_list/__snapshots__/thread_list.test.tsx.snap b/webapp/channels/src/components/threading/global_threads/thread_list/__snapshots__/thread_list.test.tsx.snap
index 3db6010ca8..7c895bfacb 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_list/__snapshots__/thread_list.test.tsx.snap
+++ b/webapp/channels/src/components/threading/global_threads/thread_list/__snapshots__/thread_list.test.tsx.snap
@@ -46,9 +46,10 @@ exports[`components/threading/global_threads/thread_list should match snapshot 1
-
-
+
}
/>
diff --git a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.test.tsx b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.test.tsx
index 5485c2408c..47e8138c3e 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.test.tsx
+++ b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.test.tsx
@@ -119,7 +119,7 @@ describe('components/threading/global_threads/thread_list', () => {
,
);
- wrapper.find(Header).shallow().find({content: 'Mark all as read'}).find(Button).simulate('click');
+ wrapper.find(Header).shallow().find(Button).find({id: 'threads-list__mark-all-as-read'}).simulate('click');
expect(openModal).toHaveBeenCalledTimes(1);
});
diff --git a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
index 347f5af9ba..2953bb9409 100644
--- a/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
+++ b/webapp/channels/src/components/threading/global_threads/thread_list/thread_list.tsx
@@ -22,7 +22,7 @@ import NoResultsIndicator from 'components/no_results_indicator';
import CRTListTutorialTip from 'components/tours/crt_tour/crt_list_tutorial_tip';
import CRTUnreadTutorialTip from 'components/tours/crt_tour/crt_unread_tutorial_tip';
import Header from 'components/widgets/header';
-import SimpleTooltip from 'components/widgets/simple_tooltip';
+import WithTooltip from 'components/with_tooltip';
import {A11yClassNames, Constants, CrtTutorialSteps, ModalIdentifiers, Preferences} from 'utils/constants';
import * as Keyboard from 'utils/keyboard';
@@ -231,12 +231,13 @@ const ThreadList = ({
)}
right={(
-
-
+
)}
/>