diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss index dc22de4713..27014d175a 100644 --- a/res/css/views/right_panel/_UserInfo.scss +++ b/res/css/views/right_panel/_UserInfo.scss @@ -261,10 +261,16 @@ limitations under the License. } .mx_UserInfo_verify { + padding-top: 0; + padding-left: 0; + font-weight: normal; + } + + .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 8868c30053..c3f6770d18 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..c48d9c9c37 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 18a9024310..48f4320bee 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 aee0f57cf8..26badb9826 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 3ae0991f16..c529e8bf56 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1173,6 +1173,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.",