StripeCryptoOnramp SDK: Better Cancellation Signaling

StripeCryptoOnramp/StripeCryptoOnramp/Source/Components/CryptoOnrampCoordinator.swift

@@ -174,6 +174,14 @@ public final class CryptoOnrampCoordinator: NSObject, CryptoOnrampCoordinatorPro
     private let appearance: LinkAppearance
     private let analyticsClient: CryptoOnrampAnalyticsClient
     private var applePayCompletionContinuation: CheckedContinuation<ApplePayPaymentStatus, Swift.Error>?
+
+    /// Temporary snapshot of the selection that existed before starting an Apple Pay collection flow.
+    ///
+    /// We set this immediately before presenting Apple Pay so we can restore `selectedPaymentSource`
+    /// if the Apple Pay flow is canceled or fails after `didCreatePaymentMethod` has already updated
+    /// `selectedPaymentSource`. This value should only represent pre-existing selection state for the
+    /// active Apple Pay attempt, and must be cleared once that attempt completes, fails, or the user logs out.
+    private var paymentSourceBeforeApplePay: SelectedPaymentSource?
     private var selectedPaymentSource: SelectedPaymentSource?
     private let cryptoCustomerState: CryptoCustomerState
 
@@ -478,7 +486,6 @@ public final class CryptoOnrampCoordinator: NSObject, CryptoOnrampCoordinatorPro
                 supportedPaymentMethodTypes: supportedPaymentMethodTypes,
                 collectName: type.requiresNameCollection
             ) else {
-                selectedPaymentSource = nil
                 return .canceled
             }
 
@@ -493,6 +500,7 @@ public final class CryptoOnrampCoordinator: NSObject, CryptoOnrampCoordinatorPro
             return .completed(displayData: preview, kycInfo: nil)
         case .applePay(let paymentRequest):
             // This presents Apple Pay and fills the selected payment source in the delegate.
+            paymentSourceBeforeApplePay = selectedPaymentSource
             do {
                 let status = try await presentApplePay(using: paymentRequest, from: viewController)
                 switch status {
@@ -520,14 +528,15 @@ public final class CryptoOnrampCoordinator: NSObject, CryptoOnrampCoordinatorPro
                         sublabel: sublabel
                     )
 
+                    paymentSourceBeforeApplePay = nil
                     analyticsClient.log(.collectPaymentMethodCompleted(paymentMethodType: type.analyticsValue))
 
                     return .completed(displayData: paymentMethodPreview, kycInfo: kycInfo)
                 case .canceled:
-                    selectedPaymentSource = nil
                     return .canceled
                 }
             } catch {
+                paymentSourceBeforeApplePay = nil
                 analyticsClient.log(.errorOccurred(during: .collectPaymentMethod, errorMessage: error.localizedDescription))
                 throw error
             }
@@ -629,6 +638,8 @@ public final class CryptoOnrampCoordinator: NSObject, CryptoOnrampCoordinatorPro
 
     public func logOut() async throws {
         do {
+            paymentSourceBeforeApplePay = nil
+            selectedPaymentSource = nil
             try await linkController.logOut()
             analyticsClient.log(.userLoggedOut)
         } catch {
@@ -657,16 +668,17 @@ extension CryptoOnrampCoordinator: ApplePayContextDelegate {
         case .success:
             applePayCompletionContinuation?.resume(returning: .success)
         case .userCancellation:
-            selectedPaymentSource = nil
+            selectedPaymentSource = paymentSourceBeforeApplePay
             applePayCompletionContinuation?.resume(returning: .canceled)
         case .error:
-            selectedPaymentSource = nil
+            selectedPaymentSource = paymentSourceBeforeApplePay
             applePayCompletionContinuation?.resume(throwing: error ?? ApplePayPaymentStatus.Error.applePayFallbackError)
         @unknown default:
-            selectedPaymentSource = nil
+            selectedPaymentSource = paymentSourceBeforeApplePay
             applePayCompletionContinuation?.resume(throwing: error ?? ApplePayPaymentStatus.Error.applePayFallbackError)
         }
 
+        paymentSourceBeforeApplePay = nil
         applePayCompletionContinuation = nil
     }
 }

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Link/LinkController.swift

@@ -368,7 +368,7 @@ import UIKit
         with email: String?,
         supportedPaymentMethodTypes: [LinkPaymentMethodType] = LinkPaymentMethodType.allCases,
         collectName: Bool = false,
-        completion: @escaping () -> Void
+        completion: @escaping (_ didSelectPaymentMethod: Bool) -> Void
     ) {
         var configuration = self.configuration
         configuration.defaultBillingDetails.email = email
@@ -395,12 +395,12 @@ import UIKit
                 if shouldClearSelection {
                     self?.internalPaymentOption = nil
                 }
-                completion()
+                completion(false)
                 return
             }
 
             self?.internalPaymentOption = .link(option: confirmOption)
-            completion()
+            completion(true)
         }
     }
 
@@ -1037,9 +1037,9 @@ extension LinkController: LinkFullConsentViewControllerDelegate {
                     with: email,
                     supportedPaymentMethodTypes: supportedPaymentMethodTypes,
                     collectName: collectName
-                ) { [weak self] in
+                ) { [weak self] didSelectPaymentMethod in
                     guard let self else { return }
-                    continuation.resume(returning: self.paymentMethodPreview)
+                    continuation.resume(returning: didSelectPaymentMethod ? self.paymentMethodPreview : nil)
                 }
             }
         }