From 62f0e1b00daf47b14b688c702756d82e6b3da009 Mon Sep 17 00:00:00 2001
From: Chernykh Aleksandr <dernet4@gmail.com>
Date: Sat, 2 May 2026 06:42:31 +0300
Subject: [PATCH 1/4] commit

---
 src/KeyKeeper/Views/ErrorDialog.axaml | 79 +++++++++++++++++++--------
 1 file changed, 56 insertions(+), 23 deletions(-)

diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml b/src/KeyKeeper/Views/ErrorDialog.axaml
index 03246d0..13f41ad 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml
@@ -1,31 +1,64 @@
-<Window xmlns="https://github.com/avaloniaui"
+<Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="KeyKeeper.Views.ErrorDialog"
-        Width="350" Height="120"
-        Background="White"
+        Width="400" Height="180"
+        WindowStartupLocation="CenterOwner"
+        Background="#F9F9F9"
         CanResize="False"
-        Title="Error">
+        Title="Access Error"
+        TransparencyLevelHint="AcrylicBlur"
+        ExtendClientAreaToDecorationsHint="True">
 
-    <Grid Margin="10" RowDefinitions="*,Auto">
-        <TextBlock x:Name="MessageText"
-                   Grid.Row="0"
-                   Foreground="Red"
-                   FontSize="18"
-                   TextWrapping="Wrap" />
+    <Grid Margin="20" RowDefinitions="*, Auto">
+        <!-- Main Content -->
+        <StackPanel Grid.Row="0" Orientation="Horizontal" Spacing="15" VerticalAlignment="Center">
+            <!-- Error Icon (Material Design Style) -->
+            <Path Data="M12,2C6.47,2 2,6.47 2,12C2,17.53 6.47,22 12,22C17.53,22 22,17.53 22,12C22,6.47 17.53,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z"
+                  Fill="#E74C3C"
+                  Width="40" Height="40"
+                  Stretch="Uniform" />
+            
+            <StackPanel VerticalAlignment="Center" Width="280">
+                <TextBlock Text="Oops! Something went wrong" 
+                           FontWeight="Bold" 
+                           FontSize="16" 
+                           Foreground="#333"
+                           Margin="0,0,0,4"/>
+                <TextBlock x:Name="MessageText"
+                           Foreground="#666"
+                           FontSize="14"
+                           TextWrapping="Wrap"
+                           LineHeight="20"/>
+            </StackPanel>
+        </StackPanel>
+
+        <!-- Action Button -->
         <Button Grid.Row="1"
-                Content="OK"
-                HorizontalAlignment="Center"
-                Margin="0,10,0,0"
+                Content="Got it"
                 Click="Ok_Click"
-                Background="#aaa" />
-        <Grid.Styles>
-            <Style Selector="Button /template/ ContentPresenter">
-                <Setter Property="Foreground" Value="#333" />
-            </Style>
-            <Style Selector="Button:pointerover /template/ ContentPresenter">
-                <Setter Property="Background" Value="#ccc" />
-                <Setter Property="Foreground" Value="#444" />
-            </Style>
-        </Grid.Styles>
+                HorizontalAlignment="Right"
+                Padding="25,8"
+                BorderThickness="0"
+                CornerRadius="4"
+                Cursor="Hand">
+            <Button.Styles>
+                <Style Selector="Button">
+                    <Setter Property="Background" Value="#E0E0E0"/>
+                    <Setter Property="Foreground" Value="#333"/>
+                    <Setter Property="Transitions">
+                        <Transitions>
+                            <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" />
+                            <BrushTransition Property="Background" Duration="0:0:0.2" />
+                        </Transitions>
+                    </Setter>
+                </Style>
+                <Style Selector="Button:pointerover /template/ ContentPresenter">
+                    <Setter Property="Background" Value="#D5D5D5"/>
+                </Style>
+                <Style Selector="Button:pressed">
+                    <Setter Property="RenderTransform" Value="scale(0.95)"/>
+                </Style>
+            </Button.Styles>
+        </Button>
     </Grid>
 </Window>

From 0a36ad69c1f86f4eb31649587a66c3f54c552737 Mon Sep 17 00:00:00 2001
From: Chernykh Aleksandr <dernet4@gmail.com>
Date: Sat, 2 May 2026 06:42:36 +0300
Subject: [PATCH 2/4] commit

---
 src/KeyKeeper/Views/ErrorDialog.axaml.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml.cs b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
index ef17520..c3c380a 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml.cs
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 
 namespace KeyKeeper.Views;
@@ -8,12 +8,10 @@ public partial class ErrorDialog : Window
     public ErrorDialog(string message)
     {
         InitializeComponent();
-        MinWidth = 400;
-        MinHeight = 200;
         MessageText.Text = message;
     }
 
-    private void Ok_Click(object sender, RoutedEventArgs e)
+    private void Ok_Click(object? sender, RoutedEventArgs e)
     {
         Close();
     }

From 5a7dfc7f9add4b67037c417a4e21aea118b45f2e Mon Sep 17 00:00:00 2001
From: Slavasil <subvia@proton.me>
Date: Sun, 3 May 2026 16:02:20 +0300
Subject: [PATCH 3/4] make error title customizable

---
 src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs | 10 +++++-----
 src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs |  2 +-
 src/KeyKeeper/Views/ErrorDialog.axaml                 |  2 +-
 src/KeyKeeper/Views/ErrorDialog.axaml.cs              |  3 ++-
 src/KeyKeeper/Views/RepositoryWindow.axaml.cs         |  4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs b/src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs
