diff --git a/lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart b/lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
index 297a0fd3..35241755 100644
--- a/lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
+++ b/lib/modules/cm_module/views/forms/work_order/components/attachments_view.dart
@@ -1,39 +1,39 @@
-import 'dart:io';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
-import 'package:test_sa/extensions/context_extension.dart';
-import 'package:test_sa/extensions/int_extensions.dart';
-import 'package:test_sa/extensions/text_extensions.dart';
-import 'package:test_sa/views/widgets/images/multi_image_picker.dart';
-
-class AttachmentView extends StatelessWidget {
-  const AttachmentView({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    //TODO user the same form key everywhere....
-    final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
-    final List<File> _files = [];
-    return Consumer<ServiceRequestsProvider>(builder: (context, serviceRequestProvider, child) {
-      serviceRequestProvider.currentSelectedRequest?.visitDate = '';
-      return Form(
-        key: _formKey,
-        child: SingleChildScrollView(
-          child: Column(
-            children: [
-              MultiFilesPicker(
-                label: context.translation.attachImage,
-                buttonHeight: 108.toScreenHeight,
-                buttonIcon:  'image_icon'?.toSvgAsset(),
-                files: _files,
-                onlyImages: true,
-              ),
-              16.height,
-            ],
-          ),
-        ),
-      );
-    });
-  }
-}
+// import 'dart:io';
+// import 'package:flutter/material.dart';
+// import 'package:provider/provider.dart';
+// import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
+// import 'package:test_sa/extensions/context_extension.dart';
+// import 'package:test_sa/extensions/int_extensions.dart';
+// import 'package:test_sa/extensions/text_extensions.dart';
+// import 'package:test_sa/views/widgets/images/multi_image_picker.dart';
+//
+// class AttachmentView extends StatelessWidget {
+//   const AttachmentView({Key? key}) : super(key: key); todo @delete
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     //TODO user the same form key everywhere....
+//     final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+//     final List<File> _files = [];
+//     return Consumer<ServiceRequestsProvider>(builder: (context, serviceRequestProvider, child) {
+//       serviceRequestProvider.currentSelectedRequest?.visitDate = '';
+//       return Form(
+//         key: _formKey,
+//         child: SingleChildScrollView(
+//           child: Column(
+//             children: [
+//               MultiFilesPicker(
+//                 label: context.translation.attachImage,
+//                 buttonHeight: 108.toScreenHeight,
+//                 buttonIcon:  'image_icon'?.toSvgAsset(),
+//                 files: _files,
+//                 onlyImages: true,
+//               ),
+//               16.height,
+//             ],
+//           ),
+//         ),
+//       );
+//     });
+//   }
+// }
diff --git a/lib/views/widgets/images/multi_image_picker.dart b/lib/views/widgets/images/multi_image_picker.dart
index 3a22dd10..3f2282fa 100644
--- a/lib/views/widgets/images/multi_image_picker.dart
+++ b/lib/views/widgets/images/multi_image_picker.dart
@@ -101,7 +101,9 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
     if (result != null) {
       for (var path in result.paths) {
         widget.files.add(File(path!));
-        widget.onChange!();
+        if (widget.onChange != null) {
+          widget.onChange!();
+        }
       }
       setState(() {});
     }