shakebug-react-native 2.4.12 → 2.4.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.4.12",
+  "version": "2.4.14",
   "description": "Shakebug allows users to report the bug from your mobile phone for your application. Here users just need to shake their mobile and all the data regarding bugs & crashes can be seen by developers through their log in panel easily",
   "main": "src/index.tsx",
   "types": "src/index.tsx",

package/src/Componanats/CustomAlert.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { View, Text, Button, StyleSheet, Modal, TouchableOpacity } from 'react-native';
 
-const CustomeAlert = ({color, isVisible, OnPrees, text}) => {
+const CustomeAlert = ({color, isVisible, OnPrees, text = ""}) => {
     
     return (
         <Modal
@@ -13,7 +13,7 @@ const CustomeAlert = ({color, isVisible, OnPrees, text}) => {
                 <View 
                     style={[
                     styles.container, {
-                        height: text.length > 120 ? 300 : text.length < 50 ? 170 : 200
+                        height: (text && text.length > 120) ? 300 : (text && text.length < 50) ? 170 : 200
                     }]}
                 >
                     <Text style={styles.text}>

package/src/Componanats/ReviewModal.js

@@ -13,7 +13,7 @@ const ReviewModal = ({ visible, onClose, onSubmit, color }) => {
 
     const handleSubmit = () => {
         ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "true");
-        AddReviewApi(rating, feedback, global.application_id, global.session_id);
+        AddReviewApi(rating, feedback, global.application_id, global.session_id).catch(() => {});
         setRating(0);
         setFeedback('');
         onClose();

package/src/Componanats/localization.js

@@ -1,6 +1,6 @@
 export const Localization = {
     "ENGLISH": {
-        InterNetConnetionError: "Please check you internet connection",
+        InterNetConnetionError: "Please check your internet connection",
         FirstScreenTitle: "Annotate your bug",
         SecondScreenTitle: "Add Details",
         RecordVideo: "Record Video?",

package/src/Screens/AddDetailsScreen.js

@@ -49,7 +49,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     // For handel system back navigation
     useEffect(() => {
 
-        NetInfo.addEventListener(stat => {
+        const unsubscribeNetInfo = NetInfo.addEventListener(stat => {
             setIsInternet(stat.isConnected)
         })
 
@@ -73,7 +73,12 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
 
         const backHandler = BackHandler.addEventListener('hardwareBackPress', backAction);
 
-        return () => backHandler.remove(); // Clean up the event listener on unmount
+        return () => {
+            backHandler.remove();
+            if (unsubscribeNetInfo) {
+                unsubscribeNetInfo();
+            }
+        }; // Clean up the event listener on unmount
     }, []);
 
 

package/src/Screens/Shakebug.js

@@ -16,7 +16,7 @@ import FirstScreen from './FirstScreen';
 import AddDetailsScreen from './AddDetailsScreen';
 import TrimVideoScreen from './TrimVideoScreen'
 import DeviceInfo from '../../DeviceInfo';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useRef } from 'react';
 import GetLocation from '../../GetLocation'
 import NetInfo from '../../NetInfo/src'
 import { SessionStartApi } from '../APIs/StartSession';
@@ -63,18 +63,18 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.4.12";
+global.sdk_version = "2.4.14";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
 global.KEY_REVIEW_SUBMITTED = false;
-// Initialize feature flags with defaults (allow all)
+// Initialize feature flags with defaults (allow core reporting; reviews disabled by default until verified)
 global.allowBugReport = true;
 global.allowCrashReport = true;
 global.allowEvent = true;
-global.allowReview = true;
+global.allowReview = false;
 global.allowSession = true;
-global.shakebug_type = "1"; // default allow all
+global.shakebug_type = "";
 global.sdk_platform = "react-native";
 try {
   global.sdk_platform_version = require("react-native/package.json").version;
@@ -190,27 +190,58 @@ const ShakeScreen = () => {
 
 
 
-function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirstTime, ShakebugThemeColor, changeSDKScreenTitle, allowToReportBugByShakingMobile, allowToReportBugByScreenCapture, allowCrashReport, ShakebugLanguage, makeLogEnabled, setShakebugSDKEndPointURL }) {
+function Shakebug({
+  children,
+  Android_appkey,
+  iOS_appkey,
+  showTutorialScreenFirstTime = true,
+  ShakebugThemeColor = "#1dd3e3",
+  changeSDKScreenTitle = ['Annotate your bug', 'Add Details'],
+  allowToReportBugByShakingMobile = true,
+  allowToReportBugByScreenCapture = false,
+  allowCrashReport = true,
+  ShakebugLanguage = "ENGLISH",
+  makeLogEnabled = false,
+  setShakebugSDKEndPointURL = ["https://www.shakebug.com/api/v1.6/webservice.php/", "MarchShake2022", ""]
+}) {
 
   const [allowBugReport, setAllowBugReport] = useState(true);
   const [allowCrashFlag, setAllowCrashFlag] = useState(true);
   const [allowEventFlag, setAllowEventFlag] = useState(true);
-  const [allowReviewFlag, setAllowReviewFlag] = useState(true);
+  const [allowReviewFlag, setAllowReviewFlag] = useState(false);
   const [allowSessionFlag, setAllowSessionFlag] = useState(true);
 
   const { ShakebugSDKSharedPreferencesModule } = NativeModules;
 
+  const validLanguage = (ShakebugLanguage && Localization[ShakebugLanguage])
+    ? ShakebugLanguage
+    : (global.ShakebugLanguage && Localization[global.ShakebugLanguage])
+    ? global.ShakebugLanguage
+    : "ENGLISH";
+  global.ShakebugLanguage = validLanguage;
+
   const ThemeColor = ShakebugThemeColor ? ShakebugThemeColor : "#1dd3e3";
-  const FirstScreenTitle = changeSDKScreenTitle ? changeSDKScreenTitle[0] != "" ? changeSDKScreenTitle[0] : Localization[ShakebugLanguage].FirstScreenTitle : Localization[ShakebugLanguage].FirstScreenTitle;
-  const SecondScreenTitle = changeSDKScreenTitle ? changeSDKScreenTitle[1] != "" ? changeSDKScreenTitle[1] : Localization[ShakebugLanguage].SecondScreenTitle : Localization[ShakebugLanguage].SecondScreenTitle;
+  const FirstScreenTitle = (changeSDKScreenTitle && changeSDKScreenTitle[0] && changeSDKScreenTitle[0] !== "")
+    ? changeSDKScreenTitle[0]
+    : Localization[validLanguage]?.FirstScreenTitle || "Annotate your bug";
+  const SecondScreenTitle = (changeSDKScreenTitle && changeSDKScreenTitle[1] && changeSDKScreenTitle[1] !== "")
+    ? changeSDKScreenTitle[1]
+    : Localization[validLanguage]?.SecondScreenTitle || "Add Details";
   const [isAlert, setIsAlert] = useState(false)
   const [isAlertText, setAlertText] = useState("")
   const [showModal, setShowModal] = useState(false);
   const [focusedScreen, setFocusedScreen] = useState('');
-  global.ShakebugLanguage = ShakebugLanguage;
   global.makeLogEnabled = makeLogEnabled;
-  global.ShakebugSDKEndPointURL = setShakebugSDKEndPointURL[0].length > 0 ? setShakebugSDKEndPointURL[0] : "https://www.shakebug.com/api/v1.6/webservice.php/";
-  global.ShakebugSDKEndPointURLheaderKey = setShakebugSDKEndPointURL[1].length > 0 ? setShakebugSDKEndPointURL[1] : "MarchShake2022";
+  global.ShakebugSDKEndPointURL = (setShakebugSDKEndPointURL && setShakebugSDKEndPointURL[0] && setShakebugSDKEndPointURL[0].length > 0)
+    ? setShakebugSDKEndPointURL[0]
+    : "https://www.shakebug.com/api/v1.6/webservice.php/";
+  global.ShakebugSDKEndPointURLheaderKey = (setShakebugSDKEndPointURL && setShakebugSDKEndPointURL[1] && setShakebugSDKEndPointURL[1].length > 0)
+    ? setShakebugSDKEndPointURL[1]
+    : "MarchShake2022";
+
+  const connectionAlertShownRef = useRef(false);
+  const isMatchingKeyRef = useRef(false);
+  const reviewTimeoutRef = useRef(null);
 
 
   // DefaulfConfig for log
@@ -259,116 +290,362 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     fetchData();
   }, [Android_appkey, iOS_appkey])
 
-  // For check mau limit, valid appkey and call MatchKeyFunc
-  useEffect(() => {
-    async function fetchData() {
+  // For call Startsesstion and get session id 
+  const StartSession = async () => {
+    if (global.session_id == "") {
+      try {
+        const { success, session_id: newSessionId, message } = await SessionStartApi(global.latitude, global.longitude, global.application_id);
+        if (success) {
+          global.session_id = newSessionId
+          log.debug("------------------------------------------------------------------------------------------")
+          log.info('API response:', message);
+          log.debug("------------------------------------------------------------------------------------------")
+        } else {
+          log.debug("------------------------------------------------------------------------------------------")
+          log.warn(message);
+          log.debug("------------------------------------------------------------------------------------------")
+          global.session_id = ""
+        }
+      }
+      catch (err) {
+        log.error("err", err)
+      }
+    }
 
-      const KEY_APP_LAUNCH_COUNT = await ShakebugSDKSharedPreferencesModule.getString("KEY_APP_LAUNCH_COUNT") ? parseInt(await ShakebugSDKSharedPreferencesModule.getString("KEY_APP_LAUNCH_COUNT")) : 0;
-      const LAST_POPUP_TIME = await ShakebugSDKSharedPreferencesModule.getString("LAST_POPUP_TIME") ? parseInt(await ShakebugSDKSharedPreferencesModule.getString("LAST_POPUP_TIME")) : null;
-      const IS_REVIEW_SUBMITTED = await ShakebugSDKSharedPreferencesModule.getString("IS_REVIEW_SUBMITTED") || "false";
+    DeviceInfo.isEmulator().then(res => {
+      if (res === true) {
+        log.info("Supports real device only");
+      }
+    })
+  }
 
-      const SDK_VERSION = await ShakebugSDKSharedPreferencesModule.getString("SDK_VERSION")
+  // Set feature flags based on shakebug_type (supports comma‑separated codes)
+  const applyFeatureFlags = (type) => {
+    if (type === undefined || type === null || type === "") return;
+
+    // Reset all flags to false initially
+    global.allowBugReport = false;
+    global.allowCrashReport = false;
+    global.allowEvent = false;
+    global.allowReview = false;
+    global.allowSession = false;
+
+    // Helper to enable a specific flag
+    const enableFlag = (code) => {
+      switch (code) {
+        case "0":
+          // Disable all – already false
+          break;
+        case "1":
+          // Enable all
+          global.allowBugReport = true;
+          global.allowCrashReport = true;
+          global.allowEvent = true;
+          global.allowReview = true;
+          global.allowSession = true;
+          break;
+        case "2":
+          global.allowBugReport = true;
+          break;
+        case "3":
+          global.allowCrashReport = true;
+          break;
+        case "4":
+          global.allowEvent = true;
+          break;
+        case "5":
+          global.allowSession = true;
+          break;
+        case "6":
+          global.allowReview = true;
+          break;
+        default:
+          // ignore unknown codes
+          break;
+      }
+    };
 
-      ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", (KEY_APP_LAUNCH_COUNT + 1).toString())
+    // Split the incoming string and enable flags for each code
+    const codes = String(type).split(',').map(c => c.trim());
+    codes.forEach(enableFlag);
 
-      if (SDK_VERSION) {
-        if (SDK_VERSION != global.sdk_version) {
-          ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", "0")
-          ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", "")
-          ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
-          ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
-        }
+    // Store raw type for reference
+    global.shakebug_type = type;
+
+    // Update React state so UI re‑renders with new flags
+    setAllowBugReport(global.allowBugReport);
+    setAllowCrashFlag(global.allowCrashReport);
+    setAllowEventFlag(global.allowEvent);
+    setAllowReviewFlag(global.allowReview);
+    setAllowSessionFlag(global.allowSession);
+  };
+
+  const checkAndScheduleReviewPopup = async () => {
+    try {
+      if (!global.allowReview || !global.application_id) {
+        return;
       }
-      else {
-        ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", "0")
-        ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", "")
-        ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
-        ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
+
+      const LAST_POPUP_TIME = (await ShakebugSDKSharedPreferencesModule.getString("LAST_POPUP_TIME"))
+        ? parseInt(await ShakebugSDKSharedPreferencesModule.getString("LAST_POPUP_TIME"))
+        : null;
+      const IS_REVIEW_SUBMITTED = (await ShakebugSDKSharedPreferencesModule.getString("IS_REVIEW_SUBMITTED")) || "false";
+
+      if (global.app_lunch_count >= global.POPUP_LAUNCH_THRESHOLD && global.allowReview) {
+        if (LAST_POPUP_TIME && LAST_POPUP_TIME != "" && IS_REVIEW_SUBMITTED != "true") {
+          const now = Date.now(); // current timestamp in milliseconds
+          const cooldownInMs = global.POPUP_COOLDOWN_DAYS * 24 * 60 * 60 * 1000;
+
+          if (now - parseInt(LAST_POPUP_TIME) >= cooldownInMs) {
+            if (reviewTimeoutRef.current) {
+              clearTimeout(reviewTimeoutRef.current);
+            }
+            reviewTimeoutRef.current = setTimeout(() => {
+              if (global.allowReview && global.application_id) {
+                setShowModal(true);
+              }
+            }, 15000);
+          }
+        } else if (IS_REVIEW_SUBMITTED != "true") {
+          if (reviewTimeoutRef.current) {
+            clearTimeout(reviewTimeoutRef.current);
+          }
+          reviewTimeoutRef.current = setTimeout(() => {
+            if (global.allowReview && global.application_id) {
+              setShowModal(true);
+            }
+          }, 15000);
+        }
       }
+    } catch (err) {
+      log.error("Error scheduling review popup", err);
+    }
+  };
+
+  // For call Match key app and get application id
+  const MatchKeyFunc = async (appkey) => {
+    try {
+      let BundleId = DeviceInfo.getBundleId();
+
+      const { success, application_id: newApplication_id, message, total_mau, used_mau, total_video, used_video, video_duration, shakebug_type } = await MatchKeyApi(appkey, BundleId);
+
+      global.videoDuration = video_duration;
+
+      if (success) {
+        if (total_video == "Unlimited") {
+          global.AllowVideo = true;
+        }
+        else if (used_video == null) {
+          global.AllowVideo = true;
+        }
+        else if (parseInt(total_video) > parseInt(used_video)) {
+          global.AllowVideo = true;
+        }
+        else {
+          global.AllowVideo = false;
+          global.total_video = total_video;
+          global.used_video = used_video;
+        }
 
-      global.app_lunch_count = (parseInt(KEY_APP_LAUNCH_COUNT) + 1);
+        if (total_mau.toString() == used_mau.toString()) {
+          let date = new Date().getTime() + 6 * 60 * 60 * 1000
+          ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", date.toString())
+        }
+        if (Platform.OS == "android") {
+          global.isAndroidValid = true
+        }
+        else {
+          global.isIOSValid = true
+        }
+        global.application_id = newApplication_id;
 
+        // Apply and persist feature flags
+        applyFeatureFlags(shakebug_type);
+        if (shakebug_type) {
+          ShakebugSDKSharedPreferencesModule.setString("SHAKEBUG_TYPE", String(shakebug_type));
+        }
+
+        log.debug("------------------------------------------------------------------------------------------");
+        log.info('API response:', message);
+        log.debug("------------------------------------------------------------------------------------------");
+        if (global.allowSession) { StartSession(); }
+
+        checkAndScheduleReviewPopup();
+        return true;
+      } else {
+        if (Platform.OS == "android") {
+          global.isAndroidValid = false
+        }
+        else {
+          global.isIOSValid = false
+        }
+        log.debug("------------------------------------------------------------------------------------------")
+        log.warn(message);
+        log.debug("------------------------------------------------------------------------------------------")
+        global.application_id = ""
+        return false;
+      }
+    }
+    catch (err) {
+      log.error("Err", err)
+      if (err === "Network request failed" || err?.message === "Network request failed") {
+        log.warn("Please check your internet connection")
+      }
+      return false;
+    }
+  }
+
+  const executeMatchKey = async () => {
+    if (global.application_id && global.application_id.trim().length > 0) {
+      return true;
+    }
+    if (isMatchingKeyRef.current) {
+      return false;
+    }
+    isMatchingKeyRef.current = true;
+    try {
       if (Platform.OS == 'android') {
         if (Android_appkey && Android_appkey.trim().length > 0) {
           try {
             const ismauReached = await ShakebugSDKSharedPreferencesModule.getString('mauReachedTime');
             if (!ismauReached) {
-              await MatchKeyFunc(Android_appkey);
+              return await MatchKeyFunc(Android_appkey);
             } else if (parseInt(ismauReached) < new Date().getTime()) {
-              await MatchKeyFunc(Android_appkey);
+              const res = await MatchKeyFunc(Android_appkey);
               ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", "");
+              return res;
             } else {
               log.debug("------------------------------------------------------------------------------------------");
               log.warn('MAU limit is arrived, please try after', new Date(parseInt(ismauReached)).toLocaleString());
               log.debug("------------------------------------------------------------------------------------------");
+              return false;
             }
           } catch (err) {
             log.error("Err here", err);
+            return false;
           }
         } else {
           log.warn("Please provide valid android appkey");
+          return false;
         }
       } else if (Platform.OS == 'ios') {
         if (iOS_appkey && iOS_appkey.trim().length > 0) {
           try {
             const ismauReached = await ShakebugSDKSharedPreferencesModule.getString('mauReachedTime');
             if (!ismauReached) {
-              await MatchKeyFunc(iOS_appkey);
+              return await MatchKeyFunc(iOS_appkey);
             } else if (parseInt(ismauReached) < new Date().getTime()) {
-              await MatchKeyFunc(iOS_appkey);
+              const res = await MatchKeyFunc(iOS_appkey);
               ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", "");
+              return res;
             } else {
               log.debug("------------------------------------------------------------------------------------------");
               log.warn('MAU limit is arrived, please try after', new Date(parseInt(ismauReached)).toLocaleString());
               log.debug("------------------------------------------------------------------------------------------");
+              return false;
             }
           } catch (err) {
             log.error("Err", err);
+            return false;
           }
         } else {
           log.warn("Please provide valid ios appkey");
+          return false;
         }
       }
+      return false;
+    } finally {
+      isMatchingKeyRef.current = false;
+    }
+  };
 
-      if (global.app_lunch_count >= POPUP_LAUNCH_THRESHOLD && global.allowReview) {
-        if (LAST_POPUP_TIME && LAST_POPUP_TIME != "" && IS_REVIEW_SUBMITTED != "true") {
-          const now = Date.now(); // current timestamp in milliseconds
-          const cooldownInMs = global.POPUP_COOLDOWN_DAYS * 24 * 60 * 60 * 1000;
+  // For check mau limit, valid appkey, handle connectivity, and call MatchKeyFunc
+  useEffect(() => {
+    let isMounted = true;
 
-          if (now - parseInt(LAST_POPUP_TIME) >= cooldownInMs) {
-            setTimeout(() => {
-              if (global.allowReview) {
-                setShowModal(true);
-              }
-            }, 15000);
+    async function initLaunchData() {
+      try {
+        const KEY_APP_LAUNCH_COUNT = (await ShakebugSDKSharedPreferencesModule.getString("KEY_APP_LAUNCH_COUNT"))
+          ? parseInt(await ShakebugSDKSharedPreferencesModule.getString("KEY_APP_LAUNCH_COUNT"))
+          : 0;
+        const SDK_VERSION = await ShakebugSDKSharedPreferencesModule.getString("SDK_VERSION");
+
+        if (SDK_VERSION) {
+          if (SDK_VERSION != global.sdk_version) {
+            await ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", "1");
+            await ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", "");
+            await ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false");
+            await ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version);
+            global.app_lunch_count = 1;
+          } else {
+            const newCount = KEY_APP_LAUNCH_COUNT + 1;
+            await ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", newCount.toString());
+            global.app_lunch_count = newCount;
           }
-
+        } else {
+          await ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", "1");
+          await ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", "");
+          await ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false");
+          await ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version);
+          global.app_lunch_count = 1;
         }
-        else if (IS_REVIEW_SUBMITTED != "true") {
-          setTimeout(() => {
-            if (global.allowReview) {
-              setShowModal(true);
-            }
-          }, 15000);
+
+        // Load cached feature flags from previous session if available
+        const cachedShakebugType = await ShakebugSDKSharedPreferencesModule.getString("SHAKEBUG_TYPE");
+        if (cachedShakebugType && cachedShakebugType.trim().length > 0) {
+          applyFeatureFlags(cachedShakebugType);
         }
+      } catch (err) {
+        log.error("Err initializing launch data", err);
       }
     }
 
-    let i = 0;
-    NetInfo.addEventListener(state => {
-      if (i == 0) {
-        if (state.isConnected == true) {
-          fetchData()
+    initLaunchData();
+
+    const handleConnectivityChange = (state) => {
+      if (!isMounted || !state) return;
+
+      // Ignore unknown/null initial state until native connectivity is reported
+      if (state.isConnected === null) return;
+
+      const isConnected = state.isConnected === true;
+      const lang = (global.ShakebugLanguage && Localization[global.ShakebugLanguage])
+        ? global.ShakebugLanguage
+        : "ENGLISH";
+      const errorMsg = Localization[lang]?.InterNetConnetionError || "Please check your internet connection";
+
+      if (!isConnected) {
+        setAlertText(errorMsg);
+        setIsAlert(true);
+        connectionAlertShownRef.current = true;
+      } else {
+        if (connectionAlertShownRef.current || isAlert) {
+          setIsAlert(false);
+          setAlertText("");
+          connectionAlertShownRef.current = false;
         }
-        else {
-          setAlertText(Localization[global.ShakebugLanguage].InterNetConnetionError)
-          setIsAlert(true)
+        if (!global.application_id || global.application_id === "") {
+          executeMatchKey();
         }
       }
-      i++;
-    })
-  }, [Android_appkey, iOS_appkey])
+    };
+
+    // Check immediate connectivity on mount
+    NetInfo.fetch().then(handleConnectivityChange).catch(() => {});
 
+    // Listen to network changes (online <-> offline)
+    const unsubscribe = NetInfo.addEventListener(handleConnectivityChange);
+
+    return () => {
+      isMounted = false;
+      if (unsubscribe) {
+        unsubscribe();
+      }
+      if (reviewTimeoutRef.current) {
+        clearTimeout(reviewTimeoutRef.current);
+      }
+    };
+  }, [Android_appkey, iOS_appkey]);
 
   // For close or start session according app state
   useEffect(() => {
@@ -416,150 +693,6 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     };
   }, [global.IsBackground]);
 
-
-  // For call Match key app and get application id
-  const MatchKeyFunc = async (appkey) => {
-    try {
-      let BundleId = DeviceInfo.getBundleId();
-
-      const { success, application_id: newApplication_id, message, total_mau, used_mau, total_video, used_video, video_duration, shakebug_type } = await MatchKeyApi(appkey, BundleId);
-
-      global.videoDuration = video_duration;
-
-      if (success) {
-        if (total_video == "Unlimited") {
-          global.AllowVideo = true;
-        }
-        else if (used_video == null) {
-          global.AllowVideo = true;
-        }
-        else if (parseInt(total_video) > parseInt(used_video)) {
-          global.AllowVideo = true;
-        }
-        else {
-          global.AllowVideo = false;
-          global.total_video = total_video;
-          global.used_video = used_video;
-        }
-
-        if (total_mau.toString() == used_mau.toString()) {
-          let date = new Date().getTime() + 6 * 60 * 60 * 1000
-          ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", date.toString())
-        }
-        if (Platform.OS == "android") {
-          global.isAndroidValid = true
-        }
-        else {
-          global.isIOSValid = true
-        }
-        global.application_id = newApplication_id;
-        // Set feature flags based on shakebug_type (supports comma‑separated codes)
-        // Reset all flags to false initially
-        global.allowBugReport = false;
-        global.allowCrashReport = false;
-        global.allowEvent = false;
-        global.allowReview = false;
-        global.allowSession = false;
-        // Helper to enable a specific flag
-        const enableFlag = (code) => {
-          switch (code) {
-            case "0":
-              // Disable all – already false
-              break;
-            case "1":
-              // Enable all
-              global.allowBugReport = true;
-              global.allowCrashReport = true;
-              global.allowEvent = true;
-              global.allowReview = true;
-              global.allowSession = true;
-              break;
-            case "2":
-              global.allowBugReport = true;
-              break;
-            case "3":
-              global.allowCrashReport = true;
-              break;
-            case "4":
-              global.allowEvent = true;
-              break;
-            case "5":
-              global.allowReview = true;
-              break;
-            case "6":
-              global.allowSession = true;
-              break;
-            default:
-              // ignore unknown codes
-              break;
-          }
-        };
-        // Split the incoming string and enable flags for each code
-        if (shakebug_type) {
-          const codes = String(shakebug_type).split(',').map(c => c.trim());
-          codes.forEach(enableFlag);
-        }
-        // Store raw type for reference
-        global.shakebug_type = shakebug_type;
-        // Update React state so UI re‑renders with new flags
-        setAllowBugReport(global.allowBugReport);
-        setAllowCrashFlag(global.allowCrashReport);
-        setAllowEventFlag(global.allowEvent);
-        setAllowReviewFlag(global.allowReview);
-        setAllowSessionFlag(global.allowSession); log.debug("------------------------------------------------------------------------------------------");
-        log.info('API response:', message);
-        log.debug("------------------------------------------------------------------------------------------");
-        if (global.allowSession) { StartSession(); }
-      } else {
-        if (Platform.OS == "android") {
-          global.isAndroidValid = false
-        }
-        else {
-          global.isIOSValid = false
-        }
-        log.debug("------------------------------------------------------------------------------------------")
-        log.warn(message);
-        log.debug("------------------------------------------------------------------------------------------")
-        global.application_id = ""
-      }
-    }
-    catch (err) {
-      log.error("Err", err)
-      if (err === "Network request failed" || err?.message === "Network request failed") {
-        log.warn("Please check your internet connection")
-      }
-    }
-  }
-
-  // For call Startsesstion and get session id 
-  const StartSession = async () => {
-    if (global.session_id == "") {
-      try {
-        const { success, session_id: newSessionId, message } = await SessionStartApi(global.latitude, global.longitude, global.application_id);
-        if (success) {
-          global.session_id = newSessionId
-          log.debug("------------------------------------------------------------------------------------------")
-          log.info('API response:', message);
-          log.debug("------------------------------------------------------------------------------------------")
-        } else {
-          log.debug("------------------------------------------------------------------------------------------")
-          log.warn(message);
-          log.debug("------------------------------------------------------------------------------------------")
-          global.session_id = ""
-        }
-      }
-      catch (err) {
-        log.error("err", err)
-      }
-    }
-
-    DeviceInfo.isEmulator().then(res => {
-      if (res === true) {
-        log.info("Supports real device only");
-      }
-    })
-  }
-
   // For handle error globally
   setGlobalErrorHandler()
 
@@ -605,10 +738,15 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           OnPrees={() => {
             setAlertText("")
             setIsAlert(false)
+            connectionAlertShownRef.current = false;
           }}
         />
 
-        <ReviewModal color={ThemeColor} visible={showModal && allowReviewFlag && global.allowReview} onClose={() => { setShowModal(false) }} />
+        <ReviewModal
+          color={ThemeColor}
+          visible={showModal && allowReviewFlag && global.allowReview && !!global.application_id}
+          onClose={() => { setShowModal(false) }}
+        />
       </View>
     </ShakebugContext.Provider>
   )