3/25/1

lib/views/home/Captin/orderCaptin/order_request_page.dart

@@ -1,5 +1,6 @@
 import 'package:SEFER/controller/home/captin/home_captain_controller.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/controller/firebase/firbase_messge.dart';
@@ -61,8 +62,8 @@ class OrderRequestPage extends StatelessWidget {
     return MyScafolld(
         title: 'Order Details'.tr,
         body: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
+          ListView(
+            // crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               // SizedBox(height: 200, child: Text(pointsList.toString())),
               // Text(message.notification!.body.toString()),

lib/views/home/Captin/orderCaptin/order_speed_request.dart

@@ -296,7 +296,7 @@ class OrderSpeedRequest extends StatelessWidget {
                           FirebaseMessagesController()
                               .sendNotificationToPassengerToken(
                             'Apply Ride',
-                            arguments['DriverList'][9].toString(),
+                            'The ${box.read(BoxName.nameDriver)} ${'accepted your order'.tr}',
                             arguments['DriverList'][9].toString(),
                             // box.read(BoxName.tokenDriver).toString(),
                             bodyToPassenger,
@@ -338,17 +338,13 @@ class OrderSpeedRequest extends StatelessWidget {
                       ),
                       GetBuilder<OrderRequestController>(
                         builder: (timerController) {
-                          final isNearEnd =
-                              timerController.remainingTimeSpeed <=
-                                  5; // Define a threshold for "near end"
-
                           return Stack(
                             alignment: Alignment.center,
                             children: [
                               CircularProgressIndicator(
                                 value: timerController.progressSpeed,
                                 // Set the color based on the "isNearEnd" condition
-                                color: isNearEnd ? Colors.red : Colors.blue,
+                                color: Colors.blue,
                               ),
                               Text(
                                 '${timerController.remainingTimeSpeed}',