diff --git a/devtools_options.yaml b/devtools_options.yaml
new file mode 100644
index 00000000..fa0b357c
--- /dev/null
+++ b/devtools_options.yaml
@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
diff --git a/lib/models/helper_data_models/workorder/work_order_helper_models.dart b/lib/models/helper_data_models/workorder/work_order_helper_models.dart
index be919b55..ba6296f1 100644
--- a/lib/models/helper_data_models/workorder/work_order_helper_models.dart
+++ b/lib/models/helper_data_models/workorder/work_order_helper_models.dart
@@ -17,7 +17,7 @@ class FixRemotelyHelperModel {
 }
 
 class WorkOrderHelperModel {
-  int? assetId;
+  num? assetId;
   int? equipmentStatusId;
   int? priorityId;
   int? problemDescriptionId;
diff --git a/lib/new_views/common_widgets/app_bottom_nav_bar.dart b/lib/new_views/common_widgets/app_bottom_nav_bar.dart
index 4dd78f84..086b0b32 100644
--- a/lib/new_views/common_widgets/app_bottom_nav_bar.dart
+++ b/lib/new_views/common_widgets/app_bottom_nav_bar.dart
@@ -47,7 +47,7 @@ class AppBottomNavigationBar extends StatelessWidget {
       icon: iconName
           .toSvgAsset(
             width: showLabel ? 28 : 38,
-            height: showLabel ? 26 : 40,
+            height: showLabel ? 26 : 37,
             color: showLabel || (showLabel && selectedIndex != 2)
                 ? selectedIndex == index
                     ? Theme.of(context).bottomNavigationBarTheme.selectedItemColor
diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart
index 0c5f37c6..c9deb0e0 100644
--- a/lib/new_views/pages/land_page/land_page.dart
+++ b/lib/new_views/pages/land_page/land_page.dart
@@ -107,6 +107,7 @@ class _LandPageState extends State<LandPage> {
         })),
         // const old_page.LandPage(),
         const MyRequestsPage(),
+    if(_userProvider!.user!.type != UsersTypes.engineer) const CreateNewRequest(),
        // if (_userProvider!.user!.type != UsersTypes.engineer) const CalendarPage(),
         const MyAssetsPage(fromBottomBar: true),
       ];
@@ -135,9 +136,7 @@ class _LandPageState extends State<LandPage> {
           selectedIndex: currentPageIndex,
           onPressed: (index) {
             bool isEngineer = _userProvider!.user!.type == UsersTypes.engineer;
-            if(!isEngineer&&index==2){
-              Navigator.push(context, MaterialPageRoute(builder: (context)=>const CreateNewRequest()));
-            }
+
             if (index == (!isEngineer ? 4 : 3)) {
               showModalBottomSheet(
                 context: context,
diff --git a/lib/service_request_latest/views/nurse/create_new_request_view.dart b/lib/service_request_latest/views/nurse/create_new_request_view.dart
index 9aa685ac..9ba7ade0 100644
--- a/lib/service_request_latest/views/nurse/create_new_request_view.dart
+++ b/lib/service_request_latest/views/nurse/create_new_request_view.dart
@@ -12,6 +12,7 @@ import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_models.dart';
+import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/service_request/pending_service_request_model.dart';
 import 'package:test_sa/models/service_request/service_request.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
@@ -239,7 +240,6 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
         pendingAssetServiceRequest = null;
         _serviceRequest.device = asset;
         await checkAssetForPendingServiceRequest(asset.id!.toInt());
-
         if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) {
           showPendingRequestBottomSheet();
         }
@@ -253,8 +253,9 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
       children: [
         context.translation.highPriority.bodyText(context).custom(color: AppColor.black20),
         Consumer<PriorityProvider>(builder: (cxt, snapshot, _) {
-          _serviceRequest.priority ??= snapshot.items.firstWhere((element) => element.value == 0, orElse: null);
-
+          if(snapshot.items.isNotEmpty){
+            _serviceRequest.priority ??= snapshot.items.firstWhere((element) => element.value == 0, orElse: () => Lookup());
+          }
           return CupertinoSwitch(
               thumbColor: AppColor.red70,
               activeColor: AppColor.red30.withOpacity(0.4),
@@ -361,7 +362,7 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
         attachement.add(WorkOrderAttachments(id: 0, name: "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}"));
       }
     _requestDetailProvider.workOrderHelperModel = WorkOrderHelperModel(
-      assetId: _serviceRequest.deviceId,
+      assetId: _serviceRequest.device?.id,
       priorityId: _serviceRequest.priority?.id,
       equipmentStatusId:  _serviceRequest.defectType?.id,
       voiceNote: _serviceRequest.audio,
@@ -369,8 +370,12 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
       comments: _serviceRequest.callComments,
       //add attachments also...
     );
+      print('model to add activity is ${_requestDetailProvider.workOrderHelperModel?.toJson()}');
+
+     int status =  await _requestDetailProvider.createWorkOrder();
+     if(status==200){
 
-      await _requestDetailProvider.createWorkOrder();
+     }
 
       // await _serviceRequestsProvider.createRequest(
       //   context: context,