@thealteroffice/react-native-adgeist 0.0.28-beta → 0.0.30-beta

package/Adgeist.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency "AdgeistKit", '= 1.0.8-beta'
+  s.dependency "AdgeistKit", '= 1.0.12-beta'
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/README.md

@@ -99,7 +99,7 @@ export default function App() {
 Use the `HTML5AdView` component to display banner ads anywhere in your app. Place this component where you want the ads to appear and the SDK will automatically load and render the ad content.
 
 ```tsx
-import { HTML5AdView } from '@thealteroffice/react-native-adgeist';
+import { HTML5AdView, AdTypes } from '@thealteroffice/react-native-adgeist';
 
 <HTML5AdView
   adUnitID="6932a4c022f6786424ce3b84"
@@ -109,10 +109,15 @@ import { HTML5AdView } from '@thealteroffice/react-native-adgeist';
   onAdOpened={}
   onAdClosed={}
   onAdClicked={}
-  adType="display"
+  adType={AdTypes.DISPLAY}
 />;
 ```
 
+**Ad Types:**
+- `AdTypes.BANNER` - Small rectangular banner ads
+- `AdTypes.DISPLAY` - Standard display ads
+- `AdTypes.COMPANION` - Companion ads (requires minimum 320x320 dimensions)
+
 
 ### Campaign Conversion Analytics
 

package/android/app/build/generated/source/codegen/java/com/facebook/fbreact/specs/NativeAdgeistSpec.java

@@ -81,4 +81,8 @@ public abstract class NativeAdgeistSpec extends ReactContextBaseJavaModule imple
   @ReactMethod
   @DoNotStrip
   public abstract void trackVideoPlayback(String campaignId, String adSpaceId, String bidId, String bidMeta, String buyType, boolean isTestEnvironment, double totalPlaybackTime, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void trackDeeplinkUtm(String url);
 }

package/android/app/build/generated/source/codegen/java/com/facebook/react/viewmanagers/HTML5AdNativeComponentManagerDelegate.java

@@ -34,7 +34,7 @@ public class HTML5AdNativeComponentManagerDelegate<T extends View, U extends Bas
         mViewManager.setAdSize(view, (ReadableMap) value);
         break;
       case "adType":
-        mViewManager.setAdType(view, value == null ? null : (String) value);
+        mViewManager.setAdType(view, (String) value);
         break;
       default:
         super.setProperty(view, propName, value);

package/android/app/build/generated/source/codegen/jni/RNAdgeistSpec-generated.cpp

@@ -72,6 +72,11 @@ static facebook::jsi::Value __hostFunction_NativeAdgeistSpecJSI_trackVideoPlayba
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "trackVideoPlayback", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZDLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
+static facebook::jsi::Value __hostFunction_NativeAdgeistSpecJSI_trackDeeplinkUtm(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, VoidKind, "trackDeeplinkUtm", "(Ljava/lang/String;)V", args, count, cachedMethodId);
+}
+
 NativeAdgeistSpecJSI::NativeAdgeistSpecJSI(const JavaTurboModule::InitParams &params)
   : JavaTurboModule(params) {
   methodMap_["initializeSdk"] = MethodMetadata {4, __hostFunction_NativeAdgeistSpecJSI_initializeSdk};
@@ -86,6 +91,7 @@ NativeAdgeistSpecJSI::NativeAdgeistSpecJSI(const JavaTurboModule::InitParams &pa
   methodMap_["trackTotalView"] = MethodMetadata {7, __hostFunction_NativeAdgeistSpecJSI_trackTotalView};
   methodMap_["trackClick"] = MethodMetadata {6, __hostFunction_NativeAdgeistSpecJSI_trackClick};
   methodMap_["trackVideoPlayback"] = MethodMetadata {7, __hostFunction_NativeAdgeistSpecJSI_trackVideoPlayback};
+  methodMap_["trackDeeplinkUtm"] = MethodMetadata {1, __hostFunction_NativeAdgeistSpecJSI_trackDeeplinkUtm};
 }
 
 std::shared_ptr<TurboModule> RNAdgeistSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {

package/android/app/build/generated/source/codegen/jni/react/renderer/components/RNAdgeistSpec/Props.cpp

@@ -22,7 +22,7 @@ HTML5AdNativeComponentProps::HTML5AdNativeComponentProps(
     adUnitID(convertRawProp(context, rawProps, "adUnitID", sourceProps.adUnitID, {})),
     adIsResponsive(convertRawProp(context, rawProps, "adIsResponsive", sourceProps.adIsResponsive, {false})),
     adSize(convertRawProp(context, rawProps, "adSize", sourceProps.adSize, {})),
-    adType(convertRawProp(context, rawProps, "adType", sourceProps.adType, {}))
+    adType(convertRawProp(context, rawProps, "adType", sourceProps.adType, {HTML5AdNativeComponentAdType::BANNER}))
       {}
 
 } // namespace facebook::react

package/android/app/build/generated/source/codegen/jni/react/renderer/components/RNAdgeistSpec/Props.h

@@ -15,6 +15,23 @@
 
 namespace facebook::react {
 
+enum class HTML5AdNativeComponentAdType { BANNER, DISPLAY, COMPANION };
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, HTML5AdNativeComponentAdType &result) {
+  auto string = (std::string)value;
+  if (string == "BANNER") { result = HTML5AdNativeComponentAdType::BANNER; return; }
+  if (string == "DISPLAY") { result = HTML5AdNativeComponentAdType::DISPLAY; return; }
+  if (string == "COMPANION") { result = HTML5AdNativeComponentAdType::COMPANION; return; }
+  abort();
+}
+
+static inline std::string toString(const HTML5AdNativeComponentAdType &value) {
+  switch (value) {
+    case HTML5AdNativeComponentAdType::BANNER: return "BANNER";
+    case HTML5AdNativeComponentAdType::DISPLAY: return "DISPLAY";
+    case HTML5AdNativeComponentAdType::COMPANION: return "COMPANION";
+  }
+}
 struct HTML5AdNativeComponentAdSizeStruct {
   double width{0.0};
   double height{0.0};
@@ -46,7 +63,7 @@ class HTML5AdNativeComponentProps final : public ViewProps {
   std::string adUnitID{};
   bool adIsResponsive{false};
   HTML5AdNativeComponentAdSizeStruct adSize{};
-  std::string adType{};
+  HTML5AdNativeComponentAdType adType{HTML5AdNativeComponentAdType::BANNER};
 };
 
 } // namespace facebook::react

package/android/app/build/generated/source/codegen/jni/react/renderer/components/RNAdgeistSpec/RNAdgeistSpecJSI-generated.cpp

@@ -121,6 +121,13 @@ static jsi::Value __hostFunction_NativeAdgeistCxxSpecJSI_trackVideoPlayback(jsi:
     count <= 6 ? throw jsi::JSError(rt, "Expected argument in position 6 to be passed") : args[6].asNumber()
   );
 }
+static jsi::Value __hostFunction_NativeAdgeistCxxSpecJSI_trackDeeplinkUtm(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  static_cast<NativeAdgeistCxxSpecJSI *>(&turboModule)->trackDeeplinkUtm(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
+  );
+  return jsi::Value::undefined();
+}
 
 NativeAdgeistCxxSpecJSI::NativeAdgeistCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule("Adgeist", jsInvoker) {
@@ -136,6 +143,7 @@ NativeAdgeistCxxSpecJSI::NativeAdgeistCxxSpecJSI(std::shared_ptr<CallInvoker> js
   methodMap_["trackTotalView"] = MethodMetadata {7, __hostFunction_NativeAdgeistCxxSpecJSI_trackTotalView};
   methodMap_["trackClick"] = MethodMetadata {6, __hostFunction_NativeAdgeistCxxSpecJSI_trackClick};
   methodMap_["trackVideoPlayback"] = MethodMetadata {7, __hostFunction_NativeAdgeistCxxSpecJSI_trackVideoPlayback};
+  methodMap_["trackDeeplinkUtm"] = MethodMetadata {1, __hostFunction_NativeAdgeistCxxSpecJSI_trackDeeplinkUtm};
 }
 
 

package/android/app/build/generated/source/codegen/jni/react/renderer/components/RNAdgeistSpec/RNAdgeistSpecJSI.h

@@ -32,6 +32,7 @@ public:
   virtual jsi::Value trackTotalView(jsi::Runtime &rt, jsi::String campaignId, jsi::String adSpaceId, jsi::String bidId, jsi::String bidMeta, jsi::String buyType, bool isTestEnvironment, double totalViewTime) = 0;
   virtual jsi::Value trackClick(jsi::Runtime &rt, jsi::String campaignId, jsi::String adSpaceId, jsi::String bidId, jsi::String bidMeta, jsi::String buyType, bool isTestEnvironment) = 0;
   virtual jsi::Value trackVideoPlayback(jsi::Runtime &rt, jsi::String campaignId, jsi::String adSpaceId, jsi::String bidId, jsi::String bidMeta, jsi::String buyType, bool isTestEnvironment, double totalPlaybackTime) = 0;
+  virtual void trackDeeplinkUtm(jsi::Runtime &rt, jsi::String url) = 0;
 
 };
 
@@ -158,6 +159,14 @@ private:
       return bridging::callFromJs<jsi::Value>(
           rt, &T::trackVideoPlayback, jsInvoker_, instance_, std::move(campaignId), std::move(adSpaceId), std::move(bidId), std::move(bidMeta), std::move(buyType), std::move(isTestEnvironment), std::move(totalPlaybackTime));
     }
+    void trackDeeplinkUtm(jsi::Runtime &rt, jsi::String url) override {
+      static_assert(
+          bridging::getParameterCount(&T::trackDeeplinkUtm) == 2,
+          "Expected trackDeeplinkUtm(...) to have 2 parameters");
+
+      return bridging::callFromJs<void>(
+          rt, &T::trackDeeplinkUtm, jsInvoker_, instance_, std::move(url));
+    }
 
   private:
     friend class NativeAdgeistCxxSpec;

package/android/build.gradle

@@ -98,14 +98,35 @@ android {
 repositories {
   mavenCentral()
   google()
+  /*
+   * Alternative: Use local AAR file instead of remote package
+   * Uncomment the lines below and comment out the remote dependency above to use a local AAR file.
+   * This is useful for testing unreleased versions or when working with custom builds.
+   * Place your AAR file in the 'libs' folder.
+   */
+  // flatDir {
+  //   dirs 'libs'
+  // }
 }
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   implementation "com.facebook.react:react-android"
-  implementation "ai.adgeist:adgeistkit:1.1.17-beta"
+  implementation "ai.adgeist:adgeistkit:1.1.20-beta"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+  /*
+   * Alternative: Use local AAR file instead of remote package
+   * Uncomment the lines below and comment out the remote dependency above to use a local AAR file.
+   * This is useful for testing unreleased versions or when working with custom builds.
+   * Place your AAR file in the 'libs' folder.
+   */
+  // implementation(name: 'adgeistkit-beta-release', ext: 'aar')
+  // implementation "androidx.work:work-runtime-ktx:2.11.1"
+  // implementation 'com.google.code.gson:gson:2.10.1'
+  // implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+  // implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
 }
 
 if (isNewArchitectureEnabled()) {

package/android/src/main/java/com/adgeist/components/HTML5AdViewManagerImpl.kt

@@ -5,8 +5,9 @@ import android.view.View
 import androidx.annotation.RequiresPermission
 import com.adgeistkit.ads.AdListener
 import com.adgeistkit.ads.AdSize
+import com.adgeistkit.ads.AdType
 import com.adgeistkit.ads.AdView
-import com.adgeistkit.ads.network.AdRequest
+import com.adgeistkit.request.AdRequest
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
@@ -23,9 +24,13 @@ object HTML5AdViewManagerImpl {
     const val EVENT_AD_CLOSED = "onAdClosed"
     const val EVENT_AD_CLICKED = "onAdClicked"
 
+    private val viewContextMap = mutableMapOf<Int, ThemedReactContext>()
+
     fun createViewInstance(reactContext: ThemedReactContext): AdView {
-        val adView = AdView(reactContext.applicationContext)
-        adView.setTag(com.facebook.react.R.id.view_tag_native_id, reactContext)
+        Log.d(TAG, "Creating AdView with ThemedReactContext: ${reactContext.hashCode()}")
+        val adView = AdView(reactContext)
+        viewContextMap[System.identityHashCode(adView)] = reactContext
+        Log.d(TAG, "AdView created with hash: ${System.identityHashCode(adView)} and context hash: ${reactContext.hashCode()}")
         return adView
     }
 
@@ -55,8 +60,12 @@ object HTML5AdViewManagerImpl {
     }
 
     fun setAdType(view: AdView, adType: String?) {
-        if (adType != null) {
-            view.adType = adType
+        val typeToSet = adType ?: "BANNER"
+        try {
+            view.adType = AdType.valueOf(typeToSet)
+        } catch (e: IllegalArgumentException) {
+            Log.e(TAG, "Invalid ad type: $typeToSet. Must be BANNER, DISPLAY, or COMPANION", e)
+            view.adType = AdType.BANNER
         }
     }
 
@@ -107,7 +116,14 @@ object HTML5AdViewManagerImpl {
     }
 
     fun destroyAd(view: AdView) {
-        view.destroy()
+        try {
+            view.destroy()
+        } catch (e: Exception) {
+            Log.e(TAG, "Error destroying ad view", e)
+        } finally {
+            // Clean up the context reference
+            viewContextMap.remove(System.identityHashCode(view))
+        }
     }
 
     private fun measureAndLayout(view: AdView) {
@@ -119,13 +135,17 @@ object HTML5AdViewManagerImpl {
     }
 
     private fun sendEvent(view: AdView, eventName: String, params: WritableMap) {
-        val reactContext = view.getTag(com.facebook.react.R.id.view_tag_native_id) as? ThemedReactContext
+        val reactContext = viewContextMap[System.identityHashCode(view)]
         if (reactContext != null) {
-            reactContext
-                .getJSModule(RCTEventEmitter::class.java)
-                .receiveEvent(view.id, eventName, params)
+            try {
+                reactContext
+                    .getJSModule(RCTEventEmitter::class.java)
+                    .receiveEvent(view.id, eventName, params)
+            } catch (e: Exception) {
+                Log.e(TAG, "Error sending event $eventName", e)
+            }
         } else {
-            Log.e(TAG, "Unable to send event $eventName: ThemedReactContext not found")
+            Log.w(TAG, "Unable to send event $eventName: ThemedReactContext not found or view already destroyed")
         }
     }
 }

package/android/src/main/java/com/adgeist/modules/AdgeistImpl.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.adgeistkit.AdgeistCore
+import com.adgeistkit.data.models.AdData
 import com.adgeistkit.data.models.CPMAdResponse
 import com.adgeistkit.data.models.Event
 import com.adgeistkit.data.models.FixedAdResponse
@@ -14,17 +15,16 @@ import com.adgeistkit.data.network.FetchCreative
 
 import com.facebook.react.bridge.ReadableMap
 import com.adgeist.utils.toWritableMap
-import com.adgeistkit.ads.network.AnalyticsRequest
-import com.adgeistkit.ads.network.AnalyticsRequestDEPRECATED
+import com.adgeistkit.request.AnalyticsRequestDEPRECATED
 
 class AdgeistImpl internal constructor(private val context: ReactApplicationContext) {
-
   private var adgeistInstance: AdgeistCore? = null
   private var getAd: FetchCreative? = null
   private var postCreativeAnalytic: CreativeAnalytics? = null
 
   fun initializeSdk(customBidRequestBackendDomain: String?, customPackageOrBundleID: String?, customAdgeistAppID: String?, customVersioning: String?, promise: Promise) {
     try {
+      Log.d("AdgeistImpl", "SDK initialized with domain: ${customBidRequestBackendDomain ?: "default"}, package/bundle ID: ${customPackageOrBundleID ?: "default"}, app ID: ${customAdgeistAppID ?: "default"}, versioning: ${customVersioning ?: "default"}")
       adgeistInstance = AdgeistCore.initialize(context.applicationContext, customBidRequestBackendDomain, customPackageOrBundleID, customAdgeistAppID, customVersioning)
       getAd = adgeistInstance?.getCreative()
       postCreativeAnalytic = adgeistInstance?.postCreativeAnalytics()
@@ -42,16 +42,20 @@ class AdgeistImpl internal constructor(private val context: ReactApplicationCont
   fun fetchCreative(adSpaceId: String, buyType: String, isTestEnvironment: Boolean, promise: Promise) {
     getAd?.fetchCreative(adSpaceId, buyType, isTestEnvironment) { adData ->
       if (adData != null) {
-        when (adData) {
-          is CPMAdResponse -> {
-            promise.resolve(adData.toWritableMap())
-          }
-          is FixedAdResponse -> {
-            promise.resolve(adData.toWritableMap())
-          }
-          else -> {
-            promise.resolve(null)
+        if (adData.isSuccess && adData.data != null) {
+          when (val response = adData.data) {
+            is CPMAdResponse -> {
+              promise.resolve(response.toWritableMap())
+            }
+            is FixedAdResponse -> {
+              promise.resolve(response.toWritableMap())
+            }
+            else -> {
+              promise.reject("UNKNOWN_RESPONSE", "Unknown ad response type")
+            }
           }
+        } else {
+          promise.reject("AD_ERROR", adData.errorMessage)
         }
       } else {
         promise.reject("NO_AD", "Ad data not available")

package/android/src/main/java/com/adgeist/utils/CreativeExtensions.kt

@@ -53,13 +53,16 @@ fun CPMAdResponse.toWritableMap(): WritableMap {
 fun FixedAdResponse.toWritableMap(): WritableMap {
   val map = Arguments.createMap()
 
+  isTest?.let { map.putBoolean("isTest", it) }
+  expiresAt?.let { map.putString("expiresAt", it) }
   map.putString("metaData", metaData)
   map.putString("id", id)
-  map.putString("generatedAt", generatedAt)
-  map.putString("campaignId", campaignId)
-  map.putString("type", type)
-  map.putString("loadType", loadType)
-  map.putInt("frontendCacheDurationSeconds", frontendCacheDurationSeconds ?: 0)
+  generatedAt?.let { map.putString("generatedAt", it) }
+  signature?.let { map.putString("signature", it) }
+  campaignId?.let { map.putString("campaignId", it) }
+  type?.let { map.putString("type", it) }
+  loadType?.let { map.putString("loadType", it) }
+  frontendCacheDurationSeconds?.let { map.putInt("frontendCacheDurationSeconds", it) }
 
   advertiser?.let {
     val advMap = Arguments.createMap()
@@ -76,41 +79,74 @@ fun FixedAdResponse.toWritableMap(): WritableMap {
     map.putMap("campaignValidity", cvMap)
   }
 
-  creatives?.let { list ->
-    val arr = Arguments.createArray()
-    list.forEach { creative ->
-      val cMap = Arguments.createMap()
-      cMap.putString("ctaUrl", creative.ctaUrl)
-      cMap.putString("description", creative.description)
-      cMap.putString("fileName", creative.fileName)
-      cMap.putInt("fileSize", creative.fileSize ?: 0)
-      cMap.putString("fileUrl", creative.fileUrl)
-      cMap.putString("thumbnailUrl", creative.thumbnailUrl)
-      cMap.putString("title", creative.title)
-      cMap.putString("type", creative.type)
-
-      creative.contentModerationResult?.let {
-        val cm = Arguments.createMap()
-        cm.putString("\$oid", it.`$oid`)
-        cMap.putMap("contentModerationResult", cm)
-      }
+  val creativesArr = Arguments.createArray()
+  creatives.forEach { creative ->
+    val cMap = Arguments.createMap()
+    cMap.putString("ctaUrl", creative.ctaUrl)
+    cMap.putString("description", creative.description)
+    cMap.putString("fileName", creative.fileName)
+    cMap.putInt("fileSize", creative.fileSize ?: 0)
+    cMap.putString("fileUrl", creative.fileUrl)
+    cMap.putString("thumbnailUrl", creative.thumbnailUrl)
+    cMap.putString("title", creative.title)
+    cMap.putString("type", creative.type)
+
+    creative.contentModerationResult?.let {
+      val cm = Arguments.createMap()
+      cm.putString("\$oid", it.`$oid`)
+      cMap.putMap("contentModerationResult", cm)
+    }
 
-      creative.createdAt?.let {
-        val cm = Arguments.createMap()
-        cm.putDouble("\$date", it.`$date`?.toDouble() ?: 0.0)
-        cMap.putMap("createdAt", cm)
-      }
+    creative.createdAt?.let {
+      val cm = Arguments.createMap()
+      cm.putDouble("\$date", it.`$date`?.toDouble() ?: 0.0)
+      cMap.putMap("createdAt", cm)
+    }
 
-      creative.updatedAt?.let {
-        val cm = Arguments.createMap()
-        cm.putDouble("\$date", it.`$date`?.toDouble() ?: 0.0)
-        cMap.putMap("updatedAt", cm)
-      }
+    creative.updatedAt?.let {
+      val cm = Arguments.createMap()
+      cm.putDouble("\$date", it.`$date`?.toDouble() ?: 0.0)
+      cMap.putMap("updatedAt", cm)
+    }
 
-      arr.pushMap(cMap)
+    creativesArr.pushMap(cMap)
+  }
+  map.putArray("creatives", creativesArr)
+
+  val creativesV1Arr = Arguments.createArray()
+  creativesV1.forEach { creativeV1 ->
+    val cv1Map = Arguments.createMap()
+    cv1Map.putString("title", creativeV1.title)
+    cv1Map.putString("description", creativeV1.description)
+    cv1Map.putString("ctaUrl", creativeV1.ctaUrl)
+
+    creativeV1.primary?.let {
+      val primMap = Arguments.createMap()
+      primMap.putString("type", it.type)
+      primMap.putString("fileName", it.fileName)
+      primMap.putInt("fileSize", it.fileSize ?: 0)
+      primMap.putString("fileUrl", it.fileUrl)
+      primMap.putString("thumbnailUrl", it.thumbnailUrl)
+      cv1Map.putMap("primary", primMap)
+    }
+
+    creativeV1.companions?.let { companions ->
+      val companionsArr = Arguments.createArray()
+      companions.forEach { companion ->
+        val compMap = Arguments.createMap()
+        compMap.putString("type", companion.type)
+        compMap.putString("fileName", companion.fileName)
+        compMap.putInt("fileSize", companion.fileSize ?: 0)
+        compMap.putString("fileUrl", companion.fileUrl)
+        compMap.putString("thumbnailUrl", companion.thumbnailUrl)
+        companionsArr.pushMap(compMap)
+      }
+      cv1Map.putArray("companions", companionsArr)
     }
-    map.putArray("creatives", arr)
+
+    creativesV1Arr.pushMap(cv1Map)
   }
+  map.putArray("creativesV1", creativesV1Arr)
 
   displayOptions?.let { opt ->
     val opMap = Arguments.createMap()
@@ -142,7 +178,11 @@ fun FixedAdResponse.toWritableMap(): WritableMap {
 
   impressionRequirements?.let {
     val ir = Arguments.createMap()
-    ir.putString("impressionType", it.impressionType)
+    it.impressionType?.let { types ->
+      val typesArr = Arguments.createArray()
+      types.forEach { type -> typesArr.pushString(type) }
+      ir.putArray("impressionType", typesArr)
+    }
     ir.putInt("minViewDurationSeconds", it.minViewDurationSeconds ?: 0)
     map.putMap("impressionRequirements", ir)
   }

package/android/src/newarch/java/com/Adgeist.kt

@@ -3,7 +3,7 @@ package com.adgeist
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.adgeist.modules.AdgeistImpl
-import com.adgeistkit.ads.network.AnalyticsRequestDEPRECATED
+import com.adgeistkit.request.AnalyticsRequestDEPRECATED
 import com.facebook.react.bridge.ReadableMap
 
 class Adgeist internal constructor(reactContext: ReactApplicationContext) :

package/android/src/oldarch/java/com/Adgeist.kt

@@ -5,7 +5,7 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.adgeist.modules.AdgeistImpl
-import com.adgeistkit.ads.network.AnalyticsRequestDEPRECATED
+import com.adgeistkit.request.AnalyticsRequestDEPRECATED
 import com.facebook.react.bridge.ReadableMap
 
 class Adgeist internal constructor(reactContext: ReactApplicationContext) :

package/ios/AdgeistImpl.swift

@@ -52,8 +52,9 @@ import React
             adUnitID: adSpaceId,
             buyType: buyType,
             isTestEnvironment: isTestEnvironment
-        ) { creativeData in
-            if let creativeData = creativeData {
+        ) { adData in
+            // Check if the request was successful
+            if adData.isSuccess, let creativeData = adData.data {
                 var result: [String: Any] = [:]
                 
                 // Use Mirror to reflect the object's properties
@@ -66,7 +67,8 @@ import React
                 
                 resolver(result)
             } else {
-                rejecter("NO_AD", "Ad data not available", nil)
+                // Return error from AdData
+                rejecter("AD_ERROR", adData.errorMessage, nil)
             }
         }
     }

package/ios/NativeHTML5AdManager.mm

@@ -103,9 +103,12 @@ using namespace facebook::react;
     }
 
     if (oldPropsStruct.adType != newProps.adType) {
-        _swiftView.adType = newProps.adType.empty()
+        // Pass the string value ("BANNER", "DISPLAY", or "COMPANION"), or nil to use default "BANNER" in Swift
+        // The Swift layer converts the string to AdType enum
+        std::string adTypeStr = toString(newProps.adType);
+        _swiftView.adType = adTypeStr.empty()
             ? nil
-            : [NSString stringWithUTF8String:newProps.adType.c_str()];
+            : [NSString stringWithUTF8String:adTypeStr.c_str()];
     }
 
     [super updateProps:props oldProps:oldProps];

package/ios/NativeHTML5AdView.swift

@@ -88,7 +88,7 @@ public class NativeHTML5AdView: UIView {
         let adView = AdView()
         adView.frame = bounds
         adView.adUnitId = adUnitID
-        adView.adIsResposive = adIsResponsive
+        adView.adIsResponsive = adIsResponsive
 
         if let dict = adSize as? [String: Any] {
             if let w = dict["width"] as? Int, let h = dict["height"] as? Int {
@@ -96,7 +96,20 @@ public class NativeHTML5AdView: UIView {
             }
         }
 
-        if let adType = adType { adView.adType = adType }
+        // Handle adType with default value of BANNER
+        let adTypeStr = (adType ?? "BANNER").uppercased()
+        
+        switch adTypeStr {
+        case "BANNER":
+            adView.adType = .BANNER
+        case "DISPLAY":
+            adView.adType = .DISPLAY
+        case "COMPANION":
+            adView.adType = .COMPANION
+        default:
+            delegate?.onAdFailedToLoad(self, error: "Invalid ad type: \(adTypeStr)")
+            return
+        }
 
         let listener = NativeHTML5AdListener(view: self)
         self.adListener = listener

package/lib/module/components/deprecated/BannerAdView.js

@@ -56,14 +56,15 @@ export const BannerAd = ({
     bidId = adData?.id;
     campaignId = adData?.campaignId;
   } else {
-    let creativeData = adData?.seatBid?.[0]?.bid?.[0]?.ext;
+    let cpmData = adData?.data;
+    let creativeData = cpmData?.seatBid?.[0]?.bid?.[0]?.ext;
     creativeTitle = creativeData?.creativeTitle;
     creativeDescription = creativeData?.creativeDescription;
-    creativeBrandName = creativeData?.creativeBrandName;
+    creativeBrandName = undefined; // Not available in CPM response
     creativeUrl = creativeData?.creativeUrl;
     ctaUrl = creativeData?.ctaUrl;
-    bidId = adData?.id;
-    campaignId = adData?.seatBid?.[0]?.bid?.[0]?.id;
+    bidId = cpmData?.id;
+    campaignId = cpmData?.seatBid?.[0]?.bid?.[0]?.id;
   }
   const fetchAd = useCallback(async () => {
     if (!isInitialized) return;
@@ -155,7 +156,7 @@ export const BannerAd = ({
     });
   }, [hasImpression, trackView, dataSlotType, isPaused, hasView, isManuallyControlled]);
   const handleClick = useCallback(async () => {
-    if (!adData || dataBuyType == 'CPM' && !adData.seatBid.length || !bidId || !campaignId) return;
+    if (!adData || dataBuyType == 'CPM' && !adData.data?.seatBid?.length || !bidId || !campaignId) return;
     try {
       Adgeist.trackClick(campaignId, adSpaceId, bidId, bidMeta, dataBuyType, isTestEnvironment);
       await Linking.openURL(normalizeUrl(ctaUrl));