Move common hooks to respective folders

21 files changed, 30 insertions, 26 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/beta-list-item/BetaListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/beta-list-item/BetaListItem.tsx
index aee5ebd82c..9dbbb0d566 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/beta-list-item/BetaListItem.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/beta-list-item/BetaListItem.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 
 import { messages } from '../../../../../../shared/gettext';
 import { ListItem } from '../../../../../lib/components/list-item';
+import { useSettingsShowBetaReleases, useVersionIsBeta } from '../../../../../redux/hooks';
 import Switch from '../../../../Switch';
-import { useSettingsShowBetaReleases, useVersionIsBeta } from '../../hooks';
 
 export function BetaListItem() {
   const { isBeta } = useVersionIsBeta();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/changelog-list-item/ChangelogListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/changelog-list-item/ChangelogListItem.tsx
index cc84da62c0..437cae4d37 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/changelog-list-item/ChangelogListItem.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/changelog-list-item/ChangelogListItem.tsx
@@ -1,7 +1,7 @@
 import { messages } from '../../../../../../shared/gettext';
+import { usePushChangelog } from '../../../../../history/hooks';
 import { Icon } from '../../../../../lib/components';
 import { ListItem } from '../../../../../lib/components/list-item';
-import { usePushChangelog } from '../../hooks';
 
 export function ChangelogListItem() {
   const pushChangelog = usePushChangelog();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/update-available-list-item/UpdateAvailableListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/update-available-list-item/UpdateAvailableListItem.tsx
index 0d15e9d037..698c71f24a 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/update-available-list-item/UpdateAvailableListItem.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/update-available-list-item/UpdateAvailableListItem.tsx
@@ -1,10 +1,11 @@
 import styled from 'styled-components';
 
 import { messages } from '../../../../../../shared/gettext';
+import { usePushAppUpgrade } from '../../../../../history/hooks';
 import { Flex, Icon } from '../../../../../lib/components';
 import { Dot } from '../../../../../lib/components/dot';
 import { ListItem } from '../../../../../lib/components/list-item';
-import { useConnectionIsBlocked, usePushAppUpgrade, useVersionSuggestedUpgrade } from '../../hooks';
+import { useConnectionIsBlocked, useVersionSuggestedUpgrade } from '../../../../../redux/hooks';
 
 const StyledText = styled(ListItem.Text)`
   margin-top: -4px;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/VersionListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/VersionListItem.tsx
index 7d49840c2b..5a20fcdd1b 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/VersionListItem.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/VersionListItem.tsx
@@ -2,7 +2,7 @@ import { messages } from '../../../../../../shared/gettext';
 import { Icon } from '../../../../../lib/components';
 import { ListItem } from '../../../../../lib/components/list-item';
 import { Colors } from '../../../../../lib/foundations';
-import { useVersionCurrent } from '../../hooks';
+import { useVersionCurrent } from '../../../../../redux/hooks';
 import { useShowAlert, useShowFooter } from './hooks';
 
 export function VersionListItem() {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/hooks/useShowAlert.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/hooks/useShowAlert.tsx
index 3351e7b378..36c9e32382 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/hooks/useShowAlert.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/hooks/useShowAlert.tsx
@@ -1,4 +1,4 @@
-import { useVersionConsistent } from '../../../hooks';
+import { useVersionConsistent } from '../../../../../../redux/hooks';
 
 export const useShowAlert = () => {
   const { consistent } = useVersionConsistent();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/hooks/useShowFooter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/hooks/useShowFooter.tsx
index 1020de875f..077648d705 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/hooks/useShowFooter.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/components/version-list-item/hooks/useShowFooter.tsx
@@ -1,4 +1,4 @@
-import { useVersionConsistent } from '../../../hooks';
+import { useVersionConsistent } from '../../../../../../redux/hooks';
 
 export const useShowFooter = () => {
   const { consistent } = useVersionConsistent();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/index.ts
index f22bb910ee..48285aaafb 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/index.ts
@@ -1,9 +1 @@
-export * from './useConnectionIsBlocked';
-export * from './usePushAppUpgrade';
-export * from './usePushChangelog';
-export * from './useSetttingsShowBetaReleases';
-export * from './useVersionConsistent';
-export * from './useVersionCurrent';
-export * from './useVersionIsBeta';
-export * from './useVersionSuggestedUpgrade';
 export * from './useShowUpdateAvailable';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useShowUpdateAvailable.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useShowUpdateAvailable.tsx
index 7ca3763a19..5cb4507a39 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useShowUpdateAvailable.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useShowUpdateAvailable.tsx
@@ -1,4 +1,4 @@
-import { useVersionSuggestedUpgrade } from './useVersionSuggestedUpgrade';
+import { useVersionSuggestedUpgrade } from '../../../../redux/version/hooks/useVersionSuggestedUpgrade';
 
 export const useShowUpdateAvailable = () => {
   const { suggestedUpgrade } = useVersionSuggestedUpgrade();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/history/hooks/index.ts b/desktop/packages/mullvad-vpn/src/renderer/history/hooks/index.ts
new file mode 100644
index 0000000000..973cc7b4c6
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/history/hooks/index.ts
@@ -0,0 +1,2 @@
+export * from './usePushAppUpgrade';
+export * from './usePushChangelog';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/usePushAppUpgrade.tsx b/desktop/packages/mullvad-vpn/src/renderer/history/hooks/usePushAppUpgrade.tsx
index ee09cdc539..7ae7ca8b2a 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/usePushAppUpgrade.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/history/hooks/usePushAppUpgrade.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { useHistory } from '../../../../lib/history';
-import { RoutePath } from '../../../../lib/routes';
+import { useHistory } from '../../lib/history';
+import { RoutePath } from '../../lib/routes';
 
 export const usePushAppUpgrade = () => {
   const history = useHistory();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/usePushChangelog.tsx b/desktop/packages/mullvad-vpn/src/renderer/history/hooks/usePushChangelog.tsx
index 3e87134c72..d1774fb7b7 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/usePushChangelog.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/history/hooks/usePushChangelog.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 
-import { useHistory } from '../../../../lib/history';
-import { RoutePath } from '../../../../lib/routes';
+import { useHistory } from '../../lib/history';
+import { RoutePath } from '../../lib/routes';
 
 export const usePushChangelog = () => {
   const history = useHistory();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/redux/connection/hooks/index.ts b/desktop/packages/mullvad-vpn/src/renderer/redux/connection/hooks/index.ts
new file mode 100644
index 0000000000..d302ed2c2c
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/connection/hooks/index.ts
@@ -0,0 +1 @@
+export * from './useConnectionIsBlocked';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useConnectionIsBlocked.tsx b/desktop/packages/mullvad-vpn/src/renderer/redux/connection/hooks/useConnectionIsBlocked.tsx
index e71b843b77..42345f9b70 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useConnectionIsBlocked.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/connection/hooks/useConnectionIsBlocked.tsx
@@ -1,4 +1,4 @@
-import { useSelector } from '../../../../redux/store';
+import { useSelector } from '../../store';
 
 export const useConnectionIsBlocked = () => {
   return { isBlocked: useSelector((state) => state.connection.isBlocked) };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/redux/hooks/index.ts b/desktop/packages/mullvad-vpn/src/renderer/redux/hooks/index.ts
new file mode 100644
index 0000000000..7e4dc3ccf9
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/hooks/index.ts
@@ -0,0 +1,3 @@
+export * from '../connection/hooks';
+export * from '../settings/hooks';
+export * from '../version/hooks';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/redux/settings/hooks/index.ts b/desktop/packages/mullvad-vpn/src/renderer/redux/settings/hooks/index.ts
new file mode 100644
index 0000000000..a64158b2c3
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/settings/hooks/index.ts
@@ -0,0 +1 @@
+export * from './useSettingsShowBetaReleases';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useSetttingsShowBetaReleases.tsx b/desktop/packages/mullvad-vpn/src/renderer/redux/settings/hooks/useSettingsShowBetaReleases.tsx
index 67ad99adbe..b7d83bd528 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useSetttingsShowBetaReleases.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/settings/hooks/useSettingsShowBetaReleases.tsx
@@ -1,5 +1,5 @@
-import { useAppContext } from '../../../../context';
-import { useSelector } from '../../../../redux/store';
+import { useAppContext } from '../../../context';
+import { useSelector } from '../../store';
 
 export const useSettingsShowBetaReleases = () => {
   const { setShowBetaReleases } = useAppContext();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/index.ts b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/index.ts
new file mode 100644
index 0000000000..64038d9d66
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/index.ts
@@ -0,0 +1,4 @@
+export * from './useVersionConsistent';
+export * from './useVersionCurrent';
+export * from './useVersionIsBeta';
+export * from './useVersionSuggestedUpgrade';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionConsistent.tsx b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/useVersionConsistent.tsx
index 1e13730cbc..64bd2972ef 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionConsistent.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/useVersionConsistent.tsx
@@ -1,4 +1,4 @@
-import { useSelector } from '../../../../redux/store';
+import { useSelector } from '../../store';
 
 export const useVersionConsistent = () => {
   return { consistent: useSelector((state) => state.version.consistent) };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionCurrent.tsx b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/useVersionCurrent.tsx
index ace1214d17..9b2d8a9430 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionCurrent.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/useVersionCurrent.tsx
@@ -1,4 +1,4 @@
-import { useSelector } from '../../../../redux/store';
+import { useSelector } from '../../store';
 
 export const useVersionCurrent = () => {
   return { current: useSelector((state) => state.version.current) };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionIsBeta.tsx b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/useVersionIsBeta.tsx
index 731e1d5464..a2aab53ffe 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionIsBeta.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/useVersionIsBeta.tsx
@@ -1,4 +1,4 @@
-import { useSelector } from '../../../../redux/store';
+import { useSelector } from '../../store';
 
 export const useVersionIsBeta = () => {
   return { isBeta: useSelector((state) => state.version.isBeta) };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionSuggestedUpgrade.tsx b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/useVersionSuggestedUpgrade.tsx
index c71dbe38be..1da590ea8f 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionSuggestedUpgrade.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/redux/version/hooks/useVersionSuggestedUpgrade.tsx
@@ -1,4 +1,4 @@
-import { useSelector } from '../../../../redux/store';
+import { useSelector } from '../../store';
 
 export const useVersionSuggestedUpgrade = () => {
   return { suggestedUpgrade: useSelector((state) => state.version.suggestedUpgrade) };