commit 8e72f860d678ac3d0cada82445f66b59535bd2d2 parent 64e8fc4e3d9b5271d657db3e367365e61dbbf9da Author: Marc Stibane <marc@taler.net> Date: Thu, 5 Dec 2024 23:05:16 +0100 reloadTransactions Diffstat:
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalancesListView.swift b/TalerWallet1/Views/Balances/BalancesListView.swift @@ -16,7 +16,7 @@ struct BalancesListView: View { let stack: CallStack @Binding var selectedBalance: Balance? // @Binding var shouldReloadPending: Int - @Binding var shouldReloadBalances: Int + @Binding var reloadTransactions: Int @EnvironmentObject private var model: WalletModel @EnvironmentObject private var controller: Controller @@ -44,7 +44,7 @@ struct BalancesListView: View { sectionCount: count, amountToTransfer: $amountToTransfer, // does still have the wrong currency summary: $summary, - shouldReloadBalances: $shouldReloadBalances) + reloadTransactions: $reloadTransactions) } .onAppear() { DebugViewC.shared.setViewID(VIEW_BALANCES, stack: stack.push("onAppear")) diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift b/TalerWallet1/Views/Balances/BalancesSectionView.swift @@ -23,7 +23,7 @@ struct BalancesSectionView { let sectionCount: Int @Binding var amountToTransfer: Amount // does still have the wrong currency @Binding var summary: String - @Binding var shouldReloadBalances: Int + @Binding var reloadTransactions: Int @EnvironmentObject private var model: WalletModel @Environment(\.colorScheme) private var colorScheme @@ -120,10 +120,10 @@ extension BalancesSectionView: View { } header: { BarGraphHeader(stack: stack.push(), scope: scopeInfo, - shouldReloadBalances: $shouldReloadBalances) + reloadTransactions: $reloadTransactions) }.id(sectionID) .listRowSeparator(.hidden) - .task(id: shouldReloadBalances + 1_000_000) { + .task(id: reloadTransactions + 1_000_000) { symLog.log(".task for BalancesSectionView - load recent+completed+pending") await loadRecent(stack.push(".task - load recent")) await loadCompleted(stack.push(".task - load completed")) diff --git a/TalerWallet1/Views/HelperViews/BarGraph.swift b/TalerWallet1/Views/HelperViews/BarGraph.swift @@ -11,7 +11,7 @@ struct BarGraphHeader: View { private let symLog = SymLogV(0) let stack: CallStack let scope: ScopeInfo - @Binding var shouldReloadBalances: Int + @Binding var reloadTransactions: Int @EnvironmentObject private var model: WalletModel @EnvironmentObject private var controller: Controller @@ -46,7 +46,7 @@ struct BarGraphHeader: View { maxBars: MAXBARS, barHeight: barHeight) } // .headerProminence(.increased) // unfortunately this is not useful - .task(id: shouldReloadBalances + 2_000_000) { await loadCompleted() } + .task(id: reloadTransactions + 2_000_000) { await loadCompleted() } } } // MARK: - diff --git a/TalerWallet1/Views/Main/MainView.swift b/TalerWallet1/Views/Main/MainView.swift @@ -238,6 +238,7 @@ extension MainView { @StateObject var navModel = NavigationModel() @State private var shouldReloadBalances = 0 + @State private var shouldReloadTransactions = 0 @State private var shouldReloadPending = 0 @State private var selectedTab: Tab = .balances @State private var showKycAlert: Bool = false @@ -354,7 +355,7 @@ extension MainView { BalancesListView(stack: stack.push(balancesTitle), selectedBalance: $selectedBalance, // shouldReloadPending: $shouldReloadPending, - shouldReloadBalances: $shouldReloadBalances) + reloadTransactions: $shouldReloadTransactions) .navigationTitle(balancesTitle) .background(balanceActions) }.navigationViewStyle(.stack) @@ -419,13 +420,13 @@ extension MainView { } .onNotification(.TransactionExpired) { notification in logger.info(".onNotification(.TransactionExpired) ==> reload balances") - shouldReloadBalances += 1 + shouldReloadTransactions += 1 shouldReloadPending += 1 } .onNotification(.TransactionDone) { - shouldReloadBalances += 1 + shouldReloadTransactions += 1 shouldReloadPending += 1 - selectedTab = .balances +// selectedTab = .balances // automatically switch to Balances } .onNotification(.TransactionError) { notification in shouldReloadPending += 1 diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeSectionView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeSectionView.swift @@ -28,7 +28,7 @@ struct ExchangeSectionView: View { #endif @State private var exchanges: [Exchange] = [] - @State private var shouldReloadBalances: Int = 0 + @State private var reloadTransactions: Int = 0 @State private var currencyInfo: CurrencyInfo = CurrencyInfo.zero(UNKNOWN) @State private var didDelete: Bool = false @State private var disabled: Bool = false @@ -161,7 +161,7 @@ struct ExchangeSectionView: View { } header: { BarGraphHeader(stack: stack.push(), scope: scopeInfo, - shouldReloadBalances: $shouldReloadBalances) + reloadTransactions: $reloadTransactions) } .task { await viewDidLoad() } .task(id: controller.currencyTicker) { await currencyTickerChanged(scopeInfo) }