react-native-applovin-max 6.1.0 → 6.2.0

package/android/build.gradle

@@ -35,8 +35,8 @@ android {
   defaultConfig {
     minSdkVersion 16
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    versionCode 6010000
-    versionName "6.1.0"
+    versionCode 6020000
+    versionName "6.2.0"
   }
 
   flavorDimensions("default")
@@ -140,5 +140,5 @@ dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
 
-  implementation 'com.applovin:applovin-sdk:12.0.0'
+  implementation 'com.applovin:applovin-sdk:12.1.0'
 }

package/android/src/main/java/com/applovin/reactnative/AppLovinMAXModule.java

@@ -151,6 +151,7 @@ public class AppLovinMAXModule
     // Store these values if pub attempts to set it before initializing
     private       List<String>        initializationAdUnitIdsToSet;
     private       String              userIdToSet;
+    private       Boolean             mutedToSet;
     private       List<String>        testDeviceAdvertisingIdsToSet;
     private       Boolean             verboseLoggingToSet;
     private       Boolean             creativeDebuggerEnabledToSet;
@@ -331,6 +332,13 @@ public class AppLovinMAXModule
             debugUserGeographyToSet = null;
         }
 
+        // Set muted if needed
+        if ( mutedToSet != null )
+        {
+            settings.setMuted( mutedToSet );
+            mutedToSet = null;
+        }
+
         // Set test device ids if needed
         if ( testDeviceAdvertisingIdsToSet != null )
         {
@@ -531,9 +539,15 @@ public class AppLovinMAXModule
     @ReactMethod
     public void setMuted(final boolean muted)
     {
-        if ( !isPluginInitialized ) return;
-
-        sdk.getSettings().setMuted( muted );
+        if ( isPluginInitialized )
+        {
+            sdk.getSettings().setMuted( muted );
+            mutedToSet = null;
+        }
+        else
+        {
+            mutedToSet = muted;
+        }
     }
 
     @ReactMethod
@@ -2659,6 +2673,63 @@ public class AppLovinMAXModule
         return networkResponseObject;
     }
 
+    // Amazon
+
+    public void setAmazonBannerResult(final Object result, final String adUnitId)
+    {
+        setAmazonResult( result, adUnitId, MaxAdFormat.BANNER );
+    }
+
+    public void setAmazonMRecResult(final Object result, final String adUnitId)
+    {
+        setAmazonResult( result, adUnitId, MaxAdFormat.MREC );
+    }
+
+    public void setAmazonInterstitialResult(final Object result, final String adUnitId)
+    {
+        setAmazonResult( result, adUnitId, MaxAdFormat.INTERSTITIAL );
+    }
+
+    private void setAmazonResult(final Object result, final String adUnitId, final MaxAdFormat adFormat)
+    {
+        if ( sdk == null )
+        {
+            logUninitializedAccessError( "Failed to set Amazon result - SDK not initialized: " + adUnitId );
+            return;
+        }
+
+        if ( result == null )
+        {
+            e( "Failed to set Amazon result - null value" );
+            return;
+        }
+
+        String key = getLocalExtraParameterKeyForAmazonResult( result );
+
+        if ( adFormat == MaxAdFormat.INTERSTITIAL )
+        {
+            MaxInterstitialAd interstitial = retrieveInterstitial( adUnitId, "setAmazonResult" );
+            if ( interstitial == null )
+            {
+                e( "Unable to set Amazon result - unable to retrieve interstitial" );
+                return;
+            }
+
+            interstitial.setLocalExtraParameter( key, result );
+        }
+        else
+        {
+            MaxAdView adView = retrieveAdView( adUnitId, adFormat );
+            adView.setLocalExtraParameter( key, result );
+        }
+    }
+
+    private String getLocalExtraParameterKeyForAmazonResult(final Object /* DTBAdResponse or AdError */ result)
+    {
+        String className = result.getClass().getSimpleName();
+        return "DTBAdResponse".equalsIgnoreCase( className ) ? "amazon_ad_response" : "amazon_ad_error";
+    }
+
     // Lifecycle Events
 
     @Override

package/android/src/main/java/com/applovin/reactnative/AppLovinMAXNativeAdView.java

@@ -1,6 +1,8 @@
 package com.applovin.reactnative;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,8 +31,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import androidx.annotation.Nullable;
 
-import static com.applovin.sdk.AppLovinSdkUtils.runOnUiThreadDelayed;
-
 public class AppLovinMAXNativeAdView
         extends ReactViewGroup
         implements MaxAdRevenueListener, View.OnLayoutChangeListener, ViewGroup.OnHierarchyChangeListener
