mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-11-24 03:51:09 +01:00
Code Issues Projects Releases Wiki Activity

Fix #30118 - TypeError in manual verify - by using MatrixClientPeg (#30131)

Browse Source 
We can't use MatrixClientContext inside a dialog at the moment.
This commit is contained in:
Andy Balaam 2025-06-12 11:53:52 +01:00 committed by GitHub
parent a622772a08
commit 55e874fb50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
View File

@ -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) => {

7
test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
View File

@ -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(() => {