diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-10-04 17:12:59 +0200 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-10-07 15:40:34 +0200 |
| commit | e7e77cfc14291b4d06291a1fed73a0e56924a40b (patch) | |
| tree | d0d010166e114385f1e87f7bad2726c1f1bf04bb /gui/src/renderer/components/main-view | |
| parent | 0578e79afcaf6ad1158663941e05f01ce3a7c2c3 (diff) | |
| download | mullvadvpn-e7e77cfc14291b4d06291a1fed73a0e56924a40b.tar.xz mullvadvpn-e7e77cfc14291b4d06291a1fed73a0e56924a40b.zip | |
Replace "smart routing" with "direct only" in gui code
Diffstat (limited to 'gui/src/renderer/components/main-view')
| -rw-r--r-- | gui/src/renderer/components/main-view/FeatureIndicators.tsx | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/gui/src/renderer/components/main-view/FeatureIndicators.tsx b/gui/src/renderer/components/main-view/FeatureIndicators.tsx index a4bf8659c6..2d7914fd87 100644 --- a/gui/src/renderer/components/main-view/FeatureIndicators.tsx +++ b/gui/src/renderer/components/main-view/FeatureIndicators.tsx @@ -5,13 +5,10 @@ import styled from 'styled-components'; import { colors, strings } from '../../../config.json'; import { FeatureIndicator } from '../../../shared/daemon-rpc-types'; import { messages } from '../../../shared/gettext'; -import { useBoolean, useStyledRef } from '../../lib/utilityHooks'; +import { useStyledRef } from '../../lib/utilityHooks'; import { useSelector } from '../../redux/store'; import { tinyText } from '../common-styles'; -import { SmartRoutingModalMessage } from '../DaitaSettings'; import { InfoIcon } from '../InfoButton'; -import { ModalAlert, ModalAlertType } from '../Modal'; -import { SmallButton, SmallButtonColor } from '../SmallButton'; import { ConnectionPanelAccordion } from './styles'; const LINE_HEIGHT = 22; @@ -102,11 +99,6 @@ interface FeatureIndicatorsProps { // we can count those and add another ellipsis element which is visible and place it after the last // visible indicator. export default function FeatureIndicators(props: FeatureIndicatorsProps) { - const [ - daitaSmartRoutingDialogueVisible, - showDaitaSmartRoutingDialogue, - hideDaitaSmartRoutingDialogue, - ] = useBoolean(); const tunnelState = useSelector((state) => state.connection.status); const ellipsisRef = useStyledRef<HTMLSpanElement>(); const ellipsisSpacerRef = useStyledRef<HTMLSpanElement>(); @@ -127,9 +119,8 @@ export default function FeatureIndicators(props: FeatureIndicatorsProps) { // Returns an optional callback for clickable feature indicators, or undefined. const getFeatureIndicatorOnClick = (indicator: FeatureIndicator) => { + // NOTE: With the "smart routing" feature indicator removed, this function now does nothing, should it be removed? switch (indicator) { - case FeatureIndicator.daitaSmartRouting: - return showDaitaSmartRoutingDialogue; default: return undefined; } @@ -231,21 +222,6 @@ export default function FeatureIndicators(props: FeatureIndicatorsProps) { /> </StyledFeatureIndicators> </StyledFeatureIndicatorsContainer> - - <ModalAlert - isOpen={daitaSmartRoutingDialogueVisible} - type={ModalAlertType.info} - gridButtons={[ - <SmallButton - key="dismiss" - onClick={hideDaitaSmartRoutingDialogue} - color={SmallButtonColor.blue}> - {messages.gettext('Got it!')} - </SmallButton>, - ]} - close={hideDaitaSmartRoutingDialogue}> - <SmartRoutingModalMessage /> - </ModalAlert> </StyledAccordion> ); } @@ -276,13 +252,6 @@ function getFeatureIndicatorLabel(indicator: FeatureIndicator) { switch (indicator) { case FeatureIndicator.daita: return strings.daita; - case FeatureIndicator.daitaSmartRouting: - return sprintf( - // TRANSLATORS: This refers to the Smart Routing setting in the VPN settings view. - // TRANSLATORS: This is displayed when both Smart Routing and DAITA features are on. - messages.gettext('%(daita)s: Smart routing'), - { daita: strings.daita }, - ); case FeatureIndicator.udp2tcp: case FeatureIndicator.shadowsocks: return messages.pgettext('wireguard-settings-view', 'Obfuscation'); |
