From 0356f04b9c8378b9657f83e484cf6d85f954b9d4 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 17 Aug 2016 14:40:10 +0100 Subject: [PATCH] MemberInfo: initialise _enableDevices in componentWillMount ... to avoid referencing it in render() before it is set --- src/components/views/rooms/MemberInfo.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js index b3c61ce807..59e186da06 100644 --- a/src/components/views/rooms/MemberInfo.js +++ b/src/components/views/rooms/MemberInfo.js @@ -67,17 +67,17 @@ module.exports = React.createClass({ componentWillMount: function() { this._cancelDeviceList = null; + // only display the devices list if our client supports E2E *and* the + // feature is enabled in the user settings + this._enableDevices = MatrixClientPeg.get().isCryptoEnabled() && + UserSettingsStore.isFeatureEnabled("e2e_encryption"); + this.setState({ existingOneToOneRoomId: this.getExistingOneToOneRoomId() }); }, componentDidMount: function() { - // only display the devices list if our client supports E2E *and* the - // feature is enabled in the user settings - this._enableDevices = MatrixClientPeg.get().isCryptoEnabled() && - UserSettingsStore.isFeatureEnabled("e2e_encryption"); - this._updateStateForNewMember(this.props.member); MatrixClientPeg.get().on("deviceVerificationChanged", this.onDeviceVerificationChanged); },