Update CreateEventViewModel.cs (#1730)

TrashMob-eco · Oct 21, 2024 · 85e993d · 85e993d
1 parent 36d52dc
commit 85e993d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/TrashMobMobile/ViewModels/CreateEventViewModel.cs b/TrashMobMobile/ViewModels/CreateEventViewModel.cs
@@ -231,7 +231,7 @@ private void ValidateCurrentStep(object sender, PropertyChangedEventArgs e)
                 break;
             //Step 2 validation 
             case 1:
-                if (!string.IsNullOrEmpty(EventViewModel.Address.City))
+                if (!string.IsNullOrEmpty(EventViewModel.Address.City) && !string.IsNullOrEmpty(EventViewModel.Address.Region))
                 {
                     IsStepValid = true;
                 }
@@ -305,7 +305,7 @@ public async Task SetCurrentStep(StepType step)
         }
         else
         {
-            if (CurrentStep < Steps.Length - 1)
+            if (CurrentStep < Steps.Length)
             {
                 switch (CurrentStep)
                 {
@@ -318,13 +318,13 @@ public async Task SetCurrentStep(StepType step)
 
                         await LoadPartners();
                         await LoadLitterReports();
-                        
+
                         break;
                     }
-                    case 6:
+                    case 5:
                         //Evaluate displaying a confirmation text
                         CloseCommand.Execute(null);
-                        break;
+                        return;
                 }
 
                 CurrentStep++;
@@ -333,7 +333,7 @@ public async Task SetCurrentStep(StepType step)
             }
         }
 
-        CanGoBack = CurrentStep != 0 && CurrentStep != 4;
+        CanGoBack = CurrentStep != 0 && CurrentStep != 4 && CurrentStep != 5;
     }
 
     // This is only for the map point