diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart
index 263efa1a..a147cfd5 100644
--- a/lib/controllers/api_routes/urls.dart
+++ b/lib/controllers/api_routes/urls.dart
@@ -10,7 +10,7 @@ class URLs {
   static String _baseUrl = "$_host/mobile";
   // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
   // static final String _baseUrl = "$_host/mobile"; // host local UAT
-  // static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis
+  // static final String _baseUrl = "$_host/v3/mobile"; // v3 for new CM,PM,TM
 
   static String _host = host1;
 
diff --git a/lib/extensions/context_extension.dart b/lib/extensions/context_extension.dart
index ae450626..bab455de 100644
--- a/lib/extensions/context_extension.dart
+++ b/lib/extensions/context_extension.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
+import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart';
 
 import '../controllers/providers/settings/setting_provider.dart';
@@ -16,7 +17,7 @@ extension BuildContextExtension on BuildContext {
   bool get isAr => Provider.of<SettingProvider>(this).language == "ar";
 
   SettingProvider get settingProvider => Provider.of<SettingProvider>(this, listen: false);
-  // UserProvider get userProvider => Provider.of<UserProvider>(this, listen: false);
+  UserProvider get userProvider => Provider.of<UserProvider>(this, listen: false);
 
   void showConfirmDialog(String message, {String? title, VoidCallback? onTap}) => showDialog(
         context: this,
diff --git a/lib/main.dart b/lib/main.dart
index 71d84aa9..c709d9bf 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -97,16 +97,16 @@ import 'new_views/pages/gas_refill_request_form.dart';
 import 'providers/service_request_providers/loan_availability_provider.dart';
 import 'providers/service_request_providers/reject_reason_provider.dart';
 
-class MyHttpOverrides extends HttpOverrides {
-  @override
-  HttpClient createHttpClient(SecurityContext? context) {
-    return super.createHttpClient(context)..badCertificateCallback = (X509Certificate cert, String host, int port) => true;
-  }
-}
+// class MyHttpOverrides extends HttpOverrides {
+//   @override
+//   HttpClient createHttpClient(SecurityContext? context) {
+//     return super.createHttpClient(context)..badCertificateCallback = (X509Certificate cert, String host, int port) => true;
+//   }
+// }
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  HttpOverrides.global = MyHttpOverrides(); // for later use.
+  // HttpOverrides.global = MyHttpOverrides(); // for later use.
   _configureLocalTimeZone();
   NotificationManger.initialisation((notificationDetails) {}, (id, title, body, payload) async {});
 
diff --git a/lib/models/new_models/gas_refill_model.dart b/lib/models/new_models/gas_refill_model.dart
index 0670dc28..37ccbdc3 100644
--- a/lib/models/new_models/gas_refill_model.dart
+++ b/lib/models/new_models/gas_refill_model.dart
@@ -123,10 +123,8 @@ class GasRefillModel {
       json['gasRefillContactPerson'].forEach((v) {
         gasRefillContactPerson?.add(GasRefillContactPerson.fromJson(v));
       });
-
     }
 
-
     // try {
     //   final DateTime? sd = DateTime.tryParse(startDate ?? "");
     //   final DateTime? st = DateTime.tryParse(startTime ?? "");
diff --git a/lib/modules/cm_module/views/components/service_request_detail_view.dart b/lib/modules/cm_module/views/components/service_request_detail_view.dart
index 358b0ca2..c6b2d25c 100644
--- a/lib/modules/cm_module/views/components/service_request_detail_view.dart
+++ b/lib/modules/cm_module/views/components/service_request_detail_view.dart
@@ -68,8 +68,10 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
                               initialVisitCard(requestDetailProvider: requestProvider, userProvider: _userProvider),
                               assetDetailCard(requestDetailProvider: requestProvider, userProvider: _userProvider),
                               12.height,
-                              costCard(context, requestProvider),
-                              12.height,
+                              if (context.userProvider.user!.type == UsersTypes.engineer) ...[
+                                costCard(context, requestProvider),
+                                12.height,
+                              ],
                               contactInfoCard(context, requestProvider.currentWorkOrder!.data!),
                               20.height,
                             ],
@@ -120,7 +122,7 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
                           ),
                           8.width,
                         ],
-                        if(workOrder.itgFormWorkOrderStatus!=null)...[
+                        if (workOrder.itgFormWorkOrderStatus != null) ...[
                           StatusLabel(
                             label: workOrder.itgFormWorkOrderStatus,
                             id: 0,
diff --git a/lib/views/pages/user/gas_refill/gas_refill_details.dart b/lib/views/pages/user/gas_refill/gas_refill_details.dart
index b945a479..46a05f28 100644
--- a/lib/views/pages/user/gas_refill/gas_refill_details.dart
+++ b/lib/views/pages/user/gas_refill/gas_refill_details.dart
@@ -11,7 +11,6 @@ import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/string_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
-import 'package:test_sa/new_views/pages/gas_refill_request_form.dart';
 import 'package:test_sa/views/pages/user/gas_refill/update_gas_refill_request.dart';
 import 'package:test_sa/views/widgets/images/files_list.dart';
 import 'package:test_sa/views/widgets/loaders/app_loading.dart';