diff --git a/app/lib/ui/flow/journey/components/journey_map.dart b/app/lib/ui/flow/journey/components/journey_map.dart
index ec073cc2..63684241 100644
--- a/app/lib/ui/flow/journey/components/journey_map.dart
+++ b/app/lib/ui/flow/journey/components/journey_map.dart
@@ -15,6 +15,7 @@ class JourneyMap extends StatefulWidget {
   final List<Marker> markers;
   final bool isTimeLine;
   final bool gestureEnable;
+  final MapType mapType;
 
   const JourneyMap({
     super.key,
@@ -22,6 +23,7 @@ class JourneyMap extends StatefulWidget {
     required this.markers,
     required this.isTimeLine,
     required this.gestureEnable,
+    this.mapType = MapType.normal,
   });
 
   @override
@@ -66,6 +68,7 @@ class _JourneyMapState extends State<JourneyMap> {
             zoomGesturesEnabled: widget.gestureEnable,
             scrollGesturesEnabled: widget.gestureEnable,
             rotateGesturesEnabled: widget.gestureEnable,
+            mapType: widget.mapType,
             markers: widget.markers.toSet(),
             polylines:ployLines.toSet(),
           ),
diff --git a/app/lib/ui/flow/journey/detail/user_journey_detail_screen.dart b/app/lib/ui/flow/journey/detail/user_journey_detail_screen.dart
index 23d170b8..fe93b81f 100644
--- a/app/lib/ui/flow/journey/detail/user_journey_detail_screen.dart
+++ b/app/lib/ui/flow/journey/detail/user_journey_detail_screen.dart
@@ -73,6 +73,7 @@ class _UserJourneyDetailScreenState
                   markers: _markers,
                   isTimeLine: false,
                   gestureEnable: true,
+                  mapType: getMapTypeInfo(state.mapType),
                 ),
               ),
               _journeyInfo(state)
@@ -256,8 +257,8 @@ class _UserJourneyDetailScreenState
   }
 
   Future<List<Marker>> _buildMarkers(LatLng fromLatLng, LatLng toLatLng) async {
-    final fromIcon = await notifier.createCustomIcon(
-        'assets/images/ic_timeline_start_location_icon.png');
+    final fromIcon = await notifier
+        .createCustomIcon('assets/images/ic_timeline_start_location_icon.png');
     final toIcon = await notifier.createCustomIcon(
         'assets/images/ic_timeline_end_location_flag_icon.png');
 
@@ -280,4 +281,14 @@ class _UserJourneyDetailScreenState
 
     return markers;
   }
+
+  MapType getMapTypeInfo(String mapType) {
+    if (mapType == 'Terrain') {
+      return MapType.terrain;
+    } else if (mapType == 'Satellite') {
+      return MapType.satellite;
+    } else {
+      return MapType.normal;
+    }
+  }
 }
diff --git a/app/lib/ui/flow/journey/detail/user_journey_detail_view_model.dart b/app/lib/ui/flow/journey/detail/user_journey_detail_view_model.dart
index f55bd07a..61b52e47 100644
--- a/app/lib/ui/flow/journey/detail/user_journey_detail_view_model.dart
+++ b/app/lib/ui/flow/journey/detail/user_journey_detail_view_model.dart
@@ -3,6 +3,7 @@ import 'dart:ui' as ui;
 import 'package:data/api/location/journey/api_journey_service.dart';
 import 'package:data/api/location/journey/journey.dart';
 import 'package:data/log/logger.dart';
