Move settings view to separate folder

4 files changed, 20 insertions, 19 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
index fc027738d1..903f1695eb 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
@@ -27,7 +27,6 @@ import MultihopSettings from './MultihopSettings';
 import OpenVpnSettings from './OpenVpnSettings';
 import ProblemReport from './ProblemReport';
 import SelectLanguage from './SelectLanguage';
-import Settings from './Settings';
 import SettingsImport from './SettingsImport';
 import SettingsTextImport from './SettingsTextImport';
 import Shadowsocks from './Shadowsocks';
@@ -36,7 +35,7 @@ import Support from './Support';
 import TooManyDevices from './TooManyDevices';
 import UdpOverTcp from './UdpOverTcp';
 import UserInterfaceSettings from './UserInterfaceSettings';
-import { AppInfoView, ChangelogView } from './views';
+import { AppInfoView, ChangelogView, SettingsView } from './views';
 import VpnSettings from './VpnSettings';
 import WireguardSettings from './WireguardSettings';
 
@@ -62,7 +61,7 @@ export default function AppRouter() {
         <Route exact path={RoutePath.timeAdded} component={TimeAdded} />
         <Route exact path={RoutePath.setupFinished} component={SetupFinished} />
         <Route exact path={RoutePath.account} component={Account} />
-        <Route exact path={RoutePath.settings} component={Settings} />
+        <Route exact path={RoutePath.settings} component={SettingsView} />
         <Route exact path={RoutePath.selectLanguage} component={SelectLanguage} />
         <Route exact path={RoutePath.userInterfaceSettings} component={UserInterfaceSettings} />
         <Route exact path={RoutePath.multihopSettings} component={MultihopSettings} />
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 dff5aa7a90..2ff7a5978b 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
@@ -1,2 +1,3 @@
 export * from './app-info';
 export * from './changelog';
+export * from './settings';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Settings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/SettingsView.tsx
index a729a56d1f..0172a55315 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/Settings.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/SettingsView.tsx
@@ -1,16 +1,17 @@
 import styled from 'styled-components';
 
-import { strings } from '../../shared/constants';
-import { messages } from '../../shared/gettext';
-import { useAppContext } from '../context';
-import { Button, Flex, Icon, TitleBig } from '../lib/components';
-import { Dot } from '../lib/components/dot';
-import { ListItem } from '../lib/components/list-item';
-import { useHistory } from '../lib/history';
-import { RoutePath } from '../lib/routes';
-import { useSelector } from '../redux/store';
-import { AppNavigationHeader } from './';
-import { BackAction } from './KeyboardNavigation';
+import { strings } from '../../../../shared/constants';
+import { messages } from '../../../../shared/gettext';
+import { useAppContext } from '../../../context';
+import { Button, Flex, Icon, TitleBig } from '../../../lib/components';
+import { Dot } from '../../../lib/components/dot';
+import { ListItem } from '../../../lib/components/list-item';
+import { useHistory } from '../../../lib/history';
+import { RoutePath } from '../../../lib/routes';
+import { useSelector } from '../../../redux/store';
+import SettingsHeader from '../..//SettingsHeader';
+import { AppNavigationHeader } from '../../';
+import { BackAction } from '../../KeyboardNavigation';
 import {
   ButtonStack,
   Footer,
@@ -19,16 +20,15 @@ import {
   SettingsContent,
   SettingsNavigationScrollbars,
   SettingsStack,
-} from './Layout';
-import { NavigationContainer } from './NavigationContainer';
-import { NavigationListItem } from './NavigationListItem';
-import SettingsHeader from './SettingsHeader';
+} from '../../Layout';
+import { NavigationContainer } from '../../NavigationContainer';
+import { NavigationListItem } from '../../NavigationListItem';
 
 export const StyledFlex = styled(Flex).attrs({ $flexDirection: 'column' })`
   gap: 1px;
 `;
 
-export default function Support() {
+export function SettingsView() {
   const history = useHistory();
 
   const loginState = useSelector((state) => state.account.status);
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/index.ts
new file mode 100644
index 0000000000..4877aa46c4
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/index.ts
@@ -0,0 +1 @@
+export * from './SettingsView';