Refactor matrix hooks

src/room/CallEndedView.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import styles from "./CallEndedView.module.css";
 import { LinkButton } from "../button";
-import { useProfile } from "../ConferenceCallManagerHooks";
+import { useProfile } from "../useProfile";
 import { Subtitle, Body, Link, Headline } from "../typography/Typography";
 import { Header, HeaderLogo, LeftNav, RightNav } from "../Header";
 

src/room/InCallView.jsx

@@ -12,7 +12,7 @@ import VideoGrid, {
 } from "matrix-react-sdk/src/components/views/voip/GroupCallView/VideoGrid";
 import SimpleVideoGrid from "matrix-react-sdk/src/components/views/voip/GroupCallView/SimpleVideoGrid";
 import "matrix-react-sdk/res/css/views/voip/GroupCallView/_VideoGrid.scss";
-import { getAvatarUrl } from "../ConferenceCallManagerHooks";
+import { getAvatarUrl } from "../matrix-utils";
 import { GroupCallInspector } from "./GroupCallInspector";
 import { OverflowMenu } from "./OverflowMenu";
 import { GridLayoutMenu } from "./GridLayoutMenu";

src/room/InviteModal.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { Modal, ModalContent } from "../Modal";
 import { CopyButton } from "../button";
-import { getRoomUrl } from "../ConferenceCallManagerHooks";
+import { getRoomUrl } from "../matrix-utils";
 import styles from "./InviteModal.module.css";
 
 export function InviteModal({ roomId, ...rest }) {

src/room/LobbyView.jsx

@@ -5,7 +5,7 @@ import { Header, LeftNav, RightNav, RoomHeaderInfo } from "../Header";
 import { GroupCallState } from "matrix-js-sdk/src/webrtc/groupCall";
 import { useCallFeed } from "matrix-react-sdk/src/hooks/useCallFeed";
 import { useMediaStream } from "matrix-react-sdk/src/hooks/useMediaStream";
-import { getRoomUrl } from "../ConferenceCallManagerHooks";
+import { getRoomUrl } from "../matrix-utils";
 import { OverflowMenu } from "./OverflowMenu";
 import { UserMenuContainer } from "../UserMenuContainer";
 import { Body, Link } from "../typography/Typography";

src/room/RoomPage.jsx

@@ -16,7 +16,7 @@ limitations under the License.
 
 import React, { useMemo } from "react";
 import { useLocation, useParams } from "react-router-dom";
-import { useClient } from "../ConferenceCallManagerHooks";
+import { useClient } from "../ClientContext";
 import { ErrorView, LoadingView } from "../FullScreenView";
 import { RoomAuthView } from "./RoomAuthView";
 import { GroupCallLoader } from "./GroupCallLoader";

src/room/RoomRedirect.jsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";
 import { useLocation, useHistory } from "react-router-dom";
-import { defaultHomeserverHost } from "../ConferenceCallManagerHooks";
+import { defaultHomeserverHost } from "../matrix-utils";
 import { LoadingView } from "../FullScreenView";
 
 export function RoomRedirect() {