diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js index b2a63efd4c..d2760bc82c 100644 --- a/src/MatrixClientPeg.js +++ b/src/MatrixClientPeg.js @@ -208,9 +208,6 @@ class MatrixClientPeg { } _createClient(creds: MatrixClientCreds) { - const aggregateRelations = SettingsStore.isFeatureEnabled("feature_reactions"); - const enableEdits = SettingsStore.isFeatureEnabled("feature_message_editing"); - const opts = { baseUrl: creds.homeserverUrl, idBaseUrl: creds.identityServerUrl, @@ -220,7 +217,7 @@ class MatrixClientPeg { timelineSupport: true, forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false), verificationMethods: [verificationMethods.SAS], - unstableClientRelationAggregation: aggregateRelations || enableEdits, + unstableClientRelationAggregation: true, }; this.matrixClient = createMatrixClient(opts); diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 37a8a2d4c9..1fb0d6c725 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -110,7 +110,6 @@ module.exports = React.createClass({ }, componentWillMount: function() { - this._editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing"); // the event after which we put a visible unread marker on the last // render cycle; null if readMarkerVisible was false or the RM was // suppressed (eg because it was at the end of the timeline) @@ -586,7 +585,7 @@ module.exports = React.createClass({ ; } - if (this.isEditingEnabled() && canEditContent(this.props.mxEvent)) { + if (canEditContent(this.props.mxEvent)) { editButton =