@stripe/stripe-react-native 0.59.0 → 0.59.2

package/README.md

@@ -23,7 +23,10 @@ Get started with our [📚 integration guides](https://stripe.com/docs/payments/
 
 **Native UI**: We provide native screens and elements to securely collect payment details on Android and iOS.
 
-**PaymentSheet**: [Learn how to integrate](https://stripe.com/docs/payments/accept-a-payment) PaymentSheet, our new pre-built payments UI for mobile apps. PaymentSheet lets you accept cards, Apple Pay, Google Pay, and much more out of the box and also supports saving & reusing payment methods. PaymentSheet currently accepts the following payment methods: Card, Apple Pay, Google Pay, SEPA Debit, Bancontact, Billie, iDEAL, EPS, P24, Afterpay/Clearpay, Klarna, Giropay, and ACH.
+**PaymentSheet**: [Learn how to integrate](https://stripe.com/docs/payments/accept-a-payment) PaymentSheet, our new pre-built payments UI for mobile apps.
+- PaymentSheet lets you accept cards, Apple Pay, Google Pay, and much more out of the box and also supports saving & reusing payment methods.
+- PaymentSheet currently accepts the following payment methods: Card, Apple Pay, Google Pay, SEPA Debit, Bancontact, Billie, iDEAL, EPS, P24, Afterpay/Clearpay, Klarna, Giropay, and ACH.
+- PaymentSheet provides card scanning on iOS and Android, with the Android functionality provided by [Google Payment Card Recognition](https://developers.google.com/pay/payment-card-recognition/debit-credit-card-recognition). To enable card scanning in your app, follow [our guide](https://docs.corp.stripe.com/payments/accept-a-payment?payment-ui=mobile&platform=react-native#react-native-card-scanning).
 
 #### Recommended usage
 
@@ -283,5 +286,5 @@ While installing pods in your iOS project using a Stripe React Native version be
 UnsupportedModulePropertyParserError: Module NativeStripeSdkModule: TypeScript interfaces extending TurboModule must only contain 'FunctionTypeAnnotation's. Property 'onConfirmHandlerCallback' refers to a 'TSTypeReference'.
 ```
 
-If possible, update to version 0.52 or above of the Stripe React Native SDK. 
+If possible, update to version 0.52 or above of the Stripe React Native SDK.
 If you are unable to do so, please follow our [guide to apply the fix patch](https://github.com/stripe/stripe-react-native/tree/master/patches).

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=22.7.+
+StripeSdk_stripeVersion=22.8.+

package/android/src/main/AndroidManifest.xml

@@ -27,8 +27,8 @@
         </activity>
 
         <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.stripe.fileprovider"
+            android:name="com.reactnativestripesdk.StripeFileProvider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

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

@@ -68,11 +68,6 @@ class FakeOnrampSdkModule(
     promise?.resolveNotImplemented()
   }
 
-  @ReactMethod
-  override fun authenticateUser(promise: Promise?) {
-    promise?.resolveNotImplemented()
-  }
-
   @ReactMethod
   override fun verifyIdentity(promise: Promise?) {
     promise?.resolveNotImplemented()

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

@@ -2,6 +2,7 @@ package com.reactnativestripesdk
 
 import com.facebook.react.bridge.ReadableMap
 import com.reactnativestripesdk.utils.PaymentSheetException
+import com.reactnativestripesdk.utils.forEachKey
 import com.reactnativestripesdk.utils.getBooleanOr
 import com.reactnativestripesdk.utils.getIntOr
 import com.reactnativestripesdk.utils.getLongOr
@@ -78,12 +79,23 @@ private fun mapStringToLinkDisplay(value: String?): PaymentSheet.LinkConfigurati
     else -> PaymentSheet.LinkConfiguration.Display.Automatic
   }
 
-internal fun computeTermsDisplayForUserKey(publishableKey: String): Map<PaymentMethod.Type, PaymentSheet.TermsDisplay> =
-  if (publishableKey.startsWith("uk_")) {
-    mapOf(PaymentMethod.Type.Card to PaymentSheet.TermsDisplay.NEVER)
-  } else {
-    emptyMap()
+internal fun mapToTermsDisplay(params: ReadableMap?): Map<PaymentMethod.Type, PaymentSheet.TermsDisplay>? {
+  val termsDisplayMap = params?.getMap("termsDisplay") ?: return null
+  val result = mutableMapOf<PaymentMethod.Type, PaymentSheet.TermsDisplay>()
+  termsDisplayMap.forEachKey { code ->
+    val paymentMethodType = PaymentMethod.Type.fromCode(code)
+    val termsDisplay =
+      when (termsDisplayMap.getString(code)) {
+        "never" -> PaymentSheet.TermsDisplay.NEVER
+        "automatic" -> PaymentSheet.TermsDisplay.AUTOMATIC
+        else -> null
+      }
+    if (paymentMethodType != null && termsDisplay != null) {
+      result[paymentMethodType] = termsDisplay
+    }
   }
+  return result.ifEmpty { null }
+}
 
 private val mapIntToButtonType =
   mapOf(

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

@@ -61,7 +61,7 @@ fun parseAppearance(
   font?.let { appearance.font(font) }
   val colors = PaymentMethodMessagingElement.Appearance.Colors()
   textColor?.let { colors.textColor(it) }
-  linkTextColor?.let { colors.infoIconColor(linkTextColor) }
+  linkTextColor?.let { colors.linkTextColor(linkTextColor) }
   appearance.colors(colors)
 
   return appearance

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

@@ -39,7 +39,6 @@ import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.reactnativestripesdk.utils.parseCustomPaymentMethods
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
-import com.stripe.android.PaymentConfiguration
 import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.model.PaymentMethod
 import com.stripe.android.paymentelement.ConfirmCustomPaymentMethodCallback
@@ -299,13 +298,7 @@ class PaymentSheetManager(
       mapToPaymentMethodLayout(arguments.getString("paymentMethodLayout")),
     )
 
-    val userKeyTermsDisplay =
-      computeTermsDisplayForUserKey(
-        PaymentConfiguration.getInstance(context).publishableKey,
-      )
-    if (userKeyTermsDisplay.isNotEmpty()) {
-      configurationBuilder.termsDisplay(userKeyTermsDisplay)
-    }
+    mapToTermsDisplay(arguments)?.let { configurationBuilder.termsDisplay(it) }
 
     paymentSheetConfiguration = configurationBuilder.build()
 

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

@@ -0,0 +1,17 @@
+package com.reactnativestripesdk
+
+/**
+ * A custom FileProvider subclass for the Stripe React Native SDK.
+ *
+ * This class extends androidx.core.content.FileProvider to provide a unique
+ * android:name in the manifest, preventing conflicts with other libraries that
+ * also use FileProvider (e.g., react-native-document-viewer, expo-file-system).
+ *
+ * By using a library-specific class name, the Android manifest merger keeps
+ * this provider separate from other FileProviders, avoiding the
+ * "Attribute provider@authorities value=... is also present at..." error.
+ *
+ * No additional implementation is needed - this simply inherits all functionality
+ * from the parent FileProvider class.
+ */
+class StripeFileProvider : androidx.core.content.FileProvider()

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

@@ -1518,7 +1518,7 @@ class StripeSdkModule(
       val uri =
         androidx.core.content.FileProvider.getUriForFile(
           reactApplicationContext,
-          "${reactApplicationContext.packageName}.stripe.fileprovider",
+          "${reactApplicationContext.packageName}.fileprovider",
           file,
         )
 

package/android/src/oldarch/java/com/reactnativestripesdk/NativeOnrampSdkModuleSpec.java

@@ -72,10 +72,6 @@ public abstract class NativeOnrampSdkModuleSpec extends ReactContextBaseJavaModu
   @DoNotStrip
   public abstract void updatePhoneNumber(String phone, Promise promise);
 
-  @ReactMethod
-  @DoNotStrip
-  public abstract void authenticateUser(Promise promise);
-
   @ReactMethod
   @DoNotStrip
   public abstract void verifyIdentity(Promise promise);

package/android/src/onramp/java/com/reactnativestripesdk/OnrampMappers.kt

@@ -0,0 +1,103 @@
+package com.reactnativestripesdk
+
+import android.annotation.SuppressLint
+import androidx.compose.ui.graphics.Color
+import com.facebook.react.bridge.ReadableMap
+import com.stripe.android.crypto.onramp.model.OnrampConfiguration
+import com.stripe.android.link.LinkAppearance
+import com.stripe.android.link.LinkAppearance.Colors
+import com.stripe.android.link.LinkAppearance.PrimaryButton
+import com.stripe.android.link.LinkAppearance.Style
+
+@SuppressLint("RestrictedApi")
+internal fun mapConfig(
+  configMap: ReadableMap,
+  publishableKey: String,
+): OnrampConfiguration {
+  val appearanceMap = configMap.getMap("appearance")
+  val appearance =
+    if (appearanceMap != null) {
+      mapAppearance(appearanceMap)
+    } else {
+      LinkAppearance()
+        .style(Style.AUTOMATIC)
+    }
+
+  val displayName = configMap.getString("merchantDisplayName") ?: ""
+  val cryptoCustomerId = configMap.getString("cryptoCustomerId")
+
+  return OnrampConfiguration()
+    .merchantDisplayName(displayName)
+    .publishableKey(publishableKey)
+    .appearance(appearance)
+    .cryptoCustomerId(cryptoCustomerId)
+}
+
+@SuppressLint("RestrictedApi")
+internal fun mapAppearance(appearanceMap: ReadableMap): LinkAppearance {
+  val lightColorsMap = appearanceMap.getMap("lightColors")
+  val darkColorsMap = appearanceMap.getMap("darkColors")
+  val styleStr = appearanceMap.getString("style")
+  val primaryButtonMap = appearanceMap.getMap("primaryButton")
+
+  val lightColors =
+    if (lightColorsMap != null) {
+      val primaryColorStr = lightColorsMap.getString("primary")
+      val contentColorStr = lightColorsMap.getString("contentOnPrimary")
+      val borderSelectedColorStr = lightColorsMap.getString("borderSelected")
+
+      Colors()
+        .primary(Color(android.graphics.Color.parseColor(primaryColorStr)))
+        .contentOnPrimary(Color(android.graphics.Color.parseColor(contentColorStr)))
+        .borderSelected(Color(android.graphics.Color.parseColor(borderSelectedColorStr)))
+    } else {
+      Colors()
+    }
+
+  val darkColors =
+    if (darkColorsMap != null) {
+      val primaryColorStr = darkColorsMap.getString("primary")
+      val contentColorStr = darkColorsMap.getString("contentOnPrimary")
+      val borderSelectedColorStr = darkColorsMap.getString("borderSelected")
+
+      Colors()
+        .primary(Color(android.graphics.Color.parseColor(primaryColorStr)))
+        .contentOnPrimary(Color(android.graphics.Color.parseColor(contentColorStr)))
+        .borderSelected(Color(android.graphics.Color.parseColor(borderSelectedColorStr)))
+    } else {
+      Colors()
+    }
+
+  val style =
+    when (styleStr) {
+      "ALWAYS_LIGHT" -> Style.ALWAYS_LIGHT
+      "ALWAYS_DARK" -> Style.ALWAYS_DARK
+      else -> Style.AUTOMATIC
+    }
+
+  val primaryButton =
+    if (primaryButtonMap != null) {
+      PrimaryButton()
+        .cornerRadiusDp(
+          if (primaryButtonMap.hasKey("cornerRadius")) {
+            primaryButtonMap.getDouble("cornerRadius").toFloat()
+          } else {
+            null
+          },
+        ).heightDp(
+          if (primaryButtonMap.hasKey("height")) {
+            primaryButtonMap.getDouble("height").toFloat()
+          } else {
+            null
+          },
+        )
+    } else {
+      PrimaryButton()
+    }
+
+  return LinkAppearance()
+    .lightColors(lightColors)
+    .darkColors(darkColors)
+    .style(style)
+    .primaryButton(primaryButton)
+}

package/android/src/onramp/java/com/reactnativestripesdk/OnrampSdkModule.kt

@@ -3,8 +3,6 @@ package com.reactnativestripesdk
 import android.annotation.SuppressLint
 import android.app.Application
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.graphics.Color
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.SavedStateHandle
 import com.facebook.react.bridge.Arguments
@@ -30,12 +28,10 @@ import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
-import com.stripe.android.crypto.onramp.model.OnrampAuthenticateResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
 import com.stripe.android.crypto.onramp.model.OnrampCallbacks
 import com.stripe.android.crypto.onramp.model.OnrampCheckoutResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
-import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
@@ -47,10 +43,6 @@ import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodType
-import com.stripe.android.link.LinkAppearance
-import com.stripe.android.link.LinkAppearance.Colors
-import com.stripe.android.link.LinkAppearance.PrimaryButton
-import com.stripe.android.link.LinkAppearance.Style
 import com.stripe.android.link.LinkController.PaymentMethodPreview
 import com.stripe.android.link.PaymentMethodPreviewDetails
 import com.stripe.android.model.CardBrand
@@ -59,8 +51,11 @@ import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
 
 @SuppressLint("RestrictedApi")
 @ReactModule(name = NativeOnrampSdkModuleSpec.NAME)
@@ -81,6 +76,7 @@ class OnrampSdkModule(
   private var verifyKycPromise: Promise? = null
 
   private var checkoutClientSecretDeferred: CompletableDeferred<String>? = null
+  private val rnScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
 
   @ReactMethod
   override fun initialise(
@@ -95,6 +91,11 @@ class OnrampSdkModule(
     promise.resolve(null)
   }
 
+  override fun invalidate() {
+    super.invalidate()
+    rnScope.cancel()
+  }
+
   /**
    * Safely get and cast the current activity as an AppCompatActivity. If that fails, the promise
    * provided will be resolved with an error message instructing the user to retry the method.
@@ -124,33 +125,37 @@ class OnrampSdkModule(
       return
     }
 
+    val onrampCallbacks =
+      OnrampCallbacks()
+        .verifyIdentityCallback { result ->
+          handleOnrampIdentityVerificationResult(result, identityVerificationPromise!!)
+        }.collectPaymentCallback { result ->
+          handleOnrampCollectPaymentResult(result, collectPaymentPromise!!)
+        }.authorizeCallback { result ->
+          handleOnrampAuthorizationResult(result, authorizePromise!!)
+        }.checkoutCallback { result ->
+          handleOnrampCheckoutResult(result, checkoutPromise!!)
+        }.verifyKycCallback { result ->
+          handleOnrampKycVerificationResult(result, verifyKycPromise!!)
+        }.onrampSessionClientSecretProvider { sessionId ->
+          checkoutClientSecretDeferred = CompletableDeferred()
+
+          val params = Arguments.createMap()
+          params.putString("onrampSessionId", sessionId)
+
+          emitOnCheckoutClientSecretRequested(params)
+
+          checkoutClientSecretDeferred!!.await()
+        }
+
     val coordinator =
       onrampCoordinator ?: OnrampCoordinator
         .Builder()
-        .build(application, SavedStateHandle())
+        .build(application, SavedStateHandle(), onrampCallbacks)
         .also { this.onrampCoordinator = it }
 
     CoroutineScope(Dispatchers.IO).launch {
-      val appearanceMap = config.getMap("appearance")
-      val appearance =
-        if (appearanceMap != null) {
-          mapAppearance(appearanceMap)
-        } else {
-          LinkAppearance(style = Style.AUTOMATIC)
-        }
-
-      val displayName = config.getString("merchantDisplayName") ?: ""
-
-      val cryptoCustomerId = config.getString("cryptoCustomerId")
-
-      val configuration =
-        OnrampConfiguration(
-          merchantDisplayName = displayName,
-          publishableKey = publishableKey,
-          appearance = appearance,
-          cryptoCustomerId = cryptoCustomerId,
-        )
-
+      val configuration = mapConfig(config, publishableKey)
       val configureResult = coordinator.configure(configuration)
 
       CoroutineScope(Dispatchers.Main).launch {
@@ -182,30 +187,8 @@ class OnrampSdkModule(
       return
     }
 
-    val onrampCallbacks =
-      OnrampCallbacks(
-        authenticateUserCallback = { result ->
-          handleOnrampAuthenticationResult(result, authenticateUserPromise!!)
-        },
-        verifyIdentityCallback = { result ->
-          handleOnrampIdentityVerificationResult(result, identityVerificationPromise!!)
-        },
-        collectPaymentCallback = { result ->
-          handleOnrampCollectPaymentResult(result, collectPaymentPromise!!)
-        },
-        authorizeCallback = { result ->
-          handleOnrampAuthorizationResult(result, authorizePromise!!)
-        },
-        checkoutCallback = { result ->
-          handleOnrampCheckoutResult(result, checkoutPromise!!)
-        },
-        verifyKycCallback = { result ->
-          handleOnrampKycVerificationResult(result, verifyKycPromise!!)
-        },
-      )
-
     try {
-      onrampPresenter = onrampCoordinator!!.createPresenter(activity, onrampCallbacks)
+      onrampPresenter = onrampCoordinator!!.createPresenter(activity)
       promise.resolveVoid()
     } catch (e: Exception) {
       promise.resolve(createFailedError(e))
@@ -394,7 +377,7 @@ class OnrampSdkModule(
       }
     CoroutineScope(Dispatchers.IO).launch {
       when (val result = coordinator.updatePhoneNumber(phone)) {
-        OnrampUpdatePhoneNumberResult.Completed -> {
+        is OnrampUpdatePhoneNumberResult.Completed -> {
           promise.resolveVoid()
         }
         is OnrampUpdatePhoneNumberResult.Failed -> {
@@ -404,19 +387,6 @@ class OnrampSdkModule(
     }
   }
 
-  @ReactMethod
-  override fun authenticateUser(promise: Promise) {
-    val presenter =
-      onrampPresenter ?: run {
-        promise.resolve(createOnrampNotConfiguredError())
-        return
-      }
-
-    authenticateUserPromise = promise
-
-    presenter.authenticateUser()
-  }
-
   @ReactMethod
   override fun verifyIdentity(promise: Promise) {
     val presenter =
@@ -505,20 +475,9 @@ class OnrampSdkModule(
         return
       }
 
-    val checkoutHandler: suspend () -> String = {
-      checkoutClientSecretDeferred = CompletableDeferred()
-
-      val params = Arguments.createMap()
-      params.putString("onrampSessionId", onrampSessionId)
-
-      emitOnCheckoutClientSecretRequested(params)
-
-      checkoutClientSecretDeferred!!.await()
-    }
-
     checkoutPromise = promise
 
-    presenter.performCheckout(onrampSessionId, checkoutHandler)
+    presenter.performCheckout(onrampSessionId)
   }
 
   @ReactMethod
@@ -579,6 +538,7 @@ class OnrampSdkModule(
             null
           }
         }
+
         token.hasKey("us_bank_account") -> {
           val bankMap = token.getMap("us_bank_account")
           if (bankMap != null) {
@@ -597,6 +557,7 @@ class OnrampSdkModule(
             null
           }
         }
+
         else -> null
       }
 
@@ -608,19 +569,35 @@ class OnrampSdkModule(
       )
       return
     }
+    rnScope.launch {
+      val iconDataUri: String =
+        try {
+          val base64 =
+            withContext(Dispatchers.Default) {
+              val drawable =
+                withTimeout(5_000L) {
+                  withContext(Dispatchers.IO) {
+                    paymentDetails.imageLoader()
+                  }
+                }
+
+              getBitmapFromDrawable(drawable)?.let { bitmap ->
+                getBase64FromBitmap(bitmap)
+              } ?: ""
+            }
+
+          if (base64.isNotEmpty()) "data:image/png;base64,$base64" else ""
+        } catch (_: Exception) {
+          ""
+        }
 
-    val icon =
-      reactApplicationContext.currentActivity
-        ?.let { ContextCompat.getDrawable(it, paymentDetails.iconRes) }
-        ?.let { "data:image/png;base64," + getBase64FromBitmap(getBitmapFromDrawable(it)) }
-
-    val displayData = Arguments.createMap()
-
-    displayData.putString("icon", icon)
-    displayData.putString("label", paymentDetails.label)
-    displayData.putString("sublabel", paymentDetails.sublabel)
+      val displayData = Arguments.createMap()
+      displayData.putString("icon", iconDataUri)
+      displayData.putString("label", paymentDetails.label)
+      displayData.putString("sublabel", paymentDetails.sublabel)
 
-    promise.resolve(createResult("displayData", displayData))
+      promise.resolve(createResult("displayData", displayData))
+    }
   }
 
   @ReactMethod
@@ -659,95 +636,6 @@ class OnrampSdkModule(
     }
   }
 
-  private fun mapAppearance(appearanceMap: ReadableMap): LinkAppearance {
-    val lightColorsMap = appearanceMap.getMap("lightColors")
-    val darkColorsMap = appearanceMap.getMap("darkColors")
-    val styleStr = appearanceMap.getString("style")
-    val primaryButtonMap = appearanceMap.getMap("primaryButton")
-
-    val lightColors =
-      if (lightColorsMap != null) {
-        val primaryColorStr = lightColorsMap.getString("primary")
-        val contentColorStr = lightColorsMap.getString("contentOnPrimary")
-        val borderSelectedColorStr = lightColorsMap.getString("borderSelected")
-
-        Colors(
-          primary = Color(android.graphics.Color.parseColor(primaryColorStr)),
-          contentOnPrimary = Color(android.graphics.Color.parseColor(contentColorStr)),
-          borderSelected = Color(android.graphics.Color.parseColor(borderSelectedColorStr)),
-        )
-      } else {
-        null
-      }
-
-    val darkColors =
-      if (darkColorsMap != null) {
-        val primaryColorStr = darkColorsMap.getString("primary")
-        val contentColorStr = darkColorsMap.getString("contentOnPrimary")
-        val borderSelectedColorStr = darkColorsMap.getString("borderSelected")
-
-        Colors(
-          primary = Color(android.graphics.Color.parseColor(primaryColorStr)),
-          contentOnPrimary = Color(android.graphics.Color.parseColor(contentColorStr)),
-          borderSelected = Color(android.graphics.Color.parseColor(borderSelectedColorStr)),
-        )
-      } else {
-        null
-      }
-
-    val style =
-      when (styleStr) {
-        "ALWAYS_LIGHT" -> Style.ALWAYS_LIGHT
-        "ALWAYS_DARK" -> Style.ALWAYS_DARK
-        else -> Style.AUTOMATIC
-      }
-
-    val primaryButton =
-      if (primaryButtonMap != null) {
-        PrimaryButton(
-          cornerRadiusDp =
-            if (primaryButtonMap.hasKey("cornerRadius")) {
-              primaryButtonMap.getDouble("cornerRadius").toFloat()
-            } else {
-              null
-            },
-          heightDp =
-            if (primaryButtonMap.hasKey("height")) {
-              primaryButtonMap.getDouble("height").toFloat()
-            } else {
-              null
-            },
-        )
-      } else {
-        null
-      }
-
-    val default = LinkAppearance(style = Style.AUTOMATIC)
-    return LinkAppearance(
-      lightColors = lightColors ?: default.lightColors,
-      darkColors = darkColors ?: default.darkColors,
-      style = style,
-      primaryButton = primaryButton ?: default.primaryButton,
-    )
-  }
-
-  private fun handleOnrampAuthenticationResult(
-    result: OnrampAuthenticateResult,
-    promise: Promise,
-  ) {
-    when (result) {
-      is OnrampAuthenticateResult.Completed -> {
-        promise.resolveString("customerId", result.customerId)
-      }
-      is OnrampAuthenticateResult.Cancelled -> {
-        promise.resolve(createCanceledError("Authentication was cancelled"))
-      }
-      is OnrampAuthenticateResult.Failed -> {
-        promise.resolve(createFailedError(result.error))
-      }
-    }
-  }
-
   private fun handleOnrampIdentityVerificationResult(
     result: OnrampVerifyIdentityResult,
     promise: Promise,
@@ -795,19 +683,41 @@ class OnrampSdkModule(
   ) {
     when (result) {
       is OnrampCollectPaymentMethodResult.Completed -> {
-        val displayData = Arguments.createMap()
-        val icon =
-          reactApplicationContext.currentActivity
-            ?.let { ContextCompat.getDrawable(it, result.displayData.iconRes) }
-            ?.let { "data:image/png;base64," + getBase64FromBitmap(getBitmapFromDrawable(it)) }
-        displayData.putString("icon", icon)
-        displayData.putString("label", result.displayData.label)
-        result.displayData.sublabel?.let { displayData.putString("sublabel", it) }
-        promise.resolve(createResult("displayData", displayData))
+        rnScope.launch {
+          val iconDataUri =
+            try {
+              val base64 =
+                withContext(Dispatchers.Default) {
+                  val drawable =
+                    withTimeout(5_000L) {
+                      withContext(Dispatchers.IO) {
+                        result.displayData.imageLoader()
+                      }
+                    }
+
+                  getBitmapFromDrawable(drawable)?.let { bitmap ->
+                    getBase64FromBitmap(bitmap)
+                  } ?: ""
+                }
+
+              if (base64.isNotEmpty()) "data:image/png;base64,$base64" else ""
+            } catch (_: Exception) {
+              ""
+            }
+
+          val displayData = Arguments.createMap()
+          displayData.putString("icon", iconDataUri)
+          displayData.putString("label", result.displayData.label)
+          result.displayData.sublabel?.let { displayData.putString("sublabel", it) }
+
+          promise.resolve(createResult("displayData", displayData))
+        }
       }
+
       is OnrampCollectPaymentMethodResult.Cancelled -> {
         promise.resolve(createCanceledError("Payment collection was cancelled"))
       }
+
       is OnrampCollectPaymentMethodResult.Failed -> {
         promise.resolve(createFailedError(result.error))
       }