Merge pull request #2559 from matrix-org/travis/settings/disable-old

Disable old settings, making tabbed settings the default
matrix-org · Feb 1, 2019 · 37fe224 · 37fe224
2 parents 62f59f8 + 2a91496
commit 37fe224
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
@@ -572,7 +572,7 @@ export default React.createClass({
                 this._viewIndexedRoom(payload.roomIndex);
                 break;
             case 'view_user_settings': {
-                if (SettingsStore.isFeatureEnabled("feature_tabbed_settings")) {
+                if (true || SettingsStore.isFeatureEnabled("feature_tabbed_settings")) {
                     const UserSettingsDialog = sdk.getComponent("dialogs.UserSettingsDialog");
                     Modal.createTrackedDialog('User settings', '', UserSettingsDialog, {}, 'mx_SettingsDialog');
                 } else {

diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -83,11 +83,11 @@ export default class RoomSettingsDialog extends React.Component {
             "mx_RoomSettingsDialog_warningIcon",
             <AdvancedRoomSettingsTab roomId={this.props.roomId} />,
         ));
-        tabs.push(new Tab(
-            _td("Visit old settings"),
-            "mx_RoomSettingsDialog_warningIcon",
-            <TempTab onClose={this.props.onFinished} />,
-        ));
+        // tabs.push(new Tab(
+        //     _td("Visit old settings"),
+        //     "mx_RoomSettingsDialog_warningIcon",
+        //     <TempTab onClose={this.props.onFinished} />,
+        // ));
 
         return tabs;
     }

diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
@@ -96,11 +96,11 @@ export default class UserSettingsDialog extends React.Component {
             "mx_UserSettingsDialog_helpIcon",
             <HelpSettingsTab closeSettingsFn={this.props.onFinished} />,
         ));
-        tabs.push(new Tab(
-            _td("Visit old settings"),
-            "mx_UserSettingsDialog_helpIcon",
-            <TempTab onClose={this.props.onFinished} />,
-        ));
+        // tabs.push(new Tab(
+        //     _td("Visit old settings"),
+        //     "mx_UserSettingsDialog_helpIcon",
+        //     <TempTab onClose={this.props.onFinished} />,
+        // ));
 
         return tabs;
     }

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
@@ -120,7 +120,7 @@ class RoomViewStore extends Store {
                 });
                 break;
             case 'open_room_settings':
-                if (SettingsStore.isFeatureEnabled("feature_tabbed_settings")) {
+                if (true || SettingsStore.isFeatureEnabled("feature_tabbed_settings")) {
                     const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
                     Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
                         roomId: this._state.roomId,