[taler-taler-ios] 01/19: Patch for CCCamp, removed extra, bump version to 0.9.3 (18)

[gnunet]

This is an automated email from the git hooks/post-receive script.

marc-stibane pushed a commit to branch master
in repository taler-ios.

commit 8646727279612a66e728f211cbe6d6b68c15b805
Author: Marc Stibane <marc@taler.net>
AuthorDate: Tue Aug 22 16:11:59 2023 +0200

    Patch for CCCamp, removed extra, bump version to 0.9.3 (18)
---
 TalerWallet.xcodeproj/project.pbxproj        | 4 ++--
 TalerWallet1/Model/Model+Payment.swift       | 4 ++--
 TalerWallet1/Views/Payment/PaymentView.swift | 4 ++--
 TestFlight/WhatToTest.en-US.txt              | 5 +++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/TalerWallet.xcodeproj/project.pbxproj 
b/TalerWallet.xcodeproj/project.pbxproj
index 14555ba..691df69 100644
--- a/TalerWallet.xcodeproj/project.pbxproj
+++ b/TalerWallet.xcodeproj/project.pbxproj
@@ -1021,7 +1021,7 @@
                                CODE_SIGN_ENTITLEMENTS = "GNU 
Taler.entitlements";
                                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone 
Developer";
                                CODE_SIGN_STYLE = Manual;
-                               CURRENT_PROJECT_VERSION = 17;
+                               CURRENT_PROJECT_VERSION = 18;
                                DEVELOPMENT_TEAM = "";
                                "DEVELOPMENT_TEAM[sdk=iphoneos*]" = GUDDQ9428Y;
                                ENABLE_PREVIEWS = YES;
@@ -1063,7 +1063,7 @@
                                CODE_SIGN_ENTITLEMENTS = "GNU 
Taler.entitlements";
                                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone 
Distribution";
                                CODE_SIGN_STYLE = Manual;
-                               CURRENT_PROJECT_VERSION = 17;
+                               CURRENT_PROJECT_VERSION = 18;
                                DEVELOPMENT_TEAM = "";
                                "DEVELOPMENT_TEAM[sdk=iphoneos*]" = GUDDQ9428Y;
                                ENABLE_PREVIEWS = YES;
diff --git a/TalerWallet1/Model/Model+Payment.swift 
b/TalerWallet1/Model/Model+Payment.swift
index 88872e2..b183d36 100644
--- a/TalerWallet1/Model/Model+Payment.swift
+++ b/TalerWallet1/Model/Model+Payment.swift
@@ -42,7 +42,7 @@ struct MerchantContractTerms: Codable {
     let wireFeeAmortization: Int?       // Share of the wire fee that must be 
settled with one payment
     let maxWireFee: Amount?             // Maximum wire fee that the merchant 
agrees to pay for
     let minimumAge: Int?
-    let extra: Extra                    // Extra data, interpreted by the 
mechant only
+//    let extra: Extra?                   // Extra data, interpreted by the 
mechant only
 //    let auditors: [Auditor]?
 
     enum CodingKeys: String, CodingKey {
@@ -73,7 +73,7 @@ struct MerchantContractTerms: Codable {
         case wireFeeAmortization = "wire_fee_amortization"
         case maxWireFee = "max_wire_fee"
         case minimumAge = "minimum_age"
-        case extra
+//        case extra
 //        case auditors
     }
 }
diff --git a/TalerWallet1/Views/Payment/PaymentView.swift 
b/TalerWallet1/Views/Payment/PaymentView.swift
index 27db640..6b6bc0f 100644
--- a/TalerWallet1/Views/Payment/PaymentView.swift
+++ b/TalerWallet1/Views/Payment/PaymentView.swift
@@ -135,8 +135,8 @@ struct PaymentURIView_Previews: PreviewProvider {
                                             fulfillmentMessageI18n: nil,
                                           wireFeeAmortization: 0,
                                           maxWireFee: try! Amount(fromString: 
LONGCURRENCY + ":0.2"),
-                                            minimumAge: nil,
-                                          extra: extra
+                                          minimumAge: nil
+//                                          extra: extra,
 //                                          auditors: [],
                                   )
         let details = PreparePayResult(
diff --git a/TestFlight/WhatToTest.en-US.txt b/TestFlight/WhatToTest.en-US.txt
index 6fb04f7..9611ffa 100644
--- a/TestFlight/WhatToTest.en-US.txt
+++ b/TestFlight/WhatToTest.en-US.txt
@@ -1,4 +1,9 @@
 
+Version 0.9.3 (18)
+
+- Should work now with https://kaufen.tschunk.shop
+
+
 Version 0.9.3 (17)
 
 • New Feature: Payment Sounds from carlo von lynX

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.