@stripe/stripe-react-native 0.63.0 → 0.64.0

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=23.3.+
+StripeSdk_stripeVersion=23.4.+

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

@@ -42,6 +42,7 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.Bancontact -> createBancontactParams()
         PaymentMethod.Type.Billie -> createBillieParams()
         PaymentMethod.Type.SepaDebit -> createSepaParams()
+        PaymentMethod.Type.Multibanco -> createMultibancoParams()
         PaymentMethod.Type.Oxxo -> createOXXOParams()
         PaymentMethod.Type.Eps -> createEPSParams()
         PaymentMethod.Type.GrabPay -> createGrabPayParams()
@@ -131,6 +132,26 @@ class PaymentMethodCreateParamsFactory(
     throw PaymentMethodCreateParamsException("You must provide billing details")
   }
 
+  @Throws(PaymentMethodCreateParamsException::class)
+  private fun createMultibancoParams(): PaymentMethodCreateParams {
+    billingDetailsParams?.let {
+      if (it.email.isNullOrBlank()) {
+        throw PaymentMethodCreateParamsException(
+          "When creating a Multibanco payment method, you must provide the following billing details: email",
+        )
+      }
+
+      return PaymentMethodCreateParams.createMultibanco(
+        billingDetails = it,
+        metadata = metadataParams,
+      )
+    }
+
+    throw PaymentMethodCreateParamsException(
+      "When creating a Multibanco payment method, you must provide the following billing details: email",
+    )
+  }
+
   @Throws(PaymentMethodCreateParamsException::class)
   private fun createEPSParams(): PaymentMethodCreateParams {
     billingDetailsParams?.let {
@@ -255,6 +276,7 @@ class PaymentMethodCreateParamsFactory(
         PaymentMethod.Type.Bancontact,
         PaymentMethod.Type.Billie,
         PaymentMethod.Type.SepaDebit,
+        PaymentMethod.Type.Multibanco,
         PaymentMethod.Type.Oxxo,
         PaymentMethod.Type.Eps,
         PaymentMethod.Type.GrabPay,

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

@@ -25,6 +25,7 @@ import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.modules.systeminfo.ReactNativeVersion
 import com.reactnativestripesdk.addresssheet.AddressLauncherManager
 import com.reactnativestripesdk.customersheet.CustomerSheetManager
 import com.reactnativestripesdk.pushprovisioning.PushProvisioningProxy
@@ -213,6 +214,11 @@ class StripeSdkModule(
               ).toString()
           ),
           "appVersion" to (packageInfo?.versionName ?: ""),
+          "isNewArchitecture" to BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
+          "reactNativeVersion" to
+            with(ReactNativeVersion.VERSION) {
+              "${get("major")}.${get("minor")}.${get("patch")}"
+            },
         ),
     )
   }

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

