diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss index dc22de4713..5e5b66f58a 100644 --- a/res/css/views/right_panel/_UserInfo.scss +++ b/res/css/views/right_panel/_UserInfo.scss @@ -260,11 +260,11 @@ limitations under the License. } } - .mx_UserInfo_verify { + .mx_UserInfo_wideButton { display: block; margin: 16px 0; } - button.mx_UserInfo_verify { + button.mx_UserInfo_wideButton { width: 100%; // FIXME get rid of this once we get rid of DialogButtons here } } diff --git a/src/components/views/right_panel/EncryptionInfo.js b/src/components/views/right_panel/EncryptionInfo.js index f8ac797b63..299e553769 100644 --- a/src/components/views/right_panel/EncryptionInfo.js +++ b/src/components/views/right_panel/EncryptionInfo.js @@ -38,7 +38,7 @@ const EncryptionInfo = ({pending, member, onStartVerification}) => { } else { const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); content = ( - + {_t("Start Verification")} ); diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js index ee9884efe8..f189380eac 100644 --- a/src/components/views/right_panel/UserInfo.js +++ b/src/components/views/right_panel/UserInfo.js @@ -1255,11 +1255,12 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => { userTrust.isCrossSigningVerified() : userTrust.isVerified(); const isMe = member.userId === cli.getUserId(); + let verifyButton; if (isRoomEncrypted && !userVerified && !isMe) { verifyButton = ( - verifyUser(member)}> - {_t("Verify")} + verifyUser(member)}> + {_t("Learn more")} ); } diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js index e78f20c743..6f580991f9 100644 --- a/src/components/views/right_panel/VerificationPanel.js +++ b/src/components/views/right_panel/VerificationPanel.js @@ -63,7 +63,7 @@ export default class VerificationPanel extends React.PureComponent { button = ; } else { button = ( - + {_t("Verify by emoji")} ); @@ -128,7 +128,7 @@ export default class VerificationPanel extends React.PureComponent {

Verify all users in a room to ensure it's secure.

- + {_t("Got it")} @@ -156,7 +156,7 @@ export default class VerificationPanel extends React.PureComponent {

Verification cancelled

{ text }

- + {_t("Got it")} diff --git a/src/components/views/verification/VerificationShowSas.js b/src/components/views/verification/VerificationShowSas.js index 2a4888ffab..40d3b96beb 100644 --- a/src/components/views/verification/VerificationShowSas.js +++ b/src/components/views/verification/VerificationShowSas.js @@ -80,7 +80,7 @@ export default class VerificationShowSas extends React.Component { } else { return
{_t("Unable to find a supported verification method.")} - + {_t('Cancel')}
; @@ -96,10 +96,10 @@ export default class VerificationShowSas extends React.Component { confirm = ; } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 20c1234190..e921e62209 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1172,6 +1172,7 @@ "%(role)s in %(roomName)s": "%(role)s in %(roomName)s", "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.", + "Learn more": "Learn more", "Security": "Security", "Verify by emoji": "Verify by emoji", "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",