refactor: remove currency references (#14)

paypal · Nov 22, 2023 · 751c903 · 751c903
1 parent 86320e9
commit 751c903
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 167 deletions.
diff --git a/Sources/PayPalMessages/Config/PayPalMessageModalConfig.swift b/Sources/PayPalMessages/Config/PayPalMessageModalConfig.swift
@@ -36,7 +36,6 @@ class PayPalMessageModalDataConfig: NSObject {
     var partnerAttributionID: String?
     var environment: Environment
     var amount: Double?
-    var currency: String?
     var buyerCountry: String?
     var offerType: PayPalMessageOfferType?
     var placement: PayPalMessagePlacement?
@@ -51,14 +50,12 @@ class PayPalMessageModalDataConfig: NSObject {
         clientID: String,
         environment: Environment,
         amount: Double? = nil,
-        currency: String? = nil,
         placement: PayPalMessagePlacement? = nil,
         offerType: PayPalMessageOfferType? = nil,
         modalCloseButton: ModalCloseButtonConfig = ModalCloseButtonConfig()
     ) {
         self.clientID = clientID
         self.amount = amount
-        self.currency = currency
         self.placement = placement
         self.offerType = offerType
         self.modalCloseButton = modalCloseButton
@@ -72,7 +69,6 @@ class PayPalMessageModalDataConfig: NSObject {
         environment: Environment,
         partnerAttributionID: String,
         amount: Double? = nil,
-        currency: String? = nil,
         placement: PayPalMessagePlacement? = nil,
         offerType: PayPalMessageOfferType? = nil,
         modalCloseButton: ModalCloseButtonConfig = ModalCloseButtonConfig()
@@ -81,7 +77,6 @@ class PayPalMessageModalDataConfig: NSObject {
         self.merchantID = merchantID
         self.partnerAttributionID = partnerAttributionID
         self.amount = amount
-        self.currency = currency
         self.placement = placement
         self.offerType = offerType
         self.modalCloseButton = modalCloseButton
@@ -122,7 +117,6 @@ class PayPalMessageModalConfig: NSObject, Encodable {
         case merchantID = "merchant_id"
         case partnerAttributionID = "partner_attribution_id"
         case amount
-        case currency
         case buyerCountry
         case offerType = "offer"
         case channel
@@ -139,7 +133,6 @@ class PayPalMessageModalConfig: NSObject, Encodable {
         try container.encodeIfPresent(data.merchantID, forKey: .merchantID)
         try container.encodeIfPresent(data.partnerAttributionID, forKey: .partnerAttributionID)
         try container.encodeIfPresent(data.amount, forKey: .amount)
-        try container.encodeIfPresent(data.currency, forKey: .currency)
         try container.encodeIfPresent(data.buyerCountry, forKey: .buyerCountry)
         try container.encodeIfPresent(data.offerType?.rawValue, forKey: .offerType)
         try container.encodeIfPresent(data.channel, forKey: .channel)

diff --git a/Sources/PayPalMessages/PayPalMessageModal.swift b/Sources/PayPalMessages/PayPalMessageModal.swift
@@ -25,9 +25,6 @@ final class PayPalMessageModal: UIViewController, WKUIDelegate {
     @Proxy(\.viewModel.amount)
     var amount: Double?
 
-    @Proxy(\.viewModel.currency)
-    var currency: String?
-
     @Proxy(\.viewModel.buyerCountry)
     var buyerCountry: String?
 

diff --git a/Sources/PayPalMessages/PayPalMessageModalViewModel.swift b/Sources/PayPalMessages/PayPalMessageModalViewModel.swift
@@ -30,9 +30,6 @@ class PayPalMessageModalViewModel: NSObject, WKNavigationDelegate, WKScriptMessa
     var amount: Double? {
         didSet { queueUpdate(from: oldValue, to: amount) }
     }
-    var currency: String? {
-        didSet { queueUpdate(from: oldValue, to: currency) }
-    }
     var buyerCountry: String? {
         didSet { queueUpdate(from: oldValue, to: buyerCountry) }
     }
@@ -71,7 +68,6 @@ class PayPalMessageModalViewModel: NSObject, WKNavigationDelegate, WKScriptMessa
             "merchant_id": merchantID,
             "partner_attribution_id": partnerAttributionID,
             "amount": amount?.description,
-            "currency": currency,
             "buyer_country": buyerCountry,
             "offer": offerType?.rawValue,
             "channel": channel,
@@ -125,7 +121,6 @@ class PayPalMessageModalViewModel: NSObject, WKNavigationDelegate, WKScriptMessa
         merchantID = config.data.merchantID
         partnerAttributionID = config.data.partnerAttributionID
         amount = config.data.amount
-        currency = config.data.currency
         offerType = config.data.offerType
         buyerCountry = config.data.buyerCountry
         channel = config.data.channel
@@ -166,7 +161,6 @@ class PayPalMessageModalViewModel: NSObject, WKNavigationDelegate, WKScriptMessa
         merchantID = config.data.merchantID
         partnerAttributionID = config.data.partnerAttributionID
         amount = config.data.amount
-        currency = config.data.currency
         offerType = config.data.offerType
         buyerCountry = config.data.buyerCountry
         channel = config.data.channel
@@ -181,7 +175,6 @@ class PayPalMessageModalViewModel: NSObject, WKNavigationDelegate, WKScriptMessa
             clientID: self.clientID,
             environment: self.environment,
             amount: self.amount,
-            currency: self.currency,
             placement: self.placement,
             offerType: self.offerType
         ))

diff --git a/Sources/PayPalMessages/PayPalMessageViewModel.swift b/Sources/PayPalMessages/PayPalMessageViewModel.swift
@@ -387,7 +387,6 @@ class PayPalMessageViewModel: PayPalMessageModalEventDelegate {
                 clientID: clientID,
                 environment: environment,
                 amount: amount,
-                // currency: currency, TODO: Implement?
                 placement: placement,
                 offerType: offerType,
                 modalCloseButton: modalCloseButton