Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix: "manually verify by text" does nothing #11059

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Fix: "manually verify by text" does nothing #11059

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
991918a
use matrixclientpeg in manual verification dialog
Jun 8, 2023
feba4e8
Merge branch 'develop' into kerry/25375/manual-verification
Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { Device } from "matrix-js-sdk/src/models/device";
import * as FormattingUtils from "../../../utils/FormattingUtils";
import { _t } from "../../../languageHandler";
import QuestionDialog from "./QuestionDialog";
import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
import { MatrixClientPeg } from "../../../MatrixClientPeg";

interface IManualDeviceKeyVerificationDialogProps {
userId: string;
Expand All @@ -37,11 +37,11 @@ export function ManualDeviceKeyVerificationDialog({
device,
onFinished,
}: IManualDeviceKeyVerificationDialogProps): JSX.Element {
const mxClient = useMatrixClientContext();
const mxClient = MatrixClientPeg.get();

const onLegacyFinished = useCallback(
(confirm: boolean) => {
if (confirm && mxClient) {
if (confirm) {
mxClient.setDeviceVerified(userId, device.deviceId, true);
}
onFinished(confirm);
Expand Down