Adept KnownMembership imports for new location in types

test/components/views/context_menus/RoomContextMenu-test.tsx

@@ -19,7 +19,8 @@ limitations under the License.
 import { render, screen } from "@testing-library/react";
 import React, { ComponentProps } from "react";
 import { mocked } from "jest-mock";
-import { KnownMembership, MatrixClient, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import RoomContextMenu from "../../../../src/components/views/context_menus/RoomContextMenu";

test/components/views/context_menus/RoomGeneralContextMenu-test.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 
 import { fireEvent, getByLabelText, render, screen } from "@testing-library/react";
 import { mocked } from "jest-mock";
-import { ReceiptType, MatrixClient, PendingEventOrdering, Room, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { ReceiptType, MatrixClient, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import React from "react";
 import userEvent from "@testing-library/user-event";
 

test/components/views/dialogs/ConfirmUserActionDialog-test.tsx

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from "react";
 import { render } from "@testing-library/react";
-import { KnownMembership } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import ConfirmUserActionDialog from "../../../../src/components/views/dialogs/ConfirmUserActionDialog";
 import { mkRoomMember } from "../../../test-utils";

test/components/views/dialogs/InviteDialog-test.tsx

@@ -17,7 +17,8 @@ limitations under the License.
 import React from "react";
 import { fireEvent, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { RoomType, MatrixClient, MatrixError, Room, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { RoomType, MatrixClient, MatrixError, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { sleep } from "matrix-js-sdk/src/utils";
 import { mocked, Mocked } from "jest-mock";
 

test/components/views/dialogs/SpotlightDialog-test.tsx

@@ -21,11 +21,11 @@ import {
     IProtocol,
     IPublicRoomsChunkRoom,
     JoinRule,
-    KnownMembership,
     MatrixClient,
     Room,
     RoomMember,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import sanitizeHtml from "sanitize-html";
 import { fireEvent, render, screen } from "@testing-library/react";
 

test/components/views/elements/EventListSummary-test.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 
 import React, { ComponentProps } from "react";
 import { render, RenderResult } from "@testing-library/react";
-import { KnownMembership, MatrixEvent, Membership, RoomMember } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, RoomMember } from "matrix-js-sdk/src/matrix";
+import { KnownMembership, Membership } from "matrix-js-sdk/src/types";
 
 import {
     getMockClientWithEventEmitter,

test/components/views/elements/FacePile-test.tsx

@@ -15,7 +15,7 @@ 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/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import FacePile from "../../../../src/components/views/elements/FacePile";
 import { mkRoomMember } from "../../../test-utils";

test/components/views/elements/RoomFacePile-test.tsx

@@ -15,7 +15,7 @@ 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/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { mkRoom, mkRoomMember, stubClient, withClientContextRenderOptions } from "../../../test-utils";
 import RoomFacePile from "../../../../src/components/views/elements/RoomFacePile";

test/components/views/right_panel/RoomSummaryCard-test.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 
 import React from "react";
 import { render, fireEvent, screen } from "@testing-library/react";
-import { EventType, MatrixEvent, Room, MatrixClient, JoinRule, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { EventType, MatrixEvent, Room, MatrixClient, JoinRule } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { mocked, MockedObject } from "jest-mock";
 import { TooltipProvider } from "@vector-im/compound-web";
 

test/components/views/right_panel/UserInfo-test.tsx

@@ -28,8 +28,8 @@ import {
     CryptoApi,
     DeviceVerificationStatus,
     Device,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import {
     Phase,
     VerificationRequest,

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

@@ -24,8 +24,8 @@ import {
     RoomStateEvent,
     PendingEventOrdering,
     ISearchResults,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { CallType } from "matrix-js-sdk/src/webrtc/call";
 import { ClientWidgetApi, Widget } from "matrix-widget-api";
 import EventEmitter from "events";

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

@@ -17,15 +17,8 @@ limitations under the License.
 
 import React from "react";
 import { act, fireEvent, render, RenderResult, screen } from "@testing-library/react";
-import {
-    Room,
-    MatrixClient,
-    RoomState,
-    RoomMember,
-    User,
-    MatrixEvent,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import { Room, MatrixClient, RoomState, RoomMember, User, MatrixEvent } from "matrix-js-sdk/src/matrix";
+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";

test/components/views/rooms/NotificationBadge/UnreadNotificationBadge-test.tsx

@@ -26,8 +26,8 @@ import {
     EventStatus,
     PendingEventOrdering,
     ReceiptType,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
 import { mkThread } from "../../../../test-utils/threads";

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

@@ -19,13 +19,13 @@ import { CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import {
     EventType,
     JoinRule,
-    KnownMembership,
     MatrixClient,
     MatrixEvent,
     PendingEventOrdering,
     Room,
     RoomMember,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import {
     createEvent,
     fireEvent,

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

@@ -19,13 +19,13 @@ import {
     EventTimeline,
     EventType,
     JoinRule,
-    KnownMembership,
     MatrixError,
     MatrixEvent,
     Room,
     RoomMember,
     RoomStateEvent,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import React from "react";
 
 import ErrorDialog from "../../../../src/components/views/dialogs/ErrorDialog";

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

@@ -16,7 +16,8 @@ limitations under the License.
 
 import React, { ComponentProps } from "react";
 import { render, fireEvent, RenderResult, waitFor } from "@testing-library/react";
-import { Room, RoomMember, MatrixError, IContent, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, RoomMember, MatrixError, IContent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { withClientContextRenderOptions, stubClient } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";

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

@@ -17,7 +17,8 @@ limitations under the License.
 import React from "react";
 import { mocked, Mocked } from "jest-mock";
 import { render, screen, act } from "@testing-library/react";
-import { KnownMembership, PendingEventOrdering, Room, RoomStateEvent, RoomType } from "matrix-js-sdk/src/matrix";
+import { PendingEventOrdering, Room, RoomStateEvent, RoomType } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import type { MatrixClient, RoomMember } from "matrix-js-sdk/src/matrix";
 import { stubClient, wrapInMatrixClientContext, mkRoomMember } from "../../../test-utils";

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

@@ -24,8 +24,8 @@ import {
     MatrixEvent,
     RoomStateEvent,
     Thread,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { Widget } from "matrix-widget-api";
 
 import type { RoomMember } from "matrix-js-sdk/src/matrix";

test/components/views/settings/JoinRuleSettings-test.tsx

@@ -27,8 +27,8 @@ import {
     RoomMember,
     MatrixError,
     Visibility,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { defer, IDeferred } from "matrix-js-sdk/src/utils";
 
 import {

test/components/views/settings/tabs/room/PeopleRoomSettingsTab-test.tsx

@@ -18,13 +18,13 @@ import { act, fireEvent, render, screen, within } from "@testing-library/react";
 import {
     EventTimeline,
     EventType,
-    KnownMembership,
     MatrixError,
     MatrixEvent,
     Room,
     RoomMember,
     RoomStateEvent,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import React from "react";
 
 import ErrorDialog from "../../../../../../src/components/views/dialogs/ErrorDialog";

test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx

@@ -16,15 +16,8 @@ limitations under the License.
 
 import React from "react";
 import { fireEvent, render, RenderResult, screen, waitFor } from "@testing-library/react";
-import {
-    MatrixClient,
-    EventType,
-    MatrixEvent,
-    Room,
-    RoomMember,
-    ISendEventResponse,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import { MatrixClient, EventType, MatrixEvent, Room, RoomMember, ISendEventResponse } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { mocked } from "jest-mock";
 import { defer } from "matrix-js-sdk/src/utils";