@stripe/stripe-react-native 0.27.2 → 0.29.0

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 ## Unreleased
 
+## 0.29.0 - 2023-07-13
+
+### Breaking changes
+
+- The Apple Pay and Google Pay APIs, which are deprecated and were replaced with the [Platform Pay API](https://github.com/stripe/stripe-react-native/blob/master/docs/Platform-Pay-Migration.md) last year, have been removed. [#1424](https://github.com/stripe/stripe-react-native/pull/1424)
+
+## Features
+
+- You can now collect payment details before creating a `PaymentIntent` or `SetupIntent`. See [our docs](https://stripe.com/docs/payments/accept-a-payment-deferred?platform=react-native) for more info. This integration also allows you to [confirm the Intent on the server](https://stripe.com/docs/payments/finalize-payments-on-the-server?platform=react-native). [#1424](https://github.com/stripe/stripe-react-native/pull/1424)
+
+## Fixes
+
+- Fixes `handleURLCallback` to only take action on iOS, no-op on Android. [#1423](https://github.com/stripe/stripe-react-native/pull/1423)
+
+## 0.28.0 - 2023-06-16
+
+## Features
+
+- Added a `disabled` prop to `CardField` and `CardForm` which applies a disabled state such that user input is not accepted.  [#1403](https://github.com/stripe/stripe-react-native/pull/1403)
+
+## Fixes
+
+- Fixed an instance on Android where `collectBankAccountToken` or `collectFinancialConnectionsAccounts` could result in a fatal error. [#1401](https://github.com/stripe/stripe-react-native/pull/1401)
+- Resolve with better error objects on iOS in `confirmPaymentSheetPayment`, `createTokenForCVCUpdate`, `createPaymentMethod`, `retrievePaymentIntent`, and `retrieveSetupIntent`  [#1399](https://github.com/stripe/stripe-react-native/pull/1399)
+
 ## 0.27.2 - 2023-05-15
 
 ## Fixes

package/README.md

@@ -228,11 +228,11 @@ jest.mock('@stripe/stripe-react-native', () => mock);
 To have a more control over the mocks, you can extend and override particular methods e.g.:
 
 ```tsx
-const presentApplePayMock = jest.fn();
+const presentNativePayMock = jest.fn();
 
 jest.mock('@stripe/stripe-react-native', () => ({
   ...mock,
-  presentApplePay: presentApplePayMock,
+  presentNativePay: presentNativePayMock,
 }));
 ```
 

package/android/gradle.properties

@@ -1,3 +1,3 @@
 StripeSdk_kotlinVersion=1.8.0
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=20.25.+
+StripeSdk_stripeVersion=20.27.+

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

@@ -209,6 +209,10 @@ class CardFieldView(context: ThemedReactContext) : FrameLayout(context) {
     }
   }
 
+  fun setDisabled(isDisabled: Boolean) {
+    mCardWidget.isEnabled = !isDisabled
+  }
+
   /**
    * We can reliable assume that setPostalCodeEnabled is called before
    * setCountryCode because of the order of the props in CardField.tsx

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

@@ -56,6 +56,11 @@ class CardFieldViewManager : SimpleViewManager<CardFieldView>() {
     view.setPlaceHolders(placeholders)
   }
 
+  @ReactProp(name = "disabled")
+  fun setDisabled(view: CardFieldView, isDisabled: Boolean) {
+    view.setDisabled(isDisabled)
+  }
+
   override fun createViewInstance(reactContext: ThemedReactContext): CardFieldView {
     val stripeSdkModule: StripeSdkModule? = reactContext.getNativeModule(StripeSdkModule::class.java)
     val view = CardFieldView(reactContext)

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

@@ -58,6 +58,10 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
     setCountry(defaults.getString("countryCode"))
   }
 
+  fun setDisabled(isDisabled: Boolean) {
+    cardForm.isEnabled = !isDisabled
+  }
+
   private fun setCountry(countryString: String?) {
     if (countryString != null) {
       cardFormViewBinding.countryLayout.setSelectedCountryCode(CountryCode(countryString))

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

@@ -56,6 +56,11 @@ class CardFormViewManager : SimpleViewManager<CardFormView>() {
     view.setDefaultValues(defaults)
   }
 
+  @ReactProp(name = "disabled")
+  fun setDisabled(view: CardFormView, isDisabled: Boolean) {
+    view.setDisabled(isDisabled)
+  }
+
   override fun createViewInstance(reactContext: ThemedReactContext): CardFormView {
     val stripeSdkModule: StripeSdkModule? = reactContext.getNativeModule(StripeSdkModule::class.java)
     val view = CardFormView(reactContext)

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

@@ -180,18 +180,44 @@ class FinancialConnectionsSheetFragment : Fragment() {
       val map = WritableNativeMap()
       map.putDouble("asOf", balance.asOf * 1000.0)
       map.putString("type", mapFromBalanceType(balance.type))
-      map.putMap("current", balance.current as ReadableMap)
       WritableNativeMap().also {
-        it.putMap("available", balance.cash?.available as ReadableMap)
-        map.putMap("cash", it)
-      }
-      WritableNativeMap().also {
-        it.putMap("used", balance.credit?.used as ReadableMap)
-        map.putMap("credit", it)
+        for (entry in balance.current.entries) {
+          it.putInt(entry.key, entry.value)
+        }
+        map.putMap("current", it)
       }
+      map.putMap("cash", mapFromCashAvailable(balance))
+      map.putMap("credit", mapFromCreditUsed(balance))
+
       return map
     }
 
+    private fun mapFromCashAvailable(balance: Balance): WritableNativeMap {
+      return WritableNativeMap().also { cashMap ->
+        WritableNativeMap().also { availableMap ->
+          balance.cash?.available?.entries?.let { entries ->
+            for (entry in entries) {
+              availableMap.putInt(entry.key, entry.value)
+            }
+          }
+          cashMap.putMap("available", availableMap)
+        }
+      }
+    }
+
+    private fun mapFromCreditUsed(balance: Balance): WritableNativeMap {
+      return WritableNativeMap().also { creditMap ->
+        WritableNativeMap().also { usedMap ->
+          balance.credit?.used?.entries?.let { entries ->
+            for (entry in entries) {
+              usedMap.putInt(entry.key, entry.value)
+            }
+          }
+          creditMap.putMap("used", usedMap)
+        }
+      }
+    }
+
     private fun mapFromAccountBalanceRefresh(balanceRefresh: BalanceRefresh?): WritableMap? {
       if (balanceRefresh == null) {
         return null

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

@@ -15,11 +15,6 @@ class GooglePayButtonManager : SimpleViewManager<GooglePayButtonView?>() {
     view.initialize()
   }
 
-  @ReactProp(name = "buttonType")
-  fun buttonType(view: GooglePayButtonView, buttonType: String) {
-    view.setButtonType(buttonType)
-  }
-
   @ReactProp(name = "type")
   fun type(view: GooglePayButtonView, buttonType: Int) {
     view.setType(buttonType)

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

@@ -7,33 +7,21 @@ import com.facebook.react.uimanager.ThemedReactContext
 
 class GooglePayButtonView(private val context: ThemedReactContext) : FrameLayout(context) {
   private var button: View? = null
-  // Used in legacy GooglePayButton implementations
-  private var buttonType: String? = null
-
-  // Used in the new PlatformPayButton implementations
   private var type: Int? = null
 
   fun initialize() {
     val resAsset: Int =
-      if (type != null) {
-        when (type) {
-          0 -> R.layout.plain_googlepay_button
-          1 -> R.layout.buy_with_googlepay_button
-          6 -> R.layout.book_with_googlepay_button
-          5 -> R.layout.checkout_with_googlepay_button
-          4 -> R.layout.donate_with_googlepay_button
-          11 -> R.layout.order_with_googlepay_button
-          1000 -> R.layout.pay_with_googlepay_button
-          7 -> R.layout.subscribe_with_googlepay_button
-          1001 -> R.layout.googlepay_mark_button
-          else -> R.layout.plain_googlepay_button
-        }
-      } else {
-        when (buttonType) {
-          "pay" -> R.layout.pay_with_googlepay_button
-          "standard" -> R.layout.plain_googlepay_button
-          else -> R.layout.plain_googlepay_button
-        }
+      when (type) {
+        0 -> R.layout.plain_googlepay_button
+        1 -> R.layout.buy_with_googlepay_button
+        6 -> R.layout.book_with_googlepay_button
+        5 -> R.layout.checkout_with_googlepay_button
+        4 -> R.layout.donate_with_googlepay_button
+        11 -> R.layout.order_with_googlepay_button
+        1000 -> R.layout.pay_with_googlepay_button
+        7 -> R.layout.subscribe_with_googlepay_button
+        1001 -> R.layout.googlepay_mark_button
+        else -> R.layout.plain_googlepay_button
       }
 
     button = LayoutInflater.from(context).inflate(
@@ -56,10 +44,6 @@ class GooglePayButtonView(private val context: ThemedReactContext) : FrameLayout
     button?.layout(left, top, right, bottom)
   }
 
-  fun setButtonType(type: String) {
-    buttonType = type
-  }
-
   fun setType(type: Int) {
     this.type = type
   }

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

@@ -17,16 +17,15 @@ import android.widget.FrameLayout
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.fragment.app.Fragment
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.bridge.*
 import com.reactnativestripesdk.addresssheet.AddressSheetView
 import com.reactnativestripesdk.utils.*
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createResult
 import com.stripe.android.paymentsheet.*
+import kotlinx.coroutines.CompletableDeferred
 import java.io.ByteArrayOutputStream
+import kotlin.Exception
 
 class PaymentSheetFragment(
   private val context: ReactApplicationContext,
@@ -36,10 +35,12 @@ class PaymentSheetFragment(
   private var flowController: PaymentSheet.FlowController? = null
   private var paymentIntentClientSecret: String? = null
   private var setupIntentClientSecret: String? = null
+  private var intentConfiguration: PaymentSheet.IntentConfiguration? = null
   private lateinit var paymentSheetConfiguration: PaymentSheet.Configuration
   private var confirmPromise: Promise? = null
   private var presentPromise: Promise? = null
   private var paymentSheetTimedOut = false
+  internal val paymentSheetIntentCreationCallback = CompletableDeferred<ReadableMap>()
 
   override fun onCreateView(
     inflater: LayoutInflater,
@@ -67,6 +68,12 @@ class PaymentSheetFragment(
     val billingConfigParams = arguments?.getBundle("billingDetailsCollectionConfiguration")
     paymentIntentClientSecret = arguments?.getString("paymentIntentClientSecret").orEmpty()
     setupIntentClientSecret = arguments?.getString("setupIntentClientSecret").orEmpty()
+    intentConfiguration = try {
+      buildIntentConfiguration(arguments?.getBundle("intentConfiguration"))
+    } catch (error: PaymentSheetException) {
+      initPromise.resolve(createError(ErrorType.Failed.toString(), error))
+      return
+    }
     val appearance = try {
       buildPaymentSheetAppearance(arguments?.getBundle("appearance"), context)
     } catch (error: PaymentSheetAppearanceException) {
@@ -120,6 +127,34 @@ class PaymentSheetFragment(
       }
     }
 
+    val createIntentCallback = CreateIntentCallback {  paymentMethod, shouldSavePaymentMethod ->
+      val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
+      if (stripeSdkModule == null || stripeSdkModule.eventListenerCount == 0) {
+        return@CreateIntentCallback CreateIntentResult.Failure(
+          cause = Exception("Tried to call confirmHandler, but no callback was found. Please file an issue: https://github.com/stripe/stripe-react-native/issues"),
+          displayMessage = "An unexpected error occurred"
+          )
+      }
+      val params = Arguments.createMap().apply {
+        putMap("paymentMethod", mapFromPaymentMethod(paymentMethod))
+        putBoolean("shouldSavePaymentMethod", shouldSavePaymentMethod)
+      }
+
+      stripeSdkModule.sendEvent(context, "onConfirmHandlerCallback", params)
+
+      val resultFromJavascript = paymentSheetIntentCreationCallback.await()
+
+      return@CreateIntentCallback resultFromJavascript.getString("clientSecret")?.let {
+        CreateIntentResult.Success(clientSecret = it)
+      } ?: run {
+        val errorMap = resultFromJavascript.getMap("error")
+        CreateIntentResult.Failure(
+          cause = Exception(errorMap?.getString("message")),
+          displayMessage = errorMap?.getString("localizedMessage")
+        )
+      }
+    }
+
     val billingDetailsConfig = PaymentSheet.BillingDetailsCollectionConfiguration(
       name = mapToCollectionMode(billingConfigParams?.getString("name")),
       phone = mapToCollectionMode(billingConfigParams?.getString("phone")),
@@ -162,10 +197,34 @@ class PaymentSheetFragment(
     )
 
     if (arguments?.getBoolean("customFlow") == true) {
-      flowController = PaymentSheet.FlowController.create(this, paymentOptionCallback, paymentResultCallback)
+      flowController = if (intentConfiguration != null) {
+        PaymentSheet.FlowController.create(
+          this,
+          paymentOptionCallback = paymentOptionCallback,
+          createIntentCallback = createIntentCallback,
+          paymentResultCallback = paymentResultCallback
+        )
+      } else {
+        PaymentSheet.FlowController.create(
+          this,
+          paymentOptionCallback = paymentOptionCallback,
+          paymentResultCallback = paymentResultCallback
+        )
+      }
       configureFlowController()
     } else {
-      paymentSheet = PaymentSheet(this, paymentResultCallback)
+      paymentSheet = if (intentConfiguration != null) {
+        PaymentSheet(
+          this,
+          createIntentCallback = createIntentCallback,
+          paymentResultCallback = paymentResultCallback
+        )
+      } else {
+        PaymentSheet(
+          this,
+          callback = paymentResultCallback
+        )
+      }
       initPromise.resolve(WritableNativeMap())
     }
   }
@@ -177,6 +236,11 @@ class PaymentSheetFragment(
         paymentSheet?.presentWithPaymentIntent(paymentIntentClientSecret!!, paymentSheetConfiguration)
       } else if (!setupIntentClientSecret.isNullOrEmpty()) {
         paymentSheet?.presentWithSetupIntent(setupIntentClientSecret!!, paymentSheetConfiguration)
+      } else if (intentConfiguration != null) {
+        paymentSheet?.presentWithIntentConfiguration(
+          intentConfiguration = intentConfiguration!!,
+          configuration = paymentSheetConfiguration
+        )
       }
     } else if(flowController != null) {
       flowController?.presentPaymentOptions()
@@ -253,6 +317,15 @@ class PaymentSheetFragment(
         configuration = paymentSheetConfiguration,
         callback = onFlowControllerConfigure
       )
+    } else if (intentConfiguration != null) {
+      flowController?.configureWithIntentConfiguration(
+        intentConfiguration = intentConfiguration!!,
+        configuration = paymentSheetConfiguration,
+        callback = onFlowControllerConfigure
+      )
+    } else {
+      initPromise.resolve(createError(ErrorType.Failed.toString(), "One of `paymentIntentClientSecret`, `setupIntentClientSecret`, or `intentConfiguration` is required"))
+      return
     }
   }
 
@@ -287,6 +360,41 @@ class PaymentSheetFragment(
         currencyCode = currencyCode
       )
     }
+
+    @Throws(PaymentSheetException::class)
+    private fun buildIntentConfiguration(intentConfigurationParams: Bundle?): PaymentSheet.IntentConfiguration? {
+      if (intentConfigurationParams == null) {
+        return null
+      }
+      val modeParams = intentConfigurationParams.getBundle("mode")
+              ?: throw PaymentSheetException("If `intentConfiguration` is provided, `intentConfiguration.mode` is required")
+
+      return PaymentSheet.IntentConfiguration(
+        mode = buildIntentConfigurationMode(modeParams),
+        paymentMethodTypes = intentConfigurationParams.getStringArrayList("paymentMethodTypes")?.toList() ?: emptyList(),
+      )
+    }
+
+    private fun buildIntentConfigurationMode(modeParams: Bundle): PaymentSheet.IntentConfiguration.Mode {
+      val currencyCode = modeParams.getString("currencyCode")
+        ?: throw PaymentSheetException("You must provide a value to intentConfiguration.mode.currencyCode")
+
+      return if (modeParams.containsKey("amount")) {
+        PaymentSheet.IntentConfiguration.Mode.Payment(
+          amount = modeParams.getInt("amount").toLong(),
+          currency = currencyCode,
+          setupFutureUse = mapToSetupFutureUse(modeParams.getString("setupFutureUsage")),
+          captureMethod = mapToCaptureMethod(modeParams.getString("captureMethod")),
+        )
+      } else {
+        val setupFutureUsage = mapToSetupFutureUse(modeParams.getString("setupFutureUsage"))
+          ?: throw PaymentSheetException("You must provide a value to intentConfiguration.mode.setupFutureUsage")
+        PaymentSheet.IntentConfiguration.Mode.Setup(
+          currency = currencyCode,
+          setupFutureUse = setupFutureUsage
+        )
+      }
+    }
   }
 }
 
@@ -329,3 +437,20 @@ fun mapToAddressCollectionMode(str: String?): PaymentSheet.BillingDetailsCollect
     else -> PaymentSheet.BillingDetailsCollectionConfiguration.AddressCollectionMode.Automatic
   }
 }
+
+fun mapToSetupFutureUse(type: String?): PaymentSheet.IntentConfiguration.SetupFutureUse? {
+  return when (type) {
+    "OffSession" ->  PaymentSheet.IntentConfiguration.SetupFutureUse.OffSession
+    "OnSession" ->  PaymentSheet.IntentConfiguration.SetupFutureUse.OnSession
+    else ->  null
+  }
+}
+
+fun mapToCaptureMethod(type: String?): PaymentSheet.IntentConfiguration.CaptureMethod {
+  return when (type) {
+    "Automatic" ->  PaymentSheet.IntentConfiguration.CaptureMethod.Automatic
+    "Manual" ->  PaymentSheet.IntentConfiguration.CaptureMethod.Manual
+    "AutomaticAsync" ->  PaymentSheet.IntentConfiguration.CaptureMethod.AutomaticAsync
+    else ->  PaymentSheet.IntentConfiguration.CaptureMethod.Automatic
+  }
+}

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

@@ -7,6 +7,7 @@ import android.util.Log
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.*
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.reactnativestripesdk.addresssheet.AddressLauncherFragment
 import com.reactnativestripesdk.pushprovisioning.PushProvisioningProxy
 import com.reactnativestripesdk.utils.*
@@ -47,6 +48,8 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
   private var paymentLauncherFragment: PaymentLauncherFragment? = null
   private var collectBankAccountLauncherFragment: CollectBankAccountLauncherFragment? = null
 
+  internal var eventListenerCount = 0
+
   // If you create a new Fragment, you must put the tag here, otherwise result callbacks for that
   // Fragment will not work on RN < 0.65
   private val allStripeFragmentTags: List<String>
@@ -204,6 +207,16 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     promise.resolve(null)
   }
 
+  @ReactMethod
+  fun intentCreationCallback(params: ReadableMap, promise: Promise) {
+    if (paymentSheetFragment == null) {
+      promise.resolve(PaymentSheetFragment.createMissingInitError())
+      return
+    }
+
+    paymentSheetFragment?.paymentSheetIntentCreationCallback?.complete(params)
+  }
+
   private fun payWithFpx() {
     getCurrentActivityOrResolveWithError(confirmPromise)?.let {
       AddPaymentMethodActivityStarter(it)
@@ -866,14 +879,24 @@ class StripeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ
     }
   }
 
-  /**
-   * We need the following in order to avoid some annoying console.warns() from our Apple Pay event listeners. Otherwise,
-   * we'd have to put our users through some annoying (if Platform.OS...) logic & null-handling logic.
-   */
   @ReactMethod
-  fun addListener(eventName: String) {}
+  fun addListener(eventName: String) {
+    eventListenerCount++
+  }
+
   @ReactMethod
-  fun removeListeners(count: Int) {}
+  fun removeListeners(count: Int) {
+    eventListenerCount -= count
+    if (eventListenerCount < 0) {
+      eventListenerCount = 0
+    }
+  }
+
+  internal fun sendEvent(reactContext: ReactContext, eventName: String, params: WritableMap) {
+    reactContext
+      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+      .emit(eventName, params)
+  }
 
   /**
    * Safely get and cast the current activity as an AppCompatActivity. If that fails, the promise

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

@@ -43,6 +43,8 @@ enum class GooglePayErrorType {
 
 class PaymentSheetAppearanceException(message: String) : Exception(message)
 
+class PaymentSheetException(message: String) : Exception(message)
+
 internal fun mapError(code: String, message: String?, localizedMessage: String?, declineCode: String?, type: String?, stripeErrorCode: String?): WritableMap {
   val map: WritableMap = WritableNativeMap()
   val details: WritableMap = WritableNativeMap()

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

@@ -856,7 +856,20 @@ fun toBundleObject(readableMap: ReadableMap?): Bundle {
       }
       ReadableType.String -> result.putString(key, readableMap.getString(key))
       ReadableType.Map -> result.putBundle(key, toBundleObject(readableMap.getMap(key)))
-      ReadableType.Array -> Log.e("toBundleException", "Cannot put arrays of objects into bundles. Failed on: $key.")
+      ReadableType.Array -> {
+        val list = readableMap.getArray(key)?.toArrayList()
+        if (list == null) {
+          result.putString(key, null)
+        } else if (list.isEmpty()) {
+          result.putStringArrayList(key, ArrayList())
+        } else {
+          when (list.first()) {
+            is String -> result.putStringArrayList(key, list as java.util.ArrayList<String>)
+            is Int -> result.putIntegerArrayList(key, list as java.util.ArrayList<Int>)
+            else -> Log.e("toBundleException", "Cannot put arrays of objects into bundles. Failed on: $key.")
+          }
+        }
+      }
       else -> Log.e("toBundleException", "Could not convert object with key: $key.")
     }
   }

package/ios/ApplePayButtonView.swift

@@ -17,25 +17,11 @@ class ApplePayButtonView: UIView {
     @objc var borderRadius: NSNumber?
     @objc var disabled = false
     
-    func doesNothing(_: Optional<Dictionary<AnyHashable, Any>>) {
-        return
-    }
-    
     @objc func handleApplePayButtonTapped() {
-        if onPressAction != nil {
-            onPressAction!(["true": true])
-            // JS Callbacks are all no-ops since in legacy code (useApplePay hook),
-            // this behavior is controlled via the onDidSetShippingMethod and onDidSetShippingContact
-            // events
-            stripeSdk?.shippingMethodUpdateJSCallback = doesNothing
-            stripeSdk?.shippingContactUpdateJSCallback = doesNothing
-            stripeSdk?.couponCodeEnteredJSCallback = doesNothing
-        } else {
-            stripeSdk?.shippingMethodUpdateJSCallback = onShippingMethodSelectedAction
-            stripeSdk?.shippingContactUpdateJSCallback = onShippingContactSelectedAction
-            stripeSdk?.couponCodeEnteredJSCallback = onCouponCodeEnteredAction
-            stripeSdk?.platformPayOrderTrackingJSCallback = onOrderTrackingAction
-        }
+        stripeSdk?.shippingMethodUpdateJSCallback = onShippingMethodSelectedAction
+        stripeSdk?.shippingContactUpdateJSCallback = onShippingContactSelectedAction
+        stripeSdk?.couponCodeEnteredJSCallback = onCouponCodeEnteredAction
+        stripeSdk?.platformPayOrderTrackingJSCallback = onOrderTrackingAction
     }
     
     override func didSetProps(_ changedProps: [String]!) {

package/ios/ApplePayViewController.swift

@@ -122,10 +122,6 @@ extension StripeSdk : PKPaymentAuthorizationViewControllerDelegate, STPApplePayC
         didSelect shippingMethod: PKShippingMethod,
         handler: @escaping (PKPaymentRequestShippingMethodUpdate) -> Void
     ) {
-        if (self.hasLegacyApplePayListeners) {
-            // Legacy, remove when useApplePay hook is removed
-            sendEvent(withName: "onDidSetShippingMethod", body: ["shippingMethod": Mappers.mapFromShippingMethod(shippingMethod: shippingMethod)])
-        }
         if let callback = self.shippingMethodUpdateJSCallback {
             self.shippingMethodUpdateCompletion = handler
             callback(["shippingMethod": Mappers.mapFromShippingMethod(shippingMethod: shippingMethod)])
@@ -141,10 +137,6 @@ extension StripeSdk : PKPaymentAuthorizationViewControllerDelegate, STPApplePayC
         didSelectShippingContact contact: PKContact,
         handler: @escaping (PKPaymentRequestShippingContactUpdate) -> Void
     ) {
-        if (self.hasLegacyApplePayListeners) {
-            // Legacy, remove when useApplePay hook is removed
-            sendEvent(withName: "onDidSetShippingContact", body: ["shippingContact": Mappers.mapFromShippingContact(shippingContact: contact)])
-        }
         if let callback = self.shippingContactUpdateJSCallback {
             self.shippingContactUpdateCompletion = handler
             callback(["shippingContact": Mappers.mapFromShippingContact(shippingContact: contact)])
@@ -170,10 +162,7 @@ extension StripeSdk : PKPaymentAuthorizationViewControllerDelegate, STPApplePayC
         } else if let clientSecret = self.confirmApplePaySetupClientSecret {
             completion(clientSecret, nil)
         } else {
-            self.applePayCompletionCallback = completion
-            let method = Mappers.mapFromPaymentMethod(paymentMethod.splitApplePayAddressByNewline())
-            self.deprecatedApplePayRequestResolver?(Mappers.createResult("paymentMethod", method))
-            self.deprecatedApplePayRequestRejecter = nil
+            RCTMakeAndLogError("Tried to complete Apple Pay payment, but no client secret was found.", nil, nil)
         }
     }
     
@@ -233,44 +222,28 @@ extension StripeSdk : PKPaymentAuthorizationViewControllerDelegate, STPApplePayC
                         }
                     }
                 }
-                
-            } else {
-                deprecatedConfirmApplePayPaymentResolver?([])
             }
             break
         case .error:
             if let resolve = self.confirmApplePayResolver {
                 resolve(Errors.createError(ErrorType.Failed, error as NSError?))
-            } else {
-                let message = "Payment not completed"
-                deprecatedApplePayCompletionRejecter?(ErrorType.Failed, message, nil)
-                deprecatedApplePayRequestRejecter?(ErrorType.Failed, message, nil)
             }
             break
         case .userCancellation:
             let message = "The payment has been canceled"
             if let resolve = self.confirmApplePayResolver {
                 resolve(Errors.createError(ErrorType.Canceled, message))
-            } else {
-                deprecatedApplePayCompletionRejecter?(ErrorType.Canceled, message, nil)
-                deprecatedApplePayRequestRejecter?(ErrorType.Canceled, message, nil)
             }
             break
         @unknown default:
             if let resolve = self.confirmApplePayResolver {
                 resolve(Errors.createError(ErrorType.Unknown, error as NSError?))
-            } else {
-                let message = "Payment not completed"
-                deprecatedApplePayCompletionRejecter?(ErrorType.Unknown, message, nil)
-                deprecatedApplePayRequestRejecter?(ErrorType.Unknown, message, nil)
             }
             break
         }
         confirmApplePayResolver = nil
         confirmApplePayPaymentClientSecret = nil
         confirmApplePaySetupClientSecret = nil
-        deprecatedApplePayCompletionRejecter = nil
-        deprecatedApplePayRequestRejecter = nil
     }
     
 }

package/ios/CardFieldManager.m

@@ -10,6 +10,7 @@ RCT_EXPORT_VIEW_PROPERTY(onFocusChange, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(cardStyle, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(placeholders, NSDictionary)
 RCT_EXPORT_VIEW_PROPERTY(autofocus, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(disabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(dangerouslyGetFullCardDetails, BOOL)
 RCT_EXTERN_METHOD(focus:(nonnull NSNumber*) reactTag)
 RCT_EXTERN_METHOD(blur:(nonnull NSNumber*) reactTag)

package/ios/CardFieldView.swift

@@ -12,6 +12,12 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
     public var cardParams: STPPaymentMethodParams? = nil
     public var cardPostalCode: String? = nil
 
+    @objc var disabled: Bool = false {
+        didSet {
+            cardField.isUserInteractionEnabled = !disabled
+        }
+    }
+    
     @objc var postalCodeEnabled: Bool = true {
         didSet {
             cardField.postalCodeEntryEnabled = postalCodeEnabled