From cab830aad18510611a19c098b6e03d9b713d44f7 Mon Sep 17 00:00:00 2001 From: Hristo Terezov Date: Thu, 18 Jun 2020 12:25:49 -0500 Subject: [PATCH] fix(e2ee): hide if not supported. --- .../security-dialog/SecurityDialog.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/react/features/security/components/security-dialog/SecurityDialog.js b/react/features/security/components/security-dialog/SecurityDialog.js index bcadeb5cf..29ad89cd6 100644 --- a/react/features/security/components/security-dialog/SecurityDialog.js +++ b/react/features/security/components/security-dialog/SecurityDialog.js @@ -42,6 +42,11 @@ type Props = { */ _passwordNumberOfDigits: ?number, + /** + * Indicates whether e2ee will be displayed or not. + */ + _showE2ee: boolean, + /** * Action that sets the conference password. */ @@ -64,6 +69,7 @@ function SecurityDialog({ _locked, _password, _passwordNumberOfDigits, + _showE2ee, setPassword }: Props) { const [ passwordEditEnabled, setPasswordEditEnabled ] = useState(false); @@ -93,8 +99,13 @@ function SecurityDialog({ passwordNumberOfDigits = { _passwordNumberOfDigits } setPassword = { setPassword } setPasswordEditEnabled = { setPasswordEditEnabled } /> -
- + { + _showE2ee ? <> +
+ + : null + } +
); @@ -111,6 +122,7 @@ function SecurityDialog({ function mapStateToProps(state) { const { conference, + e2eeSupported, locked, password } = state['features/base/conference']; @@ -120,7 +132,8 @@ function mapStateToProps(state) { _conference: conference, _dialIn: state['features/invite'], _locked: locked, - _password: password + _password: password, + _showE2ee: Boolean(e2eeSupported) }; }