keyboard scroll

screens/auth/register/RegisterForm.tsx

@@ -25,15 +25,16 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   ActivityIndicator,
-  KeyboardAvoidingView,
-  Platform,
+  Keyboard,
   ScrollView,
   StyleSheet,
   Text,
   TextInput,
   TouchableOpacity,
-  View,
+  TouchableWithoutFeedback,
+  View
 } from 'react-native';
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { auth_api } from '../login/lib/api';
 import PhonePrefix from '../login/ui/PhonePrefix';
@@ -360,10 +361,13 @@ export default function RegisterFormScreen() {
   };
 
   return (
-    <KeyboardAvoidingView
-      behavior="padding"
-      style={{ flex: 1 }}
+    <KeyboardAwareScrollView
+      showsVerticalScrollIndicator={false}
+      keyboardShouldPersistTaps="handled"
+      enableOnAndroid
+      extraScrollHeight={120}
     >
+      <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
         <View style={styles.container}>
           <LinearGradient
             colors={['#0f172a', '#1e293b', '#334155']}
@@ -377,10 +381,7 @@ export default function RegisterFormScreen() {
           <AuthHeader />
 
           <SafeAreaView style={{ flex: 1 }} edges={['bottom']}>
-          <KeyboardAvoidingView
-            style={{ flex: 1 }}
-            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-          >
+
             <ScrollView
               contentContainerStyle={styles.scrollContent}
               showsVerticalScrollIndicator={false}
@@ -647,7 +648,6 @@ export default function RegisterFormScreen() {
                 </View>
               </View>
             </ScrollView>
-          </KeyboardAvoidingView>
           </SafeAreaView>
 
           {/* ---- Country BottomSheet ---- */}
@@ -730,7 +730,8 @@ export default function RegisterFormScreen() {
             />
           </BottomSheet>
         </View>
-    </KeyboardAvoidingView>
+      </TouchableWithoutFeedback>
+    </KeyboardAwareScrollView>
   );
 }
 

screens/create-ads/ui/CreateAdsScreens.tsx

@@ -1,5 +1,5 @@
 import { useTheme } from '@/components/ThemeContext';
-import { BottomSheetBackdrop, BottomSheetModal, BottomSheetScrollView } from '@gorhom/bottom-sheet';
+import { BottomSheetBackdrop, BottomSheetModal, BottomSheetScrollView, TouchableWithoutFeedback } from '@gorhom/bottom-sheet';
 import { useMutation, useQuery } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
 import { router, useFocusEffect } from 'expo-router';
@@ -7,18 +7,19 @@ import React, { useCallback, useRef, useState } from 'react';
 import {
   Alert,
   Image,
-  KeyboardAvoidingView,
+  Keyboard,
   Linking,
   ScrollView,
   StyleSheet,
   Text,
   TouchableOpacity,
-  View,
+  View
 } from 'react-native';
 
 import OneClick from '@/assets/images/one_click.png';
 import PAYME from '@/assets/images/Payme_NEW.png';
 import { useTranslation } from 'react-i18next';
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import { price_calculation } from '../lib/api';
 import { CreateAdsResponse } from '../lib/types';
 import StepFour from './StepFour';
@@ -209,10 +210,14 @@ export default function CreateAdsScreens() {
   };
 
   return (
-    <KeyboardAvoidingView
-      behavior="padding"
+    <KeyboardAwareScrollView
+      showsVerticalScrollIndicator={false}
+      keyboardShouldPersistTaps="handled"
+      enableOnAndroid
+      extraScrollHeight={120}
       style={[styles.safeArea, isDark ? styles.darkBg : styles.lightBg]}
     >
+      <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
         <ScrollView contentContainerStyle={[styles.container, { paddingBottom: 90 }]}>
           <Image
             source={OneClick}
@@ -324,7 +329,8 @@ export default function CreateAdsScreens() {
             </View>
           </BottomSheetScrollView>
         </BottomSheetModal>
-    </KeyboardAvoidingView>
+      </TouchableWithoutFeedback>
+    </KeyboardAwareScrollView>
   );
 }