From ebcc644d8cd43d8760fe6151c35d598598c95c84 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <masahamdev@gmail.com>
Date: Sat, 23 Sep 2023 23:06:02 +0300
Subject: [PATCH] 9/23/2

---
 lib/controller/home/map_page_controller.dart |  9 +++++++--
 lib/views/home/map_page.dart                 | 12 ++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/controller/home/map_page_controller.dart b/lib/controller/home/map_page_controller.dart
index b5cdc40..ec32fef 100644
--- a/lib/controller/home/map_page_controller.dart
+++ b/lib/controller/home/map_page_controller.dart
@@ -222,7 +222,10 @@ class MapController extends GetxController {
       await Future.delayed(const Duration(seconds: 1));
       progress = i / durationTimer;
       remainingTime = durationTimer - i;
-
+      if (remainingTime == 0) {
+        rideConfirm = false;
+        update();
+      }
       update();
     }
     timerEnded();
@@ -353,12 +356,14 @@ class MapController extends GetxController {
       data = [];
       changeCancelRidePageShow();
       rideConfirm = false;
+      shouldFetch = false;
       update();
     } else {
       clearPlaces();
       clearpolyline();
       data = [];
       rideConfirm = false;
+      shouldFetch = false;
       changeCancelRidePageShow();
       remainingTime = 25;
       update();
@@ -624,7 +629,7 @@ class MapController extends GetxController {
           newTime1 = currentTime.add(durationfromDriverToPassenger);
           duratioByPassenger =
               data['rows'][0]['elements'][0]['duration']['text'];
-
+          update();
           if (distance1 < nearestDistance) {
             nearestDistance = distance1.toDouble();
 
diff --git a/lib/views/home/map_page.dart b/lib/views/home/map_page.dart
index 2153fbc..80e4385 100644
--- a/lib/views/home/map_page.dart
+++ b/lib/views/home/map_page.dart
@@ -304,8 +304,16 @@ class MapPage extends StatelessWidget {
                 return Center(
                   child: Container(
                     decoration: AppStyle.boxDecoration,
-                    height: 100,
-                    width: 100,
+                    // height: 100,
+                    // width: 100,
+                    child: Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: Text(
+                        'You Can cancel Ride After Captain did not come in the time'
+                            .tr,
+                        style: AppStyle.subtitle,
+                      ),
+                    ),
                   ),
                 );
               } else {