From 76c31f01f1f0c57b10ada98f3b98c52d0be67b49 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 29 Jan 2019 14:37:21 -0700 Subject: [PATCH] Appease the linter --- .../settings/tabs/SecurityRoomSettingsTab.js | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/components/views/settings/tabs/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/SecurityRoomSettingsTab.js index a13aafe092..d7645cd0ac 100644 --- a/src/components/views/settings/tabs/SecurityRoomSettingsTab.js +++ b/src/components/views/settings/tabs/SecurityRoomSettingsTab.js @@ -17,12 +17,8 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import {_t} from "../../../../languageHandler"; -import RoomProfileSettings from "../../room_settings/RoomProfileSettings"; import MatrixClientPeg from "../../../../MatrixClientPeg"; import sdk from "../../../../index"; -import AccessibleButton from "../../elements/AccessibleButton"; -import {MatrixClient} from "matrix-js-sdk"; -import dis from "../../../../dispatcher"; import LabelledToggleSwitch from "../../elements/LabelledToggleSwitch"; import {SettingLevel} from "../../../../settings/SettingsStore"; import Modal from "../../../../Modal"; @@ -182,7 +178,7 @@ export default class SecurityRoomSettingsTab extends React.Component { {_t("Anyone who knows the room's link, including guests")} - ) + ); } _renderHistory() { @@ -227,7 +223,7 @@ export default class SecurityRoomSettingsTab extends React.Component { {_t('Members only (since they joined)')} - ) + ); } render() { @@ -239,19 +235,10 @@ export default class SecurityRoomSettingsTab extends React.Component { const hasEncryptionPermission = room.currentState.mayClientSendStateEvent("m.room.encryption", client); const canEnableEncryption = !isEncrypted && hasEncryptionPermission; - let encryptionSection = ( -
-
- {_t("Once enabled, encryption cannot be disabled.")} -
- -
- ); let encryptionSettings = null; if (isEncrypted) { encryptionSettings = + roomId={this.props.roomId} />; } return ( @@ -260,7 +247,13 @@ export default class SecurityRoomSettingsTab extends React.Component { {_t("Encryption")}
- {encryptionSection} +
+
+ {_t("Once enabled, encryption cannot be disabled.")} +
+ +
{encryptionSettings}