+import 'package:data/storage/app_preferences.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -17,13 +18,15 @@ final userJourneyDetailStateProvider = StateNotifierProvider.autoDispose<
         UserJourneyDetailViewModel, UserJourneyDetailState>(
     (ref) => UserJourneyDetailViewModel(
           ref.read(journeyServiceProvider),
+          ref.read(googleMapType.notifier),
         ));
 
 class UserJourneyDetailViewModel extends StateNotifier<UserJourneyDetailState> {
   final ApiJourneyService journeyService;
+  final StateController<String> mapTypeController;
 
-  UserJourneyDetailViewModel(this.journeyService)
-      : super(const UserJourneyDetailState());
+  UserJourneyDetailViewModel(this.journeyService, this.mapTypeController)
+      : super(UserJourneyDetailState(mapType: mapTypeController.state));
 
   void loadData(ApiLocationJourney journey) async {
     final isNetworkOff = await _checkUserInternet();
@@ -122,6 +125,7 @@ class UserJourneyDetailState with _$UserJourneyDetailState {
     @Default(false) bool isNetworkOff,
     ApiLocationJourney? journey,
     String? journeyId,
+    @Default("Normal") String mapType,
     @Default([]) List<Placemark> addressFrom,
     @Default([]) List<Placemark> addressTo,
     Object? error,
diff --git a/app/lib/ui/flow/journey/detail/user_journey_detail_view_model.freezed.dart b/app/lib/ui/flow/journey/detail/user_journey_detail_view_model.freezed.dart
index d5a275b8..5e2d9c68 100644
--- a/app/lib/ui/flow/journey/detail/user_journey_detail_view_model.freezed.dart
+++ b/app/lib/ui/flow/journey/detail/user_journey_detail_view_model.freezed.dart
@@ -20,6 +20,7 @@ mixin _$UserJourneyDetailState {
   bool get isNetworkOff => throw _privateConstructorUsedError;
   ApiLocationJourney? get journey => throw _privateConstructorUsedError;
   String? get journeyId => throw _privateConstructorUsedError;
+  String get mapType => throw _privateConstructorUsedError;
   List<Placemark> get addressFrom => throw _privateConstructorUsedError;
   List<Placemark> get addressTo => throw _privateConstructorUsedError;
   Object? get error => throw _privateConstructorUsedError;
@@ -40,6 +41,7 @@ abstract class $UserJourneyDetailStateCopyWith<$Res> {
       bool isNetworkOff,
       ApiLocationJourney? journey,
       String? journeyId,
+      String mapType,
       List<Placemark> addressFrom,
       List<Placemark> addressTo,
       Object? error});
@@ -65,6 +67,7 @@ class _$UserJourneyDetailStateCopyWithImpl<$Res,
     Object? isNetworkOff = null,
     Object? journey = freezed,
     Object? journeyId = freezed,
+    Object? mapType = null,
     Object? addressFrom = null,
     Object? addressTo = null,
     Object? error = freezed,
@@ -86,6 +89,10 @@ class _$UserJourneyDetailStateCopyWithImpl<$Res,
           ? _value.journeyId
           : journeyId // ignore: cast_nullable_to_non_nullable
               as String?,
+      mapType: null == mapType
+          ? _value.mapType
+          : mapType // ignore: cast_nullable_to_non_nullable
+              as String,
       addressFrom: null == addressFrom
           ? _value.addressFrom
           : addressFrom // ignore: cast_nullable_to_non_nullable
@@ -125,6 +132,7 @@ abstract class _$$UserJourneyDetailStateImplCopyWith<$Res>
       bool isNetworkOff,
       ApiLocationJourney? journey,
       String? journeyId,
+      String mapType,
       List<Placemark> addressFrom,
       List<Placemark> addressTo,
       Object? error});
@@ -150,6 +158,7 @@ class __$$UserJourneyDetailStateImplCopyWithImpl<$Res>
     Object? isNetworkOff = null,
     Object? journey = freezed,
     Object? journeyId = freezed,
+    Object? mapType = null,
     Object? addressFrom = null,
     Object? addressTo = null,
     Object? error = freezed,
@@ -171,6 +180,10 @@ class __$$UserJourneyDetailStateImplCopyWithImpl<$Res>
           ? _value.journeyId
           : journeyId // ignore: cast_nullable_to_non_nullable
               as String?,
+      mapType: null == mapType
+          ? _value.mapType
+          : mapType // ignore: cast_nullable_to_non_nullable
+              as String,
       addressFrom: null == addressFrom
           ? _value._addressFrom
           : addressFrom // ignore: cast_nullable_to_non_nullable
@@ -192,6 +205,7 @@ class _$UserJourneyDetailStateImpl implements _UserJourneyDetailState {
       this.isNetworkOff = false,
       this.journey,
       this.journeyId,
+      this.mapType = "Normal",
       final List<Placemark> addressFrom = const [],
       final List<Placemark> addressTo = const [],
       this.error})
