Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eik/reactivate securitytab #70

Merged
merged 5 commits into from
Aug 12, 2024
Merged

Eik/reactivate securitytab #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4dc0afd
1982 translations
eiksta Aug 12, 2024
a275abd
1967 Security tab is missing
eiksta Aug 12, 2024
f50ef51
1967 Security tab is missing
eiksta Aug 12, 2024
7292cff
1967 Security tab is missing
eiksta Aug 12, 2024
e354934
1967 Security tab is missing
eiksta Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions src/components/views/dialogs/UserSettingsDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions src/components/views/dialogs/spotlight/SpotlightDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import SettingsTab from "../SettingsTab";
import { SettingsSection } from "../../shared/SettingsSection";
import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection";
import SdkConfig from "../../../../../SdkConfig";
import { UIFeature } from "../../../../../settings/UIFeature";

type InteractionName = "WebSettingsSidebarTabSpacesCheckbox" | "WebQuickSettingsPinToSidebarCheckbox";

Expand Down Expand Up @@ -79,8 +78,6 @@ const SidebarUserSettingsTab: React.FC = () => {
PosthogTrackers.trackInteraction("WebSettingsSidebarTabSpacesCheckbox", event, 1);
};

if (!SettingsStore.getValue(UIFeature.SpacesEnabled)) return <></>;

return (
<SettingsTab>
<SettingsSection>
Expand Down
Loading
Loading