Eik/reactivate securitytab (element-hq#69)

* 1982 translations * 1967 Security tab is missing * 1967 Security tab is missing
verji · Aug 12, 2024 · fe5b96a · fe5b96a
1 parent bcc91a7
commit fe5b96a
Show file tree

Hide file tree

Showing 7 changed files with 4,738 additions and 76 deletions.
diff --git a/src/components/views/dialogs/UserSettingsDialog.tsx b/src/components/views/dialogs/UserSettingsDialog.tsx
@@ -150,17 +150,15 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
                 "UserSettingsKeyboard",
             ),
         );
-        if (SettingsStore.getValue(UIFeature.SpacesEnabled)) {
-            tabs.push(
-                new Tab(
-                    UserTab.Sidebar,
-                    _td("settings|sidebar|title"),
-                    "mx_UserSettingsDialog_sidebarIcon",
-                    <SidebarUserSettingsTab />,
-                    "UserSettingsSidebar",
-                ),
-            );
-        }
+        tabs.push(
+            new Tab(
+                UserTab.Sidebar,
+                _td("settings|sidebar|title"),
+                "mx_UserSettingsDialog_sidebarIcon",
+                <SidebarUserSettingsTab />,
+                "UserSettingsSidebar",
+            ),
+        );
 
         if (voipEnabled) {
             tabs.push(
@@ -174,17 +172,15 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
             );
         }
 
-        if (SettingsStore.getValue(UIFeature.SpacesEnabled)) {
-            tabs.push(
-                new Tab(
-                    UserTab.Security,
-                    _td("room_settings|security|title"),
-                    "mx_UserSettingsDialog_securityIcon",
-                    <SecurityUserSettingsTab closeSettingsFn={props.onFinished} />,
-                    "UserSettingsSecurityPrivacy",
-                ),
-            );
-        }
+        tabs.push(
+            new Tab(
+                UserTab.Security,
+                _td("room_settings|security|title"),
+                "mx_UserSettingsDialog_securityIcon",
+                <SecurityUserSettingsTab closeSettingsFn={props.onFinished} />,
+                "UserSettingsSecurityPrivacy",
+            ),
+        );
 
         if (showLabsFlags() || SettingsStore.getFeatureSettingNames().some((k) => SettingsStore.getBetaInfo(k))) {
             tabs.push(

diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
@@ -569,8 +569,8 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
 
     let otherSearchesSection: JSX.Element | undefined;
     if (
-        (SettingsStore.getValue(UIFeature.SpacesEnabled) && trimmedQuery) ||
-        (filter !== Filter.PublicRooms && filter !== Filter.PublicSpaces)
+        SettingsStore.getValue(UIFeature.SpotlightDialogShowOtherSearches) &&
+        (trimmedQuery || (filter !== Filter.PublicRooms && filter !== Filter.PublicSpaces))
     ) {
         otherSearchesSection = (
             <div