taler-ios

commit 573ac29f32bb13008b5df86e56f33635598bb1fd
parent c4c4e6d15c6d358e8697f10e25d247f18a6eb7df
Author: Marc Stibane <marc@taler.net>
Date:   Thu, 18 Jul 2024 22:49:18 +0200

no PayForTemplate live fee updates

Diffstat:
M
TalerWallet1/Views/Sheets/Payment/PaymentView.swift
 | 
67
++++++++++++++++++++++++++++++++++---------------------------------

1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentView.swift b/TalerWallet1/Views/Sheets/Payment/PaymentView.swift
@@ -29,39 +29,40 @@ func templateFee(ppCheck: PreparePayResult?) -> Amount? {
     return nil
 }
 
-struct PayForTemplateResult {
-    let ppCheck: PreparePayResult
-    let insufficient: Bool
-    let feeAmount: Amount?
-    let feeStr: String
-}
-
-func preparePayForTemplate(model: WalletModel,
-                             url: URL,
-                          amount: Amount?,
-                         summary: String?,
-                        announce: Announce)
-  async -> PayForTemplateResult? {
-    if let ppCheck = try? await model.preparePayForTemplateM(url.absoluteString, amount: amount, summary: summary) {
-        let controller = Controller.shared
-        let amountRaw = ppCheck.amountRaw
-        let currency = amountRaw.currencyStr
-        let currencyInfo = controller.info(for: currency, controller.currencyTicker)
-        let amountVoiceOver = amountRaw.formatted(currencyInfo, isNegative: false)
-        let insufficient = ppCheck.status == .insufficientBalance
-        if let feeAmount = templateFee(ppCheck: ppCheck) {
-            let feeStr = feeAmount.formatted(currencyInfo, isNegative: false)
-            let feeLabel = feeLabel(feeStr)
-            announce("\(amountVoiceOver), \(feeLabel)")
-            return PayForTemplateResult(ppCheck: ppCheck, insufficient: insufficient,
-                                        feeAmount: feeAmount, feeStr: feeStr)
-        }
-        announce(amountVoiceOver)
-        return PayForTemplateResult(ppCheck: ppCheck, insufficient: insufficient,
-                                    feeAmount: nil, feeStr: EMPTYSTRING)
-    }
-    return nil
-}
+/// at the moment the merchant doesn't provide live fee updates, but only after creating the payment. Thus we cannot show life fees...
+//struct PayForTemplateResult {
+//    let ppCheck: PreparePayResult
+//    let insufficient: Bool
+//    let feeAmount: Amount?
+//    let feeStr: String
+//}
+//
+//func preparePayForTemplate(model: WalletModel,
+//                             url: URL,
+//                          amount: Amount?,
+//                         summary: String?,
+//                        announce: Announce)
+//  async -> PayForTemplateResult? {
+//    if let ppCheck = try? await model.preparePayForTemplateM(url.absoluteString, amount: amount, summary: summary) {
+//        let controller = Controller.shared
+//        let amountRaw = ppCheck.amountRaw
+//        let currency = amountRaw.currencyStr
+//        let currencyInfo = controller.info(for: currency, controller.currencyTicker)
+//        let amountVoiceOver = amountRaw.formatted(currencyInfo, isNegative: false)
+//        let insufficient = ppCheck.status == .insufficientBalance
+//        if let feeAmount = templateFee(ppCheck: ppCheck) {
+//            let feeStr = feeAmount.formatted(currencyInfo, isNegative: false)
+//            let feeLabel = feeLabel(feeStr)
+//            announce("\(amountVoiceOver), \(feeLabel)")
+//            return PayForTemplateResult(ppCheck: ppCheck, insufficient: insufficient,
+//                                        feeAmount: feeAmount, feeStr: feeStr)
+//        }
+//        announce(amountVoiceOver)
+//        return PayForTemplateResult(ppCheck: ppCheck, insufficient: insufficient,
+//                                    feeAmount: nil, feeStr: EMPTYSTRING)
+//    }
+//    return nil
+//}
 
 // MARK: -
 // Will be called either by the user scanning a QR code or tapping the provided link,