From 7db491384567d0a5f4fee85d2a20cd4ccec961d5 Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 21 Jan 2025 11:16:07 +0100 Subject: [PATCH 1/3] Remove link to external changelog --- desktop/packages/mullvad-vpn/src/config.json | 3 +- .../views/changelog/ChangelogView.tsx | 32 +------------------ 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/desktop/packages/mullvad-vpn/src/config.json b/desktop/packages/mullvad-vpn/src/config.json index 43229834cae4..a77c47de4501 100644 --- a/desktop/packages/mullvad-vpn/src/config.json +++ b/desktop/packages/mullvad-vpn/src/config.json @@ -4,8 +4,7 @@ "purchase": "https://mullvad.net/account/", "faq": "https://mullvad.net/help/tag/mullvad-app/", "privacyGuide": "https://mullvad.net/help/first-steps-towards-online-privacy/", - "download": "https://mullvad.net/download/vpn/", - "changelog": "https://github.com/mullvad/mullvadvpn-app/blob/main/CHANGELOG.md" + "download": "https://mullvad.net/download/vpn/" }, "colors": { "darkerBlue": "rgba(25, 38, 56, 0.95)", diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/changelog/ChangelogView.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/changelog/ChangelogView.tsx index 9fe23132d750..682d48feb789 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/changelog/ChangelogView.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/changelog/ChangelogView.tsx @@ -1,15 +1,11 @@ -import { useCallback } from 'react'; import styled from 'styled-components'; -import { links } from '../../../../config.json'; import { messages } from '../../../../shared/gettext'; -import { useAppContext } from '../../../context'; -import { BodySmall, Button, Container, Flex, TitleBig, TitleLarge } from '../../../lib/components'; +import { BodySmall, Container, Flex, TitleBig, TitleLarge } from '../../../lib/components'; import { Colors, Spacings } from '../../../lib/foundations'; import { useHistory } from '../../../lib/history'; import { useSelector } from '../../../redux/store'; import { AppNavigationHeader } from '../../'; -import ImageView from '../../ImageView'; import { BackAction } from '../../KeyboardNavigation'; import { Layout, SettingsContainer } from '../../Layout'; import { NavigationContainer } from '../../NavigationContainer'; @@ -24,21 +20,11 @@ const StyledList = styled(Flex)({ }, }); -const StyledFooter = styled(Flex)({ - position: 'sticky', - minHeight: '64px', - bottom: 0, - background: Colors.darkBlue, -}); - export const ChangelogView = () => { const { pop } = useHistory(); - const { openUrl } = useAppContext(); const changelog = useSelector((state) => state.userInterface.changelog); const version = useSelector((state) => state.version.current); - const url = links.changelog; - const openDownloadLink = useCallback(() => openUrl(url), [openUrl, url]); return ( @@ -76,22 +62,6 @@ export const ChangelogView = () => { - - - ); From 71e5f555f4db4d16e2d75855c9e5bf2d9b5e1a6b Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 21 Jan 2025 11:20:24 +0100 Subject: [PATCH 2/3] Update spacing between title and content in changelog view --- .../views/changelog/ChangelogView.tsx | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/changelog/ChangelogView.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/changelog/ChangelogView.tsx index 682d48feb789..cb7719e53e57 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/changelog/ChangelogView.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/changelog/ChangelogView.tsx @@ -10,7 +10,6 @@ import { BackAction } from '../../KeyboardNavigation'; import { Layout, SettingsContainer } from '../../Layout'; import { NavigationContainer } from '../../NavigationContainer'; import { NavigationScrollbars } from '../../NavigationScrollbars'; -import SettingsHeader from '../../SettingsHeader'; const StyledList = styled(Flex)({ listStyleType: 'disc', @@ -33,31 +32,33 @@ export const ChangelogView = () => { - - {messages.pgettext('changelog-view', 'What’s new')} - - + - {version} - - - {changelog.length ? ( - - {changelog.map((item, i) => ( - - {item} - - ))} - - ) : ( - - {messages.pgettext( - 'changelog-view', - 'No updates or changes were made in this release for this platform.', - )} - - )} + {messages.pgettext('changelog-view', 'What’s new')} + + + {version} + + + {changelog.length ? ( + + {changelog.map((item, i) => ( + + {item} + + ))} + + ) : ( + + {messages.pgettext( + 'changelog-view', + 'No updates or changes were made in this release for this platform.', + )} + + )} + + From 22c0b471ecbb1bf8e9093a95ef123f33221f9bbf Mon Sep 17 00:00:00 2001 From: Oliver Date: Tue, 21 Jan 2025 11:33:01 +0100 Subject: [PATCH 3/3] Update translations --- desktop/packages/mullvad-vpn/locales/messages.pot | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/desktop/packages/mullvad-vpn/locales/messages.pot b/desktop/packages/mullvad-vpn/locales/messages.pot index fab982ae0ba1..6855ce44089f 100644 --- a/desktop/packages/mullvad-vpn/locales/messages.pot +++ b/desktop/packages/mullvad-vpn/locales/messages.pot @@ -612,10 +612,6 @@ msgctxt "auth-failure" msgid "You are logged in with an invalid account number. Please log out and try another one." msgstr "" -msgctxt "changelog" -msgid "See full changelog" -msgstr "" - msgctxt "changelog-view" msgid "No updates or changes were made in this release for this platform." msgstr "" @@ -2629,6 +2625,9 @@ msgstr "" msgid "Search" msgstr "" +msgid "See full changelog" +msgstr "" + msgid "Set WireGuard MTU value. Valid range: %d - %d." msgstr ""