@@ -208,6 +222,9 @@ class _$UserJourneyDetailStateImpl implements _UserJourneyDetailState {
   final ApiLocationJourney? journey;
   @override
   final String? journeyId;
+  @override
+  @JsonKey()
+  final String mapType;
   final List<Placemark> _addressFrom;
   @override
   @JsonKey()
@@ -231,7 +248,7 @@ class _$UserJourneyDetailStateImpl implements _UserJourneyDetailState {
 
   @override
   String toString() {
-    return 'UserJourneyDetailState(loading: $loading, isNetworkOff: $isNetworkOff, journey: $journey, journeyId: $journeyId, addressFrom: $addressFrom, addressTo: $addressTo, error: $error)';
+    return 'UserJourneyDetailState(loading: $loading, isNetworkOff: $isNetworkOff, journey: $journey, journeyId: $journeyId, mapType: $mapType, addressFrom: $addressFrom, addressTo: $addressTo, error: $error)';
   }
 
   @override
@@ -245,6 +262,7 @@ class _$UserJourneyDetailStateImpl implements _UserJourneyDetailState {
             (identical(other.journey, journey) || other.journey == journey) &&
             (identical(other.journeyId, journeyId) ||
                 other.journeyId == journeyId) &&
+            (identical(other.mapType, mapType) || other.mapType == mapType) &&
             const DeepCollectionEquality()
                 .equals(other._addressFrom, _addressFrom) &&
             const DeepCollectionEquality()
@@ -259,6 +277,7 @@ class _$UserJourneyDetailStateImpl implements _UserJourneyDetailState {
       isNetworkOff,
       journey,
       journeyId,
+      mapType,
       const DeepCollectionEquality().hash(_addressFrom),
       const DeepCollectionEquality().hash(_addressTo),
       const DeepCollectionEquality().hash(error));
@@ -277,6 +296,7 @@ abstract class _UserJourneyDetailState implements UserJourneyDetailState {
       final bool isNetworkOff,
       final ApiLocationJourney? journey,
       final String? journeyId,
+      final String mapType,
       final List<Placemark> addressFrom,
       final List<Placemark> addressTo,
       final Object? error}) = _$UserJourneyDetailStateImpl;
@@ -290,6 +310,8 @@ abstract class _UserJourneyDetailState implements UserJourneyDetailState {
   @override
   String? get journeyId;
   @override
+  String get mapType;
+  @override
   List<Placemark> get addressFrom;
   @override
   List<Placemark> get addressTo;
diff --git a/app/lib/ui/flow/journey/timeline/journey_timeline_screen.dart b/app/lib/ui/flow/journey/timeline/journey_timeline_screen.dart
index ba54772a..90f09bfc 100644
--- a/app/lib/ui/flow/journey/timeline/journey_timeline_screen.dart
+++ b/app/lib/ui/flow/journey/timeline/journey_timeline_screen.dart
@@ -138,6 +138,7 @@ class _JourneyTimelineScreenState extends ConsumerState<JourneyTimelineScreen> {
                         journey,
                         state.sortedJourney.first.id == journey.id,
                         state.sortedJourney.last.id == journey.id,
+                        state.mapType,
                       ),
               ],
             );
@@ -224,6 +225,7 @@ class _JourneyTimelineScreenState extends ConsumerState<JourneyTimelineScreen> {
     ApiLocationJourney journey,
     bool isFirstItem,
     bool isLastItem,
+    String mapType,
   ) {
     final time = _getFormattedJourneyTime(
         journey.created_at ?? 0, journey.update_at ?? 0);
@@ -262,6 +264,7 @@ class _JourneyTimelineScreenState extends ConsumerState<JourneyTimelineScreen> {
                             markers: markers,
                             isTimeLine: true,
                             gestureEnable: false,
+                            mapType: getMapTypeInfo(mapType),
                           );
                         } else {
                           return JourneyMap(
@@ -269,6 +272,7 @@ class _JourneyTimelineScreenState extends ConsumerState<JourneyTimelineScreen> {
                             markers: const [],
                             isTimeLine: true,
                             gestureEnable: false,
+                            mapType: getMapTypeInfo(mapType),
                           );
                         }
                       },
@@ -369,7 +373,9 @@ class _JourneyTimelineScreenState extends ConsumerState<JourneyTimelineScreen> {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Text(
-          address.isEmpty ? context.l10n.journey_timeline_unknown_address_text : address,
+          address.isEmpty
+              ? context.l10n.journey_timeline_unknown_address_text
+              : address,
           style: AppTextStyle.body2
               .copyWith(color: context.colorScheme.textPrimary),
           maxLines: 2,
@@ -542,4 +548,14 @@ class _JourneyTimelineScreenState extends ConsumerState<JourneyTimelineScreen> {
       return date.toString();
     }
   }
+
+  MapType getMapTypeInfo(String mapType) {
+    if (mapType == 'Terrain') {
+      return MapType.terrain;
+    } else if (mapType == 'Satellite') {
+      return MapType.satellite;
+    } else {
+      return MapType.normal;
+    }
+  }
 }
diff --git a/app/lib/ui/flow/journey/timeline/journey_timeline_view_model.dart b/app/lib/ui/flow/journey/timeline/journey_timeline_view_model.dart
index 9974c228..0a8b2aad 100644
--- a/app/lib/ui/flow/journey/timeline/journey_timeline_view_model.dart
+++ b/app/lib/ui/flow/journey/timeline/journey_timeline_view_model.dart
@@ -23,18 +23,21 @@ final journeyTimelineStateProvider = StateNotifierProvider.autoDispose<
           ref.read(currentUserPod),
           ref.read(journeyServiceProvider),
           ref.read(currentSpaceId.notifier),
+          ref.read(googleMapType.notifier),
         ));
 
 class JourneyTimelineViewModel extends StateNotifier<JourneyTimelineState> {
   final ApiUser? currentUser;
   final ApiJourneyService journeyService;
   final StateController<String?> _currentSpaceId;
+  final StateController<String> mapTypeController;
 
   JourneyTimelineViewModel(
     this.currentUser,
     this.journeyService,
     this._currentSpaceId,
-  ) : super(const JourneyTimelineState());
+    this.mapTypeController,
+  ) : super(JourneyTimelineState(mapType: mapTypeController.state));
 
   void loadData(ApiUser selectedUser) async {
     final isNetworkOff = await _checkUserInternet();
@@ -249,6 +252,7 @@ class JourneyTimelineState with _$JourneyTimelineState {
     int? selectedTimeFrom,
     int? selectedTimeTo,
     String? spaceId,
+    @Default("Normal") String mapType,
     Object? error,
   }) = _JourneyTimelineState;
 }
