@stripe/stripe-react-native 0.41.0 → 0.43.0

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

@@ -1,19 +1,17 @@
 package com.reactnativestripesdk
+
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-internal class CardFocusEvent constructor(viewTag: Int, private val focusField: String?) : Event<CardFocusEvent>(viewTag) {
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
+internal class CardFocusEvent(
+  surfaceId: Int,
+  viewTag: Int,
+  private val focusField: String?,
+) : Event<CardFocusEvent>(surfaceId, viewTag) {
+  override fun getEventName() = EVENT_NAME
 
-  override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-    rctEventEmitter.receiveEvent(viewTag, eventName, serializeEventData())
-  }
-
-  private fun serializeEventData(): WritableMap {
+  override fun getEventData(): WritableMap? {
     val eventData = Arguments.createMap()
     eventData.putString("focusedField", focusField)
 
@@ -23,5 +21,4 @@ internal class CardFocusEvent constructor(viewTag: Int, private val focusField:
   companion object {
     const val EVENT_NAME = "topFocusChange"
   }
-
 }

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

@@ -3,18 +3,17 @@ package com.reactnativestripesdk
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-internal class CardFormCompleteEvent constructor(viewTag: Int, private val cardDetails: MutableMap<String, Any>?, private val complete: Boolean, private val dangerouslyGetFullCardDetails: Boolean) : Event<CardChangedEvent>(viewTag) {
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
-
-  override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-    rctEventEmitter.receiveEvent(viewTag, eventName, serializeEventData())
-  }
+internal class CardFormCompleteEvent(
+  surfaceId: Int,
+  viewTag: Int,
+  private val cardDetails: MutableMap<String, Any>?,
+  private val complete: Boolean,
+  private val dangerouslyGetFullCardDetails: Boolean,
+) : Event<CardChangedEvent>(surfaceId, viewTag) {
+  override fun getEventName() = EVENT_NAME
 
-  private fun serializeEventData(): WritableMap {
+  override fun getEventData(): WritableMap? {
     val eventData = Arguments.createMap()
 
     if (cardDetails == null) {
@@ -37,7 +36,6 @@ internal class CardFormCompleteEvent constructor(viewTag: Int, private val cardD
   }
 
   companion object {
-    const val EVENT_NAME = "onFormComplete"
+    const val EVENT_NAME = "topFormComplete"
   }
-
 }

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

@@ -12,36 +12,46 @@ import androidx.core.view.setMargins
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.UIManagerModule
-import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.views.text.ReactTypefaceUtils
 import com.google.android.material.shape.CornerFamily
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
-import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.PostalCodeUtilities
+import com.reactnativestripesdk.utils.getIntOrNull
+import com.reactnativestripesdk.utils.getValOr
+import com.reactnativestripesdk.utils.hideSoftKeyboard
 import com.reactnativestripesdk.utils.mapCardBrand
+import com.reactnativestripesdk.utils.mapToPreferredNetworks
+import com.reactnativestripesdk.utils.showSoftKeyboard
 import com.stripe.android.core.model.CountryCode
-import com.stripe.android.databinding.StripeCardMultilineWidgetBinding
 import com.stripe.android.databinding.StripeCardFormViewBinding
+import com.stripe.android.databinding.StripeCardMultilineWidgetBinding
 import com.stripe.android.model.Address
 import com.stripe.android.model.PaymentMethodCreateParams
 import com.stripe.android.view.CardFormView
 import com.stripe.android.view.CardInputListener
 
-class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
-  private var cardForm: CardFormView = CardFormView(context, null, com.stripe.android.R.style.StripeCardFormView_Borderless)
-  private var mEventDispatcher: EventDispatcher? = context.getNativeModule(UIManagerModule::class.java)?.eventDispatcher
+@SuppressLint("ViewConstructor")
+class CardFormView(
+  private val context: ThemedReactContext,
+) : FrameLayout(context) {
+  private var cardForm: CardFormView =
+    CardFormView(context, null, com.stripe.android.R.style.StripeCardFormView_Borderless)
   private var dangerouslyGetFullCardDetails: Boolean = false
   private var currentFocusedField: String? = null
   var cardParams: PaymentMethodCreateParams.Card? = null
   var cardAddress: Address? = null
   private val cardFormViewBinding = StripeCardFormViewBinding.bind(cardForm)
-  private val multilineWidgetBinding = StripeCardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget)
+  private val multilineWidgetBinding =
+    StripeCardMultilineWidgetBinding.bind(cardFormViewBinding.cardMultilineWidget)
 
   init {
     cardFormViewBinding.cardMultilineWidgetContainer.isFocusable = true
     cardFormViewBinding.cardMultilineWidgetContainer.isFocusableInTouchMode = true
-    (cardFormViewBinding.cardMultilineWidgetContainer.layoutParams as MarginLayoutParams).setMargins(0)
+    (cardFormViewBinding.cardMultilineWidgetContainer.layoutParams as MarginLayoutParams).setMargins(
+      0,
+    )
     addView(cardForm)
     setListeners()
 
@@ -124,8 +134,9 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
   }
 
   private fun onChangeFocus() {
-    mEventDispatcher?.dispatchEvent(
-      CardFocusEvent(id, currentFocusedField))
+    UIManagerHelper
+      .getEventDispatcherForReactTag(context, id)
+      ?.dispatchEvent(CardFocusEvent(context.surfaceId, id, currentFocusedField))
   }
 
   @SuppressLint("RestrictedApi")
@@ -141,18 +152,20 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
     val textErrorColor = getValOr(value, "textErrorColor", null)
     val cursorColor = getValOr(value, "cursorColor", null)
 
-    val editTextBindings = setOf(
-      cardFormViewBinding.cardMultilineWidget.cardNumberEditText,
-      cardFormViewBinding.cardMultilineWidget.cvcEditText,
-      cardFormViewBinding.cardMultilineWidget.expiryDateEditText,
-      cardFormViewBinding.postalCode
-    )
-    val placeholderTextBindings = setOf(
-      multilineWidgetBinding.tlExpiry,
-      multilineWidgetBinding.tlCardNumber,
-      multilineWidgetBinding.tlCvc,
-      cardFormViewBinding.postalCodeContainer,
-    )
+    val editTextBindings =
+      setOf(
+        cardFormViewBinding.cardMultilineWidget.cardNumberEditText,
+        cardFormViewBinding.cardMultilineWidget.cvcEditText,
+        cardFormViewBinding.cardMultilineWidget.expiryDateEditText,
+        cardFormViewBinding.postalCode,
+      )
+    val placeholderTextBindings =
+      setOf(
+        multilineWidgetBinding.tlExpiry,
+        multilineWidgetBinding.tlCardNumber,
+        multilineWidgetBinding.tlCvc,
+        cardFormViewBinding.postalCodeContainer,
+      )
 
     textColor?.let {
       for (binding in editTextBindings) {
@@ -178,7 +191,8 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
     }
     fontFamily?.let {
       // Load custom font from assets, and fallback to default system font
-      val typeface = ReactTypefaceUtils.applyStyles(null, -1, -1, it.takeIf { it.isNotEmpty() }, context.assets)
+      val typeface =
+        ReactTypefaceUtils.applyStyles(null, -1, -1, it.takeIf { it.isNotEmpty() }, context.assets)
       for (binding in editTextBindings) {
         binding.typeface = typeface
       }
@@ -202,25 +216,26 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
       }
     }
 
-    cardFormViewBinding.cardMultilineWidgetContainer.background = MaterialShapeDrawable(
-      ShapeAppearanceModel()
-        .toBuilder()
-        .setAllCorners(CornerFamily.ROUNDED, PixelUtil.toPixelFromDIP(borderRadius.toDouble()))
-        .build()
-    ).also { shape ->
-      shape.strokeWidth = 0.0f
-      shape.strokeColor = ColorStateList.valueOf(Color.parseColor("#000000"))
-      shape.fillColor = ColorStateList.valueOf(Color.parseColor("#FFFFFF"))
-      borderWidth?.let {
-        shape.strokeWidth = PixelUtil.toPixelFromDIP(it.toDouble())
-      }
-      borderColor?.let {
-        shape.strokeColor = ColorStateList.valueOf(Color.parseColor(it))
-      }
-      backgroundColor?.let {
-        shape.fillColor = ColorStateList.valueOf(Color.parseColor(it))
+    cardFormViewBinding.cardMultilineWidgetContainer.background =
+      MaterialShapeDrawable(
+        ShapeAppearanceModel()
+          .toBuilder()
+          .setAllCorners(CornerFamily.ROUNDED, PixelUtil.toPixelFromDIP(borderRadius.toDouble()))
+          .build(),
+      ).also { shape ->
+        shape.strokeWidth = 0.0f
+        shape.strokeColor = ColorStateList.valueOf(Color.parseColor("#000000"))
+        shape.fillColor = ColorStateList.valueOf(Color.parseColor("#FFFFFF"))
+        borderWidth?.let {
+          shape.strokeWidth = PixelUtil.toPixelFromDIP(it.toDouble())
+        }
+        borderColor?.let {
+          shape.strokeColor = ColorStateList.valueOf(Color.parseColor(it))
+        }
+        backgroundColor?.let {
+          shape.fillColor = ColorStateList.valueOf(Color.parseColor(it))
+        }
       }
-    }
   }
 
   fun setDangerouslyGetFullCardDetails(isEnabled: Boolean) {
@@ -232,35 +247,58 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
       if (isValid) {
         cardForm.cardParams?.let {
           val cardParamsMap = it.toParamMap()["card"] as HashMap<*, *>
-          val cardDetails: MutableMap<String, Any> = mutableMapOf(
-            "expiryMonth" to cardParamsMap["exp_month"] as Int,
-            "expiryYear" to cardParamsMap["exp_year"] as Int,
-            "last4" to it.last4,
-            "brand" to mapCardBrand(it.brand),
-            "postalCode" to (it.address?.postalCode ?: ""),
-            "country" to (it.address?.country ?: "")
-          )
+          val cardDetails: MutableMap<String, Any> =
+            mutableMapOf(
+              "expiryMonth" to cardParamsMap["exp_month"] as Int,
+              "expiryYear" to cardParamsMap["exp_year"] as Int,
+              "last4" to it.last4,
+              "brand" to mapCardBrand(it.brand),
+              "postalCode" to (it.address?.postalCode ?: ""),
+              "country" to (it.address?.country ?: ""),
+            )
 
           if (dangerouslyGetFullCardDetails) {
             cardDetails["number"] = cardParamsMap["number"] as String
             cardDetails["cvc"] = cardParamsMap["cvc"] as String
           }
 
-          mEventDispatcher?.dispatchEvent(
-            CardFormCompleteEvent(id, cardDetails, isValid, dangerouslyGetFullCardDetails))
-
-          cardAddress = Address.Builder()
-            .setPostalCode(it.address?.postalCode)
-            .setCountry(it.address?.country)
-            .build()
-
-          cardFormViewBinding.cardMultilineWidget.paymentMethodCard?.let { params -> cardParams = params }
+          UIManagerHelper
+            .getEventDispatcherForReactTag(context, id)
+            ?.dispatchEvent(
+              CardFormCompleteEvent(
+                context.surfaceId,
+                id,
+                cardDetails,
+                isValid,
+                dangerouslyGetFullCardDetails,
+              ),
+            )
+
+          cardAddress =
+            Address
+              .Builder()
+              .setPostalCode(it.address?.postalCode)
+              .setCountry(it.address?.country)
+              .build()
+
+          cardFormViewBinding.cardMultilineWidget.paymentMethodCard?.let { params ->
+            cardParams = params
+          }
         }
       } else {
         cardParams = null
         cardAddress = null
-        mEventDispatcher?.dispatchEvent(
-          CardFormCompleteEvent(id, null, isValid, dangerouslyGetFullCardDetails))
+        UIManagerHelper
+          .getEventDispatcherForReactTag(context, id)
+          ?.dispatchEvent(
+            CardFormCompleteEvent(
+              context.surfaceId,
+              id,
+              null,
+              isValid,
+              dangerouslyGetFullCardDetails,
+            ),
+          )
       }
     }
 
@@ -269,29 +307,37 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
     val expiryEditText = multilineWidgetBinding.etExpiry
     val postalCodeEditText = cardFormViewBinding.postalCode
 
-    cardNumberEditText.onFocusChangeListener = OnFocusChangeListener { _, hasFocus ->
-      currentFocusedField = if (hasFocus) CardInputListener.FocusField.CardNumber.toString() else  null
-      onChangeFocus()
-    }
-    cvcEditText.onFocusChangeListener = OnFocusChangeListener { _, hasFocus ->
-      currentFocusedField = if (hasFocus) CardInputListener.FocusField.Cvc.toString() else  null
-      onChangeFocus()
-    }
-    expiryEditText.onFocusChangeListener = OnFocusChangeListener { _, hasFocus ->
-      currentFocusedField = if (hasFocus) CardInputListener.FocusField.ExpiryDate.toString() else  null
-      onChangeFocus()
-    }
-    postalCodeEditText.onFocusChangeListener = OnFocusChangeListener { _, hasFocus ->
-      currentFocusedField = if (hasFocus) CardInputListener.FocusField.PostalCode.toString() else  null
-      onChangeFocus()
-    }
+    cardNumberEditText.onFocusChangeListener =
+      OnFocusChangeListener { _, hasFocus ->
+        currentFocusedField =
+          if (hasFocus) CardInputListener.FocusField.CardNumber.toString() else null
+        onChangeFocus()
+      }
+    cvcEditText.onFocusChangeListener =
+      OnFocusChangeListener { _, hasFocus ->
+        currentFocusedField = if (hasFocus) CardInputListener.FocusField.Cvc.toString() else null
+        onChangeFocus()
+      }
+    expiryEditText.onFocusChangeListener =
+      OnFocusChangeListener { _, hasFocus ->
+        currentFocusedField =
+          if (hasFocus) CardInputListener.FocusField.ExpiryDate.toString() else null
+        onChangeFocus()
+      }
+    postalCodeEditText.onFocusChangeListener =
+      OnFocusChangeListener { _, hasFocus ->
+        currentFocusedField =
+          if (hasFocus) CardInputListener.FocusField.PostalCode.toString() else null
+        onChangeFocus()
+      }
   }
 
   private fun setPostalCodeFilter() {
-    cardFormViewBinding.postalCode.filters = arrayOf(
-      *cardFormViewBinding.postalCode.filters,
-      createPostalCodeInputFilter()
-    )
+    cardFormViewBinding.postalCode.filters =
+      arrayOf(
+        *cardFormViewBinding.postalCode.filters,
+        createPostalCodeInputFilter(),
+      )
   }
 
   @SuppressLint("RestrictedApi")
@@ -316,10 +362,12 @@ class CardFormView(context: ThemedReactContext) : FrameLayout(context) {
     post(mLayoutRunnable)
   }
 
-  private val mLayoutRunnable = Runnable {
-    measure(
-      MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-      MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY))
-    layout(left, top, right, bottom)
-  }
+  private val mLayoutRunnable =
+    Runnable {
+      measure(
+        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
+      )
+      layout(left, top, right, bottom)
+    }
 }

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

@@ -2,23 +2,28 @@ package com.reactnativestripesdk
 
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.common.MapBuilder
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
+@ReactModule(name = CardFormViewManager.REACT_CLASS)
 class CardFormViewManager : SimpleViewManager<CardFormView>() {
-  override fun getName() = "CardForm"
+  override fun getName() = REACT_CLASS
 
   private var reactContextRef: ThemedReactContext? = null
 
-  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
-    return MapBuilder.of(
-      CardFocusEvent.EVENT_NAME, MapBuilder.of("registrationName", "onFocusChange"),
-      CardFormCompleteEvent.EVENT_NAME, MapBuilder.of("registrationName", "onFormComplete"))
-  }
-
-  override fun receiveCommand(root: CardFormView, commandId: String?, args: ReadableArray?) {
+  override fun getExportedCustomDirectEventTypeConstants() =
+    mutableMapOf(
+      CardFocusEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFocusChange"),
+      CardFormCompleteEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFormComplete"),
+    )
+
+  override fun receiveCommand(
+    root: CardFormView,
+    commandId: String?,
+    args: ReadableArray?,
+  ) {
     when (commandId) {
       "focus" -> root.requestFocusFromJS()
       "blur" -> root.requestBlurFromJS()
@@ -27,48 +32,73 @@ class CardFormViewManager : SimpleViewManager<CardFormView>() {
   }
 
   @ReactProp(name = "dangerouslyGetFullCardDetails")
-  fun setDangerouslyGetFullCardDetails(view: CardFormView, dangerouslyGetFullCardDetails: Boolean = false) {
+  fun setDangerouslyGetFullCardDetails(
+    view: CardFormView,
+    dangerouslyGetFullCardDetails: Boolean = false,
+  ) {
     view.setDangerouslyGetFullCardDetails(dangerouslyGetFullCardDetails)
   }
 
   @ReactProp(name = "postalCodeEnabled")
-  fun setPostalCodeEnabled(view: CardFormView, postalCodeEnabled: Boolean = false) {
+  fun setPostalCodeEnabled(
+    view: CardFormView,
+    postalCodeEnabled: Boolean = false,
+  ) {
     view.setPostalCodeEnabled(postalCodeEnabled)
   }
 
-   @ReactProp(name = "placeholders")
-   fun setPlaceHolders(view: CardFormView, placeholders: ReadableMap) {
-     view.setPlaceHolders(placeholders)
-   }
+  @ReactProp(name = "placeholders")
+  fun setPlaceHolders(
+    view: CardFormView,
+    placeholders: ReadableMap,
+  ) {
+    view.setPlaceHolders(placeholders)
+  }
 
   @ReactProp(name = "autofocus")
-  fun setAutofocus(view: CardFormView, autofocus: Boolean = false) {
+  fun setAutofocus(
+    view: CardFormView,
+    autofocus: Boolean = false,
+  ) {
     view.setAutofocus(autofocus)
   }
 
   @ReactProp(name = "cardStyle")
-  fun setCardStyle(view: CardFormView, cardStyle: ReadableMap) {
+  fun setCardStyle(
+    view: CardFormView,
+    cardStyle: ReadableMap,
+  ) {
     view.setCardStyle(cardStyle)
   }
 
   @ReactProp(name = "defaultValues")
-  fun setDefaultValues(view: CardFormView, defaults: ReadableMap) {
+  fun setDefaultValues(
+    view: CardFormView,
+    defaults: ReadableMap,
+  ) {
     view.setDefaultValues(defaults)
   }
 
   @ReactProp(name = "disabled")
-  fun setDisabled(view: CardFormView, isDisabled: Boolean) {
+  fun setDisabled(
+    view: CardFormView,
+    isDisabled: Boolean,
+  ) {
     view.setDisabled(isDisabled)
   }
 
   @ReactProp(name = "preferredNetworks")
-  fun setPreferredNetworks(view: CardFormView, preferredNetworks: ReadableArray?) {
+  fun setPreferredNetworks(
+    view: CardFormView,
+    preferredNetworks: ReadableArray?,
+  ) {
     val networks = preferredNetworks?.toArrayList()?.filterIsInstance<Int>()?.let { ArrayList(it) }
     view.setPreferredNetworks(networks)
   }
 
   override fun createViewInstance(reactContext: ThemedReactContext): CardFormView {
-    val stripeSdkModule: StripeSdkModule? = reactContext.getNativeModule(StripeSdkModule::class.java)
+    val stripeSdkModule: StripeSdkModule? =
+      reactContext.getNativeModule(StripeSdkModule::class.java)
     val view = CardFormView(reactContext)
 
     reactContextRef = reactContext
@@ -80,8 +110,13 @@ class CardFormViewManager : SimpleViewManager<CardFormView>() {
   override fun onDropViewInstance(view: CardFormView) {
     super.onDropViewInstance(view)
 
-    val stripeSdkModule: StripeSdkModule? = reactContextRef?.getNativeModule(StripeSdkModule::class.java)
+    val stripeSdkModule: StripeSdkModule? =
+      reactContextRef?.getNativeModule(StripeSdkModule::class.java)
     stripeSdkModule?.cardFormView = null
     reactContextRef = null
   }
+
+  companion object {
+    const val REACT_CLASS = "CardForm"
+  }
 }

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

@@ -5,15 +5,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.reactnativestripesdk.utils.*
+import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.createError
 import com.reactnativestripesdk.utils.createResult
+import com.reactnativestripesdk.utils.mapFromFinancialConnectionsEvent
 import com.reactnativestripesdk.utils.mapFromPaymentIntentResult
 import com.reactnativestripesdk.utils.mapFromSetupIntentResult
+import com.reactnativestripesdk.utils.removeFragment
+import com.stripe.android.financialconnections.FinancialConnections
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.SetupIntent
 import com.stripe.android.model.StripeIntent
@@ -27,60 +29,89 @@ class CollectBankAccountLauncherFragment(
   private val stripeAccountId: String?,
   private val clientSecret: String,
   private val isPaymentIntent: Boolean,
-  private val collectParams:  CollectBankAccountConfiguration.USBankAccount,
-  private val promise: Promise
+  private val collectParams: CollectBankAccountConfiguration.USBankAccount,
+  private val promise: Promise,
 ) : Fragment() {
   private lateinit var collectBankAccountLauncher: CollectBankAccountLauncher
 
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                            savedInstanceState: Bundle?): View {
-    collectBankAccountLauncher = createBankAccountLauncher()
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
 
-    return FrameLayout(requireActivity()).also {
-      it.visibility = View.GONE
+    val stripeSdkModule: StripeSdkModule? = context.getNativeModule(StripeSdkModule::class.java)
+    if (stripeSdkModule != null && stripeSdkModule.eventListenerCount > 0) {
+      FinancialConnections.setEventListener { event ->
+        val params = mapFromFinancialConnectionsEvent(event)
+        stripeSdkModule.sendEvent(context, "onFinancialConnectionsEvent", params)
+      }
     }
   }
 
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(
-      view,
-      savedInstanceState)
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?,
+  ): View {
+    collectBankAccountLauncher = createBankAccountLauncher()
+
+    return FrameLayout(requireActivity()).also { it.visibility = View.GONE }
+  }
+
+  override fun onViewCreated(
+    view: View,
+    savedInstanceState: Bundle?,
+  ) {
+    super.onViewCreated(view, savedInstanceState)
 
     if (isPaymentIntent) {
       collectBankAccountLauncher.presentWithPaymentIntent(
         publishableKey,
         stripeAccountId,
         clientSecret,
-        collectParams
+        collectParams,
       )
     } else {
       collectBankAccountLauncher.presentWithSetupIntent(
         publishableKey,
         stripeAccountId,
         clientSecret,
-        collectParams
+        collectParams,
       )
     }
   }
 
-  private fun createBankAccountLauncher(): CollectBankAccountLauncher {
-    return CollectBankAccountLauncher.create(this) { result ->
+  override fun onDestroy() {
+    super.onDestroy()
+
+    // Remove any event listener that might be set
+    FinancialConnections.clearEventListener()
+  }
+
+  private fun createBankAccountLauncher(): CollectBankAccountLauncher =
+    CollectBankAccountLauncher.create(this) { result ->
       when (result) {
         is CollectBankAccountResult.Completed -> {
           val intent = result.response.intent
           if (intent.status === StripeIntent.Status.RequiresPaymentMethod) {
-            promise.resolve(createError(ErrorType.Canceled.toString(), "Bank account collection was canceled."))
+            promise.resolve(
+              createError(ErrorType.Canceled.toString(), "Bank account collection was canceled."),
+            )
           } else if (intent.status === StripeIntent.Status.RequiresConfirmation) {
             promise.resolve(
-              if (isPaymentIntent)
-                createResult("paymentIntent", mapFromPaymentIntentResult(intent as PaymentIntent))
-              else
+              if (isPaymentIntent) {
+                createResult(
+                  "paymentIntent",
+                  mapFromPaymentIntentResult(intent as PaymentIntent),
+                )
+              } else {
                 createResult("setupIntent", mapFromSetupIntentResult(intent as SetupIntent))
+              },
             )
           }
         }
         is CollectBankAccountResult.Cancelled -> {
-          promise.resolve(createError(ErrorType.Canceled.toString(), "Bank account collection was canceled."))
+          promise.resolve(
+            createError(ErrorType.Canceled.toString(), "Bank account collection was canceled."),
+          )
         }
         is CollectBankAccountResult.Failed -> {
           promise.resolve(createError(ErrorType.Failed.toString(), result.error))
@@ -88,7 +119,6 @@ class CollectBankAccountLauncherFragment(
       }
       removeFragment(context)
     }
-  }
 
   companion object {
     internal const val TAG = "collect_bank_account_launcher_fragment"