diff --git a/assets/translations/ar.json b/assets/translations/ar.json
index 8553ab9..d9cc878 100644
--- a/assets/translations/ar.json
+++ b/assets/translations/ar.json
@@ -248,5 +248,6 @@
   "userAddress": "عنوان المستخدم",
   "accept": "قبول",
   "reject": "رفض",
-  "noPendingOrders": "لا توجد طلبات معلقة"
+  "noPendingOrders": "لا توجد طلبات معلقة",
+  "floweryRider": "سائق فلاوري"
 }
\ No newline at end of file
diff --git a/assets/translations/en.json b/assets/translations/en.json
index 826cd59..14068c5 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -250,5 +250,6 @@
   "userAddress": "User address",
   "accept": "Accept",
   "reject": "Reject",
-  "noPendingOrders": "No pending orders"
+  "noPendingOrders": "No pending orders",
+  "floweryRider": "Flowery Rider"
 }
\ No newline at end of file
diff --git a/lib/app/config/auth_storage/auth_storage.dart b/lib/app/config/auth_storage/auth_storage.dart
index c63dba0..d9b7748 100644
--- a/lib/app/config/auth_storage/auth_storage.dart
+++ b/lib/app/config/auth_storage/auth_storage.dart
@@ -6,10 +6,26 @@ class AuthStorage {
   static const _tokenKey = 'auth_token';
   static const _userKey = 'user_data';
   static const _rememberMeKey = 'remember_me';
+  static const _orderIdKey = 'order_id';
 
   Future<SharedPreferences> get _prefs async =>
       await SharedPreferences.getInstance();
 
+  Future<void> saveOrderId(String orderId) async {
+    final prefs = await _prefs;
+    await prefs.setString(_orderIdKey, orderId);
+  }
+
+  Future<String?> getOrderId() async {
+    final prefs = await _prefs;
+    return prefs.getString(_orderIdKey);
+  }
+
+  Future<void> clearOrderId() async {
+    final prefs = await _prefs;
+    await prefs.remove(_orderIdKey);
+  }
+
   Future<void> saveToken(String token) async {
     final prefs = await _prefs;
     await prefs.setString(_tokenKey, token);
@@ -54,5 +70,6 @@ class AuthStorage {
     await clearToken();
     await clearUser();
     await setRememberMe(false);
+    await clearOrderId();
   }
 }
diff --git a/lib/app/config/di/di.config.dart b/lib/app/config/di/di.config.dart
index 681bd16..86546bf 100644
--- a/lib/app/config/di/di.config.dart
+++ b/lib/app/config/di/di.config.dart
@@ -9,6 +9,7 @@
 // coverage:ignore-file
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'package:cloud_firestore/cloud_firestore.dart' as _i974;
 import 'package:dio/dio.dart' as _i361;
 import 'package:get_it/get_it.dart' as _i174;
 import 'package:injectable/injectable.dart' as _i526;
@@ -59,6 +60,10 @@ import '../../../features/home/data/repo/driverOrderRepo_impl.dart' as _i1020;
 import '../../../features/home/domain/repo/driverOrderRepo.dart' as _i499;
 import '../../../features/home/domain/usecase/getdriverOrderUsecase.dart'
     as _i858;
+import '../../../features/home/domain/usecase/upload_driver_fire_data_use_case.dart'
+    as _i329;
+import '../../../features/home/domain/usecase/upload_order_fire_data_use_case.dart'
+    as _i233;
 import '../../../features/home/presentation/manger/driverorderCubit.dart'
     as _i573;
 import '../../../features/profile/api/profile_lacal_datasource_imp.dart'
@@ -96,9 +101,23 @@ extension GetItInjectableX on _i174.GetIt {
     gh.lazySingleton<_i783.CountryLocalDataSource>(
       () => _i783.CountryLocalDataSourceImpl(),
     );
+    gh.lazySingleton<_i974.FirebaseFirestore>(
+      () => networkModule.firestore,
+      instanceName: 'firestore',
+    );
     gh.lazySingleton<_i361.Dio>(
       () => networkModule.dio(gh<_i603.AuthStorage>()),
     );
+    gh.factory<_i329.UploadDriverFireDataUseCase>(
+      () => _i329.UploadDriverFireDataUseCase(
+        gh<_i974.FirebaseFirestore>(instanceName: 'firestore'),
+      ),
+    );
+    gh.factory<_i233.UploadOrderFireDataUseCase>(
+      () => _i233.UploadOrderFireDataUseCase(
+        gh<_i974.FirebaseFirestore>(instanceName: 'firestore'),
+      ),
+    );
     gh.lazySingleton<_i697.ProfileLocalDataSource>(
       () => _i495.ProfileLocalDataSourceImpl(gh<_i603.AuthStorage>()),
     );
@@ -206,6 +225,9 @@ extension GetItInjectableX on _i174.GetIt {
       () => _i573.DriverOrderCubit(
         gh<_i858.GetDriverOrdersUseCase>(),
         gh<_i603.AuthStorage>(),
+        gh<_i329.UploadDriverFireDataUseCase>(),
+        gh<_i233.UploadOrderFireDataUseCase>(),
+        gh<_i499.DriverOrderRepo>(),
       ),
     );
     gh.factory<_i603.ProfileCubit>(
diff --git a/lib/app/config/network/network_module.dart b/lib/app/config/network/network_module.dart
index fa0d692..c976283 100644
--- a/lib/app/config/network/network_module.dart
+++ b/lib/app/config/network/network_module.dart
@@ -2,6 +2,7 @@ import 'package:dio/dio.dart';
 import 'package:tracking_app/app/config/auth_storage/auth_storage.dart';
 import 'package:tracking_app/app/config/network/interceptor.dart';
 import 'package:injectable/injectable.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:pretty_dio_logger/pretty_dio_logger.dart';
 
 import '../../core/api_manger/api_client.dart';
@@ -37,4 +38,8 @@ abstract class NetworkModule {
 
   @lazySingleton
   ApiClient authApiClient(Dio dio) => ApiClient(dio);
+
+  @lazySingleton
+  @Named('firestore')
+  FirebaseFirestore get firestore => FirebaseFirestore.instance;
 }
diff --git a/lib/app/core/api_manger/api_client.dart b/lib/app/core/api_manger/api_client.dart
index 127fdb7..a216c76 100644
--- a/lib/app/core/api_manger/api_client.dart
+++ b/lib/app/core/api_manger/api_client.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
-import 'package:retrofit/dio.dart';
 import 'package:tracking_app/app/core/values/app_endpoint_strings.dart';
 import 'package:tracking_app/features/auth/data/model/response/change_password_dto.dart';
 import 'package:tracking_app/features/auth/data/model/request/LoginRequest.dart';
diff --git a/lib/app/core/app_constants.dart b/lib/app/core/app_constants.dart
index e185f38..06be015 100644
--- a/lib/app/core/app_constants.dart
+++ b/lib/app/core/app_constants.dart
@@ -37,4 +37,5 @@ class AppConstants {
   static const String english = 'English';
   static const String arabic = 'Arabic';
   static const String logoutFailed = 'Logout failed';
+  static const String floweryRider = 'Flowery Rider';
 }
diff --git a/lib/features/home/api/driverOrderDataS_imp.dart b/lib/features/home/api/driverOrderDataS_imp.dart
index bb658b6..58a9510 100644
--- a/lib/features/home/api/driverOrderDataS_imp.dart
+++ b/lib/features/home/api/driverOrderDataS_imp.dart
@@ -4,6 +4,7 @@ import 'package:tracking_app/app/core/network/api_result.dart';
 import 'package:tracking_app/app/core/network/safe_api_call.dart';
 import 'package:tracking_app/features/home/data/datascourse/driverOrderDatascource.dart';
 import 'package:tracking_app/features/home/data/model/response/orderRespons.dart';
+import 'package:tracking_app/features/profile/data/models/responses/edit_profile_response.dart';
 
 @Injectable(as: DriverOrderDataSource)
 class DriverOrderDataSourceImpl implements DriverOrderDataSource {
@@ -15,4 +16,9 @@ class DriverOrderDataSourceImpl implements DriverOrderDataSource {
   Future<ApiResult<OrderResponse>> getPendingOrders(String token) {
     return safeApiCall(call: () => _apiClient.getPendingOrders(token));
   }
+
+  @override
+  Future<ApiResult<EditProfileResponse>> getProfile(String token) {
+    return safeApiCall(call: () => _apiClient.getProfile(token: token));
+  }
 }
diff --git a/lib/features/home/data/datascourse/driverOrderDatascource.dart b/lib/features/home/data/datascourse/driverOrderDatascource.dart
index 655f8af..b0c7709 100644
--- a/lib/features/home/data/datascourse/driverOrderDatascource.dart
+++ b/lib/features/home/data/datascourse/driverOrderDatascource.dart
@@ -1,6 +1,8 @@
 import 'package:tracking_app/app/core/network/api_result.dart';
 import 'package:tracking_app/features/home/data/model/response/orderRespons.dart';
+import 'package:tracking_app/features/profile/data/models/responses/edit_profile_response.dart';
 
 abstract class DriverOrderDataSource {
   Future<ApiResult<OrderResponse>> getPendingOrders(String token);
+  Future<ApiResult<EditProfileResponse>> getProfile(String token);
 }
diff --git a/lib/features/home/data/repo/driverOrderRepo_impl.dart b/lib/features/home/data/repo/driverOrderRepo_impl.dart
index 56d0dfa..51cad99 100644
--- a/lib/features/home/data/repo/driverOrderRepo_impl.dart
+++ b/lib/features/home/data/repo/driverOrderRepo_impl.dart
@@ -2,6 +2,7 @@ import 'package:injectable/injectable.dart';
 import 'package:tracking_app/app/core/network/api_result.dart';
 import 'package:tracking_app/features/home/data/datascourse/driverOrderDatascource.dart';
 import 'package:tracking_app/features/home/data/model/response/orderRespons.dart';
+import 'package:tracking_app/features/profile/data/models/responses/edit_profile_response.dart';
 import 'package:tracking_app/features/home/domain/repo/driverOrderRepo.dart';
 
 @Injectable(as: DriverOrderRepo)
@@ -14,4 +15,9 @@ class DriverOrderRepositoryImpl implements DriverOrderRepo {
   Future<ApiResult<OrderResponse>> getPendingOrders(String token) {
     return _dataSource.getPendingOrders(token);
   }
+
+  @override
+  Future<ApiResult<EditProfileResponse>> getProfile(String token) {
+    return _dataSource.getProfile(token);
+  }
 }
diff --git a/lib/features/home/domain/repo/driverOrderRepo.dart b/lib/features/home/domain/repo/driverOrderRepo.dart
index d6085cb..5fad3ee 100644
--- a/lib/features/home/domain/repo/driverOrderRepo.dart
+++ b/lib/features/home/domain/repo/driverOrderRepo.dart
@@ -1,6 +1,8 @@
 import 'package:tracking_app/app/core/network/api_result.dart';
 import 'package:tracking_app/features/home/data/model/response/orderRespons.dart';
+import 'package:tracking_app/features/profile/data/models/responses/edit_profile_response.dart';
 
 abstract class DriverOrderRepo {
   Future<ApiResult<OrderResponse>> getPendingOrders(String token);
+  Future<ApiResult<EditProfileResponse>> getProfile(String token);
 }
diff --git a/lib/features/home/domain/usecase/upload_driver_fire_data_use_case.dart b/lib/features/home/domain/usecase/upload_driver_fire_data_use_case.dart
new file mode 100644
index 0000000..89926b5
--- /dev/null
+++ b/lib/features/home/domain/usecase/upload_driver_fire_data_use_case.dart
@@ -0,0 +1,26 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:injectable/injectable.dart';
+import 'package:tracking_app/features/profile/data/models/driver_model.dart';
+
+@injectable
+class UploadDriverFireDataUseCase {
+  final FirebaseFirestore _firestore;
+
+  UploadDriverFireDataUseCase(@Named('firestore') this._firestore);
+
+  Future<void> call(
+    DriverModel driver, {
+    required double lat,
+    required double lng,
+    String? deviceToken,
+  }) async {
+    final driverCollection = _firestore.collection('drivers');
+    await driverCollection.doc(driver.Id).set({
+      'id': driver.Id,
+      'name': '${driver.firstName} ${driver.lastName}',
+      'phone': driver.phone,
+      'currentLocation': {'lat': lat, 'lng': lng},
+      'deviceToken': deviceToken,
+    }, SetOptions(merge: true));
+  }
+}
diff --git a/lib/features/home/domain/usecase/upload_order_fire_data_use_case.dart b/lib/features/home/domain/usecase/upload_order_fire_data_use_case.dart
new file mode 100644
index 0000000..c35f894
--- /dev/null
+++ b/lib/features/home/domain/usecase/upload_order_fire_data_use_case.dart
@@ -0,0 +1,55 @@
+import 'package:cloud_firestore/cloud_firestore.dart' hide Order;
+import 'package:injectable/injectable.dart' hide Order;
+import 'package:tracking_app/features/home/data/model/response/orderRespons.dart';
+
+@injectable
+class UploadOrderFireDataUseCase {
+  final FirebaseFirestore _firestore;
+
+  UploadOrderFireDataUseCase(@Named('firestore') this._firestore);
+
+  Future<void> call({required Order order, required String driverId}) async {
+    final orderCollection = _firestore.collection('orders');
+
+    final data = {
+      'driver_id': driverId,
+      'oder_dt': {
+        'items':
+            order.orderItems
+                ?.map(
+                  (e) => {
+                    'productId': e.product?.id,
+                    'title': e.product?.title,
+                    'quantity': e.quantity,
+                    'price': e.product?.price,
+                    'image': e.product?.imgCover,
+                  },
+                )
+                .toList() ??
+            [],
+        'orderId': order.id,
+        'pickupAddress': {
+          'address': order.store?.address ?? '',
+          'name': order.store?.name ?? '',
+        },
+        'status': order.state ?? 'pending',
+        'totalPrice': order.totalPrice ?? 0,
+        'userAddress':
+            '${order.shippingAddress?.street ?? ''}, ${order.shippingAddress?.city ?? ''}',
+      },
+      'userAddress': {
+        'adress':
+            '${order.shippingAddress?.street ?? ''}, ${order.shippingAddress?.city ?? ''}',
+        'name': '${order.user?.firstName ?? ''} ${order.user?.lastName ?? ''}',
+        'user_id': order.user?.id ?? '',
+      },
+      'user_id': order.user?.id ?? '',
+    };
+
+    if (order.id != null) {
+      await orderCollection.doc(order.id).set(data, SetOptions(merge: true));
+    } else {
+      await orderCollection.add(data);
+    }
+  }
+}
diff --git a/lib/features/home/presentation/manger/driverorderCubit.dart b/lib/features/home/presentation/manger/driverorderCubit.dart
index 6678175..01f5170 100644
--- a/lib/features/home/presentation/manger/driverorderCubit.dart
+++ b/lib/features/home/presentation/manger/driverorderCubit.dart
@@ -1,3 +1,6 @@
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/foundation.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:injectable/injectable.dart' hide Order;
 import 'package:tracking_app/features/home/data/model/response/orderRespons.dart';
@@ -7,14 +10,25 @@ import 'package:tracking_app/app/core/network/api_result.dart';
 import 'package:tracking_app/features/home/domain/usecase/getdriverOrderUsecase.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderIntent.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderStates.dart';
+import 'package:tracking_app/features/home/domain/repo/driverOrderRepo.dart';
+import 'package:tracking_app/features/home/domain/usecase/upload_driver_fire_data_use_case.dart';
+import 'package:tracking_app/features/home/domain/usecase/upload_order_fire_data_use_case.dart';
 
 @injectable
 class DriverOrderCubit extends Cubit<DriverOrderState> {
   final GetDriverOrdersUseCase _getDriverOrdersUseCase;
   final AuthStorage _authStorage;
+  final UploadDriverFireDataUseCase _uploadDriverFireDataUseCase;
+  final UploadOrderFireDataUseCase _uploadOrderFireDataUseCase;
+  final DriverOrderRepo _driverOrderRepository;
 
-  DriverOrderCubit(this._getDriverOrdersUseCase, this._authStorage)
-    : super(DriverOrderState());
+  DriverOrderCubit(
+    this._getDriverOrdersUseCase,
+    this._authStorage,
+    this._uploadDriverFireDataUseCase,
+    this._uploadOrderFireDataUseCase,
+    this._driverOrderRepository,
+  ) : super(DriverOrderState());
 
   void onIntent(DriverOrderIntent intent) {
     switch (intent) {
@@ -22,6 +36,8 @@ class DriverOrderCubit extends Cubit<DriverOrderState> {
         _getPendingOrders();
       case RemoveOrder(order: final order):
         _removeOrder(order);
+      case AcceptOrder(order: final order):
+        _acceptOrder(order);
     }
   }
 
@@ -43,6 +59,72 @@ class DriverOrderCubit extends Cubit<DriverOrderState> {
     }
   }
 
+  Future<void> _acceptOrder(Order order) async {
+    final token = await _authStorage.getToken();
+    if (token == null) return;
+
+    final result = await _driverOrderRepository.getProfile(token);
+
+    if (result is SuccessApiResult) {
+      final profile = (result as SuccessApiResult).data;
+      if (profile.driver != null) {
+        try {
+          final position = await _determinePosition();
+          if (position == null) {
+            if (kDebugMode)
+              print("Location permission denied or service disabled.");
+            return;
+          }
+
+          final deviceToken = await FirebaseMessaging.instance.getToken();
+          await _uploadDriverFireDataUseCase(
+            profile.driver!,
+            lat: position.latitude,
+            lng: position.longitude,
+            deviceToken: deviceToken,
+          );
+
+          await _uploadOrderFireDataUseCase(
+            order: order,
+            driverId: profile.driver?.Id ?? '',
+          );
+
+          if (order.id != null) {
+            await _authStorage.saveOrderId(order.id!);
+          }
+        } catch (e) {
+          if (kDebugMode) {
+            print("Firestore/Location Error: $e");
+          }
+        }
+      }
+    }
+  }
+
+  Future<Position?> _determinePosition() async {
+    bool serviceEnabled;
+    LocationPermission permission;
+
+    serviceEnabled = await Geolocator.isLocationServiceEnabled();
+    if (!serviceEnabled) {
+      return null;
+    }
+
+    permission = await Geolocator.checkPermission();
+    if (permission == LocationPermission.denied) {
+      permission = await Geolocator.requestPermission();
+      if (permission == LocationPermission.denied) {
+        return null;
+      }
+    }
+
+    if (permission == LocationPermission.deniedForever) {
+      return null;
+    }
+
+    return await Geolocator.getCurrentPosition();
+  }
+
   Future<void> _getPendingOrders() async {
     emit(state.copyWith(orderResource: Resource.loading()));
     final token = await _authStorage.getToken();
diff --git a/lib/features/home/presentation/manger/driverorderIntent.dart b/lib/features/home/presentation/manger/driverorderIntent.dart
index bb0ed20..9f88440 100644
--- a/lib/features/home/presentation/manger/driverorderIntent.dart
+++ b/lib/features/home/presentation/manger/driverorderIntent.dart
@@ -8,3 +8,8 @@ class RemoveOrder extends DriverOrderIntent {
   final Order order;
   RemoveOrder(this.order);
 }
+
+class AcceptOrder extends DriverOrderIntent {
+  final Order order;
+  AcceptOrder(this.order);
+}
diff --git a/lib/features/home/presentation/pages/driverOrderScreen.dart b/lib/features/home/presentation/pages/driverOrderScreen.dart
index c4804f9..41b2d8e 100644
--- a/lib/features/home/presentation/pages/driverOrderScreen.dart
+++ b/lib/features/home/presentation/pages/driverOrderScreen.dart
@@ -1,6 +1,10 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:tracking_app/generated/locale_keys.g.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:tracking_app/app/config/di/di.dart';
+import 'package:tracking_app/app/core/ui_helper/color/colors.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderCubit.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderIntent.dart';
 import 'package:tracking_app/features/home/presentation/widgets/driverScreenBody.dart';
@@ -13,7 +17,15 @@ class DriverOrderScreen extends StatelessWidget {
     return BlocProvider(
       create: (context) =>
           getIt<DriverOrderCubit>()..onIntent(GetPendingOrders()),
-      child: const DriverOrderBody(),
+      child: Scaffold(
+        appBar: AppBar(
+          title: Text(
+            LocaleKeys.floweryRider.tr(),
+            style: const TextStyle(color: AppColors.pink),
+          ),
+        ),
+        body: const DriverOrderBody(),
+      ),
     );
   }
 }
diff --git a/lib/features/home/presentation/widgets/driverOrderButton.dart b/lib/features/home/presentation/widgets/driverOrderButton.dart
index 4cb310d..6759d98 100644
--- a/lib/features/home/presentation/widgets/driverOrderButton.dart
+++ b/lib/features/home/presentation/widgets/driverOrderButton.dart
@@ -14,10 +14,15 @@ class DriverOrderButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final width = MediaQuery.of(context).size.width;
+    final height = MediaQuery.of(context).size.height;
     return InkWell(
       onTap: onTap,
       child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
+        padding: EdgeInsets.symmetric(
+          horizontal: width * 0.06,
+          vertical: height * 0.012,
+        ),
         decoration: BoxDecoration(
           color: isPrimary ? const Color(0xFFE91E63) : Colors.white,
           borderRadius: BorderRadius.circular(24),
@@ -27,7 +32,7 @@ class DriverOrderButton extends StatelessWidget {
           text,
           style: TextStyle(
             color: isPrimary ? Colors.white : const Color(0xFFE91E63),
-            fontSize: 14,
+            fontSize: width * 0.035,
             fontWeight: FontWeight.w500,
           ),
         ),
diff --git a/lib/features/home/presentation/widgets/driverOrderInfoCard.dart b/lib/features/home/presentation/widgets/driverOrderInfoCard.dart
index 5ec8b15..c8b668a 100644
--- a/lib/features/home/presentation/widgets/driverOrderInfoCard.dart
+++ b/lib/features/home/presentation/widgets/driverOrderInfoCard.dart
@@ -16,8 +16,10 @@ class DriverOrderInfoCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final width = MediaQuery.of(context).size.width;
+    final height = MediaQuery.of(context).size.height;
     return Container(
-      padding: const EdgeInsets.all(12),
+      padding: EdgeInsets.all(width * 0.03),
       decoration: BoxDecoration(
         color: const Color(0xFFF9F9F9),
         borderRadius: BorderRadius.circular(12),
@@ -26,8 +28,8 @@ class DriverOrderInfoCard extends StatelessWidget {
       child: Row(
         children: [
           Container(
-            width: 50,
-            height: 50,
+            width: width * 0.12,
+            height: width * 0.12,
             decoration: BoxDecoration(
               shape: BoxShape.circle,
               color: isStore ? const Color(0xFFE91E63) : Colors.grey[300],
@@ -45,33 +47,33 @@ class DriverOrderInfoCard extends StatelessWidget {
                   )
                 : null,
           ),
-          const SizedBox(width: 12),
+          SizedBox(width: width * 0.03),
           Expanded(
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Text(
                   title,
-                  style: const TextStyle(
-                    fontSize: 14,
+                  style: TextStyle(
+                    fontSize: width * 0.035,
                     fontWeight: FontWeight.w500,
-                    color: Color(0xFF2D2D2D),
+                    color: const Color(0xFF2D2D2D),
                   ),
                 ),
-                const SizedBox(height: 4),
+                SizedBox(height: height * 0.005),
                 Row(
                   children: [
-                    const Icon(
+                    Icon(
                       Icons.location_on_outlined,
-                      size: 14,
+                      size: width * 0.035,
                       color: Colors.black54,
                     ),
-                    const SizedBox(width: 4),
+                    SizedBox(width: width * 0.01),
                     Expanded(
                       child: Text(
                         subtitle,
-                        style: const TextStyle(
-                          fontSize: 12,
+                        style: TextStyle(
+                          fontSize: width * 0.03,
                           color: Colors.black54,
                         ),
                         maxLines: 1,
diff --git a/lib/features/home/presentation/widgets/driverOrderItem.dart b/lib/features/home/presentation/widgets/driverOrderItem.dart
index abf3278..271950d 100644
--- a/lib/features/home/presentation/widgets/driverOrderItem.dart
+++ b/lib/features/home/presentation/widgets/driverOrderItem.dart
@@ -4,6 +4,7 @@ import 'package:tracking_app/features/home/data/model/response/orderRespons.dart
 import 'package:tracking_app/features/home/presentation/widgets/driverOrderButton.dart';
 import 'package:tracking_app/features/home/presentation/widgets/driverOrderInfoCard.dart';
 import 'package:tracking_app/features/home/presentation/widgets/driverOrderSectionLabel.dart';
+import 'package:tracking_app/generated/locale_keys.g.dart';
 
 class DriverOrderItem extends StatelessWidget {
   final Order order;
@@ -19,9 +20,14 @@ class DriverOrderItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final width = MediaQuery.of(context).size.width;
+    final height = MediaQuery.of(context).size.height;
     return Container(
-      margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      padding: const EdgeInsets.all(16),
+      margin: EdgeInsets.symmetric(
+        horizontal: width * 0.04,
+        vertical: height * 0.01,
+      ),
+      padding: EdgeInsets.all(width * 0.04),
       decoration: BoxDecoration(
         color: Colors.white,
         borderRadius: BorderRadius.circular(12),
@@ -37,39 +43,40 @@ class DriverOrderItem extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Text(
-            "driverOrderTitle".tr(),
+            LocaleKeys.driverOrderTitle.tr(),
             style: const TextStyle(
               fontSize: 16,
               fontWeight: FontWeight.bold,
               color: Color(0xFF2D2D2D),
             ),
           ),
-          const SizedBox(height: 16),
-          DriverOrderSectionLabel("pickupAddress".tr()),
-          const SizedBox(height: 8),
+          SizedBox(height: height * 0.02),
+          DriverOrderSectionLabel(LocaleKeys.pickupAddress.tr()),
+          SizedBox(height: height * 0.01),
           DriverOrderInfoCard(
             image: order.store?.image,
-            title: order.store?.name ?? "unknownStore".tr(),
-            subtitle: order.store?.address ?? "noAddress".tr(),
+            title: order.store?.name ?? LocaleKeys.unknownStore.tr(),
+            subtitle: order.store?.address ?? LocaleKeys.noAddress.tr(),
             isStore: true,
           ),
-          const SizedBox(height: 16),
-          DriverOrderSectionLabel("userAddress".tr()),
-          const SizedBox(height: 8),
+          SizedBox(height: height * 0.02),
+          DriverOrderSectionLabel(LocaleKeys.userAddress.tr()),
+          SizedBox(height: height * 0.01),
           DriverOrderInfoCard(
             image: order.user?.photo != null
                 ? "https://flower.elevateegy.com/uploads/${order.user!.photo!}"
                 : null,
             title:
                 "${order.user?.firstName ?? ''} ${order.user?.lastName ?? ''}",
-            subtitle: order.shippingAddress?.street ?? "noAddress".tr(),
+            subtitle:
+                order.shippingAddress?.street ?? LocaleKeys.noAddress.tr(),
             isStore: false,
           ),
-          const SizedBox(height: 24),
+          SizedBox(height: height * 0.03),
           Row(
             children: [
               Text(
-                "${order.totalPrice ?? 0} ${"egp".tr()}",
+                "${order.totalPrice ?? 0} ${LocaleKeys.egp.tr()}",
                 style: const TextStyle(
                   fontSize: 16,
                   fontWeight: FontWeight.bold,
@@ -78,13 +85,13 @@ class DriverOrderItem extends StatelessWidget {
               ),
               const Spacer(),
               DriverOrderButton(
-                text: "reject".tr(),
+                text: LocaleKeys.reject.tr(),
                 onTap: onReject,
                 isPrimary: false,
               ),
-              const SizedBox(width: 8),
+              SizedBox(width: width * 0.02),
               DriverOrderButton(
-                text: "accept".tr(),
+                text: LocaleKeys.accept.tr(),
                 onTap: onAccept,
                 isPrimary: true,
               ),
diff --git a/lib/features/home/presentation/widgets/driverOrderSectionLabel.dart b/lib/features/home/presentation/widgets/driverOrderSectionLabel.dart
index eb08938..f15fb59 100644
--- a/lib/features/home/presentation/widgets/driverOrderSectionLabel.dart
+++ b/lib/features/home/presentation/widgets/driverOrderSectionLabel.dart
@@ -6,6 +6,10 @@ class DriverOrderSectionLabel extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Text(text, style: const TextStyle(fontSize: 14, color: Colors.grey));
+    final width = MediaQuery.of(context).size.width;
+    return Text(
+      text,
+      style: TextStyle(fontSize: width * 0.035, color: Colors.grey),
+    );
   }
 }
diff --git a/lib/features/home/presentation/widgets/driverScreenBody.dart b/lib/features/home/presentation/widgets/driverScreenBody.dart
index 5c4695b..9f97a0b 100644
--- a/lib/features/home/presentation/widgets/driverScreenBody.dart
+++ b/lib/features/home/presentation/widgets/driverScreenBody.dart
@@ -6,6 +6,7 @@ import 'package:tracking_app/features/home/presentation/manger/driverorderCubit.
 import 'package:tracking_app/features/home/presentation/manger/driverorderIntent.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderStates.dart';
 import 'package:tracking_app/features/home/presentation/widgets/driverOrderItem.dart';
+import 'package:tracking_app/generated/locale_keys.g.dart';
 
 class DriverOrderBody extends StatefulWidget {
   const DriverOrderBody({super.key});
@@ -28,7 +29,7 @@ class _DriverOrderBodyState extends State<DriverOrderBody> {
         if (resource.status == Status.error) {
           return Center(
             child: Text(
-              resource.error ?? "unknownError".tr(),
+              resource.error ?? LocaleKeys.unknownError.tr(),
               style: const TextStyle(color: Colors.red),
             ),
           );
@@ -37,7 +38,7 @@ class _DriverOrderBodyState extends State<DriverOrderBody> {
         if (resource.status == Status.success) {
           final orders = resource.data?.orders ?? [];
           if (orders.isEmpty) {
-            return Center(child: Text("noPendingOrders".tr()));
+            return Center(child: Text(LocaleKeys.noPendingOrders.tr()));
           }
           return RefreshIndicator(
             onRefresh: () async {
@@ -48,7 +49,11 @@ class _DriverOrderBodyState extends State<DriverOrderBody> {
               itemBuilder: (context, index) {
                 return DriverOrderItem(
                   order: orders[index],
-                  onAccept: () {},
+                  onAccept: () {
+                    context.read<DriverOrderCubit>().onIntent(
+                      AcceptOrder(orders[index]),
+                    );
+                  },
                   onReject: () {
                     context.read<DriverOrderCubit>().onIntent(
                       RemoveOrder(orders[index]),
diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart
index 47bfd51..bc697fc 100644
--- a/lib/generated/locale_keys.g.dart
+++ b/lib/generated/locale_keys.g.dart
@@ -186,12 +186,12 @@ abstract class LocaleKeys {
   static const failed_to_save_address = 'failed_to_save_address';
   static const addNewAddress = 'addNewAddress';
   static const savedAddress = 'savedAddress';
-  static const discount = 'discount';
   static const sortBy = 'sortBy';
   static const lowestPrice = 'lowestPrice';
   static const highestPrice = 'highestPrice';
   static const newest = 'newest';
   static const oldest = 'oldest';
+  static const discount = 'discount';
   static const filter = 'filter';
   static const active = 'active';
   static const completed = 'completed';
@@ -246,4 +246,13 @@ abstract class LocaleKeys {
   static const editDriverProfile = 'editDriverProfile';
   static const editVehicle = 'editVehicle';
   static const cannotBeSame = 'cannotBeSame';
+  static const driverOrderTitle = 'driverOrderTitle';
+  static const pickupAddress = 'pickupAddress';
+  static const unknownStore = 'unknownStore';
+  static const noAddress = 'noAddress';
+  static const userAddress = 'userAddress';
+  static const accept = 'accept';
+  static const reject = 'reject';
+  static const noPendingOrders = 'noPendingOrders';
+  static const floweryRider = 'floweryRider';
 }
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index cac8596..e884426 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,6 +5,7 @@
 import FlutterMacOS
 import Foundation
 
+import cloud_firestore
 import file_selector_macos
 import firebase_core
 import firebase_crashlytics
@@ -15,6 +16,7 @@ import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index 78e44c7..310feec 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -161,6 +161,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.2"
+  cloud_firestore:
+    dependency: "direct main"
+    description:
+      name: cloud_firestore
+      sha256: "54484b2fc49f41b46f35b60a54b12351181eeaad22c0e3def276a81e17ae7c9b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.2"
+  cloud_firestore_platform_interface:
+    dependency: transitive
+    description:
+      name: cloud_firestore_platform_interface
+      sha256: dfaa8b2c0d0a824af289d4159816a5c78417feec264c2194081d645687195158
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.6"
+  cloud_firestore_web:
+    dependency: transitive
+    description:
+      name: cloud_firestore_web
+      sha256: "35d01f502b3b701d700470d32a8f82704dac8341a66e86c074900cde5bab343d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.2"
   code_builder:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index f19b393..01460f4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -37,6 +37,7 @@ dependencies:
   firebase_messaging: ^16.1.1
   flutter_local_notifications: ^20.0.0
   firebase_crashlytics: ^5.0.7
+  cloud_firestore: 6.1.2
 
 dev_dependencies:
   bloc_test: ^10.0.0
diff --git a/test/features/home/presentation/manger/driverorderCubit_test.dart b/test/features/home/presentation/manger/driverorderCubit_test.dart
index 7982394..41faf4b 100644
--- a/test/features/home/presentation/manger/driverorderCubit_test.dart
+++ b/test/features/home/presentation/manger/driverorderCubit_test.dart
@@ -8,16 +8,26 @@ import 'package:tracking_app/app/core/network/api_result.dart';
 import 'package:tracking_app/features/home/data/model/response/orderRespons.dart';
 import 'package:tracking_app/features/home/domain/repo/driverOrderRepo.dart';
 import 'package:tracking_app/features/home/domain/usecase/getdriverOrderUsecase.dart';
+import 'package:tracking_app/features/home/domain/usecase/getdriverOrderUsecase.dart';
+import 'package:tracking_app/features/home/domain/usecase/upload_driver_fire_data_use_case.dart';
+import 'package:tracking_app/features/home/domain/usecase/upload_order_fire_data_use_case.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderCubit.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderIntent.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderStates.dart';
 
 import 'driverorderCubit_test.mocks.dart';
 
-@GenerateMocks([DriverOrderRepo, AuthStorage])
+@GenerateMocks([
+  DriverOrderRepo,
+  AuthStorage,
+  UploadDriverFireDataUseCase,
+  UploadOrderFireDataUseCase,
+])
 void main() {
   late DriverOrderCubit driverOrderCubit;
   late MockDriverOrderRepo mockDriverOrderRepo;
+  late MockUploadDriverFireDataUseCase mockUploadDriverFireDataUseCase;
+  late MockUploadOrderFireDataUseCase mockUploadOrderFireDataUseCase;
   late GetDriverOrdersUseCase getDriverOrdersUseCase;
   late MockAuthStorage mockAuthStorage;
 
@@ -27,10 +37,15 @@ void main() {
     );
     mockDriverOrderRepo = MockDriverOrderRepo();
     mockAuthStorage = MockAuthStorage();
+    mockUploadDriverFireDataUseCase = MockUploadDriverFireDataUseCase();
+    mockUploadOrderFireDataUseCase = MockUploadOrderFireDataUseCase();
     getDriverOrdersUseCase = GetDriverOrdersUseCase(mockDriverOrderRepo);
     driverOrderCubit = DriverOrderCubit(
       getDriverOrdersUseCase,
       mockAuthStorage,
+      mockUploadDriverFireDataUseCase,
+      mockUploadOrderFireDataUseCase,
+      mockDriverOrderRepo,
     );
   });
 
diff --git a/test/features/home/presentation/pages/driverOrderScreen_test.dart b/test/features/home/presentation/pages/driverOrderScreen_test.dart
index 3cc14dc..ec577d3 100644
--- a/test/features/home/presentation/pages/driverOrderScreen_test.dart
+++ b/test/features/home/presentation/pages/driverOrderScreen_test.dart
@@ -10,16 +10,26 @@ import 'package:tracking_app/app/core/network/api_result.dart';
 import 'package:tracking_app/features/home/data/model/response/orderRespons.dart';
 import 'package:tracking_app/features/home/domain/repo/driverOrderRepo.dart';
 import 'package:tracking_app/features/home/domain/usecase/getdriverOrderUsecase.dart';
+import 'package:tracking_app/features/home/domain/usecase/getdriverOrderUsecase.dart';
+import 'package:tracking_app/features/home/domain/usecase/upload_driver_fire_data_use_case.dart';
+import 'package:tracking_app/features/home/domain/usecase/upload_order_fire_data_use_case.dart';
 import 'package:tracking_app/features/home/presentation/manger/driverorderCubit.dart';
 import 'package:tracking_app/features/home/presentation/pages/driverOrderScreen.dart';
 import 'package:tracking_app/features/home/presentation/widgets/driverOrderItem.dart';
 
 import 'driverOrderScreen_test.mocks.dart';
 
-@GenerateMocks([DriverOrderRepo, AuthStorage])
+@GenerateMocks([
+  DriverOrderRepo,
+  AuthStorage,
+  UploadDriverFireDataUseCase,
+  UploadOrderFireDataUseCase,
+])
 void main() {
   late MockDriverOrderRepo mockDriverOrderRepo;
   late MockAuthStorage mockAuthStorage;
+  late MockUploadDriverFireDataUseCase mockUploadDriverFireDataUseCase;
+  late MockUploadOrderFireDataUseCase mockUploadOrderFireDataUseCase;
   late GetDriverOrdersUseCase getDriverOrdersUseCase;
 
   setUpAll(() async {
@@ -30,6 +40,8 @@ void main() {
   setUp(() async {
     mockDriverOrderRepo = MockDriverOrderRepo();
     mockAuthStorage = MockAuthStorage();
+    mockUploadDriverFireDataUseCase = MockUploadDriverFireDataUseCase();
+    mockUploadOrderFireDataUseCase = MockUploadOrderFireDataUseCase();
     getDriverOrdersUseCase = GetDriverOrdersUseCase(mockDriverOrderRepo);
 
     provideDummy<ApiResult<OrderResponse>>(
@@ -38,7 +50,13 @@ void main() {
 
     await GetIt.I.reset();
     GetIt.I.registerFactory<DriverOrderCubit>(
-      () => DriverOrderCubit(getDriverOrdersUseCase, mockAuthStorage),
+      () => DriverOrderCubit(
+        getDriverOrdersUseCase,
+        mockAuthStorage,
+        mockUploadDriverFireDataUseCase,
+        mockUploadOrderFireDataUseCase,
+        mockDriverOrderRepo,
+      ),
     );
   });
 
diff --git a/test/features/home/presentation/widgets/driverOrderSectionLabel_test.dart b/test/features/home/presentation/widgets/driverOrderSectionLabel_test.dart
deleted file mode 100644
index 0105e4e..0000000
--- a/test/features/home/presentation/widgets/driverOrderSectionLabel_test.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:tracking_app/features/home/presentation/widgets/driverOrderSectionLabel.dart';
-
-void main() {
-  testWidgets('DriverOrderSectionLabel renders correct text and style', (
-    tester,
-  ) async {
-    const labelText = 'Test Label';
-    await tester.pumpWidget(
-      const MaterialApp(
-        home: Scaffold(body: DriverOrderSectionLabel(labelText)),
-      ),
-    );
-
-    // Verify text is rendered
-    expect(find.text(labelText), findsOneWidget);
-
-    // Verify text style
-    final textWidget = tester.widget<Text>(find.text(labelText));
-    expect(textWidget.style?.fontSize, 14);
-    expect(textWidget.style?.color, Colors.grey);
-  });
-}
diff --git a/web/firebase-messaging-sw.js b/web/firebase-messaging-sw.js
new file mode 100644
index 0000000..32d89e8
--- /dev/null
+++ b/web/firebase-messaging-sw.js
@@ -0,0 +1,25 @@
+importScripts("https://www.gstatic.com/firebasejs/8.10.0/firebase-app.js");
+importScripts("https://www.gstatic.com/firebasejs/8.10.0/firebase-messaging.js");
+
+firebase.initializeApp({
+  apiKey: "AIzaSyDKWdkFjeKkEAfKFrMO2svs48t2d9OqRGw",
+  appId: "1:725835190067:web:86225b1572d53a90e53846",
+  messagingSenderId: "725835190067",
+  projectId: "elevate-flower-app",
+  authDomain: "elevate-flower-app.firebaseapp.com",
+  storageBucket: "elevate-flower-app.firebasestorage.app"
+});
+
+const messaging = firebase.messaging();
+
+messaging.onBackgroundMessage(function(payload) {
+  console.log('[firebase-messaging-sw.js] Received background message ', payload);
+  const notificationTitle = payload.notification.title;
+  const notificationOptions = {
+    body: payload.notification.body,
+    icon: '/icons/Icon-192.png'
+  };
+
+  self.registration.showNotification(notificationTitle,
+    notificationOptions);
+});
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index b762e91..8e904a1 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,12 +6,15 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <cloud_firestore/cloud_firestore_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
 #include <firebase_core/firebase_core_plugin_c_api.h>
 #include <geolocator_windows/geolocator_windows.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  CloudFirestorePluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("CloudFirestorePluginCApi"));
   FileSelectorWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FileSelectorWindows"));
   FirebaseCorePluginCApiRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index b5e0031..8d3f745 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  cloud_firestore
   file_selector_windows
   firebase_core
   geolocator_windows