From 12e2de9b68de2d8d20f0367f804d21263d6826bf Mon Sep 17 00:00:00 2001 From: Lennart Binscheck Date: Wed, 16 Feb 2022 12:55:16 +0200 Subject: [PATCH 1/2] fix: incorrect payment sheet shown --- ios/StripeSdk.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/StripeSdk.swift b/ios/StripeSdk.swift index cfb6c2503..67f024c1f 100644 --- a/ios/StripeSdk.swift +++ b/ios/StripeSdk.swift @@ -156,6 +156,7 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi } } else { self.paymentSheet = PaymentSheet(paymentIntentClientSecret: paymentIntentClientSecret, configuration: configuration) + self.paymentSheetFlowController = nil resolve([]) } } else if let setupIntentClientSecret = params["setupIntentClientSecret"] as? String { @@ -171,6 +172,7 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi } } else { self.paymentSheet = PaymentSheet(setupIntentClientSecret: setupIntentClientSecret, configuration: configuration) + self.paymentSheetFlowController = nil resolve([]) } } else { From 6887eeda6f9f45b32f9fb6a0d5250ddb8777f347 Mon Sep 17 00:00:00 2001 From: Lennart Binscheck Date: Wed, 16 Feb 2022 20:04:45 +0200 Subject: [PATCH 2/2] code review changes --- ios/StripeSdk.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ios/StripeSdk.swift b/ios/StripeSdk.swift index 67f024c1f..cca68c0f1 100644 --- a/ios/StripeSdk.swift +++ b/ios/StripeSdk.swift @@ -65,6 +65,7 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi func initPaymentSheet(params: NSDictionary, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) -> Void { var configuration = PaymentSheet.Configuration() + self.paymentSheetFlowController = nil if params["applePay"] as? Bool == true { if let merchantIdentifier = self.merchantIdentifier, let merchantCountryCode = params["merchantCountryCode"] as? String { @@ -156,7 +157,6 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi } } else { self.paymentSheet = PaymentSheet(paymentIntentClientSecret: paymentIntentClientSecret, configuration: configuration) - self.paymentSheetFlowController = nil resolve([]) } } else if let setupIntentClientSecret = params["setupIntentClientSecret"] as? String { @@ -172,7 +172,6 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi } } else { self.paymentSheet = PaymentSheet(setupIntentClientSecret: setupIntentClientSecret, configuration: configuration) - self.paymentSheetFlowController = nil resolve([]) } } else {