From dc9de97de3318df57bbe327d05d88a7e0a72087f Mon Sep 17 00:00:00 2001
From: Kurdistan Tech Ministry <info@pezkuwichain.io>
Date: Sat, 17 Jan 2026 03:40:28 +0300
Subject: [PATCH] Remove duplicate back buttons from all Dashboard screens

---
 mobile/src/screens/B2BScreen.tsx         | 17 ++---------
 mobile/src/screens/IdentityScreen.tsx    | 14 ---------
 mobile/src/screens/KurdMediaScreen.tsx   |  6 ----
 mobile/src/screens/LaunchpadScreen.tsx   | 21 ++-----------
 mobile/src/screens/PerwerdeScreen.tsx    |  6 ----
 mobile/src/screens/PresidentScreen.tsx   | 10 -------
 mobile/src/screens/ProposalsScreen.tsx   |  6 ----
 mobile/src/screens/SettingsScreen.tsx    |  4 +--
 mobile/src/screens/SwapScreen.tsx        | 18 ++---------
 mobile/src/screens/TaxZekatScreen.tsx    | 38 ++----------------------
 mobile/src/screens/ValidatorsScreen.tsx  |  6 ----
 mobile/src/screens/VoteScreen.tsx        |  6 ----
 mobile/src/screens/WalletScreen.tsx      |  5 +---
 mobile/src/screens/WalletSetupScreen.tsx |  4 +--
 14 files changed, 13 insertions(+), 148 deletions(-)

diff --git a/mobile/src/screens/B2BScreen.tsx b/mobile/src/screens/B2BScreen.tsx
index 02fe68a6..fffc71df 100644
--- a/mobile/src/screens/B2BScreen.tsx
+++ b/mobile/src/screens/B2BScreen.tsx
@@ -434,14 +434,11 @@ const B2BScreen: React.FC = () => {
   );
 
   return (
-    <SafeAreaView style={styles.container}>
+    <View style={styles.container}>
       <StatusBar barStyle="dark-content" />
 
-      {/* Header */}
+      {/* Action Bar */}
       <View style={styles.header}>
-        <TouchableOpacity onPress={() => navigation.goBack()} style={styles.backButton}>
-          <Text style={styles.backButtonText}>← Paş</Text>
-        </TouchableOpacity>
         <View>
           <Text style={styles.headerTitle}>B2B Bazirganî</Text>
           <Text style={styles.headerSubtitle}>Kurdish Business Marketplace</Text>
@@ -830,7 +827,7 @@ const B2BScreen: React.FC = () => {
           </View>
         </View>
       </Modal>
-    </SafeAreaView>
+    </View>
   );
 };
 
@@ -849,14 +846,6 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderBottomColor: '#E0E0E0',
   },
