Fix typing issues

test/components/views/rooms/EventTile-test.tsx

@@ -29,7 +29,6 @@ import {
     TweakName,
 } from "matrix-js-sdk/src/matrix";
 import { EventEncryptionInfo, EventShieldColour, EventShieldReason } from "matrix-js-sdk/src/crypto-api";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { mkEncryptedMatrixEvent } from "matrix-js-sdk/src/testing";
 
 import EventTile, { EventTileProps } from "../../../../src/components/views/rooms/EventTile";
@@ -59,13 +58,11 @@ describe("EventTile", () => {
         return (
             <MatrixClientContext.Provider value={client}>
                 <RoomContext.Provider value={props.roomContext}>
-                    <TooltipProvider>
-                        <EventTile
-                            mxEvent={mxEvent}
-                            replacingEventId={mxEvent.replacingEventId()}
-                            {...(props.eventTilePropertyOverrides ?? {})}
-                        />
-                    </TooltipProvider>
+                    <EventTile
+                        mxEvent={mxEvent}
+                        replacingEventId={mxEvent.replacingEventId()}
+                        {...(props.eventTilePropertyOverrides ?? {})}
+                    />
                 </RoomContext.Provider>
             </MatrixClientContext.Provider>
         );

test/components/views/rooms/LegacyRoomHeader-test.tsx

@@ -32,7 +32,6 @@ import { ClientWidgetApi, Widget } from "matrix-widget-api";
 import EventEmitter from "events";
 import { setupJestCanvasMock } from "jest-canvas-mock";
 import { ViewRoomOpts } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
-import { TooltipProvider } from "@vector-im/compound-web";
 // eslint-disable-next-line no-restricted-imports
 import { MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
 // eslint-disable-next-line no-restricted-imports
@@ -226,7 +225,6 @@ describe("LegacyRoomHeader", () => {
                     {...props}
                 />
             </RoomContext.Provider>,
-            ,
         );
     };
 
@@ -870,7 +868,6 @@ function mountHeader(room: Room, propsOverride = {}, roomContext?: Partial<IRoom
         <RoomContext.Provider value={{ ...roomContext, room } as IRoomState}>
             <RoomHeader {...props} />
         </RoomContext.Provider>,
-        ,
     );
 }
 

test/components/views/rooms/RoomHeader-test.tsx

@@ -40,7 +40,6 @@ import {
     waitFor,
 } from "@testing-library/react";
 import { ViewRoomOpts } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { filterConsole, mkEvent, stubClient } from "../../../test-utils";
 import RoomHeader from "../../../../src/components/views/rooms/RoomHeader";
@@ -67,11 +66,7 @@ jest.mock("../../../../src/utils/ShieldUtils");
 function getWrapper(): RenderOptions {
     return {
         wrapper: ({ children }) => (
-            <TooltipProvider>
-                <MatrixClientContext.Provider value={MatrixClientPeg.safeGet()}>
-                    {children}
-                </MatrixClientContext.Provider>
-            </TooltipProvider>
+            <MatrixClientContext.Provider value={MatrixClientPeg.safeGet()}>{children}</MatrixClientContext.Provider>
         ),
     };
 }

test/components/views/rooms/RoomHeader/CallGuestLinkButton-test.tsx

@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import React from "react";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { fireEvent, getByLabelText, getByText, render, screen, waitFor } from "@testing-library/react";
 import { EventTimeline, JoinRule, Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
@@ -75,11 +74,7 @@ describe("<CallGuestLinkButton />", () => {
 
     const getComponent = (room: Room) =>
         render(<CallGuestLinkButton room={room} />, {
-            wrapper: ({ children }) => (
-                <SDKContext.Provider value={sdkContext}>
-                    <TooltipProvider>{children}</TooltipProvider>
-                </SDKContext.Provider>
-            ),
+            wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider>,
         });
 
     const oldGet = SdkConfig.get;
@@ -225,11 +220,7 @@ describe("<CallGuestLinkButton />", () => {
 
         const getComponent = (room: Room, canInvite: boolean = true) =>
             render(<JoinRuleDialog room={room} canInvite={canInvite} onFinished={onFinished} />, {
-                wrapper: ({ children }) => (
-                    <SDKContext.Provider value={sdkContext}>
-                        <TooltipProvider>{children}</TooltipProvider>
-                    </SDKContext.Provider>
-                ),
+                wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider>,
             });
 
         beforeEach(() => {

test/components/views/rooms/RoomHeader/VideoRoomChatButton-test.tsx

@@ -18,7 +18,6 @@ import React from "react";
 import { MockedObject } from "jest-mock";
 import { Room } from "matrix-js-sdk/src/matrix";
 import { fireEvent, render, screen } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { VideoRoomChatButton } from "../../../../../src/components/views/rooms/RoomHeader/VideoRoomChatButton";
 import { SDKContext, SdkContextClass } from "../../../../../src/contexts/SDKContext";
@@ -57,11 +56,7 @@ describe("<VideoRoomChatButton />", () => {
 
     const getComponent = (room: Room) =>
         render(<VideoRoomChatButton room={room} />, {
-            wrapper: ({ children }) => (
-                <SDKContext.Provider value={sdkContext}>
-                    <TooltipProvider>{children}</TooltipProvider>
-                </SDKContext.Provider>
-            ),
+            wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider>,
         });
 
     beforeEach(() => {

test/components/views/rooms/RoomList-test.tsx

@@ -20,7 +20,6 @@ import { cleanup, queryByRole, render, screen, within } from "@testing-library/r
 import userEvent from "@testing-library/user-event";
 import { mocked } from "jest-mock";
 import { Room } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import RoomList from "../../../../src/components/views/rooms/RoomList";
 import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
@@ -56,18 +55,16 @@ describe("RoomList", () => {
 
     function getComponent(props: Partial<ComponentProps<typeof RoomList>> = {}): JSX.Element {
         return (
-            <TooltipProvider>
-                <RoomList
-                    onKeyDown={jest.fn()}
-                    onFocus={jest.fn()}
-                    onBlur={jest.fn()}
-                    onResize={jest.fn()}
-                    resizeNotifier={new ResizeNotifier()}
-                    isMinimized={false}
-                    activeSpace={MetaSpace.Home}
-                    {...props}
-                />
-            </TooltipProvider>
+            <RoomList
+                onKeyDown={jest.fn()}
+                onFocus={jest.fn()}
+                onBlur={jest.fn()}
+                onResize={jest.fn()}
+                resizeNotifier={new ResizeNotifier()}
+                isMinimized={false}
+                activeSpace={MetaSpace.Home}
+                {...props}
+            />
         );
     }