react-native-insider 8.1.0 → 9.0.0

package/android/src/main/java/com/useinsider/react/RNInsiderPackage.java

@@ -25,8 +25,12 @@ public class RNInsiderPackage implements ReactPackage {
         return Collections.emptyList();
     }
 
+    // Without this entry Fabric has no ViewManager for InsiderAppFrameView and it never renders.
+    // RNInsiderAppFrameViewManager needs an Insider SDK that ships App Frames to compile at all.
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Collections.emptyList();
+        List<ViewManager> viewManagers = new ArrayList<>();
+        viewManagers.add(new RNInsiderAppFrameViewManager());
+        return viewManagers;
     }
 }

package/android/src/main/java/com/useinsider/react/RNUtils.java

@@ -17,10 +17,12 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 public class RNUtils {
@@ -37,6 +39,115 @@ public class RNUtils {
         return writableMap;
     }
 
+    /**
+     * Recursively converts a {@code Map<String, Object>} coming from the native SDK into a
+     * {@link WritableMap} for the React Native bridge.
+     *
+     * <p>Unlike {@link #convertMapToWritableMap(HashMap)} — which only accepts
+     * {@code HashMap<String, String>} — this handles the heterogeneous value types the SDK
+     * emits for recorded-event parameters: nested maps, {@link List}s and arrays (including
+     * the {@code String[]} / {@code Number[]} produced by
+     * {@code addParameterWithStringArray} / {@code addParameterWithNumericArray}), booleans,
+     * integral and floating point numbers, strings, dates and nulls.
+     *
+     * <p>Following the house style, a failure is reported through
+     * {@code Insider.Instance.putException} and the partial result is returned rather than
+     * throwing back into the SDK's callback thread.
+     */
+    public static WritableMap convertObjectMapToWritableMap(Map<String, Object> map) {
+        WritableMap writableMap = new WritableNativeMap();
+        try {
+            if (map == null) {
+                return writableMap;
+            }
+
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                String key = entry.getKey();
+                if (key == null) continue;
+
+                putObjectIntoWritableMap(writableMap, key, entry.getValue());
+            }
+        } catch (Exception e) {
+            Insider.Instance.putException(e);
+        }
+        return writableMap;
+    }
+
+    /**
+     * Recursively converts a {@link List} or Java array from the native SDK into a
+     * {@link WritableArray}. Element type dispatch matches
+     * {@link #convertObjectMapToWritableMap(Map)}.
+     */
+    public static WritableArray convertObjectListToWritableArray(Object list) {
+        WritableArray writableArray = new WritableNativeArray();
+        try {
+            if (list == null) {
+                return writableArray;
+            }
+
+            if (list instanceof List) {
+                for (Object value : (List<?>) list) {
+                    pushObjectIntoWritableArray(writableArray, value);
+                }
+            } else if (list.getClass().isArray()) {
+                int length = Array.getLength(list);
+                for (int i = 0; i < length; i++) {
+                    pushObjectIntoWritableArray(writableArray, Array.get(list, i));
+                }
+            }
+        } catch (Exception e) {
+            Insider.Instance.putException(e);
+        }
+        return writableArray;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void putObjectIntoWritableMap(WritableMap map, String key, Object value) {
+        if (value == null) {
+            map.putNull(key);
+        } else if (value instanceof Map) {
+            map.putMap(key, convertObjectMapToWritableMap((Map<String, Object>) value));
+        } else if (value instanceof List || value.getClass().isArray()) {
+            map.putArray(key, convertObjectListToWritableArray(value));
+        } else if (value instanceof Boolean) {
+            map.putBoolean(key, (Boolean) value);
+        } else if (value instanceof Integer || value instanceof Short || value instanceof Byte) {
+            map.putInt(key, ((Number) value).intValue());
+        } else if (value instanceof Number) {
+            // Long included: the bridge has no 64-bit integer type, so widen to double.
+            map.putDouble(key, ((Number) value).doubleValue());
+        } else if (value instanceof String) {
+            map.putString(key, (String) value);
+        } else if (value instanceof Date) {
+            map.putDouble(key, ((Date) value).getTime());
+        } else {
+            map.putString(key, value.toString());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void pushObjectIntoWritableArray(WritableArray array, Object value) {
+        if (value == null) {
+            array.pushNull();
+        } else if (value instanceof Map) {
+            array.pushMap(convertObjectMapToWritableMap((Map<String, Object>) value));
+        } else if (value instanceof List || value.getClass().isArray()) {
+            array.pushArray(convertObjectListToWritableArray(value));
+        } else if (value instanceof Boolean) {
+            array.pushBoolean((Boolean) value);
+        } else if (value instanceof Integer || value instanceof Short || value instanceof Byte) {
+            array.pushInt(((Number) value).intValue());
+        } else if (value instanceof Number) {
+            array.pushDouble(((Number) value).doubleValue());
+        } else if (value instanceof String) {
+            array.pushString((String) value);
+        } else if (value instanceof Date) {
+            array.pushDouble(((Date) value).getTime());
+        } else {
+            array.pushString(value.toString());
+        }
+    }
+
     public static WritableArray convertJSONArrayToArray(JSONArray jsonArray) {
         WritableArray array = new WritableNativeArray();
         try {

package/babel.config.js

@@ -1,3 +1,6 @@
+// Single Babel config for Jest and Stryker. It replaces a .babelrc that
+// carried the same preset with enableBabelRuntime: false; keeping one file
+// means every tool resolves the same transform.
 module.exports = {
-  presets: ['@react-native/babel-preset'],
+  presets: [['@react-native/babel-preset', { enableBabelRuntime: false }]],
 };

package/index.d.ts

@@ -3,6 +3,23 @@ import type RNInsiderEvent from './src/InsiderEvent';
 import type RNInsiderUser from './src/InsiderUser';
 import type RNInsiderIdentifier from './src/InsiderIdentifier';
 import type RNInsiderAppCards from './src/InsiderAppCards';
+import type RNInsiderEvents from './src/InsiderEvents';
+
+// App Frames is a React component, so it is a named export rather than a member of RNInsider.
+export { default as InsiderAppFrame } from './src/InsiderAppFrame';
+export type { InsiderAppFrameProps, InsiderAppFrameHandle } from './src/InsiderAppFrame';
+export {
+  InsiderAppFramesError,
+  InsiderAppFramesErrorCode,
+  NO_DISMISS_CODE,
+} from './src/InsiderAppFramesError';
+export type { InsiderAppFramesErrorCodeType } from './src/InsiderAppFramesError';
+export { InsiderAppFrameStatus } from './src/InsiderAppFrameStatus';
+export { isErrorStatus, isLoadingStatus } from './src/InsiderAppFrameLogic';
+export type { InsiderAppFrameStatusType } from './src/InsiderAppFrameStatus';
+
+import type { InsiderAppFramesError as InsiderAppFramesErrorClass } from './src/InsiderAppFramesError';
+import type { InsiderAppFramesErrorCode as InsiderAppFramesErrorCodeEnum } from './src/InsiderAppFramesError';
 
 export type CustomParameters = {
   [key: string]: string | number | boolean | Date | number[] | string[];
@@ -36,6 +53,17 @@ export declare const InsiderAppCardsErrorCode: {
 /** Union type of all possible error code values. */
 export type InsiderAppCardsErrorCodeType = typeof InsiderAppCardsErrorCode[keyof typeof InsiderAppCardsErrorCode];
 
+/**
+ * Recorded-event types. They are defined alongside the `events` module in
+ * `./src/InsiderEvents`, and re-exported here so that consumers can keep importing them
+ * straight from the package root (`import { InsiderEventSubscription } from 'react-native-insider'`).
+ */
+export type {
+  InsiderRecordedEventParameters,
+  InsiderEventRecordedCallback,
+  InsiderEventSubscription,
+} from './src/InsiderEvents';
+
 /**
  * Represents a typed error from an App Cards operation.
  *
@@ -84,167 +112,174 @@ export declare class InsiderAppCardsError extends Error {
   static from(error: { code: string; message: string } | string | unknown): InsiderAppCardsError;
 }
 
-declare module 'react-native-insider' {
-  export interface InsiderCloseButtonPosition {
-    LEFT: string;
-    RIGHT: string;
-    NONE: string;
-  }
-
-  export default class RNInsider {
-    static closeButtonPosition: InsiderCloseButtonPosition;
-    static AppCardsError: typeof InsiderAppCardsError;
-    static AppCardsErrorCode: typeof InsiderAppCardsErrorCode;
-    static init(partnerName: string, appGroup: string, insiderCallback: Function): void;
-    static initWithCustomEndpoint(partnerName: string, appGroup: string, endpoint: string, insiderCallback: Function): void;
-    static reinitWithPartnerName(partnerName: string): void;
-    static tagEvent(name: string): RNInsiderEvent;
-    static getCurrentUser(): RNInsiderUser;
-    static get appCards(): RNInsiderAppCards;
-    static setGDPRConsent(gdprConsent: boolean): void;
-    static setMobileAppAccess(mobileAppAccess: boolean): void;
+// Top level, not `declare module 'react-native-insider'`: this file is already a module, so such
+// a block would be read as an augmentation of itself and never applied.
+export interface InsiderCloseButtonPosition {
+  LEFT: string;
+  RIGHT: string;
+  NONE: string;
+}
 
-    static createNewProduct(
-      productID: string,
-      name: string,
-      taxonomy: Array<string>,
-      imageURL: string,
-      price: number,
-      currency: string
-    ): RNInsiderProduct;
-    static itemPurchased(uniqueSaleID: string, product: RNInsiderProduct, customParameters?: CustomParameters): void;
-    static itemAddedToCart(product: RNInsiderProduct, customParameters?: CustomParameters): void;
-    static itemRemovedFromCart(productID: string): void;
-    static itemRemovedFromCart(productID: string, customParameters: CustomParameters): void;
-    static itemRemovedFromCart(productID: string, saleID: string): void;
-    static itemRemovedFromCart(productID: string, saleID: string, customParameters: CustomParameters): void;
-    static cartCleared(customParameters?: CustomParameters): void;
-    static itemAddedToWishlist(product: RNInsiderProduct, customParameters?: CustomParameters): void;
-    static itemRemovedFromWishlist(productID: string, customParameters?: CustomParameters): void;
-    static wishlistCleared(customParameters?: CustomParameters): void;
-    static getMessageCenterData(
-      limit: number,
-      startDate: Date,
-      endDate: Date,
-      callback: (messageCenterData: any) => void
-    ): void;
-    static getMessageCenterDataWithIdentifiers(
-      limit: number,
-      startDate: Date,
-      endDate: Date,
-      identifiers: RNInsiderIdentifier,
-      callback: (messageCenterData: any) => void
-    ): void;
-    static getSmartRecommendation(
-      recommendationID: number,
-      locale: string,
-      currency: string,
-      callback: (recommendation: any) => void
-    ): void;
-    static getSmartRecommendationWithProduct(
-      product: RNInsiderProduct,
-      recommendationID: number,
-      locale: string,
-      callback: (recommendation: any) => void
-    ): void;
-    static getSmartRecommendationWithProductIDs(
-      productIDs: string[],
-      recommendationID: number,
-      locale: string,
-      currency: string,
-      callback: (recommendation: any) => void
-    ): void;
-    static clickSmartRecommendationProduct(recommendationID: number, product: RNInsiderProduct): void;
-    static getContentStringWithName(
-      variableName: string,
-      defaultValue: string,
-      contentOptimizerDataType: number,
-      callback: (content: string) => void
-    ): void;
-    static getContentBoolWithName(
-      variableName: string,
-      defaultValue: boolean,
-      contentOptimizerDataType: number,
-      callback: (content: boolean) => void
-    ): void;
-    static getContentIntWithName(
-      variableName: string,
-      defaultValue: number,
-      contentOptimizerDataType: number,
-      callback: (content: number) => void
-    ): void;
-    static getContentStringWithoutCache(
-      variableName: string,
-      defaultValue: string,
-      contentOptimizerDataType: number,
-      callback: (content: string) => void
-    ): void;
-    static getContentBoolWithoutCache(
-      variableName: string,
-      defaultValue: boolean,
-      contentOptimizerDataType: number,
-      callback: (content: boolean) => void
-    ): void;
-    static getContentIntWithoutCache(
-      variableName: string,
-      defaultValue: number,
-      contentOptimizerDataType: number,
-      callback: (content: number) => void
-    ): void;
-    static visitHomePage(customParameters?: CustomParameters): void;
-    static visitListingPage(taxonomy: Array<string>, customParameters?: CustomParameters): void;
-    static visitProductDetailPage(product: RNInsiderProduct, customParameters?: CustomParameters): void;
-    static visitCartPage(products: Array<RNInsiderProduct>): void;
-    static visitCartPage(products: Array<RNInsiderProduct>, customParameters: CustomParameters): void;
-    static visitCartPage(products: Array<RNInsiderProduct>, saleID: string): void;
-    static visitCartPage(products: Array<RNInsiderProduct>, saleID: string, customParameters: CustomParameters): void;
-    static visitWishlistPage(products: Array<RNInsiderProduct>, customParameters?: CustomParameters): void;
-    static startTrackingGeofence(): void;
-    static setAllowsBackgroundLocationUpdates(allowsBackgroundLocationUpdates: boolean): void;
-    static handleNotification(notification: any): void;
-    static triggerPushProcessWithNotificationData(notification: any): void;
-    static enableIDFACollection(enableIDFACollection: boolean): void;
-    static removeInapp(): void;
-    static registerWithQuietPermission(enabled: boolean): void;
-    static setHybridPushToken(token: string): void;
-    static showNativeAppReview(): void;
-    static enableLocationCollection(consentStatus: boolean): void;
-    static enableIpCollection(consentStatus: boolean): void;
-    static enableCarrierCollection(consentStatus: boolean): void;
-    static signUpConfirmation(customParameters?: CustomParameters): void;
-    static setInternalBrowserCloseButtonPosition(position: string): void;
-    static reenableTemplatesForIOS(): void;
-    static disableTemplatesForIOS(): void;
-    static setForegroundPushCallback(callback: (notification: any) => void): void;
-    static setActiveForegroundPushView(): void;
-    static handleUniversalLink(url: string): void;
-    static getInsiderID(): Promise<string>;
-    static insiderIDListener(callback: (insiderID: string) => void): void;
-    static disableInAppMessages(): void;
-    static enableInAppMessages(): void;
-    /**
-     * Handles deep link URLs from Insider QR codes and email links.
-     *
-     * This method processes incoming URLs to enable deep linking functionality
-     * for features available in the Insider panel. It parses the URL and routes
-     * the user to the appropriate screen or action within the app, allowing
-     * seamless integration with Insider's panel-based features.
-     *
-     * @platform iOS only - This method is only available on iOS platform
-     * @param url - The URL string to be processed from Insider QR codes or email links
-     * @example
-     * RNInsider.handleURL('insider{your_partner_name}://test_device/...');
-     */
-    static handleURL(url: string): void;
-  }
+export default class RNInsider {
+  static closeButtonPosition: InsiderCloseButtonPosition;
+  static AppCardsError: typeof InsiderAppCardsError;
+  static AppCardsErrorCode: typeof InsiderAppCardsErrorCode;
+  static AppFramesError: typeof InsiderAppFramesErrorClass;
+  static AppFramesErrorCode: typeof InsiderAppFramesErrorCodeEnum;
+  /**
+   * Initializes the Insider SDK; pass `appIdentifier` when one partner serves several apps.
+   * @param appIdentifier Optional app identifier given to you by Insider (`^[a-z0-9][a-z0-9_]{0,49}$`).
+   * Omit it, or pass an empty string, to initialize without one.
+   */
+  static init(partnerName: string, appGroup: string, insiderCallback: Function, appIdentifier?: string): void;
+  /**
+   * Initializes the Insider SDK against a custom endpoint; pass `appIdentifier` when one partner serves several apps.
+   * @param appIdentifier Optional app identifier given to you by Insider (`^[a-z0-9][a-z0-9_]{0,49}$`).
+   * Omit it, or pass an empty string, to initialize without one.
+   */
+  static initWithCustomEndpoint(partnerName: string, appGroup: string, endpoint: string, insiderCallback: Function, appIdentifier?: string): void;
+  static reinitWithPartnerName(partnerName: string): void;
+  static tagEvent(name: string): RNInsiderEvent;
+  static getCurrentUser(): RNInsiderUser;
+  static get appCards(): RNInsiderAppCards;
+  static get events(): RNInsiderEvents;
+  static setGDPRConsent(gdprConsent: boolean): void;
+  static setMobileAppAccess(mobileAppAccess: boolean): void;
 
-  export const NOTIFICATION_OPEN: string;
-  export const INAPP_BUTTON_CLICK: string;
-  export const TEMP_STORE_PURCHASE: string;
-  export const TEMP_STORE_ADDED_TO_CART: string;
-  export const TEMP_STORE_CUSTOM_ACTION: string;
-  export const FOREGROUND_PUSH: string;
-  export const INAPP_SEEN: string;
-  export const INSIDER_ID_LISTENER: string;
-  export const SESSION_STARTED: string;
+  static createNewProduct(
+    productID: string,
+    name: string,
+    taxonomy: Array<string>,
+    imageURL: string,
+    price: number,
+    currency: string
+  ): RNInsiderProduct;
+  static itemPurchased(uniqueSaleID: string, product: RNInsiderProduct, customParameters?: CustomParameters): void;
+  static itemAddedToCart(product: RNInsiderProduct, customParameters?: CustomParameters): void;
+  static itemRemovedFromCart(productID: string): void;
+  static itemRemovedFromCart(productID: string, customParameters: CustomParameters): void;
+  static itemRemovedFromCart(productID: string, saleID: string): void;
+  static itemRemovedFromCart(productID: string, saleID: string, customParameters: CustomParameters): void;
+  static cartCleared(customParameters?: CustomParameters): void;
+  static itemAddedToWishlist(product: RNInsiderProduct, customParameters?: CustomParameters): void;
+  static itemRemovedFromWishlist(productID: string, customParameters?: CustomParameters): void;
+  static wishlistCleared(customParameters?: CustomParameters): void;
+  static getMessageCenterData(
+    limit: number,
+    startDate: Date,
+    endDate: Date,
+    callback: (messageCenterData: any) => void
+  ): void;
+  static getMessageCenterDataWithIdentifiers(
+    limit: number,
+    startDate: Date,
+    endDate: Date,
+    identifiers: RNInsiderIdentifier,
+    callback: (messageCenterData: any) => void
+  ): void;
+  static getSmartRecommendation(
+    recommendationID: number,
+    locale: string,
+    currency: string,
+    callback: (recommendation: any) => void
+  ): void;
+  static getSmartRecommendationWithProduct(
+    product: RNInsiderProduct,
+    recommendationID: number,
+    locale: string,
+    callback: (recommendation: any) => void
+  ): void;
+  static getSmartRecommendationWithProductIDs(
+    productIDs: string[],
+    recommendationID: number,
+    locale: string,
+    currency: string,
+    callback: (recommendation: any) => void
+  ): void;
+  static clickSmartRecommendationProduct(recommendationID: number, product: RNInsiderProduct): void;
+  static getContentStringWithName(
+    variableName: string,
+    defaultValue: string,
+    contentOptimizerDataType: number,
+    callback: (content: string) => void
+  ): void;
+  static getContentBoolWithName(
+    variableName: string,
+    defaultValue: boolean,
+    contentOptimizerDataType: number,
+    callback: (content: boolean) => void
+  ): void;
+  static getContentIntWithName(
+    variableName: string,
+    defaultValue: number,
+    contentOptimizerDataType: number,
+    callback: (content: number) => void
+  ): void;
+  static getContentStringWithoutCache(
+    variableName: string,
+    defaultValue: string,
+    contentOptimizerDataType: number,
+    callback: (content: string) => void
+  ): void;
+  static getContentBoolWithoutCache(
+    variableName: string,
+    defaultValue: boolean,
+    contentOptimizerDataType: number,
+    callback: (content: boolean) => void
+  ): void;
+  static getContentIntWithoutCache(
+    variableName: string,
+    defaultValue: number,
+    contentOptimizerDataType: number,
+    callback: (content: number) => void
+  ): void;
+  static markContentOptimizerAsSeen(variableName: string): void;
+  static visitHomePage(customParameters?: CustomParameters): void;
+  static visitListingPage(taxonomy: Array<string>, customParameters?: CustomParameters): void;
+  static visitProductDetailPage(product: RNInsiderProduct, customParameters?: CustomParameters): void;
+  static visitCartPage(products: Array<RNInsiderProduct>): void;
+  static visitCartPage(products: Array<RNInsiderProduct>, customParameters: CustomParameters): void;
+  static visitCartPage(products: Array<RNInsiderProduct>, saleID: string): void;
+  static visitCartPage(products: Array<RNInsiderProduct>, saleID: string, customParameters: CustomParameters): void;
+  static visitWishlistPage(products: Array<RNInsiderProduct>, customParameters?: CustomParameters): void;
+  static startTrackingGeofence(): void;
+  static setAllowsBackgroundLocationUpdates(allowsBackgroundLocationUpdates: boolean): void;
+  static handleNotification(notification: any): void;
+  static triggerPushProcessWithNotificationData(notification: any): void;
+  static enableIDFACollection(enableIDFACollection: boolean): void;
+  static removeInapp(): void;
+  static registerWithQuietPermission(enabled: boolean): void;
+  static setHybridPushToken(token: string): void;
+  static showNativeAppReview(): void;
+  static enableLocationCollection(consentStatus: boolean): void;
+  static enableIpCollection(consentStatus: boolean): void;
+  static enableCarrierCollection(consentStatus: boolean): void;
+  static signUpConfirmation(customParameters?: CustomParameters): void;
+  static setInternalBrowserCloseButtonPosition(position: string): void;
+  static reenableTemplatesForIOS(): void;
+  static disableTemplatesForIOS(): void;
+  static setForegroundPushCallback(callback: (notification: any) => void): void;
+  static setActiveForegroundPushView(): void;
+  static handleUniversalLink(url: string): void;
+  static getInsiderID(): Promise<string>;
+  static insiderIDListener(callback: (insiderID: string) => void): void;
+  static disableInAppMessages(): void;
+  static enableInAppMessages(): void;
+  /**
+   * Handles deep link URLs from Insider QR codes and email links.
+   *
+   * This method processes incoming URLs to enable deep linking functionality
+   * for features available in the Insider panel. It parses the URL and routes
+   * the user to the appropriate screen or action within the app, allowing
+   * seamless integration with Insider's panel-based features.
+   *
+   * @platform iOS only - This method is only available on iOS platform
+   * @param url - The URL string to be processed from Insider QR codes or email links
+   * @example
+   * RNInsider.handleURL('insider{your_partner_name}://test_device/...');
+   */
+  static handleURL(url: string): void;
 }
+
+// The event-channel constants (NOTIFICATION_OPEN, …) are module-local in index.js and not
+// exported; discriminate callbacks with `InsiderCallbackType`.

package/index.js

@@ -1,19 +1,23 @@
-import { Platform, NativeModules, NativeEventEmitter } from 'react-native';
+import { Platform, NativeModules } from 'react-native';
 
 import { shouldNotProceed, generateJSONErrorString, checkParameters, showParameterWarningLog, parseObjectWithTypes, isPlainObject } from './src/Util';
 import RNInsiderEvent from './src/InsiderEvent';
 import RNInsiderUser from './src/InsiderUser';
 import RNInsiderProduct from './src/InsiderProduct';
 import RNInsiderAppCards from './src/InsiderAppCards';
+import RNInsiderEvents from './src/InsiderEvents';
+import eventHandler from './src/EventHandler';
 import { InsiderAppCardsError, InsiderAppCardsErrorCode } from './src/InsiderAppCardsError';
+import InsiderAppFrame from './src/InsiderAppFrame';
+import { InsiderAppFramesError, InsiderAppFramesErrorCode, NO_DISMISS_CODE } from './src/InsiderAppFramesError';
+import { InsiderAppFrameStatus } from './src/InsiderAppFrameStatus';
+import { isErrorStatus, isLoadingStatus } from './src/InsiderAppFrameLogic';
 import CloseButtonPosition from './src/CloseButtonPosition';
 
 var packageJSON = require('./package.json');
 
 const Insider = NativeModules.RNInsider;
 const InsiderUser = new RNInsiderUser();
-const NotificationHandler = NativeModules.RNNotificationHandler;
-const eventHandler = new NativeEventEmitter(NotificationHandler);
 
 const NOTIFICATION_OPEN = 'NOTIFICATION_OPEN';
 const INAPP_BUTTON_CLICK = 'INAPP_BUTTON_CLICK';
@@ -43,14 +47,35 @@ function registerInsiderCallback(insiderCallback) {
   }
 }
 
-export { InsiderAppCardsError, InsiderAppCardsErrorCode };
+function resolveAppIdentifier(functionName, appIdentifier) {
+  if (appIdentifier !== undefined && appIdentifier !== null && typeof appIdentifier !== 'string') {
+    console.warn(`[ReactNative] ${functionName}: 'appIdentifier' must be a string (got ${typeof appIdentifier}); initializing without an app identifier.`);
+  }
+  return typeof appIdentifier === 'string' && appIdentifier.length > 0 ? appIdentifier : null;
+}
+
+// The codegen view config is resolved lazily, so importing InsiderAppFrame costs nothing
+// until it is first rendered.
+export {
+  InsiderAppCardsError,
+  InsiderAppCardsErrorCode,
+  InsiderAppFrame,
+  InsiderAppFramesError,
+  InsiderAppFramesErrorCode,
+  InsiderAppFrameStatus,
+  isErrorStatus,
+  isLoadingStatus,
+  NO_DISMISS_CODE,
+};
 
 export default class RNInsider {
   static closeButtonPosition = CloseButtonPosition;
   static AppCardsError = InsiderAppCardsError;
   static AppCardsErrorCode = InsiderAppCardsErrorCode;
+  static AppFramesError = InsiderAppFramesError;
+  static AppFramesErrorCode = InsiderAppFramesErrorCode;
 
-  static init(partnerName, appGroup, insiderCallback) {
+  static init(partnerName, appGroup, insiderCallback, appIdentifier) {
     if (shouldNotProceed()) return;
     if (checkParameters([{ type: 'string', value: partnerName }, { type: 'string', value: appGroup }, { type: 'function', value: insiderCallback }])) {
       showParameterWarningLog("init", [
@@ -63,17 +88,18 @@ export default class RNInsider {
     try {
       registerInsiderCallback(insiderCallback);
       let sdkVersion = 'RN-' + packageJSON.version;
+      appIdentifier = resolveAppIdentifier("init", appIdentifier);
       if (Platform.OS === platformType.ios) {
-        Insider.initWithLaunchOptions(null, partnerName, appGroup, sdkVersion);
+        Insider.initWithLaunchOptions(null, partnerName, appGroup, sdkVersion, appIdentifier);
       } else {
-        Insider.init(partnerName, sdkVersion);
+        Insider.init(partnerName, sdkVersion, appIdentifier);
       }
     } catch (error) {
       Insider.putErrorLog(generateJSONErrorString(error));
     }
   }
 
-  static initWithCustomEndpoint(partnerName, appGroup, endpoint, insiderCallback) {
+  static initWithCustomEndpoint(partnerName, appGroup, endpoint, insiderCallback, appIdentifier) {
     if (shouldNotProceed()) return;
     if (checkParameters([
       { type: 'string', value: partnerName },
@@ -91,10 +117,11 @@ export default class RNInsider {
     } try {
       registerInsiderCallback(insiderCallback);
       let sdkVersion = 'RN-' + packageJSON.version;
+      appIdentifier = resolveAppIdentifier("initWithCustomEndpoint", appIdentifier);
       if (Platform.OS === platformType.ios) {
-        Insider.initWithCustomEndpoint(null, partnerName, appGroup, endpoint, sdkVersion);
+        Insider.initWithCustomEndpoint(null, partnerName, appGroup, endpoint, sdkVersion, appIdentifier);
       } else {
-        Insider.init(partnerName, sdkVersion);
+        Insider.init(partnerName, sdkVersion, appIdentifier);
         Insider.setCustomEndpoint(endpoint);
       }
     } catch (error) {
@@ -134,6 +161,11 @@ export default class RNInsider {
     return RNInsiderAppCards;
   }
 
+  static get events() {
+    if (shouldNotProceed()) return;
+    return RNInsiderEvents;
+  }
+
   static setGDPRConsent(gdprConsent) {
     if (shouldNotProceed()) return;
     if (checkParameters([{ type: 'boolean', value: gdprConsent }])) {
@@ -586,6 +618,23 @@ export default class RNInsider {
     }
   }
 
+  static markContentOptimizerAsSeen(variableName) {
+    if (shouldNotProceed()) return;
+    if (checkParameters([
+      { type: 'string', value: variableName }
+    ])) {
+      showParameterWarningLog("markContentOptimizerAsSeen", [
+        { type: 'string', value: variableName }
+      ]);
+      return;
+    }
+    try {
+      Insider.markContentOptimizerAsSeen(variableName);
+    } catch (error) {
+      Insider.putErrorLog(generateJSONErrorString(error));
+    }
+  }
+
 
   // Visit Pages
   static visitHomePage(customParameters) {
@@ -897,7 +946,7 @@ export default class RNInsider {
       return;
     }
     try {
-      if (Platform.OS !== 'android' || url == null || shouldNotProceed()) return;
+      if (Platform.OS !== 'android') return;
 
       Insider.handleUniversalLink(url);
     } catch (error) {