commit 8fe9a668b0402e5ec4895a2933d608abdc3f33e3
parent b973fa12ff64f1946f06644ee7384bc2419089d3
Author: Marc Stibane <marc@taler.net>
Date: Thu, 6 Aug 2026 22:23:31 +0200
show chQRr in instructions
Diffstat:
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift b/TalerWallet1/Views/Transactions/ManualDetailsWireV.swift
@@ -165,16 +165,21 @@ struct PayeeTown: View {
// MARK: -
struct Cryptocode: View {
let cryptoString: String
+ let chQRr: String?
+
@State var isCopied: Bool? = false
var body: some View {
+ let isChQRr = chQRr != nil
HStack {
- Text(cryptoString)
+ Text(chQRr ?? cryptoString)
.foregroundStyle(isCopied == true ? Color.secondary : .primary)
.monospacedDigit()
- .accessibilityLabel(Text("Cryptocode", comment: "a11y"))
+ .accessibilityLabel(isChQRr ? Text("QR reference", comment: "a11y")
+ : Text("Cryptocode", comment: "a11y"))
.frame(maxWidth: .infinity, alignment: .leading)
- CopyButton(cryptoString, isCopied: $isCopied, vertical: true)
- .accessibilityLabel(Text("Copy the cryptocode", comment: "a11y"))
+ CopyButton(chQRr ?? cryptoString, isCopied: $isCopied, vertical: true)
+ .accessibilityLabel(isChQRr ? Text("Copy the QR reference", comment: "a11y")
+ : Text("Copy the cryptocode", comment: "a11y"))
.disabled(false)
} .padding(.leading)
}
@@ -304,7 +309,7 @@ struct ManualDetailsWireV: View {
var body: some View {
if let receiverStr = payto.receiver {
List {
- let cryptoString = debitIBAN == nil ? reservePub : "kyc" + reservePub
+ let cryptoString = debitIBAN == nil ? reservePub : "KYC:" + reservePub
let warningIcon = Image(systemName: WARNING)
let note = Text("**Note: Don't forget to copy and paste the code in Step 2.**")
let manda = debitIBAN == nil ? String(localized: "This is mandatory, otherwise your money will not arrive in this wallet.")
@@ -365,7 +370,7 @@ struct ManualDetailsWireV: View {
}
AmountCode(amountStr: amountStr, amountValue: amountValue)
step2(payto.chQRr != nil)
- Cryptocode(cryptoString: cryptoString)
+ Cryptocode(cryptoString: cryptoString, chQRr: payto.chQRr)
// .padding(.top)
step3 // .padding(.top, 6)
}.listRowSeparator(.hidden)