react-native-iap 14.3.5-rc.1 → 14.3.6

package/NitroIap.podspec

@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
   # OpenIAP Apple for StoreKit 2 integration
-  s.dependency 'openiap', '1.1.9'
+  s.dependency 'openiap', '1.1.12'
 
   install_modules_dependencies(s)
 end

package/README.md

@@ -94,7 +94,7 @@ Add the OpenIAP Google library to your `android/app/build.gradle` dependencies:
 
 ```gradle
 dependencies {
-    implementation "io.github.hyochan.openiap:openiap-google:1.1.0"
+    implementation "io.github.hyochan.openiap:openiap-google:1.1.10"
 }
 ```
 

package/android/CMakeLists.txt

@@ -13,6 +13,10 @@ add_library(${PACKAGE_NAME} SHARED
         src/main/cpp/cpp-adapter.cpp
 )
 
+# Ensure Android/iOS preprocessor macros from the NDK do not clash with
+# the generated enum values in Nitrogen headers (IapPlatform.hpp).
+target_compile_options(${PACKAGE_NAME} PRIVATE -UANDROID -UIOS)
+
 # Add Nitrogen specs :)
 include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/NitroIap+autolinking.cmake)
 

package/android/build.gradle

@@ -156,8 +156,8 @@ dependencies {
   // Kotlin coroutines
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
 
-  // OpenIAP Google (v1.1.0)
-  implementation 'io.github.hyochan.openiap:openiap-google:1.1.0'
+  // OpenIAP Google (v1.1.10)
+  implementation 'io.github.hyochan.openiap:openiap-google:1.1.10'
 }
 
 configurations.all {

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,4 +1,12 @@
 #include <jni.h>
+
+#ifdef ANDROID
+#undef ANDROID
+#endif
+#ifdef IOS
+#undef IOS
+#endif
+
 #include "NitroIapOnLoad.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {

package/android/src/main/java/com/margelo/nitro/iap/HybridRnIap.kt

@@ -4,15 +4,15 @@ import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
 import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.Promise
-import dev.hyo.openiap.OpenIapError
+import dev.hyo.openiap.OpenIapError as OpenIAPError
 import dev.hyo.openiap.OpenIapModule
 import dev.hyo.openiap.listener.OpenIapPurchaseErrorListener
 import dev.hyo.openiap.listener.OpenIapPurchaseUpdateListener
+import dev.hyo.openiap.models.DeepLinkOptions
 import dev.hyo.openiap.models.OpenIapProduct
 import dev.hyo.openiap.models.OpenIapPurchase
-import dev.hyo.openiap.models.DeepLinkOptions
 import dev.hyo.openiap.models.ProductRequest
-import dev.hyo.openiap.models.RequestPurchaseAndroidProps
+import dev.hyo.openiap.models.OpenIapRequestPurchaseProps
 import dev.hyo.openiap.models.OpenIapSerialization
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -68,8 +68,8 @@ class HybridRnIap : HybridRnIapSpec() {
                         .onFailure { Log.e(TAG, "Failed to forward purchase update", it) }
                 })
                 openIap.addPurchaseErrorListener(OpenIapPurchaseErrorListener { e ->
-                    val code = OpenIapError.toCode(e)
-                    val message = e.message ?: OpenIapError.defaultMessage(code)
+                    val code = OpenIAPError.toCode(e)
+                    val message = e.message ?: OpenIAPError.defaultMessage(code)
                     runCatching {
                         sendPurchaseError(
                             NitroPurchaseResult(
@@ -88,12 +88,23 @@ class HybridRnIap : HybridRnIapSpec() {
             val deferred = initDeferred!!
             try {
                 val ok = runCatching { openIap.initConnection() }.getOrElse { err ->
-                    val error = OpenIapError.InitConnection(err.message ?: "Failed to initialize connection")
-                    throw Exception(toErrorJson(error))
+                    val error = OpenIAPError.InitConnection()
+                    throw Exception(
+                        toErrorJson(
+                            error = error,
+                            debugMessage = err.message,
+                            messageOverride = err.message
+                        )
+                    )
                 }
                 if (!ok) {
-                    val error = OpenIapError.InitConnection("Failed to initialize connection")
-                    throw Exception(toErrorJson(error))
+                    val error = OpenIAPError.InitConnection()
+                    throw Exception(
+                        toErrorJson(
+                            error = error,
+                            messageOverride = "Failed to initialize connection"
+                        )
+                    )
                 }
                 isInitialized = true
                 deferred.complete(true)
@@ -125,7 +136,7 @@ class HybridRnIap : HybridRnIapSpec() {
             Log.d(TAG, "fetchProducts (OpenIAP) skus=${skus.joinToString()} type=$type")
 
             if (skus.isEmpty()) {
-                throw Exception(toErrorJson(OpenIapError.EmptySkuList))
+                throw Exception(toErrorJson(OpenIAPError.EmptySkuList))
             }
 
             initConnection().await()
@@ -141,17 +152,19 @@ class HybridRnIap : HybridRnIapSpec() {
     
     // Purchase methods
     // Purchase methods (Unified)
-    override fun requestPurchase(request: NitroPurchaseRequest): Promise<Unit> {
+    override fun requestPurchase(request: NitroPurchaseRequest): Promise<RequestPurchaseResult> {
         return Promise.async {
+            val defaultResult = RequestPurchaseResult(null, null)
+
             val androidRequest = request.android ?: run {
                 // Programming error: no Android params provided
-                sendPurchaseError(toErrorResult(OpenIapError.DeveloperError))
-                return@async
+                sendPurchaseError(toErrorResult(OpenIAPError.DeveloperError))
+                return@async defaultResult
             }
 
             if (androidRequest.skus.isEmpty()) {
-                sendPurchaseError(toErrorResult(OpenIapError.EmptySkuList))
-                return@async
+                sendPurchaseError(toErrorResult(OpenIAPError.EmptySkuList))
+                return@async defaultResult
             }
 
             try {
@@ -160,14 +173,14 @@ class HybridRnIap : HybridRnIapSpec() {
 
                 val missing = androidRequest.skus.firstOrNull { !productTypeBySku.containsKey(it) }
                 if (missing != null) {
-                    sendPurchaseError(toErrorResult(OpenIapError.SkuNotFound(missing), missing))
-                    return@async
+                    sendPurchaseError(toErrorResult(OpenIAPError.SkuNotFound(missing), missing))
+                    return@async defaultResult
                 }
                 val typeStr = androidRequest.skus.firstOrNull()?.let { productTypeBySku[it] } ?: "inapp"
                 val typeEnum = ProductRequest.ProductRequestType.fromString(typeStr)
 
                 val result = openIap.requestPurchase(
-                    RequestPurchaseAndroidProps(
+                    OpenIapRequestPurchaseProps(
                         skus = androidRequest.skus.toList(),
                         obfuscatedAccountIdAndroid = androidRequest.obfuscatedAccountIdAndroid,
                         obfuscatedProfileIdAndroid = androidRequest.obfuscatedProfileIdAndroid,
@@ -180,8 +193,17 @@ class HybridRnIap : HybridRnIapSpec() {
                     runCatching { sendPurchaseUpdate(convertToNitroPurchase(p)) }
                         .onFailure { Log.e(TAG, "Failed to forward PURCHASE_UPDATED", it) }
                 }
+
+                defaultResult
             } catch (e: Exception) {
-                sendPurchaseError(toErrorResult(OpenIapError.PurchaseFailed(e.message ?: "Purchase failed")))
+                sendPurchaseError(
+                    toErrorResult(
+                        error = OpenIAPError.PurchaseFailed(),
+                        debugMessage = e.message,
+                        messageOverride = e.message
+                    )
+                )
+                defaultResult
             }
         }
     }
@@ -215,7 +237,7 @@ class HybridRnIap : HybridRnIapSpec() {
                     NitroPurchaseResult(
                         responseCode = -1.0,
                         debugMessage = "Missing purchaseToken",
-                        code = OpenIapError.toCode(OpenIapError.DeveloperError),
+                        code = OpenIAPError.toCode(OpenIAPError.DeveloperError),
                         message = "Missing purchaseToken",
                         purchaseToken = null
                     )
@@ -226,13 +248,13 @@ class HybridRnIap : HybridRnIapSpec() {
             try {
                 initConnection().await()
             } catch (e: Exception) {
-                val err = OpenIapError.InitConnection(e.message ?: "Failed to initialize connection")
+                val err = OpenIAPError.InitConnection()
                 return@async Variant_Boolean_NitroPurchaseResult.Second(
                     NitroPurchaseResult(
                         responseCode = -1.0,
                         debugMessage = e.message,
-                        code = OpenIapError.toCode(err),
-                        message = err.message,
+                        code = OpenIAPError.toCode(err),
+                        message = e.message?.takeIf { it.isNotBlank() } ?: err.message,
                         purchaseToken = purchaseToken
                     )
                 )
@@ -254,14 +276,14 @@ class HybridRnIap : HybridRnIapSpec() {
                     )
                 )
             } catch (e: Exception) {
-                val err = OpenIapError.BillingError(e.message ?: "Service error")
+                val err = OpenIAPError.BillingError()
                 Variant_Boolean_NitroPurchaseResult.Second(
                     NitroPurchaseResult(
                         responseCode = -1.0,
                         debugMessage = e.message,
-                        code = OpenIapError.toCode(err),
-                        message = err.message,
-                        purchaseToken = purchaseToken
+                        code = OpenIAPError.toCode(err),
+                        message = e.message?.takeIf { it.isNotBlank() } ?: err.message,
+                        purchaseToken = null
                     )
                 )
             }
@@ -356,7 +378,7 @@ class HybridRnIap : HybridRnIapSpec() {
         var subscriptionPeriodAndroid: String? = null
         var freeTrialPeriodAndroid: String? = null
 
-        if (product.type == OpenIapProduct.ProductType.INAPP) {
+        if (product.type == OpenIapProduct.ProductType.InApp) {
             product.oneTimePurchaseOfferDetailsAndroid?.let { otp ->
                 originalPriceAndroid = otp.formattedPrice
                 // priceAmountMicros is a string; parse to number if possible
@@ -428,8 +450,8 @@ class HybridRnIap : HybridRnIapSpec() {
     private fun convertToNitroPurchase(purchase: OpenIapPurchase): NitroPurchase {
         // Map OpenIAP purchase state back to legacy numeric Android state for compatibility
         val purchaseStateAndroidNumeric = when (purchase.purchaseState) {
-            OpenIapPurchase.PurchaseState.PURCHASED -> 1.0
-            OpenIapPurchase.PurchaseState.PENDING -> 2.0
+            OpenIapPurchase.PurchaseState.Purchased -> 1.0
+            OpenIapPurchase.PurchaseState.Pending -> 2.0
             else -> 0.0 // UNSPECIFIED/UNKNOWN/other
         }
         return NitroPurchase(
@@ -465,14 +487,14 @@ class HybridRnIap : HybridRnIapSpec() {
     // iOS-specific method - not supported on Android
     override fun getStorefrontIOS(): Promise<String> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
 
     // iOS-specific method - not supported on Android
     override fun getAppTransactionIOS(): Promise<String?> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
 
@@ -558,7 +580,7 @@ class HybridRnIap : HybridRnIapSpec() {
             try {
                 // For Android, we need the androidOptions to be provided
                 val androidOptions = params.androidOptions
-                    ?: throw Exception(toErrorJson(OpenIapError.DeveloperError))
+                    ?: throw Exception(toErrorJson(OpenIAPError.DeveloperError))
 
                 // Android receipt validation would typically involve server-side validation
                 // using Google Play Developer API. Here we provide a simplified implementation
@@ -595,7 +617,15 @@ class HybridRnIap : HybridRnIapSpec() {
                 Variant_NitroReceiptValidationResultIOS_NitroReceiptValidationResultAndroid.Second(result)
                 
             } catch (e: Exception) {
-                throw Exception(toErrorJson(OpenIapError.InvalidReceipt("Receipt validation failed: ${e.message}")))
+                val debugMessage = e.message
+                val error = OpenIAPError.InvalidReceipt()
+                throw Exception(
+                    toErrorJson(
+                        error = error,
+                        debugMessage = debugMessage,
+                        messageOverride = "Receipt validation failed: ${debugMessage ?: "unknown reason"}"
+                    )
+                )
             }
         }
     }
@@ -603,31 +633,31 @@ class HybridRnIap : HybridRnIapSpec() {
     // iOS-specific methods - Not applicable on Android, return appropriate defaults
     override fun subscriptionStatusIOS(sku: String): Promise<Array<NitroSubscriptionStatus>?> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
     
     override fun currentEntitlementIOS(sku: String): Promise<NitroPurchase?> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
     
     override fun latestTransactionIOS(sku: String): Promise<NitroPurchase?> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
     
     override fun getPendingTransactionsIOS(): Promise<Array<NitroPurchase>> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
     
     override fun syncIOS(): Promise<Boolean> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
     
@@ -635,49 +665,61 @@ class HybridRnIap : HybridRnIapSpec() {
     
     override fun isEligibleForIntroOfferIOS(groupID: String): Promise<Boolean> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
     
     override fun getReceiptDataIOS(): Promise<String> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
     
     override fun isTransactionVerifiedIOS(sku: String): Promise<Boolean> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
     
     override fun getTransactionJwsIOS(sku: String): Promise<String?> {
         return Promise.async {
-            throw Exception(toErrorJson(OpenIapError.NotSupported))
+            throw Exception(toErrorJson(OpenIAPError.NotSupported))
         }
     }
 
     // ---------------------------------------------------------------------
     // OpenIAP error helpers: unify error codes/messages from library
     // ---------------------------------------------------------------------
-    private fun toErrorJson(error: OpenIapError, productId: String? = null): String {
-        val code = OpenIapError.toCode(error)
-        val message = error.message.ifEmpty { OpenIapError.defaultMessage(code) }
+    private fun toErrorJson(
+        error: OpenIAPError,
+        productId: String? = null,
+        debugMessage: String? = null,
+        messageOverride: String? = null
+    ): String {
+        val code = OpenIAPError.toCode(error)
+        val message = messageOverride?.takeIf { it.isNotBlank() }
+            ?: error.message.ifEmpty { OpenIAPError.defaultMessage(code) }
         return BillingUtils.createErrorJson(
             code = code,
             message = message,
             responseCode = -1,
-            debugMessage = error.message,
+            debugMessage = debugMessage ?: error.message,
             productId = productId
         )
     }
 
-    private fun toErrorResult(error: OpenIapError, productId: String? = null): NitroPurchaseResult {
-        val code = OpenIapError.toCode(error)
-        val message = error.message.ifEmpty { OpenIapError.defaultMessage(code) }
+    private fun toErrorResult(
+        error: OpenIAPError,
+        productId: String? = null,
+        debugMessage: String? = null,
+        messageOverride: String? = null
+    ): NitroPurchaseResult {
+        val code = OpenIAPError.toCode(error)
+        val message = messageOverride?.takeIf { it.isNotBlank() }
+            ?: error.message.ifEmpty { OpenIAPError.defaultMessage(code) }
         return NitroPurchaseResult(
             responseCode = -1.0,
-            debugMessage = error.message,
+            debugMessage = debugMessage ?: error.message,
             code = code,
             message = message,
             purchaseToken = null

package/ios/HybridRnIap.swift

@@ -164,7 +164,7 @@ class HybridRnIap: HybridRnIapSpec {
             } catch {
                 // Surface as event and keep flags consistent
                 let err = self.createPurchaseErrorResult(
-                    code: OpenIapError.E_INIT_CONNECTION,
+                    code: OpenIapError.InitConnection,
                     message: error.localizedDescription,
                     productId: nil
                 )
@@ -198,29 +198,30 @@ class HybridRnIap: HybridRnIapSpec {
         }
     }
     
-    func requestPurchase(request: NitroPurchaseRequest) throws -> Promise<Void> {
+    func requestPurchase(request: NitroPurchaseRequest) throws -> Promise<RequestPurchaseResult> {
         return Promise.async {
+            let defaultResult = RequestPurchaseResult(purchase: nil, purchases: nil)
             guard let iosRequest = request.ios else {
                 let error = self.createPurchaseErrorResult(
-                    code: OpenIapError.E_USER_ERROR,
+                    code: OpenIapError.UserError,
                     message: "No iOS request provided"
                 )
                 self.sendPurchaseError(error, productId: nil)
-                return
+                return defaultResult
             }
             do {
                 // Event-first behavior: don't reject Promise on connection issues
                 guard self.isInitialized else {
                     #if DEBUG
-                    print("[HybridRnIap] requestPurchase while not initialized; sending E_INIT_CONNECTION")
+                    print("[HybridRnIap] requestPurchase while not initialized; sending InitConnection")
                     #endif
                     let err = self.createPurchaseErrorResult(
-                        code: OpenIapError.E_INIT_CONNECTION,
+                        code: OpenIapError.InitConnection,
                         message: "IAP store connection not initialized",
                         productId: iosRequest.sku
                     )
                     self.sendPurchaseError(err, productId: iosRequest.sku)
-                    return
+                    return defaultResult
                 }
                 // Delegate purchase to OpenIAP. It emits success/error events which we bridge above.
                 let props = OpenIapRequestPurchaseProps(
@@ -238,15 +239,17 @@ class HybridRnIap: HybridRnIapSpec {
                     }
                 )
                 _ = try await OpenIapModule.shared.requestPurchase(props)
+                return defaultResult
             } catch {
                 // Ensure an error reaches JS even if OpenIAP threw before emitting.
                 // Use simple de-duplication window to avoid double-emitting.
                 let err = self.createPurchaseErrorResult(
-                    code: OpenIapError.E_SERVICE_ERROR,
+                    code: OpenIapError.ServiceError,
                     message: error.localizedDescription,
                     productId: iosRequest.sku
                 )
                 self.sendPurchaseErrorDedup(err, productId: iosRequest.sku)
+                return defaultResult
             }
         }
     }
@@ -261,7 +264,7 @@ class HybridRnIap: HybridRnIapSpec {
                 return purchases.map { self.convertOpenIapPurchaseToNitroPurchase($0) }
             } catch {
                 // Propagate OpenIAP error or map to network error
-                throw OpenIapError.make(code: OpenIapError.E_NETWORK_ERROR)
+                throw OpenIapError.make(code: OpenIapError.NetworkError)
             }
         }
     }
@@ -275,7 +278,7 @@ class HybridRnIap: HybridRnIapSpec {
                 return .first(ok)
             } catch {
                 let tid = iosParams.transactionId
-                throw OpenIapError.make(code: OpenIapError.E_PURCHASE_ERROR, message: "Transaction not found: \(tid)")
+                throw OpenIapError.make(code: OpenIapError.PurchaseError, message: "Transaction not found: \(tid)")
             }
         }
     }
@@ -296,7 +299,7 @@ class HybridRnIap: HybridRnIapSpec {
                 )
                 return .first(mapped)
             } catch {
-                throw OpenIapError.make(code: OpenIapError.E_RECEIPT_FAILED, message: error.localizedDescription)
+                throw OpenIapError.make(code: OpenIapError.ReceiptFailed, message: error.localizedDescription)
             }
         }
     }
@@ -308,7 +311,7 @@ class HybridRnIap: HybridRnIapSpec {
             do {
                 return try await OpenIapModule.shared.getStorefrontIOS()
             } catch {
-                throw OpenIapError.make(code: OpenIapError.E_SERVICE_ERROR, message: error.localizedDescription)
+                throw OpenIapError.make(code: OpenIapError.ServiceError, message: error.localizedDescription)
             }
         }
     }
@@ -384,7 +387,7 @@ class HybridRnIap: HybridRnIapSpec {
                 return ok
             } catch {
                 // Fallback with explicit error for simulator or unsupported cases
-                throw OpenIapError.make(code: OpenIapError.E_FEATURE_NOT_SUPPORTED)
+                throw OpenIapError.make(code: OpenIapError.FeatureNotSupported)
             }
         }
     }
@@ -443,12 +446,13 @@ class HybridRnIap: HybridRnIapSpec {
         return Promise.async {
             try self.ensureConnection()
             do {
-                if let p = try await OpenIapModule.shared.currentEntitlementIOS(sku: sku) {
-                    return self.convertOpenIapPurchaseToNitroPurchase(p)
+                let purchase = try await OpenIapModule.shared.currentEntitlementIOS(sku: sku)
+                if let purchase {
+                    return self.convertOpenIapPurchaseToNitroPurchase(purchase)
                 }
-                return nil
+                return Optional<NitroPurchase>.none
             } catch {
-                throw OpenIapError.make(code: OpenIapError.E_SKU_NOT_FOUND, productId: sku)
+                throw OpenIapError.make(code: OpenIapError.SkuNotFound, productId: sku)
             }
         }
     }
@@ -457,12 +461,13 @@ class HybridRnIap: HybridRnIapSpec {
         return Promise.async {
             try self.ensureConnection()
             do {
-                if let p = try await OpenIapModule.shared.latestTransactionIOS(sku: sku) {
-                    return self.convertOpenIapPurchaseToNitroPurchase(p)
+                let purchase = try await OpenIapModule.shared.latestTransactionIOS(sku: sku)
+                if let purchase {
+                    return self.convertOpenIapPurchaseToNitroPurchase(purchase)
                 }
-                return nil
+                return Optional<NitroPurchase>.none
             } catch {
-                throw OpenIapError.make(code: OpenIapError.E_SKU_NOT_FOUND, productId: sku)
+                throw OpenIapError.make(code: OpenIapError.SkuNotFound, productId: sku)
             }
         }
     }
@@ -484,7 +489,7 @@ class HybridRnIap: HybridRnIapSpec {
                 let ok = try await OpenIapModule.shared.syncIOS()
                 return ok
             } catch {
-                throw OpenIapError.make(code: OpenIapError.E_SERVICE_ERROR, message: error.localizedDescription)
+                throw OpenIapError.make(code: OpenIapError.ServiceError, message: error.localizedDescription)
             }
         }
     }
@@ -498,7 +503,7 @@ class HybridRnIap: HybridRnIapSpec {
                 let purchases = try await OpenIapModule.shared.getAvailablePurchases(OpenIapPurchaseOptions(alsoPublishToEventListenerIOS: false, onlyIncludeActiveItemsIOS: true))
                 return purchases.map { self.convertOpenIapPurchaseToNitroPurchase($0) }
             } catch {
-                throw OpenIapError.make(code: OpenIapError.E_SERVICE_ERROR, message: error.localizedDescription)
+                throw OpenIapError.make(code: OpenIapError.ServiceError, message: error.localizedDescription)
             }
         }
     }
@@ -515,9 +520,9 @@ class HybridRnIap: HybridRnIapSpec {
                 if let receipt = try await OpenIapModule.shared.getReceiptDataIOS() {
                     return receipt
                 }
-                throw OpenIapError.make(code: OpenIapError.E_RECEIPT_FAILED)
+                throw OpenIapError.make(code: OpenIapError.ReceiptFailed)
             } catch {
-                throw OpenIapError.make(code: OpenIapError.E_RECEIPT_FAILED, message: error.localizedDescription)
+                throw OpenIapError.make(code: OpenIapError.ReceiptFailed, message: error.localizedDescription)
             }
         }
     }
@@ -532,8 +537,11 @@ class HybridRnIap: HybridRnIapSpec {
     func getTransactionJwsIOS(sku: String) throws -> Promise<String?> {
         return Promise.async {
             try self.ensureConnection()
-            do { return try await OpenIapModule.shared.getTransactionJwsIOS(sku: sku) } catch {
-                throw OpenIapError.make(code: OpenIapError.E_TRANSACTION_VALIDATION_FAILED, message: "Can't find transaction for sku \(sku)")
+            do {
+                let jws = try await OpenIapModule.shared.getTransactionJwsIOS(sku: sku)
+                return jws
+            } catch {
+                throw OpenIapError.make(code: OpenIapError.TransactionValidationFailed, message: "Can't find transaction for sku \(sku)")
             }
         }
     }
@@ -602,7 +610,7 @@ class HybridRnIap: HybridRnIapSpec {
     
     private func ensureConnection() throws {
         guard isInitialized else {
-            throw OpenIapError.make(code: OpenIapError.E_INIT_CONNECTION, message: "Connection not initialized. Call initConnection() first.")
+            throw OpenIapError.make(code: OpenIapError.InitConnection, message: "Connection not initialized. Call initConnection() first.")
         }
     }
     
@@ -720,13 +728,13 @@ class HybridRnIap: HybridRnIapSpec {
     // because the TS spec marks them as Android-only.
     func getStorefrontAndroid() throws -> Promise<String> {
         return Promise.async {
-            throw OpenIapError.make(code: OpenIapError.E_FEATURE_NOT_SUPPORTED)
+            throw OpenIapError.make(code: OpenIapError.FeatureNotSupported)
         }
     }
 
     func deepLinkToSubscriptionsAndroid(options: NitroDeepLinkOptionsAndroid) throws -> Promise<Void> {
         return Promise.async {
-            throw OpenIapError.make(code: OpenIapError.E_FEATURE_NOT_SUPPORTED)
+            throw OpenIapError.make(code: OpenIapError.FeatureNotSupported)
         }
     }
 }