From 1c44f686ab1a7518bdf1309b3cf557e44600c01e Mon Sep 17 00:00:00 2001
From: Max Mannstein <max.mannstein@gmail.com>
Date: Tue, 15 Jul 2025 11:19:46 +0200
Subject: [PATCH] Refactor XAML and ViewModel code to comment out not needed UI
 elements and logic for mangopay

---
 .../Controls/Register/Step2ExternalControl.xaml      |  4 ++--
 .../gehGassiApp/Controls/Register/Step3Control.xaml  |  4 ++--
 .../ViewModels/Account/RegisterViewModel.cs          |  4 +++-
 gehGassiApp/gehGassiApp/Views/More/MoreView.xaml     |  4 ++--
 .../gehGassiApp/Views/More/MoreWalkerView.xaml       | 12 ++++++------
 gehGassiApp/gehGassiApp/Views/ProfileView.xaml       |  4 ++--
 gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml |  4 ++--
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml b/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml
index 3462582..c5ef271 100644
--- a/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml
+++ b/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml
@@ -150,7 +150,7 @@
                 <Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedPrivacy}"></Switch>
             </Grid>
 
-            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
+            <!-- <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
                   IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" >
                 <Label Grid.Column="0" Text="{x:Static res:Text.Register_AcceptTermsMangopay}" Style="{StaticResource LinkLabelStyle}" HorizontalOptions="Start" Padding="0,0,0,0" LineBreakMode="TailTruncation">
                     <Label.GestureRecognizers>
@@ -158,7 +158,7 @@
                     </Label.GestureRecognizers>
                 </Label>
                 <Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedTermsMangopay}"></Switch>
-            </Grid>
+            </Grid> -->
         </VerticalStackLayout>
 
         <VerticalStackLayout Spacing="0" IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" Margin="{StaticResource MarginBig}">
diff --git a/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml b/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml
index 937af60..c709204 100644
--- a/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml
+++ b/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml
@@ -117,7 +117,7 @@
                 <Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedPrivacy}"></Switch>
             </Grid>
 
-            <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
+            <!-- <Grid ColumnDefinitions="*,Auto" ColumnSpacing="10"
                   IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" >
                 <Label Grid.Column="0" Text="{x:Static res:Text.Register_AcceptTermsMangopay}" Style="{StaticResource LinkLabelStyle}" HorizontalOptions="Start" Padding="0,0,0,0" LineBreakMode="TailTruncation">
                     <Label.GestureRecognizers>
@@ -125,7 +125,7 @@
                     </Label.GestureRecognizers>
                 </Label>
                 <Switch Grid.Column="1" VerticalOptions="Center" HorizontalOptions="End" IsToggled="{Binding ViewModel.AcceptedTermsMangopay}"></Switch>
-            </Grid>
+            </Grid> -->
         </VerticalStackLayout>
 
         <VerticalStackLayout Spacing="0" IsVisible="{Binding ViewModel.AppUserType, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static enum:AppUserType.DogWalker}}" Margin="{StaticResource MarginBig}">
diff --git a/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs b/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs
index 25046a5..c98e476 100644
--- a/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs
+++ b/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs
@@ -203,7 +203,9 @@ namespace gehGassiApp.ViewModels.Account
                 if (AppUserType == AppUserType.DogOwner)
                     return true;
 
-                if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null)
+                // if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null)
+                //     return true;
+                if (SelectedNationality != null && SelectedMainResidence != null)
                     return true;
 
                 return false;
diff --git a/gehGassiApp/gehGassiApp/Views/More/MoreView.xaml b/gehGassiApp/gehGassiApp/Views/More/MoreView.xaml
index 01d3676..d48dd5c 100644
--- a/gehGassiApp/gehGassiApp/Views/More/MoreView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/More/MoreView.xaml
@@ -476,7 +476,7 @@
                             </Grid.GestureRecognizers>
                         </Grid>
 
