4/11/3

lib/controller/home/captin/map_driver_controller.dart

@@ -420,12 +420,14 @@ class MapDriverController extends GetxController {
         middleText: '',
         confirm: MyElevatedButton(
             title: 'Ok'.tr,
+            kolor: AppColor.greenColor,
             onPressed: () {
               Get.back();
               finishRideFromDriver1();
             }),
         cancel: MyElevatedButton(
             title: 'Cancel'.tr,
+            kolor: Colors.red,
             onPressed: () {
               Get.back();
             }));

lib/controller/home/map_passenger_controller.dart

@@ -658,9 +658,9 @@ class MapPassengerController extends GetxController {
 
       update();
     }
-    rideTimerBegin = false;
-    isRideFinished = true;
-    update();
+    // rideTimerBegin = false;
+    // isRideFinished = true;
+    // update();
   }
 
   void tripFinishedFromDriver() async {