fixed conflict

lib/data/services/model/tender_approvals_data/tender_approvals_data.dart

@@ -1,29 +1,3 @@
-<<<<<<< HEAD
-// ignore_for_file: invalid_annotation_target
-
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-import '../tender_data/tender_data.dart';
-
-part 'tender_approvals_data.freezed.dart';
-part 'tender_approvals_data.g.dart';
-
-@freezed
-abstract class TenderApprovalsData with _$TenderApprovalsData {
-  const factory TenderApprovalsData({
-    required String? id,
-    required String status,
-    @JsonKey(name: 'tender_id') required String? tenderId,
-    @JsonKey(name: 'company_id') required String? companyId,
-    @JsonKey(name: 'submission_mode') required String? submissionMode,
-    @JsonKey(name: 'created_at') required int? createdAt,
-    required TenderData? tender,
-  }) = _TenderApprovalsData;
-
-  factory TenderApprovalsData.fromJson(Map<String, Object?> json) =>
-      _$TenderApprovalsDataFromJson(json);
-}
-=======
 // ignore_for_file: invalid_annotation_target
 
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -37,7 +11,7 @@ part 'tender_approvals_data.g.dart';
 abstract class TenderApprovalsData with _$TenderApprovalsData {
   const factory TenderApprovalsData({
     required String? id,
-    required String? status,
+    required String status,
     @JsonKey(name: 'tender_id') required String? tenderId,
     @JsonKey(name: 'company_id') required String? companyId,
     @JsonKey(name: 'submission_mode') required String? submissionMode,
@@ -48,4 +22,3 @@ abstract class TenderApprovalsData with _$TenderApprovalsData {
   factory TenderApprovalsData.fromJson(Map<String, Object?> json) =>
       _$TenderApprovalsDataFromJson(json);
 }
->>>>>>> tenders_approval

lib/data/services/model/tender_approvals_response/tender_approvals_response.dart

@@ -1,29 +1,3 @@
-<<<<<<< HEAD
-// ignore_for_file: invalid_annotation_target
-
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-import '../error/error_model.dart';
-import '../tender_approvals_data/tender_approvals_data.dart';
-
-part 'tender_approvals_response.freezed.dart';
-part 'tender_approvals_response.g.dart';
-
-@freezed
-abstract class TenderApprovalsResponse with _$TenderApprovalsResponse {
-  const factory TenderApprovalsResponse({
-    required String? message,
-    required bool? success,
-    required ErrorModel? error,
-    required List<TenderApprovalsData>? data,
-  }) = _TenderApprovalsResponse;
-
-  factory TenderApprovalsResponse.fromJson(Map<String, Object?> json) =>
-      _$TenderApprovalsResponseFromJson(json);
-}
-=======
-// ignore_for_file: invalid_annotation_target
-
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 import '../error/error_model.dart';
@@ -35,7 +9,6 @@ part 'tender_approvals_response.g.dart';
 @freezed
 abstract class TenderApprovalsResponse with _$TenderApprovalsResponse {
   const factory TenderApprovalsResponse({
-    required String? message,
     required bool? success,
     required ErrorModel? error,
     required List<TenderApprovalsData>? data,
@@ -44,4 +17,3 @@ abstract class TenderApprovalsResponse with _$TenderApprovalsResponse {
   factory TenderApprovalsResponse.fromJson(Map<String, Object?> json) =>
       _$TenderApprovalsResponseFromJson(json);
 }
->>>>>>> tenders_approval

lib/data/services/model/tender_approvals_response/tender_approvals_response.freezed.dart

@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$TenderApprovalsResponse {
 
- String? get message; bool? get success; ErrorModel? get error; List<TenderApprovalsData>? get data;
+ bool? get success; ErrorModel? get error; List<TenderApprovalsData>? get data;
 /// Create a copy of TenderApprovalsResponse
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $TenderApprovalsResponseCopyWith<TenderApprovalsResponse> get copyWith => _$Tend
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is TenderApprovalsResponse&&(identical(other.message, message) || other.message == message)&&(identical(other.success, success) || other.success == success)&&(identical(other.error, error) || other.error == error)&&const DeepCollectionEquality().equals(other.data, data));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is TenderApprovalsResponse&&(identical(other.success, success) || other.success == success)&&(identical(other.error, error) || other.error == error)&&const DeepCollectionEquality().equals(other.data, data));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,message,success,error,const DeepCollectionEquality().hash(data));
+int get hashCode => Object.hash(runtimeType,success,error,const DeepCollectionEquality().hash(data));
 
 @override
 String toString() {
-  return 'TenderApprovalsResponse(message: $message, success: $success, error: $error, data: $data)';
+  return 'TenderApprovalsResponse(success: $success, error: $error, data: $data)';
 }
 
 
@@ -48,7 +48,7 @@ abstract mixin class $TenderApprovalsResponseCopyWith<$Res>  {
   factory $TenderApprovalsResponseCopyWith(TenderApprovalsResponse value, $Res Function(TenderApprovalsResponse) _then) = _$TenderApprovalsResponseCopyWithImpl;
 @useResult
 $Res call({
- String? message, bool? success, ErrorModel? error, List<TenderApprovalsData>? data
+ bool? success, ErrorModel? error, List<TenderApprovalsData>? data
 });
 
 
@@ -65,10 +65,9 @@ class _$TenderApprovalsResponseCopyWithImpl<$Res>
 
 /// Create a copy of TenderApprovalsResponse
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? message = freezed,Object? success = freezed,Object? error = freezed,Object? data = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? success = freezed,Object? error = freezed,Object? data = freezed,}) {
   return _then(_self.copyWith(
-message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
+success: freezed == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
-as String?,success: freezed == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
 as bool?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
 as ErrorModel?,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
 as List<TenderApprovalsData>?,
@@ -168,10 +167,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String? message,  bool? success,  ErrorModel? error,  List<TenderApprovalsData>? data)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool? success,  ErrorModel? error,  List<TenderApprovalsData>? data)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _TenderApprovalsResponse() when $default != null:
-return $default(_that.message,_that.success,_that.error,_that.data);case _:
+return $default(_that.success,_that.error,_that.data);case _:
   return orElse();
 
 }
@@ -189,10 +188,10 @@ return $default(_that.message,_that.success,_that.error,_that.data);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String? message,  bool? success,  ErrorModel? error,  List<TenderApprovalsData>? data)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool? success,  ErrorModel? error,  List<TenderApprovalsData>? data)  $default,) {final _that = this;
 switch (_that) {
 case _TenderApprovalsResponse():
-return $default(_that.message,_that.success,_that.error,_that.data);case _:
+return $default(_that.success,_that.error,_that.data);case _:
   throw StateError('Unexpected subclass');
 
 }
@@ -209,10 +208,10 @@ return $default(_that.message,_that.success,_that.error,_that.data);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String? message,  bool? success,  ErrorModel? error,  List<TenderApprovalsData>? data)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool? success,  ErrorModel? error,  List<TenderApprovalsData>? data)?  $default,) {final _that = this;
 switch (_that) {
 case _TenderApprovalsResponse() when $default != null:
-return $default(_that.message,_that.success,_that.error,_that.data);case _:
+return $default(_that.success,_that.error,_that.data);case _:
   return null;
 
 }
@@ -224,10 +223,9 @@ return $default(_that.message,_that.success,_that.error,_that.data);case _:
 @JsonSerializable()
 
 class _TenderApprovalsResponse implements TenderApprovalsResponse {
-  const _TenderApprovalsResponse({required this.message, required this.success, required this.error, required final  List<TenderApprovalsData>? data}): _data = data;
+  const _TenderApprovalsResponse({required this.success, required this.error, required final  List<TenderApprovalsData>? data}): _data = data;
   factory _TenderApprovalsResponse.fromJson(Map<String, dynamic> json) => _$TenderApprovalsResponseFromJson(json);
 
-@override final  String? message;
 @override final  bool? success;
 @override final  ErrorModel? error;
  final  List<TenderApprovalsData>? _data;
@@ -253,16 +251,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _TenderApprovalsResponse&&(identical(other.message, message) || other.message == message)&&(identical(other.success, success) || other.success == success)&&(identical(other.error, error) || other.error == error)&&const DeepCollectionEquality().equals(other._data, _data));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _TenderApprovalsResponse&&(identical(other.success, success) || other.success == success)&&(identical(other.error, error) || other.error == error)&&const DeepCollectionEquality().equals(other._data, _data));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,message,success,error,const DeepCollectionEquality().hash(_data));
+int get hashCode => Object.hash(runtimeType,success,error,const DeepCollectionEquality().hash(_data));
 
 @override
 String toString() {
-  return 'TenderApprovalsResponse(message: $message, success: $success, error: $error, data: $data)';
+  return 'TenderApprovalsResponse(success: $success, error: $error, data: $data)';
 }
 
 
