commit 5f382e0d4dd353b65d66883555ad5466192f9463 parent bce0a702e3f6c07dbf2adafe00d2414434a39f4a Author: Marc Stibane <marc@taler.net> Date: Wed, 5 Mar 2025 08:30:18 +0100 debugging Diffstat:
19 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/TalerWallet1/Views/Actions/Banking/DepositAmountView.swift b/TalerWallet1/Views/Actions/Banking/DepositAmountView.swift @@ -115,7 +115,7 @@ struct DepositAmountView: View { #endif if depositStarted { let message = String(localized: "Depositing...", comment: "loading") - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) .navigationBarBackButtonHidden(true) .interactiveDismissDisabled() // can only use "Done" button to dismiss .safeAreaInset(edge: .bottom) { diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift @@ -264,7 +264,7 @@ struct ManualWithdrawContent: View { .padding(.horizontal) .task { await reloadExchange(detailsForAmount.exchangeBaseUrl) } } else { - LoadingView(scopeInfo: scope, message: nil) + LoadingView(stack: stack.push(), scopeInfo: scope, message: nil) .task { await viewDidLoad2() } } } diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift @@ -63,7 +63,7 @@ struct ManualWithdrawDone: View { .padding(.horizontal) } } else { - LoadingView(scopeInfo: nil, message: baseURL.trimURL) + LoadingView(stack: stack.push(), scopeInfo: nil, message: baseURL.trimURL) .task { await viewDidLoad() } } } diff --git a/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift b/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift @@ -94,7 +94,7 @@ struct P2PReadyV: View { #else let message: String? = nil #endif - LoadingView(scopeInfo: scope, message: message) + LoadingView(stack: stack.push(), scopeInfo: scope, message: message) } } .navigationTitle(navTitle) diff --git a/TalerWallet1/Views/HelperViews/LoadingView.swift b/TalerWallet1/Views/HelperViews/LoadingView.swift @@ -10,6 +10,7 @@ import SymLog struct LoadingView: View { private let symLog = SymLogV(0) + let stack: CallStack let scopeInfo: ScopeInfo? let message: String? @@ -53,7 +54,7 @@ struct LoadingView: View { struct LoadingView_Previews: PreviewProvider { static var previews: some View { NavigationView { - LoadingView(scopeInfo: nil, message: "test message") // , backButtonHidden: true) + LoadingView(stack: CallStack("Loading"), scopeInfo: nil, message: "test message") // , backButtonHidden: true) .navigationBarTitleDisplayMode(.automatic) }.navigationViewStyle(.stack) } diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift @@ -41,7 +41,7 @@ struct P2pAcceptDone: View { let navTitle = incoming ? String(localized: "Received", comment: "Nav Title, short") : String(localized: "Paid", comment: "Nav Title, short") let message = String(localized: "Accepting...", comment: "loading") - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) .navigationBarBackButtonHidden(true) // .interactiveDismissDisabled() // can only use "Done" button to dismiss .navigationTitle(navTitle) diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift @@ -93,7 +93,7 @@ struct P2pPayURIView: View { #else let message: String? = nil #endif - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) .task { await viewDidLoad() } } } diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift @@ -113,7 +113,7 @@ struct P2pReceiveURIView: View { #else let message: String? = nil #endif - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) } } // must be here and not at LoadingView(), because this needs to run a 2nd time after ToS was accepted diff --git a/TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift b/TalerWallet1/Views/Sheets/Payment/PayTemplateV.swift @@ -223,7 +223,7 @@ struct PayTemplateV: View { DebugViewC.shared.setSheetID(SHEET_PAY_TEMPLATE) } } else { - LoadingView(scopeInfo: nil, message: url.host) + LoadingView(stack: stack.push(), scopeInfo: nil, message: url.host) .task { await viewDidLoad() } } } diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentDone.swift b/TalerWallet1/Views/Sheets/Payment/PaymentDone.swift @@ -59,7 +59,7 @@ struct PaymentDone: View { } } else { let message = String(localized: "Paying...", comment: "loading") - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) .task { await viewDidLoad() } } }.onAppear() { diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentView.swift b/TalerWallet1/Views/Sheets/Payment/PaymentView.swift @@ -298,7 +298,7 @@ struct PaymentView: View, Sendable { symLog.log("Info(for: \(currency)) loaded: \(currencyInfo.name)") } } else { - LoadingView(scopeInfo: nil, message: url.host) + LoadingView(stack: stack.push(), scopeInfo: nil, message: url.host) .task { await viewDidLoad() } } }.onAppear() { diff --git a/TalerWallet1/Views/Sheets/QRSheet.swift b/TalerWallet1/Views/Sheets/QRSheet.swift @@ -31,9 +31,13 @@ struct QRSheet: View { } var body: some View { +#if PRINT_CHANGES + let _ = Self._printChanges() + let _ = symLog.vlog(scannedCode) // just to get the # to compare it with .onAppear & onDisappear +#endif Group { if scannedCode != nil { -// let _ = print(scannedCode as Any) // TODO: logging +// let _ = symLog(scannedCode!) // TODO: logging if let scannedURL = urlToOpen { let scheme = scannedURL.scheme diff --git a/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift b/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift @@ -60,7 +60,7 @@ struct RefundURIView: View { // currencyInfo = controller.info2(for: currency, controller.currencyTicker) // } } else { - LoadingView(scopeInfo: nil, message: url.host) + LoadingView(stack: stack.push(), scopeInfo: nil, message: url.host) .task { await viewDidLoad() } } } diff --git a/TalerWallet1/Views/Sheets/URLSheet.swift b/TalerWallet1/Views/Sheets/URLSheet.swift @@ -25,6 +25,7 @@ struct URLSheet: View { private func passUrlOnce() { if urlToOpen != nil { passedURL = urlToOpen + symLog.log("❗️ passed urlToOpen: \(urlToOpen?.absoluteString)") urlCommand = controller.openURL(urlToOpen!, stack: stack.push()) urlToOpen = nil symLog.log("❗️ erase urlToOpen: \(urlToOpen?.absoluteString)") @@ -34,7 +35,7 @@ struct URLSheet: View { var body: some View { #if PRINT_CHANGES let _ = Self._printChanges() - let _ = symLog.vlog() // just to get the # to compare it with .onAppear & onDisappear + let _ = symLog.vlog(urlToOpen?.absoluteString) // just to get the # to compare it with .onAppear & onDisappear #endif if let urlCommand, let passedURL { switch urlCommand { @@ -66,7 +67,7 @@ struct URLSheet: View { } } else { let message = String(localized: "Scanning...", comment: "loading") - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) .task(id: urlToOpen) { passUrlOnce() } diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift @@ -84,7 +84,7 @@ struct WithdrawAcceptDone: View { } } else { let fallback = String(localized: "Bank Authorization", comment: "loading") - LoadingView(scopeInfo: nil, + LoadingView(stack: stack.push(), scopeInfo: nil, message: exchangeBaseUrl?.trimURL ?? fallback) .task { await viewDidLoad() } } diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptView.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptView.swift @@ -53,6 +53,10 @@ struct WithdrawAcceptView: View { } var body: some View { +#if PRINT_CHANGES + let _ = Self._printChanges() + let _ = symLog.vlog(scope.url ?? amountToTransfer.readableDescription) // just to get the # +#endif if let exchange2 = exchange { VStack { let tosAccepted = exchange2.tosStatus == .accepted @@ -131,7 +135,7 @@ struct WithdrawAcceptView: View { #else let message: String? = nil #endif - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) .task(id: exchange?.id) { await viewDidLoad() } } } diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawTOSView.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawTOSView.swift @@ -70,7 +70,7 @@ struct WithdrawTOSView: View { } } else { let fallback = String(localized: "No payment service", comment: "loading") - LoadingView(scopeInfo: nil, + LoadingView(stack: stack.push(), scopeInfo: nil, message: exchangeBaseUrl?.trimURL ?? fallback) .task { await loadToS(languageCode) diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawURIView.swift @@ -123,7 +123,7 @@ struct WithdrawURIView: View { var body: some View { #if PRINT_CHANGES let _ = Self._printChanges() - let _ = symLog.vlog() // just to get the # to compare it with .onAppear & onDisappear + let _ = symLog.vlog(url.absoluteString) // just to get the # to compare it with .onAppear & onDisappear #endif if let exchange2 = exchange { if let defaultBaseUrl = defaultExchangeBaseUrl ?? possibleExchanges.first?.exchangeBaseUrl { @@ -202,7 +202,7 @@ struct WithdrawURIView: View { #else let message: String? = nil #endif - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) .task { await viewDidLoad() } } } diff --git a/TalerWallet1/Views/Sheets/WithdrawExchangeV.swift b/TalerWallet1/Views/Sheets/WithdrawExchangeV.swift @@ -71,7 +71,7 @@ struct WithdrawExchangeV: View { } } else { let message = String(localized: "No payment service...", comment: "loading") - LoadingView(scopeInfo: nil, message: message) + LoadingView(stack: stack.push(), scopeInfo: nil, message: message) .task { await viewDidLoad() } } }