@stripe/stripe-react-native 0.44.0 → 0.46.0

package/android/.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

package/android/.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

package/android/.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

package/android/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

package/android/build.gradle

@@ -1,6 +1,10 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['StripeSdk_kotlinVersion']
+  def kotlin_version = rootProject.ext.has('kotlinVersion')
+    ? rootProject.ext.get('kotlinVersion')
+    : project.properties['StripeSdk_kotlinVersion']
+
+  def kotlinMajor = kotlin_version.tokenize('\\.')[0].toInteger()
 
   repositories {
     google()
@@ -12,19 +16,18 @@ buildscript {
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
+    // only use this old compose-compiler plugin when Kotlin >= 2.0
+    if (kotlinMajor >= 2) {
+      classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
+    }
   }
 }
 
 if (project == rootProject) {
-    apply from: 'spotless.gradle'
-    return
+  apply from: 'spotless.gradle'
+  return
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
-//apply plugin: 'kotlin-android-extensions'
-
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['StripeSdk_' + name]
 }
@@ -33,8 +36,59 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['StripeSdk_' + name]).toInteger()
 }
 
+def isNewArchitectureEnabled() {
+  // To opt-in for the New Architecture, you can either:
+  // - Set `newArchEnabled` to true inside the `gradle.properties` file
+  // - Invoke gradle with `-newArchEnabled=true`
+  // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
+def reactNativeArchitectures() {
+  def value = project.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : [
+    "armeabi-v7a",
+    "x86",
+    "x86_64",
+    "arm64-v8a"
+  ]
+}
+
+def kotlin_version = rootProject.ext.has('kotlinVersion')
+    ? rootProject.ext.get('kotlinVersion')
+    : project.properties['StripeSdk_kotlinVersion']
+def kotlinMajor = kotlin_version.tokenize('\\.')[0].toInteger()
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
+// Only apply the compose plugin if we have the old compose-compiler on the classpath
+if (kotlinMajor >= 2) {
+  apply plugin: 'org.jetbrains.kotlin.plugin.compose'
+}
+//apply plugin: 'kotlin-android-extensions'
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: 'com.facebook.react'
+}
+
 android {
+  namespace "com.reactnativestripesdk"
+  buildFeatures {
+    buildConfig true
+  }
+
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+
+  // Used to override the NDK path/version on internal CI or by allowing
+  // users to customize the NDK path/version from their root project (e.g. for M1 support)
+  if (rootProject.hasProperty("ndkPath")) {
+    ndkPath rootProject.ext.ndkPath
+  }
+  if (rootProject.hasProperty("ndkVersion")) {
+    ndkVersion rootProject.ext.ndkVersion
+  }
+
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault('minSdkVersion')
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
@@ -43,6 +97,11 @@ android {
     vectorDrawables.useSupportLibrary = true
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     consumerProguardFiles 'proguard-rules.txt'
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
+    ndk {
+      abiFilters(*reactNativeArchitectures())
+    }
   }
 
   buildTypes {
@@ -50,9 +109,11 @@ android {
       minifyEnabled false
     }
   }
+
   lintOptions {
     disable 'GradleCompatible'
   }
+
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
@@ -60,6 +121,15 @@ android {
 
   buildFeatures {
     viewBinding true
+    compose true
+  }
+
+  sourceSets.main {
+    java {
+      if (!isNewArchitectureEnabled()) {
+        srcDirs += ["src/oldarch/java"]
+      }
+    }
   }
 }
 
@@ -75,8 +145,8 @@ repositories {
     defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
   } else {
     defaultDir = new File(
-            projectDir,
-            '/../../../node_modules/react-native/android'
+      projectDir,
+      '/../../../node_modules/react-native/android'
     )
   }
 
@@ -96,13 +166,13 @@ repositories {
       parentDir = parentDir.parentFile
 
       def androidSourcesDir = new File(
-              parentDir,
-              'node_modules/react-native'
+        parentDir,
+        'node_modules/react-native'
       )
 
       def androidPrebuiltBinaryDir = new File(
-              parentDir,
-              'node_modules/react-native/android'
+        parentDir,
+        'node_modules/react-native/android'
       )
 
       if (androidPrebuiltBinaryDir.exists()) {
@@ -127,13 +197,12 @@ repositories {
 
   if (!found) {
     throw new GradleException(
-            "${project.name}: unable to locate React Native android sources. " +
-                    "Ensure you have you installed React Native as a dependency in your project and try again."
+      "${project.name}: unable to locate React Native android sources. " +
+        "Ensure you have you installed React Native as a dependency in your project and try again."
     )
   }
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
 def stripe_version = getExtOrDefault('stripeVersion')
 
 dependencies {
@@ -145,7 +214,7 @@ dependencies {
   implementation("com.stripe:stripe-android:$stripe_version") {
     exclude group: 'androidx.emoji2', module: 'emoji2'
   }
-  implementation ("com.stripe:financial-connections:$stripe_version") {
+  implementation("com.stripe:financial-connections:$stripe_version") {
     exclude group: 'androidx.emoji2', module: 'emoji2'
   }
   implementation('androidx.emoji2:emoji2:1.3.0').force // Avoid using 1.4.0 since that requires targetSdkVersion 34
@@ -164,4 +233,7 @@ dependencies {
   androidTestImplementation "androidx.test:core:1.4.0"
   androidTestImplementation 'androidx.test:runner:1.1.0'
   androidTestImplementation "org.mockito:mockito-core:3.+"
+
+  implementation "androidx.compose.ui:ui:1.7.8"
+  implementation "androidx.compose.foundation:foundation-layout:1.7.8"
 }

package/android/gradle.properties

@@ -3,4 +3,4 @@ StripeSdk_compileSdkVersion=30
 StripeSdk_targetSdkVersion=28
 StripeSdk_minSdkVersion=21
 # Keep StripeSdk_stripeVersion in sync with https://github.com/stripe/stripe-identity-react-native/blob/main/android/gradle.properties
-StripeSdk_stripeVersion=21.10.+
+StripeSdk_stripeVersion=21.12.+

package/android/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Sep 24 20:02:13 MDT 2024
+sdk.dir=/Users/porter/Library/Android/sdk

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

@@ -1,15 +1,24 @@
 package com.reactnativestripesdk
 
-import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Dynamic
 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
+import com.facebook.react.viewmanagers.AuBECSDebitFormManagerDelegate
+import com.facebook.react.viewmanagers.AuBECSDebitFormManagerInterface
+import com.reactnativestripesdk.utils.asMapOrNull
 
 @ReactModule(name = AuBECSDebitFormViewManager.REACT_CLASS)
-class AuBECSDebitFormViewManager : SimpleViewManager<AuBECSDebitFormView>() {
+class AuBECSDebitFormViewManager :
+  SimpleViewManager<AuBECSDebitFormView>(),
+  AuBECSDebitFormManagerInterface<AuBECSDebitFormView> {
+  private val delegate = AuBECSDebitFormManagerDelegate(this)
+
   override fun getName() = REACT_CLASS
 
+  override fun getDelegate() = delegate
+
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
     mutableMapOf(
       FormCompleteEvent.EVENT_NAME to
@@ -17,7 +26,7 @@ class AuBECSDebitFormViewManager : SimpleViewManager<AuBECSDebitFormView>() {
     )
 
   @ReactProp(name = "companyName")
-  fun setCompanyName(
+  override fun setCompanyName(
     view: AuBECSDebitFormView,
     name: String?,
   ) {
@@ -25,11 +34,11 @@ class AuBECSDebitFormViewManager : SimpleViewManager<AuBECSDebitFormView>() {
   }
 
   @ReactProp(name = "formStyle")
-  fun setFormStyle(
+  override fun setFormStyle(
     view: AuBECSDebitFormView,
-    style: ReadableMap,
+    style: Dynamic,
   ) {
-    view.setFormStyle(style)
+    view.setFormStyle(style.asMapOrNull())
   }
 
   override fun createViewInstance(reactContext: ThemedReactContext): AuBECSDebitFormView = AuBECSDebitFormView(reactContext)

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

@@ -0,0 +1,56 @@
+package com.reactnativestripesdk
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+internal class CardChangeEvent(
+  surfaceId: Int,
+  viewTag: Int,
+  private val cardDetails: MutableMap<String, Any?>,
+  private val postalCodeEnabled: Boolean,
+  private val complete: Boolean,
+  private val dangerouslyGetFullCardDetails: Boolean,
+) : Event<CardChangeEvent>(surfaceId, viewTag) {
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap? {
+    val cardData = Arguments.createMap()
+    cardData.putString("brand", cardDetails["brand"]?.toString())
+    cardData.putString("last4", cardDetails["last4"]?.toString())
+
+    (cardDetails["expiryMonth"] as Int?)?.let {
+      cardData.putInt("expiryMonth", it)
+    } ?: run {
+      cardData.putNull("expiryMonth")
+    }
+
+    (cardDetails["expiryYear"] as Int?)?.let {
+      cardData.putInt("expiryYear", it)
+    } ?: run {
+      cardData.putNull("expiryYear")
+    }
+
+    cardData.putBoolean("complete", complete)
+    cardData.putString("validNumber", cardDetails["validNumber"]?.toString())
+    cardData.putString("validCVC", cardDetails["validCVC"]?.toString())
+    cardData.putString("validExpiryDate", cardDetails["validExpiryDate"]?.toString())
+
+    if (postalCodeEnabled) {
+      cardData.putString("postalCode", cardDetails["postalCode"]?.toString())
+    }
+
+    if (dangerouslyGetFullCardDetails) {
+      cardData.putString("number", cardDetails["number"]?.toString()?.replace(" ", ""))
+      cardData.putString("cvc", cardDetails["cvc"]?.toString())
+    }
+
+    return Arguments.createMap().apply {
+      putMap("card", cardData)
+    }
+  }
+
+  companion object {
+    const val EVENT_NAME = "topCardChange"
+  }
+}

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

@@ -99,10 +99,10 @@ class CardFieldView(
   private fun onChangeFocus() {
     UIManagerHelper
       .getEventDispatcherForReactTag(context, id)
-      ?.dispatchEvent(CardFocusEvent(context.surfaceId, id, currentFocusedField))
+      ?.dispatchEvent(CardFocusChangeEvent(context.surfaceId, id, currentFocusedField))
   }
 
-  fun setCardStyle(value: ReadableMap) {
+  fun setCardStyle(value: ReadableMap?) {
     val borderWidth = getIntOrNull(value, "borderWidth")
     val backgroundColor = getValOr(value, "backgroundColor", null)
     val borderColor = getValOr(value, "borderColor", null)
@@ -206,7 +206,7 @@ class CardFieldView(
     }
   }
 
-  fun setPlaceHolders(value: ReadableMap) {
+  fun setPlaceHolders(value: ReadableMap?) {
     val numberPlaceholder = getValOr(value, "number", null)
     val expirationPlaceholder = getValOr(value, "expiration", null)
     val cvcPlaceholder = getValOr(value, "cvc", null)
@@ -295,7 +295,7 @@ class CardFieldView(
     UIManagerHelper
       .getEventDispatcherForReactTag(context, id)
       ?.dispatchEvent(
-        CardChangedEvent(
+        CardChangeEvent(
           context.surfaceId,
           id,
           cardDetails,

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

@@ -1,70 +1,86 @@
 package com.reactnativestripesdk
 
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableMap
 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
+import com.facebook.react.viewmanagers.CardFieldManagerDelegate
+import com.facebook.react.viewmanagers.CardFieldManagerInterface
+import com.reactnativestripesdk.utils.asMapOrNull
 
 @ReactModule(name = CardFieldViewManager.REACT_CLASS)
-class CardFieldViewManager : SimpleViewManager<CardFieldView>() {
+class CardFieldViewManager :
+  SimpleViewManager<CardFieldView>(),
+  CardFieldManagerInterface<CardFieldView> {
+  private val delegate = CardFieldManagerDelegate(this)
+  private var reactContextRef: ThemedReactContext? = null
+
   override fun getName() = REACT_CLASS
 
-  private var reactContextRef: ThemedReactContext? = null
+  override fun getDelegate() = delegate
 
   override fun getExportedCustomDirectEventTypeConstants() =
     mutableMapOf(
-      CardFocusEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFocusChange"),
-      CardChangedEvent.EVENT_NAME to mutableMapOf("registrationName" to "onCardChange"),
+      CardFocusChangeEvent.EVENT_NAME to mutableMapOf("registrationName" to "onFocusChange"),
+      CardChangeEvent.EVENT_NAME to mutableMapOf("registrationName" to "onCardChange"),
     )
 
-  override fun receiveCommand(
-    root: CardFieldView,
-    commandId: String?,
-    args: ReadableArray?,
-  ) {
-    when (commandId) {
-      "focus" -> root.requestFocusFromJS()
-      "blur" -> root.requestBlurFromJS()
-      "clear" -> root.requestClearFromJS()
-    }
+  override fun createViewInstance(reactContext: ThemedReactContext): CardFieldView {
+    val stripeSdkModule: StripeSdkModule? =
+      reactContext.getNativeModule(StripeSdkModule::class.java)
+    val view = CardFieldView(reactContext)
+
+    reactContextRef = reactContext
+
+    stripeSdkModule?.cardFieldView = view
+    return view
+  }
+
+  override fun onDropViewInstance(view: CardFieldView) {
+    super.onDropViewInstance(view)
+
+    val stripeSdkModule: StripeSdkModule? =
+      reactContextRef?.getNativeModule(StripeSdkModule::class.java)
+    stripeSdkModule?.cardFieldView = null
+    reactContextRef = null
   }
 
   @ReactProp(name = "dangerouslyGetFullCardDetails")
-  fun setDangerouslyGetFullCardDetails(
+  override fun setDangerouslyGetFullCardDetails(
     view: CardFieldView,
-    dangerouslyGetFullCardDetails: Boolean = false,
+    dangerouslyGetFullCardDetails: Boolean,
   ) {
     view.setDangerouslyGetFullCardDetails(dangerouslyGetFullCardDetails)
   }
 
   @ReactProp(name = "postalCodeEnabled")
-  fun setPostalCodeEnabled(
+  override fun setPostalCodeEnabled(
     view: CardFieldView,
-    postalCodeEnabled: Boolean = true,
+    postalCodeEnabled: Boolean,
   ) {
     view.setPostalCodeEnabled(postalCodeEnabled)
   }
 
   @ReactProp(name = "autofocus")
-  fun setAutofocus(
+  override fun setAutofocus(
     view: CardFieldView,
-    autofocus: Boolean = false,
+    autofocus: Boolean,
   ) {
     view.setAutofocus(autofocus)
   }
 
   @ReactProp(name = "cardStyle")
-  fun setCardStyle(
+  override fun setCardStyle(
     view: CardFieldView,
-    cardStyle: ReadableMap,
+    cardStyle: Dynamic,
   ) {
-    view.setCardStyle(cardStyle)
+    view.setCardStyle(cardStyle.asMapOrNull())
   }
 
   @ReactProp(name = "countryCode")
-  fun setCountryCode(
+  override fun setCountryCode(
     view: CardFieldView,
     countryCode: String?,
   ) {
@@ -72,7 +88,7 @@ class CardFieldViewManager : SimpleViewManager<CardFieldView>() {
   }
 
   @ReactProp(name = "onBehalfOf")
-  fun setOnBehalfOf(
+  override fun setOnBehalfOf(
     view: CardFieldView,
     onBehalfOf: String?,
   ) {
@@ -80,15 +96,15 @@ class CardFieldViewManager : SimpleViewManager<CardFieldView>() {
   }
 
   @ReactProp(name = "placeholders")
-  fun setPlaceHolders(
+  override fun setPlaceholders(
     view: CardFieldView,
-    placeholders: ReadableMap,
+    placeholders: Dynamic,
   ) {
-    view.setPlaceHolders(placeholders)
+    view.setPlaceHolders(placeholders.asMapOrNull())
   }
 
   @ReactProp(name = "disabled")
-  fun setDisabled(
+  override fun setDisabled(
     view: CardFieldView,
     isDisabled: Boolean,
   ) {
@@ -96,7 +112,7 @@ class CardFieldViewManager : SimpleViewManager<CardFieldView>() {
   }
 
   @ReactProp(name = "preferredNetworks")
-  fun setPreferredNetworks(
+  override fun setPreferredNetworks(
     view: CardFieldView,
     preferredNetworks: ReadableArray?,
   ) {
@@ -104,24 +120,18 @@ class CardFieldViewManager : SimpleViewManager<CardFieldView>() {
     view.setPreferredNetworks(networks)
   }
 
-  override fun createViewInstance(reactContext: ThemedReactContext): CardFieldView {
-    val stripeSdkModule: StripeSdkModule? =
-      reactContext.getNativeModule(StripeSdkModule::class.java)
-    val view = CardFieldView(reactContext)
-
-    reactContextRef = reactContext
+  // Native commands
 
-    stripeSdkModule?.cardFieldView = view
-    return view
+  override fun blur(view: CardFieldView) {
+    view.requestBlurFromJS()
   }
 
-  override fun onDropViewInstance(view: CardFieldView) {
-    super.onDropViewInstance(view)
+  override fun focus(view: CardFieldView) {
+    view.requestFocusFromJS()
+  }
 
-    val stripeSdkModule: StripeSdkModule? =
-      reactContextRef?.getNativeModule(StripeSdkModule::class.java)
-    stripeSdkModule?.cardFieldView = null
-    reactContextRef = null
+  override fun clear(view: CardFieldView) {
+    view.requestClearFromJS()
   }
 
   companion object {

package/android/src/main/java/com/reactnativestripesdk/{CardFocusEvent.kt → CardFocusChangeEvent.kt}

@@ -4,11 +4,11 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-internal class CardFocusEvent(
+internal class CardFocusChangeEvent(
   surfaceId: Int,
   viewTag: Int,
   private val focusField: String?,
-) : Event<CardFocusEvent>(surfaceId, viewTag) {
+) : Event<CardFocusChangeEvent>(surfaceId, viewTag) {
   override fun getEventName() = EVENT_NAME
 
   override fun getEventData(): WritableMap? {

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

@@ -10,29 +10,30 @@ internal class CardFormCompleteEvent(
   private val cardDetails: MutableMap<String, Any>?,
   private val complete: Boolean,
   private val dangerouslyGetFullCardDetails: Boolean,
-) : Event<CardChangedEvent>(surfaceId, viewTag) {
+) : Event<CardChangeEvent>(surfaceId, viewTag) {
   override fun getEventName() = EVENT_NAME
 
   override fun getEventData(): WritableMap? {
-    val eventData = Arguments.createMap()
+    val cardData = Arguments.createMap()
 
-    if (cardDetails == null) {
-      return eventData
-    }
-    eventData.putString("brand", cardDetails["brand"]?.toString())
-    eventData.putString("last4", cardDetails["last4"]?.toString())
-    eventData.putString("country", cardDetails["country"]?.toString())
-    eventData.putInt("expiryMonth", cardDetails["expiryMonth"] as Int)
-    eventData.putInt("expiryYear", cardDetails["expiryYear"] as Int)
-    eventData.putBoolean("complete", complete)
-    eventData.putString("postalCode", cardDetails["postalCode"]?.toString())
+    if (cardDetails != null) {
+      cardData.putString("brand", cardDetails["brand"]?.toString())
+      cardData.putString("last4", cardDetails["last4"]?.toString())
+      cardData.putString("country", cardDetails["country"]?.toString())
+      cardData.putInt("expiryMonth", cardDetails["expiryMonth"] as Int)
+      cardData.putInt("expiryYear", cardDetails["expiryYear"] as Int)
+      cardData.putBoolean("complete", complete)
+      cardData.putString("postalCode", cardDetails["postalCode"]?.toString())
 
-    if (dangerouslyGetFullCardDetails) {
-      eventData.putString("number", cardDetails["number"]?.toString()?.replace(" ", ""))
-      eventData.putString("cvc", cardDetails["cvc"]?.toString())
+      if (dangerouslyGetFullCardDetails) {
+        cardData.putString("number", cardDetails["number"]?.toString()?.replace(" ", ""))
+        cardData.putString("cvc", cardDetails["cvc"]?.toString())
+      }
     }
 
-    return eventData
+    return Arguments.createMap().apply {
+      putMap("card", cardData)
+    }
   }
 
   companion object {