commit 09abda13157bbef53893d49dd0afecdd4ddd6ace
parent 25f2384a08f23d8495c23392586ed4e32febb367
Author: Marc Stibane <marc@taler.net>
Date: Thu, 6 Aug 2026 22:14:19 +0200
debug: defaultExchanges.append(stage)
Diffstat:
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/TalerWallet1/Controllers/Controller.swift b/TalerWallet1/Controllers/Controller.swift
@@ -556,14 +556,16 @@ class Controller: ObservableObject {
"taler://dev-experiment/demo-shortcuts?val=KUDOS:4,KUDOS:8,KUDOS:16,KUDOS:32")
}
defaultExchanges = await model.getDefaultExchanges(stage: stage)
- if stage, let talerOps = defaultExchanges.first {
- let stageURI = "taler://withdraw-exchange/exchange.stage.taler-ops.ch"
- if talerOps.talerUri != stageURI {
- let stageExc = DefaultExchange(talerUri: stageURI,
- currency: talerOps.currency,
- currencySpec: talerOps.currencySpec
- )
- defaultExchanges.insert(stageExc, at: 0)
+ if defaultExchanges.count == 1 {
+ if stage, let talerOps = defaultExchanges.first {
+ let stageURI = "taler://withdraw-exchange/exchange.stage.taler-ops.ch"
+ if talerOps.talerUri != stageURI {
+ let stageExc = DefaultExchange(talerUri: stageURI,
+ currency: talerOps.currency,
+ currencySpec: talerOps.currencySpec
+ )
+ defaultExchanges.append(stageExc)
+ }
}
}
DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
diff --git a/TalerWallet1/Views/HelperViews/ScopePicker.swift b/TalerWallet1/Views/HelperViews/ScopePicker.swift
@@ -32,6 +32,13 @@ struct CurrencyPicker: View {
@State private var selected = 0
+ func base(_ index: Int, _ count: Int) -> String {
+ if index != 0 && index == count - 1 {
+ return " (stage)"
+ }
+ return " (prod)"
+ }
+
var body: some View {
#if PRINT_CHANGES
let _ = Self._printChanges()
@@ -41,8 +48,7 @@ struct CurrencyPicker: View {
Picker(EMPTYSTRING, selection: $selected) {
ForEach(0..<count, id: \.self) { index in
let exchange = exchanges[index]
- let base = index == 0 ? " (stage)" : " (prod)"
- Text(exchange.currencySpec.name + base)
+ Text(exchange.currencySpec.name + base(index, count))
.tag(index)
}
}