wbrawner/twigs-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issues with budget selection

Browse source
This commit is contained in:
William Brawner 2022-05-17 19:55:28 -06:00
parent 7d1c9a9df8
commit 20b685809b
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Twigs/Budget/BudgetListsView.swift
View file

@ -36,7 +36,9 @@ struct BudgetListItemView: View {
var body: some View {
Button(
action: {
self.dataStore.selectBudget(budget)
Task {
await self.dataStore.selectBudget(budget)
}
},
label: {
VStack(alignment: .leading) {

14
Twigs/DataStore.swift
View file

@ -19,13 +19,9 @@ class DataStore : ObservableObject {
@Published var budgets: AsyncData<[Budget]> = .empty
@Published var budget: AsyncData<Budget> = .empty {
didSet {
self.overview = .empty
if case let .success(budget) = self.budget {
UserDefaults.standard.set(budget.id, forKey: LAST_BUDGET)
self.showBudgetSelection = false
Task {
await loadOverview(budget)
}
}
}
}
@ -51,10 +47,10 @@ class DataStore : ObservableObject {
return
}
if let id = UserDefaults.standard.string(forKey: LAST_BUDGET), let lastBudget = budgets.first(where: { $0.id == id }) {
self.budget = .success(lastBudget)
await self.selectBudget(lastBudget)
} else {
if let budget = budgets.first {
self.budget = .success(budget)
await self.selectBudget(budget)
}
}
} catch {
@ -95,8 +91,12 @@ class DataStore : ObservableObject {
}
}
func selectBudget(_ budget: Budget) {
func selectBudget(_ budget: Budget) async {
self.budget = .success(budget)
await loadOverview(budget)
await getTransactions()
await getCategories(budgetId: budget.id, expense: nil, archived: nil, count: nil, page: nil)
await getRecurringTransactions()
}
@Published var categories: AsyncData<[TwigsCore.Category]> = .empty