@stripe/stripe-react-native 0.23.2 → 0.24.0

package/CHANGELOG.md

@@ -2,15 +2,45 @@
 
 ## Unreleased
 
+## 0.24.0 - 2023-02-17
+
+### Breaking changes
+
+-  [#1248](https://github.com/stripe/stripe-react-native/pull/1248) Renamed the `paymentSummaryItems` field in `initPaymentSheet()`'s `applePay` params to `cartItems`. So your change will look like this:
+
+```diff
+ initPaymentSheet({
+   ...
+   applePay: {
+-    paymentSummaryItems: [
++    cartItems: [
+   }
+  ...
+ })
+```
+
+### New Features
+
+- Added the `setOrderTracking` property to the `PlatformPayButton` component and the `initPaymentSheet` method. Use this callback for setting the order details to give users the ability to track and manage their purchases in Wallet. To learn more about order tracking, see [Apple’s Wallet Orders documentation](https://developer.apple.com/documentation/walletorders). [#1248](https://github.com/stripe/stripe-react-native/pull/1248)
+- Added the `buttonType` field to `initPaymentSheet()`'s `applePay` params. Use this to set the text displayed by the call to action button in the Apple Pay sheet.[#1248](https://github.com/stripe/stripe-react-native/pull/1248)
+- Added the `request` field to `initPaymentSheet()`'s, `confirmPlatformPayPayment()`'s, and `confirmPlatformPaySetupIntent`'s  `applePay` params. Use this to support different types of payment requests, like `RecurringPaymentRequest`, `AutomaticReloadPaymentRequest`, and `MultiMerchantRequest`.[#1248](https://github.com/stripe/stripe-react-native/pull/1248)
+- Added an `options` argument to `presentPaymentSheet` which includes a `timeout` property. [#1287](https://github.com/stripe/stripe-react-native/pull/1287)
+
+## 0.23.3 - 2023-02-07
+
+### Fixes
+
+- Fixes a build failure on Android when using `stripe-android` v20.19.2. [#1289](https://github.com/stripe/stripe-react-native/pull/1289)
+
 ## 0.23.2 - 2023-02-06
 
-## Fixes
+### Fixes
 
 - Fixed a bug on Android where `canAddCardToWallet` wouldn't correctly return the `details.token` object. [#1282](https://github.com/stripe/stripe-react-native/pull/1282)
 
 ## 0.23.1 - 2023-01-25
 
-## Fixes
+### Fixes
 
 - Fixed an issue with `confirmPlatformPaySetupIntent` on iOS. [#1266](https://github.com/stripe/stripe-react-native/pull/1266)
 - Fixed types so that Klarna accepts the `shippingDetails` property. [#1272](https://github.com/stripe/stripe-react-native/pull/1272)
@@ -23,7 +53,7 @@
 - `createPlatformPayPaymentMethod` no longer returns a `token` object. [#1236](https://github.com/stripe/stripe-react-native/issues/1236)
   - If your integration depends on Stripe's Tokens API, please use `createPlatformPayToken`, which accepts identical arguments.
 
-## Fixes
+### Fixes
 
 - Fixed an issue with `createPlatformPayPaymentMethod` on iOS where a "Canceled" error could be returned in production. [#1236](https://github.com/stripe/stripe-react-native/issues/1236)
 - Fixed an issue where the `PlatformPayButton` with `type={PlatformPay.ButtonType.GooglePayMark}` would be unclickable. [#1236](https://github.com/stripe/stripe-react-native/issues/1236)
@@ -32,7 +62,7 @@
 
 ## 0.22.1 - 2022-12-07
 
-## Fixes
+### Fixes
 
 - Fixed the `ShippingMethod` type to contain the `isPending` field instead of a `type` field (which previously was never correct). This reflects the inputs accepted. [#1227](https://github.com/stripe/stripe-react-native/pull/1227)
 - Fixed the `ShippingMethod` type to contain the `startDate` and `endDate` keys, if applicable. [#1227](https://github.com/stripe/stripe-react-native/pull/1227)
@@ -48,7 +78,7 @@
 - Added the `hasPairedAppleWatch` option to `canAddCardToWallet`. [#1219](https://github.com/stripe/stripe-react-native/pull/1219)
 - Added new functions and a new component to streamline integrating with Apple and Google Pay and add more feature support. See the [Migrating to Platform Pay guide](https://github.com/stripe/stripe-react-native/blob/master/docs/Platform-Pay-Migration.md) for more details. The old Apple and Google Pay APIs are marked as `deprecated` and will be removed in a future release, but are still supported in this version.
 
-## Fixes
+### Fixes
 
 - Fixed an issue where builds would error with the message `'const' enums are not supported.` [see commit](https://github.com/stripe/stripe-react-native/commit/f882bfa588aa6d23a980b4b43d2cca660ca1dd2a)
 - Fixed an issue where the `canAddCardToWallet` method would sometimes wrongly return `false` with a `details.status` of `MISSING_CONFIGURATION` in production builds. [#1215](https://github.com/stripe/stripe-react-native/pull/1215)
@@ -65,7 +95,7 @@
   - [Find the docs here](https://stripe.com/docs/elements/address-element?platform=react-native)
 - Added the `defaultShippingDetails` field to the `params` argument in `initPaymentSheet(params)`. This will allow you to collect shipping details (either in your own UI or using the new `<AddressSheet />` component) for payments in the Payment Sheet. [#1169](https://github.com/stripe/stripe-react-native/pull/1169)
 
-## Fixes
+### Fixes
 
 - Fixed a build error on Android when using Kotlin version 1.7.10. [#1195](https://github.com/stripe/stripe-react-native/pull/1195)
 
@@ -83,7 +113,7 @@
 - Added support for custom fonts to `CardForm` and `CardView` on Android. [#1150](https://github.com/stripe/stripe-react-native/pull/1150)
 - Added support for customizing the call to action button label in Payment Sheet by providing the `primaryButtonLabel` property to `initPaymentSheet()`. [#1190](https://github.com/stripe/stripe-react-native/pull/1190)
 
-## Fixes
+### Fixes
 
 - Fixed an issue on iOS where `confirmSetupIntent` would throw an error if the `Card` payment method was provided with the `paymentMethodId` parameter. [#1151](https://github.com/stripe/stripe-react-native/pull/1151)
 - Upgraded `stripe-android` to 20.15.+. [#1176](https://github.com/stripe/stripe-react-native/pull/1176)
@@ -103,7 +133,7 @@
 
 - Add `returnURL` as an optional parameter to `handleNextAction`. Use this so the Stripe SDK can redirect back to your app after authentication. [#1104](https://github.com/stripe/stripe-react-native/pull/1104)
 
-## Fixes
+### Fixes
 
 - Fixed an issue where the error resolved on iOS wasn't the root error. [#1105](https://github.com/stripe/stripe-react-native/pull/1105)
 - Fix Expo Config Plugin support on SDK 46. [#1111](https://github.com/stripe/stripe-react-native/pull/1111)
@@ -115,7 +145,7 @@
 
 ### New features
 
-## Fixes
+### Fixes
 
 - Fixed an issue where some promises on Android would never resolve when using React Native 0.65.x or under. [#1089](https://github.com/stripe/stripe-react-native/pull/1089).
 

package/android/gradle.properties

@@ -1,2 +1,2 @@
-StripeSdk_kotlinVersion=1.6.21
-StripeSdk_stripeVersion=20.19.+
+StripeSdk_kotlinVersion=1.8.0
+StripeSdk_stripeVersion=[20.19.2, 20.20.0[

package/android/src/main/java/com/reactnativestripesdk/PaymentLauncherFragment.kt

@@ -262,7 +262,8 @@ class PaymentLauncherFragment(
       StripeIntent.NextActionType.BlikAuthorize,
       StripeIntent.NextActionType.WeChatPayRedirect,
       StripeIntent.NextActionType.UpiAwaitNotification,
-      null -> false
+      StripeIntent.NextActionType.CashAppRedirect,
+      null, -> false
     }
   }
 }

package/android/src/main/java/com/reactnativestripesdk/PaymentSheetFragment.kt

@@ -1,10 +1,14 @@
 package com.reactnativestripesdk
 
+import android.app.Activity
+import android.app.Application
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.util.Base64
 import android.view.LayoutInflater
 import android.view.View
@@ -21,10 +25,7 @@ import com.reactnativestripesdk.addresssheet.AddressSheetView
 import com.reactnativestripesdk.utils.*
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createResult
-import com.stripe.android.paymentsheet.PaymentOptionCallback
-import com.stripe.android.paymentsheet.PaymentSheet
-import com.stripe.android.paymentsheet.PaymentSheetResult
-import com.stripe.android.paymentsheet.PaymentSheetResultCallback
+import com.stripe.android.paymentsheet.*
 import java.io.ByteArrayOutputStream
 
 class PaymentSheetFragment(
@@ -38,6 +39,7 @@ class PaymentSheetFragment(
   private lateinit var paymentSheetConfiguration: PaymentSheet.Configuration
   private var confirmPromise: Promise? = null
   private var presentPromise: Promise? = null
+  private var paymentSheetTimedOut = false
 
   override fun onCreateView(
     inflater: LayoutInflater,
@@ -84,23 +86,35 @@ class PaymentSheetFragment(
         option.putString("image", imageString)
         createResult("paymentOption", option)
       } ?: run {
-        createError(PaymentSheetErrorType.Canceled.toString(), "The payment option selection flow has been canceled")
+        if (paymentSheetTimedOut) {
+          paymentSheetTimedOut = false
+          createError(PaymentSheetErrorType.Timeout.toString(), "The payment has timed out")
+        } else {
+          createError(PaymentSheetErrorType.Canceled.toString(), "The payment option selection flow has been canceled")
+        }
       }
       presentPromise?.resolve(result)
     }
 
     val paymentResultCallback = PaymentSheetResultCallback { paymentResult ->
-      when (paymentResult) {
-        is PaymentSheetResult.Canceled -> {
-          resolvePaymentResult(createError(PaymentSheetErrorType.Canceled.toString(), "The payment flow has been canceled"))
-        }
-        is PaymentSheetResult.Failed -> {
-          resolvePaymentResult(createError(PaymentSheetErrorType.Failed.toString(), paymentResult.error))
-        }
-        is PaymentSheetResult.Completed -> {
-          resolvePaymentResult(WritableNativeMap())
-          // Remove the fragment now, we can be sure it won't be needed again if an intent is successful
-          removeFragment(context)
+      if (paymentSheetTimedOut) {
+        paymentSheetTimedOut = false
+        resolvePaymentResult(createError(PaymentSheetErrorType.Timeout.toString(), "The payment has timed out"))
+      } else {
+        when (paymentResult) {
+          is PaymentSheetResult.Canceled -> {
+            resolvePaymentResult(createError(PaymentSheetErrorType.Canceled.toString(), "The payment flow has been canceled"))
+          }
+          is PaymentSheetResult.Failed -> {
+            resolvePaymentResult(createError(PaymentSheetErrorType.Failed.toString(), paymentResult.error))
+          }
+          is PaymentSheetResult.Completed -> {
+            resolvePaymentResult(WritableNativeMap())
+            // Remove the fragment now, we can be sure it won't be needed again if an intent is successful
+            removeFragment(context)
+            paymentSheet = null
+            flowController = null
+          }
         }
       }
     }
@@ -155,7 +169,45 @@ class PaymentSheetFragment(
       }
     } else if(flowController != null) {
       flowController?.presentPaymentOptions()
+    } else {
+      promise.resolve(createMissingInitError())
+    }
+  }
+
+  fun presentWithTimeout(timeout: Long, promise: Promise) {
+    var paymentSheetActivity: Activity? = null
+
+    val activityLifecycleCallbacks = object : Application.ActivityLifecycleCallbacks {
+      override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        paymentSheetActivity = activity
+      }
+
+      override fun onActivityStarted(activity: Activity) {}
+
+      override fun onActivityResumed(activity: Activity) {}
+
+      override fun onActivityPaused(activity: Activity) {}
+
+      override fun onActivityStopped(activity: Activity) {}
+
+      override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+
+      override fun onActivityDestroyed(activity: Activity) {
+        paymentSheetActivity = null
+        context.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
+      }
     }
+
+    Handler(Looper.getMainLooper()).postDelayed({
+      paymentSheetActivity?.let {
+        it.finish()
+        paymentSheetTimedOut = true
+      }
+    }, timeout)
+
+    context.currentActivity?.application?.registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
+
+    this.present(promise)
   }
 
   fun confirmPayment(promise: Promise) {
@@ -205,6 +257,10 @@ class PaymentSheetFragment(
   companion object {
     internal const val TAG = "payment_sheet_launch_fragment"
 
+    internal fun createMissingInitError(): WritableMap {
+      return createError(PaymentSheetErrorType.Failed.toString(), "No payment sheet has been initialized yet. You must call `initPaymentSheet` before `presentPaymentSheet`.")
+    }
+
     internal fun buildGooglePayConfig(params: Bundle?): PaymentSheet.GooglePayConfiguration? {
       if (params == null) {
         return null

package/android/src/main/java/com/reactnativestripesdk/StripeSdkModule.kt

@@ -172,12 +172,29 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
   }
 
   @ReactMethod
-  fun presentPaymentSheet(promise: Promise) {
-    paymentSheetFragment?.present(promise)
+  fun presentPaymentSheet(options: ReadableMap, promise: Promise) {
+    if (paymentSheetFragment == null) {
+      promise.resolve(PaymentSheetFragment.createMissingInitError())
+      return
+    }
+
+    val timeoutKey = "timeout"
+    if (options.hasKey(timeoutKey)) {
+      paymentSheetFragment?.presentWithTimeout(
+        options.getInt(timeoutKey).toLong(), promise
+      )
+    } else {
+      paymentSheetFragment?.present(promise)
+    }
   }
 
   @ReactMethod
   fun confirmPaymentSheetPayment(promise: Promise) {
+    if (paymentSheetFragment == null) {
+      promise.resolve(PaymentSheetFragment.createMissingInitError())
+      return
+    }
+
     paymentSheetFragment?.confirmPayment(promise)
   }
 

package/android/src/main/java/com/reactnativestripesdk/utils/Errors.kt

@@ -34,7 +34,7 @@ enum class RetrieveSetupIntentErrorType {
 }
 
 enum class PaymentSheetErrorType {
-  Failed, Canceled
+  Failed, Canceled, Timeout
 }
 
 enum class GooglePayErrorType {

package/android/src/main/java/com/reactnativestripesdk/utils/Mappers.kt

@@ -482,7 +482,7 @@ internal fun mapNextAction(type: NextActionType?, data: NextActionData?): Writab
     NextActionType.AlipayRedirect -> { // TODO: Can't access, private
       return null
     }
-    NextActionType.BlikAuthorize, NextActionType.UseStripeSdk, NextActionType.UpiAwaitNotification,  null -> {
+    NextActionType.CashAppRedirect, NextActionType.BlikAuthorize, NextActionType.UseStripeSdk, NextActionType.UpiAwaitNotification,  null -> {
       return null
     }
   }

package/ios/ApplePayButtonManager.m

@@ -11,5 +11,6 @@ RCT_EXPORT_VIEW_PROPERTY(disabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(onShippingMethodSelectedAction, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onShippingContactSelectedAction, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onCouponCodeEnteredAction, RCTDirectEventBlock)
+RCT_EXPORT_VIEW_PROPERTY(onOrderTrackingAction, RCTDirectEventBlock)
 
 @end

package/ios/ApplePayButtonView.swift

@@ -10,6 +10,7 @@ class ApplePayButtonView: UIView {
     @objc var onShippingMethodSelectedAction: RCTDirectEventBlock?
     @objc var onShippingContactSelectedAction: RCTDirectEventBlock?
     @objc var onCouponCodeEnteredAction: RCTDirectEventBlock?
+    @objc var onOrderTrackingAction: RCTDirectEventBlock?
     
     @objc var type: NSNumber?
     @objc var buttonStyle: NSNumber?
@@ -33,6 +34,7 @@ class ApplePayButtonView: UIView {
             stripeSdk?.shippingMethodUpdateJSCallback = onShippingMethodSelectedAction
             stripeSdk?.shippingContactUpdateJSCallback = onShippingContactSelectedAction
             stripeSdk?.couponCodeEnteredJSCallback = onCouponCodeEnteredAction
+            stripeSdk?.platformPayOrderTrackingJSCallback = onOrderTrackingAction
         }
     }
     

package/ios/ApplePayUtils.swift

@@ -19,11 +19,7 @@ class ApplePayUtils {
         }
 
         if let additionalEnabledNetworks = params["additionalEnabledNetworks"] as? [String] {
-            do {
-                StripeAPI.additionalEnabledApplePayNetworks = try ApplePayUtils.mapToArrayOfPaymentNetworks(arrayOfStrings: additionalEnabledNetworks)
-            } catch {
-                return (Errors.createError(ErrorType.Failed, error.localizedDescription), nil)
-            }
+            StripeAPI.additionalEnabledApplePayNetworks = ApplePayUtils.mapToArrayOfPaymentNetworks(arrayOfStrings: additionalEnabledNetworks)
         } else if (params["jcbEnabled"] as? Bool == true) {
             StripeAPI.additionalEnabledApplePayNetworks = [.JCB]
         }
@@ -61,7 +57,7 @@ class ApplePayUtils {
         do {
             paymentRequest.paymentSummaryItems = try ApplePayUtils
                 .buildPaymentSummaryItems(items: summaryItems as? [[String : Any]])
-        } catch  {
+        } catch {
             return (Errors.createError(ErrorType.Failed, error.localizedDescription), nil)
         }
         
@@ -84,10 +80,79 @@ class ApplePayUtils {
                 paymentRequest.couponCode = couponCode
             }
         }
-        
+
+        do {
+            try paymentRequest.configureRequestType(requestParams: params["request"] as? NSDictionary)
+        } catch {
+            return (Errors.createError(ErrorType.Failed, error.localizedDescription), nil)
+        }
+
         return (nil, paymentRequest)
     }
     
+#if compiler(>=5.7)
+    @available(iOS 16.0, *)
+    internal class func buildRecurringPaymentRequest(params: NSDictionary) throws -> PKRecurringPaymentRequest {
+        guard let description = params["description"] as? String else {
+            throw ApplePayUtilsError.missingParameter(nil, "description")
+        }
+        guard let urlString = params["managementUrl"] as? String else {
+            throw ApplePayUtilsError.missingParameter(nil, "managementUrl")
+        }
+        guard let url = URL(string: urlString) else {
+            throw ApplePayUtilsError.invalidUrl(urlString)
+        }
+        let regularBilling = try ApplePayUtils.createRecurringPaymentSummaryItem(item: params["billing"] as? [String : Any] ?? [:])
+        let request = PKRecurringPaymentRequest(paymentDescription: description, regularBilling: regularBilling, managementURL: url)
+        if let trialParams = params["trialBilling"] as? [String : Any] {
+            request.trialBilling = try ApplePayUtils.createRecurringPaymentSummaryItem(item: trialParams)
+        }
+        if let tokenNotificationURL = params["tokenNotificationURL"] as? String {
+            request.tokenNotificationURL = URL(string: tokenNotificationURL)
+        }
+        request.billingAgreement = params["billingAgreement"] as? String
+        return request
+    }
+    
+    @available(iOS 16.0, *)
+    internal class func buildAutomaticReloadPaymentRequest(params: NSDictionary) throws -> PKAutomaticReloadPaymentRequest {
+        guard let description = params["description"] as? String else {
+            throw ApplePayUtilsError.missingParameter(nil, "description")
+        }
+        guard let urlString = params["managementUrl"] as? String else {
+            throw ApplePayUtilsError.missingParameter(nil, "managementUrl")
+        }
+        guard let url = URL(string: urlString) else {
+            throw ApplePayUtilsError.invalidUrl(urlString)
+        }
+        let automaticReloadBilling = PKAutomaticReloadPaymentSummaryItem.init(label: params["label"] as? String ?? "", amount: NSDecimalNumber(string: params["reloadAmount"] as? String ?? ""))
+        guard let threshold = params["thresholdAmount"] as? String else {
+            throw ApplePayUtilsError.missingParameter(nil, "thresholdAmount")
+        }
+        automaticReloadBilling.thresholdAmount = NSDecimalNumber(string: threshold)
+        let request = PKAutomaticReloadPaymentRequest(paymentDescription: description, automaticReloadBilling: automaticReloadBilling, managementURL: url)
+        if let tokenNotificationURL = params["tokenNotificationURL"] as? String {
+            request.tokenNotificationURL = URL(string: tokenNotificationURL)
+        }
+        request.billingAgreement = params["billingAgreement"] as? String
+        return request
+    }
+    
+    @available(iOS 16.0, *)
+    internal class func buildPaymentTokenContexts(items: [[String : Any]]) -> [PKPaymentTokenContext] {
+        var result: [PKPaymentTokenContext] = []
+        for item in items {
+            let context = PKPaymentTokenContext.init(merchantIdentifier: item["merchantIdentifier"] as? String ?? "",
+                                                     externalIdentifier: item["externalIdentifier"] as? String ?? "",
+                                                     merchantName: item["merchantName"] as? String ?? "",
+                                                     merchantDomain: item["merchantDomain"] as? String,
+                                                     amount: NSDecimalNumber(string: item["thresholdAmount"] as? String ?? ""))
+            result.append(context)
+        }
+        return result
+    }
+#endif
+    
     internal class func getMerchantCapabilityFrom(string: String?) -> PKMerchantCapability {
         switch string {
         case "supportsDebit":
@@ -119,7 +184,7 @@ class ApplePayUtils {
     }
     
     @available(iOS 15.0, *)
-    internal class func createDeferredPaymentSummaryItem(item: [String : Any]) throws -> PKPaymentSummaryItem {
+    internal class func createDeferredPaymentSummaryItem(item: [String : Any]) throws -> PKDeferredPaymentSummaryItem {
         let label = item["label"] as? String ?? ""
         let amount = NSDecimalNumber(string: item["amount"] as? String ?? "")
         
@@ -135,7 +200,7 @@ class ApplePayUtils {
     }
     
     @available(iOS 15.0, *)
-    internal class func createRecurringPaymentSummaryItem(item: [String : Any]) throws -> PKPaymentSummaryItem {
+    internal class func createRecurringPaymentSummaryItem(item: [String : Any]) throws -> PKRecurringPaymentSummaryItem {
         let label = item["label"] as? String ?? ""
         let amount = NSDecimalNumber(string: item["amount"] as? String ?? "")
         
@@ -285,8 +350,8 @@ class ApplePayUtils {
         return (shippingAddressErrors, couponCodeErrors)
     }
     
-    internal class func mapToArrayOfPaymentNetworks(arrayOfStrings: [String]) throws -> [PKPaymentNetwork] {
-        let validNetworks: [PKPaymentNetwork?] = try arrayOfStrings.map { networkString in
+    internal class func mapToArrayOfPaymentNetworks(arrayOfStrings: [String]) -> [PKPaymentNetwork] {
+        let validNetworks: [PKPaymentNetwork?] = arrayOfStrings.map { networkString in
             return PKPaymentNetwork.init(rawValue: networkString)
         }
         return validNetworks.compactMap { $0 }
@@ -295,7 +360,9 @@ class ApplePayUtils {
     public class func buildPaymentSheetApplePayConfig(
         merchantIdentifier: String?,
         merchantCountryCode: String?,
-        paymentSummaryItems: [[String : Any]]?
+        paymentSummaryItems: [[String : Any]]?,
+        buttonType: NSNumber?,
+        customHandlers: PaymentSheet.ApplePayConfiguration.Handlers?
     ) throws -> PaymentSheet.ApplePayConfiguration {
         guard let merchantId = merchantIdentifier else {
             throw ApplePayUtilsError.missingMerchantId
@@ -306,20 +373,25 @@ class ApplePayUtils {
         let paymentSummaryItems = try ApplePayUtils.buildPaymentSummaryItems(
             items: paymentSummaryItems
         )
+        
         return PaymentSheet.ApplePayConfiguration.init(
             merchantId: merchantId,
             merchantCountryCode: countryCode,
-            paymentSummaryItems:paymentSummaryItems.count > 0 ? paymentSummaryItems : nil
+            buttonType: PKPaymentButtonType(rawValue: buttonType as? Int ?? 0) ?? .plain,
+            paymentSummaryItems: paymentSummaryItems.count > 0 ? paymentSummaryItems : nil,
+            customHandlers: customHandlers
         )
     }
 }
 
 enum ApplePayUtilsError : Error, Equatable {
     case invalidCartSummaryItemType(String)
-    case missingParameter(String, String)
+    case missingParameter(String?, String)
     case invalidTimeInterval(String)
     case invalidPaymentNetwork(String)
     case invalidErrorType(String)
+    case invalidUrl(String)
+    case invalidRequestType(String)
     case missingMerchantId
     case missingCountryCode
 }
@@ -330,7 +402,11 @@ extension ApplePayUtilsError: LocalizedError {
         case .invalidCartSummaryItemType(let type):
             return "Failed to ceate Apple Pay summary item. Expected `type` to be one of 'Immediate', 'Recurring', or 'Deferred', but received: \(type)"
         case .missingParameter(let label, let parameter):
-            return "Failed to create Apple Pay summary item with label: \(label). The \(parameter) item parameter is required, but none was provided."
+            if let label = label {
+                return "Failed to create Apple Pay summary item with label: \(label). The \(parameter) item parameter is required, but none was provided."
+            } else {
+                return "The \(parameter) item parameter is required, but none was provided."
+            }
         case .invalidTimeInterval(let providedInterval):
             return "Failed to create Apple Pay summary item. \(providedInterval) is not a valid timeInterval, must be one of: minute, hour, day, month, or year."
         case .invalidPaymentNetwork(let network):
@@ -341,6 +417,31 @@ extension ApplePayUtilsError: LocalizedError {
             return "`merchantIdentifier` is required, but none was found. Ensure you are passing this to initStripe your StripeProvider."
         case .missingCountryCode:
             return "`merchantCountryCode` is a required param, but was not provided."
+        case .invalidUrl(let url):
+            return "Invalid URL: \(url)."
+        case .invalidRequestType(let tyoe):
+            return "Apple Pay request type `\(tyoe)` is not supported."
+        }
+    }
+}
+
+extension PKPaymentRequest {
+    func configureRequestType(requestParams: NSDictionary?) throws -> Void {
+#if compiler(>=5.7)
+        if #available(iOS 16.0, *) {
+            if let requestParams = requestParams {
+                switch requestParams["type"] as? String {
+                case "Recurring":
+                    self.recurringPaymentRequest = try ApplePayUtils.buildRecurringPaymentRequest(params: requestParams)
+                case "AutomaticReload":
+                    self.automaticReloadPaymentRequest = try ApplePayUtils.buildAutomaticReloadPaymentRequest(params: requestParams)
+                case "MultiMerchant":
+                    self.multiTokenContexts = ApplePayUtils.buildPaymentTokenContexts(items: requestParams["merchants"] as? [[String : Any]] ?? [])
+                default:
+                    throw ApplePayUtilsError.invalidRequestType(String(describing: requestParams["type"]))
+                }
+            }
         }
+#endif
     }
 }

package/ios/ApplePayViewController.swift

@@ -177,6 +177,19 @@ extension StripeSdk : PKPaymentAuthorizationViewControllerDelegate, STPApplePayC
         }
     }
     
+   func applePayContext(
+       _ context: STPApplePayContext,
+       willCompleteWithResult authorizationResult: PKPaymentAuthorizationResult,
+       handler: @escaping (PKPaymentAuthorizationResult) -> Void
+   ) {
+       if let callback = self.platformPayOrderTrackingJSCallback {
+           self.orderTrackingHandler = (authorizationResult, handler)
+           callback(nil)
+       } else {
+           handler(authorizationResult)
+       }
+   }
+    
     func applePayContext(
         _ context: STPApplePayContext,
         didCompleteWith status: STPPaymentStatus,

package/ios/Errors.swift

@@ -5,6 +5,7 @@ enum ErrorType {
     static let Failed = "Failed"
     static let Canceled = "Canceled"
     static let Unknown = "Unknown"
+    static let Timeout = "Timeout"
 }
 
 class Errors {