Skip to content

Fix embedded playground confirm failing for interstitial integration #5984

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

Open
yuki-stripe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix embedded playground confirm failing for interstitial integration #5984

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
11 changes: 8 additions & 3 deletions Example/PaymentSheet Example/PaymentSheet Example/EmbeddedPlaygroundViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ class EmbeddedPlaygroundViewController: UIViewController {
embeddedPaymentElement.delegate = self
embeddedPaymentElement.presentingViewController = self
self.embeddedPaymentElement = embeddedPaymentElement
self.embeddedPaymentElement?.presentingViewController = self

// Scroll view contains our content
let scrollView = UIScrollView()
Expand Down Expand Up @@ -274,8 +273,14 @@ class EmbeddedPlaygroundViewController: UIViewController {
func didTapPaymentMethodButton() {
guard let embeddedPaymentElement else { return }
let paymentMethodsViewController = EmbeddedPaymentElementWrapperViewController(embeddedPaymentElement: embeddedPaymentElement, needsDismissal: { [weak self] in
self?.dismiss(animated: true)
self?.updatePaymentOptionView()
guard let self else { return }
self.dismiss(animated: true)
// Reset state - nil out the PMVC since it's dead (we'll re-create it if it's presented again)
self.paymentMethodsViewController = nil
// Reconfigure Embedded to use us as the presentingVC and delegate
self.embeddedPaymentElement?.presentingViewController = self
self.embeddedPaymentElement?.delegate = self
self.updatePaymentOptionView()
})
self.paymentMethodsViewController = paymentMethodsViewController
let navController = UINavigationController(rootViewController: paymentMethodsViewController)
Expand Down
6 changes: 3 additions & 3 deletions Example/PaymentSheet Example/PaymentSheet Example/ExampleWalletButtonsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ class ExampleWalletButtonsModel: ObservableObject {
configuration.customer = .init(id: customerId, customerSessionClientSecret: customerSessionClientSecret)
configuration.returnURL = "payments-example://stripe-redirect"
configuration.willUseWalletButtonsView = true
configuration.appearance = self.appearance ?? PaymentSheet.Appearance()
configuration.appearance = self.appearance

var linkConfiguration = PaymentSheet.LinkConfiguration()
linkConfiguration.display = self.disableLink == true ? .never : .automatic
Expand All @@ -510,7 +510,7 @@ class ExampleWalletButtonsModel: ObservableObject {
self.latestIntentConfig = .init(sharedPaymentTokenSessionWithMode: .payment(amount: 9999, currency: "USD", setupFutureUsage: nil, captureMethod: .automatic, paymentMethodOptions: nil), sellerDetails: .init(networkId: "stripe", externalId: "acct_1HvTI7Lu5o3P18Zp", businessName: "Till's Pills"), paymentMethodTypes: ["card", "shop_pay"], preparePaymentMethodHandler: { [weak self] paymentMethod, address in
self?.isProcessing = true
self?.addDebugLog("PaymentMethod prepared: \(paymentMethod.stripeId)")
self?.addDebugLog("Address: \(address)")
self?.addDebugLog("Address: \(String(describing: address))")
// Create the payment intent on the rough-lying-carriage backend
self?.createPaymentIntentWithSPTTestBackend(customerId: customerId, paymentMethod: paymentMethod.stripeId)
})
Expand Down Expand Up @@ -596,7 +596,7 @@ class ExampleWalletButtonsModel: ObservableObject {
}
} else {
let paymentIntentID = json["paymentIntent"] as? String
self?.addDebugLog("Payment intent created: \(paymentIntentID)")
self?.addDebugLog("Payment intent created: \(String(describing: paymentIntentID))")
DispatchQueue.main.async {
self?.isProcessing = false
self?.onCompletion(result: .completed)
Expand Down
Loading