From dc4bef93c16047b7e8ff0c0c7618c9f3e1182090 Mon Sep 17 00:00:00 2001
From: Nurmuhammet Allanov <nurmuhammet@mail.com>
Date: Tue, 15 Jul 2025 10:20:14 +0500
Subject: [PATCH] fix scroll

---
 src/navigation/MainNavigator.js |  5 +--
 src/navigation/MenuNavigator.js | 55 +++++++++++++++++----------------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/navigation/MainNavigator.js b/src/navigation/MainNavigator.js
index 070c03a..4824110 100644
--- a/src/navigation/MainNavigator.js
+++ b/src/navigation/MainNavigator.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
 import { Ionicons } from '@expo/vector-icons';
 import { COLORS } from '../constants/colors';
+import { View, ActivityIndicator, Platform } from 'react-native';
 
 import HomeScreen from '../screens/Main/HomeScreen';
 import MenuNavigator from './MenuNavigator';
@@ -33,9 +34,9 @@ const MainNavigator = () => {
           backgroundColor: COLORS.white,
           borderTopWidth: 1,
           borderTopColor: COLORS.gray[200],
-          paddingBottom: 8,
+          paddingBottom: Platform.OS === 'android' ? 16 : 8,
           paddingTop: 8,
-          height: 88,
+          height: Platform.OS === 'android' ? 96 : 88,
         },
         tabBarLabelStyle: {
           fontSize: 12,
diff --git a/src/navigation/MenuNavigator.js b/src/navigation/MenuNavigator.js
index 33c3b62..5abd173 100644
--- a/src/navigation/MenuNavigator.js
+++ b/src/navigation/MenuNavigator.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { createStackNavigator } from '@react-navigation/stack';
+import { SafeAreaView } from 'react-native-safe-area-context';
 import MenuScreen from '../screens/Main/MenuScreen';
 import LoanRemainingOrdersScreen from '../screens/Loan/LoanRemainingOrdersScreen';
 import CreateLoanRemainingOrderScreen from '../screens/Loan/CreateLoanRemainingOrderScreen';
@@ -28,32 +29,34 @@ import CardOrderDetailsScreen from '../screens/Card/CardOrderDetailsScreen';
 const Stack = createStackNavigator();
 
 const MenuNavigator = () => (
-  <Stack.Navigator screenOptions={{ headerShown: false }}>
-    <Stack.Screen name="MenuHome" component={MenuScreen} />
-    <Stack.Screen name="LoanRemainingOrders" component={LoanRemainingOrdersScreen} />
-    <Stack.Screen name="CreateLoanRemainingOrder" component={CreateLoanRemainingOrderScreen} />
-    <Stack.Screen name="LoanPaidOffLetterOrders" component={LoanPaidOffLetterOrdersScreen} />
-    <Stack.Screen name="CreateLoanPaidOffLetterOrder" component={CreateLoanPaidOffLetterOrderScreen} />
-    <Stack.Screen name="LoanPaidOffLetterOrderDetails" component={LoanPaidOffLetterOrderDetailsScreen} />
-    <Stack.Screen name="LoanOrders" component={LoanOrdersScreen} />
-    <Stack.Screen name="CreateLoanOrder" component={CreateLoanOrderScreen} />
-    <Stack.Screen name="LoanOrderDetails" component={LoanOrderDetailsScreen} />
-    <Stack.Screen name="CardTransactionOrders" component={CardTransactionOrdersScreen} />
-    <Stack.Screen name="CreateCardTransactionOrder" component={CreateCardTransactionOrderScreen} />
-    <Stack.Screen name="CardTransactionOrderDetails" component={CardTransactionOrderDetailsScreen} />
-    <Stack.Screen name="CardBalanceOrders" component={CardBalanceOrdersScreen} />
-    <Stack.Screen name="CreateCardBalanceOrder" component={CreateCardBalanceOrderScreen} />
-    <Stack.Screen name="CardBalanceOrderDetails" component={CardBalanceOrderDetailsScreen} />
-    <Stack.Screen name="CardRequisiteOrders" component={CardRequisiteOrdersScreen} />
-    <Stack.Screen name="CreateCardRequisiteOrder" component={CreateCardRequisiteOrderScreen} />
-    <Stack.Screen name="CardRequisiteOrderDetails" component={CardRequisiteOrderDetailsScreen} />
-    <Stack.Screen name="CardPinOrders" component={CardPinOrdersScreen} />
-    <Stack.Screen name="CreateCardPinOrder" component={CreateCardPinOrderScreen} />
-    <Stack.Screen name="CardPinOrderDetails" component={CardPinOrderDetailsScreen} />
-    <Stack.Screen name="CardOrders" component={CardOrdersScreen} />
-    <Stack.Screen name="CreateCardOrder" component={CreateCardOrderScreen} />
-    <Stack.Screen name="CardOrderDetails" component={CardOrderDetailsScreen} />
-  </Stack.Navigator>
+  <SafeAreaView style={{ flex: 1 }}>
+    <Stack.Navigator screenOptions={{ headerShown: false }}>
+      <Stack.Screen name="MenuHome" component={MenuScreen} />
+      <Stack.Screen name="LoanRemainingOrders" component={LoanRemainingOrdersScreen} />
+      <Stack.Screen name="CreateLoanRemainingOrder" component={CreateLoanRemainingOrderScreen} />
+      <Stack.Screen name="LoanPaidOffLetterOrders" component={LoanPaidOffLetterOrdersScreen} />
+      <Stack.Screen name="CreateLoanPaidOffLetterOrder" component={CreateLoanPaidOffLetterOrderScreen} />
+      <Stack.Screen name="LoanPaidOffLetterOrderDetails" component={LoanPaidOffLetterOrderDetailsScreen} />
+      <Stack.Screen name="LoanOrders" component={LoanOrdersScreen} />
+      <Stack.Screen name="CreateLoanOrder" component={CreateLoanOrderScreen} />
+      <Stack.Screen name="LoanOrderDetails" component={LoanOrderDetailsScreen} />
+      <Stack.Screen name="CardTransactionOrders" component={CardTransactionOrdersScreen} />
+      <Stack.Screen name="CreateCardTransactionOrder" component={CreateCardTransactionOrderScreen} />
+      <Stack.Screen name="CardTransactionOrderDetails" component={CardTransactionOrderDetailsScreen} />
+      <Stack.Screen name="CardBalanceOrders" component={CardBalanceOrdersScreen} />
+      <Stack.Screen name="CreateCardBalanceOrder" component={CreateCardBalanceOrderScreen} />
+      <Stack.Screen name="CardBalanceOrderDetails" component={CardBalanceOrderDetailsScreen} />
+      <Stack.Screen name="CardRequisiteOrders" component={CardRequisiteOrdersScreen} />
+      <Stack.Screen name="CreateCardRequisiteOrder" component={CreateCardRequisiteOrderScreen} />
+      <Stack.Screen name="CardRequisiteOrderDetails" component={CardRequisiteOrderDetailsScreen} />
+      <Stack.Screen name="CardPinOrders" component={CardPinOrdersScreen} />
+      <Stack.Screen name="CreateCardPinOrder" component={CreateCardPinOrderScreen} />
+      <Stack.Screen name="CardPinOrderDetails" component={CardPinOrderDetailsScreen} />
+      <Stack.Screen name="CardOrders" component={CardOrdersScreen} />
+      <Stack.Screen name="CreateCardOrder" component={CreateCardOrderScreen} />
+      <Stack.Screen name="CardOrderDetails" component={CardOrderDetailsScreen} />
+    </Stack.Navigator>
+  </SafeAreaView>
 );
 
 export default MenuNavigator; 
\ No newline at end of file