matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-17 17:42:41 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into dbkr/default_display_name_register

Browse Source
This commit is contained in:
David Baker
2020-01-30 11:45:54 +00:00
parent 2f4b3272da 67468d85c6
commit c8673452be
4 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/verification/VerificationShowSas.js
View File

@@ -62,7 +62,9 @@ export default class VerificationShowSas extends React.Component {
</div>,
);
sasDisplay = <div className="mx_VerificationShowSas_emojiSas">
{emojiBlocks}
{emojiBlocks.slice(0, 4)}
<div className="mx_VerificationShowSas_emojiSas_break" />
{emojiBlocks.slice(4)}
</div>;
sasCaption = _t(
"Verify this user by confirming the following emoji appear on their screen.",
@@ -105,8 +107,8 @@ export default class VerificationShowSas extends React.Component {
return <div className="mx_VerificationShowSas">
<p>{sasCaption}</p>
<p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
{sasDisplay}
<p>{_t("To be secure, do this in person or use a trusted way to communicate.")}</p>
{confirm}
</div>;
}