Move daita settings to views folder

5 files changed, 25 insertions, 22 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
index a557b7770f..857f37f62a 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
@@ -6,7 +6,6 @@ import SelectLocation from '../components/select-location/SelectLocationContaine
 import { useViewTransitions } from '../lib/transition-hooks';
 import Account from './Account';
 import ApiAccessMethods from './ApiAccessMethods';
-import DaitaSettings from './DaitaSettings';
 import Debug from './Debug';
 import { DeviceRevokedView } from './DeviceRevokedView';
 import { EditApiAccessMethod } from './EditApiAccessMethod';
@@ -35,6 +34,7 @@ import {
   AppInfoView,
   AppUpgradeView,
   ChangelogView,
+  DaitaSettings,
   LaunchView,
   LoginView,
   MainView,
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx
index 75379f579f..526d174fd1 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/MultihopSettings.tsx
@@ -11,12 +11,12 @@ import { useSelector } from '../redux/store';
 import { AppNavigationHeader } from './';
 import { AriaDescription, AriaInput, AriaInputGroup, AriaLabel } from './AriaGroup';
 import * as Cell from './cell';
-import { StyledIllustration } from './DaitaSettings';
 import { BackAction } from './KeyboardNavigation';
 import { Layout, SettingsContainer } from './Layout';
 import { NavigationContainer } from './NavigationContainer';
 import { NavigationScrollbars } from './NavigationScrollbars';
 import SettingsHeader, { HeaderSubTitle, HeaderTitle } from './SettingsHeader';
+import { StyledIllustration } from './views/daita-settings/DaitaSettings';
 
 const PATH_PREFIX = process.env.NODE_ENV === 'development' ? '../' : '';
 
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/DaitaSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/daita-settings/DaitaSettings.tsx
index ee95d35a49..49c5a80fa0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/DaitaSettings.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/daita-settings/DaitaSettings.tsx
@@ -2,25 +2,25 @@ import React, { useCallback } from 'react';
 import { sprintf } from 'sprintf-js';
 import styled from 'styled-components';
 
-import { strings } from '../../shared/constants';
-import { messages } from '../../shared/gettext';
-import { useAppContext } from '../context';
-import { Button, Flex } from '../lib/components';
-import { spacings } from '../lib/foundations';
-import { useHistory } from '../lib/history';
-import { useBoolean } from '../lib/utility-hooks';
-import { useSelector } from '../redux/store';
-import { AppNavigationHeader } from './';
-import { AriaDescription, AriaInput, AriaInputGroup, AriaLabel } from './AriaGroup';
-import * as Cell from './cell';
-import InfoButton from './InfoButton';
-import { BackAction } from './KeyboardNavigation';
-import { Layout, SettingsContainer } from './Layout';
-import { ModalAlert, ModalAlertType, ModalMessage } from './Modal';
-import { NavigationContainer } from './NavigationContainer';
-import { NavigationScrollbars } from './NavigationScrollbars';
-import PageSlider from './PageSlider';
-import SettingsHeader, { HeaderSubTitle, HeaderTitle } from './SettingsHeader';
+import { strings } from '../../../../shared/constants';
+import { messages } from '../../../../shared/gettext';
+import { useAppContext } from '../../../context';
+import { Button, Flex } from '../../../lib/components';
+import { spacings } from '../../../lib/foundations';
+import { useHistory } from '../../../lib/history';
+import { useBoolean } from '../../../lib/utility-hooks';
+import { useSelector } from '../../../redux/store';
+import { AppNavigationHeader } from '../..';
+import { AriaDescription, AriaInput, AriaInputGroup, AriaLabel } from '../../AriaGroup';
+import * as Cell from '../../cell';
+import InfoButton from '../../InfoButton';
+import { BackAction } from '../../KeyboardNavigation';
+import { Layout, SettingsContainer } from '../../Layout';
+import { ModalAlert, ModalAlertType, ModalMessage } from '../../Modal';
+import { NavigationContainer } from '../../NavigationContainer';
+import { NavigationScrollbars } from '../../NavigationScrollbars';
+import PageSlider from '../../PageSlider';
+import SettingsHeader, { HeaderSubTitle, HeaderTitle } from '../../SettingsHeader';
 
 const StyledHeaderSubTitle = styled(HeaderSubTitle)({
   display: 'inline-block',
@@ -37,7 +37,7 @@ const StyledInfoButton = styled(InfoButton)({
 
 const PATH_PREFIX = process.env.NODE_ENV === 'development' ? '../' : '';
 
-export default function DaitaSettings() {
+export function DaitaSettings() {
   const { pop } = useHistory();
 
   return (
@@ -187,6 +187,7 @@ function DaitaToggle() {
 
   const directOnlyString = messages.gettext('Direct only');
 
+  // Move to views folder
   return (
     <>
       <AriaInputGroup>
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/daita-settings/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/daita-settings/index.ts
new file mode 100644
index 0000000000..093d7813a0
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/daita-settings/index.ts
@@ -0,0 +1 @@
+export * from './DaitaSettings';
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 53662f1e3c..31fa8c9332 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
@@ -1,5 +1,6 @@
 export * from './app-info';
 export * from './app-upgrade';
+export * from './daita-settings';
 export * from './launch';
 export * from './main';
 export * from './login';