From 5a6d96ca97d90685f2c913d87a2f62a74556597d Mon Sep 17 00:00:00 2001
From: Nouredeen06 <nouredeen.ghazal42@gmail.com>
Date: Thu, 26 Mar 2026 20:42:15 +0300
Subject: [PATCH] Restore Point

---
 Clario/Theme/AppTheme.axaml             |  3 +++
 Clario/ViewModels/AccountsViewModel.cs  |  4 ++--
 Clario/ViewModels/BudgetViewModel.cs    | 12 ++++++++++--
 Clario/ViewModels/DashboardViewModel.cs |  4 ++--
 Clario/Views/BudgetView.axaml           |  4 ++--
 Clario/Views/MainWindow.axaml           |  1 -
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Clario/Theme/AppTheme.axaml b/Clario/Theme/AppTheme.axaml
index 9cf1f5c..f72f39e 100644
--- a/Clario/Theme/AppTheme.axaml
+++ b/Clario/Theme/AppTheme.axaml
@@ -306,18 +306,21 @@
         <Setter Property="Background" Value="{DynamicResource BadgeBgGreen}" />
         <Setter Property="CornerRadius" Value="{DynamicResource RadiusPill}" />
         <Setter Property="Padding" Value="{DynamicResource BadgePadding}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource AccentGreen}"/>
     </Style>
 
     <Style Selector="Border.badge-red">
         <Setter Property="Background" Value="{DynamicResource BadgeBgRed}" />
         <Setter Property="CornerRadius" Value="{DynamicResource RadiusPill}" />
         <Setter Property="Padding" Value="{DynamicResource BadgePadding}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource AccentRed}"/>
     </Style>
 
     <Style Selector="Border.badge-yellow">
         <Setter Property="Background" Value="{DynamicResource BadgeBgYellow}" />
         <Setter Property="CornerRadius" Value="{DynamicResource RadiusPill}" />
         <Setter Property="Padding" Value="{DynamicResource BadgePadding}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource AccentYellow}"/>
     </Style>
 
     <Style Selector="Border.badge-blue">
diff --git a/Clario/ViewModels/AccountsViewModel.cs b/Clario/ViewModels/AccountsViewModel.cs
index 2ae4d6d..35b8ede 100644
--- a/Clario/ViewModels/AccountsViewModel.cs
+++ b/Clario/ViewModels/AccountsViewModel.cs
@@ -17,7 +17,7 @@ public partial class AccountsViewModel : ViewModelBase
     public required List<Transaction> Transactions = new();
     [ObservableProperty] private ObservableCollection<Account> _visibleAccounts = new();
     [ObservableProperty] private decimal _totalBalance = 0;
-    [ObservableProperty] private Account _selectedAccount;
+    [ObservableProperty] private Account? _selectedAccount;
 
     public AccountsViewModel()
     {
@@ -28,7 +28,7 @@ public partial class AccountsViewModel : ViewModelBase
     {
         FetchAndProcessAccountInfo();
         GroupAccounts();
-        SelectedAccount = VisibleAccounts.First(x => !x.GroupHeader);
+        SelectedAccount = VisibleAccounts.FirstOrDefault(x => !x.GroupHeader);
     }
 
     private void FetchAndProcessAccountInfo()
diff --git a/Clario/ViewModels/BudgetViewModel.cs b/Clario/ViewModels/BudgetViewModel.cs
index 50e98f0..2568cf6 100644
--- a/Clario/ViewModels/BudgetViewModel.cs
+++ b/Clario/ViewModels/BudgetViewModel.cs
@@ -68,8 +68,16 @@ public partial class BudgetViewModel : ViewModelBase
 
     public async Task Initialize()
     {
-        await ProcessBudgets();
-        ProcessChartData();
+        try
+        {
+            await ProcessBudgets();
+            ProcessChartData();
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine(e);
+            throw;
+        }
     }
 
     private void ProcessChartData()
diff --git a/Clario/ViewModels/DashboardViewModel.cs b/Clario/ViewModels/DashboardViewModel.cs
index 7d9880d..9d3d879 100644
--- a/Clario/ViewModels/DashboardViewModel.cs
+++ b/Clario/ViewModels/DashboardViewModel.cs
@@ -95,8 +95,8 @@ public partial class DashboardViewModel : ViewModelBase
             .Sum(x => x.Amount);
         try
         {
-            _monthlyIncomeChange = Math.Round((MonthlyIncome / lastMonthIncome) - 1, 2);
-            _monthlyExpensesChange = Math.Round((MonthlyExpenses / lastMonthExpenses) - 1, 2);
+            _monthlyIncomeChange = Math.Round((MonthlyIncome / ((lastMonthIncome == 0) ? 1 : lastMonthIncome)) - 1, 2);
+            _monthlyExpensesChange = Math.Round((MonthlyExpenses / ((lastMonthExpenses == 0) ? 1 : lastMonthExpenses)) - 1, 2);
         }
         catch (Exception e)
         {
diff --git a/Clario/Views/BudgetView.axaml b/Clario/Views/BudgetView.axaml
index 11aef82..4c430c0 100644
--- a/Clario/Views/BudgetView.axaml
+++ b/Clario/Views/BudgetView.axaml
@@ -225,8 +225,8 @@
                                             <Grid ColumnDefinitions="*,Auto">
                                                 <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="6">
                                                     <Border Classes.badge-green="{Binding IsOnTrack}"
-                                                            Classes.badge-warning="{Binding IsWarning}"
-                                                            Classes.badge-over="{Binding IsOverBudget}"
+                                                            Classes.badge-yellow="{Binding IsWarning}"
+                                                            Classes.badge-red="{Binding IsOverBudget}"
                                                             CornerRadius="20"
                                                             Padding="6,2">
                                                         <StackPanel Orientation="Horizontal" Spacing="4">
diff --git a/Clario/Views/MainWindow.axaml b/Clario/Views/MainWindow.axaml
index 1aa239d..20bd1e5 100644
--- a/Clario/Views/MainWindow.axaml
+++ b/Clario/Views/MainWindow.axaml
@@ -7,7 +7,6 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         MinWidth="1000" MinHeight="600"
         x:Class="Clario.Views.MainWindow"
-        Icon="/Assets/avalonia-logo.ico"
         Title="Clario"
         x:CompileBindings="False">
     <ContentControl Content="{Binding}" />