@@ -273,7 +271,7 @@ abstract mixin class _$TenderApprovalsResponseCopyWith<$Res> implements $TenderA
   factory _$TenderApprovalsResponseCopyWith(_TenderApprovalsResponse value, $Res Function(_TenderApprovalsResponse) _then) = __$TenderApprovalsResponseCopyWithImpl;
 @override @useResult
 $Res call({
- String? message, bool? success, ErrorModel? error, List<TenderApprovalsData>? data
+ bool? success, ErrorModel? error, List<TenderApprovalsData>? data
 });
 
 
@@ -290,10 +288,9 @@ class __$TenderApprovalsResponseCopyWithImpl<$Res>
 
 /// Create a copy of TenderApprovalsResponse
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? message = freezed,Object? success = freezed,Object? error = freezed,Object? data = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? success = freezed,Object? error = freezed,Object? data = freezed,}) {
   return _then(_TenderApprovalsResponse(
-message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
+success: freezed == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
-as String?,success: freezed == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
 as bool?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
 as ErrorModel?,data: freezed == data ? _self._data : data // ignore: cast_nullable_to_non_nullable
 as List<TenderApprovalsData>?,

lib/data/services/model/tender_approvals_response/tender_approvals_response.g.dart

@@ -9,7 +9,6 @@ part of 'tender_approvals_response.dart';
 _TenderApprovalsResponse _$TenderApprovalsResponseFromJson(
   Map<String, dynamic> json,
 ) => _TenderApprovalsResponse(
-  message: json['message'] as String?,
   success: json['success'] as bool?,
   error:
       json['error'] == null
@@ -24,7 +23,6 @@ _TenderApprovalsResponse _$TenderApprovalsResponseFromJson(
 Map<String, dynamic> _$TenderApprovalsResponseToJson(
   _TenderApprovalsResponse instance,
 ) => <String, dynamic>{
-  'message': instance.message,
   'success': instance.success,
   'error': instance.error,
   'data': instance.data,

lib/view_models/tenders_view_model.dart

@@ -292,7 +292,7 @@ class TendersViewModel with ChangeNotifier {
           // Convert TenderApprovalsToggleData to TenderApprovalsData
           final approvalData = TenderApprovalsData(
             id: _tenderApprovalToggleData!.id,
-            status: _tenderApprovalToggleData!.status,
+            status: _tenderApprovalToggleData!.status!,
             tenderId: _tenderApprovalToggleData!.tenderId,
             companyId: _tenderApprovalToggleData!.companyId,
             submissionMode: _tenderApprovalToggleData!.submissionMode,