Merge pull request #232 from TheAxelander/pre-release

Merge changes for version 1.8.1
TheAxelander · Mar 17, 2024 · c32fb37 · c32fb37
2 parents a0d7af4 + a9f77ee
commit c32fb37
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.8.1 (2024-03-17)
+
+### :beetle: Bug Fixes
+
+* Duplicate check on Import Page was showing wrong Account. Now only Transactions of the selected target Account will be considered during the analysis [#230](https://github.com/TheAxelander/OpenBudgeteer/issues/230)
+* Bucket Movements were shown with Account `(Inactive)` [#231](https://github.com/TheAxelander/OpenBudgeteer/issues/231)
+
 ## 1.8 (2024-03-16)
 
 ### :warning: Breaking Changes

diff --git a/OpenBudgeteer.Blazor/Shared/MainLayout.razor b/OpenBudgeteer.Blazor/Shared/MainLayout.razor
@@ -16,7 +16,7 @@
         </button>
         <span class="navbar-brand flex-fill ms-2 fs-5">OpenBudgeteer</span>
         <span class="navbar-text ms-3 d-none d-md-block">Database: @CurrentDatabase</span>
-        <span class="navbar-text ms-3 d-none d-md-block">Version: 1.8 (<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)</span>
+        <span class="navbar-text ms-3 d-none d-md-block">Version: 1.8.1 (<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)</span>
     </div>
 </header>
 <div class="container-fluid">

diff --git a/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs b/OpenBudgeteer.Core/ViewModels/EntityViewModels/TransactionViewModel.cs
@@ -361,7 +361,7 @@ public static TransactionViewModel CreateEmpty(IServiceManager serviceManager)
             {
                 Id = Guid.Empty,
                 AccountId = Guid.Empty,
-                Account = new Account(),
+                Account = new Account(){ IsActive = 1},
                 Amount = bucketMovement.Amount,
                 Memo = "Bucket Movement",
                 Payee = string.Empty,

diff --git a/OpenBudgeteer.Core/ViewModels/PageViewModels/ImportPageViewModel.cs b/OpenBudgeteer.Core/ViewModels/PageViewModels/ImportPageViewModel.cs
@@ -407,7 +407,9 @@ private async Task DuplicateCheckOnParsedRecordsAsync()
     {
         await Task.Run(() =>
         {
-            var transactions = ServiceManager.BankTransactionService.GetAll().ToList();
+            var transactions = ServiceManager.BankTransactionService
+                .GetFromAccount(SelectedImportProfile.Account.AccountId)
+                .ToList();
             var parsedRecords = ParsedRecords
                 .Where(i => i.IsValid)
                 .ToList();

diff --git a/SECURITY.md b/SECURITY.md
@@ -4,9 +4,9 @@
 
 | Version     | Supported          |
 |-------------| ------------------ |
-| 1.8         | :white_check_mark: |
+| 1.8.1       | :white_check_mark: |
 | pre-release | :white_check_mark: |
-| < 1.8       | :x:                |
+| < 1.8.1     | :x:                |
 
 ## Reporting a Vulnerability