Context Improvements + Hooks dir

apps/router/src/components/Header.tsx

@@ -3,7 +3,7 @@ import { Flex, Text } from '@chakra-ui/react';
 import { Logo } from './Logo';
 import { ServiceMenu } from './ServiceMenu';
 import { useActiveService } from '../hooks';
-import { useAppContext } from '../context/hooks';
+import { useAppContext } from '../hooks';
 
 export const Header = React.memo(function Header() {
   const { guardians, gateways } = useAppContext();

apps/router/src/context/gateway/GatewayContext.tsx

@@ -5,13 +5,15 @@ import React, {
   useMemo,
   useReducer,
 } from 'react';
-import { useGatewayConfig } from '../hooks';
+import { useGatewayConfig } from '../../hooks';
 import { GatewayApi } from '../../api/GatewayApi';
 import {
   GATEWAY_APP_ACTION_TYPE,
   GatewayAppAction,
   GatewayAppState,
   GatewayStatus,
+  WalletModalAction,
+  WalletModalType,
 } from '../../types/gateway';
 import { useLocation } from 'react-router-dom';
 
@@ -29,6 +31,15 @@ const initialState: GatewayAppState = {
   balances: null,
   gatewayInfo: null,
   unit: 'msats',
+  showConnectFed: false,
+  walletModalState: {
+    isOpen: false,
+    action: WalletModalAction.Receive,
+    type: WalletModalType.Onchain,
+    selectedFederation: null,
+    showSelector: true,
+  },
+  activeTab: 0,
 };
 
 const reducer = (
@@ -48,6 +59,12 @@ const reducer = (
       return { ...state, gatewayInfo: action.payload };
     case GATEWAY_APP_ACTION_TYPE.SET_UNIT:
       return { ...state, unit: action.payload };
+    case GATEWAY_APP_ACTION_TYPE.SET_SHOW_CONNECT_FED:
+      return { ...state, showConnectFed: action.payload };
+    case GATEWAY_APP_ACTION_TYPE.SET_WALLET_MODAL_STATE:
+      return { ...state, walletModalState: { ...state.walletModalState, ...action.payload } };
+    case GATEWAY_APP_ACTION_TYPE.SET_ACTIVE_TAB:
+      return { ...state, activeTab: action.payload };
     default:
       return state;
   }

apps/router/src/context/guardian/AdminContext.tsx

@@ -1,6 +1,5 @@
 import React, { createContext, ReactNode } from 'react';
-// import { AdminApiInterface } from '../guardian-ui/GuardianApi';
-import { useGuardianStatus } from '../hooks';
+import { useGuardianStatus } from '../../hooks';
 import { GuardianStatus } from '../../types/guardian';
 
 // export interface AdminContextValue {}

apps/router/src/context/guardian/GuardianContext.tsx

@@ -12,7 +12,7 @@ import {
   GuardianAppState,
   GuardianStatus,
 } from '../../types/guardian';
-import { useGuardianConfig } from '../hooks';
+import { useGuardianConfig } from '../../hooks';
 import { useLocation } from 'react-router-dom';
 
 export interface GuardianContextValue {

apps/router/src/context/guardian/SetupContext.tsx

@@ -11,11 +11,11 @@ import { randomNames } from '../../guardian-ui/setup/randomNames';
 import {
   FollowerConfigs,
   HostConfigs,
-  useGuardianContext,
+  useGuardianApi,
   useHandleBackgroundGuardianSetupActions,
   useHandleSetupServerStatus,
   useUpdateLocalStorageOnSetupStateChange,
-} from '../hooks';
+} from '../../hooks';
 
 export const LOCAL_STORAGE_SETUP_KEY = 'setup-guardian-ui-state';
 
@@ -123,7 +123,7 @@ export const SetupContextProvider: React.FC<SetupContextProviderProps> = ({
   initServerStatus,
   children,
 }: SetupContextProviderProps) => {
-  const { api } = useGuardianContext();
+  const api = useGuardianApi();
   const [state, dispatch] = useReducer(reducer, {
     ...initialState,
     password: api.getPassword() || initialState.password,