Use new compound tooltip

2025-07-28 15:22:05 +03:00 · 2024-04-12 14:56:23 +02:00
parent aadb46358b
commit 5354e6efea
49 changed files with 127 additions and 211 deletions
--- a/test/components/structures/MessagePanel-test.tsx
+++ b/test/components/structures/MessagePanel-test.tsx
@ -20,7 +20,6 @@ import { EventEmitter } from "events";
 import { MatrixEvent, Room, RoomMember, Thread, ReceiptType } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { render } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";

 import MessagePanel, { shouldFormContinuation } from "../../../src/components/structures/MessagePanel";
 import SettingsStore from "../../../src/settings/SettingsStore";
@ -99,9 +98,7 @@ describe("MessagePanel", function () {
    const getComponent = (props = {}, roomContext: Partial<IRoomState> = {}) => (
        <MatrixClientContext.Provider value={client}>
            <RoomContext.Provider value={{ ...defaultRoomContext, ...roomContext }}>
-                <TooltipProvider>
-                    <MessagePanel {...defaultProps} {...props} />
-                </TooltipProvider>
+                <MessagePanel {...defaultProps} {...props} />
            </RoomContext.Provider>
        </MatrixClientContext.Provider>
    );
--- a/test/components/structures/RightPanel-test.tsx
+++ b/test/components/structures/RightPanel-test.tsx
@ -19,7 +19,6 @@ import { render, screen, waitFor } from "@testing-library/react";
 import { jest } from "@jest/globals";
 import { mocked, MockedObject } from "jest-mock";
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";

 import _RightPanel from "../../../src/components/structures/RightPanel";
 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
@ -123,7 +122,6 @@ describe("RightPanel", () => {
                resizeNotifier={resizeNotifier}
                permalinkCreator={new RoomPermalinkCreator(r1, r1.roomId)}
            />,
-            { wrapper: TooltipProvider },
        );
        // Wait for RPS room 1 updates to fire
        const rpsUpdated = waitForRpsUpdate();
--- a/test/components/structures/RoomView-test.tsx
+++ b/test/components/structures/RoomView-test.tsx
@ -33,7 +33,6 @@ import { KnownMembership } from "matrix-js-sdk/src/types";
 import { MEGOLM_ALGORITHM } from "matrix-js-sdk/src/crypto/olmlib";
 import { fireEvent, render, screen, RenderResult, waitForElementToBeRemoved, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { TooltipProvider } from "@vector-im/compound-web";

 import {
    stubClient,
@ -145,7 +144,6 @@ describe("RoomView", () => {
                    wrappedRef={ref as any}
                />
            </SDKContext.Provider>,
-            { wrapper: TooltipProvider },
        );
        await flushPromises();
        return roomView;
@ -183,7 +181,6 @@ describe("RoomView", () => {
                    onRegistered={jest.fn()}
                />
            </SDKContext.Provider>,
-            { wrapper: TooltipProvider },
        );
        await flushPromises();
        return roomView;
--- a/test/components/structures/SpaceHierarchy-test.tsx
+++ b/test/components/structures/SpaceHierarchy-test.tsx
@ -20,7 +20,6 @@ import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved } from "@
 import { HierarchyRoom, JoinRule, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { RoomHierarchy } from "matrix-js-sdk/src/room-hierarchy";
-import { TooltipProvider } from "@vector-im/compound-web";

 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import { mkStubRoom, stubClient } from "../../test-utils";
@ -287,9 +286,7 @@ describe("SpaceHierarchy", () => {
        };
        const getComponent = (props = {}): React.ReactElement => (
            <MatrixClientContext.Provider value={client}>
-                <TooltipProvider>
-                    <SpaceHierarchy {...defaultProps} {...props} />
-                </TooltipProvider>
+                <SpaceHierarchy {...defaultProps} {...props} />
            </MatrixClientContext.Provider>
        );

--- a/test/components/structures/ThreadPanel-test.tsx
+++ b/test/components/structures/ThreadPanel-test.tsx
@ -25,7 +25,6 @@ import {
    FeatureSupport,
    Thread,
 } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";

 import ThreadPanel, { ThreadFilterType, ThreadPanelHeader } from "../../../src/components/structures/ThreadPanel";
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
@ -51,7 +50,6 @@ describe("ThreadPanel", () => {
                    filterOption={ThreadFilterType.All}
                    setFilterOption={() => undefined}
                />,
-                { wrapper: TooltipProvider },
            );
            expect(asFragment()).toMatchSnapshot();
        });
@ -63,7 +61,6 @@ describe("ThreadPanel", () => {
                    filterOption={ThreadFilterType.My}
                    setFilterOption={() => undefined}
                />,
-                { wrapper: TooltipProvider },
            );
            expect(asFragment()).toMatchSnapshot();
        });
@ -75,7 +72,6 @@ describe("ThreadPanel", () => {
                    filterOption={ThreadFilterType.All}
                    setFilterOption={() => undefined}
                />,
-                { wrapper: TooltipProvider },
            );
            expect(asFragment()).toMatchSnapshot();
        });
@ -87,7 +83,6 @@ describe("ThreadPanel", () => {
                    filterOption={ThreadFilterType.All}
                    setFilterOption={() => undefined}
                />,
-                { wrapper: TooltipProvider },
            );
            const found = container.querySelector(".mx_ThreadPanel_dropdown");
            expect(found).toBeTruthy();
@ -103,7 +98,6 @@ describe("ThreadPanel", () => {
                    filterOption={ThreadFilterType.All}
                    setFilterOption={() => undefined}
                />,
-                { wrapper: TooltipProvider },
            );
            fireEvent.click(container.querySelector(".mx_ThreadPanel_dropdown")!);
            const found = screen.queryAllByRole("menuitemradio");
@ -126,13 +120,11 @@ describe("ThreadPanel", () => {
            const { container } = render(
                <RoomContext.Provider value={roomContextObject}>
                    <MatrixClientContext.Provider value={mockClient}>
-                        <TooltipProvider>
-                            <ThreadPanelHeader
-                                empty={false}
-                                filterOption={ThreadFilterType.All}
-                                setFilterOption={() => undefined}
-                            />
-                        </TooltipProvider>
+                        <ThreadPanelHeader
+                            empty={false}
+                            filterOption={ThreadFilterType.All}
+                            setFilterOption={() => undefined}
+                        />
                    </MatrixClientContext.Provider>
                </RoomContext.Provider>,
            );
@ -146,13 +138,11 @@ describe("ThreadPanel", () => {
            const mockClient = createTestClient();
            const { container } = render(
                <MatrixClientContext.Provider value={mockClient}>
-                    <TooltipProvider>
-                        <ThreadPanelHeader
-                            empty={false}
-                            filterOption={ThreadFilterType.All}
-                            setFilterOption={() => undefined}
-                        />
-                    </TooltipProvider>
+                    <ThreadPanelHeader
+                        empty={false}
+                        filterOption={ThreadFilterType.All}
+                        setFilterOption={() => undefined}
+                    />
                </MatrixClientContext.Provider>,
            );
            fireEvent.click(getByRole(container, "button", { name: "Mark all as read" }));
@ -308,7 +298,7 @@ describe("ThreadPanel", () => {
            myThreads!.addLiveEvent(ownThread.rootEvent);

            let events: EventData[] = [];
-            const renderResult = render(<TestThreadPanel />, { wrapper: TooltipProvider });
+            const renderResult = render(<TestThreadPanel />);
            await waitFor(() => expect(renderResult.container.querySelector(".mx_AutoHideScrollbar")).toBeFalsy());
            await waitFor(() => {
                events = findEvents(renderResult.container);
@ -354,7 +344,7 @@ describe("ThreadPanel", () => {
            allThreads!.addLiveEvent(otherThread.rootEvent);

            let events: EventData[] = [];
-            const renderResult = render(<TestThreadPanel />, { wrapper: TooltipProvider });
+            const renderResult = render(<TestThreadPanel />);
            await waitFor(() => expect(renderResult.container.querySelector(".mx_AutoHideScrollbar")).toBeFalsy());
            await waitFor(() => {
                events = findEvents(renderResult.container);
--- a/test/components/structures/TimelinePanel-test.tsx
+++ b/test/components/structures/TimelinePanel-test.tsx
@ -39,7 +39,6 @@ import { KnownMembership } from "matrix-js-sdk/src/types";
 import React, { createRef } from "react";
 import { Mocked, mocked } from "jest-mock";
 import { forEachRight } from "lodash";
-import { TooltipProvider } from "@vector-im/compound-web";

 import TimelinePanel from "../../../src/components/structures/TimelinePanel";
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";
@ -212,7 +211,6 @@ describe("TimelinePanel", () => {
                    manageReadReceipts={true}
                    ref={ref}
                />,
-                { wrapper: TooltipProvider },
            );
            await flushPromises();
            timelinePanel = ref.current!;
@ -392,7 +390,7 @@ describe("TimelinePanel", () => {
            onEventScrolledIntoView: jest.fn(),
        };

-        const { rerender } = render(<TimelinePanel {...props} />, { wrapper: TooltipProvider });
+        const { rerender } = render(<TimelinePanel {...props} />);
        expect(props.onEventScrolledIntoView).toHaveBeenCalledWith(undefined);
        props.eventId = events[1].getId();
        rerender(<TimelinePanel {...props} />);
@ -409,9 +407,7 @@ describe("TimelinePanel", () => {
        setupPagination(client, timeline, eventsPage1, null);

        await withScrollPanelMountSpy(async (mountSpy) => {
-            const { container } = render(<TimelinePanel {...getProps(room, events)} timelineSet={timelineSet} />, {
-                wrapper: TooltipProvider,
-            });
+            const { container } = render(<TimelinePanel {...getProps(room, events)} timelineSet={timelineSet} />, {});

            await waitFor(() => expectEvents(container, [events[1]]));

@ -428,7 +424,7 @@ describe("TimelinePanel", () => {
        const [, room, events] = setupTestData();

        await withScrollPanelMountSpy(async (mountSpy) => {
-            const { container } = render(<TimelinePanel {...getProps(room, events)} />, { wrapper: TooltipProvider });
+            const { container } = render(<TimelinePanel {...getProps(room, events)} />);

            await waitFor(() => expectEvents(container, [events[0], events[1]]));

@ -455,7 +451,7 @@ describe("TimelinePanel", () => {

            const paginateSpy = jest.spyOn(TimelineWindow.prototype, "paginate").mockClear();

-            render(<TimelinePanel {...props} />, { wrapper: TooltipProvider });
+            render(<TimelinePanel {...props} />);

            const event = new MatrixEvent({ type: RoomEvent.Timeline, origin_server_ts: 0 });
            const data = { timeline: otherTimeline, liveEvent: true };
@ -471,7 +467,7 @@ describe("TimelinePanel", () => {

            const paginateSpy = jest.spyOn(TimelineWindow.prototype, "paginate").mockClear();

-            render(<TimelinePanel {...props} />, { wrapper: TooltipProvider });
+            render(<TimelinePanel {...props} />);

            const event = new MatrixEvent({ type: RoomEvent.Timeline, origin_server_ts: 0 });
            const data = { timeline: props.timelineSet.getLiveTimeline(), liveEvent: false };
@ -487,7 +483,7 @@ describe("TimelinePanel", () => {

            const paginateSpy = jest.spyOn(TimelineWindow.prototype, "paginate").mockClear();

-            render(<TimelinePanel {...props} />, { wrapper: TooltipProvider });
+            render(<TimelinePanel {...props} />);

            const event = new MatrixEvent({ type: RoomEvent.Timeline, origin_server_ts: 0 });
            const data = { timeline: props.timelineSet.getLiveTimeline(), liveEvent: false };
@ -504,7 +500,7 @@ describe("TimelinePanel", () => {

            const paginateSpy = jest.spyOn(TimelineWindow.prototype, "paginate").mockClear();

-            render(<TimelinePanel {...props} />, { wrapper: TooltipProvider });
+            render(<TimelinePanel {...props} />);

            const event = new MatrixEvent({ type: RoomEvent.Timeline, origin_server_ts: 0 });
            const data = { timeline: props.timelineSet.getLiveTimeline(), liveEvent: true };
@ -527,7 +523,7 @@ describe("TimelinePanel", () => {

            const paginateSpy = jest.spyOn(TimelineWindow.prototype, "paginate").mockClear();

-            render(<TimelinePanel {...props} />, { wrapper: TooltipProvider });
+            render(<TimelinePanel {...props} />);

            await flushPromises();

@ -568,7 +564,6 @@ describe("TimelinePanel", () => {
                    overlayTimelineSet={overlayTimelineSet}
                    overlayTimelineSetFilter={isCallEvent}
                />,
-                { wrapper: TooltipProvider },
            );
            await waitFor(() =>
                expectEvents(container, [
@ -608,7 +603,6 @@ describe("TimelinePanel", () => {

            const { container } = render(
                <TimelinePanel {...getProps(room, events)} overlayTimelineSet={overlayTimelineSet} />,
-                { wrapper: TooltipProvider },
            );

            await waitFor(() =>
@ -640,7 +634,6 @@ describe("TimelinePanel", () => {

            const { container } = render(
                <TimelinePanel {...getProps(room, events)} overlayTimelineSet={overlayTimelineSet} />,
-                { wrapper: TooltipProvider },
            );

            await waitFor(() =>
@ -672,7 +665,6 @@ describe("TimelinePanel", () => {

            const { container } = render(
                <TimelinePanel {...getProps(room, events)} overlayTimelineSet={overlayTimelineSet} />,
-                { wrapper: TooltipProvider },
            );

            await waitFor(() =>
@ -707,7 +699,6 @@ describe("TimelinePanel", () => {
                        timelineSet={timelineSet}
                        overlayTimelineSet={overlayTimelineSet}
                    />,
-                    { wrapper: TooltipProvider },
                );

                await waitFor(() => expectEvents(container, [overlayEvents[0], events[0]]));
@ -781,7 +772,6 @@ describe("TimelinePanel", () => {
            await withScrollPanelMountSpy(async (mountSpy) => {
                const { container } = render(
                    <TimelinePanel {...getProps(room, events)} overlayTimelineSet={overlayTimelineSet} />,
-                    { wrapper: TooltipProvider },
                );

                await waitFor(() =>
@ -894,7 +884,6 @@ describe("TimelinePanel", () => {
                <MatrixClientContext.Provider value={client}>
                    <TimelinePanel timelineSet={allThreads} manageReadReceipts sendReadReceiptOnLoad />
                </MatrixClientContext.Provider>,
-                { wrapper: TooltipProvider },
            );
            await dom.findByText("RootEvent");
            await dom.findByText("ReplyEvent1");
@ -948,7 +937,6 @@ describe("TimelinePanel", () => {
                <MatrixClientContext.Provider value={client}>
                    <TimelinePanel timelineSet={allThreads} manageReadReceipts sendReadReceiptOnLoad />
                </MatrixClientContext.Provider>,
-                { wrapper: TooltipProvider },
            );
            await dom.findByText("RootEvent");
            await dom.findByText("ReplyEvent1");
@ -1017,7 +1005,6 @@ describe("TimelinePanel", () => {
            <MatrixClientContext.Provider value={client}>
                <TimelinePanel timelineSet={timelineSet} manageReadReceipts={true} sendReadReceiptOnLoad={true} />
            </MatrixClientContext.Provider>,
-            { wrapper: TooltipProvider },
        );

        await waitFor(() => expect(screen.queryByRole("progressbar")).toBeNull());
--- a/test/components/structures/auth/ForgotPassword-test.tsx
+++ b/test/components/structures/auth/ForgotPassword-test.tsx
@ -103,7 +103,7 @@ describe("<ForgotPassword>", () => {
        beforeEach(() => {
            renderResult = render(
                <ForgotPassword serverConfig={serverConfig} onComplete={onComplete} onLoginClick={onLoginClick} />,
-                { wrapper: TooltipProvider },
+                ,
            );
        });

--- a/test/components/views/beacon/BeaconListItem-test.tsx
+++ b/test/components/views/beacon/BeaconListItem-test.tsx
@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { act, fireEvent, render } from "@testing-library/react";
 import { Beacon, RoomMember, MatrixEvent, LocationAssetType } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";

 import BeaconListItem from "../../../../src/components/views/beacon/BeaconListItem";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
@ -76,7 +75,6 @@ describe("<BeaconListItem />", () => {
            <MatrixClientContext.Provider value={mockClient}>
                <BeaconListItem {...defaultProps} {...props} />
            </MatrixClientContext.Provider>,
-            { wrapper: TooltipProvider },
        );

    const setupRoomWithBeacons = (beaconInfoEvents: MatrixEvent[], locationEvents?: MatrixEvent[]): Beacon[] => {
--- a/test/components/views/beacon/BeaconViewDialog-test.tsx
+++ b/test/components/views/beacon/BeaconViewDialog-test.tsx
@ -80,8 +80,7 @@ describe("<BeaconViewDialog />", () => {
        matrixClient: mockClient as MatrixClient,
    };

-    const getComponent = (props = {}): RenderResult =>
-        render(<BeaconViewDialog {...defaultProps} {...props} />, { wrapper: TooltipProvider });
+    const getComponent = (props = {}): RenderResult => render(<BeaconViewDialog {...defaultProps} {...props} />);

    const openSidebar = (getByTestId: RenderResult["getByTestId"]) => {
        fireEvent.click(getByTestId("beacon-view-dialog-open-sidebar"));
--- a/test/components/views/beacon/ShareLatestLocation-test.tsx
+++ b/test/components/views/beacon/ShareLatestLocation-test.tsx
@ -16,7 +16,6 @@ limitations under the License.

 import React from "react";
 import { fireEvent, render } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";

 import ShareLatestLocation from "../../../../src/components/views/beacon/ShareLatestLocation";
 import { copyPlaintext } from "../../../../src/utils/strings";
@ -33,8 +32,7 @@ describe("<ShareLatestLocation />", () => {
            timestamp: 123,
        },
    };
-    const getComponent = (props = {}) =>
-        render(<ShareLatestLocation {...defaultProps} {...props} />, { wrapper: TooltipProvider });
+    const getComponent = (props = {}) => render(<ShareLatestLocation {...defaultProps} {...props} />);

    beforeEach(() => {
        jest.clearAllMocks();
--- a/test/components/views/dialogs/ServerPickerDialog-test.tsx
+++ b/test/components/views/dialogs/ServerPickerDialog-test.tsx
@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { fireEvent, render, screen } from "@testing-library/react";
 import fetchMock from "fetch-mock-jest";
-import { TooltipProvider } from "@vector-im/compound-web";

 import ServerPickerDialog from "../../../../src/components/views/dialogs/ServerPickerDialog";
 import SdkConfig from "../../../../src/SdkConfig";
@ -56,7 +55,7 @@ describe("<ServerPickerDialog />", () => {
            onFinished: any;
            serverConfig: ValidatedServerConfig;
        }> = {},
-    ) => render(<ServerPickerDialog {...defaultProps} {...props} />, { wrapper: TooltipProvider });
+    ) => render(<ServerPickerDialog {...defaultProps} {...props} />);

    beforeEach(() => {
        SdkConfig.add({
--- a/test/components/views/elements/FacePile-test.tsx
+++ b/test/components/views/elements/FacePile-test.tsx
@ -14,7 +14,6 @@ limitations under the License.

 import { render } from "@testing-library/react";
 import React from "react";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { KnownMembership } from "matrix-js-sdk/src/types";

 import FacePile from "../../../../src/components/views/elements/FacePile";
@ -26,7 +25,6 @@ describe("<FacePile />", () => {

        const { asFragment } = render(
            <FacePile members={[member]} size="36px" overflow={false} tooltipLabel="tooltip" />,
-            { wrapper: TooltipProvider },
        );

        expect(asFragment()).toMatchSnapshot();
--- a/test/components/views/elements/Pill-test.tsx
+++ b/test/components/views/elements/Pill-test.tsx
@ -65,7 +65,7 @@ describe("<Pill>", () => {
            <div onClick={pillParentClickHandler}>
                <Pill {...withDefault} />
            </div>,
-            { wrapper: TooltipProvider },
+            ,
        );
    };

--- a/test/components/views/messages/CallEvent-test.tsx
+++ b/test/components/views/messages/CallEvent-test.tsx
@ -103,7 +103,7 @@ describe("CallEvent", () => {
    });

    const renderEvent = () => {
-        render(<CallEvent mxEvent={call.event} />, { wrapper: TooltipProvider });
+        render(<CallEvent mxEvent={call.event} />);
    };

    it("shows a message and duration if the call was ended", () => {
--- a/test/components/views/messages/MStickerBody-test.tsx
+++ b/test/components/views/messages/MStickerBody-test.tsx
@ -19,7 +19,6 @@ import { render, screen } from "@testing-library/react";
 import { EventType, getHttpUriForMxc, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import fetchMock from "fetch-mock-jest";
 import userEvent from "@testing-library/user-event";
-import { TooltipProvider } from "@vector-im/compound-web";

 import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalinks";
 import {
@ -86,7 +85,7 @@ describe("<MStickerBody/>", () => {
    it("should show a tooltip on hover", async () => {
        fetchMock.getOnce(url, { status: 200 });

-        render(<MStickerBody {...props} mxEvent={mediaEvent} />, { wrapper: TooltipProvider });
+        render(<MStickerBody {...props} mxEvent={mediaEvent} />);

        expect(screen.queryByRole("tooltip")).toBeNull();
        await userEvent.hover(screen.getByRole("img"));
--- a/test/components/views/messages/MessageTimestamp-test.tsx
+++ b/test/components/views/messages/MessageTimestamp-test.tsx
@ -31,7 +31,7 @@ describe("MessageTimestamp", () => {
    const DAY_MS = HOUR_MS * 24;

    it("should render HH:MM", () => {
-        const { asFragment } = render(<MessageTimestamp ts={nowDate.getTime()} />, { wrapper: TooltipProvider });
+        const { asFragment } = render(<MessageTimestamp ts={nowDate.getTime()} />, );
        expect(asFragment()).toMatchInlineSnapshot(`
            <DocumentFragment>
              <span
@ -47,7 +47,7 @@ describe("MessageTimestamp", () => {
    });

    it("should show full date & time on hover", async () => {
-        const { container } = render(<MessageTimestamp ts={nowDate.getTime()} />, { wrapper: TooltipProvider });
+        const { container } = render(<MessageTimestamp ts={nowDate.getTime()} />, );
        await userEvent.hover(container.querySelector(".mx_MessageTimestamp")!);
        expect((await screen.findByRole("tooltip")).textContent).toMatchInlineSnapshot(`"Fri, Dec 17, 2021, 08:09:00"`);
    });
@ -55,7 +55,7 @@ describe("MessageTimestamp", () => {
    it("should show sent & received time on hover if passed", async () => {
        const { container } = render(
            <MessageTimestamp ts={nowDate.getTime()} receivedTs={nowDate.getTime() + DAY_MS} />,
-            { wrapper: TooltipProvider },
+            ,
        );
        await userEvent.hover(container.querySelector(".mx_MessageTimestamp")!);
        expect((await screen.findByRole("tooltip")).textContent).toMatchInlineSnapshot(
--- a/test/components/views/polls/pollHistory/PollListItem-test.tsx
+++ b/test/components/views/polls/pollHistory/PollListItem-test.tsx
@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { fireEvent, render } from "@testing-library/react";
 import { MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";

 import { PollListItem } from "../../../../../src/components/views/polls/pollHistory/PollListItem";
 import { makePollStartEvent, mockIntlDateTimeFormat, unmockIntlDateTimeFormat } from "../../../../test-utils";
@ -26,8 +25,7 @@ describe("<PollListItem />", () => {
    const event = makePollStartEvent("Question?", "@me:domain.org");
    event.getContent().origin;
    const defaultProps = { event, onClick: jest.fn() };
-    const getComponent = (props = {}) =>
-        render(<PollListItem {...defaultProps} {...props} />, { wrapper: TooltipProvider });
+    const getComponent = (props = {}) => render(<PollListItem {...defaultProps} {...props} />);

    beforeAll(() => {
        // mock default locale to en-GB and set timezone
--- a/test/components/views/polls/pollHistory/PollListItemEnded-test.tsx
+++ b/test/components/views/polls/pollHistory/PollListItemEnded-test.tsx
@ -61,7 +61,7 @@ describe("<PollListItemEnded />", () => {
    const pollEndEvent = makePollEndEvent(pollId, roomId, userId, timestamp + 60000);

    const getComponent = (props: { event: MatrixEvent; poll: Poll }) =>
-        render(<PollListItemEnded {...props} onClick={jest.fn()} />, { wrapper: TooltipProvider });
+        render(<PollListItemEnded {...props} onClick={jest.fn()} />);

    beforeAll(() => {
        // mock default locale to en-GB and set timezone
--- a/test/components/views/rooms/LegacyRoomHeader-test.tsx
+++ b/test/components/views/rooms/LegacyRoomHeader-test.tsx
@ -226,7 +226,7 @@ describe("LegacyRoomHeader", () => {
                    {...props}
                />
            </RoomContext.Provider>,
-            { wrapper: TooltipProvider },
+            ,
        );
    };

@ -870,7 +870,7 @@ function mountHeader(room: Room, propsOverride = {}, roomContext?: Partial<IRoom
        <RoomContext.Provider value={{ ...roomContext, room } as IRoomState}>
            <RoomHeader {...props} />
        </RoomContext.Provider>,
-        { wrapper: TooltipProvider },
+        ,
    );
 }

--- a/test/components/views/rooms/MemberList-test.tsx
+++ b/test/components/views/rooms/MemberList-test.tsx
@ -21,7 +21,6 @@ import { Room, MatrixClient, RoomState, RoomMember, User, MatrixEvent } from "ma
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { compare } from "matrix-js-sdk/src/utils";
 import { mocked, MockedObject } from "jest-mock";
-import { TooltipProvider } from "@vector-im/compound-web";

 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import * as TestUtils from "../../../test-utils";
@ -231,7 +230,6 @@ describe("MemberList", () => {
                    ref={gatherWrappedRef}
                />
            </SDKContext.Provider>,
-            { wrapper: TooltipProvider },
        );
    }

@ -383,7 +381,6 @@ describe("MemberList", () => {
                            roomId={room.roomId}
                        />
                    </SDKContext.Provider>,
-                    { wrapper: TooltipProvider },
                );
            };

--- a/test/components/views/rooms/MemberTile-test.tsx
+++ b/test/components/views/rooms/MemberTile-test.tsx
@ -21,7 +21,6 @@ import { MatrixClient, RoomMember, Device } from "matrix-js-sdk/src/matrix";
 import { UserVerificationStatus, DeviceVerificationStatus } from "matrix-js-sdk/src/crypto-api";
 import { mocked } from "jest-mock";
 import userEvent from "@testing-library/user-event";
-import { TooltipProvider } from "@vector-im/compound-web";

 import * as TestUtils from "../../../test-utils";
 import MemberTile from "../../../../src/components/views/rooms/MemberTile";
@ -37,7 +36,7 @@ describe("MemberTile", () => {
    });

    it("should not display an E2EIcon when the e2E status = normal", () => {
-        const { container } = render(<MemberTile member={member} />, { wrapper: TooltipProvider });
+        const { container } = render(<MemberTile member={member} />);

        expect(container).toMatchSnapshot();
    });
@ -48,7 +47,7 @@ describe("MemberTile", () => {
            wasCrossSigningVerified: jest.fn().mockReturnValue(true),
        } as unknown as UserVerificationStatus);

-        const { container } = render(<MemberTile member={member} />, { wrapper: TooltipProvider });
+        const { container } = render(<MemberTile member={member} />);

        expect(container).toMatchSnapshot();
        await waitFor(async () => {
@ -72,7 +71,7 @@ describe("MemberTile", () => {
            crossSigningVerified: true,
        } as DeviceVerificationStatus);

-        const { container } = render(<MemberTile member={member} />, { wrapper: TooltipProvider });
+        const { container } = render(<MemberTile member={member} />);

        expect(container).toMatchSnapshot();
        await waitFor(async () => {
--- a/test/components/views/rooms/MessageComposer-test.tsx
+++ b/test/components/views/rooms/MessageComposer-test.tsx
@ -18,7 +18,6 @@ import * as React from "react";
 import { EventType, MatrixEvent, Room, RoomMember, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
 import { act, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { TooltipProvider } from "@vector-im/compound-web";

 import {
    clearAllModals,
@ -514,7 +513,6 @@ function wrapAndRender(
                    <MessageComposer {...defaultProps} {...props} />
                </RoomContext.Provider>
            </MatrixClientContext.Provider>,
-            { wrapper: TooltipProvider },
        ),
        roomContext,
    };
--- a/test/components/views/spaces/ThreadsActivityCentre-test.tsx
+++ b/test/components/views/spaces/ThreadsActivityCentre-test.tsx
@ -20,7 +20,6 @@ import React, { ComponentProps } from "react";
 import { getByText, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { NotificationCountType, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";

 import { ThreadsActivityCentre } from "../../../../src/components/views/spaces/threads-activity-centre";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
@ -49,7 +48,6 @@ describe("ThreadsActivityCentre", () => {
            <MatrixClientContext.Provider value={cli}>
                <ThreadsActivityCentre {...props} />
            </MatrixClientContext.Provider>,
-            { wrapper: TooltipProvider },
        );
    };

@ -251,7 +249,6 @@ describe("ThreadsActivityCentre", () => {
                    <ThreadsActivityCentre />
                </MatrixClientContext.Provider>
            </div>,
-            { wrapper: TooltipProvider },
        );
        await userEvent.click(getTACButton());