apps-sdk 1.1.68 → 1.1.70

package/index.js

@@ -1,5 +1,6 @@
 import {NotificationsPush, Networking, Storage, Session, Utils, PayWallLogic, Rating, AdJust, TrackingTransparency, Voice, MixPanel, Adapty, HomeActions, Facebook, Legal} from "./src/libraries";
 import PayWall from "./src/components/PayWall";
+import AdaptyOnboarding from "./src/components/AdaptyOnboarding";
 
 class AppsSDK {
     constructor() {
@@ -56,10 +57,11 @@ export default {
     mixpanel:                    MixPanel,
     tracking:                    TrackingTransparency,
     paywall:                     PayWall,
+    adaptyOnboarding:            AdaptyOnboarding,
     notifications:               NotificationsPush,
     voice:                       Voice,
     adapty:                      Adapty,
     homeActions:                 HomeActions,
     facebook:                    Facebook,
     legal:                       Legal,
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.1.68",
+  "version": "1.1.70",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {

package/src/components/AdaptyOnboarding.js

@@ -0,0 +1,214 @@
+import React from 'react';
+import { Modal } from 'react-native';
+import { AdaptyOnboardingView } from 'react-native-adapty/dist/ui';
+import { View } from "react-native";
+import Adapty from '../libraries/Adapty';
+import * as config from '../../config';
+
+class AdaptyOnboarding extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            onboarding: null,
+            isLoading: true,
+        };
+        this.remoteConfig = null;
+        this.currentStep = 0;
+        this.totalSteps = 0;
+    }
+
+    componentDidMount() {
+        const { preloadedOnboarding, placementID, lang } = this.props;
+
+        // If preloaded onboarding is provided, use it immediately (no loading screen!)
+        if (preloadedOnboarding) {
+            console.log('[ONBOARDING] Using preloaded onboarding data - skipping load');
+            this.remoteConfig = preloadedOnboarding.remoteConfig || {};
+
+            if (this.props.onRemoteConfigLoaded && this.remoteConfig) {
+                config.DEBUG_MODE && console.log('Remote config loaded from preload:', this.remoteConfig);
+                this.props.onRemoteConfigLoaded(this.remoteConfig);
+            }
+
+            this.setState({ onboarding: preloadedOnboarding, isLoading: false });
+        } else {
+            // Fallback to loading if not preloaded
+            console.log('[ONBOARDING] No preloaded data, loading normally');
+            this.loadOnboarding(placementID, lang);
+        }
+    }
+
+    async componentDidUpdate(prevProps) {
+        if (this.props.visible && !prevProps.visible) {
+            const { placementID, lang } = this.props;
+            await this.loadOnboarding(placementID, lang);
+        }
+        if (!this.props.visible && prevProps.visible) {
+            this.handleModalDismiss();
+        }
+    }
+
+    loadOnboarding = async (placementID, lang) => {
+        try {
+            this.setState({ isLoading: true });
+            const onboarding = await Adapty.getOnboardingForPlacement(placementID, lang);
+
+            if (onboarding) {
+                this.remoteConfig = onboarding.remoteConfig || {};
+
+                if (this.props.onRemoteConfigLoaded && this.remoteConfig) {
+                    config.DEBUG_MODE && console.log('Remote config loaded:', this.remoteConfig);
+                    this.props.onRemoteConfigLoaded(this.remoteConfig);
+                }
+
+                this.setState({ onboarding, isLoading: false });
+            } else {
+                console.log('Onboarding not found for placement:', placementID, 'and language:', lang);
+                this.setState({ isLoading: false });
+                if (this.props.onError) {
+                    this.props.onError(new Error('Onboarding not found'), this.remoteConfig);
+                }
+            }
+        } catch (error) {
+            console.log('Error loading onboarding:', error);
+            this.setState({ isLoading: false });
+            if (this.props.onError) {
+                this.props.onError(error, this.remoteConfig);
+            }
+        }
+    }
+
+    //  --------------------------------------- Event Handlers ---------------------------------------
+    handleCustom = (actionId, meta) => {
+        config.DEBUG_MODE && console.log('Onboarding custom AdaptyOnboarding:', actionId, meta);
+
+        if (this.props.onCustom) {
+            this.props.onCustom(actionId, meta, this.remoteConfig);
+        }
+    }
+
+    handleClose = (actionId, meta) => {
+        const isLastStep = this.totalSteps > 0 && this.currentStep === this.totalSteps - 1;
+
+        config.DEBUG_MODE && console.log('Onboarding close attempt AdaptyOnboarding:', {actionId, meta, currentStep: this.currentStep, totalSteps: this.totalSteps, isLastStep });
+
+        if (this.props.onClose) {
+            this.props.onClose(actionId, meta, this.remoteConfig);
+        }
+
+        return true;
+    }
+
+    handleModalDismiss = () => {
+        config.DEBUG_MODE && console.log('AdaptyOnboarding Modal fully dismissed');
+
+        // Reset state after modal is fully dismissed
+        this.currentStep = 0;
+        this.totalSteps = 0;
+
+        // Notify parent that modal is fully closed
+        if (this.props.onModalDismissed) {
+            this.props.onModalDismissed();
+        }
+    }
+
+    handleStateUpdated = (action, meta) => {
+        if (meta && typeof meta === 'object') {
+            this.currentStep = meta.screen_index ?? this.currentStep;
+            this.totalSteps = meta.total_screens ?? this.totalSteps;
+
+            config.DEBUG_MODE && console.log('State updated AdaptyOnboarding:', {action, meta, currentStep: this.currentStep, totalSteps: this.totalSteps});
+        }
+
+        if (this.props.onStateUpdated) {
+            this.props.onStateUpdated(action, meta, this.remoteConfig);
+        }
+    }
+
+    handleError = (error) => {
+        console.log('Onboarding error:', error);
+
+        // Check if it's a WebResource ORB error (common on Android)
+        const isORBError = error?.message?.includes('ERR_BLOCKED_BY_ORB');
+
+        if (isORBError) {
+            config.DEBUG_MODE && console.log('WebResource ORB error detected - non-critical, continuing');
+            // Don't propagate ORB errors as they don't break functionality
+            return false; // Continue
+        }
+
+        if (this.props.onError) {
+            this.props.onError(error, this.remoteConfig);
+        }
+        return true;
+    }
+
+    handleAnalytics = (event, data) => {
+        config.DEBUG_MODE && console.log('Onboarding analytics AdaptyOnboarding:', event, data);
+
+        if (this.props.onAnalytics) {
+            this.props.onAnalytics(event, data, this.remoteConfig);
+        }
+    }
+
+    handlePaywall = (actionId, meta) => {
+        config.DEBUG_MODE && console.log('Onboarding paywall AdaptyOnboarding:', actionId, meta);
+
+        if (this.props.onPaywall) {
+            this.props.onPaywall(actionId, meta, this.remoteConfig);
+        }
+    }
+
+    handleFinishedLoading = (meta) => {
+        config.DEBUG_MODE && console.log('Onboarding finished loading AdaptyOnboarding:', meta);
+
+        if (this.props.onFinishedLoading) {
+            this.props.onFinishedLoading(meta, this.remoteConfig);
+        }
+    }
+    //  --------------------------------------- Event Handlers ---------------------------------------
+
+    render() {
+        const { visible } = this.props;
+        const { onboarding, isLoading } = this.state;
+
+        if (!visible) {
+            return null;
+        }
+
+        const content = (
+            <View style={styles.container}>
+                {!isLoading && onboarding ? (
+                    <AdaptyOnboardingView
+                        onboarding={onboarding}
+                        style={styles.onboardingView}
+                        eventHandlers={{
+                            onAnalytics: this.handleAnalytics,
+                            onClose: this.handleClose,
+                            onCustom: this.handleCustom,
+                            onPaywall: this.handlePaywall,
+                            onStateUpdated: this.handleStateUpdated,
+                            onFinishedLoading: this.handleFinishedLoading,
+                            onError: this.handleError,
+                        }}
+                    />
+                ) : null}
+            </View>
+        );
+
+        return content;
+    }
+}
+
+const styles = {
+    container: {
+        backgroundColor: '#000',
+        width: '100%',
+        height: '100%',
+    },
+    onboardingView: {
+        flex: 1,
+    },
+}
+
+export default AdaptyOnboarding;

package/src/libraries/Adapty.js

@@ -59,6 +59,11 @@ class Adapty {
             config.DEBUG_MODE && console.log('Getting paywall for placement:', placementID, 'and language:', lang, 'paywall:', paywall);
             if (paywall) {
                 const paywallView = await this.createPaywallView(paywall);
+
+                if (!paywallView) {
+                    return;
+                }
+
                 paywallView.registerEventHandlers({
                     onCloseButtonPress: eventHandlers.onCloseButtonPress || (() => { return true; }),
                     onAndroidSystemBack: eventHandlers.onAndroidSystemBack || (() => { paywallView.dismiss(); return true; }),
@@ -75,14 +80,11 @@ class Adapty {
                     onCustomAction: eventHandlers.onCustomAction || (() => {  }),
                 });
                 await paywallView.present();
-                return paywallView;
             } else {
                 console.warn('Error showing paywall: paywall not found for placement', placementID, 'and language', lang);
-                return null;
             }
         } catch (error) {
             console.error('Error showing paywall:', error);
-            return null;
         }
     }
 
@@ -104,9 +106,11 @@ class Adapty {
                 }
             } else {
                 console.warn('Error preloading paywall: paywall not found for placement', placementID, 'and language', lang);
+                return null;
             }
         } catch (error) {
             console.error('Error preloading paywall:', error);
+            return null;
         }
     }
 
@@ -295,4 +299,4 @@ class Adapty {
     }
 }
 
-export default new Adapty();
+export default new Adapty();

package/types/index.d.ts

@@ -1,6 +1,6 @@
 declare module 'apps-sdk' {
     import { Component } from 'react';
-    import {SpeechResultsEvent} from "@react-native-voice/voice";
+    import { SpeechResultsEvent } from "@react-native-voice/voice";
 
     export interface SessionData {
         app: {
@@ -213,15 +213,34 @@ declare module 'apps-sdk' {
     };
 
     type OnboardingEventHandlers = {
-        onAnalytics?: (event: any, meta: any) => void;
-        onClose?: (actionId: string, meta: any) => Promise<boolean> | boolean;
-        onCustom?: (actionId: string, meta: any) => void;
-        onPaywall?: (actionId: string, meta: any) => void;
-        onStateUpdated?: (action: any, meta: any) => void;
-        onFinishedLoading?: (meta: any) => void;
-        onError?: (error: any) => void;
+        onAnalytics?: (event: any, meta: any, remoteConfig?: any) => void;
+        onClose?: (actionId: string, meta: any, remoteConfig?: any) => Promise<boolean> | boolean;
+        onCustom?: (actionId: string, meta: any, remoteConfig?: any) => void;
+        onPaywall?: (actionId: string, meta: any, remoteConfig?: any) => void;
+        onStateUpdated?: (action: any, meta: any, remoteConfig?: any) => void;
+        onFinishedLoading?: (meta: any, remoteConfig?: any) => void;
+        onError?: (error: any, remoteConfig?: any) => void;
+        onRemoteConfigLoaded?: (remoteConfig: any) => void;
+        onModalDismissed?: () => void;
     };
 
+    export interface AdaptyOnboardingProps {
+        visible: boolean;
+        placementID: string;
+        lang: string;
+        onAnalytics?: (event: any, meta: any, remoteConfig?: any) => void;
+        onClose?: (actionId: string, meta: any, remoteConfig?: any) => Promise<boolean> | boolean;
+        onCustom?: (actionId: string, meta: any, remoteConfig?: any) => void;
+        onPaywall?: (actionId: string, meta: any, remoteConfig?: any) => void;
+        onStateUpdated?: (action: any, meta: any, remoteConfig?: any) => void;
+        onFinishedLoading?: (meta: any, remoteConfig?: any) => void;
+        onError?: (error: any, remoteConfig?: any) => boolean | void;
+        onRemoteConfigLoaded?: (remoteConfig: any) => void;
+        onModalDismissed?: () => void;
+    }
+
+    export class AdaptyOnboarding extends Component<AdaptyOnboardingProps, {}> { }
+
     export class Adapty {
         initialize(apiKey: string): Promise<void>;
         getPaywallForPlacement(placementID: string, lang: string): Promise<any>;
@@ -284,6 +303,7 @@ declare module 'apps-sdk' {
         session             : Session;
         utils               : Utils;
         paywall             : PayWall;
+        adaptyOnboarding    : typeof AdaptyOnboarding;
         rating              : Rating;
         adjust              : AdJust;
         mixpanel            : MixPanel;
@@ -299,4 +319,4 @@ declare module 'apps-sdk' {
 
     const Core: AppsSDK;
     export default Core;
-}
+}