From 0f1b2fbfc20058d906334d39995fbd16db169d99 Mon Sep 17 00:00:00 2001
From: BisratHailu <bisrathailu397@gmail.com>
Date: Thu, 7 May 2026 16:57:19 +0300
Subject: [PATCH] fix: Apply UAT fixes

---
 .../views/profile_detail/profile_detail_view.dart  | 14 +++++++-------
 .../profile_detail/profile_detail_viewmodel.dart   |  9 ++++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/ui/views/profile_detail/profile_detail_view.dart b/lib/ui/views/profile_detail/profile_detail_view.dart
index 1583713..780a963 100644
--- a/lib/ui/views/profile_detail/profile_detail_view.dart
+++ b/lib/ui/views/profile_detail/profile_detail_view.dart
@@ -40,7 +40,7 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
       'last_name': lastNameController.text,
       'country': viewModel.selectedCountry,
       'first_name': firstNameController.text,
-      'occupation': occupationController.text,
+      'occupation': viewModel.selectedOccupation,
       'birth_day': DateFormat('yyyy-MM-dd').format(DateTime.now()),
     };
 
@@ -67,7 +67,8 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
       );
 
   void _checkRegion(ProfileDetailViewModel viewModel){
-    if(viewModel.checkRegion(viewModel.user?.region ?? '')){
+    bool region = viewModel.checkRegion(region:viewModel.user?.region ?? 'Addis Ababa',country:viewModel.user?.country ?? 'Ethiopia' );
+    if(region){
       viewModel.setSelectedRegion(viewModel.user?.region ?? 'Addis Ababa');
     }else{
       regionController.text = viewModel.user?.region ?? '';
@@ -78,13 +79,12 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
   void _onModelReady(ProfileDetailViewModel viewModel) {
     phoneNumberController.text = '251900000000';
     emailController.text = viewModel.user?.email ?? '';
-
     lastNameController.text = viewModel.user?.lastName ?? '';
     firstNameController.text = viewModel.user?.firstName ?? '';
-    occupationController.text = viewModel.user?.occupation ?? '';
     _checkRegion(viewModel);
     viewModel.clearUserData();
-    viewModel.setGender(viewModel.user?.gender ?? '');
+    viewModel.setSelectedGender(viewModel.user?.gender ?? '');
+    viewModel.setSelectedOccupation(viewModel.user?.occupation ?? '');
     viewModel.setSelectedCountry(viewModel.user?.country ?? 'Ethiopia');
   }
 
@@ -370,7 +370,7 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
   Widget _buildMaleRadioButton(ProfileDetailViewModel viewModel) =>
       RadioGroup<String?>(
           groupValue: viewModel.selectedGender,
-          onChanged: (value) => viewModel.setGender(value ?? ''),
+          onChanged: (value) => viewModel.setSelectedGender(value ?? ''),
           child: _buildMaleRadioTileWrapper(viewModel));
 
   Widget _buildMaleRadioTileWrapper(ProfileDetailViewModel viewModel) =>
@@ -399,7 +399,7 @@ class ProfileDetailView extends StackedView<ProfileDetailViewModel>
   Widget _buildFemaleRadioButton(ProfileDetailViewModel viewModel) =>
       RadioGroup<String?>(
           groupValue: viewModel.selectedGender,
-          onChanged: (value) => viewModel.setGender(value ?? ''),
+          onChanged: (value) => viewModel.setSelectedGender(value ?? ''),
           child: _buildFemaleRadioTileWrapper(viewModel));
 
   Widget _buildFemaleRadioTileWrapper(ProfileDetailViewModel viewModel) =>
diff --git a/lib/ui/views/profile_detail/profile_detail_viewmodel.dart b/lib/ui/views/profile_detail/profile_detail_viewmodel.dart
index c5d43f6..9fc1cd0 100644
--- a/lib/ui/views/profile_detail/profile_detail_viewmodel.dart
+++ b/lib/ui/views/profile_detail/profile_detail_viewmodel.dart
@@ -100,7 +100,7 @@ class ProfileDetailViewModel extends ReactiveViewModel
   }
 
   // Gender
-  void setGender(String value) {
+  void setSelectedGender(String value) {
     _selectedGender = value;
     rebuildUi();
   }
@@ -321,8 +321,11 @@ class ProfileDetailViewModel extends ReactiveViewModel
     'Tigray',
   ];
 
-  bool checkRegion(String value){
-    return getRegions().contains(value);
+  bool checkRegion({required String region,required String country}){
+    if(country == 'Ethiopia'){
+      return getRegions().contains(region);
+    }
+    return false;
   }
 
   void setSelectedRegion(String value) {