Move common hooks to respective folders

Author: olmoh

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();

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();

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;

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() {

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();

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();

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';

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();

desktop/packages/mullvad-vpn/src/renderer/history/hooks/index.ts

@@ -0,0 +1,2 @@
+export * from './usePushAppUpgrade';
+export * from './usePushChangelog';

desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/usePushAppUpgrade.tsx renamed to 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();

desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/usePushChangelog.tsx renamed to 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();

desktop/packages/mullvad-vpn/src/renderer/redux/connection/hooks/index.ts

@@ -0,0 +1 @@
+export * from './useConnectionIsBlocked';

desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useConnectionIsBlocked.tsx renamed to 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) };

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';

desktop/packages/mullvad-vpn/src/renderer/redux/settings/hooks/index.ts

@@ -0,0 +1 @@
+export * from './useSettingsShowBetaReleases';

desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useSetttingsShowBetaReleases.tsx renamed to 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();

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';

desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionConsistent.tsx renamed to 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) };

desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionCurrent.tsx renamed to 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) };

desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionIsBeta.tsx renamed to 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) };

desktop/packages/mullvad-vpn/src/renderer/components/views/app-info/hooks/useVersionSuggestedUpgrade.tsx renamed to 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) };