Skip to content

Commit 260f1d1

Browse files
authored
Merge branch 'develop' into ci-blank-tests
2 parents 147ab6b + fe735d7 commit 260f1d1

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

example/ios/AdyenExampleTests/DummyData.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ let applePayDictionary: NSDictionary = [
2626
]
2727

2828
let configuration: NSDictionary = [
29-
"clientKey": "test_client_key",
29+
"clientKey": "test_clientkey",
3030
"amount": [
3131
"value": 1000,
3232
"currency": "USD"

ios/Components/ApplePay/ApplePayModule.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ internal class ApplePayModule: BaseModuleSender {
5959
let applePayParser = ApplepayConfigurationParser(configuration: configuration)
6060

6161
let paymentRequest: PKPaymentRequest
62-
guard let payment = parser.payment else {
62+
guard
63+
let context = try? parser.fetchContext(session: BaseModule.session),
64+
let payment = context.payment else {
6365
return resolver(false)
6466
}
6567

ios/Configuration/ApplePay/ApplePayRecurringConfigurationParser.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ class ApplePayRecurringConfigurationParser {
2222
}
2323
}
2424

25-
// A description of the recurring payment, for example "Apple News+".
25+
/// A description of the recurring payment, for example "Apple News+".
2626
var paymentDescription: String? {
2727
dict[ApplePayKeys.Recurring.paymentDescription] as? String
2828
}
2929

30-
// The regular billing cycle, for example "$9.99 monthly".
30+
/// The regular billing cycle, for example "$9.99 monthly".
3131
@available(iOS 15.0, *)
3232
var regularBilling: PKRecurringPaymentSummaryItem? {
3333
guard let dictionary = dict[ApplePayKeys.Recurring.regularBilling] as? [NSString: Any] else {
@@ -36,7 +36,7 @@ class ApplePayRecurringConfigurationParser {
3636
return .init(dictionary)
3737
}
3838

39-
// Optional, trial billing cycle, for example "$1.99 for the first six months".
39+
/// Optional, trial billing cycle, for example "$1.99 for the first six months".
4040
@available(iOS 15.0, *)
4141
var trialBilling: PKRecurringPaymentSummaryItem? {
4242
guard let dictionary = dict[ApplePayKeys.Recurring.trialBilling] as? [NSString: Any] else {
@@ -45,21 +45,21 @@ class ApplePayRecurringConfigurationParser {
4545
return .init(dictionary)
4646
}
4747

48-
// Optional, localized billing agreement to be displayed to the user prior to payment authorization.
48+
/// Optional, localized billing agreement to be displayed to the user prior to payment authorization.
4949
var billingAgreement: String? {
5050
dict[ApplePayKeys.Recurring.billingAgreement] as? String
5151
}
5252

53-
// A URL that links to a page on your web site where the user can manage the payment method for this
54-
// recurring payment, including deleting it.
53+
/// A URL that links to a page on your web site where the user can manage the payment method for this
54+
/// recurring payment, including deleting it.
5555
var managementURL: URL? {
5656
guard let url = dict[ApplePayKeys.Recurring.managementURL] as? String else { return nil }
5757
return URL(string: url)
5858
}
5959

60-
// Optional URL to receive lifecycle notifications for the merchant-specific payment token issued
61-
// for this request, if applicable. If this property is not set, notifications will not be sent when
62-
// lifecycle changes occur for the token, for example when the token is deleted.
60+
/// Optional URL to receive lifecycle notifications for the merchant-specific payment token issued
61+
/// for this request, if applicable. If this property is not set, notifications will not be sent when
62+
/// lifecycle changes occur for the token, for example when the token is deleted.
6363
var tokenNotificationURL: URL? {
6464
guard let url = dict[ApplePayKeys.Recurring.tokenNotificationURL] as? String else { return nil }
6565
return URL(string: url)

0 commit comments

Comments
 (0)