24-12/26/2

lib/controller/firebase/firbase_messge.dart

@@ -191,7 +191,7 @@ class FirebaseMessagesController extends GetxController {
       passengerDialog(message.notification!.body!);
 
       update();
-    } else if (message.notification!.title! == 'RideIsBegin'.tr) {
+    } else if (message.notification!.title! == 'Trip is Begin'.tr) {
       if (Platform.isAndroid) {
         notificationController.showNotification(
             'Trip is Begin'.tr, ''.tr, 'start');
@@ -246,10 +246,12 @@ class FirebaseMessagesController extends GetxController {
           );
     } else if (message.notification!.title! == 'Driver Finish Trip'.tr) {
       var myListString = message.data['DriverList'];
+      Log.print('myListString: ${myListString}');
       var driverList = jsonDecode(myListString) as List<dynamic>;
+      Log.print('driverList: ${driverList}');
       if (Platform.isAndroid) {
         notificationController.showNotification(
-            'Driver Finish Trip'.tr,
+            "Driver Finish Trip".tr,
             'you will pay to Driver'.tr + ' ${driverList[3].toString()} \$'.tr,
             'tone1');
       }
@@ -257,12 +259,14 @@ class FirebaseMessagesController extends GetxController {
       if (double.parse(box.read(BoxName.passengerWalletTotal)) < 0) {
         box.write(BoxName.passengerWalletTotal, 0);
       }
+      print(333);
       Get.find<MapPassengerController>().tripFinishedFromDriver();
-      notificationController.showNotification(
+      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');
+      print(267);
       Get.to(() => RateDriverFromPassenger(), arguments: {
         'driverId': driverList[0].toString(),
         'rideId': driverList[1].toString(),

lib/controller/local/translations.dart

@@ -715,7 +715,6 @@ class MyTranslation extends Translations {
           "Are you want to wait drivers to accept your order":
               "هل عايز تستنى لحد ما السواقين يقبلوا طلبك؟",
           "deleted": "تم الحذف",
-          "Trip is begin": "الرحلة بدأت",
           "This price is fixed even if the route changes for the driver.":
               "السعر ده ثابت حتى لو المسار اتغير للسواق.",
           "The price may increase if the route changes.":