@@ -20,7 +20,7 @@ class StripeSdkPackage : BaseReactPackage() {
     when (name) {
       StripeSdkModule.NAME -> StripeSdkModule(reactContext)
       NativeOnrampSdkModuleSpec.NAME -> {
-        val onrampModuleClass = getOnrampModuleClass()
+        val onrampModuleClass = getOnrampModuleClass() ?: return null
         val constructor = onrampModuleClass.getConstructor(ReactApplicationContext::class.java)
         constructor.newInstance(reactContext) as NativeModule
       }
@@ -29,10 +29,10 @@ class StripeSdkPackage : BaseReactPackage() {
 
   override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
     val moduleList: Array<Class<out NativeModule?>> =
-      arrayOf(
+      listOfNotNull(
         StripeSdkModule::class.java,
         getOnrampModuleClass(),
-      )
+      ).toTypedArray()
     val reactModuleInfoMap: MutableMap<String, ReactModuleInfo> = HashMap()
     for (moduleClass in moduleList) {
       val reactModule = moduleClass.getAnnotation(ReactModule::class.java) ?: continue
@@ -63,12 +63,12 @@ class StripeSdkPackage : BaseReactPackage() {
       PaymentMethodMessagingElementViewManager(),
     )
 
-  private fun getOnrampModuleClass(): Class<out NativeModule?> {
+  private fun getOnrampModuleClass(): Class<out NativeModule?>? {
     if (BuildConfig.IS_ONRAMP_INCLUDED) {
       @Suppress("UNCHECKED_CAST")
       return Class.forName("com.reactnativestripesdk.OnrampSdkModule") as Class<out NativeModule?>
     } else {
-      return FakeOnrampSdkModule::class.java
+      return null
     }
   }
 }

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

@@ -140,6 +140,7 @@ internal fun mapPaymentMethodType(type: PaymentMethod.Type?): String =
     PaymentMethod.Type.GrabPay -> "GrabPay"
     PaymentMethod.Type.Ideal -> "Ideal"
     PaymentMethod.Type.Netbanking -> "Netbanking"
+    PaymentMethod.Type.Multibanco -> "Multibanco"
     PaymentMethod.Type.Oxxo -> "Oxxo"
     PaymentMethod.Type.P24 -> "P24"
     PaymentMethod.Type.SepaDebit -> "SepaDebit"
@@ -171,6 +172,7 @@ internal fun mapToPaymentMethodType(type: String?): PaymentMethod.Type? =
     "Fpx" -> PaymentMethod.Type.Fpx
     "GrabPay" -> PaymentMethod.Type.GrabPay
     "Netbanking" -> PaymentMethod.Type.Netbanking
+    "Multibanco" -> PaymentMethod.Type.Multibanco
     "Oxxo" -> PaymentMethod.Type.Oxxo
     "P24" -> PaymentMethod.Type.P24
     "SepaDebit" -> PaymentMethod.Type.SepaDebit

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

@@ -4,8 +4,10 @@ package com.reactnativestripesdk
 
 import android.annotation.SuppressLint
 import androidx.compose.ui.graphics.Color
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
@@ -14,6 +16,8 @@ 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.model.DateOfBirth
+import com.stripe.android.paymentsheet.PaymentSheet
 
 @SuppressLint("RestrictedApi")
 internal fun mapConfig(
@@ -50,6 +54,8 @@ internal fun mapGooglePayConfig(params: ReadableMap?): GooglePayPaymentMethodLau
   val merchantName = params.getString("merchantName") ?: return null
   val existingPaymentMethodRequired =
     params.hasKey("existingPaymentMethodRequired") && params.getBoolean("existingPaymentMethodRequired")
+  val isEmailRequired = if (params.hasKey("isEmailRequired")) params.getBoolean("isEmailRequired") else false
+  val allowCreditCards = if (params.hasKey("allowCreditCards")) params.getBoolean("allowCreditCards") else true
 
   val billingAddressConfig =
     mapGooglePayBillingAddressConfig(params.getMap("billingAddressConfig"))
@@ -58,6 +64,8 @@ internal fun mapGooglePayConfig(params: ReadableMap?): GooglePayPaymentMethodLau
     environment = if (testEnv) GooglePayEnvironment.Test else GooglePayEnvironment.Production,
     merchantCountryCode = merchantCountryCode,
     merchantName = merchantName,
+    isEmailRequired = isEmailRequired,
+    allowCreditCards = allowCreditCards,
     billingAddressConfig = billingAddressConfig,
     existingPaymentMethodRequired = existingPaymentMethodRequired,
   )
@@ -159,3 +167,38 @@ internal fun mapPaymentDetailsType(type: PaymentMethodDisplayData.Type): String
     PaymentMethodDisplayData.Type.BankAccount -> "BankAccount"
     PaymentMethodDisplayData.Type.GooglePay -> "GooglePay"
   }
+
+@OptIn(ExperimentalCryptoOnramp::class)
+@SuppressLint("RestrictedApi")
+internal fun mapFromKycInfo(kycInfo: KycInfo): ReadableMap {
+  val result = Arguments.createMap()
+
+  kycInfo.firstName?.let { result.putString("firstName", it) }
+  kycInfo.lastName?.let { result.putString("lastName", it) }
+  kycInfo.idNumber?.let { result.putString("idNumber", it) }
+  kycInfo.address?.let { result.putMap("address", mapFromKycAddress(it)) }
+  kycInfo.dateOfBirth?.let { result.putMap("dateOfBirth", mapFromDateOfBirth(it)) }
+
+  return result
+}
+
+private fun mapFromKycAddress(address: PaymentSheet.Address): ReadableMap {
+  val result = Arguments.createMap()
+
+  address.city?.let { result.putString("city", it) }
+  address.country?.let { result.putString("country", it) }
+  address.line1?.let { result.putString("line1", it) }
+  address.line2?.let { result.putString("line2", it) }
+  address.postalCode?.let { result.putString("postalCode", it) }
+  address.state?.let { result.putString("state", it) }
+
+  return result
+}
+
+private fun mapFromDateOfBirth(dateOfBirth: DateOfBirth): ReadableMap {
+  val result = Arguments.createMap()
+  result.putInt("day", dateOfBirth.day)
+  result.putInt("month", dateOfBirth.month)
+  result.putInt("year", dateOfBirth.year)
+  return result
+}

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

@@ -418,6 +418,7 @@ class OnrampSdkModule(
               }
           val currencyCode = googlePayParams.getString("currencyCode") ?: ""
           val amount = googlePayParams.getDouble("amount").toLong()
+
           val transactionId = googlePayParams.getString("transactionId")
           val label = googlePayParams.getString("label")
 
@@ -722,7 +723,10 @@ class OnrampSdkModule(
           result.displayData.sublabel?.let { displayData.putString("sublabel", it) }
           displayData.putString("type", mapPaymentDetailsType(result.displayData.type))
 
-          promise.resolve(createResult("displayData", displayData))
+          val map = Arguments.createMap()
+          map.putMap("displayData", displayData)
+          result.kycInfo?.let { map.putMap("kycInfo", mapFromKycInfo(it)) }
+          promise.resolve(map)
         }
       }
 

package/android/src/test/java/com/reactnativestripesdk/mappers/MappersTest.kt

@@ -3,13 +3,18 @@ package com.reactnativestripesdk.mappers
 import android.annotation.SuppressLint
 import com.facebook.react.bridge.WritableMap
 import com.reactnativestripesdk.utils.createCanAddCardResult
+import com.reactnativestripesdk.utils.mapNextAction
+import com.reactnativestripesdk.utils.mapPaymentMethodType
 import com.reactnativestripesdk.utils.mapToAddress
 import com.reactnativestripesdk.utils.mapToBillingDetails
+import com.reactnativestripesdk.utils.mapToPaymentMethodType
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.reactnativestripesdk.utils.parseCustomPaymentMethods
 import com.reactnativestripesdk.utils.readableArrayOf
 import com.reactnativestripesdk.utils.readableMapOf
 import com.stripe.android.model.CardBrand
+import com.stripe.android.model.PaymentMethod
+import com.stripe.android.model.StripeIntent
 import org.junit.Assert
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -80,6 +85,34 @@ class MappersTest {
     Assert.assertNull(details?.getMap("token"))
   }
 
+  @Test
+  fun mapPaymentMethodType_Multibanco_ReturnsString() {
+    assertEquals("Multibanco", mapPaymentMethodType(PaymentMethod.Type.Multibanco))
+  }
+
+  @Test
+  fun mapToPaymentMethodType_Multibanco_ReturnsType() {
+    assertEquals(PaymentMethod.Type.Multibanco, mapToPaymentMethodType("Multibanco"))
+  }
+
+  @Test
+  fun mapNextAction_DisplayMultibancoDetails_ReturnsVoucherUrl() {
+    val result =
+      mapNextAction(
+        StripeIntent.NextActionType.DisplayMultibancoDetails,
+        StripeIntent.NextActionData.DisplayMultibancoDetails(
+          hostedVoucherUrl = "https://payments.stripe.com/multibanco/voucher",
+        ),
+      )
+
+    assertNotNull(result)
+    assertEquals("multibanco", result?.getString("type"))
+    assertEquals(
+      "https://payments.stripe.com/multibanco/voucher",
+      result?.getString("voucherURL"),
+    )
+  }
+
   // ============================================
   // mapToPreferredNetworks Tests
   // ============================================

package/android/src/test/java/com/reactnativestripesdk/mappers/OnrampMappersTest.kt

@@ -6,12 +6,21 @@ import android.annotation.SuppressLint
 import androidx.compose.ui.graphics.toArgb
 import com.reactnativestripesdk.mapAppearance
 import com.reactnativestripesdk.mapConfig
+import com.reactnativestripesdk.mapFromKycInfo
+import com.reactnativestripesdk.mapGooglePayConfig
 import com.reactnativestripesdk.utils.readableMapOf
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.model.KycInfo
+import com.stripe.android.googlepaylauncher.GooglePayEnvironment
+import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.link.LinkAppearance.Style
+import com.stripe.android.model.DateOfBirth
+import com.stripe.android.paymentsheet.PaymentSheet
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -19,6 +28,182 @@ import org.robolectric.RobolectricTestRunner
 @SuppressLint("RestrictedApi")
 @RunWith(RobolectricTestRunner::class)
 class OnrampMappersTest {
+  @Test
+  fun mapGooglePayConfig_NullMap_ReturnsNull() {
+    val result = mapGooglePayConfig(null)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapGooglePayConfig_MissingMerchantCountryCode_ReturnsNull() {
+    val params =
+      readableMapOf(
+        "merchantName" to "Test Merchant",
+      )
+    val result = mapGooglePayConfig(params)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapGooglePayConfig_Defaults() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertEquals(GooglePayEnvironment.Production, result!!.environment)
+    assertFalse(result.isEmailRequired)
+    assertTrue(result.allowCreditCards)
+    assertFalse(result.existingPaymentMethodRequired)
+  }
+
+  @Test
+  fun mapGooglePayConfig_TestEnv() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "testEnv" to true,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertEquals(GooglePayEnvironment.Test, result!!.environment)
+  }
+
+  @Test
+  fun mapGooglePayConfig_IsEmailRequired_True() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "isEmailRequired" to true,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertTrue(result!!.isEmailRequired)
+  }
+
+  @Test
+  fun mapGooglePayConfig_AllowCreditCards_False() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "allowCreditCards" to false,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertFalse(result!!.allowCreditCards)
+  }
+
+  @Test
+  fun mapGooglePayConfig_MissingMerchantName_ReturnsNull() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+      )
+    val result = mapGooglePayConfig(params)
+    assertNull(result)
+  }
+
+  @Test
+  fun mapGooglePayConfig_ExistingPaymentMethodRequired_False() {
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "existingPaymentMethodRequired" to false,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertFalse(result!!.existingPaymentMethodRequired)
+  }
+
+  @Test
+  fun mapGooglePayConfig_WithBillingAddressConfig_IsRequired() {
+    val billingAddressConfig =
+      readableMapOf(
+        "isRequired" to true,
+      )
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "billingAddressConfig" to billingAddressConfig,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertTrue(result!!.billingAddressConfig.isRequired)
+  }
+
+  @Test
+  fun mapGooglePayConfig_WithBillingAddressConfig_FullFormat() {
+    val billingAddressConfig =
+      readableMapOf(
+        "format" to "Full",
+      )
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "billingAddressConfig" to billingAddressConfig,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertEquals(
+      GooglePayPaymentMethodLauncher.BillingAddressConfig.Format.Full,
+      result!!.billingAddressConfig.format,
+    )
+  }
+
+  @Test
+  fun mapGooglePayConfig_WithBillingAddressConfig_UnknownFormat_DefaultsToMin() {
+    val billingAddressConfig =
+      readableMapOf(
+        "format" to "Unknown",
+      )
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "billingAddressConfig" to billingAddressConfig,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertEquals(
+      GooglePayPaymentMethodLauncher.BillingAddressConfig.Format.Min,
+      result!!.billingAddressConfig.format,
+    )
+  }
+
+  @Test
+  fun mapGooglePayConfig_WithBillingAddressConfig_IsPhoneNumberRequired() {
+    val billingAddressConfig =
+      readableMapOf(
+        "isPhoneNumberRequired" to true,
+      )
+    val params =
+      readableMapOf(
+        "merchantCountryCode" to "US",
+        "merchantName" to "Test Merchant",
+        "billingAddressConfig" to billingAddressConfig,
+      )
+    val result = mapGooglePayConfig(params)
+
+    assertNotNull(result)
+    assertTrue(result!!.billingAddressConfig.isPhoneNumberRequired)
+  }
+
   @Test
   fun mapConfig_WithAppearance() {
     val appearance =
@@ -219,4 +404,117 @@ class OnrampMappersTest {
     assertEquals(8f, state.primaryButton.cornerRadiusDp)
     assertEquals(48f, state.primaryButton.heightDp)
   }
+
+  @Test
+  fun mapFromKycInfo_AllFields() {
+    val kycInfo =
+      KycInfo(
+        firstName = "Jane",
+        lastName = "Doe",
+        idNumber = "123456789",
+        address =
+          PaymentSheet.Address(
+            city = "San Francisco",
+            country = "US",
+            line1 = "123 Main St",
+            line2 = "Apt 4",
+            postalCode = "94105",
+            state = "CA",
+          ),
+        dateOfBirth = DateOfBirth(day = 15, month = 6, year = 1990),
+      )
+    val result = mapFromKycInfo(kycInfo)
+
+    assertEquals("Jane", result.getString("firstName"))
+    assertEquals("Doe", result.getString("lastName"))
+    assertEquals("123456789", result.getString("idNumber"))
+
+    val address = result.getMap("address")
+    assertNotNull(address)
+    assertEquals("San Francisco", address!!.getString("city"))
+    assertEquals("US", address.getString("country"))
+    assertEquals("123 Main St", address.getString("line1"))
+    assertEquals("Apt 4", address.getString("line2"))
+    assertEquals("94105", address.getString("postalCode"))
+    assertEquals("CA", address.getString("state"))
+
+    val dob = result.getMap("dateOfBirth")
+    assertNotNull(dob)
+    assertEquals(15, dob!!.getInt("day"))
+    assertEquals(6, dob.getInt("month"))
+    assertEquals(1990, dob.getInt("year"))
+  }
+
+  @Test
+  fun mapFromKycInfo_AllNullFields() {
+    val kycInfo =
+      KycInfo(
+        firstName = null,
+        lastName = null,
+        idNumber = null,
+        address = null,
+        dateOfBirth = null,
+      )
+    val result = mapFromKycInfo(kycInfo)
+
+    assertFalse(result.hasKey("firstName"))
+    assertFalse(result.hasKey("lastName"))
+    assertFalse(result.hasKey("idNumber"))
+    assertFalse(result.hasKey("address"))
+    assertFalse(result.hasKey("dateOfBirth"))
+  }
+
+  @Test
+  fun mapFromKycInfo_PartialFields() {
+    val kycInfo =
+      KycInfo(
+        firstName = "Jane",
+        lastName = null,
+        idNumber = null,
+        address = null,
+        dateOfBirth = DateOfBirth(day = 1, month = 1, year = 2000),
+      )
+    val result = mapFromKycInfo(kycInfo)
+
+    assertEquals("Jane", result.getString("firstName"))
+    assertFalse(result.hasKey("lastName"))
+    assertFalse(result.hasKey("idNumber"))
+    assertFalse(result.hasKey("address"))
+
+    val dob = result.getMap("dateOfBirth")
+    assertNotNull(dob)
+    assertEquals(1, dob!!.getInt("day"))
+    assertEquals(1, dob.getInt("month"))
+    assertEquals(2000, dob.getInt("year"))
+  }
+
+  @Test
+  fun mapFromKycInfo_AddressWithPartialFields() {
+    val kycInfo =
+      KycInfo(
+        firstName = null,
+        lastName = null,
+        idNumber = null,
+        address =
+          PaymentSheet.Address(
+            city = "New York",
+            country = "US",
+            line1 = null,
+            line2 = null,
+            postalCode = null,
+            state = null,
+          ),
+        dateOfBirth = null,
+      )
+    val result = mapFromKycInfo(kycInfo)
+
+    val address = result.getMap("address")
+    assertNotNull(address)
+    assertEquals("New York", address!!.getString("city"))
+    assertEquals("US", address.getString("country"))
+    assertFalse(address.hasKey("line1"))
+    assertFalse(address.hasKey("line2"))
+    assertFalse(address.hasKey("postalCode"))
+    assertFalse(address.hasKey("state"))
+  }
 }

package/ios/AddressSheet/AddressSheetUtils.swift

@@ -79,6 +79,29 @@ class AddressSheetUtils {
         }
     }
 
+    internal class func buildConfiguration(
+        appearance: NSDictionary?,
+        defaultValues: NSDictionary?,
+        additionalFields: NSDictionary?,
+        allowedCountries: [String],
+        autocompleteCountries: [String],
+        buttonTitle: String?,
+        sheetTitle: String?
+    ) throws -> AddressViewController.Configuration {
+        let appearanceConfiguration = try PaymentSheetAppearance.buildAppearanceFromParams(userParams: appearance)
+
+        var config = AddressViewController.Configuration(
+            defaultValues: buildDefaultValues(params: defaultValues),
+            additionalFields: buildAdditionalFieldsConfiguration(params: additionalFields),
+            allowedCountries: allowedCountries,
+            appearance: appearanceConfiguration,
+            buttonTitle: buttonTitle,
+            title: sheetTitle
+        )
+        config.autocompleteCountries = autocompleteCountries
+        return config
+    }
+
     internal class func buildResult(address: AddressViewController.AddressDetails) -> [AnyHashable: Any] {
         return [
             "result": [

package/ios/AddressSheet/AddressSheetView.swift

@@ -60,7 +60,15 @@ public class AddressSheetView: UIView {
         }
         var config: AddressViewController.Configuration
         do {
-            config = try buildAddressSheetConfiguration()
+            config = try AddressSheetUtils.buildConfiguration(
+                appearance: appearance,
+                defaultValues: defaultValues,
+                additionalFields: additionalFields,
+                allowedCountries: allowedCountries,
+                autocompleteCountries: autocompleteCountries,
+                buttonTitle: primaryButtonTitle,
+                sheetTitle: sheetTitle
+            )
         } catch {
             onErrorAction!(
                 Errors.createError(ErrorType.Failed, error.localizedDescription) as? [AnyHashable: Any]
@@ -80,19 +88,6 @@ public class AddressSheetView: UIView {
         vc.present(navigationController, animated: true)
     }
 
-    private func buildAddressSheetConfiguration() throws -> AddressViewController.Configuration {
-        let appearanceConfiguration = try PaymentSheetAppearance.buildAppearanceFromParams(userParams: appearance)
-
-        return AddressViewController.Configuration(
-            defaultValues: AddressSheetUtils.buildDefaultValues(params: defaultValues),
-            additionalFields: AddressSheetUtils.buildAdditionalFieldsConfiguration(params: additionalFields),
-            allowedCountries: allowedCountries,
-            appearance: appearanceConfiguration,
-            buttonTitle: primaryButtonTitle,
-            title: sheetTitle
-        )
-    }
-
     private func getModalPresentationStyle() -> UIModalPresentationStyle {
         switch presentationStyle {
         case "fullscreen":