Resolve merge conflict between main and vypq

lib/feature/map/map_screen.dart

@@ -15,6 +15,7 @@ import 'package:sfm_app/product/base/bloc/base_bloc.dart';
 import 'package:sfm_app/product/constant/icon/icon_constants.dart';
 import 'package:sfm_app/product/permission/location_permission.dart';
 import 'package:sfm_app/product/services/api_services.dart';
+import 'package:sfm_app/product/utils/permission_handler.dart';
 import '../../product/constant/enums/app_theme_enums.dart';
 
 class MapScreen extends StatefulWidget {
@@ -181,8 +182,8 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
           ),
           position: cluster.location,
           onTap: () async {
-            bool check = await checkLocationPermission(context);
-            if (check == true) {
+            LocationPermission permission = await checkAndRequestPermission();
+            if (permission == LocationPermission.whileInUse || permission == LocationPermission.always) {
               Position position = await Geolocator.getCurrentPosition();
               onTapMarker(
                 // ignore: use_build_context_synchronously
@@ -284,9 +285,9 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
     }
   }
 
-  Future<bool> checkLocationPermission(context) async {
-    bool check = await LocationPermissionRequest.instance
-        .checkLocationPermission(context);
-    return check;
-  }
+  // Future<bool> checkLocationPermission(context) async {
+  //   bool check = await LocationPermissionRequest.instance
+  //       .checkLocationPermission(context);
+  //   return check;
+  // }
 }

lib/feature/map/widget/show_nearest_place.dart

@@ -52,6 +52,7 @@ showNearPlacesSideSheet(
         padding: context.paddingLow,
         width: screenWidth,
         height: screenHeight / 3,
+        color: Colors.white,
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [