refactor: update changeUserRole method to accept named parameters for improved clarity and modify ProfilePage to utilize new method signature

refactor: enhance AuthLogic to handle user roles and improve navigation based on role selection; format code for better readability in ProfilePage
feat: integrate GService into various root logic classes and log user roles during initialization
2025-12-30 09:40:15 +03:30 · 2025-12-30 09:16:07 +03:30 · 2025-12-29 16:44:36 +03:30 · 2025-12-29 16:23:19 +03:30 · 2025-12-29 14:40:25 +03:30 · 2025-12-29 14:27:31 +03:30
73 changed files with 2605 additions and 2102 deletions
--- a/android/local.properties
+++ b/android/local.properties
@@ -1,5 +1,5 @@
 sdk.dir=C:\\Users\\Housh11\\AppData\\Local\\Android\\sdk
 flutter.sdk=C:\\src\\flutter
 flutter.buildMode=debug
-flutter.versionName=1.3.41
-flutter.versionCode=37
+flutter.versionName=1.3.43
+flutter.versionCode=39
--- a/assets/icons/inspection_poultry.svg
+++ b/assets/icons/inspection_poultry.svg
@@ -0,0 +1,10 @@
+<svg width="49" height="39" viewBox="0 0 49 39" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.4876 30.2057C24.5116 30.2057 30.2057 24.5116 30.2057 17.4876C30.2057 10.4636 24.5116 4.76953 17.4876 4.76953C10.4636 4.76953 4.76953 10.4636 4.76953 17.4876C4.76953 24.5116 10.4636 30.2057 17.4876 30.2057Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.3852 33.3842L26.4697 26.4688" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24.0771 14.8029C23.0086 13.7947 21.8333 14.4501 20.9292 15.1325C20.1072 15.7413 19.0757 15.8847 18.7963 15.7878C18.5538 15.5552 18.3853 14.6556 18.2292 13.9925C18.0155 12.965 17.7442 11.6194 16.9511 10.6966L16.9799 10.6656C17.0471 10.5856 17.0969 10.494 17.1265 10.3959C17.1562 10.2977 17.1651 10.1951 17.1527 10.0937C17.1403 9.99234 17.1068 9.89428 17.0543 9.80512C17.0017 9.71596 16.931 9.63743 16.8463 9.57404C16.7616 9.51064 16.6644 9.46361 16.5605 9.43564C16.4565 9.40766 16.3476 9.39928 16.2402 9.41098C16.1328 9.42269 16.0289 9.45424 15.9344 9.50384C15.8399 9.55344 15.7567 9.62011 15.6895 9.70006V9.53332C15.6895 9.32764 15.6029 9.13039 15.4487 8.98495C15.2946 8.83952 15.0855 8.75781 14.8676 8.75781C14.6496 8.75781 14.4405 8.83952 14.2864 8.98495C14.1322 9.13039 14.0456 9.32764 14.0456 9.53332V9.68455L14.0004 9.62638C13.868 9.46287 13.6722 9.35569 13.456 9.32842C13.2398 9.30115 13.021 9.35603 12.8477 9.48097C12.6744 9.60592 12.5608 9.79071 12.5319 9.99469C12.503 10.1987 12.5612 10.4051 12.6936 10.5686L12.7224 10.6035C12.5089 10.8628 12.3486 11.1573 12.2498 11.4721H11.9909C11.7729 11.4721 11.5638 11.5538 11.4097 11.6992C11.2555 11.8447 11.1689 12.0419 11.1689 12.2476C11.1689 12.4533 11.2555 12.6505 11.4097 12.796C11.5638 12.9414 11.7729 13.0231 11.9909 13.0231H12.6977C13.1456 13.4419 13.7785 13.8529 13.7785 14.357C13.7785 14.5664 13.5771 14.8107 13.2484 15.1907C12.3301 16.1026 11.8207 17.314 11.8265 18.5719C11.8265 20.8984 13.3552 22.019 14.8347 23.0931C15.9977 23.9384 16.573 24.5899 17.7442 24.8613V26.2068H17.3333C17.1153 26.2068 16.9062 26.2885 16.7521 26.4339C16.598 26.5794 16.5114 26.7766 16.5114 26.9823C16.5114 27.188 16.598 27.3852 16.7521 27.5307C16.9062 27.6761 17.1153 27.7578 17.3333 27.7578H19.3881C19.6061 27.7578 19.8151 27.6761 19.9692 27.5307C20.1234 27.3852 20.21 27.188 20.21 26.9823C20.21 26.7766 20.1234 26.5794 19.9692 26.4339C19.8151 26.2885 19.6061 26.2068 19.3881 26.2068V24.8458C20.4902 24.6063 21.4789 24.0329 22.2031 23.2133C23.6785 21.3599 23.5305 21.0148 24.2579 20.2974C24.6334 19.9627 24.9157 19.5459 25.0798 19.0837C25.3962 18.2501 24.825 15.5047 24.0771 14.8029ZM23.5346 18.6068C23.4449 18.8468 23.2905 19.0606 23.0867 19.2272C22.7339 19.5461 22.4419 19.9199 22.2237 20.3323C21.8341 21.0174 21.3875 21.6721 20.8881 22.2905C20.5892 22.6159 20.2252 22.8825 19.8168 23.0748C19.4085 23.2671 18.9639 23.3814 18.5086 23.4111C17.5963 23.4111 17.0374 22.7403 15.8415 21.8601C14.4689 20.8596 13.4744 20.1384 13.4744 18.5641C13.4747 17.6661 13.8514 16.8047 14.5223 16.1678C14.9662 15.656 15.4265 15.1286 15.4265 14.3531C15.4265 13.2635 14.6045 12.5733 14.0867 12.1196C14.0045 12.0499 13.9018 11.9607 13.8278 11.8947C13.87 11.7237 13.9674 11.5692 14.1065 11.4526C14.2456 11.3359 14.4196 11.2628 14.6045 11.2433C15.7963 11.2433 16.1744 12.1429 16.6182 14.2911C16.8566 15.4543 17.0621 16.447 17.7648 17.0054C18.7264 17.7615 20.7442 17.2652 21.9565 16.3501C22.6059 15.8615 22.8606 15.8537 22.9017 15.8886C23.1976 16.2415 23.6415 18.1376 23.5346 18.6029V18.6068Z" fill="white"/>
+<path d="M19.128 19.1849C18.9796 19.3766 18.8011 19.4699 18.6209 19.4501C18.0798 19.4501 17.3842 18.4182 17.2017 18.055C17.0839 17.8567 16.9297 17.7504 16.771 17.7582C16.6123 17.766 16.4613 17.8873 16.3493 18.0969C16.2372 18.3066 16.1727 18.5886 16.1691 18.8844C16.1655 19.1803 16.223 19.4675 16.3298 19.6865C16.4566 19.8998 17.4707 21.756 18.6209 21.756C19.1215 21.7853 19.6091 21.4575 19.9845 20.8394C20.0429 20.7321 20.0893 20.6043 20.121 20.4632C20.1526 20.3222 20.1689 20.1708 20.1689 20.0179C20.1689 19.865 20.1526 19.7137 20.121 19.5726C20.0893 19.4316 20.0429 19.3037 19.9845 19.1964C19.8701 18.9888 19.7171 18.8716 19.5575 18.8695C19.3978 18.8673 19.244 18.9804 19.128 19.1849Z" fill="white"/>
+<path d="M44.5688 28.3654H37.9374C35.434 28.3654 34 26.8065 34 24.0853V15.2997C34 12.4613 35.3263 11.0195 37.9374 11.0195C38.2773 11.0195 38.5591 11.3259 38.5591 11.6953C38.5591 12.0558 38.6917 12.3982 38.9238 12.6505C39.1559 12.9028 39.4709 13.047 39.8025 13.047H42.7037C43.3918 13.047 43.9471 12.4432 43.9471 11.6953C43.9471 11.3259 44.229 11.0195 44.5688 11.0195C47.1799 11.0195 48.5062 12.4613 48.5062 15.2997V24.0853C48.5062 26.8065 47.0722 28.3654 44.5688 28.3654ZM37.3986 12.3892C36.0889 12.5063 35.2434 13.1461 35.2434 15.2997V24.0853C35.2434 26.0857 36.0972 27.0138 37.9374 27.0138H44.5688C46.409 27.0138 47.2628 26.0857 47.2628 24.0853V15.2997C47.2628 13.1461 46.4174 12.5153 45.1077 12.3892C44.8258 13.5426 43.8559 14.3986 42.7037 14.3986H39.8025C39.1394 14.3986 38.5177 14.1193 38.0452 13.6056C37.7302 13.2632 37.5146 12.8487 37.3986 12.3892Z" fill="white" stroke="white" stroke-width="0.25"/>
+<path d="M42.7039 14.4065H39.8027C39.1396 14.4065 38.5179 14.1272 38.0454 13.6136C37.5729 13.0999 37.3159 12.4241 37.3159 11.7033C37.3159 10.2165 38.435 9 39.8027 9H42.7039C43.3671 9 43.9888 9.27934 44.4613 9.79296C44.9338 10.3066 45.1907 10.9824 45.1907 11.7033C45.1907 13.19 44.0717 14.4065 42.7039 14.4065ZM39.8027 10.3516C39.1147 10.3516 38.5593 10.9554 38.5593 11.7033C38.5593 12.0637 38.6919 12.4061 38.924 12.6584C39.1561 12.9107 39.4711 13.0549 39.8027 13.0549H42.7039C43.392 13.0549 43.9473 12.4512 43.9473 11.7033C43.9473 11.3428 43.8147 11.0004 43.5826 10.7481C43.3505 10.4958 43.0355 10.3516 42.7039 10.3516H39.8027Z" fill="white"/>
+<path d="M41.2533 20.2501H37.9376C37.5978 20.2501 37.3159 19.9437 37.3159 19.5743C37.3159 19.2048 37.5978 18.8984 37.9376 18.8984H41.2533C41.5932 18.8984 41.875 19.2048 41.875 19.5743C41.875 19.9437 41.5932 20.2501 41.2533 20.2501Z" fill="white"/>
+<path d="M44.569 23.8555H37.9376C37.5978 23.8555 37.3159 23.5492 37.3159 23.1797C37.3159 22.8103 37.5978 22.5039 37.9376 22.5039H44.569C44.9089 22.5039 45.1907 22.8103 45.1907 23.1797C45.1907 23.5492 44.9089 23.8555 44.569 23.8555Z" fill="white"/>
+</svg>
--- a/assets/vec/inspection_poultry.svg.vec
+++ b/assets/vec/inspection_poultry.svg.vec
--- a/lib/data/model/app_info_model.dart
+++ b/lib/data/model/app_info_model.dart
@@ -19,6 +19,7 @@ abstract class Info with _$Info {
    String? minVersion,
    String? module,
    bool? required,
+    List<String>? changes,
  }) = _Info;

  factory Info.fromJson(Map<String, dynamic> json) => _$InfoFromJson(json);
--- a/lib/data/model/app_info_model.freezed.dart
+++ b/lib/data/model/app_info_model.freezed.dart
@@ -308,7 +308,7 @@ $InfoCopyWith<$Res>? get info {
 /// @nodoc
 mixin _$Info {

- String? get version; String? get minVersion; String? get module; bool? get required;
+ String? get version; String? get minVersion; String? get module; bool? get required; List<String>? get changes;
 /// Create a copy of Info
 /// with the given fields replaced by the non-null parameter values.
@JsonKey(includeFromJson: false, includeToJson: false)
@@ -321,16 +321,16 @@ $InfoCopyWith<Info> get copyWith => _$InfoCopyWithImpl<Info>(this as Info, _$ide

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is Info&&(identical(other.version, version) || other.version == version)&&(identical(other.minVersion, minVersion) || other.minVersion == minVersion)&&(identical(other.module, module) || other.module == module)&&(identical(other.required, required) || other.required == required));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is Info&&(identical(other.version, version) || other.version == version)&&(identical(other.minVersion, minVersion) || other.minVersion == minVersion)&&(identical(other.module, module) || other.module == module)&&(identical(other.required, required) || other.required == required)&&const DeepCollectionEquality().equals(other.changes, changes));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,version,minVersion,module,required);
+int get hashCode => Object.hash(runtimeType,version,minVersion,module,required,const DeepCollectionEquality().hash(changes));

@override
 String toString() {
-  return 'Info(version: $version, minVersion: $minVersion, module: $module, required: $required)';
+  return 'Info(version: $version, minVersion: $minVersion, module: $module, required: $required, changes: $changes)';
 }


@@ -341,7 +341,7 @@ abstract mixin class $InfoCopyWith<$Res>  {
  factory $InfoCopyWith(Info value, $Res Function(Info) _then) = _$InfoCopyWithImpl;
@useResult
 $Res call({
- String? version, String? minVersion, String? module, bool? required
+ String? version, String? minVersion, String? module, bool? required, List<String>? changes
 });


@@ -358,13 +358,14 @@ class _$InfoCopyWithImpl<$Res>

 /// Create a copy of Info
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? version = freezed,Object? minVersion = freezed,Object? module = freezed,Object? required = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? version = freezed,Object? minVersion = freezed,Object? module = freezed,Object? required = freezed,Object? changes = freezed,}) {
  return _then(_self.copyWith(
 version: freezed == version ? _self.version : version // ignore: cast_nullable_to_non_nullable
 as String?,minVersion: freezed == minVersion ? _self.minVersion : minVersion // ignore: cast_nullable_to_non_nullable
 as String?,module: freezed == module ? _self.module : module // ignore: cast_nullable_to_non_nullable
 as String?,required: freezed == required ? _self.required : required // ignore: cast_nullable_to_non_nullable
-as bool?,
+as bool?,changes: freezed == changes ? _self.changes : changes // ignore: cast_nullable_to_non_nullable
+as List<String>?,
  ));
 }

@@ -449,10 +450,10 @@ return $default(_that);case _:
 /// }
 /// ```

-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String? version,  String? minVersion,  String? module,  bool? required)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String? version,  String? minVersion,  String? module,  bool? required,  List<String>? changes)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _Info() when $default != null:
-return $default(_that.version,_that.minVersion,_that.module,_that.required);case _:
+return $default(_that.version,_that.minVersion,_that.module,_that.required,_that.changes);case _:
  return orElse();

 }
@@ -470,10 +471,10 @@ return $default(_that.version,_that.minVersion,_that.module,_that.required);case
 /// }
 /// ```

-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String? version,  String? minVersion,  String? module,  bool? required)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String? version,  String? minVersion,  String? module,  bool? required,  List<String>? changes)  $default,) {final _that = this;
 switch (_that) {
 case _Info():
-return $default(_that.version,_that.minVersion,_that.module,_that.required);case _:
+return $default(_that.version,_that.minVersion,_that.module,_that.required,_that.changes);case _:
  throw StateError('Unexpected subclass');

 }
@@ -490,10 +491,10 @@ return $default(_that.version,_that.minVersion,_that.module,_that.required);case
 /// }
 /// ```

-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String? version,  String? minVersion,  String? module,  bool? required)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String? version,  String? minVersion,  String? module,  bool? required,  List<String>? changes)?  $default,) {final _that = this;
 switch (_that) {
 case _Info() when $default != null:
-return $default(_that.version,_that.minVersion,_that.module,_that.required);case _:
+return $default(_that.version,_that.minVersion,_that.module,_that.required,_that.changes);case _:
  return null;

 }
@@ -505,13 +506,22 @@ return $default(_that.version,_that.minVersion,_that.module,_that.required);case
@JsonSerializable()

 class _Info implements Info {
-  const _Info({this.version, this.minVersion, this.module, this.required});
+  const _Info({this.version, this.minVersion, this.module, this.required, final  List<String>? changes}): _changes = changes;
  factory _Info.fromJson(Map<String, dynamic> json) => _$InfoFromJson(json);

@override final  String? version;
@override final  String? minVersion;
@override final  String? module;
@override final  bool? required;
+ final  List<String>? _changes;
+@override List<String>? get changes {
+  final value = _changes;
+  if (value == null) return null;
+  if (_changes is EqualUnmodifiableListView) return _changes;
+  // ignore: implicit_dynamic_type
+  return EqualUnmodifiableListView(value);
+}
+

 /// Create a copy of Info
 /// with the given fields replaced by the non-null parameter values.
@@ -526,16 +536,16 @@ Map<String, dynamic> toJson() {

@override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _Info&&(identical(other.version, version) || other.version == version)&&(identical(other.minVersion, minVersion) || other.minVersion == minVersion)&&(identical(other.module, module) || other.module == module)&&(identical(other.required, required) || other.required == required));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _Info&&(identical(other.version, version) || other.version == version)&&(identical(other.minVersion, minVersion) || other.minVersion == minVersion)&&(identical(other.module, module) || other.module == module)&&(identical(other.required, required) || other.required == required)&&const DeepCollectionEquality().equals(other._changes, _changes));
 }

@JsonKey(includeFromJson: false, includeToJson: false)
@override
-int get hashCode => Object.hash(runtimeType,version,minVersion,module,required);
+int get hashCode => Object.hash(runtimeType,version,minVersion,module,required,const DeepCollectionEquality().hash(_changes));

@override
 String toString() {
-  return 'Info(version: $version, minVersion: $minVersion, module: $module, required: $required)';
+  return 'Info(version: $version, minVersion: $minVersion, module: $module, required: $required, changes: $changes)';
 }


@@ -546,7 +556,7 @@ abstract mixin class _$InfoCopyWith<$Res> implements $InfoCopyWith<$Res> {
  factory _$InfoCopyWith(_Info value, $Res Function(_Info) _then) = __$InfoCopyWithImpl;
@override @useResult
 $Res call({
- String? version, String? minVersion, String? module, bool? required
+ String? version, String? minVersion, String? module, bool? required, List<String>? changes
 });


@@ -563,13 +573,14 @@ class __$InfoCopyWithImpl<$Res>

 /// Create a copy of Info
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? version = freezed,Object? minVersion = freezed,Object? module = freezed,Object? required = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? version = freezed,Object? minVersion = freezed,Object? module = freezed,Object? required = freezed,Object? changes = freezed,}) {
  return _then(_Info(
 version: freezed == version ? _self.version : version // ignore: cast_nullable_to_non_nullable
 as String?,minVersion: freezed == minVersion ? _self.minVersion : minVersion // ignore: cast_nullable_to_non_nullable
 as String?,module: freezed == module ? _self.module : module // ignore: cast_nullable_to_non_nullable
 as String?,required: freezed == required ? _self.required : required // ignore: cast_nullable_to_non_nullable
-as bool?,
+as bool?,changes: freezed == changes ? _self._changes : changes // ignore: cast_nullable_to_non_nullable
+as List<String>?,
  ));
 }

--- a/lib/data/model/app_info_model.g.dart
+++ b/lib/data/model/app_info_model.g.dart
@@ -27,6 +27,9 @@ _Info _$InfoFromJson(Map<String, dynamic> json) => _Info(
  minVersion: json['minVersion'] as String?,
  module: json['module'] as String?,
  required: json['required'] as bool?,
+  changes: (json['changes'] as List<dynamic>?)
+      ?.map((e) => e as String)
+      .toList(),
 );

 Map<String, dynamic> _$InfoToJson(_Info instance) => <String, dynamic>{
@@ -34,4 +37,5 @@ Map<String, dynamic> _$InfoToJson(_Info instance) => <String, dynamic>{
  'minVersion': instance.minVersion,
  'module': instance.module,
  'required': instance.required,
+  'changes': instance.changes,
 };
--- a/lib/presentation/pages/modules/logic.dart
+++ b/lib/presentation/pages/modules/logic.dart
@@ -94,9 +94,9 @@ class ModulesLogic extends GetxController {

  void _goToModule(Module module, int index) async {
    selectedIndex.value = index;
-    await Future.delayed(Duration(milliseconds: 300));
+    await Future.delayed(Duration(milliseconds: 100));
    selectedIndex.value = null;
-    //  saveModule(module);
+
    await navigateToModule(module);
  }

--- a/lib/presentation/pages/splash/logic.dart
+++ b/lib/presentation/pages/splash/logic.dart
@@ -14,6 +14,7 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
  RxBool hasUpdated = false.obs;
  RxBool onUpdateDownload = false.obs;
  RxDouble percent = 0.0.obs;
+  RxString strVersion = ''.obs;
  final RxnString _updateFilePath = RxnString();
  final platform = MethodChannel('apk_installer');
  final Dio _dio = Dio();
@@ -35,9 +36,15 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
      duration: const Duration(milliseconds: 8000),
    );

-    scaleAnimation.value = Tween<double>(begin: 0.8, end: 1.2).animate(scaleController);
+    scaleAnimation.value = Tween<double>(
+      begin: 0.8,
+      end: 1.2,
+    ).animate(scaleController);

-    rotationAnimation.value = Tween<double>(begin: 0.0, end: 1).animate(rotateController);
+    rotationAnimation.value = Tween<double>(
+      begin: 0.0,
+      end: 1,
+    ).animate(rotateController);

    rotateController.forward();
    rotateController.addStatusListener((status) {
@@ -63,6 +70,7 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
          onConfirm: () async {
            await fileDownload();
          },
+          changes: appInfoModel?.info?.changes,
        );
      } else if (!data && Get.isDialogOpen == true) {
        Get.back();
@@ -164,8 +172,6 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
        if (target != null) {
          var mFuns = getFunctionsList(target.functions);
          await Future.wait(mFuns ?? []);
-
-          iLog("target.route ===>${target.route!}");
          Get.offAndToNamed(target.route!);
        }
      } catch (e, st) {
@@ -184,8 +190,12 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
  Future<bool> checkVersion() async {
    try {
      final info = await PackageInfo.fromPlatform();
-      int version = info.version.versionNumber;
-      var res = await _dio.get("https://rsibackend.rasadyar.com/app/rasadyar-app-info/");
+      strVersion.value = info.version;
+      int version = strVersion.value.versionNumber;
+
+      var res = await _dio.get(
+        "https://rsibackend.rasadyar.com/app/rasadyar-app-info/",
+      );

      appInfoModel = AppInfoModel.fromJson(res.data);

@@ -244,7 +254,9 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
  Future<void> installApk() async {
    try {
      eLog(_updateFilePath.value);
-      await platform.invokeMethod('apk_installer', {'appPath': _updateFilePath.value});
+      await platform.invokeMethod('apk_installer', {
+        'appPath': _updateFilePath.value,
+      });
    } catch (e) {
      eLog(e);
    }
--- a/lib/presentation/pages/splash/view.dart
+++ b/lib/presentation/pages/splash/view.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';

-
 import 'logic.dart';

 class SplashPage extends GetView<SplashLogic> {
@@ -11,36 +10,51 @@ class SplashPage extends GetView<SplashLogic> {
  Widget build(BuildContext context) {
    return Scaffold(
      backgroundColor: AppColor.blueDarker,
-      body: Center(
-        child: Stack(
-          alignment: Alignment.center,
-          children: [
+      body: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Spacer(),
+          Center(
+            child: Stack(
+              alignment: Alignment.center,
+              children: [
+                ObxValue((data) {
+                  return ScaleTransition(
+                    scale: data.value!,
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 1),
+                      child: Assets.images.innerSplash.image(
+                        width: 190,
+                        height: 190,
+                      ),
+                    ),
+                  );
+                }, controller.scaleAnimation),

-            ObxValue((data) {
-              return ScaleTransition(
-                scale: data.value!,
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 1),
-                  child: Assets.images.innerSplash.image(
-                    width: 190,
-                    height: 190,
-                  )
-                ),
-              );
-            }, controller.scaleAnimation),
+                ObxValue((data) {
+                  return RotationTransition(
+                    turns: data.value!,

-            ObxValue((data) {
-              return RotationTransition(
-                turns: data.value!,
-
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 1),
-                    child: Assets.images.outterSplash.image()
-                ),
-              );
-            }, controller.rotationAnimation),
-          ],
-        ),
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 1),
+                      child: Assets.images.outterSplash.image(),
+                    ),
+                  );
+                }, controller.rotationAnimation),
+              ],
+            ),
+          ),
+          Spacer(),
+          ObxValue((data) {
+            return Text(
+              data.value,
+              style: AppFonts.yekan16.copyWith(
+                color: Colors.white.withAlpha(120),
+              ),
+            );
+          }, controller.strVersion),
+          SizedBox(height: 30.h),
+        ],
      ),
    );
  }
--- a/packages/chicken/lib/data/common/fa_user_role.dart
+++ b/packages/chicken/lib/data/common/fa_user_role.dart
@@ -1,4 +1,5 @@
 import 'package:rasadyar_chicken/features/city_jahad/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/features/poultry_science/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/features/province_inspector/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/features/province_operator/presentation/routes/routes.dart';
@@ -149,7 +150,7 @@ Map<String, String?> getFaUserRoleWithOnTap(String? role) {
    case "Dispenser":
      return {"پخش کننده": null};
    case "CityPoultry":
-      return {"طیور شهرستان": null};
+      return {"طیور شهرستان": CityPoultryRoutes.initCityPoultry};
    case "ParentCompany":
      return {"شرکت مادر": null};
    case "ColdHouseSteward":
--- a/packages/chicken/lib/data/di/chicken_di.dart
+++ b/packages/chicken/lib/data/di/chicken_di.dart
@@ -10,6 +10,7 @@ import 'package:rasadyar_chicken/features/steward/data/di/steward_di.dart';
 import 'package:rasadyar_chicken/features/province_operator/data/di/province_operator_di.dart';
 import 'package:rasadyar_chicken/features/province_inspector/data/di/province_inspector_di.dart';
 import 'package:rasadyar_chicken/features/city_jahad/data/di/city_jahad_di.dart';
+import 'package:rasadyar_chicken/features/city_poultry/data/di/city_poultry_di.dart';
 import 'package:rasadyar_chicken/features/vet_farm/data/di/vet_farm_di.dart';
 import 'package:rasadyar_chicken/features/super_admin/data/di/super_admin_di.dart';
 import 'package:rasadyar_chicken/features/province_supervisor/data/di/province_supervisor_di.dart';
@@ -74,6 +75,9 @@ Future<void> setupChickenDI() async {
  // Setup city_jahad feature DI
  await setupCityJahadDI(diChicken, dioRemote);

+  // Setup city_poultry feature DI
+  await setupCityPoultryDI(diChicken, dioRemote);
+
  // Setup vet_farm feature DI
  await setupVetFarmDI(diChicken, dioRemote);

@@ -138,6 +142,7 @@ Future<void> newSetupAuthDI(String newUrl) async {
  await setupProvinceOperatorDI(diChicken, dioRemote);
  await setupProvinceInspectorDI(diChicken, dioRemote);
  await setupCityJahadDI(diChicken, dioRemote);
+  await setupCityPoultryDI(diChicken, dioRemote);
  await setupVetFarmDI(diChicken, dioRemote);
  await setupSuperAdminDI(diChicken, dioRemote);
  await setupProvinceSupervisorDI(diChicken, dioRemote);
--- a/packages/chicken/lib/features/city_jahad/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/city_jahad/presentation/pages/active_hatching/view.dart
@@ -193,12 +193,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.poultry?.user?.fullname ?? 'N/A',
+                item.poultry?.user?.fullname ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
              Text(
-                item.poultry?.user?.mobile ?? 'N/A',
+                item.poultry?.user?.mobile ?? 'ندارد',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
              ),
@@ -213,12 +213,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
              Text(
-                item.poultry?.unitName ?? 'N/A',
+                item.poultry?.unitName ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.poultry?.licenceNumber ?? 'N/A',
+                item.licenceNumber ?? 'ندارد',
                textAlign: TextAlign.left,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
--- a/packages/chicken/lib/features/city_jahad/presentation/pages/home/logic.dart
+++ b/packages/chicken/lib/features/city_jahad/presentation/pages/home/logic.dart
@@ -23,7 +23,7 @@ class CityJahadHomeLogic extends GetxController {
    CityJahadActionItem(
      title: "بازرسی مزارع طیور",
      route: CityJahadRoutes.newInspectionCityJahad,
-      icon: Assets.vec.activeFramSvg.path,
+      icon: Assets.vec.inspectionPoultrySvg.path,
    ),
  ].obs;
 }
--- a/packages/chicken/lib/features/city_jahad/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/city_jahad/presentation/pages/root/logic.dart
@@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class CityJahadRootLogic extends GetxController {
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late CityJahadRepository cityJahadRepository;

@@ -45,6 +46,7 @@ class CityJahadRootLogic extends GetxController {
  void onInit() {
    super.onInit();
    cityJahadRepository = diChicken.get<CityJahadRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  void toggleExpanded(int index) {
--- a/packages/chicken/lib/features/city_poultry/city_poultry.dart
+++ b/packages/chicken/lib/features/city_poultry/city_poultry.dart
@@ -0,0 +1,4 @@
+export 'data/di/city_poultry_di.dart';
+export 'presentation/routes/routes.dart';
+export 'presentation/routes/pages.dart';
+
--- a/packages/chicken/lib/features/city_poultry/data/datasources/remote/city_poultry_remote_data_source.dart
+++ b/packages/chicken/lib/features/city_poultry/data/datasources/remote/city_poultry_remote_data_source.dart
@@ -0,0 +1,16 @@
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response.dart';
+import 'package:rasadyar_core/core.dart';
+
+abstract class CityPoultryRemoteDataSource {
+  Future<PaginationModel<PoultryScienceReport>?> getSubmitInspectionList({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  });
+
+  Future<void> submitInspection({
+    required String token,
+    required SubmitInspectionResponse request,
+  });
+}
+
--- a/packages/chicken/lib/features/city_poultry/data/datasources/remote/city_poultry_remote_data_source_impl.dart
+++ b/packages/chicken/lib/features/city_poultry/data/datasources/remote/city_poultry_remote_data_source_impl.dart
@@ -0,0 +1,40 @@
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response.dart';
+import 'package:rasadyar_chicken/features/city_poultry/data/datasources/remote/city_poultry_remote_data_source.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CityPoultryRemoteDataSourceImpl implements CityPoultryRemoteDataSource {
+  final DioRemote _httpClient;
+
+  CityPoultryRemoteDataSourceImpl(this._httpClient);
+
+  @override
+  Future<PaginationModel<PoultryScienceReport>?> getSubmitInspectionList({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  }) async {
+    var res = await _httpClient.get(
+      '/poultry_science_report/',
+      headers: {'Authorization': 'Bearer $token'},
+      queryParameters: queryParameters,
+      fromJson: (json) => PaginationModel<PoultryScienceReport>.fromJson(
+        json,
+        (json) => PoultryScienceReport.fromJson(json as Map<String, dynamic>),
+      ),
+    );
+    return res.data;
+  }
+
+  @override
+  Future<void> submitInspection({
+    required String token,
+    required SubmitInspectionResponse request,
+  }) async {
+    await _httpClient.post(
+      '/poultry_science_report/',
+      headers: {'Authorization': 'Bearer $token'},
+      data: request.toJson(),
+    );
+  }
+}
+
--- a/packages/chicken/lib/features/city_poultry/data/di/city_poultry_di.dart
+++ b/packages/chicken/lib/features/city_poultry/data/di/city_poultry_di.dart
@@ -0,0 +1,36 @@
+import 'package:rasadyar_chicken/features/city_poultry/data/datasources/remote/city_poultry_remote_data_source.dart';
+import 'package:rasadyar_chicken/features/city_poultry/data/datasources/remote/city_poultry_remote_data_source_impl.dart';
+import 'package:rasadyar_chicken/features/city_poultry/data/repositories/city_poultry_repository.dart';
+import 'package:rasadyar_chicken/features/city_poultry/data/repositories/city_poultry_repository_impl.dart';
+import 'package:rasadyar_core/core.dart';
+
+/// Setup dependency injection for city_poultry feature
+Future<void> setupCityPoultryDI(GetIt di, DioRemote dioRemote) async {
+  di.registerLazySingleton<CityPoultryRemoteDataSource>(
+    () => CityPoultryRemoteDataSourceImpl(dioRemote),
+  );
+
+  di.registerLazySingleton<CityPoultryRepository>(
+    () => CityPoultryRepositoryImpl(di.get<CityPoultryRemoteDataSource>()),
+  );
+}
+
+/// Re-register city_poultry dependencies (used when base URL changes)
+Future<void> reRegisterCityPoultryDI(GetIt di, DioRemote dioRemote) async {
+  await reRegister(di, () => CityPoultryRemoteDataSourceImpl(dioRemote));
+  await reRegister(
+    di,
+    () => CityPoultryRepositoryImpl(di.get<CityPoultryRemoteDataSource>()),
+  );
+}
+
+/// Helper function to re-register a dependency
+Future<void> reRegister<T extends Object>(
+  GetIt di,
+  T Function() factory,
+) async {
+  if (di.isRegistered<T>()) {
+    await di.unregister<T>();
+  }
+  di.registerLazySingleton<T>(factory);
+}
--- a/packages/chicken/lib/features/city_poultry/data/repositories/city_poultry_repository.dart
+++ b/packages/chicken/lib/features/city_poultry/data/repositories/city_poultry_repository.dart
@@ -0,0 +1,16 @@
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response.dart';
+import 'package:rasadyar_core/core.dart';
+
+abstract class CityPoultryRepository {
+  Future<PaginationModel<PoultryScienceReport>?> getSubmitInspectionList({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  });
+
+  Future<void> submitInspection({
+    required String token,
+    required SubmitInspectionResponse request,
+  });
+}
+
--- a/packages/chicken/lib/features/city_poultry/data/repositories/city_poultry_repository_impl.dart
+++ b/packages/chicken/lib/features/city_poultry/data/repositories/city_poultry_repository_impl.dart
@@ -0,0 +1,31 @@
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response.dart';
+import 'package:rasadyar_chicken/features/city_poultry/data/datasources/remote/city_poultry_remote_data_source.dart';
+import 'package:rasadyar_chicken/features/city_poultry/data/repositories/city_poultry_repository.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CityPoultryRepositoryImpl implements CityPoultryRepository {
+  final CityPoultryRemoteDataSource _remote;
+
+  CityPoultryRepositoryImpl(this._remote);
+
+  @override
+  Future<PaginationModel<PoultryScienceReport>?> getSubmitInspectionList({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  }) async {
+    return await _remote.getSubmitInspectionList(
+      token: token,
+      queryParameters: queryParameters,
+    );
+  }
+
+  @override
+  Future<void> submitInspection({
+    required String token,
+    required SubmitInspectionResponse request,
+  }) async {
+    return await _remote.submitInspection(token: token, request: request);
+  }
+}
+
--- a/packages/chicken/lib/features/city_poultry/presentation/pages/active_hatching/logic.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/pages/active_hatching/logic.dart
@@ -0,0 +1,101 @@
+import 'package:rasadyar_chicken/data/di/chicken_di.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching/hatching_models.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/repositories/poultry_science_repository.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/root/logic.dart';
+import 'package:rasadyar_core/core.dart';
+
+class ActiveHatchingLogic extends GetxController {
+  CityPoultryRootLogic rootLogic = Get.find<CityPoultryRootLogic>();
+  BaseLogic baseLogic = Get.find<BaseLogic>();
+  late PoultryScienceRepository poultryScienceRepository;
+  Rx<Resource<PaginationModel<HatchingModel>>> activeHatchingList =
+      Resource<PaginationModel<HatchingModel>>.loading().obs;
+
+  final RxBool isLoadingMoreList = false.obs;
+  RxInt currentPage = 1.obs;
+  RxInt expandedIndex = RxInt(-1);
+  List<String> routesName = ['اقدام', 'جوجه ریزی فعال'];
+
+  Rx<Jalali> fromDateFilter = Jalali.now().obs;
+  Rx<Jalali> toDateFilter = Jalali.now().obs;
+  RxnString searchedValue = RxnString();
+
+  @override
+  void onInit() {
+    super.onInit();
+    poultryScienceRepository = diChicken.get<PoultryScienceRepository>();
+  }
+
+  @override
+  void onReady() {
+    super.onReady();
+    getHatchingList();
+  }
+
+  @override
+  void onClose() {
+    super.onClose();
+    baseLogic.clearSearch();
+  }
+
+  Future<void> getHatchingList([bool isLoadingMore = false]) async {
+
+
+
+
+
+    if (isLoadingMore) {
+      isLoadingMoreList.value = true;
+    } else {
+      activeHatchingList.value =
+          Resource<PaginationModel<HatchingModel>>.loading();
+    }
+
+    if (searchedValue.value != null &&
+        searchedValue.value!.trim().isNotEmpty &&
+        currentPage.value > 1) {
+      currentPage.value = 1;
+    }
+
+    safeCall(
+      call: () async => await poultryScienceRepository.getHatchingPoultry(
+        token: rootLogic.tokenService.accessToken.value!,
+        queryParameters: buildQueryParams(
+          queryParams: {'type': 'hatching'},
+          role: 'CityPoultry',
+          pageSize: 50,
+          page: currentPage.value,
+        ),
+      ),
+      onSuccess: (res) {
+        if ((res?.count ?? 0) == 0) {
+          activeHatchingList.value =
+              Resource<PaginationModel<HatchingModel>>.empty();
+        } else {
+          activeHatchingList.value =
+              Resource<PaginationModel<HatchingModel>>.success(
+                PaginationModel<HatchingModel>(
+                  count: res?.count ?? 0,
+                  next: res?.next,
+                  previous: res?.previous,
+                  results: [
+                    ...(activeHatchingList.value.data?.results ?? []),
+                    ...(res?.results ?? []),
+                  ],
+                ),
+              );
+        }
+      },
+    );
+  }
+
+  void toggleExpanded(int index) {
+    expandedIndex.value = expandedIndex.value == index ? -1 : index;
+  }
+
+  Future<void> onRefresh() async {
+    currentPage.value = 1;
+    await getHatchingList();
+  }
+}
+
--- a/packages/chicken/lib/features/city_poultry/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/pages/active_hatching/view.dart
@@ -0,0 +1,236 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching/hatching_models.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/active_hatching/logic.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart';
+import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
+import 'package:rasadyar_core/core.dart';
+
+class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
+  const ActiveHatchingPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChickenBasePage(
+      hasSearch: true,
+      hasFilter: false,
+      backId: cityPoultryActionKey,
+      routes: controller.routesName,
+      onSearchChanged: (data) {
+        controller.searchedValue.value = data;
+        controller.getHatchingList();
+      },
+      child: hatchingWidget(),
+    );
+  }
+
+  Widget hatchingWidget() {
+    return ObxValue((data) {
+      return RPaginatedListView(
+        listType: ListType.separated,
+        resource: data.value,
+        hasMore: data.value.data?.next != null,
+        padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
+        itemBuilder: (context, index) {
+          var item = data.value.data!.results![index];
+          return ObxValue((val) {
+            return ExpandableListItem2(
+              selected: val.value.isEqual(index),
+              onTap: () => controller.toggleExpanded(index),
+              index: index,
+              child: itemListWidget(item),
+              secondChild: itemListExpandedWidget(item),
+              labelColor: AppColor.blueLight,
+              labelIcon: Assets.vec.activeFramSvg.path,
+            );
+          }, controller.expandedIndex);
+        },
+        itemCount: data.value.data?.results?.length ?? 0,
+        separatorBuilder: (context, index) => SizedBox(height: 8.h),
+        onLoadMore: () async => controller.getHatchingList(true),
+      );
+    }, controller.activeHatchingList);
+  }
+
+  Container itemListExpandedWidget(HatchingModel item) {
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 8),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Column(
+        spacing: 8,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              Text(
+                item.poultry?.user?.fullname ?? 'N/A',
+                textAlign: TextAlign.center,
+                style: AppFonts.yekan16.copyWith(color: AppColor.greenDark),
+              ),
+              Spacer(),
+
+              Visibility(
+                child: Text(
+                  item.violation == true ? 'پیگیری' : 'عادی',
+                  textAlign: TextAlign.center,
+                  style: AppFonts.yekan10.copyWith(color: AppColor.redDark),
+                ),
+              ),
+            ],
+          ),
+          Container(
+            height: 32,
+            padding: EdgeInsets.symmetric(horizontal: 8),
+            decoration: ShapeDecoration(
+              color: AppColor.blueLight,
+              shape: RoundedRectangleBorder(
+                side: BorderSide(width: 1, color: AppColor.blueLightHover),
+                borderRadius: BorderRadius.circular(8),
+              ),
+            ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  'نژاد:${item.breed?.first.breed ?? 'N/A'}',
+                  style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
+                ),
+                Text(
+                  ' سن${item.age} (روز)',
+
+                  style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
+                ),
+                Text(
+                  ' دوره جوجه ریزی:${item.period}',
+                  style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
+                ),
+              ],
+            ),
+          ),
+
+          buildRow(
+            title: 'شماره مجوز جوجه ریزی',
+            value: item.licenceNumber ?? 'N/A',
+          ),
+          buildUnitRow(
+            title: 'حجم جوجه ریزی',
+            value: item.quantity.separatedByCommaFa,
+            unit: '(قطعه)',
+          ),
+          buildUnitRow(
+            title: 'مانده در سالن',
+            value: item.leftOver.separatedByCommaFa,
+            unit: '(قطعه)',
+          ),
+          buildUnitRow(
+            title: 'تلفات',
+            value: item.losses.separatedByCommaFa,
+            unit: '(قطعه)',
+          ),
+          buildRow(
+            title: 'دامپزشک فارم',
+            value:
+                '${item.vetFarm?.vetFarmFullName}(${item.vetFarm?.vetFarmMobile})',
+          ),
+          buildRow(
+            title: 'شرح بازرسی',
+            value: item.reportInfo?.image == false
+                ? 'ارسال تصویر جوجه ریزی فارم '
+                : 'تکمیل شده',
+            titleStyle: AppFonts.yekan14.copyWith(
+              color: (item.reportInfo?.image ?? false)
+                  ? AppColor.greenNormal
+                  : AppColor.redDark,
+            ),
+            valueStyle: AppFonts.yekan14.copyWith(
+              color: (item.reportInfo?.image ?? false)
+                  ? AppColor.greenNormal
+                  : AppColor.redDark,
+            ),
+          ),
+
+          RElevated(
+            height: 40.h,
+            isFullWidth: true,
+            onPressed: () {
+              Get.find<CreateInspectionBottomSheetLogic>().setHatchingModel(
+                item,
+              );
+              Get.bottomSheet(
+                CreateInspectionBottomSheet(),
+                isScrollControlled: true,
+                ignoreSafeArea: false,
+              ).then((value) {
+                if (Get.isRegistered<CreateInspectionBottomSheetLogic>()) {
+                  Get.find<CreateInspectionBottomSheetLogic>().clearForm();
+                }
+              });
+            },
+            child: Text('ثبت بازرسی'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget itemListWidget(HatchingModel item) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      children: [
+        SizedBox(width: 20),
+        Expanded(
+          flex: 2,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            spacing: 3,
+            children: [
+              Text(
+                item.poultry?.user?.fullname ?? 'ندارد',
+                textAlign: TextAlign.start,
+                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+              ),
+              Text(
+                item.poultry?.user?.mobile ?? 'ندارد',
+                textAlign: TextAlign.center,
+                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
+              ),
+            ],
+          ),
+        ),
+        Expanded(
+          flex: 3,
+          child: Column(
+            spacing: 3,
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text(
+                item.poultry?.unitName ?? 'ندارد',
+                textAlign: TextAlign.start,
+                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
+              ),
+              Text(
+                item.licenceNumber ?? 'ندارد',
+                textAlign: TextAlign.left,
+                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+              ),
+            ],
+          ),
+        ),
+        Expanded(
+          flex: 1,
+          child: Assets.vec.scanSvg.svg(
+            width: 32.w,
+            height: 32.h,
+            colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
+          ),
+        ),
+      ],
+    );
+  }
+}
--- a/packages/chicken/lib/features/city_poultry/presentation/pages/home/logic.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/pages/home/logic.dart
@@ -0,0 +1,29 @@
+import 'package:rasadyar_chicken/features/city_poultry/presentation/routes/routes.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CityPoultryActionItem {
+  final String title;
+  final String route;
+  final String icon;
+
+  CityPoultryActionItem({
+    required this.title,
+    required this.route,
+    required this.icon,
+  });
+}
+
+class CityPoultryHomeLogic extends GetxController {
+  RxList<CityPoultryActionItem> items = [
+    CityPoultryActionItem(
+      title: "جوجه ریزی فعال",
+      route: CityPoultryRoutes.activeHatchingCityPoultry,
+      icon: Assets.vec.activeFramSvg.path,
+    ),
+    CityPoultryActionItem(
+      title: "بازرسی مزارع طیور",
+      route: CityPoultryRoutes.newInspectionCityPoultry,
+      icon: Assets.vec.inspectionPoultrySvg.path,
+    ),
+  ].obs;
+}
--- a/packages/chicken/lib/features/city_poultry/presentation/pages/home/view.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/pages/home/view.dart
@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
+import 'package:rasadyar_core/core.dart';
+
+import 'logic.dart';
+
+class CityPoultryHomePage extends GetView<CityPoultryHomeLogic> {
+  CityPoultryHomePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChickenBasePage(
+      isBase: true,
+      hasNews: true,
+      hasNotification: true,
+      child: gridWidget(),
+    );
+  }
+
+  Widget gridWidget() {
+    return ObxValue((data) {
+      return GridView.builder(
+        physics: BouncingScrollPhysics(),
+        padding: EdgeInsets.symmetric(vertical: 18.h, horizontal: 32.w),
+        gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+          crossAxisCount: 2,
+          mainAxisSpacing: 24.h,
+          crossAxisSpacing: 24.w,
+        ),
+        itemCount: data.length,
+        hitTestBehavior: HitTestBehavior.opaque,
+        itemBuilder: (BuildContext context, int index) {
+          var item = data[index];
+          return GlassMorphismCardIcon(
+            title: item.title,
+            vecIcon: item.icon,
+            onTap: () async {
+              Get.toNamed(item.route, id: cityPoultryActionKey);
+            },
+          );
+        },
+      );
+    }, controller.items);
+  }
+}
+
--- a/packages/chicken/lib/features/city_poultry/presentation/pages/new_inspection/logic.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/pages/new_inspection/logic.dart
@@ -0,0 +1,160 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/root/logic.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart';
+import 'package:rasadyar_core/core.dart';
+
+class NewInspectionLogic extends GetxController {
+  BaseLogic baseLogic = Get.find<BaseLogic>();
+
+  Rx<Resource<PaginationModel<PoultryScienceReport>>> submitInspectionList =
+      Resource<PaginationModel<PoultryScienceReport>>.loading().obs;
+
+  CityPoultryRootLogic rootLogic = Get.find<CityPoultryRootLogic>();
+
+  final RxBool isLoadingMoreAllocationsMade = false.obs;
+  RxInt currentPage = 1.obs;
+  RxInt expandedIndex = RxInt(-1);
+  RxList<XFile> pickedImages = <XFile>[].obs;
+
+  RxBool isOnUpload = false.obs;
+
+  RxDouble presentUpload = 0.0.obs;
+  RxList<String> routesName = RxList();
+  RxInt selectedSegmentIndex = 0.obs;
+
+  RxnString searchedValue = RxnString();
+  Rx<Jalali> fromDateFilter = Jalali.now().obs;
+  Rx<Jalali> toDateFilter = Jalali.now().obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+
+    routesName.value = ['اقدام'].toList();
+
+    ever(selectedSegmentIndex, (callback) {
+      routesName.removeLast();
+      routesName.add(callback == 0 ? 'بازرسی' : 'بایگانی');
+    });
+  }
+
+  @override
+  void onReady() {
+    super.onReady();
+
+    getReport();
+  }
+
+  @override
+  void onClose() {
+    super.onClose();
+    baseLogic.clearSearch();
+  }
+
+  Future<void> getReport([bool isLoadingMore = false]) async {
+    if (isLoadingMore) {
+      isLoadingMoreAllocationsMade.value = true;
+    } else {
+      submitInspectionList.value =
+          Resource<PaginationModel<PoultryScienceReport>>.loading();
+    }
+
+    if (searchedValue.value != null &&
+        searchedValue.value!.trim().isNotEmpty &&
+        currentPage.value > 1) {
+      currentPage.value = 1;
+    }
+
+    safeCall(
+      call: () async =>
+          await rootLogic.cityPoultryRepository.getSubmitInspectionList(
+            token: rootLogic.tokenService.accessToken.value!,
+            queryParameters: buildQueryParams(
+              role: 'CityPoultry',
+              pageSize: 50,
+              search: 'filter',
+
+              page: currentPage.value,
+            ),
+          ),
+      onSuccess: (res) {
+        if ((res?.count ?? 0) == 0) {
+          submitInspectionList.value =
+              Resource<PaginationModel<PoultryScienceReport>>.empty();
+        } else {
+          submitInspectionList.value =
+              Resource<PaginationModel<PoultryScienceReport>>.success(
+                PaginationModel<PoultryScienceReport>(
+                  count: res?.count ?? 0,
+                  next: res?.next,
+                  previous: res?.previous,
+                  results: [
+                    ...(submitInspectionList.value.data?.results ?? []),
+                    ...(res?.results ?? []),
+                  ],
+                ),
+              );
+        }
+      },
+    );
+  }
+
+  Future<void> pickImages() async {
+    determineCurrentPosition();
+    var tmp = await pickCameraImage();
+    if (tmp?.path != null && pickedImages.length < 7) {
+      pickedImages.add(tmp!);
+    }
+  }
+
+  void removeImage(int index) {
+    pickedImages.removeAt(index);
+  }
+
+  void closeBottomSheet() {
+    Get.back();
+  }
+
+  double calculateUploadProgress({required int sent, required int total}) {
+    if (total != 0) {
+      double progress = (sent * 100 / total) / 100;
+      return progress;
+    } else {
+      return 0.0;
+    }
+  }
+
+  void toggleExpanded(int index) {
+    expandedIndex.value = expandedIndex.value == index ? -1 : index;
+  }
+
+  void setSearchValue(String? data) {
+    dLog('Search Value: $data');
+    searchedValue.value = data?.trim();
+    getReport();
+  }
+
+  Future<void> onRefresh() async {
+    currentPage.value = 1;
+    await getReport();
+  }
+
+  String getStatus(PoultryScienceReport item) {
+    final status = item.reportInformation?.inspectionStatus ?? item.state;
+    if (status == null || status.isEmpty) {
+      return 'در حال بررسی';
+    }
+    return status;
+  }
+
+  Color getStatusColor(PoultryScienceReport item) {
+    final status = item.reportInformation?.inspectionStatus ?? item.state;
+    if (status == null || status.isEmpty) {
+      return AppColor.yellowNormal;
+    }
+    // می‌توانید منطق رنگ را بر اساس inspectionStatus تنظیم کنید
+    return AppColor.greenNormal;
+  }
+}
+
--- a/packages/chicken/lib/features/city_poultry/presentation/pages/new_inspection/view.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/pages/new_inspection/view.dart
--- a/packages/chicken/lib/features/city_poultry/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/pages/root/logic.dart
@@ -0,0 +1,100 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:rasadyar_chicken/data/di/chicken_di.dart';
+import 'package:rasadyar_chicken/features/city_poultry/data/repositories/city_poultry_repository.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/routes/pages.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart';
+import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/utils/utils.dart';
+import 'package:rasadyar_core/core.dart';
+
+enum ErrorLocationType { serviceDisabled, permissionDenied, none }
+
+class CityPoultryRootLogic extends GetxController {
+  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();
+
+  late CityPoultryRepository cityPoultryRepository;
+
+  RxList<ErrorLocationType> errorLocationType = RxList();
+  RxMap<int, dynamic> homeExpandedList = RxMap();
+  DateTime? _lastBackPressed;
+
+  RxInt currentPage = 0.obs;
+
+  final pages = [
+    Navigator(
+      key: Get.nestedKey(cityPoultryActionKey),
+      onGenerateRoute: (settings) {
+        final page = CityPoultryPages.pages.firstWhere(
+          (e) => e.name == settings.name,
+          orElse: () => CityPoultryPages.pages.firstWhere(
+            (e) => e.name == CityPoultryRoutes.homeCityPoultry,
+          ),
+        );
+
+        return buildRouteFromGetPage(page);
+      },
+    ),
+
+    ProfilePage(),
+  ];
+
+  @override
+  void onInit() {
+    super.onInit();
+    cityPoultryRepository = diChicken.get<CityPoultryRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
+  }
+
+  void toggleExpanded(int index) {
+    if (homeExpandedList.keys.contains(index)) {
+      homeExpandedList.remove(index);
+    } else {
+      homeExpandedList[index] = false;
+    }
+  }
+
+  void rootErrorHandler(DioException error) {
+    handleGeneric(error, () {
+      tokenService.deleteModuleTokens(Module.chicken);
+    });
+  }
+
+  void changePage(int index) {
+    currentPage.value = index;
+  }
+
+  void popBackTaped() async {
+    final nestedKey = Get.nestedKey(cityPoultryActionKey);
+
+    final currentRoute = Get.routing.current;
+
+    final isInternalRoute =
+        currentRoute == CityPoultryRoutes.activeHatchingCityPoultry ||
+        currentRoute == CityPoultryRoutes.newInspectionCityPoultry ||
+        currentRoute == CityPoultryRoutes.actionCityPoultry;
+
+    if (isInternalRoute) {
+      Get.back(id: cityPoultryActionKey);
+      return;
+    }
+
+    // اگر در صفحه home هستیم، منطق خروج از اپ را اجرا کن
+    final now = DateTime.now();
+    if (_lastBackPressed == null ||
+        now.difference(_lastBackPressed!) > Duration(seconds: 2)) {
+      _lastBackPressed = now;
+      Get.snackbar(
+        'خروج از برنامه',
+        'برای خروج دوباره بازگشت را بزنید',
+        snackPosition: SnackPosition.TOP,
+        duration: Duration(seconds: 2),
+        backgroundColor: AppColor.warning,
+      );
+    } else {
+      await SystemNavigator.pop();
+    }
+  }
+}
--- a/packages/chicken/lib/features/city_poultry/presentation/pages/root/view.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/pages/root/view.dart
@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
+import 'package:rasadyar_core/core.dart';
+
+import 'logic.dart';
+
+class CityPoultryRootPage extends GetView<CityPoultryRootLogic> {
+  const CityPoultryRootPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChickenBasePage(
+      isFullScreen: true,
+      onPopScopTaped: controller.popBackTaped,
+      child: ObxValue((data) {
+        return Stack(
+          children: [
+            IndexedStack(children: controller.pages, index: data.value),
+            Positioned(
+              right: 0,
+              left: 0,
+              bottom: 0,
+              child: RBottomNavigation(
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                items: [
+       
+                  RBottomNavigationItem(
+                    label: 'خانه',
+                    icon: Assets.vec.homeSvg.path,
+                    isSelected: controller.currentPage.value == 0,
+                    onTap: () {
+                      Get.nestedKey(
+                        cityPoultryActionKey,
+                      )?.currentState?.popUntil((route) => route.isFirst);
+                      controller.changePage(0);
+                    },
+                  ),
+                  RBottomNavigationItem(
+                    label: 'پروفایل',
+                    icon: Assets.vec.profileCircleSvg.path,
+                    isSelected: controller.currentPage.value == 1,
+                    onTap: () {
+                      Get.nestedKey(
+                        cityPoultryActionKey,
+                      )?.currentState?.popUntil((route) => route.isFirst);
+                      controller.changePage(1);
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ],
+        );
+      }, controller.currentPage),
+    );
+  }
+}
+
--- a/packages/chicken/lib/features/city_poultry/presentation/routes/pages.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/routes/pages.dart
@@ -0,0 +1,67 @@
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/home/logic.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/home/view.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/root/logic.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/root/view.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/active_hatching/logic.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/active_hatching/view.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/new_inspection/logic.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/pages/new_inspection/view.dart';
+import 'package:rasadyar_chicken/features/city_poultry/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart';
+import 'package:rasadyar_chicken/presentation/routes/global_binding.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CityPoultryPages {
+  CityPoultryPages._();
+
+  static List<GetPage> get pages => [
+    GetPage(
+      name: CityPoultryRoutes.initCityPoultry,
+      page: () => CityPoultryRootPage(),
+      middlewares: [AuthMiddleware()],
+      bindings: [
+        GlobalBinding(),
+        BindingsBuilder(() {
+          Get.lazyPut(() => ChickenBaseLogic(), fenix: true);
+          Get.lazyPut(() => CityPoultryRootLogic());
+          Get.lazyPut(() => CityPoultryHomeLogic());
+        }),
+      ],
+    ),
+    GetPage(
+      name: CityPoultryRoutes.homeCityPoultry,
+      page: () => CityPoultryHomePage(),
+      middlewares: [AuthMiddleware()],
+      binding: BindingsBuilder(() {
+        Get.put(CityPoultryHomeLogic());
+        Get.lazyPut(() => ChickenBaseLogic());
+      }),
+    ),
+
+    GetPage(
+      name: CityPoultryRoutes.activeHatchingCityPoultry,
+      page: () => ActiveHatchingPage(),
+      middlewares: [AuthMiddleware()],
+      bindings: [
+        GlobalBinding(),
+        BindingsBuilder(() {
+          Get.lazyPut(() => ActiveHatchingLogic());
+          Get.lazyPut(() => CreateInspectionBottomSheetLogic());
+        }),
+      ],
+    ),
+    GetPage(
+      name: CityPoultryRoutes.newInspectionCityPoultry,
+      page: () => NewInspectionPage(),
+      middlewares: [AuthMiddleware()],
+      bindings: [
+        GlobalBinding(),
+        BindingsBuilder(() {
+          Get.lazyPut(() => NewInspectionLogic());
+        }),
+      ],
+    ),
+  ];
+}
+
--- a/packages/chicken/lib/features/city_poultry/presentation/routes/routes.dart
+++ b/packages/chicken/lib/features/city_poultry/presentation/routes/routes.dart
@@ -0,0 +1,11 @@
+sealed class CityPoultryRoutes {
+  CityPoultryRoutes._();
+
+  static const _base = '/chicken/cityPoultry';
+  static const initCityPoultry = '$_base/';
+  static const homeCityPoultry = '$_base/home';
+  static const actionCityPoultry = '$_base/action';
+  static const activeHatchingCityPoultry = '$_base/activeHatching';
+  static const newInspectionCityPoultry = '$_base/newInspection';
+}
+
--- a/packages/chicken/lib/features/common/auth/logic.dart
+++ b/packages/chicken/lib/features/common/auth/logic.dart
@@ -1,244 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:rasadyar_chicken/data/common/dio_error_handler.dart';
-import 'package:rasadyar_chicken/data/di/chicken_di.dart';
-import 'package:rasadyar_chicken/features/common/data/model/response/user_info/user_info_model.dart';
-import 'package:rasadyar_chicken/features/common/data/model/response/user_profile_model/user_profile_model.dart';
-import 'package:rasadyar_chicken/features/common/data/repositories/auth/auth_repository.dart';
-import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart';
-import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart';
-import 'package:rasadyar_chicken/presentation/widget/captcha/logic.dart';
-import 'package:rasadyar_core/core.dart';
-
-enum AuthType { useAndPass, otp }
-
-enum AuthStatus { init }
-
-enum OtpStatus { init, sent, verified, reSend }
-
-class AuthLogic extends GetxController with GetTickerProviderStateMixin {
-  GlobalKey<FormState> formKey = GlobalKey<FormState>();
-  late AnimationController _textAnimationController;
-  late Animation<double> textAnimation;
-  RxBool showCard = false.obs;
-  RxBool rememberMe = false.obs;
-
-  Rx<GlobalKey<FormState>> formKeyOtp = GlobalKey<FormState>().obs;
-  Rx<GlobalKey<FormState>> formKeySentOtp = GlobalKey<FormState>().obs;
-  Rx<TextEditingController> usernameController = TextEditingController().obs;
-  Rx<TextEditingController> passwordController = TextEditingController().obs;
-  Rx<TextEditingController> phoneOtpNumberController =
-      TextEditingController().obs;
-  Rx<TextEditingController> otpCodeController = TextEditingController().obs;
-
-  var captchaController = Get.find<CaptchaWidgetLogic>();
-
-  RxnString phoneNumber = RxnString(null);
-  RxBool isLoading = false.obs;
-  RxBool isDisabled = true.obs;
-
-  GService gService = Get.find<GService>();
-  TokenStorageService tokenStorageService = Get.find<TokenStorageService>();
-
-  Rx<AuthType> authType = AuthType.useAndPass.obs;
-  Rx<AuthStatus> authStatus = AuthStatus.init.obs;
-  Rx<OtpStatus> otpStatus = OtpStatus.init.obs;
-  RxnString deviceName = RxnString(null);
-
-  RxInt secondsRemaining = 120.obs;
-  Timer? _timer;
-
-  AuthRepository authRepository = diChicken.get<AuthRepository>();
-
-  final Module _module = Get.arguments;
-
-  @override
-  void onInit() {
-    super.onInit();
-    _textAnimationController =
-        AnimationController(
-            vsync: this,
-            duration: const Duration(milliseconds: 1200),
-          )
-          ..repeat(reverse: true, count: 2).whenComplete(() {
-            showCard.value = true;
-          });
-
-    textAnimation = CurvedAnimation(
-      parent: _textAnimationController,
-      curve: Curves.easeInOut,
-    );
-
-    initUserPassData();
-    getDeviceModel();
-  }
-
-  @override
-  void onClose() {
-    _textAnimationController.dispose();
-    _timer?.cancel();
-    super.onClose();
-  }
-
-  void startTimer() {
-    _timer?.cancel();
-    secondsRemaining.value = 120;
-
-    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
-      if (secondsRemaining.value > 0) {
-        secondsRemaining.value--;
-      } else {
-        timer.cancel();
-      }
-    });
-  }
-
-  void stopTimer() {
-    _timer?.cancel();
-  }
-
-  String get timeFormatted {
-    final minutes = secondsRemaining.value ~/ 60;
-    final seconds = secondsRemaining.value % 60;
-    return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
-  }
-
-  bool _isFormValid() {
-    final isCaptchaValid =
-        captchaController.formKey.currentState?.validate() ?? false;
-    final isFormValid = formKey.currentState?.validate() ?? false;
-    return isCaptchaValid && isFormValid;
-  }
-
-  Future<void> submitLoginForm() async {
-    if (!_isFormValid()) return;
-    AuthRepository authTmp = diChicken.get<AuthRepository>();
-    isLoading.value = true;
-    await safeCall<UserProfileModel?>(
-      call: () => authTmp.login(
-        authRequest: {
-          "username": usernameController.value.text,
-          "password": passwordController.value.text,
-        },
-      ),
-      onSuccess: (result) async {
-        await gService.saveSelectedModule(_module);
-        await tokenStorageService.saveModule(_module);
-        await tokenStorageService.saveAccessToken(
-          _module,
-          result?.accessToken ?? '',
-        );
-        await tokenStorageService.saveRefreshToken(
-          _module,
-          result?.accessToken ?? '',
-        );
-        var tmpRoles = result?.role?.where((element) {
-          final allowedRoles = {
-            'poultryscience',
-            'steward',
-            'killhouse',
-            'provinceinspector',
-            'cityjahad',
-            'jahad',
-            'vetfarm',
-            'provincesupervisor',
-            'superadmin',
-          };
-
-          final lowerElement = element.toString().toLowerCase().trim();
-          return allowedRoles.contains(lowerElement);
-        }).toList();
-        if (tmpRoles?.length==1) {
-            await tokenStorageService.saveRoles(_module, tmpRoles ?? []);
-        }
-
-        await tokenStorageService.saveRoles(_module, tmpRoles ?? []);
-        if (rememberMe.value) {
-          await tokenStorageService.saveUserPass(
-            _module,
-            usernameController.value.text,
-            passwordController.value.text,
-          );
-        }
-
-        authTmp.stewardAppLogin(
-          token: result?.accessToken ?? '',
-          queryParameters: {
-            "mobile": usernameController.value.text,
-            "device_name": deviceName.value,
-          },
-        );
-
-      
-          Get.offAndToNamed(CommonRoutes.role);
-        
-
-/*         if (tmpRoles!.length > 1) {
-          Get.offAndToNamed(CommonRoutes.role);
-        } else {
-          Get.offAllNamed(StewardRoutes.initSteward);
-        } */
-      },
-      onError: (error, stackTrace) {
-        if (error is DioException) {
-          diChicken.get<DioErrorHandler>().handle(error);
-          if ((error.type == DioExceptionType.unknown) ||
-              (error.type == DioExceptionType.connectionError)) {
-            getUserInfo(usernameController.value.text);
-          }
-        }
-        captchaController.getCaptcha();
-      },
-    );
-    isLoading.value = false;
-  }
-
-  Future<void> getUserInfo(String value) async {
-    isLoading.value = true;
-    await safeCall<UserInfoModel?>(
-      call: () async => await authRepository.getUserInfo(value),
-      onSuccess: (result) async {
-        if (result != null) {
-          await newSetupAuthDI(result.backend ?? '');
-          await diChicken.allReady();
-        }
-      },
-      onError: (error, stackTrace) {
-        if (error is DioException) {
-          diChicken.get<DioErrorHandler>().handle(error);
-        }
-        captchaController.getCaptcha();
-      },
-    );
-    isLoading.value = false;
-  }
-
-  void initUserPassData() {
-    UserLocalModel? userLocalModel = tokenStorageService.getUserLocal(
-      Module.chicken,
-    );
-    if (userLocalModel?.username != null && userLocalModel?.password != null) {
-      usernameController.value.text = userLocalModel?.username ?? '';
-      passwordController.value.text = userLocalModel?.password ?? '';
-      rememberMe.value = true;
-    }
-  }
-
-  Future<void> getDeviceModel() async {
-    final deviceInfo = DeviceInfoPlugin();
-
-    if (Platform.isAndroid) {
-      final info = await deviceInfo.androidInfo;
-
-      deviceName.value =
-          'Device:${info.manufacturer} Model:${info.model} version ${info.version.release}';
-    } else if (Platform.isIOS) {
-      final info = await deviceInfo.iosInfo;
-
-      deviceName.value =
-          'Device:${info.utsname.machine} Model:${info.model} version ${info.systemVersion}';
-    } else {}
-  }
-}
--- a/packages/chicken/lib/features/common/auth/view.dart
+++ b/packages/chicken/lib/features/common/auth/view.dart
@@ -1,394 +0,0 @@
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
-import 'package:rasadyar_chicken/presentation/widget/captcha/view.dart';
-import 'package:rasadyar_core/core.dart';
-
-import 'logic.dart';
-
-class AuthPage extends GetView<AuthLogic> {
-  const AuthPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ChickenBasePage(
-      isFullScreen: true,
-      backGroundWidget: backGroundDecoration(
-        gradient: LinearGradient(
-          begin: Alignment.topRight,
-          end: Alignment.bottomLeft,
-          colors: [
-            const Color(0xFFB2C9FF).withValues(alpha: 1.0), // 0%
-            const Color(0xFF40BB93).withValues(alpha: 0.11), // 50%
-            const Color(0xFF93B6D3).withValues(alpha: 1.0), // 100%
-          ],
-          stops: const [0.0, 0.5, 1.0],
-        ),
-        backgroundPath: Assets.images.patternChicken.path,
-      ),
-      onPopScopTaped: () => Get.back(result: -1),
-      child: Stack(
-        children: [
-          Center(
-            child: Padding(
-              padding: EdgeInsets.symmetric(horizontal: 10.r),
-              child: FadeTransition(
-                opacity: controller.textAnimation,
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  spacing: 12,
-                  children: [
-                    Text(
-                      'به سامانه رصدطیور خوش آمدید!',
-                      textAlign: TextAlign.right,
-                      style: AppFonts.yekan25Bold.copyWith(
-                        color: AppColor.darkGreyDarkActive,
-                      ),
-                    ),
-                    Text(
-                      'سامانه رصد و پایش زنجیره تامین، تولید و توزیع کالا های اساسی',
-                      textAlign: TextAlign.center,
-                      style: AppFonts.yekan16.copyWith(
-                        color: AppColor.darkGreyDarkActive,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-
-          Obx(() {
-            final screenHeight = MediaQuery.of(context).size.height;
-            final targetTop = (screenHeight - 676) / 2;
-
-            return AnimatedPositioned(
-              duration: const Duration(milliseconds: 1200),
-              curve: Curves.linear,
-              top: controller.showCard.value ? targetTop : screenHeight,
-              left: 10.r,
-              right: 10.r,
-              child: Container(
-                width: 381.w,
-                height: 676.h,
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(40),
-                ),
-                child: Column(
-                  children: [
-                    SizedBox(height: 50.h),
-                    LogoWidget(
-                      vecPath: Assets.vec.rasadToyorSvg.path,
-                      width: 85.w,
-                      height: 85.h,
-                      titleStyle: AppFonts.yekan20Bold.copyWith(
-                        color: Color(0xFF4665AF),
-                      ),
-                      title: 'رصدطیور',
-                    ),
-                    SizedBox(height: 20.h),
-                    useAndPassFrom(),
-                    SizedBox(height: 24.h),
-                    RichText(
-                      text: TextSpan(
-                        children: [
-                          TextSpan(
-                            text: 'مطالعه بیانیه ',
-                            style: AppFonts.yekan16.copyWith(
-                              color: AppColor.darkGreyDark,
-                            ),
-                          ),
-                          TextSpan(
-                            recognizer: TapGestureRecognizer()
-                              ..onTap = () {
-                                Get.bottomSheet(
-                                  privacyPolicyWidget(),
-                                  isScrollControlled: true,
-                                  enableDrag: true,
-                                  ignoreSafeArea: false,
-                                );
-                              },
-                            text: 'حریم خصوصی',
-                            style: AppFonts.yekan16.copyWith(
-                              color: AppColor.blueNormal,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            );
-          }),
-        ],
-      ),
-    );
-  }
-
-  Widget useAndPassFrom() {
-    return Padding(
-      padding: EdgeInsets.symmetric(horizontal: 30.r),
-      child: Form(
-        key: controller.formKey,
-        child: AutofillGroup(
-          child: Column(
-            children: [
-              RTextField(
-                height: 40.h,
-                label: 'نام کاربری',
-                maxLength: 11,
-                maxLines: 1,
-                controller: controller.usernameController.value,
-                keyboardType: TextInputType.number,
-                inputFormatters: [PersianFormatter()],
-                initText: controller.usernameController.value.text,
-                autofillHints: [AutofillHints.username],
-                focusedBorder: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(8),
-                  borderSide: BorderSide(color: AppColor.textColor, width: 1),
-                ),
-                onChanged: (value) async {
-                  controller.usernameController.value.text = value;
-                  if (value.length == 11) {
-                    await controller.getUserInfo(value);
-                  }
-                },
-                prefixIcon: Padding(
-                  padding: const EdgeInsets.fromLTRB(0, 8, 6, 8),
-                  child: Assets.vec.callSvg.svg(width: 12, height: 12),
-                ),
-                suffixIcon:
-                    controller.usernameController.value.text.trim().isNotEmpty
-                    ? clearButton(() {
-                        controller.usernameController.value.clear();
-                        controller.usernameController.refresh();
-                      })
-                    : null,
-                validator: (value) {
-                  if (value == null || value.isEmpty) {
-                    return '⚠️ شماره موبایل را وارد کنید';
-                  } else if (value.length < 10) {
-                    return '⚠️ شماره موبایل باید 11 رقم باشد';
-                  }
-                  return null;
-                },
-                style: AppFonts.yekan13,
-                errorStyle: AppFonts.yekan13.copyWith(
-                  color: AppColor.redNormal,
-                ),
-                labelStyle: AppFonts.yekan13,
-                boxConstraints: const BoxConstraints(
-                  maxHeight: 40,
-                  minHeight: 40,
-                  maxWidth: 40,
-                  minWidth: 40,
-                ),
-              ),
-              const SizedBox(height: 26),
-              ObxValue(
-                (passwordController) => RTextField(
-                  height: 40.h,
-                  label: 'رمز عبور',
-                  filled: false,
-                  obscure: true,
-                  focusedBorder: OutlineInputBorder(
-                    borderRadius: BorderRadius.circular(8),
-                    borderSide: BorderSide(color: AppColor.textColor, width: 1),
-                  ),
-                  controller: passwordController.value,
-                  autofillHints: [AutofillHints.password],
-                  variant: RTextFieldVariant.password,
-                  initText: passwordController.value.text,
-                  inputFormatters: [PersianFormatter()],
-                  onChanged: (value) {
-                    passwordController.refresh();
-                  },
-                  validator: (value) {
-                    if (value == null || value.isEmpty) {
-                      return '⚠️ رمز عبور را وارد کنید';
-                    }
-                    return null;
-                  },
-                  style: AppFonts.yekan13,
-                  errorStyle: AppFonts.yekan13.copyWith(
-                    color: AppColor.redNormal,
-                  ),
-                  labelStyle: AppFonts.yekan13,
-                  prefixIcon: Padding(
-                    padding: const EdgeInsets.fromLTRB(0, 8, 8, 8),
-                    child: Assets.vec.keySvg.svg(width: 12, height: 12),
-                  ),
-                  boxConstraints: const BoxConstraints(
-                    maxHeight: 34,
-                    minHeight: 34,
-                    maxWidth: 34,
-                    minWidth: 34,
-                  ),
-                ),
-                controller.passwordController,
-              ),
-              SizedBox(height: 26),
-              CaptchaWidget(),
-
-              GestureDetector(
-                onTap: () {
-                  controller.rememberMe.value = !controller.rememberMe.value;
-                },
-                child: Row(
-                  children: [
-                    ObxValue((data) {
-                      return Checkbox(
-                        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                        visualDensity: VisualDensity(
-                          horizontal: -4,
-                          vertical: 4,
-                        ),
-                        tristate: true,
-                        value: data.value,
-                        onChanged: (value) {
-                          data.value = value ?? false;
-                        },
-                        shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(4),
-                        ),
-                        activeColor: AppColor.blueNormal,
-                      );
-                    }, controller.rememberMe),
-                    Text(
-                      'مرا به خاطر بسپار',
-                      style: AppFonts.yekan14.copyWith(
-                        color: AppColor.darkGreyDark,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-
-              Obx(() {
-                return RElevated(
-                  text: 'ورود',
-                  isLoading: controller.isLoading.value,
-                  onPressed: controller.isDisabled.value
-                      ? null
-                      : () async {
-                          await controller.submitLoginForm();
-                        },
-                  width: Get.width,
-                  height: 48,
-                );
-              }),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget privacyPolicyWidget() {
-    return BaseBottomSheet(
-      child: Column(
-        spacing: 5,
-        children: [
-          Container(
-            padding: EdgeInsets.all(8.w),
-
-            decoration: BoxDecoration(
-              color: Colors.white,
-              borderRadius: BorderRadius.circular(8),
-              border: Border.all(color: AppColor.darkGreyLight, width: 1),
-            ),
-            child: Column(
-              spacing: 3,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  'بيانيه حريم خصوصی',
-                  style: AppFonts.yekan16Bold.copyWith(
-                    color: AppColor.blueNormal,
-                  ),
-                ),
-                Text(
-                  'اطلاعات مربوط به هر شخص، حریم خصوصی وی محسوب می‌شود. حفاظت و حراست از اطلاعات شخصی در سامانه رصد یار، نه تنها موجب حفظ امنیت کاربران می‌شود، بلکه باعث اعتماد بیشتر و مشارکت آنها در فعالیت‌های جاری می‌گردد. هدف از این بیانیه، آگاه ساختن شما درباره ی نوع و نحوه ی استفاده از اطلاعاتی است که در هنگام استفاده از سامانه رصد یار ، از جانب شما دریافت می‌گردد. شرکت هوشمند سازان خود را ملزم به رعایت حریم خصوصی همه شهروندان و کاربران سامانه دانسته و آن دسته از اطلاعات کاربران را که فقط به منظور ارائه خدمات کفایت می‌کند، دریافت کرده و از انتشار آن یا در اختیار قرار دادن آن به دیگران خودداری مینماید.',
-                  style: AppFonts.yekan14.copyWith(
-                    color: AppColor.bgDark,
-                    height: 1.8,
-                  ),
-                ),
-              ],
-            ),
-          ),
-          Container(
-            padding: EdgeInsets.all(8.w),
-
-            decoration: BoxDecoration(
-              color: Colors.white,
-              borderRadius: BorderRadius.circular(8),
-              border: Border.all(color: AppColor.darkGreyLight, width: 1),
-            ),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 4,
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                Text(
-                  'چگونگی جمع آوری و استفاده از اطلاعات کاربران',
-                  style: AppFonts.yekan16Bold.copyWith(
-                    color: AppColor.blueNormal,
-                  ),
-                ),
-                Text(
-                  '''الف: اطلاعاتی که شما خود در اختيار این سامانه قرار می‌دهيد، شامل موارد زيرهستند:
-اقلام اطلاعاتی شامل شماره تلفن همراه، تاریخ تولد، کد پستی و کد ملی کاربران را دریافت مینماییم که از این اقلام، صرفا جهت احراز هویت کاربران استفاده خواهد شد.
-ب: برخی اطلاعات ديگر که به صورت خودکار از شما دريافت میشود شامل موارد زير می‌باشد:
-⦁ دستگاهی که از طریق آن سامانه رصد یار را مشاهده می‌نمایید( تلفن همراه، تبلت، رایانه).
-⦁ نام و نسخه سیستم عامل و browser کامپیوتر شما.
-⦁ اطلاعات صفحات بازدید شده.
-⦁ تعداد بازدیدهای روزانه در درگاه.
-⦁ هدف ما از دریافت این اطلاعات استفاده از آنها در تحلیل عملکرد کاربران درگاه می باشد تا بتوانیم در خدمت رسانی بهتر عمل کنیم.
-''',
-                  style: AppFonts.yekan14.copyWith(
-                    color: AppColor.bgDark,
-                    height: 1.8,
-                  ),
-                ),
-              ],
-            ),
-          ),
-          Container(
-            padding: EdgeInsets.all(8.w),
-
-            decoration: BoxDecoration(
-              color: Colors.white,
-              borderRadius: BorderRadius.circular(8),
-              border: Border.all(color: AppColor.darkGreyLight, width: 1),
-            ),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 4,
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                Text(
-                  'امنیت اطلاعات',
-                  style: AppFonts.yekan16Bold.copyWith(
-                    color: AppColor.blueNormal,
-                  ),
-                ),
-                Text(
-                  'متعهدیم که امنیت اطلاعات شما را تضمین نماییم و برای جلوگیری از هر نوع دسترسی غیرمجاز و افشای اطلاعات شما از همه شیوه‌‌های لازم استفاده می‌کنیم تا امنیت اطلاعاتی را که به صورت آنلاین گردآوری می‌کنیم، حفظ شود. لازم به ذکر است در سامانه ما، ممکن است به سایت های دیگری لینک شوید، وقتی که شما از طریق این لینک‌ها از سامانه ما خارج می‌شوید، توجه داشته باشید که ما بر دیگر سایت ها کنترل نداریم و سازمان تعهدی بر حفظ حریم شخصی آنان در سایت مقصد نخواهد داشت و مراجعه کنندگان میبایست به بیانیه حریم شخصی آن سایت ها مراجعه نمایند.',
-                  style: AppFonts.yekan14.copyWith(
-                    color: AppColor.bgDark,
-                    height: 1.8,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
--- a/packages/chicken/lib/features/common/presentation/page/auth/logic.dart
+++ b/packages/chicken/lib/features/common/presentation/page/auth/logic.dart
@@ -3,12 +3,12 @@ import 'dart:io';

 import 'package:flutter/material.dart';
 import 'package:rasadyar_chicken/data/common/dio_error_handler.dart';
+import 'package:rasadyar_chicken/data/common/fa_user_role.dart';
 import 'package:rasadyar_chicken/data/di/chicken_di.dart';
 import 'package:rasadyar_chicken/features/common/data/model/response/user_info/user_info_model.dart';
 import 'package:rasadyar_chicken/features/common/data/model/response/user_profile_model/user_profile_model.dart';
 import 'package:rasadyar_chicken/features/common/data/repositories/auth/auth_repository.dart';
 import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart';
-import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/presentation/widget/captcha/logic.dart';
 import 'package:rasadyar_core/core.dart';

@@ -124,16 +124,6 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
        },
      ),
      onSuccess: (result) async {
-        await gService.saveSelectedModule(_module);
-        await tokenStorageService.saveModule(_module);
-        await tokenStorageService.saveAccessToken(
-          _module,
-          result?.accessToken ?? '',
-        );
-        await tokenStorageService.saveRefreshToken(
-          _module,
-          result?.accessToken ?? '',
-        );
        var tmpRoles = result?.role?.where((element) {
          final allowedRoles = {
            'poultryscience',
@@ -141,6 +131,7 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
            'killhouse',
            'provinceinspector',
            'cityjahad',
+            'citypoultry',
            'jahad',
            'vetfarm',
            'provincesupervisor',
@@ -150,36 +141,56 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
          final lowerElement = element.toString().toLowerCase().trim();
          return allowedRoles.contains(lowerElement);
        }).toList();
-        if (tmpRoles?.length==1) {
-            await tokenStorageService.saveRoles(_module, tmpRoles ?? []);
-        }

-        await tokenStorageService.saveRoles(_module, tmpRoles ?? []);
-        if (rememberMe.value) {
-          await tokenStorageService.saveUserPass(
+        if (tmpRoles != null && tmpRoles.isNotEmpty) {
+          await gService.saveSelectedModule(_module);
+          await tokenStorageService.saveModule(_module);
+          await tokenStorageService.saveAccessToken(
            _module,
-            usernameController.value.text,
-            passwordController.value.text,
+            result?.accessToken ?? '',
          );
-        }
+          await tokenStorageService.saveRefreshToken(
+            _module,
+            result?.accessToken ?? '',
+          );
+          await tokenStorageService.saveRoles(_module, tmpRoles);
+          if (rememberMe.value) {
+            await tokenStorageService.saveUserPass(
+              _module,
+              usernameController.value.text,
+              passwordController.value.text,
+            );
+          }

-        authTmp.stewardAppLogin(
-          token: result?.accessToken ?? '',
-          queryParameters: {
-            "mobile": usernameController.value.text,
-            "device_name": deviceName.value,
-          },
-        );
+          authTmp.stewardAppLogin(
+            token: result?.accessToken ?? '',
+            queryParameters: {
+              "mobile": usernameController.value.text,
+              "device_name": deviceName.value,
+            },
+          );
+          if (tmpRoles.length == 1) {
+            var tmpRoute = getFaUserRoleWithOnTap(tmpRoles.first).values.first;

+            await gService.saveRole(Module.chicken, tmpRoles.first);
+            await gService.saveRoute(
+              Module.chicken,
+              tmpRoute ?? CommonRoutes.role,
+            );

-          Get.offAndToNamed(CommonRoutes.role);
-        
-
-/*         if (tmpRoles!.length > 1) {
-          Get.offAndToNamed(CommonRoutes.role);
+            Get.offAndToNamed(tmpRoute ?? CommonRoutes.role);
+          } else {
+            Get.offAndToNamed(CommonRoutes.role);
+          }
        } else {
-          Get.offAllNamed(StewardRoutes.initSteward);
-        } */
+          Get.snackbar(
+            'با احترام ',
+            'دسترسی شما در دست اقدام میباشد ',
+            backgroundColor: AppColor.warning,
+            snackPosition: SnackPosition.TOP,
+            duration: Duration(seconds: 5),
+          ).show();
+        }
      },
      onError: (error, stackTrace) {
        if (error is DioException) {
--- a/packages/chicken/lib/features/common/presentation/page/profile/logic.dart
+++ b/packages/chicken/lib/features/common/presentation/page/profile/logic.dart
@@ -173,11 +173,14 @@ class ProfileLogic extends GetxController {
    retryNewPasswordController.clear();
  }

-  Future<void> changeUserRole(String newRole) async {
-    dLog(newRole);
-    await gService.saveRoute(Module.chicken, newRole);
+  Future<void> changeUserRole({
+    required String route,
+    required String role,
+  }) async {
+    await gService.saveRoute(Module.chicken, route);
+    await gService.saveRole(Module.chicken, role);

-    Get.offAllNamed(newRole);
+    Get.offAllNamed(route);
  }

  void scrollToSelectedItem(
--- a/packages/chicken/lib/features/common/presentation/page/profile/view.dart
+++ b/packages/chicken/lib/features/common/presentation/page/profile/view.dart
@@ -32,7 +32,11 @@ class ProfilePage extends GetView<ProfileLogic> {
                    return Container(
                      width: 128.w,
                      height: 128.h,
-                      child: Center(child: CupertinoActivityIndicator(color: AppColor.greenNormal)),
+                      child: Center(
+                        child: CupertinoActivityIndicator(
+                          color: AppColor.greenNormal,
+                        ),
+                      ),
                    );
                  }

@@ -57,7 +61,9 @@ class ProfilePage extends GetView<ProfileLogic> {
                      child: data.value.data?.image != null
                          ? CircleAvatar(
                              radius: 64.w,
-                              backgroundImage: NetworkImage(data.value.data!.image!),
+                              backgroundImage: NetworkImage(
+                                data.value.data!.image!,
+                              ),
                            )
                          : Icon(Icons.person, size: 64.w),
                    ),
@@ -129,16 +135,25 @@ class ProfilePage extends GetView<ProfileLogic> {
                }, controller.userProfile),
                GestureDetector(
                  onTap: () {
-                    Get.bottomSheet(changePasswordBottomSheet(), isScrollControlled: true);
+                    Get.bottomSheet(
+                      changePasswordBottomSheet(),
+                      isScrollControlled: true,
+                    );
                  },
                  child: Container(
                    height: 47.h,
                    margin: EdgeInsets.symmetric(horizontal: 8, vertical: 8.h),
-                    padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h),
+                    padding: EdgeInsets.symmetric(
+                      horizontal: 11.h,
+                      vertical: 8.h,
+                    ),
                    decoration: BoxDecoration(
                      color: Colors.white,
                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(width: 1, color: const Color(0xFFD6D6D6)),
+                      border: Border.all(
+                        width: 1,
+                        color: const Color(0xFFD6D6D6),
+                      ),
                    ),
                    child: Row(
                      spacing: 6,
@@ -146,12 +161,17 @@ class ProfilePage extends GetView<ProfileLogic> {
                        Assets.vec.lockSvg.svg(
                          width: 24.w,
                          height: 24.h,
-                          colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
+                          colorFilter: ColorFilter.mode(
+                            AppColor.blueNormal,
+                            BlendMode.srcIn,
+                          ),
                        ),
                        Text(
                          'تغییر رمز عبور',
                          textAlign: TextAlign.center,
-                          style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
+                          style: AppFonts.yekan14.copyWith(
+                            color: AppColor.blueNormal,
+                          ),
                        ),
                      ],
                    ),
@@ -159,16 +179,25 @@ class ProfilePage extends GetView<ProfileLogic> {
                ),
                GestureDetector(
                  onTap: () {
-                    Get.bottomSheet(exitBottomSheet(), isScrollControlled: true);
+                    Get.bottomSheet(
+                      exitBottomSheet(),
+                      isScrollControlled: true,
+                    );
                  },
                  child: Container(
                    height: 47.h,
                    margin: EdgeInsets.symmetric(horizontal: 8),
-                    padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h),
+                    padding: EdgeInsets.symmetric(
+                      horizontal: 11.h,
+                      vertical: 8.h,
+                    ),
                    decoration: BoxDecoration(
                      color: Colors.white,
                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(width: 1, color: const Color(0xFFD6D6D6)),
+                      border: Border.all(
+                        width: 1,
+                        color: const Color(0xFFD6D6D6),
+                      ),
                    ),
                    child: Row(
                      spacing: 6,
@@ -176,12 +205,17 @@ class ProfilePage extends GetView<ProfileLogic> {
                        Assets.vec.logoutSvg.svg(
                          width: 24.w,
                          height: 24.h,
-                          colorFilter: ColorFilter.mode(AppColor.redNormal, BlendMode.srcIn),
+                          colorFilter: ColorFilter.mode(
+                            AppColor.redNormal,
+                            BlendMode.srcIn,
+                          ),
                        ),
                        Text(
                          'خروج',
                          textAlign: TextAlign.center,
-                          style: AppFonts.yekan14.copyWith(color: AppColor.redNormal),
+                          style: AppFonts.yekan14.copyWith(
+                            color: AppColor.redNormal,
+                          ),
                        ),
                      ],
                    ),
@@ -219,7 +253,10 @@ class ProfilePage extends GetView<ProfileLogic> {
          child: ObxValue(
            (val) => Container(
              height: val.value ? 320.h : 47.h,
-              margin: EdgeInsets.symmetric(horizontal: 8, vertical: val.value ? 8 : 0),
+              margin: EdgeInsets.symmetric(
+                horizontal: 8,
+                vertical: val.value ? 8 : 0,
+              ),
              padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h),
              decoration: BoxDecoration(
                color: Colors.white,
@@ -244,14 +281,20 @@ class ProfilePage extends GetView<ProfileLogic> {
                              child: Assets.vec.editSvg.svg(
                                width: 24.w,
                                height: 24.h,
-                                colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
+                                colorFilter: ColorFilter.mode(
+                                  AppColor.blueNormal,
+                                  BlendMode.srcIn,
+                                ),
                              ),
                            ),
                          ],
                        ),

                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 12.0,
+                            vertical: 8.0,
+                          ),
                          child: Column(
                            children: [
                              itemList(
@@ -278,7 +321,10 @@ class ProfilePage extends GetView<ProfileLogic> {
                              ),
                              itemList(
                                title: 'تاریخ تولد',
-                                content: item.birthday?.toJalali.formatCompactDate() ?? 'نامشخص',
+                                content:
+                                    item.birthday?.toJalali
+                                        .formatCompactDate() ??
+                                    'نامشخص',
                                icon: Assets.vec.calendarSvg.path,
                              ),
                              //todo
@@ -299,7 +345,12 @@ class ProfilePage extends GetView<ProfileLogic> {
                    )
                  : Row(
                      mainAxisAlignment: MainAxisAlignment.end,
-                      children: [Icon(CupertinoIcons.chevron_down, color: AppColor.iconColor)],
+                      children: [
+                        Icon(
+                          CupertinoIcons.chevron_down,
+                          color: AppColor.iconColor,
+                        ),
+                      ],
                    ),
            ),
            controller.isUserInformationOpen,
@@ -340,7 +391,10 @@ class ProfilePage extends GetView<ProfileLogic> {
          child: ObxValue(
            (val) => Container(
              height: val.value ? 320.h : 47.h,
-              margin: EdgeInsets.symmetric(horizontal: 8, vertical: val.value ? 12 : 0),
+              margin: EdgeInsets.symmetric(
+                horizontal: 8,
+                vertical: val.value ? 12 : 0,
+              ),
              padding: EdgeInsets.symmetric(horizontal: 11.h),
              decoration: BoxDecoration(
                color: Colors.white,
@@ -365,14 +419,20 @@ class ProfilePage extends GetView<ProfileLogic> {
                              child: Assets.vec.editSvg.svg(
                                width: 24.w,
                                height: 24.h,
-                                colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
+                                colorFilter: ColorFilter.mode(
+                                  AppColor.blueNormal,
+                                  BlendMode.srcIn,
+                                ),
                              ),
                            ),
                          ],
                        ),

                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 12.0,
+                            vertical: 8.0,
+                          ),
                          child: Column(
                            spacing: 2,
                            children: [
@@ -389,7 +449,8 @@ class ProfilePage extends GetView<ProfileLogic> {
                              ),
                              itemList(
                                title: 'شماره ثبت',
-                                content: item.unitRegistrationNumber ?? 'نامشخص',
+                                content:
+                                    item.unitRegistrationNumber ?? 'نامشخص',
                                visible: item.unitName != null,
                              ),

@@ -414,7 +475,10 @@ class ProfilePage extends GetView<ProfileLogic> {
                                content: item.city ?? 'نامشخص',
                                visible: item.unitName != null,
                              ),
-                              itemList(title: 'آدرس', content: item.unitAddress ?? 'نامشخص'),
+                              itemList(
+                                title: 'آدرس',
+                                content: item.unitAddress ?? 'نامشخص',
+                              ),
                            ],
                          ),
                        ),
@@ -422,7 +486,12 @@ class ProfilePage extends GetView<ProfileLogic> {
                    )
                  : Row(
                      mainAxisAlignment: MainAxisAlignment.end,
-                      children: [Icon(CupertinoIcons.chevron_down, color: AppColor.iconColor)],
+                      children: [
+                        Icon(
+                          CupertinoIcons.chevron_down,
+                          color: AppColor.iconColor,
+                        ),
+                      ],
                    ),
            ),
            controller.isUnitInformationOpen,
@@ -480,12 +549,21 @@ class ProfilePage extends GetView<ProfileLogic> {
              child: SvgGenImage.vec(icon).svg(
                width: 20.w,
                height: 20.h,
-                colorFilter: ColorFilter.mode(AppColor.textColor, BlendMode.srcIn),
+                colorFilter: ColorFilter.mode(
+                  AppColor.textColor,
+                  BlendMode.srcIn,
+                ),
              ),
            ),
-          Text(title, style: AppFonts.yekan14.copyWith(color: AppColor.textColor)),
+          Text(
+            title,
+            style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
+          ),
          Spacer(),
-          Text(content, style: AppFonts.yekan14.copyWith(color: AppColor.textColor)),
+          Text(
+            content,
+            style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
+          ),
        ],
      ),
    ),
@@ -512,7 +590,9 @@ class ProfilePage extends GetView<ProfileLogic> {
            padding: EdgeInsets.all(6),
            decoration: ShapeDecoration(
              color: cardColor ?? AppColor.blueLight,
-              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(8),
+              ),
            ),
            child: Container(
              padding: EdgeInsets.all(4),
@@ -523,7 +603,8 @@ class ProfilePage extends GetView<ProfileLogic> {
              child: SvgGenImage.vec(icon).svg(
                width: 40.w,
                height: 40.h,
-                colorFilter: color ?? ColorFilter.mode(Colors.white, BlendMode.srcIn),
+                colorFilter:
+                    color ?? ColorFilter.mode(Colors.white, BlendMode.srcIn),
              ),
            ),
          ),
@@ -547,7 +628,9 @@ class ProfilePage extends GetView<ProfileLogic> {
          children: [
            Text(
              'ویرایش اطلاعات هویتی',
-              style: AppFonts.yekan16Bold.copyWith(color: AppColor.darkGreyDarkHover),
+              style: AppFonts.yekan16Bold.copyWith(
+                color: AppColor.darkGreyDarkHover,
+              ),
            ),

            Container(
@@ -619,7 +702,9 @@ class ProfilePage extends GetView<ProfileLogic> {
                children: [
                  Text(
                    'عکس پروفایل',
-                    style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal),
+                    style: AppFonts.yekan16Bold.copyWith(
+                      color: AppColor.blueNormal,
+                    ),
                  ),
                  ObxValue((data) {
                    return Container(
@@ -628,17 +713,29 @@ class ProfilePage extends GetView<ProfileLogic> {
                      decoration: BoxDecoration(
                        color: AppColor.lightGreyNormal,
                        borderRadius: BorderRadius.circular(8),
-                        border: Border.all(width: 1, color: AppColor.blackLight),
+                        border: Border.all(
+                          width: 1,
+                          color: AppColor.blackLight,
+                        ),
                      ),
                      child: Center(
                        child: data.value == null
                            ? Padding(
-                                padding: const EdgeInsets.fromLTRB(30, 10, 10, 30),
+                                padding: const EdgeInsets.fromLTRB(
+                                  30,
+                                  10,
+                                  10,
+                                  30,
+                                ),
                                child: Image.network(
-                                  controller.userProfile.value.data?.image ?? '',
+                                  controller.userProfile.value.data?.image ??
+                                      '',
                                ),
                              )
-                            : Image.file(File(data.value!.path), fit: BoxFit.cover),
+                            : Image.file(
+                                File(data.value!.path),
+                                fit: BoxFit.cover,
+                              ),
                      ),
                    );
                  }, controller.selectedImage),
@@ -651,14 +748,18 @@ class ProfilePage extends GetView<ProfileLogic> {
                        text: 'گالری',
                        width: 150.w,
                        height: 40.h,
-                        textStyle: AppFonts.yekan20.copyWith(color: Colors.white),
+                        textStyle: AppFonts.yekan20.copyWith(
+                          color: Colors.white,
+                        ),
                        onPressed: () async {
-                          controller.selectedImage.value = await controller.imagePicker.pickImage(
-                            source: ImageSource.gallery,
-                            imageQuality: 60,
-                            maxWidth: 1080,
-                            maxHeight: 720,
-                          );
+                          controller.selectedImage.value = await controller
+                              .imagePicker
+                              .pickImage(
+                                source: ImageSource.gallery,
+                                imageQuality: 60,
+                                maxWidth: 1080,
+                                maxHeight: 720,
+                              );
                        },
                      ),
                      SizedBox(width: 16),
@@ -666,14 +767,18 @@ class ProfilePage extends GetView<ProfileLogic> {
                        text: 'دوربین',
                        width: 150.w,
                        height: 40.h,
-                        textStyle: AppFonts.yekan20.copyWith(color: AppColor.blueNormal),
+                        textStyle: AppFonts.yekan20.copyWith(
+                          color: AppColor.blueNormal,
+                        ),
                        onPressed: () async {
-                          controller.selectedImage.value = await controller.imagePicker.pickImage(
-                            source: ImageSource.camera,
-                            imageQuality: 60,
-                            maxWidth: 1080,
-                            maxHeight: 720,
-                          );
+                          controller.selectedImage.value = await controller
+                              .imagePicker
+                              .pickImage(
+                                source: ImageSource.camera,
+                                imageQuality: 60,
+                                maxWidth: 1080,
+                                maxHeight: 720,
+                              );
                        },
                      ),
                    ],
@@ -724,7 +829,9 @@ class ProfilePage extends GetView<ProfileLogic> {
            children: [
              Text(
                'تغییر رمز عبور',
-                style: AppFonts.yekan16Bold.copyWith(color: AppColor.darkGreyDarkHover),
+                style: AppFonts.yekan16Bold.copyWith(
+                  color: AppColor.darkGreyDarkHover,
+                ),
              ),
              SizedBox(),
              RTextField(
@@ -736,7 +843,8 @@ class ProfilePage extends GetView<ProfileLogic> {
                validator: (value) {
                  if (value == null || value.isEmpty) {
                    return 'رمز عبور را وارد کنید';
-                  } else if (controller.userProfile.value.data?.password != value) {
+                  } else if (controller.userProfile.value.data?.password !=
+                      value) {
                    return 'رمز عبور  صحیح نیست';
                  }
                  return null;
@@ -820,7 +928,10 @@ class ProfilePage extends GetView<ProfileLogic> {
          child: Column(
            spacing: 8,
            children: [
-              Text('خروج', style: AppFonts.yekan16Bold.copyWith(color: AppColor.error)),
+              Text(
+                'خروج',
+                style: AppFonts.yekan16Bold.copyWith(color: AppColor.error),
+              ),
              SizedBox(),
              Text(
                'آیا مطمئن هستید که می‌خواهید از حساب کاربری خود خارج شوید؟',
@@ -840,7 +951,9 @@ class ProfilePage extends GetView<ProfileLogic> {
                    backgroundColor: AppColor.error,
                    onPressed: () async {
                      await Future.wait([
-                        controller.tokenService.deleteModuleTokens(Module.chicken),
+                        controller.tokenService.deleteModuleTokens(
+                          Module.chicken,
+                        ),
                        controller.gService.clearSelectedModule(),
                      ]).then((value) async {
                        await removeChickenDI();
@@ -884,11 +997,16 @@ class ProfilePage extends GetView<ProfileLogic> {
            children: List.generate(item?.length ?? 0, (index) {
              Map tmpRole = getFaUserRoleWithOnTap(item?[index]);
              return CustomChip(
-                isSelected: controller.gService.getRoute(Module.chicken) == tmpRole.values.first,
+                isSelected:
+                    controller.gService.getRoute(Module.chicken) ==
+                    tmpRole.values.first,
                title: tmpRole.keys.first,
                index: index,
                onTap: (int p1) {
-                  controller.changeUserRole(tmpRole.values.first);
+                  controller.changeUserRole(
+                    route: tmpRole.values.first,
+                    role: item?[index] ?? '',
+                  );
                },
              );
            }),
--- a/packages/chicken/lib/features/common/presentation/page/role/view.dart
+++ b/packages/chicken/lib/features/common/presentation/page/role/view.dart
@@ -14,8 +14,40 @@ class RolePage extends GetView<RoleLogic> {
      isBase: true,
      child: Column(
        children: [
-          Assets.images.selectRole.image(height: 212.h, width: Get.width.w, fit: BoxFit.cover),
+          Assets.images.selectRole.image(
+            height: 212.h,
+            width: Get.width.w,
+            fit: BoxFit.cover,
+          ),
          ObxValue((data) {
+            if (data.isEmpty) {
+              return Expanded(
+                child: Center(
+                  child: Padding(
+                    padding: EdgeInsets.all(24.w),
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Icon(
+                          Icons.info_outline,
+                          size: 64.w,
+                          color: AppColor.darkGreyDark,
+                        ),
+                        SizedBox(height: 16.h),
+                        Text(
+                          'شما دسترسی به هیچ رولی ندارید',
+                          textAlign: TextAlign.center,
+                          style: AppFonts.yekan16Bold.copyWith(
+                            color: AppColor.darkGreyDark,
+                          ),
+                        ),
+                        SizedBox(height: 8.h),
+                      ],
+                    ),
+                  ),
+                ),
+              );
+            }
            return Expanded(
              child: GridView.builder(
                physics: BouncingScrollPhysics(),
@@ -34,9 +66,14 @@ class RolePage extends GetView<RoleLogic> {
                    onTap: () async {
                      try {
                        String route = role.values.first;
-                        await controller.gService.saveRoute(Module.chicken, route);
-
-                        await controller.gService.saveRole(Module.chicken, data[index]);
+                        await controller.gService.saveRoute(
+                          Module.chicken,
+                          route,
+                        );
+                        await controller.gService.saveRole(
+                          Module.chicken,
+                          data[index],
+                        );
                        Get.offAllNamed(route);
                      } catch (e) {
                        eLog(
@@ -55,7 +92,12 @@ class RolePage extends GetView<RoleLogic> {
  }
 }

-Widget roleCard({required String title, Function()? onTap, int? width, int? height}) {
+Widget roleCard({
+  required String title,
+  Function()? onTap,
+  int? width,
+  int? height,
+}) {
  return Container(
    width: width?.w ?? 128.w,
    height: height?.h ?? 48.h,
--- a/packages/chicken/lib/features/common/profile/logic.dart
+++ b/packages/chicken/lib/features/common/profile/logic.dart
@@ -1,257 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:rasadyar_chicken/data/di/chicken_di.dart';
-import 'package:rasadyar_chicken/features/common/data/model/request/change_password/change_password_request_model.dart';
-import 'package:rasadyar_chicken/features/common/data/model/response/iran_province_city/iran_province_city_model.dart';
-import 'package:rasadyar_chicken/features/common/data/model/response/user_profile/user_profile.dart';
-import 'package:rasadyar_chicken/features/common/data/repositories/common/common_repository.dart';
-import 'package:rasadyar_core/core.dart';
-
-class ProfileLogic extends GetxController {
-  CommonRepository commonRepository = diChicken.get<CommonRepository>();
-  GService gService = Get.find<GService>();
-  TokenStorageService tokenService = Get.find<TokenStorageService>();
-  RxInt selectedInformationType = 0.obs;
-  Rxn<Jalali> birthDate = Rxn<Jalali>();
-
-  Rx<Resource<UserProfile>> userProfile = Rx<Resource<UserProfile>>(
-    Resource.loading(),
-  );
-  Rx<Resource<UserLocalModel>> userLocal = Rx<Resource<UserLocalModel>>(
-    Resource.loading(),
-  );
-
-  TextEditingController nameController = TextEditingController();
-  TextEditingController lastNameController = TextEditingController();
-  TextEditingController nationalCodeController = TextEditingController();
-  TextEditingController nationalIdController = TextEditingController();
-  TextEditingController birthdayController = TextEditingController();
-
-  TextEditingController oldPasswordController = TextEditingController();
-  TextEditingController newPasswordController = TextEditingController();
-  TextEditingController retryNewPasswordController = TextEditingController();
-
-  RxList<IranProvinceCityModel> cites = <IranProvinceCityModel>[].obs;
-  Rxn<IranProvinceCityModel> selectedProvince = Rxn();
-  Rxn<IranProvinceCityModel> selectedCity = Rxn();
-
-  GlobalKey<FormState> formKey = GlobalKey();
-  ImagePicker imagePicker = ImagePicker();
-  Rxn<XFile> selectedImage = Rxn<XFile>();
-  final RxnString _base64Image = RxnString();
-  RxBool isOnLoading = false.obs;
-
-  RxBool isUserInformationOpen = true.obs;
-  RxBool isUnitInformationOpen = false.obs;
-
-  ScrollController scrollController = ScrollController();
-
-  @override
-  void onInit() {
-    super.onInit();
-    ever(selectedImage, (data) async {
-      if (data?.path != null) {
-        _base64Image.value = await convertImageToBase64(data!.path);
-      }
-    });
-  }
-
-  @override
-  void onReady() {
-    super.onReady();
-    getUserProfile();
-    getUserRole();
-    selectedProvince.listen((p0) => getCites());
-    userProfile.listen((data) {
-      nameController.text = data.data?.firstName ?? '';
-      lastNameController.text = data.data?.lastName ?? '';
-      nationalCodeController.text = data.data?.nationalCode ?? '';
-      nationalIdController.text = data.data?.nationalId ?? '';
-      birthdayController.text =
-          data.data?.birthday?.toJalali.formatCompactDate() ?? '';
-      birthDate.value = data.data?.birthday?.toJalali;
-      selectedProvince.value = IranProvinceCityModel(
-        name: data.data?.province ?? '',
-        id: data.data?.provinceNumber ?? 0,
-      );
-
-      selectedCity.value = IranProvinceCityModel(
-        name: data.data?.city ?? '',
-        id: data.data?.cityNumber ?? 0,
-      );
-    });
-  }
-
-  Future<void> getUserProfile() async {
-    userProfile.value = Resource.loading();
-    await safeCall<UserProfile?>(
-      call: () async => await commonRepository.getUserProfile(
-        token: tokenService.accessToken.value!,
-      ),
-      onSuccess: (result) {
-        if (result != null) {
-          userProfile.value = Resource.success(result);
-        }
-      },
-      onError: (error, stackTrace) {},
-    );
-  }
-
-  Future<void> getCites() async {
-    await safeCall(
-      call: () => commonRepository.getCity(
-        provinceName: selectedProvince.value?.name ?? '',
-      ),
-      onSuccess: (result) {
-        if (result != null && result.isNotEmpty) {
-          cites.value = result;
-        }
-      },
-    );
-  }
-
-  Future<void> updateUserProfile() async {
-    UserProfile userProfile = UserProfile(
-      firstName: nameController.text,
-      lastName: lastNameController.text,
-      nationalCode: nationalCodeController.text,
-      nationalId: nationalIdController.text,
-      birthday: birthDate.value
-          ?.toDateTime()
-          .formattedDashedGregorian
-          .toString(),
-      image: _base64Image.value,
-      personType: 'self',
-      type: 'self_profile',
-    );
-    isOnLoading.value = true;
-    await safeCall(
-      call: () async => await commonRepository.updateUserProfile(
-        token: tokenService.accessToken.value!,
-        userProfile: userProfile,
-      ),
-      onSuccess: (result) {
-        isOnLoading.value = false;
-      },
-      onError: (error, stackTrace) {
-        isOnLoading.value = false;
-      },
-    );
-  }
-
-  Future<void> updatePassword() async {
-    if (formKey.currentState?.validate() ?? false) {
-      ChangePasswordRequestModel model = ChangePasswordRequestModel(
-        username: userProfile.value.data?.mobile,
-        password: newPasswordController.text,
-      );
-
-      await safeCall(
-        call: () async => await commonRepository.updatePassword(
-          token: tokenService.accessToken.value!,
-          model: model,
-        ),
-      );
-    }
-  }
-
-  Future<void> getUserRole() async {
-    userLocal.value = Resource.loading();
-    await safeCall<UserLocalModel?>(
-      call: () async => tokenService.getUserLocal(Module.chicken),
-      onSuccess: (result) {
-        if (result != null) {
-          userLocal.value = Resource.success(result);
-        }
-      },
-      onError: (error, stackTrace) {},
-    );
-  }
-
-  void clearPasswordForm() {
-    oldPasswordController.clear();
-    newPasswordController.clear();
-    retryNewPasswordController.clear();
-  }
-
-  Future<void> changeUserRole(String newRole) async {
-    dLog(newRole);
-    await gService.saveRoute(Module.chicken, newRole);
-
-    Get.offAllNamed(newRole);
-  }
-
-  void scrollToSelectedItem(
-    int index, {
-    double chipWidth = 100,
-    double spacing = 8,
-    GlobalKey? itemKey,
-  }) {
-    if (!scrollController.hasClients) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        _performScroll(index, chipWidth, spacing, itemKey);
-      });
-    } else {
-      _performScroll(index, chipWidth, spacing, itemKey);
-    }
-  }
-
-  void _performScroll(
-    int index,
-    double chipWidth,
-    double spacing,
-    GlobalKey? itemKey,
-  ) {
-    if (!scrollController.hasClients) return;
-
-    double targetOffset;
-
-    // If we have a GlobalKey, use it for precise positioning
-    if (itemKey?.currentContext != null) {
-      final RenderBox? renderBox =
-          itemKey!.currentContext?.findRenderObject() as RenderBox?;
-      if (renderBox != null) {
-        final position = renderBox.localToGlobal(Offset.zero);
-        final scrollPosition = scrollController.position;
-        final viewportWidth = scrollPosition.viewportDimension;
-        final chipWidth = renderBox.size.width;
-
-        // Get the scroll position of the item
-        final itemScrollPosition = position.dx - scrollPosition.pixels;
-        // Center the item
-        targetOffset =
-            scrollPosition.pixels +
-            itemScrollPosition -
-            (viewportWidth / 2) +
-            (chipWidth / 2);
-      } else {
-        // Fallback to estimated position
-        targetOffset = _calculateEstimatedPosition(index, chipWidth, spacing);
-      }
-    } else {
-      // Use estimated position
-      targetOffset = _calculateEstimatedPosition(index, chipWidth, spacing);
-    }
-
-    scrollController.animateTo(
-      targetOffset.clamp(0.0, scrollController.position.maxScrollExtent),
-      duration: const Duration(milliseconds: 300),
-      curve: Curves.easeInOut,
-    );
-  }
-
-  double _calculateEstimatedPosition(
-    int index,
-    double chipWidth,
-    double spacing,
-  ) {
-    final double itemPosition = (chipWidth + spacing) * index;
-    final double viewportWidth = scrollController.position.viewportDimension;
-    return itemPosition - (viewportWidth / 2) + (chipWidth / 2);
-  }
-
-  @override
-  void onClose() {
-    scrollController.dispose();
-    super.onClose();
-  }
-}
--- a/packages/chicken/lib/features/common/profile/view.dart
+++ b/packages/chicken/lib/features/common/profile/view.dart
@@ -1,902 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/cupertino.dart' hide Image;
-import 'package:flutter/material.dart';
-import 'package:rasadyar_chicken/data/common/fa_user_role.dart';
-import 'package:rasadyar_chicken/data/di/chicken_di.dart';
-import 'package:rasadyar_chicken/features/common/data/model/response/user_profile/user_profile.dart';
-import 'package:rasadyar_core/core.dart';
-
-import 'logic.dart';
-
-class ProfilePage extends GetView<ProfileLogic> {
-  const ProfilePage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      spacing: 30,
-      children: [
-        Expanded(
-          child: Container(
-            color: AppColor.blueNormal,
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                Row(),
-                ObxValue((data) {
-                  final status = data.value.status;
-
-                  if (status == ResourceStatus.loading) {
-                    return Container(
-                      width: 128.w,
-                      height: 128.h,
-                      child: Center(child: CupertinoActivityIndicator(color: AppColor.greenNormal)),
-                    );
-                  }
-
-                  if (status == ResourceStatus.error) {
-                    return Container(
-                      width: 128.w,
-                      height: 128.h,
-                      child: Center(child: Text('خطا در دریافت اطلاعات')),
-                    );
-                  }
-
-                  // Default UI
-
-                  return Container(
-                    width: 128.w,
-                    height: 128.h,
-                    decoration: BoxDecoration(
-                      shape: BoxShape.circle,
-                      color: AppColor.blueLightActive,
-                    ),
-                    child: Center(
-                      child: data.value.data?.image != null
-                          ? CircleAvatar(
-                              radius: 64.w,
-                              backgroundImage: NetworkImage(data.value.data!.image!),
-                            )
-                          : Icon(Icons.person, size: 64.w),
-                    ),
-                  );
-                }, controller.userProfile),
-              ],
-            ),
-          ),
-        ),
-        Expanded(
-          flex: 3,
-          child: SingleChildScrollView(
-            physics: BouncingScrollPhysics(),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                rolesWidget(),
-                SizedBox(height: 12.h),
-
-                ObxValue((data) {
-                  if (data.value.status == ResourceStatus.loading) {
-                    return LoadingWidget();
-                  } else if (data.value.status == ResourceStatus.error) {
-                    return ErrorWidget('خطا در دریافت اطلاعات کاربر');
-                  } else if (data.value.status == ResourceStatus.success) {
-                    return Column(
-                      spacing: 6,
-                      children: [
-                        ObxValue((isOpen) {
-                          return GestureDetector(
-                            onTap: () => isOpen.toggle(),
-                            child: AnimatedContainer(
-                              height: isOpen.value ? 320.h : 47.h,
-                              duration: Duration(milliseconds: 500),
-                              curve: Curves.linear,
-                              child: userProfileInformation(data.value),
-                            ),
-                          );
-                        }, controller.isUserInformationOpen),
-
-                        Visibility(
-                          visible:
-                              data.value.data?.unitName != null ||
-                              data.value.data?.unitAddress != null ||
-                              data.value.data?.unitPostalCode != null ||
-                              data.value.data?.unitRegistrationNumber != null ||
-                              data.value.data?.unitEconomicalNumber != null ||
-                              data.value.data?.unitCity != null ||
-                              data.value.data?.unitProvince != null ||
-                              data.value.data?.unitNationalId != null,
-
-                          child: ObxValue((isOpen) {
-                            return GestureDetector(
-                              onTap: () => isOpen.toggle(),
-                              child: AnimatedContainer(
-                                height: isOpen.value ? 320.h : 47.h,
-                                duration: Duration(milliseconds: 500),
-                                curve: Curves.linear,
-                                child: unitInformation(data.value),
-                              ),
-                            );
-                          }, controller.isUnitInformationOpen),
-                        ),
-                      ],
-                    );
-                  } else {
-                    return SizedBox.shrink();
-                  }
-                }, controller.userProfile),
-                GestureDetector(
-                  onTap: () {
-                    Get.bottomSheet(changePasswordBottomSheet(), isScrollControlled: true);
-                  },
-                  child: Container(
-                    height: 47.h,
-                    margin: EdgeInsets.symmetric(horizontal: 8, vertical: 8.h),
-                    padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h),
-                    decoration: BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(width: 1, color: const Color(0xFFD6D6D6)),
-                    ),
-                    child: Row(
-                      spacing: 6,
-                      children: [
-                        Assets.vec.lockSvg.svg(
-                          width: 24.w,
-                          height: 24.h,
-                          colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
-                        ),
-                        Text(
-                          'تغییر رمز عبور',
-                          textAlign: TextAlign.center,
-                          style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-                GestureDetector(
-                  onTap: () {
-                    Get.bottomSheet(exitBottomSheet(), isScrollControlled: true);
-                  },
-                  child: Container(
-                    height: 47.h,
-                    margin: EdgeInsets.symmetric(horizontal: 8),
-                    padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h),
-                    decoration: BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(width: 1, color: const Color(0xFFD6D6D6)),
-                    ),
-                    child: Row(
-                      spacing: 6,
-                      children: [
-                        Assets.vec.logoutSvg.svg(
-                          width: 24.w,
-                          height: 24.h,
-                          colorFilter: ColorFilter.mode(AppColor.redNormal, BlendMode.srcIn),
-                        ),
-                        Text(
-                          'خروج',
-                          textAlign: TextAlign.center,
-                          style: AppFonts.yekan14.copyWith(color: AppColor.redNormal),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-
-                SizedBox(height: 100),
-              ],
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Container invoiceIssuanceInformation() => Container();
-
-  Widget bankInformationWidget() => Column(
-    spacing: 16,
-    children: [
-      itemList(title: 'نام بانک', content: 'سامان'),
-      itemList(title: 'نام صاحب حساب', content: 'رضا رضایی'),
-      itemList(title: 'شماره کارت ', content: '54154545415'),
-      itemList(title: 'شماره حساب', content: '62565263263652'),
-      itemList(title: 'شماره شبا', content: '62565263263652'),
-    ],
-  );
-
-  Widget userProfileInformation(Resource<UserProfile> value) {
-    UserProfile item = value.data!;
-    return Stack(
-      clipBehavior: Clip.none,
-      children: [
-        Positioned.fill(
-          child: ObxValue(
-            (val) => Container(
-              height: val.value ? 320.h : 47.h,
-              margin: EdgeInsets.symmetric(horizontal: 8, vertical: val.value ? 8 : 0),
-              padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h),
-              decoration: BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.circular(8),
-                border: Border.all(width: 0.5, color: AppColor.darkGreyLight),
-              ),
-              child: val.value
-                  ? Column(
-                      spacing: 6,
-                      children: [
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.end,
-                          children: [
-                            GestureDetector(
-                              onTap: () {
-                                Get.bottomSheet(
-                                  userInformationBottomSheet(),
-                                  isScrollControlled: true,
-                                  ignoreSafeArea: false,
-                                );
-                              },
-                              child: Assets.vec.editSvg.svg(
-                                width: 24.w,
-                                height: 24.h,
-                                colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
-                              ),
-                            ),
-                          ],
-                        ),
-
-                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
-                          child: Column(
-                            children: [
-                              itemList(
-                                title: 'نام و نام خانوادگی',
-                                content: item.fullname ?? 'نامشخص',
-                                icon: Assets.vec.userSvg.path,
-                                hasColoredBox: true,
-                              ),
-                              itemList(
-                                title: 'کدملی',
-                                content: item.nationalId ?? 'نامشخص',
-                                icon: Assets.vec.tagUserSvg.path,
-                              ),
-                              itemList(
-                                title: 'موبایل',
-                                content: item.mobile ?? 'نامشخص',
-                                icon: Assets.vec.callSvg.path,
-                              ),
-
-                              itemList(
-                                title: 'شماره شناسنامه',
-                                content: item.nationalCode ?? 'نامشخص',
-                                icon: Assets.vec.userSquareSvg.path,
-                              ),
-                              itemList(
-                                title: 'تاریخ تولد',
-                                content: item.birthday?.toJalali.formatCompactDate() ?? 'نامشخص',
-                                icon: Assets.vec.calendarSvg.path,
-                              ),
-                              //todo
-                              itemList(
-                                title: 'استان',
-                                content: item.province ?? 'نامشخص',
-                                icon: Assets.vec.pictureFrameSvg.path,
-                              ),
-                              itemList(
-                                title: 'شهر',
-                                content: item.city ?? 'نامشخص',
-                                icon: Assets.vec.mapSvg.path,
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-                    )
-                  : Row(
-                      mainAxisAlignment: MainAxisAlignment.end,
-                      children: [Icon(CupertinoIcons.chevron_down, color: AppColor.iconColor)],
-                    ),
-            ),
-            controller.isUserInformationOpen,
-          ),
-        ),
-        ObxValue(
-          (isOpen) => AnimatedPositioned(
-            right: 16,
-            top: isOpen.value ? -7 : 11,
-            duration: Duration(milliseconds: 500),
-            child: Container(
-              padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-              decoration: isOpen.value
-                  ? BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(width: 0.5, color: Color(0xFFA9A9A9)),
-                    )
-                  : null,
-              child: Text(
-                'اطلاعات هویتی',
-                style: AppFonts.yekan16.copyWith(color: AppColor.iconColor),
-              ),
-            ),
-          ),
-          controller.isUserInformationOpen,
-        ),
-      ],
-    );
-  }
-
-  Widget unitInformation(Resource<UserProfile> value) {
-    UserProfile item = value.data!;
-    return Stack(
-      clipBehavior: Clip.none,
-      children: [
-        Positioned.fill(
-          child: ObxValue(
-            (val) => Container(
-              height: val.value ? 320.h : 47.h,
-              margin: EdgeInsets.symmetric(horizontal: 8, vertical: val.value ? 12 : 0),
-              padding: EdgeInsets.symmetric(horizontal: 11.h),
-              decoration: BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.circular(8),
-                border: Border.all(width: 0.5, color: AppColor.darkGreyLight),
-              ),
-              child: val.value
-                  ? Column(
-                      children: [
-                        SizedBox(height: 5.h),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.end,
-                          children: [
-                            GestureDetector(
-                              onTap: () {
-                                Get.bottomSheet(
-                                  userInformationBottomSheet(),
-                                  isScrollControlled: true,
-                                  ignoreSafeArea: false,
-                                );
-                              },
-                              child: Assets.vec.editSvg.svg(
-                                width: 24.w,
-                                height: 24.h,
-                                colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
-                              ),
-                            ),
-                          ],
-                        ),
-
-                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
-                          child: Column(
-                            spacing: 2,
-                            children: [
-                              itemList(
-                                title: 'نام صنفی',
-                                content: item.unitName ?? 'نامشخص',
-                                hasColoredBox: true,
-                                visible: item.unitName != null,
-                              ),
-                              itemList(
-                                title: 'شناسنامه ملی',
-                                content: item.unitNationalId ?? 'نامشخص',
-                                visible: item.unitName != null,
-                              ),
-                              itemList(
-                                title: 'شماره ثبت',
-                                content: item.unitRegistrationNumber ?? 'نامشخص',
-                                visible: item.unitName != null,
-                              ),
-
-                              itemList(
-                                title: 'کد اقتصادی',
-                                content: item.unitEconomicalNumber ?? 'نامشخص',
-                                visible: item.unitName != null,
-                              ),
-                              itemList(
-                                title: 'کد پستی',
-                                content: item.unitPostalCode ?? 'نامشخص',
-                                visible: item.unitName != null,
-                              ),
-
-                              itemList(
-                                title: 'استان',
-                                content: item.province ?? 'نامشخص',
-                                visible: item.unitName != null,
-                              ),
-                              itemList(
-                                title: 'شهر',
-                                content: item.city ?? 'نامشخص',
-                                visible: item.unitName != null,
-                              ),
-                              itemList(title: 'آدرس', content: item.unitAddress ?? 'نامشخص'),
-                            ],
-                          ),
-                        ),
-                      ],
-                    )
-                  : Row(
-                      mainAxisAlignment: MainAxisAlignment.end,
-                      children: [Icon(CupertinoIcons.chevron_down, color: AppColor.iconColor)],
-                    ),
-            ),
-            controller.isUnitInformationOpen,
-          ),
-        ),
-        ObxValue(
-          (isOpen) => AnimatedPositioned(
-            right: 16,
-            top: isOpen.value ? -2 : 11,
-            duration: Duration(milliseconds: 500),
-            child: Container(
-              padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-              decoration: isOpen.value
-                  ? BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(width: 0.5, color: Color(0xFFA9A9A9)),
-                    )
-                  : null,
-              child: Text(
-                'اطلاعات صنفی',
-                style: AppFonts.yekan16.copyWith(color: AppColor.iconColor),
-              ),
-            ),
-          ),
-          controller.isUnitInformationOpen,
-        ),
-      ],
-    );
-  }
-
-  Widget itemList({
-    required String title,
-    required String content,
-    String? icon,
-    bool hasColoredBox = false,
-    bool? visible,
-  }) => Visibility(
-    visible: visible ?? true,
-    child: Container(
-      padding: EdgeInsets.symmetric(horizontal: 12.h, vertical: 6.h),
-      decoration: BoxDecoration(
-        color: hasColoredBox ? AppColor.greenLight : Colors.transparent,
-        borderRadius: BorderRadius.circular(8),
-        border: hasColoredBox
-            ? Border.all(width: 0.25, color: AppColor.bgDark)
-            : Border.all(width: 0, color: Colors.transparent),
-      ),
-      child: Row(
-        spacing: 4,
-        children: [
-          if (icon != null)
-            Padding(
-              padding: const EdgeInsets.only(left: 8.0),
-              child: SvgGenImage.vec(icon).svg(
-                width: 20.w,
-                height: 20.h,
-                colorFilter: ColorFilter.mode(AppColor.textColor, BlendMode.srcIn),
-              ),
-            ),
-          Text(title, style: AppFonts.yekan14.copyWith(color: AppColor.textColor)),
-          Spacer(),
-          Text(content, style: AppFonts.yekan14.copyWith(color: AppColor.textColor)),
-        ],
-      ),
-    ),
-  );
-
-  Widget cardActionWidget({
-    required String title,
-    required VoidCallback onPressed,
-    required String icon,
-    bool selected = false,
-    ColorFilter? color,
-    Color? cardColor,
-    Color? cardIconColor,
-    Color? textColor,
-  }) {
-    return GestureDetector(
-      onTap: onPressed,
-      child: Column(
-        spacing: 4,
-        children: [
-          Container(
-            width: 52.w,
-            height: 52.h,
-            padding: EdgeInsets.all(6),
-            decoration: ShapeDecoration(
-              color: cardColor ?? AppColor.blueLight,
-              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-            ),
-            child: Container(
-              padding: EdgeInsets.all(4),
-              decoration: BoxDecoration(
-                color: cardIconColor,
-                borderRadius: BorderRadius.circular(8),
-              ),
-              child: SvgGenImage.vec(icon).svg(
-                width: 40.w,
-                height: 40.h,
-                colorFilter: color ?? ColorFilter.mode(Colors.white, BlendMode.srcIn),
-              ),
-            ),
-          ),
-          SizedBox(height: 2),
-          Text(
-            title,
-            style: AppFonts.yekan10.copyWith(color: AppColor.textColor),
-            textAlign: TextAlign.center,
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget userInformationBottomSheet() {
-    return BaseBottomSheet(
-      height: 750.h,
-      child: SingleChildScrollView(
-        child: Column(
-          spacing: 8,
-          children: [
-            Text(
-              'ویرایش اطلاعات هویتی',
-              style: AppFonts.yekan16Bold.copyWith(color: AppColor.darkGreyDarkHover),
-            ),
-
-            Container(
-              padding: EdgeInsets.all(8),
-              decoration: BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.circular(8),
-                border: Border.all(color: AppColor.darkGreyLight, width: 1),
-              ),
-              child: Column(
-                spacing: 12,
-                children: [
-                  RTextField(
-                    controller: controller.nameController,
-                    label: 'نام',
-                    borderColor: AppColor.darkGreyLight,
-                    filledColor: AppColor.bgLight,
-                    filled: true,
-                  ),
-                  RTextField(
-                    controller: controller.lastNameController,
-                    label: 'نام خانوادگی',
-                    borderColor: AppColor.darkGreyLight,
-                    filledColor: AppColor.bgLight,
-                    filled: true,
-                  ),
-                  RTextField(
-                    controller: controller.nationalCodeController,
-                    label: 'شماره شناسنامه',
-                    borderColor: AppColor.darkGreyLight,
-                    filledColor: AppColor.bgLight,
-                    filled: true,
-                  ),
-                  RTextField(
-                    controller: controller.nationalIdController,
-                    label: 'کد ملی',
-                    borderColor: AppColor.darkGreyLight,
-                    filledColor: AppColor.bgLight,
-                    filled: true,
-                  ),
-
-                  ObxValue((data) {
-                    return RTextField(
-                      controller: controller.birthdayController,
-                      label: 'تاریخ تولد',
-                      initText: data.value?.formatCompactDate() ?? '',
-                      borderColor: AppColor.darkGreyLight,
-                      filledColor: AppColor.bgLight,
-                      filled: true,
-                      onTap: () {},
-                    );
-                  }, controller.birthDate),
-
-                  SizedBox(),
-                ],
-              ),
-            ),
-            SizedBox(),
-
-            Container(
-              padding: EdgeInsets.all(8),
-              decoration: BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.circular(8),
-                border: Border.all(color: AppColor.darkGreyLight, width: 1),
-              ),
-              child: Column(
-                spacing: 8,
-                children: [
-                  Text(
-                    'عکس پروفایل',
-                    style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal),
-                  ),
-                  ObxValue((data) {
-                    return Container(
-                      width: Get.width,
-                      height: 270,
-                      decoration: BoxDecoration(
-                        color: AppColor.lightGreyNormal,
-                        borderRadius: BorderRadius.circular(8),
-                        border: Border.all(width: 1, color: AppColor.blackLight),
-                      ),
-                      child: Center(
-                        child: data.value == null
-                            ? Padding(
-                                padding: const EdgeInsets.fromLTRB(30, 10, 10, 30),
-                                child: Image.network(
-                                  controller.userProfile.value.data?.image ?? '',
-                                ),
-                              )
-                            : Image.file(File(data.value!.path), fit: BoxFit.cover),
-                      ),
-                    );
-                  }, controller.selectedImage),
-
-                  Row(
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      RElevated(
-                        text: 'گالری',
-                        width: 150.w,
-                        height: 40.h,
-                        textStyle: AppFonts.yekan20.copyWith(color: Colors.white),
-                        onPressed: () async {
-                          controller.selectedImage.value = await controller.imagePicker.pickImage(
-                            source: ImageSource.gallery,
-                            imageQuality: 60,
-                            maxWidth: 1080,
-                            maxHeight: 720,
-                          );
-                        },
-                      ),
-                      SizedBox(width: 16),
-                      ROutlinedElevated(
-                        text: 'دوربین',
-                        width: 150.w,
-                        height: 40.h,
-                        textStyle: AppFonts.yekan20.copyWith(color: AppColor.blueNormal),
-                        onPressed: () async {
-                          controller.selectedImage.value = await controller.imagePicker.pickImage(
-                            source: ImageSource.camera,
-                            imageQuality: 60,
-                            maxWidth: 1080,
-                            maxHeight: 720,
-                          );
-                        },
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-            Row(
-              spacing: 16,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                ObxValue((data) {
-                  return RElevated(
-                    height: 40.h,
-                    text: 'ویرایش',
-                    isLoading: data.value,
-                    onPressed: () async {
-                      await controller.updateUserProfile();
-                      controller.getUserProfile();
-                      Get.back();
-                    },
-                  );
-                }, controller.isOnLoading),
-                ROutlinedElevated(
-                  height: 40.h,
-                  text: 'انصراف',
-                  borderColor: AppColor.blueNormal,
-                  onPressed: () {
-                    Get.back();
-                  },
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget changePasswordBottomSheet() {
-    return BaseBottomSheet(
-      height: 400.h,
-      child: SingleChildScrollView(
-        child: Form(
-          key: controller.formKey,
-          child: Column(
-            spacing: 8,
-            children: [
-              Text(
-                'تغییر رمز عبور',
-                style: AppFonts.yekan16Bold.copyWith(color: AppColor.darkGreyDarkHover),
-              ),
-              SizedBox(),
-              RTextField(
-                controller: controller.oldPasswordController,
-                hintText: 'رمز عبور قبلی',
-                borderColor: AppColor.darkGreyLight,
-                filledColor: AppColor.bgLight,
-                filled: true,
-                validator: (value) {
-                  if (value == null || value.isEmpty) {
-                    return 'رمز عبور را وارد کنید';
-                  } else if (controller.userProfile.value.data?.password != value) {
-                    return 'رمز عبور  صحیح نیست';
-                  }
-                  return null;
-                },
-              ),
-              RTextField(
-                controller: controller.newPasswordController,
-                hintText: 'رمز عبور جدید',
-                borderColor: AppColor.darkGreyLight,
-                filledColor: AppColor.bgLight,
-                filled: true,
-                validator: (value) {
-                  if (value == null || value.isEmpty) {
-                    return 'رمز عبور را وارد کنید';
-                  } else if (value.length < 6) {
-                    return 'رمز عبور باید بیش از 6 کارکتر باشد.';
-                  }
-                  return null;
-                },
-              ),
-              RTextField(
-                controller: controller.retryNewPasswordController,
-                hintText: 'تکرار رمز عبور جدید',
-                borderColor: AppColor.darkGreyLight,
-                filledColor: AppColor.bgLight,
-                filled: true,
-                validator: (value) {
-                  if (value == null || value.isEmpty) {
-                    return 'رمز عبور را وارد کنید';
-                  } else if (value.length < 6) {
-                    return 'رمز عبور باید بیش از 6 کارکتر باشد.';
-                  } else if (controller.newPasswordController.text != value) {
-                    return 'رمز عبور جدید یکسان نیست';
-                  }
-                  return null;
-                },
-              ),
-
-              SizedBox(),
-
-              Row(
-                spacing: 16,
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  RElevated(
-                    height: 40.h,
-                    text: 'ویرایش',
-                    onPressed: () async {
-                      if (controller.formKey.currentState?.validate() != true) {
-                        return;
-                      }
-                      await controller.updatePassword();
-                      controller.getUserProfile();
-                      controller.clearPasswordForm();
-                      Get.back();
-                    },
-                  ),
-                  ROutlinedElevated(
-                    height: 40.h,
-                    text: 'انصراف',
-                    borderColor: AppColor.blueNormal,
-                    onPressed: () {
-                      Get.back();
-                    },
-                  ),
-                ],
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget exitBottomSheet() {
-    return BaseBottomSheet(
-      height: 220.h,
-      child: SingleChildScrollView(
-        child: Form(
-          key: controller.formKey,
-          child: Column(
-            spacing: 8,
-            children: [
-              Text('خروج', style: AppFonts.yekan16Bold.copyWith(color: AppColor.error)),
-              SizedBox(),
-              Text(
-                'آیا مطمئن هستید که می‌خواهید از حساب کاربری خود خارج شوید؟',
-                textAlign: TextAlign.center,
-                style: AppFonts.yekan16Bold.copyWith(color: AppColor.textColor),
-              ),
-
-              SizedBox(),
-
-              Row(
-                spacing: 16,
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  RElevated(
-                    height: 40.h,
-                    text: 'خروج',
-                    backgroundColor: AppColor.error,
-                    onPressed: () async {
-                      await Future.wait([
-                        controller.tokenService.deleteModuleTokens(Module.chicken),
-                        controller.gService.clearSelectedModule(),
-                      ]).then((value) async {
-                        await removeChickenDI();
-                        Get.offAllNamed("/moduleList");
-                      });
-                    },
-                  ),
-                  ROutlinedElevated(
-                    height: 40.h,
-                    text: 'انصراف',
-                    borderColor: AppColor.blueNormal,
-                    onPressed: () {
-                      Get.back();
-                    },
-                  ),
-                ],
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget rolesWidget() {
-    return ObxValue((data) {
-      if (data.value.status == ResourceStatus.loading) {
-        return CupertinoActivityIndicator();
-      } else if (data.value.status == ResourceStatus.error) {
-        return ErrorWidget('خطا در دریافت اطلاعات کاربر');
-      } else if (data.value.status == ResourceStatus.success) {
-        List<String>? item = data.value.data?.roles;
-        return SingleChildScrollView(
-          scrollDirection: Axis.horizontal,
-          padding: EdgeInsets.symmetric(horizontal: 8.w),
-          physics: BouncingScrollPhysics(),
-          
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            spacing: 8.w,
-            children: List.generate(item?.length ?? 0, (index) {
-              Map tmpRole = getFaUserRoleWithOnTap(item?[index]);
-              return CustomChip(
-                isSelected: controller.gService.getRoute(Module.chicken) == tmpRole.values.first,
-                title: tmpRole.keys.first,
-                index: index,
-                onTap: (int p1) {
-                  controller.changeUserRole(tmpRole.values.first);
-                },
-              );
-            }),
-          ),
-        );
-      } else {
-        return SizedBox.shrink();
-      }
-    }, controller.userLocal);
-  }
-}
--- a/packages/chicken/lib/features/common/role/logic.dart
+++ b/packages/chicken/lib/features/common/role/logic.dart
@@ -1,18 +0,0 @@
-import 'package:rasadyar_core/core.dart';
-
-class RoleLogic extends GetxController {
-  TokenStorageService tokenService = Get.find<TokenStorageService>();
-  GService gService = Get.find<GService>();
-  RxList<String> roles = <String>[].obs;
-
-  @override
-  void onInit() {
-    super.onInit();
-    List<String> items = tokenService.getUserLocal(Module.chicken)!.roles ?? [];
-    if (items.isNotEmpty) {
-      roles.assignAll(items);
-    }
-  }
-
-
-}
--- a/packages/chicken/lib/features/common/role/view.dart
+++ b/packages/chicken/lib/features/common/role/view.dart
@@ -1,79 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:rasadyar_chicken/data/common/fa_user_role.dart';
-import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
-import 'package:rasadyar_core/core.dart';
-
-import 'logic.dart';
-
-class RolePage extends GetView<RoleLogic> {
-  const RolePage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ChickenBasePage(
-      isBase: true,
-      child: Column(
-        children: [
-          Assets.images.selectRole.image(height: 212.h, width: Get.width.w, fit: BoxFit.cover),
-          ObxValue((data) {
-            return Expanded(
-              child: GridView.builder(
-                physics: BouncingScrollPhysics(),
-                gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                  crossAxisCount: 3,
-                  mainAxisSpacing: 12.h,
-                  crossAxisSpacing: 12.w,
-                  childAspectRatio: 2,
-                ),
-                itemCount: data.length,
-                hitTestBehavior: HitTestBehavior.opaque,
-                itemBuilder: (BuildContext context, int index) {
-                  Map role = getFaUserRoleWithOnTap(data[index]);
-                  return roleCard(
-                    title: role.keys.first,
-                    onTap: () async {
-                      try {
-                        String route = role.values.first;
-                        await controller.gService.saveRoute(Module.chicken, route);
-
-                        await controller.gService.saveRole(Module.chicken, data[index]);
-                        Get.offAllNamed(route);
-                      } catch (e) {
-                        eLog(
-                          "احتمالا در\n ``getFaUserRoleWithOnTap`` \nروت اش را تعریف نکردی 👻👻 ==>$e ",
-                        );
-                      }
-                    },
-                  );
-                },
-              ),
-            );
-          }, controller.roles),
-        ],
-      ),
-    );
-  }
-}
-
-Widget roleCard({required String title, Function()? onTap, int? width, int? height}) {
-  return Container(
-    width: width?.w ?? 128.w,
-    height: height?.h ?? 48.h,
-    margin: EdgeInsets.all(8.w),
-    decoration: BoxDecoration(
-      color: Colors.white,
-      borderRadius: BorderRadius.circular(8.r),
-      border: Border.all(color: AppColor.blueNormal, width: 1.w),
-    ),
-    child: InkWell(
-      onTap: onTap,
-      child: Center(
-        child: Text(
-          title,
-          style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal),
-          textAlign: TextAlign.center,
-        ),
-      ),
-    ),
-  );
-}
--- a/packages/chicken/lib/features/jahad/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/jahad/presentation/pages/active_hatching/view.dart
@@ -175,12 +175,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.poultry?.user?.fullname ?? 'N/A',
+                item.poultry?.user?.fullname ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
              Text(
-                item.poultry?.user?.mobile ?? 'N/A',
+                item.poultry?.user?.mobile ?? 'ندارد',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
              ),
@@ -195,12 +195,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
              Text(
-                item.poultry?.unitName ?? 'N/Aaq',
+                item.poultry?.unitName ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.poultry?.licenceNumber ?? 'N/A',
+                item.licenceNumber ?? 'ندارد',
                textAlign: TextAlign.left,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
--- a/packages/chicken/lib/features/jahad/presentation/pages/home/logic.dart
+++ b/packages/chicken/lib/features/jahad/presentation/pages/home/logic.dart
@@ -23,7 +23,7 @@ class JahadHomeLogic extends GetxController {
    JahadActionItem(
      title: "بازرسی مزارع طیور",
      route: JahadRoutes.newInspectionJahad,
-      icon: Assets.vec.activeFramSvg.path,
+      icon: Assets.vec.inspectionPoultrySvg.path,
    ),
  ].obs;
 }
--- a/packages/chicken/lib/features/jahad/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/jahad/presentation/pages/root/logic.dart
@@ -15,6 +15,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class JahadRootLogic extends GetxController {
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late JahadRepository jahadRepository;

@@ -45,6 +46,7 @@ class JahadRootLogic extends GetxController {
  void onInit() {
    super.onInit();
    jahadRepository = diChicken.get<JahadRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  void toggleExpanded(int index) {
--- a/packages/chicken/lib/features/kill_house/root/logic.dart
+++ b/packages/chicken/lib/features/kill_house/root/logic.dart
@@ -12,6 +12,7 @@ class KillHouseRootLogic extends GetxController {
  RxInt currentPage = 1.obs;

  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late KillHouseRepository killHouseRepository;

@@ -19,6 +20,7 @@ class KillHouseRootLogic extends GetxController {
  void onInit() {
    super.onInit();
    killHouseRepository = diChicken.get<KillHouseRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  final pages = [
--- a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart
+++ b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart
@@ -5,7 +5,7 @@ import 'package:flutter/widgets.dart';
 import 'package:rasadyar_chicken/data/di/chicken_di.dart';
 import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart';
 import 'package:rasadyar_chicken/data/repositories/kill_house/kill_house_repository.dart';
-import 'package:rasadyar_chicken/features/common/profile/view.dart';
+import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart';
 import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/buy/view.dart';
 import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/home/view.dart';
 import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/sale/view.dart';
@@ -30,6 +30,7 @@ class WarehouseAndDistributionRootLogic extends GetxController {

  late DioRemote dioRemote;
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  RxInt currentPage = 2.obs;
  List<Widget> pages = [
@@ -68,6 +69,7 @@ class WarehouseAndDistributionRootLogic extends GetxController {
    super.onInit();

    killHouseRepository = diChicken.get<KillHouseRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  @override
--- a/packages/chicken/lib/features/poultry_science/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/poultry_science/presentation/pages/active_hatching/view.dart
@@ -193,12 +193,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.poultry?.user?.fullname ?? 'N/A',
+                item.poultry?.user?.fullname ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
              Text(
-                item.poultry?.user?.mobile ?? 'N/A',
+                item.poultry?.user?.mobile ?? 'ندارد',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
              ),
@@ -213,12 +213,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
              Text(
-                item.poultry?.unitName ?? 'N/Aaq',
+                item.poultry?.unitName ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.poultry?.licenceNumber ?? 'N/A',
+                item.licenceNumber ?? 'ندارد',
                textAlign: TextAlign.left,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
--- a/packages/chicken/lib/features/poultry_science/presentation/pages/poultry_action/logic.dart
+++ b/packages/chicken/lib/features/poultry_science/presentation/pages/poultry_action/logic.dart
@@ -40,7 +40,7 @@ class PoultryActionLogic extends GetxController {
    PoultryActionItem(
      title: "بازرسی مزارع طیور",
      route: PoultryScienceRoutes.newInspectionPoultryScience,
-      icon: Assets.vec.activeFramSvg.path,
+      icon: Assets.vec.inspectionPoultrySvg.path,
    ),
  ].obs;
 }
--- a/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart
@@ -15,6 +15,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class PoultryScienceRootLogic extends GetxController {
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late PoultryScienceRepository poultryRepository;

@@ -46,6 +47,7 @@ class PoultryScienceRootLogic extends GetxController {
  void onInit() {
    super.onInit();
    poultryRepository = diChicken.get<PoultryScienceRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  void toggleExpanded(int index) {
--- a/packages/chicken/lib/features/province_inspector/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/province_inspector/presentation/pages/active_hatching/view.dart
@@ -193,12 +193,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.poultry?.user?.fullname ?? 'N/A',
+                item.poultry?.user?.fullname ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
              Text(
-                item.poultry?.user?.mobile ?? 'N/A',
+                item.poultry?.user?.mobile ?? 'ندارد',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
              ),
@@ -213,12 +213,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
              Text(
-                item.poultry?.unitName ?? 'N/Aaq',
+                item.poultry?.unitName ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.poultry?.licenceNumber ?? 'N/A',
+                item.licenceNumber ?? 'ندارد',
                textAlign: TextAlign.left,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
--- a/packages/chicken/lib/features/province_inspector/presentation/pages/home/logic.dart
+++ b/packages/chicken/lib/features/province_inspector/presentation/pages/home/logic.dart
@@ -24,7 +24,7 @@ class ProvinceInspectorHomeLogic extends GetxController {
    ProvinceInspectorActionItem(
      title: "بازرسی مزارع طیور",
      route: ProvinceInspectorRoutes.newInspectionProvinceInspector,
-      icon: Assets.vec.activeFramSvg.path,
+      icon: Assets.vec.inspectionPoultrySvg.path,
    ),
  ].obs;
 }
--- a/packages/chicken/lib/features/province_inspector/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/province_inspector/presentation/pages/root/logic.dart
@@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class ProvinceInspectorRootLogic extends GetxController {
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late ProvinceInspectorRepository provinceInspectorRepository;

@@ -45,6 +46,7 @@ class ProvinceInspectorRootLogic extends GetxController {
  void onInit() {
    super.onInit();
    provinceInspectorRepository = diChicken.get<ProvinceInspectorRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  void toggleExpanded(int index) {
--- a/packages/chicken/lib/features/province_operator/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/province_operator/presentation/pages/active_hatching/view.dart
@@ -193,12 +193,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.poultry?.user?.fullname ?? 'N/A',
+                item.poultry?.user?.fullname ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
              Text(
-                item.poultry?.user?.mobile ?? 'N/A',
+                item.poultry?.user?.mobile ?? 'ندارد',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
              ),
@@ -213,12 +213,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
              Text(
-                item.poultry?.unitName ?? 'N/Aaq',
+                item.poultry?.unitName ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.poultry?.licenceNumber ?? 'N/A',
+                item.licenceNumber ?? 'ندارد',
                textAlign: TextAlign.left,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
--- a/packages/chicken/lib/features/province_operator/presentation/pages/home/logic.dart
+++ b/packages/chicken/lib/features/province_operator/presentation/pages/home/logic.dart
@@ -24,7 +24,7 @@ class ProvinceOperatorHomeLogic extends GetxController {
    ProvinceOperatorHomeItem(
      title: "بازرسی مزارع طیور",
      route: ProvinceOperatorRoutes.newInspectionProvinceOperator,
-      icon: Assets.vec.activeFramSvg.path,
+      icon: Assets.vec.inspectionPoultrySvg.path,
    ),
  ].obs;
 }
--- a/packages/chicken/lib/features/province_operator/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/province_operator/presentation/pages/root/logic.dart
@@ -13,6 +13,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class ProvinceOperatorRootLogic extends GetxController {
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late ProvinceOperatorRepository provinceOperatorRepository;

@@ -44,6 +45,7 @@ class ProvinceOperatorRootLogic extends GetxController {
  void onInit() {
    super.onInit();
    provinceOperatorRepository = diChicken.get<ProvinceOperatorRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  void toggleExpanded(int index) {
--- a/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/view.dart
@@ -193,12 +193,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.poultry?.user?.fullname ?? 'N/A',
+                item.poultry?.user?.fullname ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
              Text(
-                item.poultry?.user?.mobile ?? 'N/A',
+                item.poultry?.user?.mobile ?? 'ندارد',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
              ),
@@ -213,12 +213,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
              Text(
-                item.poultry?.unitName ?? 'N/Aaq',
+                item.poultry?.unitName ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.poultry?.licenceNumber ?? 'N/A',
+                item.licenceNumber ?? 'ندارد',
                textAlign: TextAlign.left,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
--- a/packages/chicken/lib/features/province_supervisor/presentation/pages/home/logic.dart
+++ b/packages/chicken/lib/features/province_supervisor/presentation/pages/home/logic.dart
@@ -24,7 +24,7 @@ class ProvinceSupervisorHomeLogic extends GetxController {
    ProvinceSupervisorActionItem(
      title: "بازرسی مزارع طیور",
      route: ProvinceSupervisorRoutes.newInspectionProvinceSupervisor,
-      icon: Assets.vec.activeFramSvg.path,
+      icon: Assets.vec.inspectionPoultrySvg.path,
    ),
  ].obs;
 }
--- a/packages/chicken/lib/features/province_supervisor/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/province_supervisor/presentation/pages/root/logic.dart
@@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class ProvinceSupervisorRootLogic extends GetxController {
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late ProvinceSupervisorRepository provinceSupervisorRepository;

@@ -46,6 +47,7 @@ class ProvinceSupervisorRootLogic extends GetxController {
    super.onInit();
    provinceSupervisorRepository = diChicken
        .get<ProvinceSupervisorRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  void toggleExpanded(int index) {
--- a/packages/chicken/lib/features/steward/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/steward/presentation/pages/root/logic.dart
@@ -42,6 +42,7 @@ class StewardRootLogic extends GetxController {

  late DioRemote dioRemote;
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();
  late CommonRepository commonRepository;
  late StewardRepository stewardRepository;
  late ChickenLocalDataSource localDatasource;
@@ -61,6 +62,7 @@ class StewardRootLogic extends GetxController {
    localDatasource = diChicken.get<ChickenLocalDataSource>();
    commonRepository = diChicken.get<CommonRepository>();
    stewardRepository = diChicken.get<StewardRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  @override
--- a/packages/chicken/lib/features/super_admin/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/super_admin/presentation/pages/active_hatching/view.dart
@@ -193,12 +193,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.poultry?.user?.fullname ?? 'N/A',
+                item.poultry?.user?.fullname ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
              Text(
-                item.poultry?.user?.mobile ?? 'N/A',
+                item.poultry?.user?.mobile ?? 'ندارد',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
              ),
@@ -213,12 +213,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
              Text(
-                item.poultry?.unitName ?? 'N/Aaq',
+                item.poultry?.unitName ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.poultry?.licenceNumber ?? 'N/A',
+                item.licenceNumber ?? 'ندارد',
                textAlign: TextAlign.left,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
--- a/packages/chicken/lib/features/super_admin/presentation/pages/home/logic.dart
+++ b/packages/chicken/lib/features/super_admin/presentation/pages/home/logic.dart
@@ -20,7 +20,7 @@ class SuperAdminHomeLogic extends GetxController {
    SuperAdminHomeItem(
      title: "بازرسی مزارع طیور",
      route: SuperAdminRoutes.newInspectionSuperAdmin,
-      icon: Assets.vec.activeFramSvg.path,
+      icon: Assets.vec.inspectionPoultrySvg.path,
    ),
  ].obs;
 }
--- a/packages/chicken/lib/features/super_admin/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/super_admin/presentation/pages/root/logic.dart
@@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class SuperAdminRootLogic extends GetxController {
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late SuperAdminRepository superAdminRepository;

@@ -45,6 +46,7 @@ class SuperAdminRootLogic extends GetxController {
  void onInit() {
    super.onInit();
    superAdminRepository = diChicken.get<SuperAdminRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  void toggleExpanded(int index) {
--- a/packages/chicken/lib/features/vet_farm/presentation/pages/active_hatching/view.dart
+++ b/packages/chicken/lib/features/vet_farm/presentation/pages/active_hatching/view.dart
@@ -193,12 +193,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            spacing: 3,
            children: [
              Text(
-                item.poultry?.user?.fullname ?? 'N/A',
+                item.poultry?.user?.fullname ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
              Text(
-                item.poultry?.user?.mobile ?? 'N/A',
+                item.poultry?.user?.mobile ?? 'ندارد',
                textAlign: TextAlign.center,
                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
              ),
@@ -213,12 +213,12 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
            crossAxisAlignment: CrossAxisAlignment.center,
            children: [
              Text(
-                item.poultry?.unitName ?? 'N/Aaq',
+                item.poultry?.unitName ?? 'ندارد',
                textAlign: TextAlign.start,
                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
              ),
              Text(
-                item.poultry?.licenceNumber ?? 'N/A',
+                item.licenceNumber ?? 'ندارد',
                textAlign: TextAlign.left,
                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
              ),
--- a/packages/chicken/lib/features/vet_farm/presentation/pages/home/logic.dart
+++ b/packages/chicken/lib/features/vet_farm/presentation/pages/home/logic.dart
@@ -19,7 +19,7 @@ class VetFarmHomeLogic extends GetxController {
    VetFarmHomeItem(
      title: "بازرسی مزارع طیور",
      route: VetFarmRoutes.newInspectionVetFarm,
-      icon: Assets.vec.activeFramSvg.path,
+      icon: Assets.vec.inspectionPoultrySvg.path,
    ),
  ].obs;
 }
--- a/packages/chicken/lib/features/vet_farm/presentation/pages/root/logic.dart
+++ b/packages/chicken/lib/features/vet_farm/presentation/pages/root/logic.dart
@@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class VetFarmRootLogic extends GetxController {
  var tokenService = Get.find<TokenStorageService>();
+  var gService = Get.find<GService>();

  late VetFarmRepository vetFarmRepository;

@@ -45,6 +46,7 @@ class VetFarmRootLogic extends GetxController {
  void onInit() {
    super.onInit();
    vetFarmRepository = diChicken.get<VetFarmRepository>();
+    fLog('gService: ${gService.getRole(Module.chicken)}');
  }

  void toggleExpanded(int index) {
--- a/packages/chicken/lib/presentation/routes/pages.dart
+++ b/packages/chicken/lib/presentation/routes/pages.dart
@@ -1,3 +1,4 @@
+import 'package:rasadyar_chicken/features/city_poultry/presentation/routes/pages.dart';
 import 'package:rasadyar_chicken/features/common/common.dart';
 import 'package:rasadyar_chicken/features/kill_house/action/logic.dart';
 import 'package:rasadyar_chicken/features/kill_house/action/view.dart';
@@ -66,6 +67,10 @@ sealed class ChickenPages {
    ...JahadPages.pages,
    //endregion

+    //region City Poultry Pages
+    ...CityPoultryPages.pages,
+    //endregion
+
    //region Poultry Farm Inspection
    GetPage(
      name: ChickenRoutes.poultryFarmInspectionHome,
--- a/packages/chicken/lib/presentation/utils/nested_keys_utils.dart
+++ b/packages/chicken/lib/presentation/utils/nested_keys_utils.dart
@@ -41,6 +41,11 @@ const int cityJahadActionKey = 112;

 //endregion

+//region city poultry Keys
+const int cityPoultryActionKey = 117;
+
+//endregion
+
 //region vet farm Keys
 const int vetFarmActionKey = 113;

--- a/packages/chicken/pubspec.yaml
+++ b/packages/chicken/pubspec.yaml
@@ -1,6 +1,6 @@
 name: rasadyar_chicken
 description: A starting point for Dart libraries or applications.
-version: 1.8.0
+version: 1.9.0

 environment:
  sdk: ^3.10.0
--- a/packages/chicken/test/integration/auth_flow_integration_test.dart
+++ b/packages/chicken/test/integration/auth_flow_integration_test.dart
@@ -3,12 +3,14 @@ import 'package:mocktail/mocktail.dart';
 import 'package:rasadyar_chicken/features/common/data/datasources/remote/auth/auth_remote.dart';
 import 'package:rasadyar_chicken/features/common/data/model/response/user_info/user_info_model.dart';
 import 'package:rasadyar_chicken/features/common/data/model/response/user_profile_model/user_profile_model.dart';
+import 'package:rasadyar_chicken/features/common/data/repositories/auth/auth_repository.dart';
+import 'package:rasadyar_chicken/features/common/data/repositories/auth/auth_repository_imp.dart';


 class MockAuthRemoteDataSource extends Mock implements AuthRemoteDataSource {}

 void main() {
-  late AuthRepositoryImpl authRepository;
+  late AuthRepository authRepository;
  late MockAuthRemoteDataSource mockAuthRemote;

  setUp(() {
--- a/packages/core/lib/data/services/g_service.dart
+++ b/packages/core/lib/data/services/g_service.dart
@@ -65,6 +65,17 @@ class GService extends GetxService {
    return getTargetPage(module)?.route;
  }

+  Future<void> clearRoute(Module module) async {
+    AppModel model = box.values.first;
+    TargetPage? targetPage = model.targetPages?.firstWhereOrNull(
+      (element) => element.module == module,
+    );
+    if (targetPage != null) {
+      targetPage.route = null;
+      model.save();
+    }
+  }
+
  Future<void> saveRole(Module module, String role) async {
    AppModel model = box.values.first;
    TargetPage? targetPage = model.targetPages?.firstWhere(
--- a/packages/core/lib/presentation/common/assets.gen.dart
+++ b/packages/core/lib/presentation/common/assets.gen.dart
@@ -229,6 +229,9 @@ class $AssetsIconsGen {
  /// File path: assets/icons/inspection.svg
  SvgGenImage get inspection => const SvgGenImage('assets/icons/inspection.svg');

+  /// File path: assets/icons/inspection_poultry.svg
+  SvgGenImage get inspectionPoultry => const SvgGenImage('assets/icons/inspection_poultry.svg');
+
  /// File path: assets/icons/key.svg
  SvgGenImage get key => const SvgGenImage('assets/icons/key.svg');

@@ -456,6 +459,7 @@ class $AssetsIconsGen {
    information,
    inside,
    inspection,
+    inspectionPoultry,
    key,
    liveStock,
    lock,
@@ -748,6 +752,9 @@ class $AssetsVecGen {
  /// File path: assets/vec/inspection.svg.vec
  SvgGenImage get inspectionSvg => const SvgGenImage.vec('assets/vec/inspection.svg.vec');

+  /// File path: assets/vec/inspection_poultry.svg.vec
+  SvgGenImage get inspectionPoultrySvg => const SvgGenImage.vec('assets/vec/inspection_poultry.svg.vec');
+
  /// File path: assets/vec/key.svg.vec
  SvgGenImage get keySvg => const SvgGenImage.vec('assets/vec/key.svg.vec');

@@ -975,6 +982,7 @@ class $AssetsVecGen {
    informationSvg,
    insideSvg,
    inspectionSvg,
+    inspectionPoultrySvg,
    keySvg,
    liveStockSvg,
    lockSvg,
--- a/packages/core/lib/presentation/widget/dialog/update_dialog.dart
+++ b/packages/core/lib/presentation/widget/dialog/update_dialog.dart
@@ -1,13 +1,35 @@
 import 'dart:io';

+import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';

-Future<void> requiredUpdateDialog({required Future<void> Function() onConfirm}) async {
+Future<void> requiredUpdateDialog({
+  required Future<void> Function() onConfirm,
+  required List<String>? changes,
+}) async {
  await Get.defaultDialog(
    barrierDismissible: false,
    onWillPop: () async => false,
    title: 'بروزرسانی',
-    middleText: 'برای استفاده از امکانات برنامه لطفا برنامه را بروز رسانی نمایید.',
+    content: Container(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        spacing: 8.h,
+        children:
+            changes
+                ?.map(
+                  (e) => Text(
+                    e,
+                    
+                    style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
+                  ),
+                )
+                .toList() ??
+            [],
+      ),
+    ),
+    middleText:
+        'برای استفاده از امکانات برنامه لطفا برنامه را بروز رسانی نمایید.',
    confirm: RElevated(
      height: 40.h,
      width: 150.w,
@@ -28,12 +50,15 @@ Future<void> requiredUpdateDialog({required Future<void> Function() onConfirm})
  );
 }

-Future<void> optionalUpdateDialog({required Future<void> Function() onConfirm}) async {
+Future<void> optionalUpdateDialog({
+  required Future<void> Function() onConfirm,
+}) async {
  await Get.defaultDialog(
    barrierDismissible: false,
    onWillPop: () async => false,
    title: 'بروزرسانی',
-    middleText: 'برای استفاده از امکانات جدید برنامه می توانید آن را بروزرسانی نمایید.',
+    middleText:
+        'برای استفاده از امکانات جدید برنامه می توانید آن را بروزرسانی نمایید.',
    confirm: RElevated(
      height: 40.h,
      width: 150.w,
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1394,7 +1394,7 @@ packages:
      path: "packages/chicken"
      relative: true
    source: path
-    version: "1.8.0"
+    version: "1.9.0"
  rasadyar_core:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: rasadyar_app
 description: "A new Flutter project."
 publish_to: "none"
-version: 1.3.41+37
+version: 1.3.43+39

 environment:
  sdk: ^3.10.0
Author	SHA1	Message	Date
mr.mojtaba	b7b203ee51	refactor: update changeUserRole method to accept named parameters for improved clarity and modify ProfilePage to utilize new method signature	2025-12-30 09:40:15 +03:30
mr.mojtaba	71123c3520	refactor: enhance AuthLogic to handle user roles and improve navigation based on role selection; format code for better readability in ProfilePage	2025-12-30 09:16:07 +03:30
mr.mojtaba	9e2e7845c8	feat: integrate GService into various root logic classes and log user roles during initialization	2025-12-29 16:44:36 +03:30
mr.mojtaba	4a96dbe2b8	chore: update app version to 1.9.0, change Flutter build mode to debug, and add changes field to app info model for update dialogs	2025-12-29 16:23:19 +03:30
mr.mojtaba	b290094164	chore: update Flutter build mode to release and increment version number in pubspec.yaml to 1.9.0	2025-12-29 14:40:25 +03:30
mr.mojtaba	f830e7d76d	chore: update version number in pubspec.yaml to 1.3.43+39	2025-12-29 14:27:31 +03:30
mr.mojtaba	9910de4ed8	feat: integrate city poultry feature by adding routes, DI setup, and updating UI components to reflect new data handling and localization changes	2025-12-29 14:26:12 +03:30
mr.mojtaba	edde363b6d	chore: change Flutter build mode to debug in local.properties, add strVersion observable in SplashLogic, and update splash view layout to display version information	2025-12-29 13:02:57 +03:30
mr.mojtaba	ed113d8702	chore: change Flutter build mode from debug to release in local.properties	2025-12-29 12:07:20 +03:30
mr.mojtaba	7d6be4f3f4	chore: update version number in pubspec.yaml and local.properties to 1.3.42+38	2025-12-29 11:38:51 +03:30
mr.mojtaba	57704399b9	refactor: optimize module navigation delay and clean up unused code in splash and auth logic fix : role access to chicken app	2025-12-29 11:21:54 +03:30
mr.mojtaba	12cdc1a5e8	refactor: update auth repository implementation in integration tests by changing type from AuthRepositoryImpl to AuthRepository and adding necessary imports	2025-12-29 10:13:04 +03:30