summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-09-02 13:50:31 +0200
committerOskar Nyberg <oskar@mullvad.net>2022-09-02 13:50:31 +0200
commita51484e55bed300c981caa4985667ba1ed960d7e (patch)
tree903977271139540d4fb86c2c1cc900472de783e7
parent6bba9ccb52710dfa4061566eb619e9efff33e9f3 (diff)
parent418f12afc577be3772f901def8c5cd926bf0a9d7 (diff)
downloadmullvadvpn-a51484e55bed300c981caa4985667ba1ed960d7e.tar.xz
mullvadvpn-a51484e55bed300c981caa4985667ba1ed960d7e.zip
Merge branch 'large-title-in-settings'
-rw-r--r--gui/src/renderer/components/Settings.tsx11
1 files changed, 4 insertions, 7 deletions
diff --git a/gui/src/renderer/components/Settings.tsx b/gui/src/renderer/components/Settings.tsx
index 587ca625c9..96080ecfe6 100644
--- a/gui/src/renderer/components/Settings.tsx
+++ b/gui/src/renderer/components/Settings.tsx
@@ -35,7 +35,6 @@ export default function Support() {
const loginState = useSelector((state) => state.account.status);
const connectedToDaemon = useSelector((state) => state.userInterface.connectedToDaemon);
- const showLargeTitle = loginState.type !== 'ok';
const showSubSettings = loginState.type === 'ok' && connectedToDaemon;
return (
@@ -43,7 +42,7 @@ export default function Support() {
<Layout>
<SettingsContainer>
<NavigationContainer>
- <NavigationBar alwaysDisplayBarTitle={!showLargeTitle}>
+ <NavigationBar>
<NavigationItems>
<TitleBarItem>
{
@@ -56,11 +55,9 @@ export default function Support() {
<StyledNavigationScrollbars fillContainer>
<StyledContent>
- {showLargeTitle && (
- <SettingsHeader>
- <HeaderTitle>{messages.pgettext('navigation-bar', 'Settings')}</HeaderTitle>
- </SettingsHeader>
- )}
+ <SettingsHeader>
+ <HeaderTitle>{messages.pgettext('navigation-bar', 'Settings')}</HeaderTitle>
+ </SettingsHeader>
<StyledSettingsContent>
{showSubSettings ? (