diff --git a/lib/controller/home/map_passenger_controller.dart b/lib/controller/home/map_passenger_controller.dart
index e071574..b83a34e 100644
--- a/lib/controller/home/map_passenger_controller.dart
+++ b/lib/controller/home/map_passenger_controller.dart
@@ -2387,12 +2387,11 @@ class MapPassengerController extends GetxController {
       print('costDistance----- $costDistance');
       print(
           'passengerWalletTotal----- ${box.read(BoxName.passengerWalletTotal)}');
-      double costComfort, costSpeed, costDelivery, costMashwari, costLady = 0;
+      double costComfort, costSpeed, costDelivery, costLady = 0;
       update();
       if (currentTime.hour >= 22 && currentTime.hour < 5) {
         // costDistance = distance * latePrice;
         costComfort = (distance * comfortPrice) + costDuration * latePrice;
-        costMashwari = (distance * mashwariPrice) + costDuration * latePrice;
         costSpeed = (distance * speedPrice) + costDuration * latePrice;
         costDelivery = (distance * deliveryPrice) + costDuration * latePrice;
         costLady = (distance * comfortPrice + 2) + costDuration * latePrice;
@@ -2402,7 +2401,6 @@ class MapPassengerController extends GetxController {
         // if (averageDuration > 2.5) {
         // costDistance = distance * heavyPrice;
         costComfort = (distance * comfortPrice) + costDuration * heavyPrice;
-        costMashwari = (distance * mashwariPrice) + costDuration * heavyPrice;
         costSpeed = (distance * speedPrice) + costDuration * heavyPrice;
         costDelivery = (distance * deliveryPrice) + costDuration * heavyPrice;
         costLady = (distance * comfortPrice + 2) + costDuration * heavyPrice;
@@ -2412,7 +2410,6 @@ class MapPassengerController extends GetxController {
       } else {
         // costDistance = distance * (naturePrice - .1);
         costComfort = (distance * comfortPrice) + costDuration;
-        costMashwari = (distance * mashwariPrice) + costDuration;
         costSpeed = (distance * speedPrice) + costDuration;
         costDelivery = (distance * deliveryPrice) + costDuration;
         costLady = (distance * comfortPrice + 2) + costDuration;
@@ -2470,6 +2467,8 @@ class MapPassengerController extends GetxController {
 
       // buttomSheetMapPage();
       changeBottomSheetShown();
+    } else {
+      print('==========================');
     }
   }
 
@@ -2609,6 +2608,7 @@ class MapPassengerController extends GetxController {
     await getRideStatusFromStartApp();
     startMarkerReloading();
     Get.put(TextToSpeechController());
+    box.write(BoxName.carType, 'yet');
     // await getNearestDriverByPassengerLocation();
 
     initilizeGetStorage();
diff --git a/lib/views/home/map_widget.dart/form_search_places_destenation.dart b/lib/views/home/map_widget.dart/form_search_places_destenation.dart
index adcf7f7..e1861f1 100644
--- a/lib/views/home/map_widget.dart/form_search_places_destenation.dart
+++ b/lib/views/home/map_widget.dart/form_search_places_destenation.dart
@@ -95,7 +95,7 @@ GetBuilder<MapPassengerController> formSearchPlacesDestenation() {
                         mainAxisAlignment: MainAxisAlignment.spaceAround,
                         children: [
                           InkWell(
-                            onTap: () {
+                            onTap: () async {
                               if (box.read(BoxName.addWork) == 'addWork') {
                                 controller.workLocationFromMap = true;
                                 controller.changeMainBottomMenuMap();
@@ -114,23 +114,10 @@ GetBuilder<MapPassengerController> formSearchPlacesDestenation() {
                                     controller.newStartPointLocation;
                                 controller.changeMainBottomMenuMap();
 
-                                controller.getMap(
+                                await controller.getMap(
                                   '${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
                                   '${latLng.latitude},${latLng.longitude}',
                                 );
-                                // controller.currentLocationToFormPlaces = false;
-                                // controller.placesDestination = [];
-                                // // controller.isCancelRidePageShown = true;
-                                // controller.clearPlacesStart();
-                                // controller.clearPlacesDestination();
-                                // controller.passengerStartLocationFromMap =
-                                //     false;
-                                // controller.isPickerShown = false;
-                                // controller.bottomSheet();
-
-                                // controller.showBottomSheet1();
-
-                                // controller.update();
                                 controller.currentLocationToFormPlaces = false;
                                 controller.placesDestination = [];
                                 // controller.isCancelRidePageShown = true;
@@ -139,17 +126,8 @@ GetBuilder<MapPassengerController> formSearchPlacesDestenation() {
                                 controller.passengerStartLocationFromMap =
                                     false;
                                 controller.isPickerShown = false;
-                                // controller.showBottomSheet1();
-                                // Get.back();
+                                controller.bottomSheet();
                                 controller.showBottomSheet1();
-                                controller.placesDestination = [];
-                                controller.placeDestinationController.clear();
-
-                                controller.showBottomSheet1();
-                                // Get.back();
-                                // controller.showBottomSheet1();
-
-                                controller.changeMainBottomMenuMap();
                               }
                             },
                             onLongPress: () {
@@ -172,8 +150,8 @@ GetBuilder<MapPassengerController> formSearchPlacesDestenation() {
                                   border: Border.all()),
                               child: Text(
                                 ' ${box.read(BoxName.addWork)}' == 'addWork'
-                                    ? 'Add Work'
-                                    : 'Work',
+                                    ? 'Add Work'.tr
+                                    : 'Work'.tr,
                                 textAlign: TextAlign.center,
                               ),
                             ),
@@ -193,7 +171,7 @@ GetBuilder<MapPassengerController> formSearchPlacesDestenation() {
                                         controller.changePickerShown();
                                       }));
                             },
-                            onTap: () {
+                            onTap: () async {
                               if (box.read(BoxName.addHome) == 'addHome') {
                                 controller.homeLocationFromMap = true;
                                 controller.changeMainBottomMenuMap();
@@ -211,7 +189,7 @@ GetBuilder<MapPassengerController> formSearchPlacesDestenation() {
                                 controller.changeMainBottomMenuMap();
 
                                 // controller.newMyLocation = latLng;
-                                controller.getMap(
+                                await controller.getMap(
                                   '${controller.passengerLocation.latitude},${controller.passengerLocation.longitude}',
                                   '${latLng.latitude},${latLng.longitude}',
                                 );