From 41d5b5c8b4a4b7d3ec010fe385db5bf520147255 Mon Sep 17 00:00:00 2001
From: Kurdistan Tech Ministry <info@pezkuwichain.io>
Date: Sat, 17 Jan 2026 02:42:19 +0300
Subject: [PATCH] Fix navigation: Use nested HomeStackNavigator for Home tab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- BottomTabNavigator uses HomeStackNavigator for Home tab
- HomeStackNavigator has all screens from Dashboard with headers
- SimpleHeader with back button for all screens except Dashboard
- Kurdish titles (Cîzdan, Nasname, Meclîs, Dadwerî, etc.)
- Bottom tabs stay visible when navigating from Dashboard
---
 mobile/src/navigation/BottomTabNavigator.tsx |   6 +-
 mobile/src/navigation/HomeStackNavigator.tsx | 108 +++++++++++++++++++
 2 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 mobile/src/navigation/HomeStackNavigator.tsx

diff --git a/mobile/src/navigation/BottomTabNavigator.tsx b/mobile/src/navigation/BottomTabNavigator.tsx
index 5559be49..4c20ce9d 100644
--- a/mobile/src/navigation/BottomTabNavigator.tsx
+++ b/mobile/src/navigation/BottomTabNavigator.tsx
@@ -7,11 +7,13 @@ import { KurdistanColors } from '../theme/colors';
 import { GradientHeader, SimpleHeader } from '../components/navigation/SharedHeader';
 
 // Screens
-import DashboardScreen from '../screens/DashboardScreen';
 import AppsScreen from '../screens/AppsScreen';
 import ReferralScreen from '../screens/ReferralScreen';
 import ProfileScreen from '../screens/ProfileScreen';
 
+// Nested Stack Navigator for Home tab
+import HomeStackNavigator from './HomeStackNavigator';
+
 // Removed screens from tabs (accessible via Dashboard/Apps):
 // WalletScreen, SwapScreen, P2PScreen, EducationScreen, ForumScreen
 
