Merge branch 'verji-develop' of https://github.com/verji/matrix-react…

…-sdk into verji-develop
element-hq · Dec 13, 2024 · 62d6dc7 · 62d6dc7
2 parents 0924306 + 497370b
commit 62d6dc7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
@@ -28,6 +28,8 @@ import { getTopic } from "../../../hooks/room/useTopic";
 import SettingsTab from "../settings/tabs/SettingsTab";
 import { SettingsSection } from "../settings/shared/SettingsSection";
 import SettingsSubsection from "../settings/shared/SettingsSubsection";
+import SettingsStore from "../../../settings/SettingsStore";
+import { UIFeature } from "../../../settings/UIFeature";
 
 interface IProps {
     matrixClient: MatrixClient;
@@ -125,17 +127,18 @@ const SpaceSettingsGeneralTab: React.FC<IProps> = ({ matrixClient: cli, space })
                         {busy ? _t("common|saving") : _t("room_settings|general|save")}
                     </AccessibleButton>
                 </div>
-
-                <SettingsSubsection heading={_t("room_settings|general|leave_space")}>
-                    <AccessibleButton
-                        kind="danger"
-                        onClick={() => {
-                            leaveSpace(space);
-                        }}
-                    >
-                        {_t("room_settings|general|leave_space")}
-                    </AccessibleButton>
-                </SettingsSubsection>
+                {SettingsStore.getValue(UIFeature.LeaveSpaceButton) && (
+                    <SettingsSubsection heading={_t("room_settings|general|leave_space")}>
+                        <AccessibleButton
+                            kind="danger"
+                            onClick={() => {
+                                leaveSpace(space);
+                            }}
+                        >
+                            {_t("room_settings|general|leave_space")}
+                        </AccessibleButton>
+                    </SettingsSubsection>
+                )}
             </SettingsSection>
         </SettingsTab>
     );

diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
@@ -1527,6 +1527,10 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
+    [UIFeature.LeaveSpaceButton]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
 
     // Electron-specific settings, they are stored by Electron and set/read over an IPC.
     // We store them over there are they are necessary to know before the renderer process launches.

diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
@@ -106,6 +106,7 @@ export const enum UIFeature {
     ShowRecentsInSuggestions = "UIFeature.showRecentsInSuggestions",
     AllowDirectUserInvite = "UIFeature.allowDirectUserInvite",
     SearchInAllRooms = "UIFeature.searchInAllRooms",
+    LeaveSpaceButton = "UIFeature.leaveSpaceButton",
 }
 
 export enum UIComponent {