Merge pull request #204 from moneymanagerex/view-11-journal

fix account in JournalView
moneymanagerex · Nov 3, 2024 · 0eece8d · 0eece8d
2 parents e0ac292 + f037b4a
commit 0eece8d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/MMEX/View/Journal/JournalView.swift b/MMEX/View/Journal/JournalView.swift
@@ -69,8 +69,10 @@ struct JournalView: View {
             }
         }
         .onAppear {
-            Task { await vm.loadTransactionList() }
-            accountId = (vm.infotableList.defaultAccountId.readyValue ?? nil) ?? DataId.void
+            Task {
+                await vm.loadTransactionList()
+                accountId = (vm.infotableList.defaultAccountId.readyValue ?? nil) ?? DataId.void
+            }
             viewModel.loadTransactions(for: accountId)
             viewModel.loadAccounts()
             viewModel.loadCategories()

diff --git a/MMEX/ViewModel/List/ScheduledList.swift b/MMEX/ViewModel/List/ScheduledList.swift
@@ -26,6 +26,7 @@ extension ViewModel {
                 load(&taskGroup, keyPath: \Self.scheduledList.used),
                 // auxiliary
                 load(&taskGroup, keyPath: \Self.infotableList.baseCurrencyId),
+                load(&taskGroup, keyPath: \Self.infotableList.defaultAccountId),
                 load(&taskGroup, keyPath: \Self.infotableList.categoryDelimiter),
                 load(&taskGroup, keyPath: \Self.currencyList.info),
                 load(&taskGroup, keyPath: \Self.accountList.data),

diff --git a/MMEX/ViewModel/List/TransactionList.swift b/MMEX/ViewModel/List/TransactionList.swift
@@ -26,6 +26,7 @@ extension ViewModel {
                 load(&taskGroup, keyPath: \Self.transactionList.used),
                 // auxiliary
                 load(&taskGroup, keyPath: \Self.infotableList.baseCurrencyId),
+                load(&taskGroup, keyPath: \Self.infotableList.defaultAccountId),
                 load(&taskGroup, keyPath: \Self.infotableList.categoryDelimiter),
                 load(&taskGroup, keyPath: \Self.currencyList.info),
                 load(&taskGroup, keyPath: \Self.accountList.data),