improvements

lib/controllers/providers/api/user_provider.dart

@@ -68,7 +68,13 @@ class UserProvider extends ChangeNotifier {
 
   List<ModulesPermissionsModel> get modulesPermissionsList => _modulesPermissionsModel;
 
-  ModulesPermissionsModel currentModelPermission(int moduleId) => ModulesPermissionsModel.fromJson(_modulesPermissionsModel.singleWhere((module) => module.module!.value == moduleId).toJson());
+  ModulesPermissionsModel? currentModelPermission(int moduleId) {
+    try {
+      return ModulesPermissionsModel.fromJson(_modulesPermissionsModel.singleWhere((module) => module.module!.value == moduleId).toJson());
+    } catch (ex) {
+      return null;
+    }
+  }
 
   set swipeHistory(List<SwipeHistory> value) {
     _swipeHistory = value;

lib/main.dart

@@ -68,6 +68,7 @@ import 'package:test_sa/modules/applicationDemo/providers/application_demo_reque
 import 'package:test_sa/modules/applicationDemo/screens/application_demo_request_form_screen.dart';
 import 'package:test_sa/modules/tm_module/gas_refill/create_gas_refill_request.dart';
 import 'package:test_sa/modules/tm_module/gas_refill/update_gas_refill_request.dart';
+import 'package:test_sa/modules/traf_module/traf_request_provider.dart';
 import 'package:test_sa/new_views/app_style/app_themes.dart';
 import 'package:test_sa/new_views/pages/help_center_page.dart';
 import 'package:test_sa/new_views/pages/land_page/land_page.dart';
@@ -332,6 +333,7 @@ class MyApp extends StatelessWidget {
         ChangeNotifierProvider(create: (_) => LoanProvider(), lazy: true),
         ChangeNotifierProvider(create: (_) => LoanPeriodProvider(), lazy: true),
         ChangeNotifierProvider(create: (_) => DemoProvider(), lazy: true),
+        ChangeNotifierProvider(create: (_) => TrafRequestProvider(), lazy: true),
 
         // MEDICAL GAS INSPECTION PROVIDERS (4)
         ChangeNotifierProvider(create: (_) => MedicalGasOrderTypeProvider(), lazy: true),

lib/modules/incident_module/incident_detail_page.dart

@@ -33,7 +33,8 @@ class IncidentDetailPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: const DefaultAppBar(title: "Request Details"),
-        body: FutureBuilder<IncidentDataModel?>(
+        body: SafeArea(
+          child: FutureBuilder<IncidentDataModel?>(
               future: Provider.of<IncidentProvider>(context, listen: false).getIncidentById(incidentId),
               builder: (BuildContext context, AsyncSnapshot<IncidentDataModel?> snapshot) {
                 if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
@@ -75,7 +76,8 @@ class IncidentDetailPage extends StatelessWidget {
                     ],
                   ).toShadowContainer(context),
                 );
-            }));
+              }),
+        ));
   }
 
   List<Widget> requestDetails(BuildContext context, IncidentDataModel incidentData) {

lib/modules/traf_module/traf_request_detail_page.dart

@@ -67,7 +67,8 @@ class _TrafRequestDetailPageState extends State<TrafRequestDetailPage> {
             }
             return trafProvider.trafRequestDataModel == null
                 ? const NoDataFound().center
-                : Column(
+                : SafeArea(
+                  child: Column(
                       children: [
                         ListView(
                           padding: const EdgeInsets.all(16),
@@ -90,6 +91,7 @@ class _TrafRequestDetailPageState extends State<TrafRequestDetailPage> {
                         //       }),
                         // ),
                       ],
+                    ),
                 );
           },
         ));