diff --git a/app/lib/ui/flow/journey/timeline/journey_timeline_view_model.freezed.dart b/app/lib/ui/flow/journey/timeline/journey_timeline_view_model.freezed.dart
index 5dd4b188..34bc986e 100644
--- a/app/lib/ui/flow/journey/timeline/journey_timeline_view_model.freezed.dart
+++ b/app/lib/ui/flow/journey/timeline/journey_timeline_view_model.freezed.dart
@@ -28,6 +28,7 @@ mixin _$JourneyTimelineState {
   int? get selectedTimeFrom => throw _privateConstructorUsedError;
   int? get selectedTimeTo => throw _privateConstructorUsedError;
   String? get spaceId => throw _privateConstructorUsedError;
+  String get mapType => throw _privateConstructorUsedError;
   Object? get error => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
@@ -53,6 +54,7 @@ abstract class $JourneyTimelineStateCopyWith<$Res> {
       int? selectedTimeFrom,
       int? selectedTimeTo,
       String? spaceId,
+      String mapType,
       Object? error});
 
   $ApiUserCopyWith<$Res>? get selectedUser;
@@ -83,6 +85,7 @@ class _$JourneyTimelineStateCopyWithImpl<$Res,
     Object? selectedTimeFrom = freezed,
     Object? selectedTimeTo = freezed,
     Object? spaceId = freezed,
+    Object? mapType = null,
     Object? error = freezed,
   }) {
     return _then(_value.copyWith(
@@ -130,6 +133,10 @@ class _$JourneyTimelineStateCopyWithImpl<$Res,
           ? _value.spaceId
           : spaceId // ignore: cast_nullable_to_non_nullable
               as String?,
+      mapType: null == mapType
+          ? _value.mapType
+          : mapType // ignore: cast_nullable_to_non_nullable
+              as String,
       error: freezed == error ? _value.error : error,
     ) as $Val);
   }
@@ -167,6 +174,7 @@ abstract class _$$JourneyTimelineStateImplCopyWith<$Res>
       int? selectedTimeFrom,
       int? selectedTimeTo,
       String? spaceId,
+      String mapType,
       Object? error});
 
   @override
@@ -195,6 +203,7 @@ class __$$JourneyTimelineStateImplCopyWithImpl<$Res>
     Object? selectedTimeFrom = freezed,
     Object? selectedTimeTo = freezed,
     Object? spaceId = freezed,
+    Object? mapType = null,
     Object? error = freezed,
   }) {
     return _then(_$JourneyTimelineStateImpl(
@@ -242,6 +251,10 @@ class __$$JourneyTimelineStateImplCopyWithImpl<$Res>
           ? _value.spaceId
           : spaceId // ignore: cast_nullable_to_non_nullable
               as String?,
+      mapType: null == mapType
+          ? _value.mapType
+          : mapType // ignore: cast_nullable_to_non_nullable
+              as String,
       error: freezed == error ? _value.error : error,
     ));
   }
@@ -262,6 +275,7 @@ class _$JourneyTimelineStateImpl implements _JourneyTimelineState {
       this.selectedTimeFrom,
       this.selectedTimeTo,
       this.spaceId,
+      this.mapType = "Normal",
       this.error})
       : _sortedJourney = sortedJourney;
 
@@ -301,11 +315,14 @@ class _$JourneyTimelineStateImpl implements _JourneyTimelineState {
   @override
   final String? spaceId;
   @override
+  @JsonKey()
+  final String mapType;
+  @override
   final Object? error;
 
   @override
   String toString() {
-    return 'JourneyTimelineState(isLoading: $isLoading, appending: $appending, hasMore: $hasMore, isCurrentUser: $isCurrentUser, showDatePicker: $showDatePicker, isNetworkOff: $isNetworkOff, selectedUser: $selectedUser, sortedJourney: $sortedJourney, selectedTimeFrom: $selectedTimeFrom, selectedTimeTo: $selectedTimeTo, spaceId: $spaceId, error: $error)';
+    return 'JourneyTimelineState(isLoading: $isLoading, appending: $appending, hasMore: $hasMore, isCurrentUser: $isCurrentUser, showDatePicker: $showDatePicker, isNetworkOff: $isNetworkOff, selectedUser: $selectedUser, sortedJourney: $sortedJourney, selectedTimeFrom: $selectedTimeFrom, selectedTimeTo: $selectedTimeTo, spaceId: $spaceId, mapType: $mapType, error: $error)';
   }
 
   @override
@@ -333,6 +350,7 @@ class _$JourneyTimelineStateImpl implements _JourneyTimelineState {
             (identical(other.selectedTimeTo, selectedTimeTo) ||
                 other.selectedTimeTo == selectedTimeTo) &&
             (identical(other.spaceId, spaceId) || other.spaceId == spaceId) &&
+            (identical(other.mapType, mapType) || other.mapType == mapType) &&
             const DeepCollectionEquality().equals(other.error, error));
   }
 
@@ -350,6 +368,7 @@ class _$JourneyTimelineStateImpl implements _JourneyTimelineState {
       selectedTimeFrom,
       selectedTimeTo,
       spaceId,
+      mapType,
       const DeepCollectionEquality().hash(error));
 
   @JsonKey(ignore: true)
@@ -374,6 +393,7 @@ abstract class _JourneyTimelineState implements JourneyTimelineState {
       final int? selectedTimeFrom,
       final int? selectedTimeTo,
       final String? spaceId,
+      final String mapType,
       final Object? error}) = _$JourneyTimelineStateImpl;
 
   @override
@@ -399,6 +419,8 @@ abstract class _JourneyTimelineState implements JourneyTimelineState {
   @override
   String? get spaceId;
   @override
+  String get mapType;
+  @override
   Object? get error;
   @override
   @JsonKey(ignore: true)
diff --git a/app/pubspec.lock b/app/pubspec.lock
index 9ee07676..47a77e92 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -1168,18 +1168,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -1224,18 +1224,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -1700,10 +1700,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.0"
   time:
     dependency: transitive
     description:
@@ -1860,10 +1860,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.2.1"
   watcher:
     dependency: transitive
     description:
diff --git a/data/lib/api/auth/auth_models.freezed.dart b/data/lib/api/auth/auth_models.freezed.dart
index 7f77158a..3680f418 100644
--- a/data/lib/api/auth/auth_models.freezed.dart
+++ b/data/lib/api/auth/auth_models.freezed.dart
@@ -35,12 +35,8 @@ mixin _$ApiUser {
   int? get created_at => throw _privateConstructorUsedError;
   int? get updated_at => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiUser to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiUser
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiUserCopyWith<ApiUser> get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -76,8 +72,6 @@ class _$ApiUserCopyWithImpl<$Res, $Val extends ApiUser>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiUser
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -189,8 +183,6 @@ class __$$ApiUserImplCopyWithImpl<$Res>
       _$ApiUserImpl _value, $Res Function(_$ApiUserImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiUser
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -373,7 +365,7 @@ class _$ApiUserImpl extends _ApiUser {
                 other.updated_at == updated_at));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType,
@@ -392,9 +384,7 @@ class _$ApiUserImpl extends _ApiUser {
       created_at,
       updated_at);
 
-  /// Create a copy of ApiUser
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiUserImplCopyWith<_$ApiUserImpl> get copyWith =>
@@ -456,11 +446,8 @@ abstract class _ApiUser extends ApiUser {
   int? get created_at;
   @override
   int? get updated_at;
-
-  /// Create a copy of ApiUser
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiUserImplCopyWith<_$ApiUserImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -480,12 +467,8 @@ mixin _$ApiSession {
   int? get created_at => throw _privateConstructorUsedError;
   int? get app_version => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiSession to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiSession
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiSessionCopyWith<ApiSession> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -517,8 +500,6 @@ class _$ApiSessionCopyWithImpl<$Res, $Val extends ApiSession>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiSession
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -595,8 +576,6 @@ class __$$ApiSessionImplCopyWithImpl<$Res>
       _$ApiSessionImpl _value, $Res Function(_$ApiSessionImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiSession
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -707,14 +686,12 @@ class _$ApiSessionImpl extends _ApiSession {
                 other.app_version == app_version));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, id, user_id, platform,
       session_active, device_name, device_id, created_at, app_version);
 
-  /// Create a copy of ApiSession
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiSessionImplCopyWith<_$ApiSessionImpl> get copyWith =>
@@ -759,11 +736,8 @@ abstract class _ApiSession extends ApiSession {
   int? get created_at;
   @override
   int? get app_version;
-
-  /// Create a copy of ApiSession
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiSessionImplCopyWith<_$ApiSessionImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -779,12 +753,8 @@ mixin _$ApiUserInfo {
   bool get isLocationEnabled => throw _privateConstructorUsedError;
   ApiSession? get session => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiUserInfo to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiUserInfo
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiUserInfoCopyWith<ApiUserInfo> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -816,8 +786,6 @@ class _$ApiUserInfoCopyWithImpl<$Res, $Val extends ApiUserInfo>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiUserInfo
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -846,8 +814,6 @@ class _$ApiUserInfoCopyWithImpl<$Res, $Val extends ApiUserInfo>
     ) as $Val);
   }
 
-  /// Create a copy of ApiUserInfo
-  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $ApiUserCopyWith<$Res> get user {
@@ -856,8 +822,6 @@ class _$ApiUserInfoCopyWithImpl<$Res, $Val extends ApiUserInfo>
     });
   }
 
-  /// Create a copy of ApiUserInfo
-  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $ApiLocationCopyWith<$Res>? get location {
@@ -870,8 +834,6 @@ class _$ApiUserInfoCopyWithImpl<$Res, $Val extends ApiUserInfo>
     });
   }
 
