summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOliver <oliver@mohlin.dev>2024-12-18 07:46:46 +0100
committerOskar <oskar@mullvad.net>2024-12-20 18:12:53 +0100
commit2d8a196d636e0c766f70c8b8b2db8098a753d03e (patch)
tree45821dc140eaf3feb10a0672198797290eff6967
parent9b3a32bb23e596b57e0cb5c4342abe3a37a06ce6 (diff)
downloadmullvadvpn-2d8a196d636e0c766f70c8b8b2db8098a753d03e.tar.xz
mullvadvpn-2d8a196d636e0c766f70c8b8b2db8098a753d03e.zip
Remove bridge mode confirmation dialog
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx38
1 files changed, 3 insertions, 35 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx
index 571e8e3571..37e72b13e7 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/OpenVpnSettings.tsx
@@ -16,14 +16,13 @@ import { useAppContext } from '../context';
import { useRelaySettingsUpdater } from '../lib/constraint-updater';
import { useHistory } from '../lib/history';
import { formatHtml } from '../lib/html-formatter';
-import { useBoolean } from '../lib/utility-hooks';
import { useSelector } from '../redux/store';
import { AriaDescription, AriaInput, AriaInputGroup, AriaLabel } from './AriaGroup';
import * as Cell from './cell';
import Selector, { SelectorItem } from './cell/Selector';
import { BackAction } from './KeyboardNavigation';
import { Layout, SettingsContainer } from './Layout';
-import { ModalAlert, ModalAlertType, ModalMessage } from './Modal';
+import { ModalMessage } from './Modal';
import {
NavigationBar,
NavigationContainer,
@@ -32,7 +31,6 @@ import {
TitleBarItem,
} from './NavigationBar';
import SettingsHeader, { HeaderTitle } from './SettingsHeader';
-import { SmallButton } from './SmallButton';
const MIN_MSSFIX_VALUE = 1000;
const MAX_MSSFIX_VALUE = 1450;
@@ -279,8 +277,6 @@ function BridgeModeSelector() {
[tunnelProtocol, transportProtocol],
);
- const [confirmationDialogVisible, showConfirmationDialog, hideConfirmationDialog] = useBoolean();
-
const setBridgeState = useCallback(
async (bridgeState: BridgeState) => {
try {
@@ -295,20 +291,11 @@ function BridgeModeSelector() {
const onSelectBridgeState = useCallback(
async (newValue: BridgeState) => {
- if (newValue === 'on') {
- showConfirmationDialog();
- } else {
- await setBridgeState(newValue);
- }
+ await setBridgeState(newValue);
},
- [showConfirmationDialog, setBridgeState],
+ [setBridgeState],
);
- const confirmBridgeState = useCallback(async () => {
- hideConfirmationDialog();
- await setBridgeState('on');
- }, [hideConfirmationDialog, setBridgeState]);
-
const footerText = bridgeModeFooterText(bridgeState === 'on', tunnelProtocol, transportProtocol);
return (
@@ -355,25 +342,6 @@ function BridgeModeSelector() {
</Cell.CellFooter>
)}
</AriaInputGroup>
- <ModalAlert
- isOpen={confirmationDialogVisible}
- type={ModalAlertType.caution}
- title={messages.pgettext('openvpn-settings-view', 'Enable bridge mode?')}
- message={
- // TRANSLATORS: Warning shown in dialog to users when they enable setting that increases
- // TRANSLATORS: network latency (decreases performance).
- messages.gettext('This setting increases latency. Use only if needed.')
- }
- gridButtons={[
- <SmallButton key="cancel" onClick={hideConfirmationDialog}>
- {messages.gettext('Cancel')}
- </SmallButton>,
- <SmallButton key="confirm" onClick={confirmBridgeState} data-testid="enable-confirm">
- {messages.gettext('Enable')}
- </SmallButton>,
- ]}
- close={hideConfirmationDialog}
- />
</>
);
}