@primer-io/react-native 2.39.0 → 2.39.1

package/android/build.gradle

@@ -21,9 +21,15 @@ buildscript {
   }
 }
 
+def isNewArchitectureEnabled() {
+  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: "com.facebook.react"
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
+}
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'io.gitlab.arturbosch.detekt'
 apply from: "./config/coverage-scripts/kover.gradle"
@@ -36,10 +42,6 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ReactNative_' + name]).toInteger()
 }
 
-def isNewArchitectureEnabled() {
-  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
-
 java {
   toolchain {
     languageVersion.set(JavaLanguageVersion.of(17))
@@ -86,18 +88,11 @@ android {
     }
   }
 
-  sourceSets {
-    main {
-      java.srcDirs += [
-        "generated/java",
-        "generated/jni"
-      ]
-
-      if (isNewArchitectureEnabled()) {
-        java.srcDirs += ['src/newarch']
-      } else {
-        java.srcDirs += ['src/oldarch']
-      }
+  sourceSets.main {
+    if (isNewArchitectureEnabled()) {
+      java.srcDirs += ['src/newarch']
+    } else {
+      java.srcDirs += ['src/oldarch']
     }
   }
 }

package/android/src/main/java/com/primerioreactnative/PrimerRNHeadlessUniversalCheckout.kt

@@ -7,6 +7,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.WritableMap
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.primerioreactnative.components.events.PrimerHeadlessUniversalCheckoutEvent
 import com.primerioreactnative.datamodels.ErrorTypeRN
@@ -26,6 +27,7 @@ import org.json.JSONObject
 
 @Suppress("TooManyFunctions")
 @ExperimentalPrimerApi
+@ReactModule(name = PrimerRNHeadlessUniversalCheckout.NAME)
 class PrimerRNHeadlessUniversalCheckout(
     private val reactContext: ReactApplicationContext,
     private val json: Json,
@@ -193,7 +195,8 @@ class PrimerRNHeadlessUniversalCheckout(
         return data.toWritableMap()
     }
 
-    private companion object {
+    companion object {
         const val TAG = "PrimerHUC"
+        const val NAME = "PrimerHeadlessUniversalCheckout"
     }
 }

package/android/src/main/java/com/primerioreactnative/PrimerSdkPackage.kt

@@ -0,0 +1,117 @@
+package com.primerioreactnative
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.module.annotations.ReactModuleList
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import com.facebook.react.uimanager.ViewManager
+import com.primerioreactnative.components.manager.ach.PrimerRNAchMandateManager
+import com.primerioreactnative.components.manager.ach.PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent
+import com.primerioreactnative.components.manager.asset.PrimerRNHeadlessUniversalCheckoutAssetManager
+import com.primerioreactnative.components.manager.banks.PrimerRNHeadlessUniversalCheckoutBanksComponent
+import com.primerioreactnative.components.manager.googlePay.PrimerGooglePayButtonConstantsModule
+import com.primerioreactnative.components.manager.googlePay.PrimerGooglePayButtonManager
+import com.primerioreactnative.components.manager.klarna.PrimerKlarnaPaymentViewManager
+import com.primerioreactnative.components.manager.klarna.PrimerRNHeadlessUniversalCheckoutKlarnaComponent
+import com.primerioreactnative.components.manager.nativeUi.PrimerRNHeadlessUniversalCheckoutNativeUiManager
+import com.primerioreactnative.components.manager.raw.PrimerRNHeadlessUniversalCheckoutRawManager
+import com.primerioreactnative.components.manager.vault.PrimerRNHeadlessUniversalCheckoutVaultManager
+import kotlinx.serialization.json.Json
+
+@ReactModuleList(
+    nativeModules = [
+        NativePrimerModule::class,
+    ],
+)
+class PrimerSdkPackage : BaseReactPackage() {
+
+    private val json = Json { ignoreUnknownKeys = true }
+
+    // Old Architecture modules
+    private val oldArchModules: Array<Class<out NativeModule>> = arrayOf(
+        PrimerRNHeadlessUniversalCheckout::class.java,
+        PrimerRNHeadlessUniversalCheckoutRawManager::class.java,
+        PrimerRNHeadlessUniversalCheckoutNativeUiManager::class.java,
+        PrimerRNHeadlessUniversalCheckoutAssetManager::class.java,
+        PrimerRNHeadlessUniversalCheckoutVaultManager::class.java,
+        PrimerRNHeadlessUniversalCheckoutKlarnaComponent::class.java,
+        PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent::class.java,
+        PrimerRNAchMandateManager::class.java,
+        PrimerRNHeadlessUniversalCheckoutBanksComponent::class.java,
+        PrimerGooglePayButtonConstantsModule::class.java,
+    )
+
+    // New Architecture modules
+    private val newArchModules: Array<Class<out NativeModule>> = arrayOf(
+        NativePrimerModule::class.java,
+    )
+
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? =
+        when (name) {
+            DefaultNativePrimerModule.NAME -> NativePrimerModule(reactContext, json)
+            PrimerRNHeadlessUniversalCheckout.NAME -> PrimerRNHeadlessUniversalCheckout(reactContext, json)
+            PrimerRNHeadlessUniversalCheckoutRawManager.NAME -> PrimerRNHeadlessUniversalCheckoutRawManager(
+                reactContext,
+                json,
+            )
+
+            PrimerRNHeadlessUniversalCheckoutNativeUiManager.NAME -> PrimerRNHeadlessUniversalCheckoutNativeUiManager(
+                reactContext,
+            )
+
+            PrimerRNHeadlessUniversalCheckoutAssetManager.NAME -> PrimerRNHeadlessUniversalCheckoutAssetManager(
+                reactContext,
+            )
+            PrimerRNHeadlessUniversalCheckoutVaultManager.NAME -> PrimerRNHeadlessUniversalCheckoutVaultManager(
+                reactContext,
+                json,
+            )
+
+            PrimerRNHeadlessUniversalCheckoutKlarnaComponent.NAME -> PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
+                reactContext,
+            )
+
+            PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent.NAME ->
+                PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent(
+                    reactContext,
+                )
+
+            PrimerRNAchMandateManager.NAME -> PrimerRNAchMandateManager(reactContext)
+            PrimerRNHeadlessUniversalCheckoutBanksComponent.NAME -> PrimerRNHeadlessUniversalCheckoutBanksComponent(
+                reactContext,
+            )
+
+            PrimerGooglePayButtonConstantsModule.NAME -> PrimerGooglePayButtonConstantsModule(reactContext)
+            else -> null
+        }
+
+    override fun getReactModuleInfoProvider() = ReactModuleInfoProvider {
+        val moduleList = newArchModules + oldArchModules
+
+        val reactModuleInfoMap: MutableMap<String, ReactModuleInfo> = HashMap()
+        for (moduleClass in moduleList) {
+            val reactModule = moduleClass.getAnnotation(ReactModule::class.java) ?: continue
+            reactModuleInfoMap[reactModule.name] = ReactModuleInfo(
+                reactModule.name,
+                moduleClass.name,
+                reactModule.canOverrideExistingModule,
+                reactModule.needsEagerInit,
+                reactModule.isCxxModule,
+                newArchModules.any {
+                    it.name == moduleClass.name
+                }, // isTurboModule
+            )
+        }
+        reactModuleInfoMap
+    }
+
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return mutableListOf(
+            PrimerKlarnaPaymentViewManager(),
+            PrimerGooglePayButtonManager(),
+        )
+    }
+}

package/android/src/main/java/com/primerioreactnative/components/manager/ach/PrimerRNAchMandateManager.kt

@@ -6,14 +6,16 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import com.primerioreactnative.datamodels.ErrorTypeRN
 import com.primerioreactnative.utils.errorTo
 import kotlinx.coroutines.launch
 
+@ReactModule(name = PrimerRNAchMandateManager.NAME)
 class PrimerRNAchMandateManager(
     private val reactContext: ReactApplicationContext,
 ) : ReactContextBaseJavaModule(reactContext) {
-    override fun getName() = "RNTAchMandateManager"
+    override fun getName() = NAME
 
     @ReactMethod
     fun acceptMandate(promise: Promise) {
@@ -69,5 +71,6 @@ class PrimerRNAchMandateManager(
             """
       Unitialized 'declineMandate' property.
             """.trimIndent()
+        const val NAME = "RNTAchMandateManager"
     }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/ach/PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent.kt

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.primerioreactnative.PrimerRNViewModelStoreOwner
 import com.primerioreactnative.components.events.PrimerHeadlessUniversalCheckoutComponentEvent
@@ -37,10 +38,11 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 @Suppress("TooManyFunctions")
+@ReactModule(name = PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent.NAME)
 class PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent(
     private val reactContext: ReactApplicationContext,
 ) : ReactContextBaseJavaModule(reactContext) {
-    override fun getName() = "RNTPrimerHeadlessUniversalCheckoutStripeAchUserDetailsComponent"
+    override fun getName() = NAME
 
     private var job: Job? = null
     private var viewModelStoreOwner: ViewModelStoreOwner? = null
@@ -277,11 +279,13 @@ class PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent(
     }
 
     companion object {
-        const val INITIALIZATION_ERROR = """
+        private val json = Json { encodeDefaults = true }
+
+        private const val INITIALIZATION_ERROR = """
       An error occurred during component initialization.
     """
 
-        const val UNINITIALIZED_ERROR =
+        private const val UNINITIALIZED_ERROR =
             """
         The component has not been initialized.
         Make sure you have initialized the `component` first.
@@ -293,6 +297,6 @@ class PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent(
         Make sure your root activity extends ComponentActivity.
       """
 
-        val json = Json { encodeDefaults = true }
+        const val NAME = "RNTPrimerHeadlessUniversalCheckoutStripeAchUserDetailsComponent"
     }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/asset/PrimerRNHeadlessUniversalCheckoutAssetManager.kt

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import com.primerioreactnative.components.assets.AssetsManager
 import com.primerioreactnative.components.assets.AssetsManager.drawableToBitmap
 import com.primerioreactnative.components.assets.CardNetworkImageFileProvider.getFileForCardNetworkAsset
@@ -30,6 +31,7 @@ import kotlinx.serialization.json.Json
 import org.json.JSONObject
 
 @ExperimentalPrimerApi
+@ReactModule(name = PrimerRNHeadlessUniversalCheckoutAssetManager.NAME)
 internal class PrimerRNHeadlessUniversalCheckoutAssetManager(
     private val reactContext: ReactApplicationContext,
 ) : ReactContextBaseJavaModule(reactContext) {
@@ -220,4 +222,8 @@ internal class PrimerRNHeadlessUniversalCheckoutAssetManager(
             promise.reject(ErrorTypeRN.UnitializedSdkSession.errorId, e.message, e)
         }
     }
+
+    companion object {
+        const val NAME = "RNTPrimerHeadlessUniversalCheckoutAssetsManager"
+    }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/banks/PrimerRNHeadlessUniversalCheckoutBanksComponent.kt

@@ -7,6 +7,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.primerioreactnative.PrimerRNViewModelStoreOwner
 import com.primerioreactnative.components.events.PrimerHeadlessUniversalCheckoutComponentEvent
@@ -38,10 +39,11 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 @Suppress("TooManyFunctions")
+@ReactModule(name = PrimerRNHeadlessUniversalCheckoutBanksComponent.NAME)
 class PrimerRNHeadlessUniversalCheckoutBanksComponent(
     private val reactContext: ReactApplicationContext,
 ) : ReactContextBaseJavaModule(reactContext) {
-    override fun getName() = "RNTPrimerHeadlessUniversalCheckoutBanksComponent"
+    override fun getName() = NAME
 
     private var job: Job? = null
     private var banksComponent: BanksComponent? = null
@@ -255,13 +257,14 @@ class PrimerRNHeadlessUniversalCheckoutBanksComponent(
         promise.resolve(null)
     }
 
-    private companion object {
-        const val UNINITIALIZED_ERROR =
+    companion object {
+        private const val UNINITIALIZED_ERROR =
             """
         The BanksComponent has not been initialized.
         Make sure you have initialized the `BanksComponent` first.
       """
 
-        val json = Json { encodeDefaults = true }
+        private val json = Json { encodeDefaults = true }
+        const val NAME = "RNTPrimerHeadlessUniversalCheckoutBanksComponent"
     }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/googlePay/PrimerGooglePayButtonConstantsModule.kt

@@ -2,6 +2,7 @@ package com.primerioreactnative.components.manager.googlePay
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.module.annotations.ReactModule
 import com.google.android.gms.wallet.button.ButtonConstants
 
 internal object PrimerGooglePayButtonOptionsMapping {
@@ -24,6 +25,7 @@ internal object PrimerGooglePayButtonOptionsMapping {
     }
 }
 
+@ReactModule(name = PrimerGooglePayButtonConstantsModule.NAME)
 class PrimerGooglePayButtonConstantsModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
     override fun getConstants(): Map<String, Any> = PrimerGooglePayButtonOptionsMapping.getOptions()
@@ -31,6 +33,6 @@ class PrimerGooglePayButtonConstantsModule(reactContext: ReactApplicationContext
     override fun getName() = NAME
 
     companion object {
-        private const val NAME = "PrimerGooglePayButtonConstants"
+        const val NAME = "PrimerGooglePayButtonConstants"
     }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/klarna/PrimerRNHeadlessUniversalCheckoutKlarnaComponent.kt

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.primerioreactnative.PrimerRNViewModelStoreOwner
 import com.primerioreactnative.components.events.PrimerHeadlessUniversalCheckoutComponentEvent
@@ -45,10 +46,11 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 @Suppress("TooManyFunctions")
+@ReactModule(name = PrimerRNHeadlessUniversalCheckoutKlarnaComponent.NAME)
 class PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
     private val reactContext: ReactApplicationContext,
 ) : ReactContextBaseJavaModule(reactContext) {
-    override fun getName(): String = "RNTPrimerHeadlessUniversalCheckoutKlarnaComponent"
+    override fun getName(): String = NAME
 
     private var job: Job? = null
     private var viewModelStoreOwner: ViewModelStoreOwner? = null
@@ -314,17 +316,19 @@ class PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
         promise.resolve(null)
     }
 
-    private companion object {
-        const val UNINITIALIZED_ERROR =
+    companion object {
+        private const val UNINITIALIZED_ERROR =
             """
             The KlarnaComponent has not been initialized.
             Make sure you have initialized the `KlarnaComponent` first.
             """
-        const val MISSING_ACTIVITY_ERROR =
+        private const val MISSING_ACTIVITY_ERROR =
             """
             Could not retrieve running activity from context.
             """
 
-        val json by lazy { Json { encodeDefaults = true } }
+        private val json by lazy { Json { encodeDefaults = true } }
+
+        const val NAME = "RNTPrimerHeadlessUniversalCheckoutKlarnaComponent"
     }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/nativeUi/PrimerRNHeadlessUniversalCheckoutNativeUiManager.kt

@@ -4,6 +4,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import com.primerioreactnative.datamodels.ErrorTypeRN
 import com.primerioreactnative.datamodels.PrimerErrorRN
 import com.primerioreactnative.utils.errorTo
@@ -16,13 +17,14 @@ import io.primer.android.core.ExperimentalPrimerApi
 import io.primer.android.domain.exception.UnsupportedPaymentIntentException
 
 @ExperimentalPrimerApi
+@ReactModule(name = PrimerRNHeadlessUniversalCheckoutNativeUiManager.NAME)
 internal class PrimerRNHeadlessUniversalCheckoutNativeUiManager(
     private val reactContext: ReactApplicationContext,
 ) : ReactContextBaseJavaModule(reactContext) {
     private lateinit var nativeUiManager: PrimerHeadlessUniversalCheckoutNativeUiManagerInterface
     private var paymentMethodTypeStr: String? = null
 
-    override fun getName() = "RNTPrimerHeadlessUniversalPaymentMethodNativeUIManager"
+    override fun getName() = NAME
 
     @ReactMethod
     fun configure(
@@ -91,4 +93,8 @@ internal class PrimerRNHeadlessUniversalCheckoutNativeUiManager(
             }
         }
     }
+
+    companion object {
+        const val NAME = "RNTPrimerHeadlessUniversalPaymentMethodNativeUIManager"
+    }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/raw/PrimerRNHeadlessUniversalCheckoutRawManager.kt

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.WritableMap
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.primerioreactnative.Keys
 import com.primerioreactnative.components.datamodels.core.PrimerRawPaymentMethodType
@@ -33,6 +34,7 @@ import org.json.JSONObject
 
 @Suppress("TooManyFunctions")
 @ExperimentalPrimerApi
+@ReactModule(name = PrimerRNHeadlessUniversalCheckoutRawManager.NAME)
 internal class PrimerRNHeadlessUniversalCheckoutRawManager(
     reactContext: ReactApplicationContext,
     private val json: Json,
@@ -45,7 +47,7 @@ internal class PrimerRNHeadlessUniversalCheckoutRawManager(
         listener.sendEvent = { eventName, paramsJson -> sendEvent(eventName, paramsJson) }
     }
 
-    override fun getName() = "RNTPrimerHeadlessUniversalCheckoutRawDataManager"
+    override fun getName() = NAME
 
     @ReactMethod
     fun configure(
@@ -221,11 +223,13 @@ internal class PrimerRNHeadlessUniversalCheckoutRawManager(
         sendEvent(PrimerHeadlessUniversalCheckoutEvent.ON_ERROR.eventName, params)
     }
 
-    private companion object {
-        const val UNINITIALIZED_ERROR =
+    companion object {
+        private const val UNINITIALIZED_ERROR =
             """
         The RawDataManager has not been initialized.
         Make sure you have initialized the `RawDataManager' first.
       """
+
+        const val NAME = "RNTPrimerHeadlessUniversalCheckoutRawDataManager"
     }
 }

package/android/src/main/java/com/primerioreactnative/components/manager/vault/PrimerRNHeadlessUniversalCheckoutVaultManager.kt

@@ -4,6 +4,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import com.primerioreactnative.components.datamodels.manager.vault.PrimerRNValidationErrors
 import com.primerioreactnative.components.datamodels.manager.vault.PrimerRNVaultedPaymentMethodAdditionalData
 import com.primerioreactnative.components.datamodels.manager.vault.PrimerRNVaultedPaymentMethods
@@ -23,6 +24,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.json.JSONObject
 
+@ReactModule(name = PrimerRNHeadlessUniversalCheckoutVaultManager.NAME)
 class PrimerRNHeadlessUniversalCheckoutVaultManager(
     reactContext: ReactApplicationContext,
     private val json: Json,
@@ -30,7 +32,7 @@ class PrimerRNHeadlessUniversalCheckoutVaultManager(
     private val vaultScope = CoroutineScope(SupervisorJob())
     private lateinit var nativeVaultManager: PrimerHeadlessUniversalCheckoutVaultManagerInterface
 
-    override fun getName() = "RNPrimerHeadlessUniversalCheckoutVaultManager"
+    override fun getName() = NAME
 
     @ReactMethod
     fun configure(promise: Promise) {
@@ -168,4 +170,8 @@ class PrimerRNHeadlessUniversalCheckoutVaultManager(
             }
         }
     }
+
+    companion object {
+        const val NAME = "RNPrimerHeadlessUniversalCheckoutVaultManager"
+    }
 }

package/android/src/newarch/java/com/primerioreactnative/NativePrimerModule.kt

@@ -1,12 +1,12 @@
-package java.com.primerioreactnative
+package com.primerioreactnative
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.primerioreactnative.DefaultNativePrimerModule
-import com.primerioreactnative.NativePrimerSpec
+import com.facebook.react.module.annotations.ReactModule
 import kotlinx.serialization.json.Json
 
+@ReactModule(name = DefaultNativePrimerModule.NAME)
 class NativePrimerModule(private val reactContext: ReactApplicationContext, private val json: Json) :
   NativePrimerSpec(reactContext) {
   private val implementation by lazy {

package/android/src/oldarch/java/com/primerioreactnative/NativePrimerModule.kt

@@ -1,13 +1,14 @@
-package java.com.primerioreactnative
+package com.primerioreactnative
 
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.primerioreactnative.DefaultNativePrimerModule
 import kotlinx.serialization.json.Json
 
+@ReactModule(name = DefaultNativePrimerModule.NAME)
 class NativePrimerModule(private val reactContext: ReactApplicationContext, private val json: Json) :
   ReactContextBaseJavaModule(reactContext) {
   private val implementation by lazy {

package/ios/Sources/version.swift

@@ -1,2 +1,2 @@
 // swiftlint:disable:next identifier_name
-public let PrimerReactNativeSDKVersion = "2.39.0"
+public let PrimerReactNativeSDKVersion = "2.39.1"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer-io/react-native",
-  "version": "2.39.0",
+  "version": "2.39.1",
   "description": "Primer SDK for RN",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/android/src/main/java/com/primerioreactnative/ReactNativePackage.kt

@@ -1,77 +0,0 @@
-package com.primerioreactnative
-
-import com.facebook.react.BaseReactPackage
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.module.model.ReactModuleInfo
-import com.facebook.react.module.model.ReactModuleInfoProvider
-import com.facebook.react.uimanager.ViewManager
-import com.primerioreactnative.components.manager.ach.PrimerRNAchMandateManager
-import com.primerioreactnative.components.manager.ach.PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent
-import com.primerioreactnative.components.manager.asset.PrimerRNHeadlessUniversalCheckoutAssetManager
-import com.primerioreactnative.components.manager.banks.PrimerRNHeadlessUniversalCheckoutBanksComponent
-import com.primerioreactnative.components.manager.googlePay.PrimerGooglePayButtonConstantsModule
-import com.primerioreactnative.components.manager.googlePay.PrimerGooglePayButtonManager
-import com.primerioreactnative.components.manager.klarna.PrimerKlarnaPaymentViewManager
-import com.primerioreactnative.components.manager.klarna.PrimerRNHeadlessUniversalCheckoutKlarnaComponent
-import com.primerioreactnative.components.manager.nativeUi.PrimerRNHeadlessUniversalCheckoutNativeUiManager
-import com.primerioreactnative.components.manager.raw.PrimerRNHeadlessUniversalCheckoutRawManager
-import com.primerioreactnative.components.manager.vault.PrimerRNHeadlessUniversalCheckoutVaultManager
-import kotlinx.serialization.json.Json
-import java.com.primerioreactnative.NativePrimerModule
-
-class ReactNativePackage : ReactPackage {
-    private val json = Json { ignoreUnknownKeys = true }
-
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf(
-            PrimerRNHeadlessUniversalCheckout(reactContext, json),
-            PrimerRNHeadlessUniversalCheckoutRawManager(reactContext, json),
-            PrimerRNHeadlessUniversalCheckoutNativeUiManager(reactContext),
-            PrimerRNHeadlessUniversalCheckoutAssetManager(reactContext),
-            PrimerRNHeadlessUniversalCheckoutVaultManager(reactContext, json),
-            PrimerRNHeadlessUniversalCheckoutKlarnaComponent(reactContext),
-            PrimerRNHeadlessUniversalCheckoutStripeAchUserDetailsComponent(reactContext),
-            PrimerRNAchMandateManager(reactContext),
-            // region Component with redirect components
-            PrimerRNHeadlessUniversalCheckoutBanksComponent(reactContext),
-            // endregion
-            // region Google Pay Helpers
-            PrimerGooglePayButtonConstantsModule(reactContext),
-            // endregion
-        )
-    }
-
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return mutableListOf(
-            PrimerKlarnaPaymentViewManager(),
-            PrimerGooglePayButtonManager(),
-        )
-    }
-}
-
-class ReactNativeTurboPackage : BaseReactPackage() {
-
-    private val json = Json { ignoreUnknownKeys = true }
-
-    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? =
-        if (name == DefaultNativePrimerModule.NAME) {
-            NativePrimerModule(reactContext, json)
-        } else {
-            null
-        }
-
-    override fun getReactModuleInfoProvider() = ReactModuleInfoProvider {
-        mapOf(
-            DefaultNativePrimerModule.NAME to ReactModuleInfo(
-                name = DefaultNativePrimerModule.NAME,
-                className = DefaultNativePrimerModule.NAME,
-                canOverrideExistingModule = false,
-                needsEagerInit = false,
-                isCxxModule = false,
-                isTurboModule = true,
-            ),
-        )
-    }
-}