From 728748c9cd4b222ae7ff43df6561dceaed03ca7f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 1 Feb 2019 10:29:13 -0700
Subject: [PATCH 1/2] Disable old settings, making tabbed settings the default

This is intentionally not removing the labs flag or other supporting structures of the old settings to make a revert as easy as possible in the event that needs to happen. All of the cruft left behind (TempTab, temp styles, labs flag, old components, etc) will be removed in the very near future.
---
 src/components/structures/MatrixChat.js            |  2 +-
 src/components/views/dialogs/RoomSettingsDialog.js | 12 ++++++------
 src/components/views/dialogs/UserSettingsDialog.js | 10 +++++-----
 src/stores/RoomViewStore.js                        |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index d0a5aa42c4..613d310da9 100644
--- 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
index 0578ccaffd..89e96ad011 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -81,13 +81,13 @@ export default class RoomSettingsDialog extends React.Component {
         tabs.push(new Tab(
             _td("Advanced"),
             "mx_RoomSettingsDialog_warningIcon",
-            <AdvancedRoomSettingsTab roomId={this.props.roomId} />,
-        ));
-        tabs.push(new Tab(
-            _td("Visit old settings"),
-            "mx_RoomSettingsDialog_warningIcon",
-            <TempTab onClose={this.props.onFinished} />,
+            <AdvancedRoomSettingsTab roomId={thisfea.props.roomId} />,
         ));
+        // 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
index 2616542bf7..d241be7660 100644
--- 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
index ba78e7687f..db49de805b 100644
--- 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,

From 2a9149668c82772e12e26e04d881800e358f6958 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 1 Feb 2019 11:00:06 -0700
Subject: [PATCH 2/2] thisfea -> this

idk what I was doing
---
 src/components/views/dialogs/RoomSettingsDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index 89e96ad011..9718d29bbc 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -81,7 +81,7 @@ export default class RoomSettingsDialog extends React.Component {
         tabs.push(new Tab(
             _td("Advanced"),
             "mx_RoomSettingsDialog_warningIcon",
-            <AdvancedRoomSettingsTab roomId={thisfea.props.roomId} />,
+            <AdvancedRoomSettingsTab roomId={this.props.roomId} />,
         ));
         // tabs.push(new Tab(
         //     _td("Visit old settings"),