Move vpn settings to views folder

4 files changed, 45 insertions, 31 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
index 7c72b833f9..85c4bb919f 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
@@ -40,8 +40,8 @@ import {
   LoginView,
   SettingsView,
   SplitTunnelingView,
+  VpnSettings,
 } from './views';
-import VpnSettings from './VpnSettings';
 import WireguardSettings from './WireguardSettings';
 
 export default function AppRouter() {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
index e35670b52a..05737cd0d5 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
@@ -5,3 +5,4 @@ export * from './login';
 export * from './changelog';
 export * from './settings';
 export * from './split-tunneling';
+export * from './vpn-settings';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/VpnSettings.tsx
index d1e3d7df72..9a95befdc8 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/VpnSettings.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/VpnSettings.tsx
@@ -2,35 +2,47 @@ import { useCallback, useMemo } from 'react';
 import { sprintf } from 'sprintf-js';
 import styled from 'styled-components';
 
-import { strings, urls } from '../../shared/constants';
-import { IDnsOptions, TunnelProtocol } from '../../shared/daemon-rpc-types';
-import { messages } from '../../shared/gettext';
-import log from '../../shared/logging';
-import { RoutePath } from '../../shared/routes';
-import { useAppContext } from '../context';
-import { Button } from '../lib/components';
-import { useRelaySettingsUpdater } from '../lib/constraint-updater';
-import { colors, spacings } from '../lib/foundations';
-import { useHistory } from '../lib/history';
-import { formatHtml } from '../lib/html-formatter';
-import { useTunnelProtocol } from '../lib/relay-settings-hooks';
-import { useBoolean } from '../lib/utility-hooks';
-import { RelaySettingsRedux } from '../redux/settings/reducers';
-import { useSelector } from '../redux/store';
-import { AppNavigationHeader } from './';
-import { AriaDescription, AriaDetails, AriaInput, AriaInputGroup, AriaLabel } from './AriaGroup';
-import * as Cell from './cell';
-import Selector, { SelectorItem } from './cell/Selector';
-import CustomDnsSettings from './CustomDnsSettings';
-import { ExternalLink } from './ExternalLink';
-import InfoButton from './InfoButton';
-import { BackAction } from './KeyboardNavigation';
-import { Layout, SettingsContainer, SettingsContent, SettingsGroup, SettingsStack } from './Layout';
-import { ModalAlert, ModalAlertType, ModalMessage } from './Modal';
-import { NavigationContainer } from './NavigationContainer';
-import { NavigationListItem } from './NavigationListItem';
-import { NavigationScrollbars } from './NavigationScrollbars';
-import SettingsHeader, { HeaderTitle } from './SettingsHeader';
+import { strings, urls } from '../../../../shared/constants';
+import { IDnsOptions, TunnelProtocol } from '../../../../shared/daemon-rpc-types';
+import { messages } from '../../../../shared/gettext';
+import log from '../../../../shared/logging';
+import { RoutePath } from '../../../../shared/routes';
+import { useAppContext } from '../../../context';
+import { Button } from '../../../lib/components';
+import { useRelaySettingsUpdater } from '../../../lib/constraint-updater';
+import { colors, spacings } from '../../../lib/foundations';
+import { useHistory } from '../../../lib/history';
+import { formatHtml } from '../../../lib/html-formatter';
+import { useTunnelProtocol } from '../../../lib/relay-settings-hooks';
+import { useBoolean } from '../../../lib/utility-hooks';
+import { RelaySettingsRedux } from '../../../redux/settings/reducers';
+import { useSelector } from '../../../redux/store';
+import { AppNavigationHeader } from '../..';
+import {
+  AriaDescription,
+  AriaDetails,
+  AriaInput,
+  AriaInputGroup,
+  AriaLabel,
+} from '../../AriaGroup';
+import * as Cell from '../../cell';
+import Selector, { SelectorItem } from '../../cell/Selector';
+import CustomDnsSettings from '../../CustomDnsSettings';
+import { ExternalLink } from '../../ExternalLink';
+import InfoButton from '../../InfoButton';
+import { BackAction } from '../../KeyboardNavigation';
+import {
+  Layout,
+  SettingsContainer,
+  SettingsContent,
+  SettingsGroup,
+  SettingsStack,
+} from '../../Layout';
+import { ModalAlert, ModalAlertType, ModalMessage } from '../../Modal';
+import { NavigationContainer } from '../../NavigationContainer';
+import { NavigationListItem } from '../../NavigationListItem';
+import { NavigationScrollbars } from '../../NavigationScrollbars';
+import SettingsHeader, { HeaderTitle } from '../../SettingsHeader';
 
 const StyledInfoButton = styled(InfoButton)({
   marginRight: spacings.medium,
@@ -53,7 +65,7 @@ const IndentedValueLabel = styled(Cell.ValueLabel)({
   marginLeft: spacings.medium,
 });
 
-export default function VpnSettings() {
+export function VpnSettings() {
   const { pop } = useHistory();
 
   return (
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/index.ts
new file mode 100644
index 0000000000..95a22221b6
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/index.ts
@@ -0,0 +1 @@
+export * from './VpnSettings';