Allowed ErrorWindow to close properly.

PcgsInvUi/ViewModels/ErrorWindowViewModel.cs

@@ -1,6 +1,4 @@
 using System.Reactive;
-using System.Security.Principal;
-using PcgsInvUi.Views;
 using ReactiveUI;
 
 namespace PcgsInvUi.ViewModels; 
@@ -11,16 +9,15 @@ public class ErrorWindowViewModel : ViewModelBase {
         get => _message;
         set => this.RaiseAndSetIfChanged(ref _message, value);
     }
-
     private string _message;
 
-    public ReactiveCommand<ErrorWindow, Unit> CloseCommand { get; }
+    public ReactiveCommand<Unit, object> CloseCommand { get; }
     
     public ErrorWindowViewModel(string message)
     {
         _message = message;
 
-        CloseCommand = ReactiveCommand.Create<ErrorWindow>(window => window.Close());
+        CloseCommand = ReactiveCommand.Create(() => (object)false);
     }
 
 }

PcgsInvUi/ViewModels/MainWindowViewModel.cs

@@ -42,7 +42,7 @@ public class MainWindowViewModel : ViewModelBase {
     public Interaction<DeleteWindowViewModel, Boolean> ShowDeleteWindow { get; }
     public ReactiveCommand<Unit, Unit> ExportCommand { get; }
     public Interaction<Unit, Uri> ShowExportWindow { get; }
-    public Interaction<ErrorWindowViewModel, Unit> ShowErrorWindow { get; }
+    public Interaction<ErrorWindowViewModel, bool> ShowErrorWindow { get; }
 
     private ViewModelBase _sideContent;
     private Coin? _selectedCoin;
@@ -57,7 +57,7 @@ public class MainWindowViewModel : ViewModelBase {
         TotalValue = DisplayedList.Sum(x => x.TotalPrice);
         
         // Set up the ability to show the error window.
-        ShowErrorWindow = new Interaction<ErrorWindowViewModel, Unit>();
+        ShowErrorWindow = new Interaction<ErrorWindowViewModel, bool>();
         
         // Set up the ability to open the delete window.
         ShowDeleteWindow = new Interaction<DeleteWindowViewModel, bool>();
@@ -117,6 +117,7 @@ public class MainWindowViewModel : ViewModelBase {
             });
 
         // Change TotalValue anytime SelectedCoin.TotalPrice changes.
+        // TODO: fix this. Should update when a coin within the collection is changed.
         // Possible null deref - how do you remove this?
         this.WhenAnyValue(x => x.SelectedCoin.TotalPrice)
             .Subscribe(_ => TotalValue = ConnectedCoinDatabase.Collection.Sum(x => x.TotalPrice));

PcgsInvUi/Views/ErrorWindow.axaml

@@ -12,8 +12,7 @@
                Margin="15"
                Content="{Binding DisplayedMessage}" />
         <Button Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom"
-                Margin="10" Name="CloseButton" IsEnabled="False"
-                Content="Use X button" Command="{Binding CloseCommand, Mode=OneWay}" 
-                CommandParameter="{Binding ElementName=NameErrorWindow}"/>
+                Margin="10" Name="CloseButton" IsEnabled="True"
+                Content="OK" Command="{Binding CloseCommand, Mode=OneWay}" />
     </Grid>
 </Window>

PcgsInvUi/Views/ErrorWindow.axaml.cs

@@ -1,5 +1,7 @@
+using System;
 using Avalonia.ReactiveUI;
 using PcgsInvUi.ViewModels;
+using ReactiveUI;
 
 namespace PcgsInvUi.Views; 
 
@@ -7,5 +9,6 @@ public partial class ErrorWindow : ReactiveWindow<ErrorWindowViewModel> {
     public ErrorWindow()
     {
         InitializeComponent();
+        this.WhenActivated(d => d(ViewModel!.CloseCommand.Subscribe(Close)));
     }
-}
+}

PcgsInvUi/Views/MainWindow.axaml.cs

@@ -18,7 +18,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel> {
         // this.WhenActivated(d => d(ViewModel!.ShowFindWindow.RegisterHandler(ShowFindWindowAsync)));
     }
 
-    private async Task ShowDeleteWindowAsync(InteractionContext<DeleteWindowViewModel, Boolean> interaction) {
+    private async Task ShowDeleteWindowAsync(InteractionContext<DeleteWindowViewModel, bool> interaction) {
         var window = new DeleteWindow();
         window.DataContext = interaction.Input;
 
@@ -53,11 +53,11 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel> {
         }
     }
     
-    private async Task ShowErrorWindowAsync(InteractionContext<ErrorWindowViewModel, Unit> interaction) {
+    private async Task ShowErrorWindowAsync(InteractionContext<ErrorWindowViewModel, bool> interaction) {
         var window = new ErrorWindow();
         window.DataContext = interaction.Input;
 
-        await window.ShowDialog(this);
-        interaction.SetOutput(Unit.Default);
+        var result = await window.ShowDialog<bool>(this);
+        interaction.SetOutput(result);
     }
-}
+}