From e200193b0aef6f92def9967a68bed6cebb76de5b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 4 Oct 2019 10:15:00 +0100
Subject: [PATCH] DRY and fix useCiderComposer being in both labs and
 preferences

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js | 2 +-
 src/settings/Settings.js              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 8cade404a9..4de573479d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -204,7 +204,7 @@ module.exports = createReactClass({
 
         WidgetEchoStore.on('update', this._onWidgetEchoStoreUpdate);
 
-        this.setState({useCider: SettingsStore.getValue("useCiderComposer")});
+        this._onCiderUpdated();
         this._ciderWatcherRef = SettingsStore.watchSetting(
             "useCiderComposer", null, this._onCiderUpdated);
     },
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index fda94091a4..3c33ae57fe 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -121,7 +121,6 @@ export const SETTINGS = {
         default: false,
     },
     "useCiderComposer": {
-        isFeature: true,
         displayName: _td("Use the new, faster, composer for writing messages"),
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: true,