From 6269dbd17120aff49b0f8458080452e3f93f0d49 Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Tue, 3 Dec 2024 10:20:54 +0100
Subject: [PATCH] Review fixes

---
 .../views/dialogs/UntrustedDeviceDialog.tsx       | 15 +++++++++++++--
 src/verification.ts                               | 10 ++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/UntrustedDeviceDialog.tsx b/src/components/views/dialogs/UntrustedDeviceDialog.tsx
index be3eb5c427..02b7438849 100644
--- a/src/components/views/dialogs/UntrustedDeviceDialog.tsx
+++ b/src/components/views/dialogs/UntrustedDeviceDialog.tsx
@@ -17,9 +17,20 @@ import BaseDialog from "./BaseDialog";
 import { IDevice } from "../right_panel/UserInfo";
 
 interface IProps {
+    /**
+     * The user whose device is untrusted.
+     */
     user: User;
+    /**
+     * The device that is untrusted.
+     */
     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 }) => {
@@ -59,7 +70,7 @@ const UntrustedDeviceDialog: React.FC<IProps> = ({ device, user, onFinished }) =
                 <AccessibleButton kind="primary_outline" onClick={() => onFinished("sas")}>
                     {_t("encryption|udd|interactive_verification_button")}
                 </AccessibleButton>
-                <AccessibleButton kind="primary" onClick={() => onFinished(false)}>
+                <AccessibleButton kind="primary" onClick={() => onFinished()}>
                     {_t("action|done")}
                 </AccessibleButton>
             </div>
diff --git a/src/verification.ts b/src/verification.ts
index 2e7abed950..0c022f097a 100644
--- a/src/verification.ts
+++ b/src/verification.ts
@@ -47,10 +47,12 @@ export async function verifyDevice(matrixClient: MatrixClient, user: User, devic
         user,
         device,
         onFinished: async (action): Promise<void> => {
-            const verificationRequestPromise = matrixClient
-                .getCrypto()
-                ?.requestDeviceVerification(user.userId, device.deviceId);
-            setRightPanel({ member: user, verificationRequestPromise });
+            if (action === "sas") {
+                const verificationRequestPromise = matrixClient
+                    .getCrypto()
+                    ?.requestDeviceVerification(user.userId, device.deviceId);
+                setRightPanel({ member: user, verificationRequestPromise });
+            }
         },
     });
 }