commit d265f565bbf727a7868fc68946269d550c3e7d58
parent 3be482deec5d507fb87a8228c6add7d4c89706bd
Author: Marc Stibane <marc@taler.net>
Date: Tue, 11 Aug 2026 10:23:30 +0200
cleanup
Diffstat:
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/TalerWallet1/Controllers/PublicConstants.swift b/TalerWallet1/Controllers/PublicConstants.swift
@@ -162,27 +162,28 @@ public let SUNFILL = "sun.max.fill" //
public let MOONFILL = "moon.fill" // 1.0 (iOS 13)
public let HTTPS = "https://"
-//public let DEMOBANK = HTTPS + "bAnK.dEmO.tAlEr.nEt" // should be weird to read, but still work
-//public let DEMOEXCHANGE = HTTPS + "eXcHaNgE.dEmO.tAlEr.nEt"
-public let TALER = "taler.net/"
-public let TALER_NET = HTTPS + TALER
+public let TALER = "taler.net"
public let DEMO = ".demo." + TALER
public let TEST = ".test." + TALER
public let HEAD = ".head." + TALER
-public let SANDBOX = "instances/sandbox/"
-public let DEMOBANK = HTTPS + "bank" + DEMO
-public let DEMOSHOP = HTTPS + "shop" + DEMO
-public let DEMOBACKEND = HTTPS + "backend" + DEMO + SANDBOX
-public let DEMOEXCHANGE = HTTPS + "exchange" + DEMO
-public let TESTBANK = HTTPS + "bank" + TEST
-public let TESTSHOP = HTTPS + "shop" + TEST
-public let TESTBACKEND = HTTPS + "backend" + TEST + SANDBOX
-public let TESTEXCHANGE = HTTPS + "exchange" + TEST
-public let HEADBANK = HTTPS + "bank" + HEAD
-public let HEADSHOP = HTTPS + "shop" + HEAD
-public let HEADBACKEND = HTTPS + "backend" + HEAD
-public let HEADEXCHANGE = HTTPS + "exchange" + HEAD
+public let SANDBOX = "/instances/sandbox/"
+public let EXCHANGE = "exchange"
+public let BACKEND = "backend"
+public let BANK = "bank"
+public let SHOP = "shop"
+public let DEMOBANK = HTTPS + BANK + DEMO + "/"
+public let DEMOSHOP = HTTPS + SHOP + DEMO
+public let DEMOBACKEND = HTTPS + BACKEND + DEMO + SANDBOX
+public let DEMOEXCHANGE = HTTPS + EXCHANGE + DEMO + "/"
+public let TESTBANK = HTTPS + BANK + TEST + "/"
+public let TESTSHOP = HTTPS + SHOP + TEST
+public let TESTBACKEND = HTTPS + BACKEND + TEST + SANDBOX
+public let TESTEXCHANGE = HTTPS + EXCHANGE + TEST + "/"
+public let HEADBANK = HTTPS + BANK + HEAD + "/"
+public let HEADSHOP = HTTPS + SHOP + HEAD
+public let HEADBACKEND = HTTPS + BACKEND + HEAD + "/"
+public let HEADEXCHANGE = HTTPS + EXCHANGE + HEAD + "/"
public let ARS_AGE_EXCHANGE = HTTPS + "exchange-age.taler.ar/"
public let ARS_EXP_EXCHANGE = HTTPS + "exchange-expensive.taler.ar/"
diff --git a/TalerWallet1/Views/Settings/AboutView.swift b/TalerWallet1/Views/Settings/AboutView.swift
@@ -48,7 +48,7 @@ struct AboutView: View {
Group {
List {
if #available(iOS 17.7, *) {
- let talerURI = TALER_NET
+ let talerURI = HTTPS + TALER
BorderWithHCE(talerURI: talerURI, nfcHint: false, size: size, scanHints: nil) {
rotatingTaler
}
@@ -62,7 +62,7 @@ struct AboutView: View {
.accessibilityAddTraits(.isLink)
.accessibilityRemoveTraits(.isStaticText)
.onTapGesture() {
- UIApplication.shared.open(URL(string:TALER_NET)!, options: [:])
+ UIApplication.shared.open(URL(string:HTTPS + TALER)!, options: [:])
}
SettingsItem(name: String(localized: "Open \(localizedAppName) settings"),
diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift
@@ -109,7 +109,7 @@ struct ExchangeListCommonV: View {
let exchanges = ["glsint.fdold.eu", "taler.magnetbank.hu", "stage.taler-ops.ch", "e.netzbon-basel.ch"]
ForEach(exchanges, id: \.self) { exchange in
- let urlStr = "https://exchange." + exchange
+ let urlStr = "exchange." + exchange
Button(urlStr) {
addExchange(urlStr, model: model)
}