apps-sdk 2.0.8 → 2.1.0

package/index.js

@@ -1,4 +1,4 @@
-import {NotificationsPush, Networking, Storage, Session, Utils, PayWallLogic, Rating, AdJust, TrackingTransparency, Voice, MixPanel, Adapty, HomeActions, Facebook, Legal} from "./src/libraries";
+import {NotificationsPush, Networking, Storage, Session, Utils, PayWallLogic, Rating, AdJust, TrackingTransparency, Voice, MixPanel, Adapty, HomeActions, Facebook, Firebase, Legal} from "./src/libraries";
 // import PayWall from "./src/components/PayWall"; // DEPRECATED: Use SDK.adaptyOnboarding or SDK.adapty.showPaywall() instead
 import AdaptyOnboarding from "./src/components/AdaptyOnboarding";
 
@@ -63,5 +63,6 @@ export default {
     adapty:                      Adapty,
     homeActions:                 HomeActions,
     facebook:                    Facebook,
+    firebase:                    Firebase,
     legal:                       Legal,
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "apps-sdk",
-  "version": "2.0.8",
-  "description": "Apps SDK - Compatible with Expo SDK 54 + React 19",
+  "version": "2.1.0",
+  "description": "Apps SDK - Compatible with Expo SDK 54 + React 19 - Firebase optional",
   "main": "index.js",
   "author": "ASD",
   "license": "ISC",
@@ -36,6 +36,10 @@
     "react-native-btr": "^2.2.1",
     "semver": "^7.6.0"
   },
+  "optionalDependencies": {
+    "@react-native-firebase/analytics": "^21.10.0",
+    "@react-native-firebase/app": "^21.10.0"
+  },
   "devDependencies": {
     "expo": "~54.0.0",
     "expo-asset": "~12.0.0",

package/src/libraries/Adapty.js

@@ -4,6 +4,11 @@ import {Session} from "./index";
 import {createPaywallView, createOnboardingView} from "react-native-adapty/dist/ui";
 
 class Adapty {
+    constructor() {
+        this.currentPaywallView = null;
+        this.currentOnboardingView = null;
+    }
+
     async initialize(apiKey = null) {
         try {
             const isActivated = await this.isActivated();
@@ -64,6 +69,8 @@ class Adapty {
                     return;
                 }
 
+                this.currentPaywallView = paywallView;
+
                 paywallView.setEventHandlers({
                     onCloseButtonPress: eventHandlers.onCloseButtonPress || (() => { return true; }),
                     onAndroidSystemBack: eventHandlers.onAndroidSystemBack || (() => { paywallView.dismiss(); return true; }),
@@ -115,12 +122,12 @@ class Adapty {
     }
 
     async closePaywall() {
-        const paywallView = await adapty.getCurrentPaywallView();
         try {
-            if (paywallView) {
-                paywallView.dismiss();
+            if (this.currentPaywallView) {
+                await this.currentPaywallView.dismiss();
+                this.currentPaywallView = null;
             } else {
-                console.warn('Error closing paywall: paywall view is null');
+                console.warn('Error closing paywall: no paywall view reference stored');
             }
         } catch (error) {
             console.error('Error closing paywall:', error);
@@ -142,6 +149,8 @@ class Adapty {
     async showPaywallPreloaded(paywallView, eventHandlers = {}) {
         try {
             if (paywallView) {
+                this.currentPaywallView = paywallView;
+                
                 paywallView.setEventHandlers({
                     onCloseButtonPress: eventHandlers.onCloseButtonPress || (() => { return true; }),
                     onAndroidSystemBack: eventHandlers.onAndroidSystemBack || (() => { paywallView.dismiss(); return true; }),
@@ -231,6 +240,9 @@ class Adapty {
             config.DEBUG_MODE && console.log('Getting onboarding for placement:', placementID, 'and language:', lang, 'onboarding:', onboarding);
             if (onboarding) {
                 const onboardingView = await this.createOnboardingView(onboarding);
+                
+                this.currentOnboardingView = onboardingView;
+                
                 onboardingView.setEventHandlers({
                     onAnalytics: eventHandlers.onAnalytics || (() => { }),
                     onClose: eventHandlers.onClose || (async (actionId, meta) => { await onboardingView.dismiss(); return true; }),
@@ -256,12 +268,12 @@ class Adapty {
 
 
     async closeOnboarding() {
-        const onboardingView = await adapty.getCurrentOnboardingView();
         try {
-            if (onboardingView) {
-                onboardingView.dismiss();
+            if (this.currentOnboardingView) {
+                await this.currentOnboardingView.dismiss();
+                this.currentOnboardingView = null;
             } else {
-                console.warn('Error closing onboarding: onboarding view is null');
+                console.warn('Error closing onboarding: no onboarding view reference stored');
             }
         } catch (error) {
             console.error('Error closing onboarding:', error);
@@ -271,6 +283,8 @@ class Adapty {
     async showOnboardingPreloaded(onboardingView, eventHandlers = {}) {
         try {
             if (onboardingView) {
+                this.currentOnboardingView = onboardingView;
+                
                 onboardingView.setEventHandlers({
                     onAnalytics: eventHandlers.onAnalytics || (() => { }),
                     onClose: eventHandlers.onClose || (async (actionId, meta) => { await onboardingView.dismiss(); return true; }),

package/src/libraries/Firebase.js

@@ -1,51 +1,87 @@
-import analytics from '@react-native-firebase/analytics';
 import config from '../../config';
 
+// Lazy load Firebase (optional dependency)
+let analyticsModule = null;
+let isAvailable = null;
+
+function getAnalytics() {
+    if (isAvailable === false) return null;
+    
+    if (analyticsModule === null && isAvailable === null) {
+        try {
+            analyticsModule = require('@react-native-firebase/analytics').default;
+            isAvailable = true;
+        } catch {
+            isAvailable = false;
+        }
+    }
+    
+    return analyticsModule;
+}
+
 class Firebase {
+    isAvailable() {
+        return getAnalytics() !== null;
+    }
+
     async initialize() {
+        const analytics = getAnalytics();
+        if (!analytics) return;
+        
         try {
-            // Firebase should already be initialized by the app
-            config.DEBUG_MODE && console.log('Firebase Analytics is ready to use');
+            config.DEBUG_MODE && console.log('[SDK] Firebase Analytics initialized');
         } catch (error) {
-            console.error('Error initializing Firebase:', error);
+            console.error('[SDK] Error initializing Firebase:', error);
         }
     }
 
     async getAppInstanceId() {
+        const analytics = getAnalytics();
+        if (!analytics) return null;
+        
         try {
             const appInstanceId = await analytics().getAppInstanceId();
-            config.DEBUG_MODE && console.log('Firebase App Instance ID:', appInstanceId);
+            config.DEBUG_MODE && console.log('[SDK] Firebase App Instance ID:', appInstanceId);
             return appInstanceId;
         } catch (error) {
-            console.error('Error getting Firebase App Instance ID:', error);
+            console.error('[SDK] Error getting Firebase App Instance ID:', error);
             return null;
         }
     }
 
     async logEvent(eventName, params = {}) {
+        const analytics = getAnalytics();
+        if (!analytics) return;
+        
         try {
             await analytics().logEvent(eventName, params);
-            config.DEBUG_MODE && console.log('Firebase event logged:', eventName, params);
+            config.DEBUG_MODE && console.log('[SDK] Firebase event logged:', eventName, params);
         } catch (error) {
-            console.error('Error logging Firebase event:', error);
+            console.error('[SDK] Error logging Firebase event:', error);
         }
     }
 
     async setUserId(userId) {
+        const analytics = getAnalytics();
+        if (!analytics) return;
+        
         try {
             await analytics().setUserId(userId);
-            config.DEBUG_MODE && console.log('Firebase user ID set:', userId);
+            config.DEBUG_MODE && console.log('[SDK] Firebase user ID set:', userId);
         } catch (error) {
-            console.error('Error setting Firebase user ID:', error);
+            console.error('[SDK] Error setting Firebase user ID:', error);
         }
     }
 
     async setUserProperty(name, value) {
+        const analytics = getAnalytics();
+        if (!analytics) return;
+        
         try {
             await analytics().setUserProperty(name, value);
-            config.DEBUG_MODE && console.log('Firebase user property set:', name, value);
+            config.DEBUG_MODE && console.log('[SDK] Firebase user property set:', name, value);
         } catch (error) {
-            console.error('Error setting Firebase user property:', error);
+            console.error('[SDK] Error setting Firebase user property:', error);
         }
     }
 }