4/7/5

lib/views/home/Captin/home_captain/drawer_captain.dart

@@ -31,7 +31,7 @@ class DrawerCaptain extends StatelessWidget {
     }
 
     return Drawer(
-      child: Column(
+      child: ListView(
         children: [
           // Other drawer items
           UserAccountsDrawerHeader(

lib/views/home/map_widget.dart/apply_order_widget.dart

@@ -154,7 +154,7 @@ class ApplyOrderWidget extends StatelessWidget {
                             ),
                           ),
                           controller.isDriverArrivePassenger
-                              ? DriverArrivePassengerAndWaitMinute()
+                              ? const DriverArrivePassengerAndWaitMinute()
                               : const TimeDriverToPassenger()
                         ],
                       ),

lib/views/home/map_widget.dart/car_details_widget_to_go.dart

@@ -290,10 +290,10 @@ class CarDetailsTypeToChoose extends StatelessWidget {
                                 } else if (mapPassengerController
                                         .selectedIndex ==
                                     3) {
-                                  box.write(BoxName.carType, 'FreeRide');
+                                  box.write(BoxName.carType, 'Mashwari');
                                   mapPassengerController.totalPassenger = 50;
                                   Get.defaultDialog(
-                                      title: 'FreeRide',
+                                      title: 'Mashwari',
                                       titleStyle: AppStyle.title,
                                       content: CarDialogue(
                                           textToSpeechController:

lib/views/home/map_widget.dart/ride_begin_passenger.dart

@@ -21,7 +21,7 @@ class RideBeginPassenger extends StatelessWidget {
     ProfileController profileController = Get.put(ProfileController());
     AudioController audioController = Get.put(AudioController());
     return GetBuilder<MapPassengerController>(builder: (controller) {
-      if (controller.rideTimerBegin) {
+      if (controller.rideTimerBegin || controller.statusRide == 'Begin') {
         return Positioned(
           left: 10,
           right: 10,
@@ -73,7 +73,7 @@ class RideBeginPassenger extends StatelessWidget {
                         ),
                         tooltip: ' Add Note', // Optional tooltip for clarity
                       ),
-                      audioController.isRecoding
+                      audioController.isRecoding == false
                           ? IconButton(
                               onPressed: () {
                                 audioController.startRecording();