@@ -42,12 +42,15 @@ public class AppLovinMAXNativeAdView
     private static final int CALL_TO_ACTION_VIEW_TAG  = 5;
     private static final int ADVERTISER_VIEW_TAG      = 8;
 
-    private final ReactContext      reactContext;
+    private final ReactContext       reactContext;
     @Nullable
-    private       MaxNativeAdLoader adLoader;
+    private       MaxNativeAdLoader  adLoader;
     @Nullable
-    private       MaxAd             nativeAd;
-    private final AtomicBoolean     isLoading = new AtomicBoolean(); // Guard against repeated ad loads
+    private       MaxAd              nativeAd;
+    private final AtomicBoolean      isLoading             = new AtomicBoolean(); // Guard against repeated ad loads
+    private final AtomicBoolean      isAdUnitIdSet         = new AtomicBoolean();
+    private final Handler            renderNativeAdHandler = new Handler( Looper.getMainLooper() );
+    private final RenderNativeAdTask renderNativeAdTask    = new RenderNativeAdTask( this );
 
     @Nullable
     private View mediaView;
@@ -91,8 +94,7 @@ public class AppLovinMAXNativeAdView
 
         adUnitId = value;
 
-        // Explicitly invoke ad load now that Ad Unit ID is set, but do so after 0.25s to allow other props to set
-        postDelayed( this::loadAd, 250 );
+        isAdUnitIdSet.set( true );
     }
 
     public void setPlacement(@Nullable final String value)
@@ -197,25 +199,7 @@ public class AppLovinMAXNativeAdView
             // Notify `AppLovinNativeAdView.js`
             sendAdLoadedReactNativeEventForAd( ad.getNativeAd() );
 
-            // After notifying the RN layer - have slight delay to let views bind to this layer in `clickableViews` before registering
-            runOnUiThreadDelayed( () -> {
-
-                // Loader can be null when the user hides before the properties are fully set
-                if ( adLoader != null )
-                {
-                    adLoader.a( clickableViews, AppLovinMAXNativeAdView.this, ad );
-                    adLoader.b( ad );
-                }
-
-                // Reassure the size of `mediaView` and its children for the networks, such as
-                // LINE, where the actual ad contents are loaded after `mediaView` is sized.
-                if ( mediaView != null && mediaView.getParent() != null )
-                {
-                    sizeToFit( mediaView, (View) mediaView.getParent() );
-                }
-
-                isLoading.set( false );
-            }, 500L );
+            isLoading.set( false );
         }
 
         @Override
@@ -421,6 +405,48 @@ public class AppLovinMAXNativeAdView
         }
     }
 
+    static class RenderNativeAdTask
+            implements Runnable
+    {
+        private AppLovinMAXNativeAdView nativeAdView;
+
+        RenderNativeAdTask(AppLovinMAXNativeAdView nativeAdView) { this.nativeAdView = nativeAdView; }
+
+        @Override
+        public void run()
+        {
+            if ( nativeAdView.adLoader == null ) return;
+
+            nativeAdView.adLoader.a( nativeAdView.clickableViews, nativeAdView, nativeAdView.nativeAd );
+            nativeAdView.adLoader.b( nativeAdView.nativeAd );
+
+            // LINE needs to be sized a while after its mediaView is attached to the React Native
+            if ( nativeAdView.mediaView != null && nativeAdView.mediaView.getParent() != null )
+            {
+                nativeAdView.renderNativeAdHandler.postDelayed( () -> sizeToFit( nativeAdView.mediaView, (View) nativeAdView.mediaView.getParent() ), 500 );
+            }
+        }
+    }
+
+    /**
+     * Invoked via ViewManager.onAfterUpdateTransaction():
+     * 1. after all the JavaScript properties are set when mounting NativeAdView
+     * 2. every time one of the asset views is mounted, following the 1st event
+     */
+    public void onSetProps()
+    {
+        if ( isAdUnitIdSet.compareAndSet( true, false ) )
+        {
+            loadAd();
+        }
+        else
+        {
+            // Renders the ad only after the last asset view is set
+            renderNativeAdHandler.removeCallbacksAndMessages( null );
+            renderNativeAdHandler.postDelayed( renderNativeAdTask, 1 );
+        }
+    }
+
     @Override
     public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom)
     {

package/android/src/main/java/com/applovin/reactnative/AppLovinMAXNativeAdViewManager.java

@@ -148,6 +148,14 @@ public class AppLovinMAXNativeAdViewManager
         view.setMediaView( value );
     }
 
+    @Override
+    public void onAfterUpdateTransaction(final AppLovinMAXNativeAdView view)
+    {
+        super.onAfterUpdateTransaction( view );
+
+        view.onSetProps();
+    }
+
     @Override
     public void onDropViewInstance(@NonNull final AppLovinMAXNativeAdView view)
     {

package/ios/AppLovinMAX.m

@@ -39,6 +39,7 @@
 // Store these values if pub attempts to set it before initializing
 @property (nonatomic, strong, nullable) NSArray<NSString *> *initializationAdUnitIdentifiersToSet;
 @property (nonatomic,   copy, nullable) NSString *userIdentifierToSet;
+@property (nonatomic, strong, nullable) NSNumber *mutedToSet;
 @property (nonatomic, strong, nullable) NSArray<NSString *> *testDeviceIdentifiersToSet;
 @property (nonatomic, strong, nullable) NSNumber *verboseLoggingToSet;
 @property (nonatomic, strong, nullable) NSNumber *creativeDebuggerEnabledToSet;
@@ -225,58 +226,65 @@ RCT_EXPORT_METHOD(initialize:(NSString *)pluginVersion :(NSString *)sdkKey :(RCT
     }
     
     ALSdkSettings *settings = [[ALSdkSettings alloc] init];
-
+    
     // Selective init
     if ( self.initializationAdUnitIdentifiersToSet )
     {
         settings.initializationAdUnitIdentifiers = self.initializationAdUnitIdentifiersToSet;
         self.initializationAdUnitIdentifiersToSet = nil;
     }
-
+    
     // Deprecated consent flow which automatically moves to the new flow
     if ( self.consentFlowEnabledToSet )
     {
         settings.consentFlowSettings.enabled = self.consentFlowEnabledToSet.boolValue;
         self.consentFlowEnabledToSet = nil;
-
+        
         if ( self.privacyPolicyURLToSet )
         {
             settings.consentFlowSettings.privacyPolicyURL = self.privacyPolicyURLToSet;
             self.privacyPolicyURLToSet = nil;
         }
-
+        
         if (self.termsOfServiceURLToSet )
         {
             settings.consentFlowSettings.termsOfServiceURL = self.termsOfServiceURLToSet;
             self.termsOfServiceURLToSet = nil;
         }
     }
-
+    
     // New terms and privacy policy flow
     if ( self.termsAndPrivacyPolicyFlowEnabledToSet )
     {
         settings.termsAndPrivacyPolicyFlowSettings.enabled = self.termsAndPrivacyPolicyFlowEnabledToSet.boolValue;
         self.termsAndPrivacyPolicyFlowEnabledToSet = nil;
-
+        
         if ( self.privacyPolicyURLToSet )
         {
             settings.termsAndPrivacyPolicyFlowSettings.privacyPolicyURL = self.privacyPolicyURLToSet;
             self.privacyPolicyURLToSet = nil;
         }
-
+        
         if ( self.termsOfServiceURLToSet )
         {
             settings.termsAndPrivacyPolicyFlowSettings.termsOfServiceURL = self.termsOfServiceURLToSet;
             self.termsOfServiceURLToSet = nil;
         }
-
+        
         if ( self.debugUserGeographyToSet )
         {
             settings.termsAndPrivacyPolicyFlowSettings.debugUserGeography = [self toAppLovinConsentFlowUserGeography: self.debugUserGeographyToSet];
             self.debugUserGeographyToSet = nil;
         }
     }
-
+    
+    // Set muted if needed
+    if ( self.mutedToSet )
+    {
+        settings.muted = self.mutedToSet;
+        self.mutedToSet = nil;
+    }
+    
     // Set test device ids if needed
     if ( self.testDeviceIdentifiersToSet )
     {
@@ -306,7 +314,7 @@ RCT_EXPORT_METHOD(initialize:(NSString *)pluginVersion :(NSString *)sdkKey :(RCT
     }
     
     [self setPendingExtraParametersIfNeeded: settings];
-
+    
     // Initialize SDK
     self.sdk = [ALSdk sharedWithKey: sdkKey settings: settings];
     [self.sdk setPluginVersion: [@"React-Native-" stringByAppendingString: pluginVersion]];
@@ -438,9 +446,15 @@ RCT_EXPORT_METHOD(setUserId:(NSString *)userId)
 
 RCT_EXPORT_METHOD(setMuted:(BOOL)muted)
 {
-    if ( ![self isPluginInitialized] ) return;
-    
-    self.sdk.settings.muted = muted;
+    if ( [self isPluginInitialized] )
+    {
+        self.sdk.settings.muted = muted;
+        self.mutedToSet = nil;
+    }
+    else
+    {
+        self.mutedToSet = @(muted);
+    }
 }
 
 RCT_EXPORT_METHOD(isMuted:(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject)
@@ -834,10 +848,11 @@ RCT_EXPORT_METHOD(setBannerExtraParameter:(NSString *)adUnitIdentifier :(NSStrin
     [self setAdViewExtraParameterForAdUnitIdentifier: adUnitIdentifier adFormat: DEVICE_SPECIFIC_ADVIEW_AD_FORMAT key: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setBannerLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
-{    
+{
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     [self setAdViewLocalExtraParameterForAdUnitIdentifier: adUnitIdentifier adFormat: DEVICE_SPECIFIC_ADVIEW_AD_FORMAT key: key value: value];
 }
@@ -949,14 +964,15 @@ RCT_EXPORT_METHOD(updateMRecPosition:(NSString *)mrecPosition :(NSString *)adUni
 }
 
 RCT_EXPORT_METHOD(setMRecExtraParameter:(NSString *)adUnitIdentifier :(NSString *)key :(nullable NSString *)value)
-{   
+{
     [self setAdViewExtraParameterForAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec key: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setMRecLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
 {
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     [self setAdViewLocalExtraParameterForAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec key: key value: value];
 }
@@ -1067,10 +1083,11 @@ RCT_EXPORT_METHOD(setInterstitialExtraParameter:(NSString *)adUnitIdentifier :(N
     [interstitial setExtraParameterForKey: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setInterstitialLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
 {
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     MAInterstitialAd *interstitial = [self retrieveInterstitialForAdUnitIdentifier: adUnitIdentifier];
     [interstitial setLocalExtraParameterForKey: key value: value];
@@ -1127,10 +1144,11 @@ RCT_EXPORT_METHOD(setRewardedAdExtraParameter:(NSString *)adUnitIdentifier :(NSS
     [rewardedAd setExtraParameterForKey: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setRewardedAdLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
 {
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     MARewardedAd *rewardedAd = [self retrieveRewardedAdForAdUnitIdentifier: adUnitIdentifier];
     [rewardedAd setLocalExtraParameterForKey: key value: value];
@@ -1187,10 +1205,11 @@ RCT_EXPORT_METHOD(setAppOpenAdExtraParameter:(NSString *)adUnitIdentifier key:(N
     [appOpenAd setExtraParameterForKey: key value: value];
 }
 
+// NOTE: Even though iOS is ok with `id` generic types, Android is not - so we wrap it via JSON/ReadableMap
 RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :(NSDictionary<NSString *, id> *)parameterDict)
 {
     NSString *key = parameterDict.allKeys.firstObject;
-    id value = parameterDict.allValues.firstObject;
+    id value = parameterDict.allValues.firstObject != [NSNull null] ? parameterDict.allValues.firstObject : nil;
     
     MAAppOpenAd *appOpenAd = [self retrieveAppOpenAdForAdUnitIdentifier: adUnitIdentifier];
     [appOpenAd setLocalExtraParameterForKey: key value: value];
@@ -2060,7 +2079,7 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     {
         return ALConsentFlowUserGeographyOther;
     }
-
+    
     return ALConsentFlowUserGeographyUnknown;
 }
 
@@ -2074,7 +2093,7 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     {
         return USER_GEOGRAPHY_OTHER;
     }
-
+    
     return USER_GEOGRAPHY_UNKNOWN;
 }
 
@@ -2096,7 +2115,7 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     {
         return APP_TRACKING_STATUS_AUTHORIZED;
     }
-
+    
     return APP_TRACKING_STATUS_UNAVAILABLE;
 }
 
@@ -2209,6 +2228,59 @@ RCT_EXPORT_METHOD(setAppOpenAdLocalExtraParameter:(NSString *)adUnitIdentifier :
     return networkResponseDict;
 }
 
+#pragma mark - Amazon
+
+- (void)setAmazonResult:(id)result forBannerAdUnitIdentifier:(NSString *)adUnitIdentifier
+{
+    [self setAmazonResult: result forAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.banner];
+}
+
+- (void)setAmazonResult:(id)result forMRecAdUnitIdentifier:(NSString *)adUnitIdentifier
+{
+    [self setAmazonResult: result forAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.mrec];
+}
+
+- (void)setAmazonResult:(id)result forInterstitialAdUnitIdentifier:(NSString *)adUnitIdentifier
+{
+    [self setAmazonResult: result forAdUnitIdentifier: adUnitIdentifier adFormat: MAAdFormat.interstitial];
+}
+
+- (void)setAmazonResult:(id /* DTBAdResponse or DTBAdErrorInfo */)result forAdUnitIdentifier:(NSString *)adUnitIdentifier adFormat:(MAAdFormat *)adFormat
+{
+    if ( !self.sdk )
+    {
+        NSString *errorMessage = [NSString stringWithFormat: @"Failed to set Amazon result - SDK not initialized: %@", adUnitIdentifier];
+        [self logUninitializedAccessError: errorMessage];
+        
+        return;
+    }
+    
+    if ( !result )
+    {
+        [self log: @"Failed to set Amazon result - nil value"];
+        return;
+    }
+    
+    NSString *key = [self localExtraParameterKeyForAmazonResult: result];
+    
+    if ( adFormat == MAAdFormat.interstitial )
+    {
+        MAInterstitialAd *interstitial = [self retrieveInterstitialForAdUnitIdentifier: adUnitIdentifier];
+        [interstitial setLocalExtraParameterForKey: key value: result];
+    }
+    else
+    {
+        MAAdView *adView = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
+        [adView setLocalExtraParameterForKey: key value: result];
+    }
+}
+
+- (NSString *)localExtraParameterKeyForAmazonResult:(id /* DTBAdResponse or DTBAdErrorInfo */)result
+{
+    NSString *className = NSStringFromClass([result class]);
+    return [@"DTBAdResponse" isEqualToString: className] ? @"amazon_ad_response" : @"amazon_ad_error";
+}
+
 #pragma mark - React Native Event Bridge
 
 - (void)sendReactNativeEventWithName:(NSString *)name body:(NSDictionary<NSString *, id> *)body

package/ios/AppLovinMAX.xcworkspace/xcuserdata/thomasso.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "8322C692-8067-489C-89A1-217F139F4039"
+   type = "0"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1DACA5BD-D4D2-4CD6-BEFD-D951963D77E1"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "AppLovinMAX.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1304"
+            endingLineNumber = "1304"
+            landmarkName = "-positionAdViewForAdUnitIdentifier:adFormat:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>

package/ios/AppLovinMAXAdView.m

@@ -176,7 +176,8 @@
         
         for ( NSString *key in self.localExtraParameters )
         {
-            [self.adView setLocalExtraParameterForKey: key value: self.localExtraParameters[key]];
+            id value = self.localExtraParameters[key];
+            [self.adView setLocalExtraParameterForKey: key value: (value != [NSNull null] ? value : nil)];
         }
         
         if ( [self isAutoRefresh] )

package/ios/AppLovinMAXNativeAdView.m

@@ -31,6 +31,7 @@
 @property (nonatomic, strong, nullable) MANativeAdLoader *adLoader;
 @property (nonatomic, strong, nullable) MAAd *nativeAd;
 @property (nonatomic, strong) ALAtomicBoolean *isLoading; // Guard against repeated ad loads
+@property (nonatomic, strong) ALAtomicBoolean *isAdUnitIdSet;
 
 // JavaScript properties
 @property (nonatomic, copy) NSString *adUnitId;
@@ -59,6 +60,7 @@
     {
         self.bridge = bridge;
         self.isLoading = [[ALAtomicBoolean alloc] init];
+        self.isAdUnitIdSet = [[ALAtomicBoolean alloc] init];
         self.clickableViews = [NSMutableArray array];
     }
     return self;
@@ -95,10 +97,7 @@
     
     _adUnitId = adUnitId;
     
-    // Explicitly invoke ad load now that Ad Unit ID is set, but do so after 0.25s to allow other props to set
-    dispatchOnMainQueueAfter(0.25, ^{
-        [self loadAd];
-    });
+    [self.isAdUnitIdSet set: YES];
 }
 
 // Called when Ad Unit ID is set, and via RN layer
@@ -124,7 +123,8 @@
         
         for ( NSString *key in self.localExtraParameters )
         {
-            [self.adLoader setLocalExtraParameterForKey: key value: self.localExtraParameters[key]];
+            id value = self.localExtraParameters[key];
+            [self.adLoader setLocalExtraParameterForKey: key value: (value != [NSNull null] ? value : nil)];
         }
         
         [self.adLoader loadAd];
@@ -267,6 +267,26 @@
     [self.nativeAd.nativeAd.mediaView al_pinToSuperview];
 }
 
+/**
+ * Invoked:
+ * 1. after all the JavaScript properties are set when mounting NativeAdView
+ * 2. after all the user's asset views are mounted, following the 1st event
+ */
+- (void)didSetProps:(NSArray<NSString *> *)changedProps
+{
+    if ( [self.isAdUnitIdSet compareAndSet:YES update: NO] )
+    {
+        [self loadAd];
+    }
+    else
+    {
+        if ( !self.adLoader ) return;     
+
+        [self.adLoader registerClickableViews: self.clickableViews withContainer: self forAd: self.nativeAd];
+        [self.adLoader handleNativeAdViewRenderedForAd: self.nativeAd];
+    }
+}
+
 #pragma mark - Ad Loader Delegate
 
 - (void)didLoadNativeAd:(nullable MANativeAdView *)nativeAdView forAd:(MAAd *)ad
@@ -291,14 +311,7 @@
     // Notify `AppLovinNativeAdView.js`
     [self sendAdLoadedReactNativeEventForAd: ad.nativeAd];
     
-    // After notifying the RN layer - have slight delay to let views bind to this layer in `clickableViews` before registering
-    dispatchOnMainQueueAfter(0.5, ^{
-        
-        [self.adLoader registerClickableViews: self.clickableViews withContainer: self forAd: ad];
-        [self.adLoader handleNativeAdViewRenderedForAd: ad];
-        
-        [self.isLoading set: NO];
-    });
+    [self.isLoading set: NO];
 }
 
 - (void)sendAdLoadedReactNativeEventForAd:(MANativeAd *)ad

package/ios/Podfile

@@ -35,6 +35,6 @@ target 'AppLovinMAX' do
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
-  pod 'AppLovinSDK', '12.0.0'
+  pod 'AppLovinSDK', '12.1.0'
 
 end

package/ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - AppLovinSDK (12.0.0)
+  - AppLovinSDK (12.1.0)
   - boost-for-react-native (1.63.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.5)
@@ -249,7 +249,7 @@ PODS:
   - Yoga (1.14.0)
 
 DEPENDENCIES:
-  - AppLovinSDK (= 12.0.0)
+  - AppLovinSDK (= 12.1.0)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
@@ -339,7 +339,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  AppLovinSDK: 15679e9f576a4d8662e1dc537c9a4ed47d3292a5
+  AppLovinSDK: 179d509c258e01a3a77eb8416f0ba843a12ed322
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 352a8ca9bbc8e2f097d680747a8c97ecef12d469
@@ -368,6 +368,6 @@ SPEC CHECKSUMS:
   ReactCommon: b9ff54b6dd22ba4a776eda22d7f83ec27544ca35
   Yoga: 0276e9f20976c8568e107cfc1163a8629051adc0
 
-PODFILE CHECKSUM: dc95f857ab3004d6fc04e845d974091e28859c7b
+PODFILE CHECKSUM: d7248805481768209533def6ca165110984d9914
 
 COCOAPODS: 1.11.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-applovin-max",
   "author": "AppLovin Corporation",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "AppLovin MAX React Native Plugin for Android and iOS",
   "homepage": "https://github.com/AppLovin/AppLovin-MAX-React-Native",
   "license": "MIT",

package/react-native-applovin-max.podspec

@@ -11,10 +11,10 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => "10.0" }
-  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_6_1_0" }
+  s.source       = { :git => "https://github.com/AppLovin/AppLovin-MAX-React-Native.git", :tag => "release_6_2_0" }
   
   s.source_files  = "ios/AppLovinMAX*.{h,m}"
 
   s.dependency "React"
-  s.dependency "AppLovinSDK", "12.0.0"
+  s.dependency "AppLovinSDK", "12.1.0"
 end

package/src/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/src.iml" filepath="$PROJECT_DIR$/.idea/src.iml" />
+    </modules>
+  </component>
+</project>

package/src/.idea/src.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/src/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

package/src/AppLovinMAX.ts

@@ -4,7 +4,7 @@ import type { Configuration } from './types/Configuration';
 
 const NativeAppLovinMAX = NativeModules.AppLovinMAX;
 
-const VERSION = '6.1.0';
+const VERSION = '6.2.0';
 
 const initialize = async (sdkKey: string): Promise<Configuration> => {
     return NativeAppLovinMAX.initialize(VERSION, sdkKey);