device transfer gas refill merged in ppm_newflow

lib/controllers/providers/api/gas_refill_comments.dart

@@ -47,7 +47,7 @@ class GasRefillCommentsProvider extends ChangeNotifier {
     notifyListeners();
     late Response response;
     try {
-      response = await ApiManager.instance.get(URLs.getGasRefillComments + "?gasRefillId=$callId");
+      response = await ApiManager.instance.get(URLs.getGazRefillComments + "?gasRefillId=$callId");
 
       stateCode = response.statusCode;
       if (response.statusCode >= 200 && response.statusCode < 300) {
@@ -87,7 +87,7 @@ class GasRefillCommentsProvider extends ChangeNotifier {
     late Response response;
     try {
       showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
-      response = await ApiManager.instance.post(URLs.addGasRefillComment, body: {"id": 0, "gasRefillId": id, "comment": comment});
+      response = await ApiManager.instance.post(URLs.addGazRefillComment, body: {"id": 0, "gasRefillId": id, "comment": comment});
 
       stateCode = response.statusCode;
       if (response.statusCode >= 200 && response.statusCode < 300) {

lib/l10n/app_ar.arb

@@ -551,8 +551,8 @@
                 "externalEngineerName": "اسم المهندس الخارجي",
                 "telephone": "الهاتف",
                 "transferAsset": "نقل الأصل",
-                 "createAssetTransferRequest": "إنشاء طلب نقل أصل"
-                "telephone": "الهاتف",
+                 "createAssetTransferRequest": "إنشاء طلب نقل أصل",
+
                 "arrivedDate": "تاريخ الوصول",
                   "closedDate": "تاريخ الإغلاق",
                   "since": "منذ",

lib/l10n/app_en.arb

@@ -552,9 +552,9 @@
             "attachments": "Attachments",
               "supplierName": "Supplier Name",
               "externalEngineerName": "External Engineer Name",
-              "telephone": "Telephone",
+
               "transferAsset": "Transfer Asset",
-              "createAssetTransferRequest": "Create Asset Transfer Request"
+              "createAssetTransferRequest": "Create Asset Transfer Request",
               "telephone": "Telephone",
               "arrivedDate": "Arrived Date",
                 "closedDate": "Closed Date",

lib/new_views/common_widgets/default_app_bar.dart

@@ -14,8 +14,9 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
   final Function? onBackPress;
   final bool showHomeActionButton;
   final VoidCallback? onWillPopScope;
+  final TextStyle? titleStyle;
 
-  const DefaultAppBar({this.title, this.onBackPress, this.onWillPopScope, this.actions, this.showHomeActionButton = false, Key? key}) : super(key: key);
+  const DefaultAppBar({this.title, this.onBackPress, this.onWillPopScope, this.actions,this.titleStyle, this.showHomeActionButton = false, Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -63,7 +64,7 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
           10.width,
           Text(
             title ?? "",
-            style: AppTextStyles.heading3.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
+            style:titleStyle?? AppTextStyles.heading3.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
           ).expanded,
         ],
       ),

lib/service_request_latest/views/components/activities_list_view.dart

@@ -364,7 +364,7 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
       ],
     ).toShadowContainer(context, padding: 12, showShadow: false).onPress(() {
       if (requestDetailProvider.isReadOnlyRequest) {
-        onEditMaintenanceRequestPress(context: context, requestDetailProvider: requestDetailProvider, activity: activity);
+        // onEditMaintenanceRequestPress(context: context, requestDetailProvider: requestDetailProvider, activity: activity);
       }
     });
   }