diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart
index 30d854e..1de5919 100644
--- a/lib/controller/firebase/firbase_messge.dart
+++ b/lib/controller/firebase/firbase_messge.dart
@@ -130,7 +130,7 @@ class FirebaseMessagesController extends GetxController {
       // var myPoints = jsonDecode(points) as List<dynamic>;
       driverToken = myList[14].toString();
       // This is for location using and uploading status
-      Get.find<HomeCaptainController>().changeRideId();
+      Get.put(HomeCaptainController()).changeRideId();
       update();
       // print('driverToken==============$driverToken');
       Get.to(() => OrderRequestPage(), arguments: {
diff --git a/lib/controller/functions/location_controller.dart b/lib/controller/functions/location_controller.dart
index 4a0a706..c217c17 100644
--- a/lib/controller/functions/location_controller.dart
+++ b/lib/controller/functions/location_controller.dart
@@ -72,14 +72,14 @@ class LocationController extends GetxController {
               'status': box.read(BoxName.statusDriverLocation).toString()
             });
             // Animate camera to user location (optional)
-            if (Get.find<HomeCaptainController>().rideId == 'rideId') {
-              Get.find<MapDriverController>()
-                  .mapController!
-                  .animateCamera(CameraUpdate.newLatLng(LatLng(
-                    Get.find<LocationController>().myLocation.latitude,
-                    Get.find<LocationController>().myLocation.longitude,
-                  )));
-            }
+            // if (Get.find<HomeCaptainController>().rideId == 'rideId') {
+            //   Get.find<MapDriverController>()
+            //       .mapController!
+            //       .animateCamera(CameraUpdate.newLatLng(LatLng(
+            //         Get.find<LocationController>().myLocation.latitude,
+            //         Get.find<LocationController>().myLocation.longitude,
+            //       )));
+            // }
             Get.find<HomeCaptainController>()
                 .mapHomeCaptainController
                 .animateCamera(CameraUpdate.newLatLng(LatLng(
diff --git a/lib/controller/home/captin/map_driver_controller.dart b/lib/controller/home/captin/map_driver_controller.dart
index b1810b2..3066921 100644
--- a/lib/controller/home/captin/map_driver_controller.dart
+++ b/lib/controller/home/captin/map_driver_controller.dart
@@ -469,7 +469,7 @@ class MapDriverController extends GetxController {
     Future.delayed(const Duration(milliseconds: 300));
     FirebaseMessagesController().sendNotificationToPassengerToken(
       'Driver Finish Trip',
-      'you will pay to Driver'.tr + ' $totalCost \$'.tr,
+      'you will pay to Driver'.tr + ' $price \$'.tr,
       tokenPassenger,
       [
         box.read(BoxName.driverID),