-  backButton: {
-    padding: 4,
-  },
-  backButtonText: {
-    fontSize: 16,
-    color: KurdistanColors.kesk,
-    fontWeight: '600',
-  },
   headerTitle: {
     fontSize: 20,
     fontWeight: 'bold',
diff --git a/mobile/src/screens/IdentityScreen.tsx b/mobile/src/screens/IdentityScreen.tsx
index cea74d84..b31b04f0 100644
--- a/mobile/src/screens/IdentityScreen.tsx
+++ b/mobile/src/screens/IdentityScreen.tsx
@@ -132,12 +132,6 @@ const IdentityScreen: React.FC = () => {
             >
               <Text style={styles.connectButtonText}>Connect Wallet</Text>
             </TouchableOpacity>
-            <TouchableOpacity
-              style={styles.backButton}
-              onPress={() => navigation.goBack()}
-            >
-              <Text style={styles.backButtonText}>← Go Back</Text>
-            </TouchableOpacity>
           </View>
         </LinearGradient>
       </SafeAreaView>
@@ -155,10 +149,6 @@ const IdentityScreen: React.FC = () => {
           end={{ x: 1, y: 1 }}
           style={styles.choiceContainer}
         >
-          <TouchableOpacity onPress={() => navigation.goBack()} style={styles.choiceBackButton}>
-            <Text style={styles.choiceBackText}>← Back</Text>
-          </TouchableOpacity>
-
           <View style={styles.choiceContent}>
             <Text style={styles.choiceIcon}>🆔</Text>
             <Text style={styles.choiceTitle}>Nasnameya Dîjîtal</Text>
@@ -208,10 +198,6 @@ const IdentityScreen: React.FC = () => {
         colors={[KurdistanColors.kesk, '#006633']}
         style={styles.header}
       >
-        <TouchableOpacity onPress={() => setUserChoice(null)} style={styles.headerBackButton}>
-          <Text style={styles.headerBackText}>←</Text>
-        </TouchableOpacity>
-
         <View style={styles.headerContent}>
           <Text style={styles.headerIcon}>🆔</Text>
           <Text style={styles.headerTitle}>Nasnameya Dîjîtal</Text>
diff --git a/mobile/src/screens/KurdMediaScreen.tsx b/mobile/src/screens/KurdMediaScreen.tsx
index 1b8ec031..a630d82a 100644
--- a/mobile/src/screens/KurdMediaScreen.tsx
+++ b/mobile/src/screens/KurdMediaScreen.tsx
@@ -214,12 +214,6 @@ const KurdMediaScreen: React.FC = () => {
         end={{ x: 1, y: 1 }}
         style={styles.header}
       >
-        <TouchableOpacity
-          style={styles.backButton}
-          onPress={() => navigation.goBack()}
-        >
-          <Text style={styles.backButtonText}>←</Text>
-        </TouchableOpacity>
         <View style={styles.headerContent}>
           <Text style={styles.headerTitle}>KurdMedia</Text>
           <Text style={styles.headerSubtitle}>Medyaya Kurdî & Piştgirî</Text>
diff --git a/mobile/src/screens/LaunchpadScreen.tsx b/mobile/src/screens/LaunchpadScreen.tsx
index 8bac46a2..290563fb 100644
--- a/mobile/src/screens/LaunchpadScreen.tsx
+++ b/mobile/src/screens/LaunchpadScreen.tsx
@@ -526,14 +526,11 @@ const LaunchpadScreen: React.FC = () => {
   }
 
   return (
-    <SafeAreaView style={styles.container}>
+    <View style={styles.container}>
       <StatusBar barStyle="dark-content" backgroundColor="#F8F9FA" />
 
-      {/* Header */}
+      {/* Action Bar */}
       <View style={styles.header}>
-        <TouchableOpacity onPress={() => navigation.goBack()} style={styles.backButton}>
-          <Text style={styles.backIcon}>←</Text>
-        </TouchableOpacity>
         <View style={styles.headerContent}>
           <Text style={styles.headerTitle}>🚀 Launchpad</Text>
           <Text style={styles.headerSubtitle}>Multi-Presale Platform</Text>
@@ -746,7 +743,7 @@ const LaunchpadScreen: React.FC = () => {
           </SafeAreaView>
         )}
       </Modal>
-    </SafeAreaView>
+    </View>
   );
 };
 
@@ -774,18 +771,6 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderBottomColor: '#E0E0E0',
   },
-  backButton: {
-    width: 40,
-    height: 40,
-    borderRadius: 20,
-    backgroundColor: '#F0F0F0',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  backIcon: {
-    fontSize: 20,
-    color: '#333',
-  },
   headerContent: {
     flex: 1,
     marginLeft: 12,
diff --git a/mobile/src/screens/PerwerdeScreen.tsx b/mobile/src/screens/PerwerdeScreen.tsx
index cb9f6815..0ba88ff0 100644
--- a/mobile/src/screens/PerwerdeScreen.tsx
+++ b/mobile/src/screens/PerwerdeScreen.tsx
@@ -369,12 +369,6 @@ const PerwerdeScreen: React.FC = () => {
         end={{ x: 1, y: 1 }}
         style={styles.header}
       >
-        <TouchableOpacity
-          style={styles.backButton}
-          onPress={() => navigation.goBack()}
-        >
-          <Text style={styles.backButtonText}>←</Text>
-        </TouchableOpacity>
         <View style={styles.headerContent}>
           <Text style={styles.headerTitle}>Perwerde</Text>
           <Text style={styles.headerSubtitle}>Platforma Perwerdehiya Dijîtal</Text>
diff --git a/mobile/src/screens/PresidentScreen.tsx b/mobile/src/screens/PresidentScreen.tsx
index e280d226..8b4cf89a 100644
--- a/mobile/src/screens/PresidentScreen.tsx
+++ b/mobile/src/screens/PresidentScreen.tsx
@@ -343,12 +343,6 @@ const PresidentScreen: React.FC = () => {
               <Text style={styles.becomeCitizenButtonText}>Become a Citizen</Text>
             </TouchableOpacity>
 
-            <TouchableOpacity
-              style={styles.backButton}
-              onPress={() => navigation.goBack()}
-            >
-              <Text style={styles.backButtonText}>← Go Back</Text>
-            </TouchableOpacity>
           </View>
         </LinearGradient>
       </SafeAreaView>
@@ -365,10 +359,6 @@ const PresidentScreen: React.FC = () => {
         colors={[KurdistanColors.kesk, '#006633']}
         style={styles.header}
       >
-        <TouchableOpacity onPress={() => navigation.goBack()} style={styles.headerBackButton}>
-          <Text style={styles.headerBackText}>←</Text>
-        </TouchableOpacity>
-
         <View style={styles.headerContent}>
           <Text style={styles.headerIcon}>👑</Text>
           <Text style={styles.headerTitle}>Serokî / President</Text>
diff --git a/mobile/src/screens/ProposalsScreen.tsx b/mobile/src/screens/ProposalsScreen.tsx
index 50a09fc7..a17b35d0 100644
--- a/mobile/src/screens/ProposalsScreen.tsx
+++ b/mobile/src/screens/ProposalsScreen.tsx
@@ -93,12 +93,6 @@ const ProposalsScreen: React.FC = () => {
               <Text style={styles.becomeCitizenButtonText}>Become a Citizen</Text>
             </TouchableOpacity>
 
-            <TouchableOpacity
-              style={styles.backButton}
-              onPress={() => navigation.goBack()}
-            >
-              <Text style={styles.backButtonText}>← Go Back</Text>
-            </TouchableOpacity>
           </View>
         </LinearGradient>
       </SafeAreaView>
diff --git a/mobile/src/screens/SettingsScreen.tsx b/mobile/src/screens/SettingsScreen.tsx
index e6d368b9..86eb61ea 100644
--- a/mobile/src/screens/SettingsScreen.tsx
+++ b/mobile/src/screens/SettingsScreen.tsx
@@ -348,9 +348,7 @@ const SettingsScreen: React.FC = () => {
 
       {/* Header */}
       <View style={[styles.header, { backgroundColor: colors.surface, borderBottomColor: colors.border }]}>
-        <TouchableOpacity onPress={() => navigation.goBack()} style={styles.backButton}>
-          <Text style={styles.backButtonText}>←</Text>
-        </TouchableOpacity>
+        <View style={{ width: 40 }} />
         <Text style={[styles.headerTitle, { color: colors.text }]}>Settings</Text>
         <View style={{ width: 40 }} />
       </View>
diff --git a/mobile/src/screens/SwapScreen.tsx b/mobile/src/screens/SwapScreen.tsx
index 8923d61f..8685d8f5 100644
--- a/mobile/src/screens/SwapScreen.tsx
+++ b/mobile/src/screens/SwapScreen.tsx
@@ -472,11 +472,9 @@ const SwapScreen: React.FC = () => {
       )}
 
       <ScrollView style={styles.scrollContent} contentContainerStyle={styles.scrollContentContainer}>
-        {/* Header */}
+        {/* Settings Button */}
         <View style={styles.header}>
-          <TouchableOpacity onPress={() => navigation.goBack()} style={styles.backButton}>
-            <Text style={styles.backButtonText}>←</Text>
-          </TouchableOpacity>
+          <View style={{width: 40}} />
           <Text style={styles.headerTitle}>Swap Tokens</Text>
           <TouchableOpacity onPress={() => setShowSettings(true)} style={styles.settingsButton}>
             <Text style={styles.settingsIcon}>⚙️</Text>
@@ -717,18 +715,6 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     marginBottom: 20,
   },
-  backButton: {
-    width: 40,
-    height: 40,
-    borderRadius: 20,
-    backgroundColor: '#F5F5F5',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  backButtonText: {
-    fontSize: 24,
-    color: '#333',
-  },
   headerTitle: {
     fontSize: 20,
     fontWeight: 'bold',
diff --git a/mobile/src/screens/TaxZekatScreen.tsx b/mobile/src/screens/TaxZekatScreen.tsx
index 1e8dcb7e..86fba800 100644
--- a/mobile/src/screens/TaxZekatScreen.tsx
+++ b/mobile/src/screens/TaxZekatScreen.tsx
@@ -214,18 +214,9 @@ const TaxZekatScreen: React.FC = () => {
   );
 
   return (
-    <SafeAreaView style={styles.container}>
+    <View style={styles.container}>
       <StatusBar barStyle="dark-content" />
 
-      {/* Header */}
-      <View style={styles.header}>
-        <TouchableOpacity onPress={() => navigation.goBack()} style={styles.backButton}>
-          <Text style={styles.backButtonText}>← Paş</Text>
-        </TouchableOpacity>
-        <Text style={styles.headerTitle}>Bac û Zekat</Text>
-        <Text style={styles.headerSubtitle}>Tax & Zekat</Text>
-      </View>
-
       <ScrollView style={styles.content} showsVerticalScrollIndicator={false}>
         {/* Description */}
         <View style={styles.descriptionBox}>
@@ -460,7 +451,7 @@ const TaxZekatScreen: React.FC = () => {
           </View>
         </View>
       </Modal>
-    </SafeAreaView>
+    </View>
   );
 };
 
@@ -469,31 +460,6 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: '#F5F5F5',
   },
-  header: {
-    backgroundColor: KurdistanColors.spi,
-    paddingHorizontal: 20,
-    paddingVertical: 16,
-    borderBottomWidth: 1,
-    borderBottomColor: '#E0E0E0',
-  },
-  backButton: {
-    marginBottom: 8,
-  },
-  backButtonText: {
-    fontSize: 16,
-    color: KurdistanColors.kesk,
-    fontWeight: '600',
-  },
-  headerTitle: {
-    fontSize: 24,
-    fontWeight: 'bold',
-    color: KurdistanColors.reş,
-  },
-  headerSubtitle: {
-    fontSize: 14,
-    color: '#666',
-    marginTop: 2,
-  },
   content: {
     flex: 1,
     padding: 16,
diff --git a/mobile/src/screens/ValidatorsScreen.tsx b/mobile/src/screens/ValidatorsScreen.tsx
index 920d3426..f86ef2fd 100644
--- a/mobile/src/screens/ValidatorsScreen.tsx
+++ b/mobile/src/screens/ValidatorsScreen.tsx
@@ -93,12 +93,6 @@ const ValidatorsScreen: React.FC = () => {
               <Text style={styles.becomeCitizenButtonText}>Become a Citizen</Text>
             </TouchableOpacity>
 
-            <TouchableOpacity
-              style={styles.backButton}
-              onPress={() => navigation.goBack()}
-            >
-              <Text style={styles.backButtonText}>← Go Back</Text>
-            </TouchableOpacity>
           </View>
         </LinearGradient>
       </SafeAreaView>
diff --git a/mobile/src/screens/VoteScreen.tsx b/mobile/src/screens/VoteScreen.tsx
index 8464e7d3..6eef595a 100644
--- a/mobile/src/screens/VoteScreen.tsx
+++ b/mobile/src/screens/VoteScreen.tsx
@@ -93,12 +93,6 @@ const VoteScreen: React.FC = () => {
               <Text style={styles.becomeCitizenButtonText}>Become a Citizen</Text>
             </TouchableOpacity>
 
-            <TouchableOpacity
-              style={styles.backButton}
-              onPress={() => navigation.goBack()}
-            >
-              <Text style={styles.backButtonText}>← Go Back</Text>
-            </TouchableOpacity>
           </View>
         </LinearGradient>
       </SafeAreaView>
diff --git a/mobile/src/screens/WalletScreen.tsx b/mobile/src/screens/WalletScreen.tsx
index b2fb5703..5db0ea68 100644
--- a/mobile/src/screens/WalletScreen.tsx
+++ b/mobile/src/screens/WalletScreen.tsx
@@ -654,11 +654,8 @@ const WalletScreen: React.FC = () => {
     <SafeAreaView style={styles.container} testID="wallet-screen">
       <StatusBar barStyle="dark-content" />
 
-      {/* Top Header with Back Button */}
+      {/* Top Header */}
       <View style={styles.topHeader} testID="wallet-top-header">
-        <TouchableOpacity onPress={() => navigation.goBack()} style={styles.backButton} testID="wallet-back-button">
-          <Text style={styles.backButtonText}>← Back</Text>
-        </TouchableOpacity>
         <Text style={styles.topHeaderTitle}>Wallet</Text>
         <TouchableOpacity onPress={() => setNetworkSelectorVisible(true)} testID="wallet-network-button">
           <Text style={styles.networkBadge}>🌐 {NETWORKS[currentNetwork].displayName}</Text>
diff --git a/mobile/src/screens/WalletSetupScreen.tsx b/mobile/src/screens/WalletSetupScreen.tsx
index d8ee1bce..3f98fdfd 100644
--- a/mobile/src/screens/WalletSetupScreen.tsx
+++ b/mobile/src/screens/WalletSetupScreen.tsx
@@ -484,9 +484,7 @@ const WalletSetupScreen: React.FC = () => {
       {/* Header */}
       {step !== 'choice' && step !== 'success' && (
         <View style={styles.header}>
-          <TouchableOpacity onPress={handleBack} style={styles.backButton} testID="wallet-setup-back">
-            <Text style={styles.backButtonText}>← Back</Text>
-          </TouchableOpacity>
+          <View style={{width: 60}} />
           <View style={styles.progressContainer}>
             {['create-show', 'create-verify', 'wallet-name'].includes(step) && isCreateFlow && (
               <>