Switch to importing more things from the main js-sdk export (#11376)

src/components/structures/RoomView.tsx

@@ -34,11 +34,11 @@ import {
     HistoryVisibility,
     JoinRule,
     ClientEvent,
+    MatrixError,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { throttle } from "lodash";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
 import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 import { ISearchResults } from "matrix-js-sdk/src/@types/search";

src/components/structures/TimelinePanel.tsx

@@ -31,6 +31,8 @@ import {
     RelationType,
     ClientEvent,
     MatrixClient,
+    Relations,
+    MatrixError,
 } from "matrix-js-sdk/src/matrix";
 import { TimelineWindow } from "matrix-js-sdk/src/timeline-window";
 import { SyncState } from "matrix-js-sdk/src/sync";
@@ -38,8 +40,6 @@ import { debounce, findLastIndex, throttle } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
 import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
-import { Relations } from "matrix-js-sdk/src/models/relations";
 
 import SettingsStore from "../../settings/SettingsStore";
 import { Layout } from "../../settings/enums/Layout";

src/components/structures/auth/SoftLogout.tsx

@@ -18,7 +18,7 @@ import React, { ChangeEvent, SyntheticEvent } from "react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Optional } from "matrix-events-sdk";
 import { ISSOFlow, LoginFlow, SSOAction } from "matrix-js-sdk/src/@types/auth";
-import { MatrixError } from "matrix-js-sdk/src/http-api";
+import { MatrixError } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
 import dis from "../../../dispatcher/dispatcher";