OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix lint

pull/21833/head
Richard van der Hoff 2017-01-26 14:12:00 +00:00
parent 67bd2cf9dd
commit 0a3d9fc17f
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/views/dialogs/UnknownDeviceDialog.js
View File

@ -45,7 +45,8 @@ function UserUnknownDeviceList(props) {
const {userId, userDevices} = props; const {userId, userDevices} = props;
const deviceListEntries = Object.keys(userDevices).map((deviceId) => const deviceListEntries = Object.keys(userDevices).map((deviceId) =>
<DeviceListEntry key={ deviceId } userId={ userId } device={ userDevices[deviceId] } />, <DeviceListEntry key={ deviceId } userId={ userId }
device={ userDevices[deviceId] } />,
); );
return ( return (
@ -105,14 +106,19 @@ export default React.createClass({
render: function() { render: function() {
const client = MatrixClientPeg.get(); const client = MatrixClientPeg.get();
const blacklistUnverified = client.getGlobalBlacklistUnverifiedDevices() || this.props.room.getBlacklistUnverifiedDevices(); const blacklistUnverified = client.getGlobalBlacklistUnverifiedDevices() ||
this.props.room.getBlacklistUnverifiedDevices();
let warning; let warning;
if (blacklistUnverified) { if (blacklistUnverified) {
warning = <h4>You are currently blacklisting unverified devices; to send messages to these devices you must verify them.</h4> warning = (
} <h4>
else { You are currently blacklisting unverified devices; to send
warning = <h4>We strongly recommend you verify them before continuing.</h4> messages to these devices you must verify them.
</h4>
);
} else {
warning = <h4>We strongly recommend you verify them before continuing.</h4>;
} }
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
@ -122,7 +128,10 @@ export default React.createClass({
title='Room contains unknown devices' title='Room contains unknown devices'
> >
<div className="mx_Dialog_content"> <div className="mx_Dialog_content">
<h4>This room contains unknown devices which have not been verified.</h4> <h4>
This room contains unknown devices which have not been
verified.
</h4>
{ warning } { warning }
Unknown devices: Unknown devices:
<UnknownDeviceList devices={this.props.devices} /> <UnknownDeviceList devices={this.props.devices} />