From 55e874fb5059b35cc5128f1a7c204b7784d77ce6 Mon Sep 17 00:00:00 2001
From: Andy Balaam <andy.balaam@matrix.org>
Date: Thu, 12 Jun 2025 11:53:52 +0100
Subject: [PATCH] Fix #30118 - TypeError in manual verify - by using
 MatrixClientPeg (#30131)

We can't use MatrixClientContext inside a dialog at the moment.
---
 .../views/dialogs/ManualDeviceKeyVerificationDialog.tsx    | 4 ++--
 .../dialogs/ManualDeviceKeyVerificationDialog-test.tsx     | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
index 8f699c4495..566061f73b 100644
--- a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
+++ b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
@@ -20,7 +20,7 @@ import Modal from "../../../Modal";
 import InfoDialog from "./InfoDialog";
 import Field from "../elements/Field";
 import ErrorDialog from "./ErrorDialog";
-import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 interface Props {
     onFinished(confirm?: boolean): void;
@@ -37,7 +37,7 @@ export function ManualDeviceKeyVerificationDialog({ onFinished }: Readonly<Props
     const [deviceId, setDeviceId] = useState("");
     const [fingerprint, setFingerprint] = useState("");
 
-    const client = useMatrixClientContext();
+    const client = MatrixClientPeg.safeGet();
 
     const onDialogFinished = useCallback(
         async (confirm: boolean) => {
diff --git a/test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx b/test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
index 0b710bec46..3193b41e66 100644
--- a/test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
@@ -13,17 +13,12 @@ import { DeviceVerificationStatus } from "matrix-js-sdk/src/crypto-api";
 
 import { stubClient } from "../../../../test-utils";
 import { ManualDeviceKeyVerificationDialog } from "../../../../../src/components/views/dialogs/ManualDeviceKeyVerificationDialog";
-import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
 
 describe("ManualDeviceKeyVerificationDialog", () => {
     let mockClient: MatrixClient;
 
     function renderDialog(onFinished: (confirm: boolean) => void) {
-        return render(
-            <MatrixClientContext.Provider value={mockClient}>
-                <ManualDeviceKeyVerificationDialog onFinished={onFinished} />
-            </MatrixClientContext.Provider>,
-        );
+        return render(<ManualDeviceKeyVerificationDialog onFinished={onFinished} />);
     }
 
     beforeEach(() => {