Remove reactions feature flag

Fixes element-hq/element-web#10282
matrix-org · Jul 17, 2019 · 599c496 · 599c496
1 parent 674f339
commit 599c496
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
@@ -22,7 +22,6 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import { createMenu } from '../../structures/ContextualMenu';
-import SettingsStore from '../../../settings/SettingsStore';
 import { isContentActionable, canEditContent } from '../../../utils/EventUtils';
 
 export default class MessageActionBar extends React.PureComponent {
@@ -123,15 +122,7 @@ export default class MessageActionBar extends React.PureComponent {
         this.onFocusChange(true);
     }
 
-    isReactionsEnabled() {
-        return SettingsStore.isFeatureEnabled("feature_reactions");
-    }
-
     renderReactButton() {
-        if (!this.isReactionsEnabled()) {
-            return null;
-        }
-
         const ReactMessageAction = sdk.getComponent('messages.ReactMessageAction');
         const { mxEvent, reactions } = this.props;
 

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
@@ -202,7 +202,7 @@ module.exports = withMatrixClient(React.createClass({
         const client = this.props.matrixClient;
         client.on("deviceVerificationChanged", this.onDeviceVerificationChanged);
         this.props.mxEvent.on("Event.decrypted", this._onDecrypted);
-        if (this.props.showReactions && SettingsStore.isFeatureEnabled("feature_reactions")) {
+        if (this.props.showReactions) {
             this.props.mxEvent.on("Event.relationsCreated", this._onReactionsCreated);
         }
     },
@@ -227,7 +227,7 @@ module.exports = withMatrixClient(React.createClass({
         const client = this.props.matrixClient;
         client.removeListener("deviceVerificationChanged", this.onDeviceVerificationChanged);
         this.props.mxEvent.removeListener("Event.decrypted", this._onDecrypted);
-        if (this.props.showReactions && SettingsStore.isFeatureEnabled("feature_reactions")) {
+        if (this.props.showReactions) {
             this.props.mxEvent.removeListener("Event.relationsCreated", this._onReactionsCreated);
         }
     },
@@ -490,8 +490,7 @@ module.exports = withMatrixClient(React.createClass({
     getReactions() {
         if (
             !this.props.showReactions ||
-            !this.props.getRelationsForEvent ||
-            !SettingsStore.isFeatureEnabled("feature_reactions")
+            !this.props.getRelationsForEvent
         ) {
             return null;
         }
@@ -681,7 +680,7 @@ module.exports = withMatrixClient(React.createClass({
             </div> : null;
 
         let reactionsRow;
-        if (SettingsStore.isFeatureEnabled("feature_reactions") && !isRedacted) {
+        if (!isRedacted) {
             const ReactionsRow = sdk.getComponent('messages.ReactionsRow');
             reactionsRow = <ReactionsRow
                 mxEvent={this.props.mxEvent}

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -315,7 +315,6 @@
     "Custom user status messages": "Custom user status messages",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
     "Render simple counters in room header": "Render simple counters in room header",
-    "React to messages with emoji (refresh to apply changes)": "React to messages with emoji (refresh to apply changes)",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Show a placeholder for removed messages": "Show a placeholder for removed messages",

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
@@ -114,12 +114,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_reactions": {
-        isFeature: true,
-        displayName: _td("React to messages with emoji (refresh to apply changes)"),
-        supportedLevels: LEVELS_FEATURE,
-        default: true,
-    },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Enable Emoji suggestions while typing'),