-                        <Border Style="{StaticResource Separator}" />
+                        <!-- <Border Style="{StaticResource Separator}" />
 
                         <Grid
                             ColumnDefinitions="24,*,24"
@@ -599,7 +599,7 @@
                             <Grid.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding PayoutsCommand}" />
                             </Grid.GestureRecognizers>
-                        </Grid>
+                        </Grid> -->
 
                         <Border Style="{StaticResource Separator}" />
 
diff --git a/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml b/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml
index cfaebd6..323903a 100644
--- a/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml
@@ -441,7 +441,7 @@
                             </Grid.GestureRecognizers>
                         </Grid>
 
-                        <Border Style="{StaticResource Separator}" />
+                        <!-- <Border Style="{StaticResource Separator}" />
 
                         <Grid
                             ColumnDefinitions="24,*,24"
@@ -484,9 +484,9 @@
                             <Grid.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding BankAccountCommand}" />
                             </Grid.GestureRecognizers>
-                        </Grid>
+                        </Grid> -->
 
-                        <Border Style="{StaticResource Separator}" />
+                        <!-- <Border Style="{StaticResource Separator}" />
 
                         <Grid
                             ColumnDefinitions="24,*,24"
@@ -529,9 +529,9 @@
                             <Grid.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding IdentityProofCommand}" />
                             </Grid.GestureRecognizers>
-                        </Grid>
+                        </Grid> -->
 
-                        <Border Style="{StaticResource Separator}" />
+                        <!-- <Border Style="{StaticResource Separator}" />
 
                         <Grid
                             ColumnDefinitions="24,*,24"
@@ -564,7 +564,7 @@
                             <Grid.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding PayoutsCommand}" />
                             </Grid.GestureRecognizers>
-                        </Grid>
+                        </Grid> -->
 
                         <Border Style="{StaticResource Separator}" />
 
diff --git a/gehGassiApp/gehGassiApp/Views/ProfileView.xaml b/gehGassiApp/gehGassiApp/Views/ProfileView.xaml
index a3b0e7c..ee6a40e 100644
--- a/gehGassiApp/gehGassiApp/Views/ProfileView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/ProfileView.xaml
@@ -442,7 +442,7 @@
                                 SelectedItem="{Binding SelectedMainResidence}" />
                         </Border>
 
-                        <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
+                        <!-- <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
                             <Label
                                 Grid.Column="0"
                                 LineBreakMode="TailTruncation"
@@ -467,7 +467,7 @@
                         <Label
                             Margin="{StaticResource MarginBig}"
                             Style="{StaticResource BodyCaption_GreyDark}"
-                            Text="{x:Static res:Text.Profile_AutoPayout_Desc}" />
+                            Text="{x:Static res:Text.Profile_AutoPayout_Desc}" /> -->
 
                         <ActivityIndicator
                             HorizontalOptions="Center"
diff --git a/gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml b/gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml
index 6bd32c4..4961678 100644
--- a/gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml
+++ b/gehGassiApp/gehGassiApp/Views/ProfileWalkerView.xaml
@@ -500,7 +500,7 @@
                                 SelectedItem="{Binding SelectedMainResidence}" />
                         </Border>
 
-                        <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
+                        <!-- <Grid Margin="{StaticResource MarginVerySmall}" ColumnDefinitions="*,*">
                             <Label
                                 Grid.Column="0"
                                 LineBreakMode="TailTruncation"
@@ -522,7 +522,7 @@
                             </Switch>
                         </Grid>
 
-                        <Label Style="{StaticResource BodyCaption_GreyDark}" Text="{x:Static res:Text.Profile_AutoPayout_Desc}" />
+                        <Label Style="{StaticResource BodyCaption_GreyDark}" Text="{x:Static res:Text.Profile_AutoPayout_Desc}" /> -->
 
                         <ActivityIndicator
                             HorizontalOptions="Center"