9/13/3

lib/controller/home/map_page_controller.dart

@@ -63,7 +63,7 @@ class MapController extends GetxController {
   int selectedPassengerCount = 1;
   double progress = 0;
   int durationTimer = 25;
-  int remainingTime = 0;
+  int remainingTime = 25;
 
   void onChangedPassengerCount(int newValue) {
     selectedPassengerCount = newValue;
@@ -129,12 +129,13 @@ class MapController extends GetxController {
     update();
   }
 
+  var rideId;
   changeConfirmRide() async {
     rideConfirm = true;
     shouldFetch = true;
     update();
     // print('rideConfirm= $rideConfirm');
-    var rideId;
+
     await getCarsLocationByPassenger();
     await CRUD().post(link: AppLink.addRides, payload: {
       "start_location": '${data[0]['start_address']}',
@@ -226,6 +227,8 @@ class MapController extends GetxController {
   void timerEnded() async {
     print('Timer ended');
     // refuseOrder();
+    isCancelRidePageShown = false;
+    update();
   }
 
   Future<String> getRideStatus(int rideId) async {
@@ -251,12 +254,16 @@ class MapController extends GetxController {
       data = [];
       rideConfirm = false;
       changeCancelRidePageShow();
+      remainingTime = 25;
+      update();
 
-      await CRUD().post(link: AppLink.addCancelRide, payload: {
-        "driverID": "1", // Convert to String
+      await CRUD().post(link: AppLink.addCancelRideFromPassenger, payload: {
+        "driverID": FirebasMessagesController()
+            .driverID
+            .toString(), // Convert to String
         "passengerID":
             box.read(BoxName.pasengerID).toString(), // Convert to String
-        "rideID": "222", // Convert to String
+        "rideID": rideId.toString(), // Convert to String
         "note": cancelNote
       });