From a928b33f274adf93cfb8b97a826776f4f0b5934e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Dec 2019 16:51:50 +0000
Subject: [PATCH 1/2] Don't show the 'verify' button if the user is verified

Which is more in keeping with the designs (and we can do this now
that the new user info panel is only enabled with cross signing).
---
 src/components/views/right_panel/UserInfo.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 0ad2cc4dfb..4dd71700ad 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -1286,11 +1286,20 @@ const UserInfo = ({user, groupId, roomId, onClose}) => {
 
     const devicesSection = isRoomEncrypted ?
         (<DevicesSection loading={devices === undefined} devices={devices} userId={user.userId} />) : null;
+
+    const userVerified = cli.checkUserTrust(user.userId).isVerified();
+    let verifyButton;
+    if (!userVerified) {
+        verifyButton = <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyDevice(user.userId, null)}>
+            {_t("Verify")}
+        </AccessibleButton>;
+    }
+
     const securitySection = (
         <div className="mx_UserInfo_container">
             <h3>{ _t("Security") }</h3>
             <p>{ text }</p>
-            <AccessibleButton className="mx_UserInfo_verify" onClick={() => verifyDevice(user.userId, null)}>{_t("Verify")}</AccessibleButton>
+            {verifyButton}
             { devicesSection }
         </div>
     );

From 376bf7e2138c2eb62199211ea37a4915a6505d5c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Dec 2019 16:56:38 +0000
Subject: [PATCH 2/2] i18n

---
 src/i18n/strings/en_EN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 313bc93edd..ec1797cafd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1124,8 +1124,8 @@
     "This client does not support end-to-end encryption.": "This client does not support end-to-end encryption.",
     "Messages in this room are not end-to-end encrypted.": "Messages in this room are not end-to-end encrypted.",
     "Messages in this room are end-to-end encrypted.": "Messages in this room are end-to-end encrypted.",
-    "Security": "Security",
     "Verify": "Verify",
+    "Security": "Security",
     "Sunday": "Sunday",
     "Monday": "Monday",
     "Tuesday": "Tuesday",