From 2a25c6aaa4206edcfca179d8cab0201492b730b6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 17 Aug 2020 13:41:19 -0600
Subject: [PATCH] Update configs for new settings structure

---
 config.sample.json             |  6 +-----
 element.io/app/config.json     |  3 +--
 element.io/develop/config.json | 16 +---------------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/config.sample.json b/config.sample.json
index 662865c041..52e47f03f1 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -26,11 +26,7 @@
     "defaultCountryCode": "GB",
     "showLabsSettings": false,
     "features": {
-        "feature_new_spinner": "labs",
-        "feature_pinning": "labs",
-        "feature_custom_status": "labs",
-        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs"
+        "feature_new_spinner": false
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/element.io/app/config.json b/element.io/app/config.json
index f0af8b82bb..c8867d3dd6 100644
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -12,8 +12,7 @@
     ],
     "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
-    "features": {
-    },
+    "showLabsSettings": false,
     "piwik": {
         "url": "https://piwik.riot.im/",
         "siteId": 1,
diff --git a/element.io/develop/config.json b/element.io/develop/config.json
index be5b58909a..bcf6142d18 100644
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -12,21 +12,7 @@
     ],
     "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
-    "features": {
-        "feature_new_spinner": "labs",
-        "feature_pinning": "labs",
-        "feature_custom_status": "labs",
-        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs",
-        "feature_many_integration_managers": "labs",
-        "feature_mjolnir": "labs",
-        "feature_dm_verification": "labs",
-        "feature_bridge_state": "labs",
-        "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs",
-        "feature_roomlist_preview_reactions_dms": "labs",
-        "feature_roomlist_preview_reactions_all": "labs"
-    },
+    "showLabsSettings": true,
     "piwik": {
         "url": "https://piwik.riot.im/",
         "siteId": 1,