From 2435332d370a0c39f7a161c016c738603b44b127 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 30 Apr 2021 12:42:16 +0100
Subject: [PATCH] fix beta disabled behaviour

---
 src/i18n/strings/en_EN.json   | 1 +
 src/settings/Settings.tsx     | 2 ++
 src/settings/SettingsStore.ts | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7f5205efa3..2dbb36725f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -784,6 +784,7 @@
     "%(senderName)s: %(reaction)s": "%(senderName)s: %(reaction)s",
     "%(senderName)s: %(stickerName)s": "%(senderName)s: %(stickerName)s",
     "Change notification settings": "Change notification settings",
+    "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.": "Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.",
     "Spaces": "Spaces",
     "Spaces are new ways to group rooms and people.": "Spaces are new ways to group rooms and people.",
     "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.": "%(brand)s will reload with Spaces disabled. Communities and custom tags will be visible again.",
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 2066cf2026..5b501a8e8b 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -131,6 +131,8 @@ export interface ISetting {
 export const SETTINGS: {[setting: string]: ISetting} = {
     "feature_spaces": {
         isFeature: true,
+        displayName: _td("Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. " +
+            "Requires compatible homeserver for some features."),
         supportedLevels: LEVELS_FEATURE,
         default: false,
         controller: new ReloadOnChangeController(),
diff --git a/src/settings/SettingsStore.ts b/src/settings/SettingsStore.ts
index 875a0a87ec..c32bbe731d 100644
--- a/src/settings/SettingsStore.ts
+++ b/src/settings/SettingsStore.ts
@@ -454,8 +454,8 @@ export default class SettingsStore {
             throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
         }
 
-        // When features are specified in the config.json, we force them as enabled or disabled.
-        if (SettingsStore.isFeature(settingName)) {
+        // When non-beta features are specified in the config.json, we force them as enabled or disabled.
+        if (SettingsStore.isFeature(settingName) && !SETTINGS[settingName]?.betaInfo) {
             const configVal = SettingsStore.getValueAt(SettingLevel.CONFIG, settingName, roomId, true, true);
             if (configVal === true || configVal === false) return false;
         }