bug fixes

android/app/build/generated/rncli/src/main/java/com/facebook/react/PackageList.java

@@ -13,8 +13,6 @@ import java.util.ArrayList;
 
 // @react-native-async-storage/async-storage
 import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
-// @react-native-community/art
-import com.reactnativecommunity.art.ARTPackage;
 // @react-native-community/datetimepicker
 import com.reactcommunity.rndatetimepicker.RNDateTimePickerPackage;
 // @react-native-community/geolocation
@@ -121,7 +119,6 @@ public class PackageList {
     return new ArrayList<>(Arrays.<ReactPackage>asList(
       new MainReactPackage(mConfig),
       new AsyncStoragePackage(),
-      new ARTPackage(),
       new RNDateTimePickerPackage(),
       new GeolocationPackage(),
       new RNCMaskedViewPackage(),

android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Fri Apr 11 14:01:10 SGT 2025
+#Tue Apr 15 10:54:24 SGT 2025
 com.project.yondu.unioilloyaltyapp-main-49\:/mipmap-xxxhdpi/ic_launcher_round.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat
 com.project.yondu.unioilloyaltyapp-main-49\:/mipmap-hdpi/ic_launcher_foreground.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher_foreground.png.flat
 com.project.yondu.unioilloyaltyapp-main-49\:/mipmap-hdpi/ic_launcher.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat

android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Fri Apr 11 14:13:48 SGT 2025
+#Tue Apr 15 11:05:44 SGT 2025
 path.4=15/classes.dex
 path.3=14/classes.dex
 path.2=0/classes.dex

android/app/build/intermediates/source_set_path_map/debug/file-map.txt

@@ -48,34 +48,33 @@ com.project.yondu.unioilloyaltyapp-merged_res-46 C:\Users\lenovo\unioil-loyalty-
 com.project.yondu.unioilloyaltyapp-debug-47 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\res
 com.project.yondu.unioilloyaltyapp-main-48 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\res
 com.project.yondu.unioilloyaltyapp-packaged_res-49 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-async-storage\async-storage\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-50 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\art\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-50 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\datetimepicker\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-51 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\datetimepicker\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-51 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\geolocation\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-52 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\geolocation\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-52 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\masked-view\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-53 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\masked-view\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-53 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\netinfo\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-54 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\netinfo\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-54 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\toolbar-android\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-55 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\toolbar-android\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-55 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-firebase\analytics\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-56 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-firebase\analytics\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-56 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-firebase\app\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-57 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-firebase\app\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-57 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-firebase\messaging\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-58 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-firebase\messaging\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-58 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\lottie-react-native\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-59 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\lottie-react-native\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-59 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-60 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-60 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-config\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-61 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-config\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-61 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-date-picker\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-62 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-date-picker\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-62 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-device-info\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-63 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-device-info\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-63 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-email-link\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-64 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-email-link\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-64 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-exception-handler\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-65 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-exception-handler\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-65 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-gesture-handler\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-66 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-gesture-handler\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-66 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-image-picker\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-67 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-image-picker\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-67 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-intent-launcher\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-68 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-intent-launcher\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-68 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-linear-gradient\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-69 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-linear-gradient\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-69 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-location\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-70 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-location\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-70 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-maps\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-71 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-maps\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-71 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-month-year-picker\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-72 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-month-year-picker\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-72 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-pager-view\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-73 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-pager-view\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-73 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-push-notification\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-74 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-push-notification\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-74 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-reanimated\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-75 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-reanimated\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-75 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-safe-area-context\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-76 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-safe-area-context\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-76 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-screens\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-77 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-screens\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-77 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-svg\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-78 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-svg\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-78 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-vector-icons\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-79 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-vector-icons\android\build\intermediates\packaged_res\debug
+com.project.yondu.unioilloyaltyapp-packaged_res-79 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-webview\android\build\intermediates\packaged_res\debug
-com.project.yondu.unioilloyaltyapp-packaged_res-80 C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-webview\android\build\intermediates\packaged_res\debug

android/app/build/outputs/logs/manifest-merger-debug-report.txt

@@ -13,7 +13,6 @@ MERGED from [:react-native-async-storage_async-storage] C:\Users\lenovo\unioil-l
 MERGED from [:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-46:12
 MERGED from [:react-native-gesture-handler] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-gesture-handler\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-7:12
 MERGED from [:react-native-reanimated] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-reanimated\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-7:12
-MERGED from [:react-native-community_art] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\art\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-7:12
 MERGED from [:react-native-community_datetimepicker] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\datetimepicker\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-9:12
 MERGED from [:react-native-community_geolocation] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\geolocation\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-7:12
 MERGED from [:react-native-community_masked-view] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\masked-view\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-7:12
@@ -471,8 +470,6 @@ MERGED from [:react-native-gesture-handler] C:\Users\lenovo\unioil-loyalty-rn-ap
 MERGED from [:react-native-gesture-handler] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-gesture-handler\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-44
 MERGED from [:react-native-reanimated] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-reanimated\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-44
 MERGED from [:react-native-reanimated] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-reanimated\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-44
-MERGED from [:react-native-community_art] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\art\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-44
-MERGED from [:react-native-community_art] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\art\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-44
 MERGED from [:react-native-community_datetimepicker] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\datetimepicker\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-44
 MERGED from [:react-native-community_datetimepicker] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\datetimepicker\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-44
 MERGED from [:react-native-community_geolocation] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\geolocation\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-44

app/screens/main/station/fragments/bottomsheet.js

@@ -108,8 +108,6 @@ export default function renderStationPanel(props) {
       <BottomSheet
         ref={bottomSheetRef}
         snapPoints={snapPoints}
-        enablePanDownToClose={true}
-        index={-1}
       >
         {renderStations(props.isGuest, props.data, props.onClick, props.onUpdateFavorite)}
         <View style={styles.panelHeader}>

app/screens/main/station/fragments/stationdetailspanel.js

@@ -21,6 +21,7 @@ import Icon from '../../../../components/icons';
 import DB from '../../../../components/storage';
 import REQUEST from '../../../../components/api';
 import BottomSheet from '@gorhom/bottom-sheet';
+import { ScrollView } from 'react-native-gesture-handler';
 
 const styles = {
   container: {
@@ -62,7 +63,7 @@ const renderStationPanel = (props) => {
       let name = station.stars >= star ? "star" : "staro"
       let mgn = i > 0 ? 5 : 0
       return (
-        <Icon.AntDesign name={name} style={{ marginLeft: mgn }} color={Theme.colors.yellow} size={20} />
+        <Icon.AntDesign name={name} style={{ marginLeft: mgn }} color={Theme.colors.yellow} size={20} key={i} />
       )
     })
 
@@ -181,14 +182,16 @@ const renderStationPanel = (props) => {
   }
 
   return (
-    // <View style={{ flex: 1 }}>
+    <View style={{ flex: 1 }}>
       <BottomSheet
         ref={bottomSheetRef}
-        index={-1}
         snapPoints={snapPoints}
-        enablePanDownToClose={true}
+        initialSnap={0}
+        enableHandlePanningGesture={true}
+        enableContentPanningGesture={true}
       >
           {renderStationDetails(props.data, props.onClick)}
+
           <View style={[styles.panelHeader, { backgroundColor: props.app_theme?.theme.dark ? Theme.colors.darkerGray : Theme.colors.lightGray }]}>
             <View style={{ flexDirection: 'row', justifyContent: 'center', padding: 15 }}>
               <Text numberOfLines={1} style={{ flex: 1, paddingRight: 40, paddingTop: 17, justifyContent: 'center', color: props.app_theme?.theme.dark ? props.app_theme?.theme.colors.text : Theme.colors.darkGray, fontSize: 16, fontWeight: 'bold' }}>
@@ -204,7 +207,8 @@ const renderStationPanel = (props) => {
                         modalVisible={true}
                         viewMode="sheet"
                         actionSheetBtnCloseTitle="Cancel"
-                      actionSheetBtnOpenTitle={<Icon.FontAwesome name="location-arrow" color="#fff" size={25} />}
+                        actionSheetBtnOpenTitle="Navigate"
+                        actionSheetBtnOpenIcon={<Icon.FontAwesome name="location-arrow" color="#fff" size={25} />}
                         actionSheetTitle="Choose an application to view the route"
                         address={props.data.address} // address to navigate by for all apps 
                         waze={{ address: props.data.address, lat: props.data.latitude, lon: props.data.longitude, action: actions.navigateByLatAndLon }} // specific settings for waze
@@ -218,7 +222,7 @@ const renderStationPanel = (props) => {
             </View>
           </View>
       </BottomSheet>
-    // </View>
+    </View>
   );
 }
 

app/screens/main/station/fragments/stationpanel.js

@@ -9,6 +9,7 @@ import {
   SafeAreaView,
   Platform,
   Alert,
+  ScrollView,
 } from 'react-native';
 import { connect } from 'react-redux';
 import { Divider } from 'react-native-elements';
@@ -220,13 +221,14 @@ const renderStationPanel = (props) => {
     <BottomSheet
       ref={bottomSheetRef}
       snapPoints={snap}
-        enablePanDownToClose={true}
+      initialSnap={0}
-        index={-1}
+      enableHandlePanningGesture={true}
+      enableContentPanningGesture={true}
     >
-        <View>
       {renderHeaders()}
+      <BottomSheetScrollView contentContainerStyle={{ flexGrow: 1 }}>
         {renderContents()}
-        </View>
+      </BottomSheetScrollView>
     </BottomSheet>
     // </View>
   );

app/screens/myprofile/card.js

@@ -15,7 +15,7 @@ import Theme from '../../components/theme.style.js';
 import DB from '../../components/storage/';
 import moment from 'moment';
 import QRCode from 'react-native-qrcode-svg';
-import Barcode from 'react-native-barcode-builder';
+import Barcode from 'react-native-barcode-svg';
 
 class MyCard extends React.Component {
 

app/screens/payatpump/fragments/stationpanel.js

@@ -16,6 +16,7 @@ import Theme from '../../../components/theme.style.js';
 import Icon from '../../../components/icons';
 import DB from '../../../components/storage';
 import REQUEST from '../../../components/api';
+import { ScrollView } from 'react-native-gesture-handler';
 
 const styles = {
   container: {
@@ -185,13 +186,12 @@ const renderStationPanel = (props) => {
     <BottomSheet
       ref={bottomSheetRef}
       snapPoints={snap}
-      enablePanDownToClose={true}
       index={initialSnap}
+      enableHandlePanningGesture={true}
+      enableContentPanningGesture={true}
     >
-      <View>
       {renderHeaders()}
       {renderContents()}
-      </View>
     </BottomSheet>
   );
 }

package.json

@@ -16,7 +16,6 @@
   "dependencies": {
     "@gorhom/bottom-sheet": "^4",
     "@react-native-async-storage/async-storage": "1.19.3",
-    "@react-native-community/art": "^1.2.0",
     "@react-native-community/datetimepicker": "7.6.3",
     "@react-native-community/geolocation": "3.0.5",
     "@react-native-community/masked-view": "0.1.11",
@@ -46,7 +45,7 @@
     "react-native": "0.72.5",
     "react-native-actionsheet": "^2.4.2",
     "react-native-animatable": "^1.3.3",
-    "react-native-barcode-builder": "^2.0.0",
+    "react-native-barcode-svg": "0.0.15",
     "react-native-blob-util": "0.19.9",
     "react-native-config": "^1.5.1",
     "react-native-credit-card-input": "^0.4.1",

patches/@react-aria+interactions+3.24.1.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@react-aria/interactions/dist/usePress.main.js b/node_modules/@react-aria/interactions/dist/usePress.main.js
-index bfdef46..6f25f6b 100644
---- a/node_modules/@react-aria/interactions/dist/usePress.main.js
-+++ b/node_modules/@react-aria/interactions/dist/usePress.main.js
-@@ -5,7 +5,7 @@ var $bBqCQ$swchelperscjs_class_private_field_getcjs = require("@swc/helpers/cjs/
- var $bBqCQ$swchelperscjs_class_private_field_initcjs = require("@swc/helpers/cjs/_class_private_field_init.cjs");
- var $bBqCQ$swchelperscjs_class_private_field_setcjs = require("@swc/helpers/cjs/_class_private_field_set.cjs");
- var $bBqCQ$reactariautils = require("@react-aria/utils");
--var $bBqCQ$reactdom = require("react-dom");
-+var $bsryd$reactdom = require("react-native");
- var $bBqCQ$react = require("react");
- 
- 

patches/@react-aria+utils+3.28.1.patch

@@ -1,11 +0,0 @@
-diff --git a/node_modules/@react-aria/utils/dist/animation.main.js b/node_modules/@react-aria/utils/dist/animation.main.js
-index f2a8b2a..ae83288 100644
---- a/node_modules/@react-aria/utils/dist/animation.main.js
-+++ b/node_modules/@react-aria/utils/dist/animation.main.js
-@@ -1,5 +1,5 @@
- var $78605a5d7424e31b$exports = require("./useLayoutEffect.main.js");
--var $bsryd$reactdom = require("react-dom");
-+var $bsryd$reactdom = require("react-native");
- var $bsryd$react = require("react");
- 
- 

patches/@react-native-community+art+1.2.0.patch

@@ -1,12 +0,0 @@
-diff --git a/node_modules/@react-native-community/art/android/build.gradle b/node_modules/@react-native-community/art/android/build.gradle
-index 949bc00..9cbc39c 100644
---- a/node_modules/@react-native-community/art/android/build.gradle
-+++ b/node_modules/@react-native-community/art/android/build.gradle
-@@ -20,6 +20,7 @@ def getExtOrIntegerDefault(name) {
- apply plugin: 'com.android.library'
- 
- android {
-+  namespace "com.reactnativecommunity.art" 
-   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
-   buildToolsVersion getExtOrDefault('buildToolsVersion')
-