taler-ios

commit 975be032dc9f73fa7e1f208f36a31e2d475cc258
parent 58a4e7cec6f2ef23bf97d7ee228702fb7ff0e6f0
Author: Marc Stibane <marc@taler.net>
Date:   Sun, 27 Sep 2026 19:01:34 +0200

Don't show details when claiming

Diffstat:
M
TalerWallet1/Model/Transaction.swift
 | 
3
+++
M
TalerWallet1/Views/Transactions/PaymentTransactionView.swift
 | 
5
++++-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/TalerWallet1/Model/Transaction.swift b/TalerWallet1/Model/Transaction.swift
@@ -393,6 +393,7 @@ struct TransactionCommon: Decodable, Sendable {
     var isAbSuspended   : Bool { txState.major == .suspendedAborting }
     var isFailed        : Bool { txState.major == .failed }
     var isExpired       : Bool { txState.major == .expired }
+    var isClaiming      : Bool { txState.minor == .claimProposal }
     var isRepurchase    : Bool { txState.minor == .repurchase }
     var isAbortable     : Bool { txActions.contains(.abort) }
     var isFailable      : Bool { txActions.contains(.fail) }
@@ -465,6 +466,7 @@ struct WithdrawalDetails: Codable {
     var exchangeCreditAccountDetails: [ExchangeAccountDetails]?
 
   /// Details for manual withdrawals:
+  /// How long does the exchange wait to transfer back funds from a reserve?
     var reserveClosingDelay: Duration?
 
   /// Details for bank-integrated withdrawals:
@@ -510,6 +512,7 @@ struct RefundInfo: Decodable {
 }
 struct PaymentTransactionDetails: Decodable {
     var info: OrderShortInfo?           // only if wallet-core already has it
+    var merchantBaseUrl: String?        // base URL used to claim the order
     var totalRefundRaw: Amount
     var totalRefundEffective: Amount
     var refundPending: Amount?
diff --git a/TalerWallet1/Views/Transactions/PaymentTransactionView.swift b/TalerWallet1/Views/Transactions/PaymentTransactionView.swift
@@ -137,6 +137,9 @@ struct PaymentTransactionView: View {
         _ = selectIndex(defaultChoiceIndex, of: choices)
     }
 
+    var isNotClaiming: Bool {
+        !common.isClaiming
+    }
     var body: some View {
 #if PRINT_CHANGES
         let _ = Self._printChanges()
@@ -205,7 +208,7 @@ struct PaymentTransactionView: View {
                     // TODO: purge and reload
                 }
             }
-        } else { // show finished payment
+        } else if isNotClaiming { // show finished payment
             TransactionPayDetailV(stack: stack.push(),
                               paymentTx: paymentTransaction)    // TODO: details.info.merchant.name
             ThreeAmountsSheet(stack: stack.push(),