From a06381bd2f3ffee03693e4cf309d65356530a6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Manuel=20NIeto=20S=C3=A1nchez=20=28SuperJMN=29?=
 <superjmn@outlook.com>
Date: Wed, 19 Jun 2024 11:51:23 +0200
Subject: [PATCH] Fix validation checkmark always visible

---
 WalletWasabi.Fluent/Controls/TextBox.axaml |  4 +++-
 WalletWasabi.Fluent/Styles/TextBox.axaml   | 12 ++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/WalletWasabi.Fluent/Controls/TextBox.axaml b/WalletWasabi.Fluent/Controls/TextBox.axaml
index 20225a1e67a..c9327c5d892 100644
--- a/WalletWasabi.Fluent/Controls/TextBox.axaml
+++ b/WalletWasabi.Fluent/Controls/TextBox.axaml
@@ -77,11 +77,13 @@
                   </ScrollViewer>
                 </DockPanel>
                 <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="10">
-                    <PathIcon Classes="checkMark checkMarkDataValidation" VerticalAlignment="Center">
+                  <Panel x:Name="CheckmarkHost">
+                    <PathIcon  Classes="checkMark" VerticalAlignment="Center">
                       <Interaction.Behaviors>
                         <CheckMarkVisibilityBehavior />
                       </Interaction.Behaviors>
                     </PathIcon>
+                  </Panel>
                     <ContentPresenter Content="{TemplateBinding InnerRightContent}" />
                   </StackPanel>
               </Grid>
diff --git a/WalletWasabi.Fluent/Styles/TextBox.axaml b/WalletWasabi.Fluent/Styles/TextBox.axaml
index 40cd13cba1e..bedc1c942e1 100644
--- a/WalletWasabi.Fluent/Styles/TextBox.axaml
+++ b/WalletWasabi.Fluent/Styles/TextBox.axaml
@@ -5,19 +5,11 @@
     <Setter Property="Theme" Value="{DynamicResource TextBoxTheme}" />
   </Style>
 
-  <Style Selector="TextBox:not(.hasCheckMark) /template/ PathIcon.checkMark.checkMarkDataValidation">
+  <Style Selector="TextBox:not(.hasCheckMark) /template/ Panel#CheckmarkHost">
     <Setter Property="IsVisible" Value="False" />
   </Style>
 
-  <Style Selector="TextBox.hasCheckMark /template/ PathIcon.checkMark.checkMarkDataValidation">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-  <Style Selector="TextBox:not(.hasCheckMarkBoolean) /template/ PathIcon.checkMark.checkMarkBoolean">
-    <Setter Property="IsVisible" Value="False" />
-  </Style>
-
-  <Style Selector="TextBox.hasCheckMarkBoolean /template/ PathIcon.checkMark.checkMarkBoolean">
+  <Style Selector="TextBox.hasCheckMark /template/ Panel#CheckmarkHost">
     <Setter Property="IsVisible" Value="True" />
   </Style>