Consume more imports from matrix-js-sdk/src/matrix (#11449)

src/hooks/room/useTopic.ts

@@ -15,8 +15,14 @@ limitations under the License.
 */
 
 import { useEffect, useState } from "react";
-import { EventType, MatrixEvent, Room, RoomStateEvent, ContentHelpers } from "matrix-js-sdk/src/matrix";
-import { MRoomTopicEventContent } from "matrix-js-sdk/src/@types/topic";
+import {
+    EventType,
+    MatrixEvent,
+    Room,
+    RoomStateEvent,
+    ContentHelpers,
+    MRoomTopicEventContent,
+} from "matrix-js-sdk/src/matrix";
 import { Optional } from "matrix-events-sdk";
 
 import { useTypedEventEmitter } from "../useEventEmitter";

src/hooks/useThreepids.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient } from "matrix-js-sdk/src/matrix";
-import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
+import { MatrixClient, IThreepid } from "matrix-js-sdk/src/matrix";
 
 import { useAsyncRefreshMemo } from "./useAsyncRefreshMemo";