diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart
index 6331eec6..9c18b46d 100644
--- a/lib/controllers/providers/api/service_requests_provider.dart
+++ b/lib/controllers/providers/api/service_requests_provider.dart
@@ -232,11 +232,7 @@ class ServiceRequestsProvider extends ChangeNotifier {
     }
   }
 
-  Future<int> updateRequest({
-    @required BuildContext context,
-    @required User user,
-    @required ServiceRequest request,
-  }) async {
+  Future<int> updateRequest({@required User user, @required ServiceRequest request}) async {
     isLoading = true;
     notifyListeners();
     Map<String, dynamic> serviceRequest = await getServiceRequestById(requestId: request.id) ?? "";
diff --git a/lib/views/pages/user/requests/create_service_request_page.dart b/lib/views/pages/user/requests/create_service_request_page.dart
index 56d92c41..fbad447e 100644
--- a/lib/views/pages/user/requests/create_service_request_page.dart
+++ b/lib/views/pages/user/requests/create_service_request_page.dart
@@ -171,11 +171,7 @@ class CreateServiceRequestPageState extends State<CreateServiceRequestPage> {
                         },
                       ),
                       8.height,
-                      MultiFilesPicker(
-                        label: context.translation.attachImage,
-                        onlyImages: true,
-                        files: _deviceImages,
-                      ),
+                      MultiFilesPicker(label: context.translation.attachImage, files: _deviceImages),
                       ((_serviceRequest.devicePhotos?.isNotEmpty ?? false) ? 16 : 8).height,
                       Align(
                         alignment: AlignmentDirectional.centerStart,
diff --git a/lib/views/pages/user/requests/first_action_bottom_sheet.dart b/lib/views/pages/user/requests/first_action_bottom_sheet.dart
index af0d539c..fcccef91 100644
--- a/lib/views/pages/user/requests/first_action_bottom_sheet.dart
+++ b/lib/views/pages/user/requests/first_action_bottom_sheet.dart
@@ -108,7 +108,7 @@ class _FirstActionBottomSheetState extends State<FirstActionBottomSheet> {
                 loading: snapshot.isLoading,
                 onPressed: () async {
                   _formKey.currentState.save();
-                  await snapshot.updateRequest(context: context, user: userProvider.user, request: _serviceRequest);
+                  await snapshot.updateRequest(user: userProvider.user, request: _serviceRequest);
                   Navigator.pop(context);
                 },
               ),
diff --git a/lib/views/pages/user/requests/update_service_request_page.dart b/lib/views/pages/user/requests/update_service_request_page.dart
index d7fe80b5..9af6081f 100644
--- a/lib/views/pages/user/requests/update_service_request_page.dart
+++ b/lib/views/pages/user/requests/update_service_request_page.dart
@@ -15,6 +15,7 @@ import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
 import '../../../../models/lookup.dart';
 import '../../../../new_views/app_style/app_color.dart';
 import '../../../../new_views/common_widgets/app_filled_button.dart';
+import '../../../../new_views/common_widgets/app_lazy_loading.dart';
 import '../../../../new_views/common_widgets/app_text_form_field.dart';
 import '../../../../new_views/common_widgets/single_item_drop_down_menu.dart';
 import '../../../../providers/service_request_providers/equipment_status_provider.dart';
@@ -112,11 +113,7 @@ class _UpdateServiceRequestPageState extends State<UpdateServiceRequestPage> {
                       },
                     ),
                     8.height,
-                    MultiFilesPicker(
-                      label: context.translation.attachImage,
-                      onlyImages: true,
-                      files: _deviceImages,
-                    ),
+                    MultiFilesPicker(label: context.translation.attachImage, files: _deviceImages),
                     ((widget.serviceRequest.devicePhotos?.isNotEmpty ?? false) ? 16 : 8).height,
                     Align(
                       alignment: AlignmentDirectional.centerStart,
@@ -162,7 +159,9 @@ class _UpdateServiceRequestPageState extends State<UpdateServiceRequestPage> {
           widget.serviceRequest.audio = "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}";
         }
       }
-      await Provider.of<ServiceRequestsProvider>(context, listen: false).updateRequest(context: context, user: _userProvider.user, request: widget.serviceRequest);
+      showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
+      await Provider.of<ServiceRequestsProvider>(context, listen: false).updateRequest(user: _userProvider.user, request: widget.serviceRequest);
+      Navigator.of(context).pop();
     }
   }