index 11745f2..f3367fa 100644
--- a/src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs
+++ b/src/KeyKeeper/ViewModels/LockedRepositoryViewModel.cs
@@ -37,24 +37,24 @@ public partial class LockedRepositoryViewModel : ViewModelBase
             if (e.Message == PassStoreFileException.ContentHMACMismatch.Message ||
                 e.Message == PassStoreFileException.InvalidBeginMarker.Message)
             {
-                await parent.ShowErrorPopup("Incorrect password or corrupted file");
+                await parent.ShowErrorPopup("Incorrect password or corrupted file", "Check password");
             } else if (e.Message == PassStoreFileException.UnexpectedEndOfFile.Message ||
                        e.Message == PassStoreFileException.IncorrectMagicNumber.Message ||
                        e.Message == PassStoreFileException.InvalidCryptoHeader.Message ||
                        e.Message == PassStoreFileException.InvalidPassStoreEntry.Message)
             {
-                await parent.ShowErrorPopup("Corrupted file");
+                await parent.ShowErrorPopup("Corrupted file", "Password store error");
             } else if (e.Message == PassStoreFileException.UnsupportedVersion.Message)
             {
-                await parent.ShowErrorPopup("Unsupported store file version");
+                await parent.ShowErrorPopup("Unsupported store file version", "Password store error");
             } else
             {
-                await parent.ShowErrorPopup("Unknown password store unlock error");
+                await parent.ShowErrorPopup("Unknown unlock error", "Password store error");
             }
         } catch (Exception e)
         {
             Console.WriteLine(e);
-            await parent.ShowErrorPopup("Cannot open the password store file");
+            await parent.ShowErrorPopup("Cannot open the password store file", "Password store error");
         }
     }
 }
\ No newline at end of file
diff --git a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
index 48fab08..c17d4db 100644
--- a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
+++ b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
@@ -16,7 +16,7 @@ public partial class RepositoryWindowViewModel : ViewModelBase
     private DateTime _timerStart;
     private string _lockTimerDisplay = string.Empty;
 
-    public Func<string, Task> ShowErrorPopup;
+    public Func<string, string, Task> ShowErrorPopup;
 
     public object CurrentPage
     {
diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml b/src/KeyKeeper/Views/ErrorDialog.axaml
index 13f41ad..f21f499 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml
@@ -19,7 +19,7 @@
                   Stretch="Uniform" />
             
             <StackPanel VerticalAlignment="Center" Width="280">
-                <TextBlock Text="Oops! Something went wrong" 
+                <TextBlock x:Name="MessageTitle"
                            FontWeight="Bold" 
                            FontSize="16" 
                            Foreground="#333"
diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml.cs b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
index c3c380a..ebcf8a0 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml.cs
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
@@ -5,10 +5,11 @@ namespace KeyKeeper.Views;
 
 public partial class ErrorDialog : Window
 {
-    public ErrorDialog(string message)
+    public ErrorDialog(string message, string title = "Oops! Something went wrong")
     {
         InitializeComponent();
         MessageText.Text = message;
+        MessageTitle.Text = title;
     }
 
     private void Ok_Click(object? sender, RoutedEventArgs e)
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index e3d7e08..02e199e 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -23,9 +23,9 @@ public partial class RepositoryWindow : Window
         MinHeight = 500;
 
         DataContext = model;
-        model.ShowErrorPopup = async (string message) =>
+        model.ShowErrorPopup = async (string message, string title) =>
         {
-            await new ErrorDialog(message).ShowDialog(this);
+            await new ErrorDialog(message, title).ShowDialog(this);
         };
     }
 

From 72997f832ec1f2255dbb7d389e407ade08853c13 Mon Sep 17 00:00:00 2001
From: Slavasil <subvia@proton.me>
Date: Sun, 3 May 2026 18:31:07 +0300
Subject: [PATCH 4/4] close the error dialog by pressing Enter/Esc

---
 src/KeyKeeper/Views/ErrorDialog.axaml    | 17 ++++++++++-------
 src/KeyKeeper/Views/ErrorDialog.axaml.cs | 12 ++++++++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml b/src/KeyKeeper/Views/ErrorDialog.axaml
index f21f499..89faf82 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml
@@ -32,13 +32,16 @@
             </StackPanel>
         </StackPanel>
 
-        <!-- Action Button -->
-        <Button Grid.Row="1"
-                Content="Got it"
-                Click="Ok_Click"
-                HorizontalAlignment="Right"
-                Padding="25,8"
-                BorderThickness="0"
+        <!-- Action Button -->
+        <Button Grid.Row="1"
+                x:Name="OkButton"
+                Content="Got it"
+                Click="Ok_Click"
+                IsDefault="True"
+                IsCancel="True"
+                HorizontalAlignment="Right"
+                Padding="25,8"
+                BorderThickness="0"
                 CornerRadius="4"
                 Cursor="Hand">
             <Button.Styles>
diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml.cs b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
index ebcf8a0..584597d 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml.cs
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
@@ -1,5 +1,7 @@
-using Avalonia.Controls;
+using System;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Threading;
 
 namespace KeyKeeper.Views;
 
@@ -16,4 +18,10 @@ public partial class ErrorDialog : Window
     {
         Close();
     }
-}
\ No newline at end of file
+
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        OkButton.Focus();
+    }
+}