@@ -63,7 +65,7 @@ const BottomTabNavigator: React.FC = () => {
     >
       <Tab.Screen
         name="Home"
-        component={DashboardScreen}
+        component={HomeStackNavigator}
         options={{
           headerShown: false,
           tabBarLabel: 'Home',
diff --git a/mobile/src/navigation/HomeStackNavigator.tsx b/mobile/src/navigation/HomeStackNavigator.tsx
new file mode 100644
index 00000000..51d4fe5f
--- /dev/null
+++ b/mobile/src/navigation/HomeStackNavigator.tsx
@@ -0,0 +1,108 @@
+import React from 'react';
+import { createStackNavigator } from '@react-navigation/stack';
+import { SimpleHeader } from '../components/navigation/SharedHeader';
+
+// Screens
+import DashboardScreen from '../screens/DashboardScreen';
+import WalletScreen from '../screens/WalletScreen';
+import WalletSetupScreen from '../screens/WalletSetupScreen';
+import SwapScreen from '../screens/SwapScreen';
+import P2PScreen from '../screens/P2PScreen';
+import B2BScreen from '../screens/B2BScreen';
+import TaxZekatScreen from '../screens/TaxZekatScreen';
+import LaunchpadScreen from '../screens/LaunchpadScreen';
+import PresidentScreen from '../screens/PresidentScreen';
+import VoteScreen from '../screens/VoteScreen';
+import ValidatorsScreen from '../screens/ValidatorsScreen';
+import ProposalsScreen from '../screens/ProposalsScreen';
+import IdentityScreen from '../screens/IdentityScreen';
+import ForumScreen from '../screens/ForumScreen';
+import KurdMediaScreen from '../screens/KurdMediaScreen';
+import PerwerdeScreen from '../screens/PerwerdeScreen';
+import BankScreen from '../screens/BankScreen';
+import AssemblyScreen from '../screens/AssemblyScreen';
+import JusticeScreen from '../screens/JusticeScreen';
+import PollsScreen from '../screens/PollsScreen';
+import WhatsKURDScreen from '../screens/WhatsKURDScreen';
+import EventsScreen from '../screens/EventsScreen';
+import HelpScreen from '../screens/HelpScreen';
+import MusicScreen from '../screens/MusicScreen';
+import VPNScreen from '../screens/VPNScreen';
+import UniversityScreen from '../screens/UniversityScreen';
+import CertificatesScreen from '../screens/CertificatesScreen';
+import ResearchScreen from '../screens/ResearchScreen';
+
+export type HomeStackParamList = {
+  Dashboard: undefined;
+  Wallet: undefined;
+  WalletSetup: undefined;
+  Swap: undefined;
+  P2P: undefined;
+  B2B: undefined;
+  TaxZekat: undefined;
+  Launchpad: undefined;
+  President: undefined;
+  Vote: undefined;
+  Validators: undefined;
+  Proposals: undefined;
+  Identity: undefined;
+  Forum: undefined;
+  KurdMedia: undefined;
+  Perwerde: undefined;
+  Bank: undefined;
+  Assembly: undefined;
+  Justice: undefined;
+  Polls: undefined;
+  WhatsKURD: undefined;
+  Events: undefined;
+  Help: undefined;
+  Music: undefined;
+  VPN: undefined;
+  University: undefined;
+  Certificates: undefined;
+  Research: undefined;
+};
+
+const Stack = createStackNavigator<HomeStackParamList>();
+
+const HomeStackNavigator: React.FC = () => {
+  return (
+    <Stack.Navigator
+      screenOptions={{
+        headerShown: true,
+        header: (props) => <SimpleHeader {...props} />,
+      }}
+    >
+      <Stack.Screen name="Dashboard" component={DashboardScreen} options={{ headerShown: false }} />
+      <Stack.Screen name="Wallet" component={WalletScreen} options={{ headerTitle: 'Cîzdan / Wallet' }} />
+      <Stack.Screen name="WalletSetup" component={WalletSetupScreen} options={{ headerTitle: 'Cîzdan Saz Bike' }} />
+      <Stack.Screen name="Swap" component={SwapScreen} options={{ headerTitle: 'Swap' }} />
+      <Stack.Screen name="P2P" component={P2PScreen} options={{ headerTitle: 'P2P Bazirganî' }} />
+      <Stack.Screen name="B2B" component={B2BScreen} options={{ headerTitle: 'B2B Bazara' }} />
+      <Stack.Screen name="TaxZekat" component={TaxZekatScreen} options={{ headerTitle: 'Bac & Zekat' }} />
+      <Stack.Screen name="Launchpad" component={LaunchpadScreen} options={{ headerTitle: 'Launchpad' }} />
+      <Stack.Screen name="President" component={PresidentScreen} options={{ headerTitle: 'Serok' }} />
+      <Stack.Screen name="Vote" component={VoteScreen} options={{ headerTitle: 'Deng' }} />
+      <Stack.Screen name="Validators" component={ValidatorsScreen} options={{ headerTitle: 'Validators' }} />
+      <Stack.Screen name="Proposals" component={ProposalsScreen} options={{ headerTitle: 'Pêşniyar' }} />
+      <Stack.Screen name="Identity" component={IdentityScreen} options={{ headerTitle: 'Nasname' }} />
+      <Stack.Screen name="Forum" component={ForumScreen} options={{ headerTitle: 'Forum' }} />
+      <Stack.Screen name="KurdMedia" component={KurdMediaScreen} options={{ headerTitle: 'KurdMedia' }} />
+      <Stack.Screen name="Perwerde" component={PerwerdeScreen} options={{ headerTitle: 'Perwerde' }} />
+      <Stack.Screen name="Bank" component={BankScreen} options={{ headerTitle: 'Bank' }} />
+      <Stack.Screen name="Assembly" component={AssemblyScreen} options={{ headerTitle: 'Meclîs' }} />
+      <Stack.Screen name="Justice" component={JusticeScreen} options={{ headerTitle: 'Dadwerî' }} />
+      <Stack.Screen name="Polls" component={PollsScreen} options={{ headerTitle: 'Rapirsî' }} />
+      <Stack.Screen name="WhatsKURD" component={WhatsKURDScreen} options={{ headerTitle: 'whatsKURD' }} />
+      <Stack.Screen name="Events" component={EventsScreen} options={{ headerTitle: 'Çalakî' }} />
+      <Stack.Screen name="Help" component={HelpScreen} options={{ headerTitle: 'Arîkarî' }} />
+      <Stack.Screen name="Music" component={MusicScreen} options={{ headerTitle: 'Muzîk' }} />
+      <Stack.Screen name="VPN" component={VPNScreen} options={{ headerTitle: 'VPN' }} />
+      <Stack.Screen name="University" component={UniversityScreen} options={{ headerTitle: 'Zanîngehî' }} />
+      <Stack.Screen name="Certificates" component={CertificatesScreen} options={{ headerTitle: 'Sertîfîka' }} />
+      <Stack.Screen name="Research" component={ResearchScreen} options={{ headerTitle: 'Lêkolîn' }} />
+    </Stack.Navigator>
+  );
+};
+
+export default HomeStackNavigator;