From 91ea7a443c21f2bebd75b964045802ffdce57985 Mon Sep 17 00:00:00 2001
From: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>
Date: Wed, 6 Apr 2022 19:12:27 +0300
Subject: [PATCH] More cleanup

---
 .../ViewModels/Components/DashboardViewModel.cs              | 2 +-
 DiscordChatExporter.Gui/Views/Components/DashboardView.xaml  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs b/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs
index 3e97520..76e4bef 100644
--- a/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs
+++ b/DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs
@@ -67,7 +67,7 @@ public class DashboardViewModel : PropertyChangedBase
         Progress.Bind(o => o.Current, (_, _) => NotifyOfPropertyChange(() => IsProgressIndeterminate));
     }
 
-    public void OnViewFullyLoaded()
+    public void OnViewLoaded()
     {
         if (_settingsService.LastToken is not null)
         {
diff --git a/DiscordChatExporter.Gui/Views/Components/DashboardView.xaml b/DiscordChatExporter.Gui/Views/Components/DashboardView.xaml
index 3fe8cc9..cdf5595 100644
--- a/DiscordChatExporter.Gui/Views/Components/DashboardView.xaml
+++ b/DiscordChatExporter.Gui/Views/Components/DashboardView.xaml
@@ -13,6 +13,7 @@
     xmlns:s="https://github.com/canton7/Stylet"
     d:DataContext="{d:DesignInstance Type=components:DashboardViewModel}"
     FocusManager.FocusedElement="{Binding ElementName=TokenValueTextBox}"
+    Loaded="{s:Action OnViewLoaded}"
     mc:Ignorable="d">
     <UserControl.Resources>
         <CollectionViewSource x:Key="AvailableChannelsViewSource" Source="{Binding AvailableChannels, Mode=OneWay}">
@@ -26,7 +27,7 @@
         </CollectionViewSource>
     </UserControl.Resources>
 
-    <Grid Loaded="{s:Action OnViewFullyLoaded}">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -356,4 +357,4 @@
             </Button>
         </Grid>
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file