summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOliver <oliver@mohlin.dev>2025-03-18 08:48:49 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-04-30 11:04:49 +0200
commit21672ba1902d10ed7146efec324f165a91eb3381 (patch)
treed368f1dfcecee01f57911d8a4670fc716a652364
parent19a5e40ef13c432ad2122171e86dceb460789610 (diff)
downloadmullvadvpn-21672ba1902d10ed7146efec324f165a91eb3381.tar.xz
mullvadvpn-21672ba1902d10ed7146efec324f165a91eb3381.zip
Use new Button in split tunneling settings view
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx47
1 files changed, 28 insertions, 19 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx
index 68644cdfa1..5b16495e75 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/SplitTunnelingSettings.tsx
@@ -12,6 +12,7 @@ import { strings } from '../../shared/constants';
import { messages } from '../../shared/gettext';
import { useAppContext } from '../context';
import { Button, Container, Flex, FootnoteMini, IconButton, Spinner } from '../lib/components';
+import { FlexColumn } from '../lib/components/flex-column';
import { Colors } from '../lib/foundations';
import { useHistory } from '../lib/history';
import { formatHtml } from '../lib/html-formatter';
@@ -20,7 +21,6 @@ import { useEffectEvent, useStyledRef } from '../lib/utility-hooks';
import { IReduxState } from '../redux/store';
import { AppNavigationHeader } from './';
import Accordion from './Accordion';
-import * as AppButton from './AppButton';
import * as Cell from './cell';
import { CustomScrollbarsRef } from './CustomScrollbars';
import { BackAction } from './KeyboardNavigation';
@@ -30,7 +30,6 @@ import { ModalAlert, ModalAlertType } from './Modal';
import { NavigationContainer } from './NavigationContainer';
import SettingsHeader, { HeaderSubTitle, HeaderTitle } from './SettingsHeader';
import {
- StyledBrowseButton,
StyledCellButton,
StyledCellLabel,
StyledCellWarningIcon,
@@ -186,15 +185,20 @@ function LinuxSplitTunnelingSettings(props: IPlatformSplitTunnelingSettingsProps
</StyledNoResult>
)}
- <Flex $flexDirection="column" $gap="medium">
+ <FlexColumn $gap="medium">
{filteredApplications !== undefined && filteredApplications.length > 0 && (
<ApplicationList applications={filteredApplications} rowRenderer={rowRenderer} />
)}
- <StyledBrowseButton onClick={launchWithFilePicker}>
- {messages.pgettext('split-tunneling-view', 'Find another app')}
- </StyledBrowseButton>
- </Flex>
+ <Button onClick={launchWithFilePicker}>
+ <Button.Text>
+ {
+ // TRANSLATORS: Button label for browsing applications with split tunneling.
+ messages.pgettext('split-tunneling-view', 'Find another app')
+ }
+ </Button.Text>
+ </Button>
+ </FlexColumn>
<ModalAlert
isOpen={browseError !== undefined}
@@ -209,9 +213,9 @@ function LinuxSplitTunnelingSettings(props: IPlatformSplitTunnelingSettingsProps
{ detailedErrorMessage: browseError },
)}
buttons={[
- <AppButton.BlueButton key="close" onClick={hideBrowseFailureDialog}>
- {messages.gettext('Close')}
- </AppButton.BlueButton>,
+ <Button key="close" onClick={hideBrowseFailureDialog}>
+ <Button.Text>{messages.gettext('Close')}</Button.Text>
+ </Button>,
]}
close={hideBrowseFailureDialog}
/>
@@ -260,17 +264,22 @@ function LinuxApplicationRow(props: ILinuxApplicationRowProps) {
);
const warningDialogButtons = disabled
? [
- <AppButton.BlueButton key="cancel" onClick={hideWarningDialog}>
- {messages.gettext('Back')}
- </AppButton.BlueButton>,
+ <Button key="cancel" onClick={hideWarningDialog}>
+ <Button.Text>{messages.gettext('Back')}</Button.Text>
+ </Button>,
]
: [
- <AppButton.BlueButton key="launch" onClick={launch}>
- {messages.pgettext('split-tunneling-view', 'Launch')}
- </AppButton.BlueButton>,
- <AppButton.BlueButton key="cancel" onClick={hideWarningDialog}>
- {messages.gettext('Cancel')}
- </AppButton.BlueButton>,
+ <Button key="launch" onClick={launch}>
+ <Button.Text>
+ {
+ // TRANSLATORS: Button label for launching an application with split tunneling.
+ messages.pgettext('split-tunneling-view', 'Launch')
+ }
+ </Button.Text>
+ </Button>,
+ <Button key="cancel" onClick={hideWarningDialog}>
+ <Button.Text>{messages.gettext('Cancel')}</Button.Text>
+ </Button>,
];
return (