Review fixes
This commit is contained in:
parent
a225628d27
commit
6269dbd171
2 changed files with 19 additions and 6 deletions
|
@ -17,9 +17,20 @@ import BaseDialog from "./BaseDialog";
|
||||||
import { IDevice } from "../right_panel/UserInfo";
|
import { IDevice } from "../right_panel/UserInfo";
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
|
/**
|
||||||
|
* The user whose device is untrusted.
|
||||||
|
*/
|
||||||
user: User;
|
user: User;
|
||||||
|
/**
|
||||||
|
* The device that is untrusted.
|
||||||
|
*/
|
||||||
device: IDevice;
|
device: IDevice;
|
||||||
onFinished(mode?: "legacy" | "sas" | false): void;
|
/**
|
||||||
|
* Callback for when the dialog is dismissed.
|
||||||
|
* If mode is "sas", the user wants to verify the device with SAS. Otherwise, the dialog was dismissed.
|
||||||
|
* @param mode The mode of dismissal.
|
||||||
|
*/
|
||||||
|
onFinished(mode?: "sas"): void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const UntrustedDeviceDialog: React.FC<IProps> = ({ device, user, onFinished }) => {
|
const UntrustedDeviceDialog: React.FC<IProps> = ({ device, user, onFinished }) => {
|
||||||
|
@ -59,7 +70,7 @@ const UntrustedDeviceDialog: React.FC<IProps> = ({ device, user, onFinished }) =
|
||||||
<AccessibleButton kind="primary_outline" onClick={() => onFinished("sas")}>
|
<AccessibleButton kind="primary_outline" onClick={() => onFinished("sas")}>
|
||||||
{_t("encryption|udd|interactive_verification_button")}
|
{_t("encryption|udd|interactive_verification_button")}
|
||||||
</AccessibleButton>
|
</AccessibleButton>
|
||||||
<AccessibleButton kind="primary" onClick={() => onFinished(false)}>
|
<AccessibleButton kind="primary" onClick={() => onFinished()}>
|
||||||
{_t("action|done")}
|
{_t("action|done")}
|
||||||
</AccessibleButton>
|
</AccessibleButton>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -47,10 +47,12 @@ export async function verifyDevice(matrixClient: MatrixClient, user: User, devic
|
||||||
user,
|
user,
|
||||||
device,
|
device,
|
||||||
onFinished: async (action): Promise<void> => {
|
onFinished: async (action): Promise<void> => {
|
||||||
|
if (action === "sas") {
|
||||||
const verificationRequestPromise = matrixClient
|
const verificationRequestPromise = matrixClient
|
||||||
.getCrypto()
|
.getCrypto()
|
||||||
?.requestDeviceVerification(user.userId, device.deviceId);
|
?.requestDeviceVerification(user.userId, device.deviceId);
|
||||||
setRightPanel({ member: user, verificationRequestPromise });
|
setRightPanel({ member: user, verificationRequestPromise });
|
||||||
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue