mobilyflow-react-native-sdk 0.3.2 → 0.4.0-alpha.4

package/MobilyflowReactNativeSdk.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.swift_versions = '5.0'
 
   # Install MobilyFlow SDK
-  s.dependency 'MobilyflowSDK', '0.3.2'
+  s.dependency 'MobilyflowSDK', '0.4.0-alpha.5'
 
   #s.subspec 'MobilyflowSDK' do |ss|
   #  ss.source_files = '../mobilyflow-ios-sdk/Sources/MobilyflowSDK/**/*'

package/android/build.gradle

@@ -100,7 +100,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.mobilyflow:mobilyflow-android-sdk:0.3.2"
+  implementation "com.mobilyflow:mobilyflow-android-sdk:0.4.0-alpha.3"
   implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.6.2"
   implementation "org.jetbrains.kotlin:kotlin-reflect"
 }

package/android/generated/java/com/mobilyflowreactnativesdk/NativeMobilyflowReactNativeSdkSpec.java

@@ -37,7 +37,7 @@ public abstract class NativeMobilyflowReactNativeSdkSpec extends ReactContextBas
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   @DoNotStrip
-  public abstract String instantiate(String appId, String apiKey, double environment, @Nullable ReadableMap options);
+  public abstract String instantiate(String appId, String apiKey, String environment, @Nullable ReadableMap options);
 
   @ReactMethod
   @DoNotStrip
@@ -89,7 +89,11 @@ public abstract class NativeMobilyflowReactNativeSdkSpec extends ReactContextBas
 
   @ReactMethod
   @DoNotStrip
-  public abstract void openRefundDialog(String uuid, String productId, Promise promise);
+  public abstract void openRefundDialogForProduct(String uuid, String productId, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void openRefundDialogForTransactionId(String uuid, String transactionId, Promise promise);
 
   @ReactMethod
   @DoNotStrip
@@ -103,6 +107,10 @@ public abstract class NativeMobilyflowReactNativeSdkSpec extends ReactContextBas
   @DoNotStrip
   public abstract void getStoreCountry(String uuid, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void isBillingAvailable(String uuid, Promise promise);
+
   @ReactMethod
   @DoNotStrip
   public abstract void isForwardingEnable(String uuid, String externalRef, Promise promise);

package/android/generated/jni/RNMobilyflowReactNativeSdkSpec-generated.cpp

@@ -14,7 +14,7 @@ namespace facebook::react {
 
 static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_instantiate(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, StringKind, "instantiate", "(Ljava/lang/String;Ljava/lang/String;DLcom/facebook/react/bridge/ReadableMap;)Ljava/lang/String;", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, StringKind, "instantiate", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/ReadableMap;)Ljava/lang/String;", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_close(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -77,9 +77,14 @@ static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "openManageSubscription", "(Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
-static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialog(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialogForProduct(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "openRefundDialog", "(Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "openRefundDialogForProduct", "(Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialogForTransactionId(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "openRefundDialogForTransactionId", "(Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_purchaseProduct(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -97,6 +102,11 @@ static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "getStoreCountry", "(Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
+static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_isBillingAvailable(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "isBillingAvailable", "(Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
 static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_isForwardingEnable(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "isForwardingEnable", "(Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
@@ -127,10 +137,12 @@ NativeMobilyflowReactNativeSdkSpecJSI::NativeMobilyflowReactNativeSdkSpecJSI(con
   methodMap_["getExternalEntitlements"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_getExternalEntitlements};
   methodMap_["requestTransferOwnership"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_requestTransferOwnership};
   methodMap_["openManageSubscription"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openManageSubscription};
-  methodMap_["openRefundDialog"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialog};
+  methodMap_["openRefundDialogForProduct"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialogForProduct};
+  methodMap_["openRefundDialogForTransactionId"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialogForTransactionId};
   methodMap_["purchaseProduct"] = MethodMetadata {3, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_purchaseProduct};
   methodMap_["sendDiagnostic"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_sendDiagnostic};
   methodMap_["getStoreCountry"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_getStoreCountry};
+  methodMap_["isBillingAvailable"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_isBillingAvailable};
   methodMap_["isForwardingEnable"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_isForwardingEnable};
   methodMap_["getCustomer"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_getCustomer};
   methodMap_["getSDKVersion"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_getSDKVersion};

package/android/generated/jni/react/renderer/components/RNMobilyflowReactNativeSdkSpec/RNMobilyflowReactNativeSdkSpecJSI-generated.cpp

@@ -16,7 +16,7 @@ static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_instan
     rt,
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
     count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt),
-    count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asNumber(),
+    count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asString(rt),
     count <= 3 || args[3].isUndefined() ? std::nullopt : std::make_optional(args[3].asObject(rt))
   );
 }
@@ -103,8 +103,15 @@ static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openMa
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
   );
 }
-static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialog(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->openRefundDialog(
+static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialogForProduct(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->openRefundDialogForProduct(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
+    count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt)
+  );
+}
+static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialogForTransactionId(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->openRefundDialogForTransactionId(
     rt,
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
     count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt)
@@ -131,6 +138,12 @@ static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getSto
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
   );
 }
+static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_isBillingAvailable(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->isBillingAvailable(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
+  );
+}
 static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_isForwardingEnable(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->isForwardingEnable(
     rt,
@@ -166,10 +179,12 @@ NativeMobilyflowReactNativeSdkCxxSpecJSI::NativeMobilyflowReactNativeSdkCxxSpecJ
   methodMap_["getExternalEntitlements"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getExternalEntitlements};
   methodMap_["requestTransferOwnership"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_requestTransferOwnership};
   methodMap_["openManageSubscription"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openManageSubscription};
-  methodMap_["openRefundDialog"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialog};
+  methodMap_["openRefundDialogForProduct"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialogForProduct};
+  methodMap_["openRefundDialogForTransactionId"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialogForTransactionId};
   methodMap_["purchaseProduct"] = MethodMetadata {3, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_purchaseProduct};
   methodMap_["sendDiagnostic"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_sendDiagnostic};
   methodMap_["getStoreCountry"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getStoreCountry};
+  methodMap_["isBillingAvailable"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_isBillingAvailable};
   methodMap_["isForwardingEnable"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_isForwardingEnable};
   methodMap_["getCustomer"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getCustomer};
   methodMap_["getSDKVersion"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getSDKVersion};

package/android/generated/jni/react/renderer/components/RNMobilyflowReactNativeSdkSpec/RNMobilyflowReactNativeSdkSpecJSI.h

@@ -128,7 +128,7 @@ protected:
   NativeMobilyflowReactNativeSdkCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
 
 public:
-  virtual jsi::String instantiate(jsi::Runtime &rt, jsi::String appId, jsi::String apiKey, double environment, std::optional<jsi::Object> options) = 0;
+  virtual jsi::String instantiate(jsi::Runtime &rt, jsi::String appId, jsi::String apiKey, jsi::String environment, std::optional<jsi::Object> options) = 0;
   virtual void close(jsi::Runtime &rt, jsi::String uuid) = 0;
   virtual jsi::Value login(jsi::Runtime &rt, jsi::String uuid, jsi::String externalRef) = 0;
   virtual void logout(jsi::Runtime &rt, jsi::String uuid) = 0;
@@ -141,10 +141,12 @@ public:
   virtual jsi::Value getExternalEntitlements(jsi::Runtime &rt, jsi::String uuid) = 0;
   virtual jsi::Value requestTransferOwnership(jsi::Runtime &rt, jsi::String uuid) = 0;
   virtual jsi::Value openManageSubscription(jsi::Runtime &rt, jsi::String uuid) = 0;
-  virtual jsi::Value openRefundDialog(jsi::Runtime &rt, jsi::String uuid, jsi::String productId) = 0;
+  virtual jsi::Value openRefundDialogForProduct(jsi::Runtime &rt, jsi::String uuid, jsi::String productId) = 0;
+  virtual jsi::Value openRefundDialogForTransactionId(jsi::Runtime &rt, jsi::String uuid, jsi::String transactionId) = 0;
   virtual jsi::Value purchaseProduct(jsi::Runtime &rt, jsi::String uuid, jsi::String productId, std::optional<jsi::Object> options) = 0;
   virtual void sendDiagnostic(jsi::Runtime &rt, jsi::String uuid) = 0;
   virtual jsi::Value getStoreCountry(jsi::Runtime &rt, jsi::String uuid) = 0;
+  virtual jsi::Value isBillingAvailable(jsi::Runtime &rt, jsi::String uuid) = 0;
   virtual jsi::Value isForwardingEnable(jsi::Runtime &rt, jsi::String uuid, jsi::String externalRef) = 0;
   virtual jsi::Value getCustomer(jsi::Runtime &rt, jsi::String uuid) = 0;
   virtual jsi::Value getSDKVersion(jsi::Runtime &rt, jsi::String uuid) = 0;
@@ -178,7 +180,7 @@ private:
 
     }
 
-    jsi::String instantiate(jsi::Runtime &rt, jsi::String appId, jsi::String apiKey, double environment, std::optional<jsi::Object> options) override {
+    jsi::String instantiate(jsi::Runtime &rt, jsi::String appId, jsi::String apiKey, jsi::String environment, std::optional<jsi::Object> options) override {
       static_assert(
           bridging::getParameterCount(&T::instantiate) == 5,
           "Expected instantiate(...) to have 5 parameters");
@@ -282,13 +284,21 @@ private:
       return bridging::callFromJs<jsi::Value>(
           rt, &T::openManageSubscription, jsInvoker_, instance_, std::move(uuid));
     }
-    jsi::Value openRefundDialog(jsi::Runtime &rt, jsi::String uuid, jsi::String productId) override {
+    jsi::Value openRefundDialogForProduct(jsi::Runtime &rt, jsi::String uuid, jsi::String productId) override {
       static_assert(
-          bridging::getParameterCount(&T::openRefundDialog) == 3,
-          "Expected openRefundDialog(...) to have 3 parameters");
+          bridging::getParameterCount(&T::openRefundDialogForProduct) == 3,
+          "Expected openRefundDialogForProduct(...) to have 3 parameters");
 
       return bridging::callFromJs<jsi::Value>(
-          rt, &T::openRefundDialog, jsInvoker_, instance_, std::move(uuid), std::move(productId));
+          rt, &T::openRefundDialogForProduct, jsInvoker_, instance_, std::move(uuid), std::move(productId));
+    }
+    jsi::Value openRefundDialogForTransactionId(jsi::Runtime &rt, jsi::String uuid, jsi::String transactionId) override {
+      static_assert(
+          bridging::getParameterCount(&T::openRefundDialogForTransactionId) == 3,
+          "Expected openRefundDialogForTransactionId(...) to have 3 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::openRefundDialogForTransactionId, jsInvoker_, instance_, std::move(uuid), std::move(transactionId));
     }
     jsi::Value purchaseProduct(jsi::Runtime &rt, jsi::String uuid, jsi::String productId, std::optional<jsi::Object> options) override {
       static_assert(
@@ -314,6 +324,14 @@ private:
       return bridging::callFromJs<jsi::Value>(
           rt, &T::getStoreCountry, jsInvoker_, instance_, std::move(uuid));
     }
+    jsi::Value isBillingAvailable(jsi::Runtime &rt, jsi::String uuid) override {
+      static_assert(
+          bridging::getParameterCount(&T::isBillingAvailable) == 2,
+          "Expected isBillingAvailable(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::isBillingAvailable, jsInvoker_, instance_, std::move(uuid));
+    }
     jsi::Value isForwardingEnable(jsi::Runtime &rt, jsi::String uuid, jsi::String externalRef) override {
       static_assert(
           bridging::getParameterCount(&T::isForwardingEnable) == 3,

package/android/src/main/java/com/mobilyflowreactnativesdk/MobilyflowReactNativeSdkModule.kt

@@ -12,7 +12,7 @@ import com.mobilyflow.mobilypurchasesdk.Exceptions.MobilyPurchaseException
 import com.mobilyflow.mobilypurchasesdk.Exceptions.MobilyTransferOwnershipException
 import com.mobilyflow.mobilypurchasesdk.MobilyPurchaseSDK
 import com.mobilyflow.mobilypurchasesdk.MobilyPurchaseSDKOptions
-import com.mobilyflow.mobilypurchasesdk.Models.PurchaseOptions
+import com.mobilyflow.mobilypurchasesdk.Models.Internal.PurchaseOptions
 import java.util.UUID
 import java.util.concurrent.Executors
 
@@ -33,7 +33,7 @@ class MobilyflowReactNativeSdkModule(reactContext: ReactApplicationContext) : Na
     return NAME
   }
 
-  override fun instantiate(appId: String, apiKey: String, environment: Double, options: ReadableMap?): String {
+  override fun instantiate(appId: String, apiKey: String, environment: String, options: ReadableMap?): String {
     val uuid = UUID.randomUUID().toString()
 
     var realOptions: MobilyPurchaseSDKOptions? = null
@@ -45,7 +45,7 @@ class MobilyflowReactNativeSdkModule(reactContext: ReactApplicationContext) : Na
       )
     }
 
-    val realEnvironment = MobilyEnvironment.entries.find { x -> x.value == environment.toInt() }
+    val realEnvironment = MobilyEnvironment.entries.find { x -> x.value == environment }
     val sdk = MobilyPurchaseSDK(reactApplicationContext, appId, apiKey, realEnvironment!!, realOptions)
     _sdkInstances[uuid] = sdk
 
@@ -73,19 +73,13 @@ class MobilyflowReactNativeSdkModule(reactContext: ReactApplicationContext) : Na
   }
 
   override fun getProducts(uuid: String, identifiers: ReadableArray?, onlyAvailable: Boolean, promise: Promise) {
-    Log.d("MobilyFlow", "[getProduct] aaa")
     val executor = Executors.newSingleThreadExecutor()
     executor.execute {
-    Log.d("MobilyFlow", "[getProduct] bbb")
       try {
         val products = _sdkInstances[uuid]!!.getProducts(identifiers.toStringArray(), onlyAvailable)
-        Log.d("MobilyFlow", "[getProduct] ccc")
         promise.resolve(products.toReadableArray())
-        Log.d("MobilyFlow", "[getProduct] ddd")
       } catch (error: Exception) {
-        Log.d("MobilyFlow", "[getProduct] catch")
         throwError(error, promise)
-        Log.d("MobilyFlow", "[getProduct] catch end")
       }
     }
   }
@@ -186,7 +180,11 @@ class MobilyflowReactNativeSdkModule(reactContext: ReactApplicationContext) : Na
     }
   }
 
-  override fun openRefundDialog(uuid: String, productId: String, promise: Promise) {
+  override fun openRefundDialogForProduct(uuid: String?, productId: String?, promise: Promise) {
+    promise.reject("-1", "Not implemented")
+  }
+
+  override fun openRefundDialogForTransactionId(uuid: String?, transactionId: String?, promise: Promise) {
     promise.reject("-1", "Not implemented")
   }
 
@@ -209,12 +207,10 @@ class MobilyflowReactNativeSdkModule(reactContext: ReactApplicationContext) : Na
         }
 
         if (offerId != null) {
-          if (product.subscriptionProduct!!.baseOffer.id == offerId) {
-            purchaseOptions.setOffer(product.subscriptionProduct!!.baseOffer)
-          } else if (product.subscriptionProduct!!.freeTrial?.id == offerId) {
-            purchaseOptions.setOffer(product.subscriptionProduct!!.freeTrial)
+          if (product.subscription!!.freeTrial?.id == offerId) {
+            purchaseOptions.setOffer(product.subscription!!.freeTrial)
           } else {
-            val offer = product.subscriptionProduct!!.promotionalOffers.find { x -> x.id == offerId }
+            val offer = product.subscription!!.promotionalOffers.find { x -> x.id == offerId }
             if (offer != null) {
               purchaseOptions.setOffer(offer)
             }
@@ -222,7 +218,7 @@ class MobilyflowReactNativeSdkModule(reactContext: ReactApplicationContext) : Na
         }
 
         val status = sdk.purchaseProduct(reactApplicationContext.currentActivity!!, product, purchaseOptions)
-        promise.resolve(status.value)
+        promise.resolve(status.toReadableMap())
       } catch (error: Exception) {
         throwError(error, promise)
       }
@@ -234,7 +230,27 @@ class MobilyflowReactNativeSdkModule(reactContext: ReactApplicationContext) : Na
   }
 
   override fun getStoreCountry(uuid: String, promise: Promise) {
-    promise.reject("-1", "Not implemented")
+    val executor = Executors.newSingleThreadExecutor()
+    executor.execute {
+      try {
+        val result = _sdkInstances[uuid]!!.getStoreCountry()
+        promise.resolve(result)
+      } catch (error: Exception) {
+        throwError(error, promise)
+      }
+    }
+  }
+
+  override fun isBillingAvailable(uuid: String, promise: Promise) {
+    val executor = Executors.newSingleThreadExecutor()
+    executor.execute {
+      try {
+        val result = _sdkInstances[uuid]!!.isBillingAvailable()
+        promise.resolve(result)
+      } catch (error: Exception) {
+        throwError(error, promise)
+      }
+    }
   }
 
   override fun isForwardingEnable(uuid: String, externalRef: String, promise: Promise) {

package/ios/MobilyflowReactNativeSdk.mm

@@ -31,11 +31,11 @@ RCT_EXPORT_MODULE()
   return [_sdkInstances objectForKey:uuid];
 }
 
-- (NSString *)instantiate:(NSString *)appId apiKey:(NSString *)apiKey environment:(double)environment options:(JS::NativeMobilyflowReactNativeSdk::MobilyPurchaseSDKOptions &)options {
+- (NSString *)instantiate:(NSString *)appId apiKey:(NSString *)apiKey environment:(NSString *)environment options:(JS::NativeMobilyflowReactNativeSdk::MobilyPurchaseSDKOptions &)options {
 
   NSString* uuid = [[NSUUID UUID] UUIDString];
 
-  MobilyPurchaseSDK *sdk = [[MobilyPurchaseSDK alloc] initWithAppId:appId apiKey:apiKey environment:(MobilyEnvironment) environment options:[ParserMobilyPurchaseSDKOptions parseFromJSI:options]];
+  MobilyPurchaseSDK *sdk = [[MobilyPurchaseSDK alloc] initWithAppId:appId apiKey:apiKey environment:environment options:[ParserMobilyPurchaseSDKOptions parseFromJSI:options]];
   [_sdkInstances setObject:sdk forKey:uuid];
 
   return uuid;
@@ -107,7 +107,7 @@ RCT_EXPORT_MODULE()
 
 - (void)getEntitlement:(NSString *)uuid productId:(NSString *)productId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
 
-  [[self getInstance:uuid] getEntitlementWithProductId:productId completionHandler:^(MobilyCustomerEntitlement * _Nullable entitlement, NSError * _Nullable error) {
+  [[self getInstance:uuid] getEntitlementWithProductId:[[NSUUID alloc] initWithUUIDString:productId] completionHandler:^(MobilyCustomerEntitlement * _Nullable entitlement, NSError * _Nullable error) {
     if (error) {
       reject([NSString stringWithFormat:@"%ld", error.code], error.description, error);
     } else {
@@ -144,11 +144,11 @@ RCT_EXPORT_MODULE()
 
 - (void)requestTransferOwnership:(NSString *)uuid resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
 
-  [[self getInstance:uuid] requestTransferOwnershipWithCompletionHandler:^(enum TransferOwnershipStatus status, NSError * _Nullable error) {
+  [[self getInstance:uuid] requestTransferOwnershipWithCompletionHandler:^(NSString * _Nullable status, NSError * _Nullable error) {
     if (error) {
       reject([NSString stringWithFormat:@"%ld", error.code], error.description, error);
     } else {
-      resolve([NSNumber numberWithInt:status]);
+      resolve(status);
     }
   }];
 }
@@ -160,14 +160,20 @@ RCT_EXPORT_MODULE()
   }];
 }
 
-- (void)openRefundDialog:(NSString *)uuid productId:(NSString *)productId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
-  MobilyProduct* product = [[self getInstance:uuid] getProductFromCacheWithIdWithId:productId];
+- (void)openRefundDialogForProduct:(NSString *)uuid productId:(NSString *)productId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+  MobilyProduct* product = [[self getInstance:uuid] getProductFromCacheWithIdWithId:[[NSUUID alloc] initWithUUIDString:productId]];
   if (product == nil) {
     reject(@"3", @"MobilyflowSDK.MobilyError.unknown_error", [NSError errorWithDomain:@"MobilyflowSDK.MobilyError" code:3 userInfo:nil]);
     return;
   }
 
-  [[self getInstance:uuid] openRefundDialogWithProduct:product completionHandler:^(enum RefundDialogResult result) {
+  [[self getInstance:uuid] openRefundDialogForProduct:product completionHandler:^(NSString * _Nullable result) {
+    resolve([NSNumber numberWithBool:result]);
+  }];
+}
+
+- (void)openRefundDialogForTransactionId:(NSString *)uuid productId:(NSString *)transactionId resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+  [[self getInstance:uuid] openRefundDialogForTransactionId:transactionId completionHandler:^(NSString * _Nullable result) {
     resolve([NSNumber numberWithBool:result]);
   }];
 }
@@ -176,13 +182,13 @@ RCT_EXPORT_MODULE()
 
   MobilyPurchaseSDK* sdk = [self getInstance:uuid];
 
-  MobilyProduct* product = [[self getInstance:uuid] getProductFromCacheWithIdWithId:productId];
+  MobilyProduct* product = [[self getInstance:uuid] getProductFromCacheWithIdWithId:[[NSUUID alloc] initWithUUIDString:productId]];
   if (product == nil) {
     reject(@"1", @"MobilyflowSDK.MobilyPurchaseError.product_unavailable", [NSError errorWithDomain:@"MobilyflowSDK.MobilyPurchaseError" code:1 userInfo:nil]);
     return;
   }
 
-  NSString *offerId = options.offerId();
+  NSUUID *offerId = [[NSUUID alloc] initWithUUIDString:options.offerId()];
   int quantity = (int)options.quantity();
 
   PurchaseOptions *purchaseOptions = [[PurchaseOptions alloc] init];
@@ -191,25 +197,23 @@ RCT_EXPORT_MODULE()
   }
 
   if (offerId != nil) {
-    if ([product.subscriptionProduct.baseOffer.id isEqualToString:offerId]) {
-      purchaseOptions = [purchaseOptions setOffer:product.subscriptionProduct.baseOffer];
-    } else if (product.subscriptionProduct.freeTrial != nil && [product.subscriptionProduct.freeTrial.id isEqualToString:offerId]) {
-      purchaseOptions = [purchaseOptions setOffer:product.subscriptionProduct.freeTrial];
+    if (product.subscription.freeTrial != nil && [product.subscription.freeTrial.id isEqual:offerId]) {
+      purchaseOptions = [purchaseOptions setOffer:product.subscription.freeTrial];
     } else {
-      for (MobilySubscriptionOffer *off in product.subscriptionProduct.promotionalOffers) {
-        if ([off.id isEqualToString:offerId]) {
+      for (MobilySubscriptionOffer *off in product.subscription.promotionalOffers) {
+        if ([off.id isEqual:offerId]) {
           purchaseOptions = [purchaseOptions setOffer:off];
           break;
         }
       }
     }
   }
-
-  [sdk purchaseProduct:product options:purchaseOptions completionHandler:^(enum WebhookStatus status, NSError * _Nullable error) {
+  
+  [sdk purchaseProduct:product options:purchaseOptions completionHandler:^(MobilyEvent * _Nullable event, NSError * _Nullable error) {
     if (error) {
       reject([NSString stringWithFormat:@"%ld", error.code], error.description, error);
     } else {
-      resolve([NSNumber numberWithInt:status]);
+      resolve([event toDictionary]);
     }
   }];
 }

package/ios/generated/RNMobilyflowReactNativeSdkSpec/RNMobilyflowReactNativeSdkSpec-generated.mm

@@ -89,8 +89,12 @@ namespace facebook::react {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "openManageSubscription", @selector(openManageSubscription:resolve:reject:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialog(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "openRefundDialog", @selector(openRefundDialog:productId:resolve:reject:), args, count);
+    static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialogForProduct(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "openRefundDialogForProduct", @selector(openRefundDialogForProduct:productId:resolve:reject:), args, count);
+    }
+
+    static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialogForTransactionId(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "openRefundDialogForTransactionId", @selector(openRefundDialogForTransactionId:transactionId:resolve:reject:), args, count);
     }
 
     static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_purchaseProduct(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -105,6 +109,10 @@ namespace facebook::react {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "getStoreCountry", @selector(getStoreCountry:resolve:reject:), args, count);
     }
 
+    static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_isBillingAvailable(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "isBillingAvailable", @selector(isBillingAvailable:resolve:reject:), args, count);
+    }
+
     static facebook::jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_isForwardingEnable(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "isForwardingEnable", @selector(isForwardingEnable:externalRef:resolve:reject:), args, count);
     }
@@ -159,7 +167,10 @@ namespace facebook::react {
         methodMap_["openManageSubscription"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openManageSubscription};
         
         
-        methodMap_["openRefundDialog"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialog};
+        methodMap_["openRefundDialogForProduct"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialogForProduct};
+        
+        
+        methodMap_["openRefundDialogForTransactionId"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_openRefundDialogForTransactionId};
         
         
         methodMap_["purchaseProduct"] = MethodMetadata {3, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_purchaseProduct};
@@ -171,6 +182,9 @@ namespace facebook::react {
         methodMap_["getStoreCountry"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_getStoreCountry};
         
         
+        methodMap_["isBillingAvailable"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_isBillingAvailable};
+        
+        
         methodMap_["isForwardingEnable"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkSpecJSI_isForwardingEnable};
         
         

package/ios/generated/RNMobilyflowReactNativeSdkSpec/RNMobilyflowReactNativeSdkSpec.h

@@ -69,7 +69,7 @@ namespace JS {
 
 - (NSString *)instantiate:(NSString *)appId
                    apiKey:(NSString *)apiKey
-              environment:(double)environment
+              environment:(NSString *)environment
                   options:(JS::NativeMobilyflowReactNativeSdk::MobilyPurchaseSDKOptions &)options;
 - (void)close:(NSString *)uuid;
 - (void)login:(NSString *)uuid
@@ -112,10 +112,14 @@ namespace JS {
 - (void)openManageSubscription:(NSString *)uuid
                        resolve:(RCTPromiseResolveBlock)resolve
                         reject:(RCTPromiseRejectBlock)reject;
-- (void)openRefundDialog:(NSString *)uuid
-               productId:(NSString *)productId
-                 resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject;
+- (void)openRefundDialogForProduct:(NSString *)uuid
+                         productId:(NSString *)productId
+                           resolve:(RCTPromiseResolveBlock)resolve
+                            reject:(RCTPromiseRejectBlock)reject;
+- (void)openRefundDialogForTransactionId:(NSString *)uuid
+                           transactionId:(NSString *)transactionId
+                                 resolve:(RCTPromiseResolveBlock)resolve
+                                  reject:(RCTPromiseRejectBlock)reject;
 - (void)purchaseProduct:(NSString *)uuid
               productId:(NSString *)productId
                 options:(JS::NativeMobilyflowReactNativeSdk::PurchaseOptions &)options
@@ -125,6 +129,9 @@ namespace JS {
 - (void)getStoreCountry:(NSString *)uuid
                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject;
+- (void)isBillingAvailable:(NSString *)uuid
+                   resolve:(RCTPromiseResolveBlock)resolve
+                    reject:(RCTPromiseRejectBlock)reject;
 - (void)isForwardingEnable:(NSString *)uuid
                externalRef:(NSString *)externalRef
                    resolve:(RCTPromiseResolveBlock)resolve

package/ios/generated/RNMobilyflowReactNativeSdkSpecJSI-generated.cpp

@@ -16,7 +16,7 @@ static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_instan
     rt,
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
     count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt),
-    count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asNumber(),
+    count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asString(rt),
     count <= 3 || args[3].isUndefined() ? std::nullopt : std::make_optional(args[3].asObject(rt))
   );
 }
@@ -103,8 +103,15 @@ static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openMa
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
   );
 }
-static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialog(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->openRefundDialog(
+static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialogForProduct(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->openRefundDialogForProduct(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
+    count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt)
+  );
+}
+static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialogForTransactionId(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->openRefundDialogForTransactionId(
     rt,
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
     count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt)
@@ -131,6 +138,12 @@ static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getSto
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
   );
 }
+static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_isBillingAvailable(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->isBillingAvailable(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
+  );
+}
 static jsi::Value __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_isForwardingEnable(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeMobilyflowReactNativeSdkCxxSpecJSI *>(&turboModule)->isForwardingEnable(
     rt,
@@ -166,10 +179,12 @@ NativeMobilyflowReactNativeSdkCxxSpecJSI::NativeMobilyflowReactNativeSdkCxxSpecJ
   methodMap_["getExternalEntitlements"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getExternalEntitlements};
   methodMap_["requestTransferOwnership"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_requestTransferOwnership};
   methodMap_["openManageSubscription"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openManageSubscription};
-  methodMap_["openRefundDialog"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialog};
+  methodMap_["openRefundDialogForProduct"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialogForProduct};
+  methodMap_["openRefundDialogForTransactionId"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_openRefundDialogForTransactionId};
   methodMap_["purchaseProduct"] = MethodMetadata {3, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_purchaseProduct};
   methodMap_["sendDiagnostic"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_sendDiagnostic};
   methodMap_["getStoreCountry"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getStoreCountry};
+  methodMap_["isBillingAvailable"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_isBillingAvailable};
   methodMap_["isForwardingEnable"] = MethodMetadata {2, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_isForwardingEnable};
   methodMap_["getCustomer"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getCustomer};
   methodMap_["getSDKVersion"] = MethodMetadata {1, __hostFunction_NativeMobilyflowReactNativeSdkCxxSpecJSI_getSDKVersion};