-  /// Create a copy of ApiUserInfo
-  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $ApiSessionCopyWith<$Res>? get session {
@@ -915,8 +877,6 @@ class __$$ApiUserInfoImplCopyWithImpl<$Res>
       _$ApiUserInfoImpl _value, $Res Function(_$ApiUserInfoImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiUserInfo
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -986,14 +946,12 @@ class _$ApiUserInfoImpl extends _ApiUserInfo {
             (identical(other.session, session) || other.session == session));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode =>
       Object.hash(runtimeType, user, location, isLocationEnabled, session);
 
-  /// Create a copy of ApiUserInfo
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiUserInfoImplCopyWith<_$ApiUserInfoImpl> get copyWith =>
@@ -1026,11 +984,8 @@ abstract class _ApiUserInfo extends ApiUserInfo {
   bool get isLocationEnabled;
   @override
   ApiSession? get session;
-
-  /// Create a copy of ApiUserInfo
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiUserInfoImplCopyWith<_$ApiUserInfoImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/data/lib/api/location/journey/journey.freezed.dart b/data/lib/api/location/journey/journey.freezed.dart
index 6a0427bd..b9189b66 100644
--- a/data/lib/api/location/journey/journey.freezed.dart
+++ b/data/lib/api/location/journey/journey.freezed.dart
@@ -32,12 +32,8 @@ mixin _$ApiLocationJourney {
   int? get created_at => throw _privateConstructorUsedError;
   int? get update_at => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiLocationJourney to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiLocationJourney
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiLocationJourneyCopyWith<ApiLocationJourney> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -72,8 +68,6 @@ class _$ApiLocationJourneyCopyWithImpl<$Res, $Val extends ApiLocationJourney>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiLocationJourney
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -168,8 +162,6 @@ class __$$LocationJourneyImplCopyWithImpl<$Res>
       _$LocationJourneyImpl _value, $Res Function(_$LocationJourneyImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiLocationJourney
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -316,7 +308,7 @@ class _$LocationJourneyImpl extends _LocationJourney {
                 other.update_at == update_at));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType,
@@ -332,9 +324,7 @@ class _$LocationJourneyImpl extends _LocationJourney {
       created_at,
       update_at);
 
-  /// Create a copy of ApiLocationJourney
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$LocationJourneyImplCopyWith<_$LocationJourneyImpl> get copyWith =>
@@ -389,11 +379,8 @@ abstract class _LocationJourney extends ApiLocationJourney {
   int? get created_at;
   @override
   int? get update_at;
-
-  /// Create a copy of ApiLocationJourney
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$LocationJourneyImplCopyWith<_$LocationJourneyImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -407,12 +394,8 @@ mixin _$JourneyRoute {
   double get latitude => throw _privateConstructorUsedError;
   double get longitude => throw _privateConstructorUsedError;
 
-  /// Serializes this JourneyRoute to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of JourneyRoute
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $JourneyRouteCopyWith<JourneyRoute> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -436,8 +419,6 @@ class _$JourneyRouteCopyWithImpl<$Res, $Val extends JourneyRoute>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of JourneyRoute
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -476,8 +457,6 @@ class __$$JourneyRouteImplCopyWithImpl<$Res>
       _$JourneyRouteImpl _value, $Res Function(_$JourneyRouteImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of JourneyRoute
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -526,13 +505,11 @@ class _$JourneyRouteImpl implements _JourneyRoute {
                 other.longitude == longitude));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, latitude, longitude);
 
-  /// Create a copy of JourneyRoute
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$JourneyRouteImplCopyWith<_$JourneyRouteImpl> get copyWith =>
@@ -558,11 +535,8 @@ abstract class _JourneyRoute implements JourneyRoute {
   double get latitude;
   @override
   double get longitude;
-
-  /// Create a copy of JourneyRoute
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$JourneyRouteImplCopyWith<_$JourneyRouteImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/data/lib/api/location/location.freezed.dart b/data/lib/api/location/location.freezed.dart
index f8c15d17..e7093584 100644
--- a/data/lib/api/location/location.freezed.dart
+++ b/data/lib/api/location/location.freezed.dart
@@ -27,12 +27,8 @@ mixin _$ApiLocation {
   int? get user_state => throw _privateConstructorUsedError;
   int? get created_at => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiLocation to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiLocation
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiLocationCopyWith<ApiLocation> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -62,8 +58,6 @@ class _$ApiLocationCopyWithImpl<$Res, $Val extends ApiLocation>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiLocation
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -128,8 +122,6 @@ class __$$ApiLocationImplCopyWithImpl<$Res>
       _$ApiLocationImpl _value, $Res Function(_$ApiLocationImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiLocation
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -219,14 +211,12 @@ class _$ApiLocationImpl extends _ApiLocation {
                 other.created_at == created_at));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType, id, user_id, latitude, longitude, user_state, created_at);
 
-  /// Create a copy of ApiLocation
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiLocationImplCopyWith<_$ApiLocationImpl> get copyWith =>
@@ -265,11 +255,8 @@ abstract class _ApiLocation extends ApiLocation {
   int? get user_state;
   @override
   int? get created_at;
-
-  /// Create a copy of ApiLocation
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiLocationImplCopyWith<_$ApiLocationImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/data/lib/api/message/message_models.freezed.dart b/data/lib/api/message/message_models.freezed.dart
index 0635438f..6af1af06 100644
--- a/data/lib/api/message/message_models.freezed.dart
+++ b/data/lib/api/message/message_models.freezed.dart
@@ -30,12 +30,8 @@ mixin _$ApiThread {
   @ServerTimestampConverter()
   DateTime? get last_message_at => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiThread to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiThread
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiThreadCopyWith<ApiThread> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -66,8 +62,6 @@ class _$ApiThreadCopyWithImpl<$Res, $Val extends ApiThread>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiThread
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -144,8 +138,6 @@ class __$$ApiThreadImplCopyWithImpl<$Res>
       _$ApiThreadImpl _value, $Res Function(_$ApiThreadImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiThread
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -273,7 +265,7 @@ class _$ApiThreadImpl extends _ApiThread {
                 other.last_message_at == last_message_at));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType,
@@ -286,9 +278,7 @@ class _$ApiThreadImpl extends _ApiThread {
       last_message,
       last_message_at);
 
-  /// Create a copy of ApiThread
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiThreadImplCopyWith<_$ApiThreadImpl> get copyWith =>
@@ -335,11 +325,8 @@ abstract class _ApiThread extends ApiThread {
   @override
   @ServerTimestampConverter()
   DateTime? get last_message_at;
-
-  /// Create a copy of ApiThread
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiThreadImplCopyWith<_$ApiThreadImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -359,12 +346,8 @@ mixin _$ApiThreadMessage {
   @ServerTimestampConverter()
   DateTime? get created_at => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiThreadMessage to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiThreadMessage
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiThreadMessageCopyWith<ApiThreadMessage> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -395,8 +378,6 @@ class _$ApiThreadMessageCopyWithImpl<$Res, $Val extends ApiThreadMessage>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiThreadMessage
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -467,8 +448,6 @@ class __$$ApiThreadMessageImplCopyWithImpl<$Res>
       $Res Function(_$ApiThreadMessageImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiThreadMessage
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -584,7 +563,7 @@ class _$ApiThreadMessageImpl extends _ApiThreadMessage {
                 other.created_at == created_at));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType,
@@ -596,9 +575,7 @@ class _$ApiThreadMessageImpl extends _ApiThreadMessage {
       const DeepCollectionEquality().hash(_archived_for),
       created_at);
 
-  /// Create a copy of ApiThreadMessage
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiThreadMessageImplCopyWith<_$ApiThreadMessageImpl> get copyWith =>
@@ -643,11 +620,8 @@ abstract class _ApiThreadMessage extends ApiThreadMessage {
   @override
   @ServerTimestampConverter()
   DateTime? get created_at;
-
-  /// Create a copy of ApiThreadMessage
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiThreadMessageImplCopyWith<_$ApiThreadMessageImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -663,12 +637,8 @@ mixin _$ThreadInfo {
       throw _privateConstructorUsedError;
   List<ApiUserInfo> get members => throw _privateConstructorUsedError;
 
-  /// Serializes this ThreadInfo to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ThreadInfo
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ThreadInfoCopyWith<ThreadInfo> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -697,8 +667,6 @@ class _$ThreadInfoCopyWithImpl<$Res, $Val extends ThreadInfo>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ThreadInfo
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -722,8 +690,6 @@ class _$ThreadInfoCopyWithImpl<$Res, $Val extends ThreadInfo>
     ) as $Val);
   }
 
-  /// Create a copy of ThreadInfo
-  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $ApiThreadCopyWith<$Res> get thread {
@@ -758,8 +724,6 @@ class __$$ThreadInfoImplCopyWithImpl<$Res>
       _$ThreadInfoImpl _value, $Res Function(_$ThreadInfoImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ThreadInfo
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -832,7 +796,7 @@ class _$ThreadInfoImpl extends _ThreadInfo {
             const DeepCollectionEquality().equals(other._members, _members));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType,
@@ -840,9 +804,7 @@ class _$ThreadInfoImpl extends _ThreadInfo {
       const DeepCollectionEquality().hash(_threadMessage),
       const DeepCollectionEquality().hash(_members));
 
-  /// Create a copy of ThreadInfo
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ThreadInfoImplCopyWith<_$ThreadInfoImpl> get copyWith =>
@@ -872,11 +834,8 @@ abstract class _ThreadInfo extends ThreadInfo {
   List<ApiThreadMessage> get threadMessage;
   @override
   List<ApiUserInfo> get members;
-
-  /// Create a copy of ThreadInfo
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ThreadInfoImplCopyWith<_$ThreadInfoImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/data/lib/api/space/space_models.freezed.dart b/data/lib/api/space/space_models.freezed.dart
index 96e7cf0d..0b2670d9 100644
--- a/data/lib/api/space/space_models.freezed.dart
+++ b/data/lib/api/space/space_models.freezed.dart
@@ -25,12 +25,8 @@ mixin _$ApiSpace {
   String get name => throw _privateConstructorUsedError;
   int? get created_at => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiSpace to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiSpace
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiSpaceCopyWith<ApiSpace> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -53,8 +49,6 @@ class _$ApiSpaceCopyWithImpl<$Res, $Val extends ApiSpace>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiSpace
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -103,8 +97,6 @@ class __$$ApiSpaceImplCopyWithImpl<$Res>
       _$ApiSpaceImpl _value, $Res Function(_$ApiSpaceImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiSpace
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -174,13 +166,11 @@ class _$ApiSpaceImpl extends _ApiSpace {
                 other.created_at == created_at));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, id, admin_id, name, created_at);
 
-  /// Create a copy of ApiSpace
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiSpaceImplCopyWith<_$ApiSpaceImpl> get copyWith =>
@@ -213,11 +203,8 @@ abstract class _ApiSpace extends ApiSpace {
   String get name;
   @override
   int? get created_at;
-
-  /// Create a copy of ApiSpace
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiSpaceImplCopyWith<_$ApiSpaceImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -235,12 +222,8 @@ mixin _$ApiSpaceMember {
   bool get location_enabled => throw _privateConstructorUsedError;
   int? get created_at => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiSpaceMember to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiSpaceMember
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiSpaceMemberCopyWith<ApiSpaceMember> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -270,8 +253,6 @@ class _$ApiSpaceMemberCopyWithImpl<$Res, $Val extends ApiSpaceMember>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiSpaceMember
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -336,8 +317,6 @@ class __$$ApiSpaceMemberImplCopyWithImpl<$Res>
       _$ApiSpaceMemberImpl _value, $Res Function(_$ApiSpaceMemberImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiSpaceMember
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -426,14 +405,12 @@ class _$ApiSpaceMemberImpl extends _ApiSpaceMember {
                 other.created_at == created_at));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType, id, space_id, user_id, role, location_enabled, created_at);
 
-  /// Create a copy of ApiSpaceMember
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiSpaceMemberImplCopyWith<_$ApiSpaceMemberImpl> get copyWith =>
@@ -473,11 +450,8 @@ abstract class _ApiSpaceMember extends ApiSpaceMember {
   bool get location_enabled;
   @override
   int? get created_at;
-
-  /// Create a copy of ApiSpaceMember
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiSpaceMemberImplCopyWith<_$ApiSpaceMemberImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -493,12 +467,8 @@ mixin _$ApiSpaceInvitation {
   String get code => throw _privateConstructorUsedError;
   int? get created_at => throw _privateConstructorUsedError;
 
-  /// Serializes this ApiSpaceInvitation to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of ApiSpaceInvitation
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $ApiSpaceInvitationCopyWith<ApiSpaceInvitation> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -522,8 +492,6 @@ class _$ApiSpaceInvitationCopyWithImpl<$Res, $Val extends ApiSpaceInvitation>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of ApiSpaceInvitation
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -572,8 +540,6 @@ class __$$ApiSpaceInvitationImplCopyWithImpl<$Res>
       $Res Function(_$ApiSpaceInvitationImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of ApiSpaceInvitation
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -643,13 +609,11 @@ class _$ApiSpaceInvitationImpl extends _ApiSpaceInvitation {
                 other.created_at == created_at));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, id, space_id, code, created_at);
 
-  /// Create a copy of ApiSpaceInvitation
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$ApiSpaceInvitationImplCopyWith<_$ApiSpaceInvitationImpl> get copyWith =>
@@ -683,11 +647,8 @@ abstract class _ApiSpaceInvitation extends ApiSpaceInvitation {
   String get code;
   @override
   int? get created_at;
-
-  /// Create a copy of ApiSpaceInvitation
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$ApiSpaceInvitationImplCopyWith<_$ApiSpaceInvitationImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -701,12 +662,8 @@ mixin _$SpaceInfo {
   ApiSpace get space => throw _privateConstructorUsedError;
   List<ApiUserInfo> get members => throw _privateConstructorUsedError;
 
-  /// Serializes this SpaceInfo to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of SpaceInfo
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $SpaceInfoCopyWith<SpaceInfo> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -731,8 +688,6 @@ class _$SpaceInfoCopyWithImpl<$Res, $Val extends SpaceInfo>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of SpaceInfo
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -751,8 +706,6 @@ class _$SpaceInfoCopyWithImpl<$Res, $Val extends SpaceInfo>
     ) as $Val);
   }
 
-  /// Create a copy of SpaceInfo
-  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $ApiSpaceCopyWith<$Res> get space {
@@ -784,8 +737,6 @@ class __$$SpaceInfoImplCopyWithImpl<$Res>
       _$SpaceInfoImpl _value, $Res Function(_$SpaceInfoImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of SpaceInfo
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -840,14 +791,12 @@ class _$SpaceInfoImpl extends _SpaceInfo {
             const DeepCollectionEquality().equals(other._members, _members));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType, space, const DeepCollectionEquality().hash(_members));
 
-  /// Create a copy of SpaceInfo
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$SpaceInfoImplCopyWith<_$SpaceInfoImpl> get copyWith =>
@@ -874,11 +823,8 @@ abstract class _SpaceInfo extends SpaceInfo {
   ApiSpace get space;
   @override
   List<ApiUserInfo> get members;
-
-  /// Create a copy of SpaceInfo
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$SpaceInfoImplCopyWith<_$SpaceInfoImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }