Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove currency references #14

Merged
merged 1 commit into from
Nov 22, 2023
Merged

refactor: remove currency references #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Sources/PayPalMessages/Config/PayPalMessageModalConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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
Expand All @@ -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()
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions Sources/PayPalMessages/PayPalMessageModal.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
7 changes: 0 additions & 7 deletions Sources/PayPalMessages/PayPalMessageModalViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
))
Expand Down
1 change: 0 additions & 1 deletion Sources/PayPalMessages/PayPalMessageViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,6 @@ class PayPalMessageViewModel: PayPalMessageModalEventDelegate {
clientID: clientID,
environment: environment,
amount: amount,
// currency: currency, TODO: Implement?
placement: placement,
offerType: offerType,
modalCloseButton: modalCloseButton
Expand Down
Loading