Fix

Author: 22388o

src/navigation/ZKMarket.tsx

@@ -1,21 +1,19 @@
 import * as React from 'react';
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import { useConnectionContext } from '../providers/ConnectionProvider';
+import { Splash } from '../components/Splash';
+import { SCREEN_NAMES } from './screenNames';
+
+// Screen Imports
 import OnBoardingHome from '../screens/Onboarding/OnBoardingHome';
 import CreateWallet from '../screens/Onboarding/CreateWallet';
-import { SCREEN_NAMES } from './screenNames';  // Ensure this import is correct
 import ConfirmSeed from '../screens/Onboarding/ConfirmSeed';
 import PinSetup from '../screens/Onboarding/PinSetup';
 import ConfirmPin from '../screens/Onboarding/ConfirmPin';
 import Dashboard from '../screens/Home/Dashboard';
-import { useConnectionContext } from '../providers/ConnectionProvider';
-import { Splash } from '../components/Splash';
 import VerifyPin from '../screens/Home/VerifyPin';
-import Dashboard from '../screens/Home/Dashboard';
-import { useConnectionContext } from '../providers/ConnectionProvider';
-import { Splash } from '../components/Splash';
-import VerifyPin from '../screens/Home/VerifyPin';
-import ZKPoolEnter from '../navigation/ZKPoolEnter';  // New screen for ZK pool entry
-import ZKPoolExit from '../navigation/ZKPoolExit';    // New screen for ZK pool exit
+import ZKPoolEnter from './ZKPoolEnter'; // Adjusted path if needed
+import ZKPoolExit from './ZKPoolExit';   // Adjusted path if needed
 
 export type RootStackParamList = {
   OnboardingHome: undefined;
@@ -25,78 +23,68 @@ export type RootStackParamList = {
   ConfirmPin: { words: string[]; walletPin: number[] };
   Dashboard: undefined;
   VerifyPin: undefined;
-  ZKPoolEnter: undefined;  // New route for entering ZK pool
-  ZKPoolExit: undefined;   // New route for exiting ZK pool
+  ZKPoolEnter: undefined;
+  ZKPoolExit: undefined;
 };
 
 const Stack = createNativeStackNavigator<RootStackParamList>();
 
-function OnBoardingNavigation() {
+const OnBoardingNavigation = () => {
   const { loading, isWalletConnected } = useConnectionContext();
-  
+
   if (loading) {
     return <Splash />;
   }
 
   return (
-    <Stack.Navigator>
+    <Stack.Navigator screenOptions={{ headerShown: false }}>
+      {/* Authenticated User Flow */}
       {isWalletConnected ? (
         <Stack.Group>
-          {/* Verify Pin and Dashboard for authenticated users */}
           <Stack.Screen
-            options={{ headerShown: false }}
             name={SCREEN_NAMES.VerifyPin}
             component={VerifyPin}
           />
           <Stack.Screen
-            options={{ headerShown: false }}
             name={SCREEN_NAMES.Dashboard}
             component={Dashboard}
           />
+          <Stack.Screen
+            name={SCREEN_NAMES.ZKPoolEnter}
+            component={ZKPoolEnter}
+          />
+          <Stack.Screen
+            name={SCREEN_NAMES.ZKPoolExit}
+            component={ZKPoolExit}
+          />
         </Stack.Group>
       ) : (
+        /* Onboarding Flow for New Users */
         <Stack.Group>
-          {/* Onboarding screens for users without a wallet */}
           <Stack.Screen
-            options={{ headerShown: false }}
             name={SCREEN_NAMES.OnboardingHome}
             component={OnBoardingHome}
           />
           <Stack.Screen
-            options={{ headerShown: false }}
             name={SCREEN_NAMES.CreateWallet}
             component={CreateWallet}
           />
           <Stack.Screen
-            options={{ headerShown: false }}
             name={SCREEN_NAMES.ConfirmSeed}
             component={ConfirmSeed}
           />
           <Stack.Screen
-            options={{ headerShown: false }}
             name={SCREEN_NAMES.PinSetup}
             component={PinSetup}
           />
           <Stack.Screen
-            options={{ headerShown: false }}
             name={SCREEN_NAMES.ConfirmPin}
             component={ConfirmPin}
           />
         </Stack.Group>
       )}
-      {/* ZK Pool Entry and Exit Screens, common to both authenticated and unauthenticated users */}
-      <Stack.Screen
-        options={{ headerShown: false }}
-        name={SCREEN_NAMES.ZKPoolEnter}
-        component={ZKPoolEnter}
-      />
-      <Stack.Screen
-        options={{ headerShown: false }}
-        name={SCREEN_NAMES.ZKPoolExit}
-        component={ZKPoolExit}
-      />
     </Stack.Navigator>
   );
-}
+};
 
 export default OnBoardingNavigation;