Adept KnownMembership imports for new location in types

test/LegacyCallHandler-test.ts

@@ -16,7 +16,6 @@ limitations under the License.
 
 import {
     IProtocol,
-    KnownMembership,
     LOCAL_NOTIFICATION_SETTINGS_PREFIX,
     MatrixEvent,
     PushRuleKind,
@@ -24,6 +23,7 @@ import {
     RuleId,
     TweakName,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { CallEvent, CallState, CallType, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import EventEmitter from "events";
 import { mocked } from "jest-mock";

test/RoomNotifs-test.ts

@@ -24,8 +24,8 @@ import {
     EventType,
     MatrixEvent,
     PendingEventOrdering,
-    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 { mkEvent, mkRoom, mkRoomMember, muteRoom, stubClient, upsertRoomStateEvents } from "./test-utils";

test/SlashCommands-test.tsx

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { KnownMembership, MatrixClient, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { mocked } from "jest-mock";
 
 import { Command, Commands, getCommand } from "../src/SlashCommands";

test/TextForEvent-test.ts

@@ -18,12 +18,12 @@ import {
     EventType,
     HistoryVisibility,
     JoinRule,
-    KnownMembership,
     MatrixClient,
     MatrixEvent,
     Room,
     RoomMember,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { render } from "@testing-library/react";
 import { ReactElement } from "react";
 import { Mocked, mocked } from "jest-mock";

test/components/structures/MessagePanel-test.tsx

@@ -17,7 +17,8 @@ limitations under the License.
 
 import React from "react";
 import { EventEmitter } from "events";
-import { MatrixEvent, Room, RoomMember, Thread, ReceiptType, KnownMembership } from "matrix-js-sdk/src/matrix";
+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";
 

test/components/structures/RoomView-test.tsx

@@ -28,8 +28,8 @@ import {
     MatrixEvent,
     SearchResult,
     IEvent,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+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";

test/components/structures/SpaceHierarchy-test.tsx

@@ -17,7 +17,8 @@ limitations under the License.
 import React from "react";
 import { mocked } from "jest-mock";
 import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved } from "@testing-library/react";
-import { MatrixClient, Room, HierarchyRoom, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, Room, HierarchyRoom } 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";
 

test/components/structures/TimelinePanel-test.tsx

@@ -34,8 +34,8 @@ import {
     THREAD_RELATION_TYPE,
     ThreadEvent,
     ThreadFilterType,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import React, { createRef } from "react";
 import { Mocked, mocked } from "jest-mock";
 import { forEachRight } from "lodash";

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";
 

test/hooks/useRoomMembers-test.tsx

@@ -16,7 +16,8 @@ limitations under the License.
 
 import { waitFor } from "@testing-library/react";
 import { renderHook, act } from "@testing-library/react-hooks/dom";
-import { KnownMembership, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import { stubClient } from "../test-utils";

test/hooks/useUnreadNotifications-test.ts

@@ -15,13 +15,8 @@ limitations under the License.
 */
 
 import { renderHook } from "@testing-library/react-hooks";
-import {
-    EventStatus,
-    KnownMembership,
-    NotificationCountType,
-    PendingEventOrdering,
-    Room,
-} from "matrix-js-sdk/src/matrix";
+import { EventStatus, NotificationCountType, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
 import { useUnreadNotifications } from "../../src/hooks/useUnreadNotifications";

test/models/Call-test.ts

@@ -17,15 +17,8 @@ limitations under the License.
 import EventEmitter from "events";
 import { mocked } from "jest-mock";
 import { waitFor } from "@testing-library/react";
-import {
-    RoomType,
-    Room,
-    RoomEvent,
-    MatrixEvent,
-    RoomStateEvent,
-    PendingEventOrdering,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import { RoomType, Room, RoomEvent, MatrixEvent, RoomStateEvent, PendingEventOrdering } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { Widget } from "matrix-widget-api";
 // eslint-disable-next-line no-restricted-imports
 import { MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";

test/stores/MemberListStore-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { EventType, IContent, KnownMembership, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
+import { EventType, IContent, MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import SdkConfig from "../../src/SdkConfig";
 import SettingsStore from "../../src/settings/SettingsStore";

test/stores/OwnBeaconStore-test.ts

@@ -24,8 +24,8 @@ import {
     RoomMember,
     ContentHelpers,
     M_BEACON,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Mocked } from "jest-mock";
 

test/stores/SpaceStore-test.ts

@@ -24,8 +24,8 @@ import {
     MatrixEvent,
     Room,
     RoomEvent,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { defer } from "matrix-js-sdk/src/utils";
 
 import SpaceStore from "../../src/stores/spaces/SpaceStore";

test/stores/notifications/RoomNotificationState-test.ts

@@ -22,8 +22,8 @@ import {
     NotificationCountType,
     EventType,
     MatrixEvent,
-    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 { mkEvent, muteRoom, stubClient } from "../../test-utils";

test/stores/room-list/RoomListStore-test.ts

@@ -18,12 +18,12 @@ import {
     ConditionKind,
     EventType,
     IPushRule,
-    KnownMembership,
     MatrixEvent,
     PendingEventOrdering,
     PushRuleActionName,
     Room,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import defaultDispatcher, { MatrixDispatcher } from "../../../src/dispatcher/dispatcher";
 import { SettingLevel } from "../../../src/settings/SettingLevel";

test/stores/room-list/algorithms/Algorithm-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked, MockedObject } from "jest-mock";
-import { KnownMembership, PendingEventOrdering, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { PendingEventOrdering, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { Widget } from "matrix-widget-api";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";

test/stores/room-list/algorithms/RecentAlgorithm-test.ts

@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Room, MatrixClient, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { mkMessage, mkRoom, stubClient } from "../../../test-utils";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";

test/test-utils/room.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { MockedObject } from "jest-mock";
-import { MatrixClient, MatrixEvent, EventType, Room, EventTimeline, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, MatrixEvent, EventType, Room, EventTimeline } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { IRoomState } from "../../src/components/structures/RoomView";
 import { TimelineRenderingType } from "../../src/contexts/RoomContext";

test/test-utils/test-utils.ts

@@ -38,8 +38,8 @@ import {
     JoinRule,
     IEventDecryptionResult,
     OidcClientConfig,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { normalize } from "matrix-js-sdk/src/utils";
 import { ReEmitter } from "matrix-js-sdk/src/ReEmitter";
 import { MediaHandler } from "matrix-js-sdk/src/webrtc/mediaHandler";
@@ -50,7 +50,8 @@ import { MatrixRTCSessionManager } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSe
 // eslint-disable-next-line no-restricted-imports
 import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
 
-import type { GroupCall, Membership } from "matrix-js-sdk/src/matrix";
+import type { GroupCall } from "matrix-js-sdk/src/matrix";
+import type { Membership } from "matrix-js-sdk/src/types";
 import { MatrixClientPeg as peg } from "../../src/MatrixClientPeg";
 import { ValidatedServerConfig } from "../../src/utils/ValidatedServerConfig";
 import { EnhancedMap } from "../../src/utils/maps";

test/utils/MultiInviter-test.ts

@@ -15,15 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import {
-    EventType,
-    KnownMembership,
-    MatrixClient,
-    MatrixError,
-    MatrixEvent,
-    Room,
-    RoomMember,
-} from "matrix-js-sdk/src/matrix";
+import { EventType, MatrixClient, MatrixError, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import Modal, { ComponentType, ComponentProps } from "../../src/Modal";

test/utils/direct-messages-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { ClientEvent, KnownMembership, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { ClientEvent, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import DMRoomMap from "../../src/utils/DMRoomMap";

test/utils/dm/createDmLocalRoom-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { EventType, KNOWN_SAFE_ROOM_VERSION, KnownMembership, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { EventType, KNOWN_SAFE_ROOM_VERSION, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { canEncryptToAllUsers } from "../../../src/createRoom";
 import { LocalRoom, LOCAL_ROOM_ID_PREFIX } from "../../../src/models/LocalRoom";

test/utils/dm/findDMForUser-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { KnownMembership, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import DMRoomMap from "../../../src/utils/DMRoomMap";
 import { createTestClient, makeMembershipEvent, mkThirdPartyInviteEvent } from "../../test-utils";

test/utils/export-test.tsx

@@ -23,8 +23,8 @@ import {
     RoomMember,
     RelationType,
     EventType,
-    KnownMembership,
 } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import { IExportOptions, ExportType, ExportFormat } from "../../src/utils/exportUtils/exportUtils";

test/utils/local-room-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { KnownMembership, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { LocalRoom, LocalRoomState, LOCAL_ROOM_ID_PREFIX } from "../../src/models/LocalRoom";
 import * as localRoomModule from "../../src/utils/local-room";

test/utils/localRoom/isRoomReady-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { EventType, KnownMembership, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { EventType, MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { LocalRoom, LOCAL_ROOM_ID_PREFIX } from "../../../src/models/LocalRoom";
 import { DirectoryMember } from "../../../src/utils/direct-messages";

test/utils/membership-test.ts

@@ -14,15 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {
-    KnownMembership,
-    MatrixClient,
-    MatrixEvent,
-    Room,
-    RoomMember,
-    RoomState,
-    RoomStateEvent,
-} from "matrix-js-sdk/src/matrix";
+import { MatrixClient, MatrixEvent, Room, RoomMember, RoomState, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 import { mocked } from "jest-mock";
 
 import { isKnockDenied, waitForMember } from "../../src/utils/membership";

test/utils/permalinks/Permalinks-test.ts

@@ -14,7 +14,8 @@ limitations under the License.
 */
 
 import { EventEmitter } from "events";
-import { Room, RoomMember, EventType, MatrixEvent, KnownMembership } from "matrix-js-sdk/src/matrix";
+import { Room, RoomMember, EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import { PermalinkParts } from "../../../src/utils/permalinks/PermalinkConstructor";

test/utils/room/canInviteTo-test.ts

@@ -15,7 +15,8 @@ limitations under the License.
 */
 
 import { mocked } from "jest-mock";
-import { JoinRule, KnownMembership, Room } from "matrix-js-sdk/src/matrix";
+import { JoinRule, Room } from "matrix-js-sdk/src/matrix";
+import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { shouldShowComponent } from "../../../src/customisations/helpers/UIComponents";
 import { UIComponent } from "../../../src/settings/UIFeature";