commit d77a32a22127e23d2780d21adf78ffd031e7b8f0 parent af60c805ec996892639bb5e15a76319c220333bc Author: Marc Stibane <marc@taler.net> Date: Thu, 18 Jun 2026 20:01:18 +0200 cleanup Diffstat:
7 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/TalerWallet1/Resources/Localizable.xcstrings b/TalerWallet1/Resources/Localizable.xcstrings @@ -7264,6 +7264,7 @@ }, "If your banking software runs on another device, you can scan this QR code:" : { "comment" : "A label displayed below a single QR code in a list of wire-transfer QR codes.", + "extractionState" : "stale", "isCommentAutoGenerated" : true, "localizations" : { "de" : { diff --git a/TalerWallet1/Views/Main/WalletMain.swift b/TalerWallet1/Views/Main/WalletMain.swift @@ -26,7 +26,6 @@ struct WalletMain: View { @Binding var showActionSheet: Bool @Binding var showScanner: Bool - @Environment(\.openURL) private var openURL @EnvironmentObject private var controller: Controller @EnvironmentObject private var model: WalletModel @EnvironmentObject private var tabBarModel: TabBarModel diff --git a/TalerWallet1/Views/Settings/DebugSettingsView.swift b/TalerWallet1/Views/Settings/DebugSettingsView.swift @@ -100,7 +100,9 @@ struct DebugSettingsView: View { id1: "debugViews", description: String(localized: "Debug view layout and flickering")) #if DEBUG - let banks = ["glstest.taler.net", "taler.fdold.eu", "regio-taler.fdold.eu", + let banks = [//"stage.taler-ops.ch", <= never has a bank! +// "glstest.taler.net", + "taler.fdold.eu", "regio-taler.fdold.eu", "taler.grothoff.org", "taler.ar", "head.taler.net", "test.taler.net", "demo.taler.net", "kyctest.taler.net"] ForEach(banks, id: \.self) { bank in diff --git a/TalerWallet1/Views/Settings/MoreSettingsView.swift b/TalerWallet1/Views/Settings/MoreSettingsView.swift @@ -60,8 +60,7 @@ struct MoreSettingsView: View { SettingsToggle(name: showQRstring, value: $showQRauto16, id1: "showQRautomatic", description: showQRhint) } - - SettingsTriState(name: String(localized: "Prefered Color Mode"), value: $preferredColorScheme, + SettingsTriState(name: String(localized: "Preferred Appearance"), value: $preferredColorScheme, id1: "colorScheme", description: String(localized: "Individual preference")) if controller.hapticCapability.supportsHaptics { diff --git a/TalerWallet1/Views/Transactions/ManualDetailsV.swift b/TalerWallet1/Views/Transactions/ManualDetailsV.swift @@ -118,6 +118,8 @@ struct ManualDetailsV: View { amountStr: amountStr.0, messageStr: payto.messageStr) } else if countA > 0 { // show the single QR directly +// Text("If your banking software runs on another device, you can scan this QR code:") +// .listRowSeparator(.hidden) if let qrCodeSpecs = transferOptions.first?.qrCodes { if let qrCode = qrCodeSpecs.first { let message = payto.messageStr ?? EMPTYSTRING diff --git a/TalerWallet1/Views/Transactions/QRcodesForPayto.swift b/TalerWallet1/Views/Transactions/QRcodesForPayto.swift @@ -48,13 +48,8 @@ struct QRcodesForPayto: View { let textToShare = String(receiverStr + "\n" + amountStr + "\n" + message) List { if !minimalistic { -// if count > 1 { - Text("If your banking software runs on another device, you can scan one of these QR codes:") - .listRowSeparator(.hidden) -// } else { -// Text("If your banking software runs on another device, you can scan this QR code:") -// .listRowSeparator(.hidden) -// } + Text("If your banking software runs on another device, you can scan one of these QR codes:") + .listRowSeparator(.hidden) } ForEach(transferOptions, id: \.self) { option in if let qrCodes = option.qrCodes { diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryList.swift b/TalerWallet1/Views/Transactions/TransactionSummaryList.swift @@ -290,8 +290,8 @@ struct TransactionSummaryList: View { payNow: $payNow) .onChange(of: payNow) { payNow2 in if payNow2 { - payNow = false Task { + payNow = false await payTransaction() } }