diff --git a/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart b/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart
index 41bc6dd0..7e3ef23a 100644
--- a/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart
+++ b/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart
@@ -11,11 +11,13 @@ import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/string_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
+import 'package:test_sa/models/generic_attachment_model.dart';
 import 'package:test_sa/models/helper_data_models/spare_part/activity_spare_part_model.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/service_request/spare_parts.dart';
 import 'package:test_sa/models/size_config.dart';
 import 'package:test_sa/modules/cm_module/service_request_detail_provider.dart';
+import 'package:test_sa/modules/cm_module/utilities/service_request_utils.dart';
 import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
 import 'package:test_sa/modules/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
@@ -25,7 +27,7 @@ import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart';
 import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
 import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart';
 import 'package:test_sa/providers/loading_list_notifier.dart';
-import 'package:test_sa/views/widgets/images/new_multi_image_picker.dart';
+import 'package:test_sa/views/widgets/images/multi_image_picker.dart';
 import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
 
 class SparePartRequest extends StatefulWidget {
@@ -43,7 +45,7 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
   bool _isLoading = false;
   List<SparePart> _spareParts = [];
 
-  List<MultiFilesPickerModel> _files = [];
+  List<GenericAttachmentModel> attachments = [];
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
   final TextEditingController _partQtyController = TextEditingController();
@@ -80,7 +82,7 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
     activityStatus = _requestDetailProvider?.sparePartHelperModel?.activityStatus?.value;
     scheduleMicrotask(() async {
       _isLoading = true;
-      _files = _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments?.map((e) => MultiFilesPickerModel(e.id!, File(e.name!))).toList() ?? [];
+      attachments = _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments?.map((e) => GenericAttachmentModel(id: e.id!, name: e.name ?? '')).toList() ?? [];
       setState(() {});
       _spareParts = await _partsProvider!.getPartsListByDisplayName(assetId: _requestDetailProvider?.currentWorkOrder?.data?.asset?.id);
       _isLoading = false;
@@ -95,7 +97,7 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
     _returnQtyController.clear();
     _oracleNoController.clear();
     _descriptionController.clear();
-    _files = [];
+    attachments = [];
   }
 
   @override
@@ -291,9 +293,9 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
                               },
                             ),
                             12.height,
-                            NewMultiFilesPicker(
+                            AttachmentPicker(
                               label: context.translation.attachQuotation,
-                              files: _files,
+                              attachment: attachments,
                               buttonIcon: 'quotation_icon'.toSvgAsset(),
                               buttonColor: AppColor.primary10,
                             ),
@@ -332,10 +334,10 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
 
     requestDetailProvider.sparePartHelperModel?.sparePartAttachments?.clear();
 
-    for (var pickerObject in _files) {
-      String fileData = _isLocalUrl(pickerObject.file.path) ? "${pickerObject.file.path.split("/").last}|${base64Encode(File(pickerObject.file.path).readAsBytesSync())}" : pickerObject.file.path;
+    for (var item in attachments) {
+      String fileName = ServiceRequestUtils.isLocalUrl(item.name ?? '') ? ("${item.name ?? ''.split("/").last}|${base64Encode(File(item.name ?? '').readAsBytesSync())}") : item.name ?? '';
       requestDetailProvider.sparePartHelperModel?.sparePartAttachments?.add(
-        SparePartAttachments(id: pickerObject.id, name: fileData),
+        SparePartAttachments(id: item.id, name: fileName),
       );
     }