12/17/1

lib/controller/firebase/firbase_messge.dart

@@ -139,6 +139,7 @@ class FirebaseMessagesController extends GetxController {
       Get.find<MapPassengerController>().statusRide == 'Apply';
       Get.find<MapPassengerController>().isSearchingWindow == false;
       Get.find<MapPassengerController>().update();
+      Get.find<MapPassengerController>().rideAppliedFromDriver(true);
 
       // driverAppliedTripSnakBar();
     } else if (message.notification!.title! == 'Promo'.tr) {
@@ -236,7 +237,7 @@ class FirebaseMessagesController extends GetxController {
             title: 'Cancel'.tr,
             kolor: AppColor.redColor,
             onPressed: () {
-              Get.offAll(const MapPagePassenger());
+              Get.offAll(() => const MapPagePassenger());
             },
           )
           // Get.find<MapPassengerController>()
@@ -256,18 +257,16 @@ class FirebaseMessagesController extends GetxController {
         box.write(BoxName.passengerWalletTotal, 0);
       }
       Get.find<MapPassengerController>().tripFinishedFromDriver();
-
-      Get.to(() => RateDriverFromPassenger(), arguments: {
-        'driverId': driverList[0].toString(),
-        'rideId': driverList[1].toString(),
-        'price': driverList[3].toString()
-      });
       notificationController.showNotification(
           'Don’t forget your personal belongings.'.tr,
           'Please make sure you have all your personal belongings and that any remaining fare, if applicable, has been added to your wallet before leaving. Thank you for choosing the Sefer app'
               .tr,
           'ding');
-      // }
+      Get.to(() => RateDriverFromPassenger(), arguments: {
+        'driverId': driverList[0].toString(),
+        'rideId': driverList[1].toString(),
+        'price': driverList[3].toString()
+      });
     } else if (message.notification!.title! == "Finish Monitor".tr) {
       Get.defaultDialog(
           titleStyle: AppStyle.title,