Add MatrixClientPeg::safeGet and use it in tests (#10985)

2025-08-06 10:22:45 +03:00 · 2023-06-05 18:12:23 +01:00
parent c47b587225
commit 6b46d6e4f8
88 changed files with 290 additions and 226 deletions
--- a/test/components/structures/LegacyCallEventGrouper-test.ts
+++ b/test/components/structures/LegacyCallEventGrouper-test.ts
@@ -30,7 +30,7 @@ let client: MatrixClient;
 describe("LegacyCallEventGrouper", () => {
    beforeEach(() => {
        stubClient();
-        client = MatrixClientPeg.get();
+        client = MatrixClientPeg.safeGet();
        client.getUserId = () => {
            return MY_USER_ID;
        };
--- a/test/components/structures/PipContainer-test.tsx
+++ b/test/components/structures/PipContainer-test.tsx
@@ -90,7 +90,7 @@ describe("PipContainer", () => {
        user = userEvent.setup();

        stubClient();
-        client = mocked(MatrixClientPeg.get());
+        client = mocked(MatrixClientPeg.safeGet());
        DMRoomMap.makeShared(client);

        room = new Room("!1:example.org", client, "@alice:example.org", {
--- a/test/components/structures/RightPanel-test.tsx
+++ b/test/components/structures/RightPanel-test.tsx
@@ -47,7 +47,7 @@ describe("RightPanel", () => {
    let RightPanel: React.ComponentType<React.ComponentProps<typeof RightPanelBase>>;
    beforeEach(() => {
        stubClient();
-        cli = mocked(MatrixClientPeg.get());
+        cli = mocked(MatrixClientPeg.safeGet());
        DMRoomMap.makeShared(cli);
        context = new SdkContextClass();
        context.client = cli;
--- a/test/components/structures/RoomSearchView-test.tsx
+++ b/test/components/structures/RoomSearchView-test.tsx
@@ -45,7 +45,7 @@ describe("<RoomSearchView/>", () => {

    beforeEach(async () => {
        stubClient();
-        client = MatrixClientPeg.get();
+        client = MatrixClientPeg.safeGet();
        client.supportsThreads = jest.fn().mockReturnValue(true);
        room = new Room("!room:server", client, client.getSafeUserId());
        mocked(client.getRoom).mockReturnValue(room);
--- a/test/components/structures/RoomStatusBar-test.tsx
+++ b/test/components/structures/RoomStatusBar-test.tsx
@@ -37,7 +37,7 @@ describe("RoomStatusBar", () => {
        jest.clearAllMocks();

        stubClient();
-        client = MatrixClientPeg.get();
+        client = MatrixClientPeg.safeGet();
        client.getSyncStateData = jest.fn().mockReturnValue({});
        room = new Room(ROOM_ID, client, client.getUserId()!, {
            pendingEventOrdering: PendingEventOrdering.Detached,
--- a/test/components/structures/RoomView-test.tsx
+++ b/test/components/structures/RoomView-test.tsx
@@ -76,7 +76,7 @@ describe("RoomView", () => {
    beforeEach(() => {
        mockPlatformPeg({ reload: () => {} });
        stubClient();
-        cli = mocked(MatrixClientPeg.get());
+        cli = mocked(MatrixClientPeg.safeGet());

        room = new Room(`!${roomCount++}:example.org`, cli, "@alice:example.org");
        jest.spyOn(room, "findPredecessor");
--- a/test/components/structures/SpaceHierarchy-test.tsx
+++ b/test/components/structures/SpaceHierarchy-test.tsx
@@ -43,7 +43,7 @@ describe("SpaceHierarchy", () => {
        let room: Room;
        beforeEach(() => {
            stubClient();
-            client = MatrixClientPeg.get();
+            client = MatrixClientPeg.safeGet();
            room = new Room("room-id", client, "@alice:example.com");
            hierarchy = new RoomHierarchy(room);

@@ -82,7 +82,7 @@ describe("SpaceHierarchy", () => {

    describe("toLocalRoom", () => {
        stubClient();
-        const client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.safeGet();
        const roomV1 = mkStubRoom("room-id-1", "Room V1", client);
        const roomV2 = mkStubRoom("room-id-2", "Room V2", client);
        const roomV3 = mkStubRoom("room-id-3", "Room V3", client);
@@ -171,7 +171,7 @@ describe("SpaceHierarchy", () => {
        });

        stubClient();
-        const client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.safeGet();

        const dmRoomMap = {
            getUserIdForRoomId: jest.fn(),
--- a/test/components/structures/ThreadPanel-test.tsx
+++ b/test/components/structures/ThreadPanel-test.tsx
@@ -120,7 +120,7 @@ describe("ThreadPanel", () => {

            stubClient();
            mockPlatformPeg();
-            mockClient = mocked(MatrixClientPeg.get());
+            mockClient = mocked(MatrixClientPeg.safeGet());
            Thread.setServerSideSupport(FeatureSupport.Stable);
            Thread.setServerSideListSupport(FeatureSupport.Stable);
            Thread.setServerSideFwdPaginationSupport(FeatureSupport.Stable);
--- a/test/components/structures/ThreadView-test.tsx
+++ b/test/components/structures/ThreadView-test.tsx
@@ -115,7 +115,7 @@ describe("ThreadView", () => {

        stubClient();
        mockPlatformPeg();
-        mockClient = mocked(MatrixClientPeg.get());
+        mockClient = mocked(MatrixClientPeg.safeGet());
        jest.spyOn(mockClient, "supportsThreads").mockReturnValue(true);

        room = new Room(ROOM_ID, mockClient, mockClient.getUserId() ?? "", {
--- a/test/components/structures/TimelinePanel-test.tsx
+++ b/test/components/structures/TimelinePanel-test.tsx
@@ -106,7 +106,7 @@ const mockEvents = (room: Room, count = 2): MatrixEvent[] => {
 };

 const setupTestData = (): [MatrixClient, Room, MatrixEvent[]] => {
-    const client = MatrixClientPeg.get();
+    const client = MatrixClientPeg.safeGet();
    const room = mkRoom(client, "roomId");
    const events = mockEvents(room);
    return [client, room, events];
@@ -377,7 +377,7 @@ describe("TimelinePanel", () => {
    });

    it("should scroll event into view when props.eventId changes", () => {
-        const client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.safeGet();
        const room = mkRoom(client, "roomId");
        const events = mockEvents(room);

@@ -798,7 +798,7 @@ describe("TimelinePanel", () => {
        let reply2: MatrixEvent;

        beforeEach(() => {
-            client = MatrixClientPeg.get();
+            client = MatrixClientPeg.safeGet();

            Thread.hasServerSideSupport = FeatureSupport.Stable;
            room = new Room("roomId", client, "userId");
@@ -952,7 +952,7 @@ describe("TimelinePanel", () => {
    });

    it("renders when the last message is an undecryptable thread root", async () => {
-        const client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.safeGet();
        client.isRoomEncrypted = () => true;
        client.supportsThreads = () => true;
        client.decryptEventIfNeeded = () => Promise.resolve();
--- a/test/components/views/avatars/MemberAvatar-test.tsx
+++ b/test/components/views/avatars/MemberAvatar-test.tsx
@@ -47,7 +47,7 @@ describe("MemberAvatar", () => {
        jest.clearAllMocks();

        stubClient();
-        mockClient = mocked(MatrixClientPeg.get());
+        mockClient = mocked(MatrixClientPeg.safeGet());

        room = new Room(ROOM_ID, mockClient, mockClient.getUserId() ?? "", {
            pendingEventOrdering: PendingEventOrdering.Detached,
--- a/test/components/views/beacon/RoomCallBanner-test.tsx
+++ b/test/components/views/beacon/RoomCallBanner-test.tsx
@@ -41,7 +41,7 @@ describe("<RoomCallBanner />", () => {
    beforeEach(() => {
        stubClient();

-        client = mocked(MatrixClientPeg.get());
+        client = mocked(MatrixClientPeg.safeGet());

        room = new Room("!1:example.org", client, "@alice:example.org", {
            pendingEventOrdering: PendingEventOrdering.Detached,
--- a/test/components/views/context_menus/MessageContextMenu-test.tsx
+++ b/test/components/views/context_menus/MessageContextMenu-test.tsx
@@ -159,7 +159,7 @@ describe("MessageContextMenu", () => {
                room_id: roomId,
            });
            pinnableEvent.event.event_id = "!3";
-            const client = MatrixClientPeg.get();
+            const client = MatrixClientPeg.safeGet();
            const room = makeDefaultRoom();

            // mock permission to allow adding pinned messages to room
@@ -204,7 +204,7 @@ describe("MessageContextMenu", () => {
                room_id: roomId,
            });
            pinnableEvent.event.event_id = "!3";
-            const client = MatrixClientPeg.get();
+            const client = MatrixClientPeg.safeGet();
            const room = makeDefaultRoom();

            // make the event already pinned in the room
@@ -543,7 +543,7 @@ function createMenuWithContent(
 }

 function makeDefaultRoom(): Room {
-    return new Room(roomId, MatrixClientPeg.get(), "@user:example.com", {
+    return new Room(roomId, MatrixClientPeg.safeGet(), "@user:example.com", {
        pendingEventOrdering: PendingEventOrdering.Detached,
    });
 }
@@ -555,7 +555,7 @@ function createMenu(
    beacons: Map<BeaconIdentifier, Beacon> = new Map(),
    room: Room = makeDefaultRoom(),
 ): RenderResult {
-    const client = MatrixClientPeg.get();
+    const client = MatrixClientPeg.safeGet();

    // @ts-ignore illegally set private prop
    room.currentState.beacons = beacons;
--- a/test/components/views/context_menus/RoomContextMenu-test.tsx
+++ b/test/components/views/context_menus/RoomContextMenu-test.tsx
@@ -46,7 +46,7 @@ describe("RoomContextMenu", () => {
        jest.clearAllMocks();

        stubClient();
-        mockClient = mocked(MatrixClientPeg.get());
+        mockClient = mocked(MatrixClientPeg.safeGet());

        room = new Room(ROOM_ID, mockClient, mockClient.getUserId() ?? "", {
            pendingEventOrdering: PendingEventOrdering.Detached,
--- a/test/components/views/context_menus/RoomGeneralContextMenu-test.tsx
+++ b/test/components/views/context_menus/RoomGeneralContextMenu-test.tsx
@@ -71,7 +71,7 @@ describe("RoomGeneralContextMenu", () => {
        jest.clearAllMocks();

        stubClient();
-        mockClient = mocked(MatrixClientPeg.get());
+        mockClient = mocked(MatrixClientPeg.safeGet());

        room = new Room(ROOM_ID, mockClient, mockClient.getUserId() ?? "", {
            pendingEventOrdering: PendingEventOrdering.Detached,
--- a/test/components/views/context_menus/ThreadListContextMenu-test.tsx
+++ b/test/components/views/context_menus/ThreadListContextMenu-test.tsx
@@ -45,7 +45,7 @@ describe("ThreadListContextMenu", () => {
        jest.clearAllMocks();

        stubClient();
-        mockClient = mocked(MatrixClientPeg.get());
+        mockClient = mocked(MatrixClientPeg.safeGet());

        room = new Room(ROOM_ID, mockClient, mockClient.getUserId() ?? "", {
            pendingEventOrdering: PendingEventOrdering.Detached,
--- a/test/components/views/dialogs/DevtoolsDialog-test.tsx
+++ b/test/components/views/dialogs/DevtoolsDialog-test.tsx
@@ -39,7 +39,7 @@ describe("DevtoolsDialog", () => {

    beforeEach(() => {
        stubClient();
-        cli = MatrixClientPeg.get();
+        cli = MatrixClientPeg.safeGet();
        room = new Room("!id", cli, "@alice:matrix.org");

        jest.spyOn(cli, "getRoom").mockReturnValue(room);
--- a/test/components/views/dialogs/SpotlightDialog-test.tsx
+++ b/test/components/views/dialogs/SpotlightDialog-test.tsx
@@ -70,7 +70,7 @@ function mockClient({
    users = [],
 }: MockClientOptions = {}): MatrixClient {
    stubClient();
-    const cli = MatrixClientPeg.get();
+    const cli = MatrixClientPeg.safeGet();
    MatrixClientPeg.getHomeserverName = jest.fn(() => homeserver);
    cli.getUserId = jest.fn(() => userId);
    cli.getHomeserverUrl = jest.fn(() => homeserver);
--- a/test/components/views/dialogs/devtools/RoomNotifications-test.tsx
+++ b/test/components/views/dialogs/devtools/RoomNotifications-test.tsx
@@ -31,7 +31,7 @@ describe("<RoomNotifications />", () => {
    });

    it("should render", () => {
-        const cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.safeGet();
        const { asFragment } = render(
            <MatrixClientContext.Provider value={cli}>
                <DevtoolsContext.Provider
--- a/test/components/views/elements/AppTile-test.tsx
+++ b/test/components/views/elements/AppTile-test.tsx
@@ -82,7 +82,7 @@ describe("AppTile", () => {

    beforeAll(async () => {
        stubClient();
-        cli = MatrixClientPeg.get();
+        cli = MatrixClientPeg.safeGet();
        cli.hasLazyLoadMembersEnabled = () => false;

        // Init misc. startup deps
--- a/test/components/views/elements/PollCreateDialog-test.tsx
+++ b/test/components/views/elements/PollCreateDialog-test.tsx
@@ -274,7 +274,7 @@ describe("PollCreateDialog", () => {
 });

 function createRoom(): Room {
-    return new Room("roomid", MatrixClientPeg.get(), "@name:example.com", {});
+    return new Room("roomid", MatrixClientPeg.safeGet(), "@name:example.com", {});
 }

 function changeValue(wrapper: RenderResult, labelText: string, value: string) {
--- a/test/components/views/messages/CallEvent-test.tsx
+++ b/test/components/views/messages/CallEvent-test.tsx
@@ -58,7 +58,7 @@ describe("CallEvent", () => {
        jest.setSystemTime(0);

        stubClient();
-        client = mocked(MatrixClientPeg.get());
+        client = mocked(MatrixClientPeg.safeGet());
        client.getUserId.mockReturnValue("@alice:example.org");

        room = new Room("!1:example.org", client, "@alice:example.org", {
--- a/test/components/views/messages/RoomPredecessorTile-test.tsx
+++ b/test/components/views/messages/RoomPredecessorTile-test.tsx
@@ -38,7 +38,7 @@ describe("<RoomPredecessorTile />", () => {
    const userId = "@alice:server.org";
    const roomId = "!room:server.org";
    stubClient();
-    const client = mocked(MatrixClientPeg.get());
+    const client = mocked(MatrixClientPeg.safeGet());

    function makeRoom({
        createEventHasPredecessor = false,
@@ -165,7 +165,7 @@ describe("<RoomPredecessorTile />", () => {
        filterConsole("Failed to find predecessor room with id old_room_id");

        beforeEach(() => {
-            mocked(MatrixClientPeg.get().getRoom).mockReturnValue(null);
+            mocked(MatrixClientPeg.safeGet().getRoom).mockReturnValue(null);
        });

        it("Shows an error if there are no via servers", () => {
@@ -219,7 +219,7 @@ describe("<RoomPredecessorTile />", () => {
            filterConsole("Failed to find predecessor room with id old_room_id");

            beforeEach(() => {
-                mocked(MatrixClientPeg.get().getRoom).mockReturnValue(null);
+                mocked(MatrixClientPeg.safeGet().getRoom).mockReturnValue(null);
            });

            it("Shows an error if there are no via servers", () => {
--- a/test/components/views/right_panel/PinnedMessagesCard-test.tsx
+++ b/test/components/views/right_panel/PinnedMessagesCard-test.tsx
@@ -34,7 +34,7 @@ import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalink

 describe("<PinnedMessagesCard />", () => {
    stubClient();
-    const cli = mocked(MatrixClientPeg.get());
+    const cli = mocked(MatrixClientPeg.safeGet());
    cli.getUserId.mockReturnValue("@alice:example.org");
    cli.setRoomAccountData.mockResolvedValue({});
    cli.relations.mockResolvedValue({ originalEvent: {} as unknown as MatrixEvent, events: [] });
--- a/test/components/views/right_panel/RoomHeaderButtons-test.tsx
+++ b/test/components/views/right_panel/RoomHeaderButtons-test.tsx
@@ -35,7 +35,7 @@ describe("RoomHeaderButtons-test.tsx", function () {
        jest.clearAllMocks();

        stubClient();
-        client = MatrixClientPeg.get();
+        client = MatrixClientPeg.safeGet();
        client.supportsThreads = () => true;
        room = new Room(ROOM_ID, client, client.getUserId() ?? "", {
            pendingEventOrdering: PendingEventOrdering.Detached,
--- a/test/components/views/rooms/BasicMessageComposer-test.tsx
+++ b/test/components/views/rooms/BasicMessageComposer-test.tsx
@@ -32,7 +32,7 @@ describe("BasicMessageComposer", () => {

    TestUtils.stubClient();

-    const client: MatrixClient = MatrixClientPeg.get();
+    const client: MatrixClient = MatrixClientPeg.safeGet();

    const roomId = "!1234567890:domain";
    const userId = client.getSafeUserId();
--- a/test/components/views/rooms/EventTile-test.tsx
+++ b/test/components/views/rooms/EventTile-test.tsx
@@ -73,7 +73,7 @@ describe("EventTile", () => {
        jest.clearAllMocks();

        stubClient();
-        client = MatrixClientPeg.get();
+        client = MatrixClientPeg.safeGet();

        room = new Room(ROOM_ID, client, client.getSafeUserId(), {
            pendingEventOrdering: PendingEventOrdering.Detached,
--- a/test/components/views/rooms/MemberList-test.tsx
+++ b/test/components/views/rooms/MemberList-test.tsx
@@ -143,7 +143,7 @@ describe("MemberList", () => {
    describe.each([false, true])("does order members correctly (presence %s)", (enablePresence) => {
        beforeEach(function () {
            TestUtils.stubClient();
-            client = MatrixClientPeg.get();
+            client = MatrixClientPeg.safeGet();
            client.hasLazyLoadMembersEnabled = () => false;

            // Make room
--- a/test/components/views/rooms/MessageComposer-test.tsx
+++ b/test/components/views/rooms/MessageComposer-test.tsx
@@ -71,7 +71,7 @@ const startVoiceMessage = async (): Promise<void> => {
 const setCurrentBroadcastRecording = (room: Room, state: VoiceBroadcastInfoState): void => {
    const recording = new VoiceBroadcastRecording(
        mkVoiceBroadcastInfoStateEvent(room.roomId, state, "@user:example.com", "ABC123"),
-        MatrixClientPeg.get(),
+        MatrixClientPeg.safeGet(),
        state,
    );
    SdkContextClass.instance.voiceBroadcastRecordingsStore.setCurrent(recording);
@@ -483,7 +483,7 @@ function wrapAndRender(
    narrow = false,
    tombstone?: MatrixEvent,
 ) {
-    const mockClient = MatrixClientPeg.get();
+    const mockClient = MatrixClientPeg.safeGet();
    const roomId = "myroomid";
    const room: any = props.room || {
        currentState: undefined,
--- a/test/components/views/rooms/RoomHeader-test.tsx
+++ b/test/components/views/rooms/RoomHeader-test.tsx
@@ -69,7 +69,7 @@ describe("RoomHeader", () => {
        mockPlatformPeg({ supportsJitsiScreensharing: () => true });

        stubClient();
-        client = mocked(MatrixClientPeg.get());
+        client = mocked(MatrixClientPeg.safeGet());
        client.getUserId.mockReturnValue("@alice:example.org");

        room = new Room("!1:example.org", client, "@alice:example.org", {
@@ -750,7 +750,7 @@ interface IRoomCreationInfo {

 function createRoom(info: IRoomCreationInfo) {
    stubClient();
-    const client: MatrixClient = MatrixClientPeg.get();
+    const client: MatrixClient = MatrixClientPeg.safeGet();

    const roomId = "!1234567890:domain";
    const userId = client.getUserId()!;
--- a/test/components/views/rooms/RoomList-test.tsx
+++ b/test/components/views/rooms/RoomList-test.tsx
@@ -47,7 +47,7 @@ DMRoomMap.sharedInstance = { getUserIdForRoomId, getDMRoomsForUserId };

 describe("RoomList", () => {
    stubClient();
-    const client = MatrixClientPeg.get();
+    const client = MatrixClientPeg.safeGet();
    const store = SpaceStore.instance;

    function getComponent(props: Partial<ComponentProps<typeof RoomList>> = {}): JSX.Element {
--- a/test/components/views/rooms/RoomListHeader-test.tsx
+++ b/test/components/views/rooms/RoomListHeader-test.tsx
@@ -112,7 +112,7 @@ describe("RoomListHeader", () => {
        } as unknown as DMRoomMap;
        DMRoomMap.setShared(dmRoomMap);
        stubClient();
-        client = MatrixClientPeg.get();
+        client = MatrixClientPeg.safeGet();
        mocked(shouldShowComponent).mockReturnValue(true); // show all UIComponents
    });

--- a/test/components/views/rooms/RoomPreviewBar-test.tsx
+++ b/test/components/views/rooms/RoomPreviewBar-test.tsx
@@ -33,7 +33,7 @@ jest.mock("../../../../src/IdentityAuthClient", () => {
 jest.useRealTimers();

 const createRoom = (roomId: string, userId: string): Room => {
-    const cli = MatrixClientPeg.get();
+    const cli = MatrixClientPeg.safeGet();
    const newRoom = new Room(roomId, cli, userId, {});
    DMRoomMap.makeShared(cli).start();
    return newRoom;
@@ -92,7 +92,7 @@ describe("<RoomPreviewBar />", () => {

    beforeEach(() => {
        stubClient();
-        MatrixClientPeg.get().getUserId = jest.fn().mockReturnValue(userId);
+        MatrixClientPeg.safeGet().getUserId = jest.fn().mockReturnValue(userId);
    });

    afterEach(() => {
@@ -118,7 +118,7 @@ describe("<RoomPreviewBar />", () => {
    });

    it("renders not logged in message", () => {
-        MatrixClientPeg.get().isGuest = jest.fn().mockReturnValue(true);
+        MatrixClientPeg.safeGet().isGuest = jest.fn().mockReturnValue(true);
        const component = getComponent({ loading: true });

        expect(isSpinnerRendered(component)).toBeFalsy();
@@ -126,7 +126,7 @@ describe("<RoomPreviewBar />", () => {
    });

    it("should send room oob data to start login", async () => {
-        MatrixClientPeg.get().isGuest = jest.fn().mockReturnValue(true);
+        MatrixClientPeg.safeGet().isGuest = jest.fn().mockReturnValue(true);
        const component = getComponent({
            oobData: {
                name: "Room Name",
@@ -339,7 +339,7 @@ describe("<RoomPreviewBar />", () => {

            describe("when client fails to get 3PIDs", () => {
                beforeEach(() => {
-                    MatrixClientPeg.get().getThreePids = jest.fn().mockRejectedValue({ errCode: "TEST_ERROR" });
+                    MatrixClientPeg.safeGet().getThreePids = jest.fn().mockRejectedValue({ errCode: "TEST_ERROR" });
                });

                it("renders error message", async () => {
@@ -354,7 +354,7 @@ describe("<RoomPreviewBar />", () => {

            describe("when invitedEmail is not associated with current account", () => {
                beforeEach(() => {
-                    MatrixClientPeg.get().getThreePids = jest
+                    MatrixClientPeg.safeGet().getThreePids = jest
                        .fn()
                        .mockResolvedValue({ threepids: mockThreePids.slice(1) });
                });
@@ -371,8 +371,8 @@ describe("<RoomPreviewBar />", () => {

            describe("when client has no identity server connected", () => {
                beforeEach(() => {
-                    MatrixClientPeg.get().getThreePids = jest.fn().mockResolvedValue({ threepids: mockThreePids });
-                    MatrixClientPeg.get().getIdentityServerUrl = jest.fn().mockReturnValue(false);
+                    MatrixClientPeg.safeGet().getThreePids = jest.fn().mockResolvedValue({ threepids: mockThreePids });
+                    MatrixClientPeg.safeGet().getIdentityServerUrl = jest.fn().mockReturnValue(false);
                });

                it("renders invite message with invited email", async () => {
@@ -387,18 +387,18 @@ describe("<RoomPreviewBar />", () => {

            describe("when client has an identity server connected", () => {
                beforeEach(() => {
-                    MatrixClientPeg.get().getThreePids = jest.fn().mockResolvedValue({ threepids: mockThreePids });
-                    MatrixClientPeg.get().getIdentityServerUrl = jest.fn().mockReturnValue("identity.test");
-                    MatrixClientPeg.get().lookupThreePid = jest.fn().mockResolvedValue("identity.test");
+                    MatrixClientPeg.safeGet().getThreePids = jest.fn().mockResolvedValue({ threepids: mockThreePids });
+                    MatrixClientPeg.safeGet().getIdentityServerUrl = jest.fn().mockReturnValue("identity.test");
+                    MatrixClientPeg.safeGet().lookupThreePid = jest.fn().mockResolvedValue("identity.test");
                });

                it("renders email mismatch message when invite email mxid doesnt match", async () => {
-                    MatrixClientPeg.get().lookupThreePid = jest.fn().mockReturnValue("not userid");
+                    MatrixClientPeg.safeGet().lookupThreePid = jest.fn().mockReturnValue("not userid");
                    const component = getComponent({ inviterName, invitedEmail });
                    await new Promise(setImmediate);

                    expect(getMessage(component)).toMatchSnapshot();
-                    expect(MatrixClientPeg.get().lookupThreePid).toHaveBeenCalledWith(
+                    expect(MatrixClientPeg.safeGet().lookupThreePid).toHaveBeenCalledWith(
                        "email",
                        invitedEmail,
                        "mock-token",
@@ -407,7 +407,7 @@ describe("<RoomPreviewBar />", () => {
                });

                it("renders invite message when invite email mxid match", async () => {
-                    MatrixClientPeg.get().lookupThreePid = jest.fn().mockReturnValue(userId);
+                    MatrixClientPeg.safeGet().lookupThreePid = jest.fn().mockReturnValue(userId);
                    const component = getComponent({ inviterName, invitedEmail });
                    await new Promise(setImmediate);

--- a/test/components/views/rooms/RoomPreviewCard-test.tsx
+++ b/test/components/views/rooms/RoomPreviewCard-test.tsx
@@ -40,7 +40,7 @@ describe("RoomPreviewCard", () => {

    beforeEach(() => {
        stubClient();
-        client = mocked(MatrixClientPeg.get());
+        client = mocked(MatrixClientPeg.safeGet());
        client.getUserId.mockReturnValue("@alice:example.org");
        DMRoomMap.makeShared(client);

--- a/test/components/views/rooms/SearchResultTile-test.tsx
+++ b/test/components/views/rooms/SearchResultTile-test.tsx
@@ -31,7 +31,7 @@ type Props = React.ComponentPropsWithoutRef<typeof SearchResultTile>;
 describe("SearchResultTile", () => {
    beforeAll(() => {
        stubClient();
-        const cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.safeGet();

        const room = new Room(ROOM_ID, cli, "@bob:example.org");
        jest.spyOn(cli, "getRoom").mockReturnValue(room);
--- a/test/components/views/rooms/VoiceRecordComposerTile-test.tsx
+++ b/test/components/views/rooms/VoiceRecordComposerTile-test.tsx
@@ -56,6 +56,7 @@ describe("<VoiceRecordComposerTile/>", () => {
            sendMessage: jest.fn(),
        } as unknown as MatrixClient;
        MatrixClientPeg.get = () => mockClient;
+        MatrixClientPeg.safeGet = () => mockClient;

        const room = {
            roomId,
--- a/test/components/views/settings/CryptographyPanel-test.tsx
+++ b/test/components/views/settings/CryptographyPanel-test.tsx
@@ -29,7 +29,7 @@ describe("CryptographyPanel", () => {
        const sessionKeyFormatted = "<b>AbCD eFgh IJK7 L/m4 nOPq RSTU VW4x yzaB CDef 6gHI Jkl</b>";

        TestUtils.stubClient();
-        const client: MatrixClient = MatrixClientPeg.get();
+        const client: MatrixClient = MatrixClientPeg.safeGet();
        client.deviceId = sessionId;
        client.getDeviceEd25519Key = () => sessionKey;

--- a/test/components/views/settings/tabs/room/AdvancedRoomSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/room/AdvancedRoomSettingsTab-test.tsx
@@ -41,7 +41,7 @@ describe("AdvancedRoomSettingsTab", () => {

    beforeEach(() => {
        stubClient();
-        cli = MatrixClientPeg.get();
+        cli = MatrixClientPeg.safeGet();
        room = mkStubRoom(roomId, "test room", cli);
        mocked(cli.getRoom).mockReturnValue(room);
        mocked(dis.dispatch).mockReset();
--- a/test/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
@@ -38,7 +38,7 @@ describe("NotificatinSettingsTab", () => {

    beforeEach(() => {
        stubClient();
-        cli = MatrixClientPeg.get();
+        cli = MatrixClientPeg.safeGet();
        const room = mkStubRoom(roomId, "test room", cli);
        roomProps = EchoChamber.forRoom(room);

--- a/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx
@@ -50,7 +50,7 @@ describe("RolesRoomSettingsTab", () => {

    beforeEach(() => {
        stubClient();
-        cli = MatrixClientPeg.get();
+        cli = MatrixClientPeg.safeGet();
        room = mkStubRoom(roomId, "test room", cli);
    });

--- a/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/room/VoipRoomSettingsTab-test.tsx
@@ -38,7 +38,7 @@ describe("VoipRoomSettingsTab", () => {

    beforeEach(() => {
        stubClient();
-        cli = MatrixClientPeg.get();
+        cli = MatrixClientPeg.safeGet();
        room = mkStubRoom(roomId, "test room", cli);

        jest.spyOn(cli, "sendStateEvent");
--- a/test/components/views/settings/tabs/user/PreferencesUserSettingsTab-test.tsx
+++ b/test/components/views/settings/tabs/user/PreferencesUserSettingsTab-test.tsx
@@ -53,7 +53,7 @@ describe("PreferencesUserSettingsTab", () => {
        const getToggle = () => renderTab().getByRole("switch", { name: "Send read receipts" });

        const mockIsVersionSupported = (val: boolean) => {
-            const client = MatrixClientPeg.get();
+            const client = MatrixClientPeg.safeGet();
            jest.spyOn(client, "doesServerSupportUnstableFeature").mockResolvedValue(false);
            jest.spyOn(client, "isVersionSupported").mockImplementation(async (version: string) => {
                if (version === "v1.4") return val;
--- a/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx
+++ b/test/components/views/spaces/SpaceSettingsVisibilityTab-test.tsx
@@ -107,6 +107,7 @@ describe("<SpaceSettingsVisibilityTab />", () => {

        (mockMatrixClient.sendStateEvent as jest.Mock).mockClear().mockResolvedValue({});
        MatrixClientPeg.get = jest.fn().mockReturnValue(mockMatrixClient);
+        MatrixClientPeg.safeGet = jest.fn().mockReturnValue(mockMatrixClient);
    });

    afterEach(() => {
--- a/test/components/views/spaces/SpaceTreeLevel-test.tsx
+++ b/test/components/views/spaces/SpaceTreeLevel-test.tsx
@@ -39,8 +39,8 @@ jest.mock("../../../../src/stores/spaces/SpaceStore", () => {

 describe("SpaceButton", () => {
    stubClient();
-    const space = mkRoom(MatrixClientPeg.get(), "!1:example.org");
-    DMRoomMap.makeShared(MatrixClientPeg.get());
+    const space = mkRoom(MatrixClientPeg.safeGet(), "!1:example.org");
+    DMRoomMap.makeShared(MatrixClientPeg.safeGet());

    const dispatchSpy = jest.spyOn(defaultDispatcher, "dispatch");

--- a/test/components/views/voip/CallView-test.tsx
+++ b/test/components/views/voip/CallView-test.tsx
@@ -54,7 +54,7 @@ describe("CallLobby", () => {
        mocked(navigator.mediaDevices.enumerateDevices).mockResolvedValue([]);

        stubClient();
-        client = mocked(MatrixClientPeg.get());
+        client = mocked(MatrixClientPeg.safeGet());

        room = new Room("!1:example.org", client, "@alice:example.org", {
            pendingEventOrdering: PendingEventOrdering.Detached,