commit 57ecfe834e1668dc9ae1fcfb7dd632db2984b09f
parent 9d1f30c6f37f5df50052e3676d6a2198ee51199f
Author: Marc Stibane <marc@taler.net>
Date: Sat, 12 Sep 2026 18:04:55 +0200
yellow bar
Diffstat:
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/TalerWallet1/Views/Main/MainView.swift b/TalerWallet1/Views/Main/MainView.swift
@@ -236,11 +236,13 @@ struct MainView: View {
}
}.animation(.linear(duration: LAUNCHDURATION), value: controller.backendState)
- VStack {
+ VStack(spacing: 0) {
if controller.networkUnavailable {
ErrorBanner(.networkUnavailable) // red bar on top
} else if controller.slowConnection {
- ErrorBanner(.warning5sec) // yellow bar on top
+ if !showScanner && !showUrlSheet {
+ ErrorBanner(.warning5sec) // yellow bar on top
+ }
}
mainGroup
.environmentObject(tabBarModel)
@@ -349,7 +351,7 @@ struct MainView: View {
}
case .stalled:
withAnimation(.easeIn(duration: BANNERDURATION)) {
- controller.slowConnection = false
+ controller.slowConnection = true
controller.stalledConnection = true
}
default:
diff --git a/TalerWallet1/Views/Sheets/Sheet.swift b/TalerWallet1/Views/Sheets/Sheet.swift
@@ -67,7 +67,7 @@ struct Sheet: View {
var body: some View {
let idString = debugViewC.sheetID > 0 ? String(debugViewC.sheetID)
: EMPTYSTRING // show nothing if 0
- VStack {
+ VStack(spacing: 0) {
if controller.networkUnavailable {
ErrorBanner(.networkUnavailable) // red bar on top
} else if controller.slowConnection {
diff --git a/TalerWallet1/Views/Sheets/URLSheet.swift b/TalerWallet1/Views/Sheets/URLSheet.swift
@@ -53,12 +53,6 @@ struct URLSheet: View {
let _ = Self._printChanges()
let _ = symLog.vlog(urlToOpen?.absoluteString) // just to get the # to compare it with .onAppear & onDisappear
#endif
- VStack {
- if controller.networkUnavailable {
- ErrorBanner(.networkUnavailable) // red bar on top
- } else if controller.slowConnection {
- ErrorBanner(.warning5sec) // yellow bar on top
- }
if let urlCommand, let passedURL {
switch urlCommand {
case .addExchange: // TODO: just check the ToS
@@ -101,7 +95,6 @@ struct URLSheet: View {
passUrlOnce()
}
}
- }
}
}
// MARK: -