notifly-sdk 2.2.4 → 2.2.6

package/index.js

@@ -7,6 +7,9 @@ import { setUserProperties, removeUserId } from './src/user';
 import { base64Decode, clickHandler, sessionStart } from './src/utils';
 import { showInAppMessage } from './src/in_app_message';
 let isSetBackgroundHandler = false;
+let isNotiflyInitialized = false;
+const openedInAppWebViewCount = { count: 0 };
+
 exports.trackEvent = logEvent;
 exports.setUserProperties = setUserProperties;
 exports.clickHandler = clickHandler;
@@ -108,16 +111,18 @@ exports.setUserId = async function (userID) {
  * await initialize('myProjectId', 'myUserName', 'myPassword');
  */
 exports.initialize = async function (prjId, userName, password, useCustomClickHandler = false) {
+    if (isNotiflyInitialized) {
+        return;
+    }
     try {
         await messaging().requestPermission();
         // in-app-message
-        const openedInAppWebViewCount = { count: 0 };
         messaging().onMessage((remoteMessage) => {
             new RootSiblings(null).destroy();
             handleInAppMessage(remoteMessage, openedInAppWebViewCount);
         });
 
-        // push
+
         messaging().onNotificationOpenedApp(handleNotificationOpened);
 
         // custom push click handler
@@ -137,6 +142,7 @@ exports.initialize = async function (prjId, userName, password, useCustomClickHa
             AsyncStorage.setItem('notiflyUserPassword', password),
         ]);
         await sessionStart();
+        isNotiflyInitialized = true;
     } catch (err) {
         console.warn('[Notifly]: ', err);
     }
@@ -156,6 +162,9 @@ async function handleInAppMessage(remoteMessage, openedInAppWebViewCount) {
 
 async function handleNotificationOpened(remoteMessage) {
     try {
+        if (remoteMessage.data?.notifly_message_type != 'push-notification') {
+            return;
+        }
         const link = remoteMessage.data?.link;
         if (link) {
             Linking.openURL(link);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notifly-sdk",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/constant.js

@@ -1,4 +1,4 @@
-export const SDK_VERSION = '2.2.4';
+export const SDK_VERSION = '2.2.6';
 
 export const NAMESPACE = {
     'EVENTID': '830b5f7b-e392-43db-a17b-d835f0bcab2b',

package/src/in_app_message.js

@@ -1,3 +1,4 @@
+import React from 'react';
 import { View, Linking, Dimensions } from 'react-native';
 import RootSiblings from 'react-native-root-siblings';
 import Modal from 'react-native-modal';
@@ -38,9 +39,11 @@ export async function showInAppMessage(data, openedInAppWebViewCount) {
                 type: event.notifly_button_click_type,
                 button_name: event.notifly_button_name,
                 link: event.notifly_button_click_link,
+                extra_data: event.notifly_extra_data,
             }));
         });
     `;
+    const backdropOpacity = _getBackgroundOpacity(modalProperties?.backgroundOpacity);
 
     const webviewMessageHandler = (e) => {
         const message = JSON.parse(e.nativeEvent.data);
@@ -98,6 +101,21 @@ export async function showInAppMessage(data, openedInAppWebViewCount) {
                     [key]: true,
                 });
             }
+        } else if (message.type === 'survey_submit_button') {
+            modal.destroy();
+            openedInAppWebViewCount.count = openedInAppWebViewCount.count - 1;
+            logEvent(
+                'survey_submit_button_click', {
+                    type: 'message_event',
+                    channel: 'in-app-message',
+                    button_name: message.button_name,
+                    campaign_id: data.campaign_id,
+                    notifly_message_id: data.notifly_message_id,
+                    notifly_extra_data: message.extra_data,
+                },
+                null,
+                true
+            );
         }
     };
 
@@ -121,7 +139,7 @@ export async function showInAppMessage(data, openedInAppWebViewCount) {
                     openedInAppWebViewCount.count = openedInAppWebViewCount.count - 1;
                     modal.destroy();
                 }}
-                backdropOpacity={0}
+                backdropOpacity={backdropOpacity}
                 style={webViewProps.modalStyle}
             >
                 <View>
@@ -226,3 +244,15 @@ function _getViewHeight(modalProps, screenWidth, screenHeight) {
 
     return viewHeight;
 }
+
+function _getBackgroundOpacity(backgroundOpacity) {
+    // if backgroundOpacity is not defined, default value is 0.2
+    if (backgroundOpacity === undefined) {
+        return 0.2;
+    }
+    // if backgroundOpacity is not between 0 and 1, default value is 0.2
+    if (backgroundOpacity < 0 || backgroundOpacity > 1) {
+        return 0.2;
+    }
+    return backgroundOpacity;
+}

package/src/log_event.js

@@ -169,6 +169,7 @@ function _getBodyForLogEvent(
         os_version: osVersion,
         app_version: appVersion,
         sdk_version: SDK_VERSION,
+        sdk_type: "react_native",
         external_user_id: externalUserId || undefined,
     });
 

package/src/utils.js

@@ -98,6 +98,9 @@ export async function clickHandler(remoteMessage) {
         console.warn('[Notifly] clickHandler receives a null remoteMessage.');
         return;
     }
+    if (remoteMessage.data?.notifly_message_type != 'push-notification') {
+        return;
+    }
 
     try {
         const { data: { link, campaign_id, notifly_message_id } = {} } = remoteMessage;