shakebug-react-native 2.1.0 → 2.2.1

package/src/APIs/AddIssue.js

@@ -1,3 +1,4 @@
+import { NativeModules, Platform } from "react-native";
 import DeviceInfo from "../../DeviceInfo";
 import NetInfo from "../../NetInfo/src";
 
@@ -6,10 +7,15 @@ const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
 async function AddIssueApi(session_id, application_id, path, isVideo, desc, email) {
     try {
+
+        const { ShakebugSDKSharedPreferencesModule } = NativeModules;
+
+        const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
+
         let i = 0;
         let internetType = "";
         NetInfo.addEventListener(stat => {
-            if(i == 0){
+            if (i == 0) {
                 internetType = stat.type
             }
             i++
@@ -25,9 +31,9 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         let osversion = await DeviceInfo.getSystemVersion()
         const type = isVideo ? 'video/mp4' : 'image/png';
         const name = isVideo ? 'video' : 'photo.png';
-        const media = isVideo ? `file://'${path}` : path; 
-        
-        
+        const media = isVideo ? `file://'${path}` : path;
+
+
         const formData = new FormData();
         formData.append("method", "addIssue");
         formData.append("description", desc);
@@ -44,6 +50,9 @@ async function AddIssueApi(session_id, application_id, path, isVideo, desc, emai
         formData.append("created", created);
         formData.append("isVideo", isVideo);
         formData.append("appversion", appversion);
+        formData.append("custom_user_id", Custom_User_Id || "")
+        formData.append("sdk_version", global.sdk_version)
+        formData.append("platform", Platform.OS)
 
 
         const response = await fetch(BASE_URL, {

package/src/APIs/AddReview.js

@@ -0,0 +1,46 @@
+import { NativeModules } from "react-native";
+
+const BASE_URL = global.ShakebugSDKEndPointURL;
+const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
+
+async function AddReviewApi(rating, review, applicationsid, session_id) {
+
+    const { ShakebugSDKSharedPreferencesModule } = NativeModules;
+
+    const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
+
+    try {
+        const formData = new FormData();
+        formData.append("method", "addAppReview");
+        formData.append("applicationsid", applicationsid);
+        formData.append("rating", rating);
+        formData.append("review", review?.trim());
+        formData.append("session_id", session_id);
+        formData.append("appVersion", global.sdk_version);
+        formData.append("custom_user_id", Custom_User_Id);
+
+        const response = await fetch(BASE_URL, {
+            method: 'POST',
+            headers: {
+                'API-KEY': API_KEY
+            },
+            body: formData,
+        });
+
+        const data = await response.json();
+
+        if (data.code === 200 && data.success === true) {
+            global.KEY_REVIEW_SUBMITTED = true;
+            return { success: true, message: data.msg };
+        } else {
+
+
+            return { success: false, message: data.msg };
+        }
+    } catch (error) {
+        // console.error('Error fetching data:', error);
+        throw error;
+    }
+}
+
+export { AddReviewApi };

package/src/APIs/CustomUserId.js

@@ -0,0 +1,47 @@
+import { NativeModules } from "react-native";
+
+const BASE_URL = global.ShakebugSDKEndPointURL;
+const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
+
+async function CustomUserIdApi(id, name, email, country, other, applicationsid) {
+
+    const { ShakebugSDKSharedPreferencesModule } = NativeModules;
+
+    try {
+        const formData = new FormData();
+        formData.append("method", "addCustomUserIds");
+        formData.append("id", id);
+        formData.append("name", name?.trim());
+        formData.append("email", email?.trim());
+        formData.append("country", country?.trim());
+        formData.append("other", other);
+        formData.append("applicationsid", applicationsid);
+
+        const response = await fetch(BASE_URL, {
+            method: 'POST',
+            headers: {
+                'API-KEY': API_KEY
+            },
+            body: formData,
+        });
+
+        const data = await response.json();
+
+        if (data.code === 200 && data.success === true) {
+            
+            ShakebugSDKSharedPreferencesModule.setString("custom_user_id", data?.response_data?.custom_user_id)
+
+            return { success: true, message: data.msg, data: data?.response_data?.custom_user_id };
+        } else {
+
+            ShakebugSDKSharedPreferencesModule.setString("custom_user_id", "")
+
+            return { success: false, message: data.msg, data: "" };
+        }
+    } catch (error) {
+        // console.error('Error fetching data:', error);
+        throw error;
+    }
+}
+
+export { CustomUserIdApi };

package/src/APIs/Event.js

@@ -1,3 +1,4 @@
+import { NativeModules } from "react-native";
 import DeviceInfo from "../../DeviceInfo";
 import NetInfo from "../../NetInfo/src";
 
@@ -7,13 +8,17 @@ const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 async function EventApi(application_id, name, value) {
     try {
 
-        
-        
+        const { ShakebugSDKSharedPreferencesModule } = NativeModules;
+
+        const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
+
         const formData = new FormData();
         formData.append("method", "event");
         formData.append("applicationsid", application_id);
         formData.append("name", name);
         formData.append("value", value);
+        formData.append("custom_user_id", Custom_User_Id || "")
+        formData.append("sdk_version", global.sdk_version)
 
         const response = await fetch(BASE_URL, {
             method: 'POST',
@@ -24,7 +29,7 @@ async function EventApi(application_id, name, value) {
         });
 
         const data = await response.json();
-        
+
         if (data.code === 200 && data.success === true) {
             return { success: true, message: data.msg };
         } else {

package/src/APIs/StartSession.js

@@ -34,6 +34,8 @@ async function SessionStartApi(latitude, longitude, application_id) {
     let uuid = null;
     let idFromStorege = await ShakebugSDKSharedPreferencesModule.getString("uuid");
 
+    const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
+    
     if (idFromStorege == "" || idFromStorege == undefined) {
         let id = await DeviceInfo.getUniqueId();
         ShakebugSDKSharedPreferencesModule.setString("uuid", id)
@@ -48,7 +50,7 @@ async function SessionStartApi(latitude, longitude, application_id) {
     let app_version = await DeviceInfo.getVersion()
 
     let device_name = await DeviceInfo.getDeviceName()
-
+    
     let os = await DeviceInfo.getSystemName()
 
     let phone_carrier = await DeviceInfo.getCarrier()
@@ -71,7 +73,9 @@ async function SessionStartApi(latitude, longitude, application_id) {
     formData.append("longitude", longitude)
     formData.append("phonecarrier", phone_carrier)
     formData.append("appversion", app_version)
-
+    formData.append("custom_user_id", Custom_User_Id || "")
+    formData.append("sdk_version", global.sdk_version)
+    
     try {
         const response = await fetch(BASE_URL, {
             method: 'POST',

package/src/Componanats/ReviewModal.js

@@ -0,0 +1,171 @@
+import React, { useState } from 'react';
+import { Modal, View, Text, TextInput, TouchableOpacity, StyleSheet, Image, KeyboardAvoidingView, ScrollView, TouchableWithoutFeedback, Keyboard, NativeModules } from 'react-native';
+import { AddReviewApi } from 'shakebug-react-native/src/APIs/AddReview';
+
+const ReviewModal = ({ visible, onClose, onSubmit, color }) => {
+
+    const { ShakebugSDKSharedPreferencesModule } = NativeModules;
+
+    const [rating, setRating] = useState(0);
+    const [feedback, setFeedback] = useState('');
+
+    const handleRating = (star) => setRating(star);
+
+    const handleSubmit = () => {
+        ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "true");
+        AddReviewApi(rating, feedback, global.application_id, global.session_id);
+        setRating(0);
+        setFeedback('');
+        onClose();
+    };
+
+    return (
+        <Modal visible={visible} transparent animationType="fade">
+            <KeyboardAvoidingView
+                behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+                style={styles.overlay}
+                keyboardVerticalOffset={Platform.OS === 'ios' ? 60 : 0}
+            >
+                <TouchableWithoutFeedback style={{ flex: 1 }} onPress={() => Keyboard.dismiss()}>
+                    <ScrollView
+                        contentContainerStyle={styles.scrollContainer}
+                        keyboardShouldPersistTaps="handled"
+                        bounces={false}
+                    >
+                        <View style={styles.modalContainer}>
+                            <Text style={styles.title}>Rate Your Experience</Text>
+                            <Text style={styles.subtitle}>We value your feedback</Text>
+
+                            <View style={styles.starsContainer}>
+                                {[1, 2, 3, 4, 5].map((star) => (
+                                    <TouchableOpacity key={star} onPress={() => handleRating(star)}>
+                                        <Image
+                                            source={
+                                                star <= rating
+                                                    ? require("../Assets/images/solar_star-bold.png")
+                                                    : require("../Assets/images/solar_star-line-duotone.png")
+                                            }
+                                            tintColor={color}
+                                            style={styles.star}
+                                        />
+                                    </TouchableOpacity>
+                                ))}
+                            </View>
+
+                            <TextInput
+                                placeholder="Write your review(optioanl)..."
+                                placeholderTextColor="#999"
+                                value={feedback}
+                                onChangeText={setFeedback}
+                                multiline
+                                style={styles.textInput}
+                            />
+
+                            <View style={styles.buttons}>
+                                <TouchableOpacity
+                                    style={styles.cancelButton}
+                                    onPress={() => {
+                                        ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", Date.now()?.toString())
+                                        onClose()
+                                    }}
+                                >
+                                    <Text style={styles.cancelText}>Cancel</Text>
+                                </TouchableOpacity>
+                                <TouchableOpacity style={[styles.submitButton, { backgroundColor: color }]} onPress={handleSubmit}>
+                                    <Text style={styles.submitText}>Submit</Text>
+                                </TouchableOpacity>
+                            </View>
+                        </View>
+                    </ScrollView>
+                </TouchableWithoutFeedback>
+            </KeyboardAvoidingView>
+        </Modal>
+
+    );
+};
+
+export default ReviewModal;
+
+const styles = StyleSheet.create({
+    overlay: {
+        flex: 1,
+        backgroundColor: '#00000066',
+        justifyContent: 'center',
+        alignItems: 'center',
+    },
+    scrollContainer: {
+        width: "100%",
+        height: "100%",
+        justifyContent: 'center',
+        alignItems: 'center',
+    },
+    modalContainer: {
+        width: '85%',
+        backgroundColor: '#fff',
+        borderRadius: 16,
+        padding: 20,
+        shadowColor: '#000',
+        shadowOpacity: 0.2,
+        shadowOffset: { width: 0, height: 4 },
+        shadowRadius: 10,
+        elevation: 8,
+    },
+    title: {
+        fontSize: 20,
+        fontWeight: '600',
+        marginBottom: 4,
+        textAlign: 'center',
+        color: '#333',
+    },
+    subtitle: {
+        fontSize: 14,
+        color: '#777',
+        marginBottom: 20,
+        textAlign: 'center',
+    },
+    starsContainer: {
+        flexDirection: 'row',
+        justifyContent: 'center',
+        marginBottom: 15,
+    },
+    star: {
+        width: 35,
+        height: 35,
+        marginHorizontal: 6,
+    },
+    textInput: {
+        borderColor: '#ccc',
+        borderWidth: 1,
+        borderRadius: 12,
+        padding: 10,
+        minHeight: 80,
+        textAlignVertical: 'top',
+        fontSize: 14,
+        color: '#333',
+        marginBottom: 20,
+        marginTop: 10
+    },
+    buttons: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'flex-end',
+    },
+    cancelButton: {
+        marginRight: 12,
+    },
+    cancelText: {
+        fontSize: 16,
+        color: '#888',
+    },
+    submitButton: {
+        backgroundColor: '#007AFF',
+        borderRadius: 8,
+        paddingVertical: 8,
+        paddingHorizontal: 16,
+    },
+    submitText: {
+        color: '#fff',
+        fontWeight: '600',
+        fontSize: 16,
+    },
+});

package/src/Componanats/ShakeFunction.js

@@ -1,7 +1,7 @@
 import { View, Text, Platform, Image, ImageBackground, NativeModules, DeviceEventEmitter, NativeEventEmitter, StatusBar, PanResponder, Animated, AppState, Dimensions, BackHandler, LogBox, StyleSheet, SafeAreaView } from 'react-native'
 import React, { useRef, useEffect, useState } from 'react'
 import { SensorTypes, setUpdateIntervalForType, accelerometer } from '../../Sensor/src/index';
-import ViewShot from '../../ScreenShot/src/index';
+import ViewShot from 'react-native-view-shot';
 import { TouchableOpacity } from 'react-native';
 import RecordScreen from '../../RecordScreen/src/index';
 import { ClearCanvas, RNDrawingView } from '../Screens/StrockView';
@@ -130,6 +130,7 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
   useEffect(() => {
     async function fetchIsFirstTime() {
       iscrashSaveed = await ShakebugSDKSharedPreferencesModule.getString('iscrashSaveed')
+      const Custom_User_Id = await ShakebugSDKSharedPreferencesModule.getString('custom_user_id')
 
       if (iscrashSaveed.length > 10 && allowCrashReport) {
 
@@ -151,7 +152,8 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
         formData.append("created", data["created"]);
         formData.append("isVideo", 0);
         formData.append("appversion", data["appversion"]);
-
+        formData.append("custom_user_id", Custom_User_Id || "")
+        formData.append("sdk_version", global.sdk_version)
 
 
         try {
@@ -321,13 +323,14 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
             if (calculate.toFixed(2) >= 2.00) {
               if (global.isIOSValid == true && global.application_id != "" && global.application_id != undefined) {
                 setIsScreenShot(true)
+                
                 let ImgUrl = await ref.current.capture()
                 try {
                   const filePath = await ShakebugSDKCustomScreenCapture.captureScreen();
                   ImgUrl = filePath
                 }
                 catch (e) {
-                  console.log("e", e);
+       
                 }
                 if (ImgUrl != undefined || ImgUrl != null) {
                   subscription.unsubscribe();

package/src/Screens/AddDetailsScreen.js

@@ -21,8 +21,7 @@ LogBox.ignoreLogs([
     'Non-serializable values were found in the navigation state',
 ]);
 
-const { ShakebugSDKCreateThumbnail } = NativeModules;
-
+const { CreateThumbnail } = NativeModules;
 
 const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScreenTitle }) => {
 
@@ -91,17 +90,23 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     const generateThumbnail = async () => {
         if (type != "img") {
             try {
-                const response = await ShakebugSDKCreateThumbnail.create({
+
+                const { create: createThumbnail } = CreateThumbnail;
+
+                const thumbnail = await createThumbnail({
                     url: `file://${path}`,
                     timeStamp: 10000,
-                });
-                if (response.path != "") {
-                    setPoster(response.path)
+                })
+
+                if (thumbnail) {
+                    setPoster(thumbnail?.path)
                     setIsLoading(false)
                 }
             } catch (error) {
-                throw new Error(error.message);
+                console.log(error);
+
                 setIsLoading(false)
+                throw new Error(error.message);
             }
         }
     };
@@ -276,12 +281,11 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     }
 
     UpdateStatusBar = () => {
-        console.log("here");
         StatusBar.setHidden(false)
     }
 
     return (
-        <SafeAreaView style={{ width: "100%", height: Dimensions.get('window').height, backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0, paddingBottom: 0 }}>
+        <SafeAreaView style={{ width: "100%", height: "100%", backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0, paddingBottom: 0 }}>
             <StatusBar backgroundColor={ThemeColor} hidden={false} />
             <KeyboardAvoidingWrapper>
                 <>
@@ -418,7 +422,7 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
                             </View>
 
                             <View style={{ alignItems: 'flex-end', marginHorizontal: 15, marginTop: '1%' }}>
-                                <Text style={{ fontSize: 12, color: "gray", fontWeight: '300' }}>© <Text>ShakeBug v2.1</Text></Text>
+                                <Text style={{ fontSize: 12, color: "gray", fontWeight: '300' }}>© <Text>ShakeBug v{global.sdk_version}</Text></Text>
                             </View>
 
                         </View>

package/src/Screens/FirstScreen.js

@@ -1,7 +1,7 @@
 import { Alert, Image, ImageBackground, Linking, PermissionsAndroid, Platform, SafeAreaView, StatusBar, Text, TouchableOpacity, View, TextInput, Keyboard, PanResponder, Animated, StyleSheet, KeyboardAvoidingView, BackHandler, Dimensions, Modal } from 'react-native'
 import React, { useEffect, useRef, useState } from 'react'
 import { ClearCanvas, RNDrawingView } from './StrockView.js';
-import ViewShot from '../../ScreenShot/src/index.js';
+import ViewShot from 'react-native-view-shot';
 import { launchImageLibrary } from '../../ImageOrVedioPicker/src/index';
 import { logger, consoleTransport } from "react-native-logs";
 import { NativeModules } from 'react-native';
@@ -310,7 +310,7 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
   // backgroundColor: "#181818"
 
   return (
-    <SafeAreaView style={{ width: "100%", height: Dimensions.get('window').height, backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0}}>
+    <SafeAreaView style={{ width: "100%", height: '100%', backgroundColor: themeColor, marginTop: Platform.OS == 'ios' ? StatusBar.currentHeight : 0}}>
       <StatusBar backgroundColor={ThemeColor} />
 
       <View style={{ width: "100%", height: "100%", backgroundColor: "#e4fdfd" }}>

package/src/Screens/Shakebug.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Platform, Alert, AppState, NativeModules, View, StyleSheet, Animated, Dimensions, SafeAreaView } from 'react-native';
+import { Platform, Alert, AppState, NativeModules, View, StyleSheet, Animated, Dimensions, SafeAreaView, Modal } from 'react-native';
 import ShakeFunction from '../Componanats/ShakeFunction';
 import FirstScreen from './FirstScreen';
 import AddDetailsScreen from './AddDetailsScreen';
@@ -19,6 +19,7 @@ import { NavigationProvider, useNavigation } from '../Componanats/NavigationCont
 import { Localization } from '../Componanats/localization';
 import { GlobalStateProvider, useGlobalState } from '../Componanats/GlobalStateContext';
 import CustomeAlert from 'shakebug-react-native/src/Componanats/CustomAlert';
+import ReviewModal from 'shakebug-react-native/src/Componanats/ReviewModal';
 
 console.ignoredYellowBox = ["Warning: Each", "Warning: Failed"];
 
@@ -50,20 +51,27 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
+global.sdk_version = "2.2.1";
+global.app_lunch_count = 0;
+global.POPUP_LAUNCH_THRESHOLD = 3;
+global.POPUP_COOLDOWN_DAYS = 2;
+global.KEY_REVIEW_SUBMITTED = false;
 
 function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirstTime, ShakebugThemeColor, changeSDKScreenTitle, allowToReportBugByShakingMobile, allowToReportBugByScreenCapture, allowCrashReport, ShakebugLanguage, makeLogEnabled, setShakebugSDKEndPointURL }) {
 
+  const { ShakebugSDKSharedPreferencesModule } = NativeModules;
+
   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 [isAlert, setIsAlert] = useState(false)
   const [isAlertText, setAlertText] = useState("")
+  const [showModal, setShowModal] = useState(false);
   global.ShakebugLanguage = ShakebugLanguage;
   global.makeLogEnabled = makeLogEnabled;
-  global.ShakebugSDKEndPointURL = setShakebugSDKEndPointURL[0].length > 0 ? setShakebugSDKEndPointURL[0] : "https://www.shakebug.com/api/v1.3/webservice.php/";
+  global.ShakebugSDKEndPointURL = setShakebugSDKEndPointURL[0].length > 0 ? setShakebugSDKEndPointURL[0] : "https://www.shakebug.com/api/v1.4/webservice.php/";
   global.ShakebugSDKEndPointURLheaderKey = setShakebugSDKEndPointURL[1].length > 0 ? setShakebugSDKEndPointURL[1] : "MarchShake2022";
 
-  const { ShakebugSDKSharedPreferencesModule } = NativeModules;
 
   // DefaulfConfig for log
   const defaultConfig = {
@@ -114,6 +122,49 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
   // For check mau limit, valid appkey and call MatchKeyFunc
   useEffect(() => {
     async function fetchData() {
+
+      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";
+
+      const SDK_VERSION = await ShakebugSDKSharedPreferencesModule.getString("SDK_VERSION")
+
+      ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", (KEY_APP_LAUNCH_COUNT + 1).toString())
+
+      if (SDK_VERSION) {
+        if (SDK_VERSION != global.sdk_version) {
+          ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", 0)
+          ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", null)
+          ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
+          ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
+        }
+      }
+      else {
+        ShakebugSDKSharedPreferencesModule.setString("KEY_APP_LAUNCH_COUNT", 0)
+        ShakebugSDKSharedPreferencesModule.setString("LAST_POPUP_TIME", null)
+        ShakebugSDKSharedPreferencesModule.setString("IS_REVIEW_SUBMITTED", "false")
+        ShakebugSDKSharedPreferencesModule.setString("SDK_VERSION", global.sdk_version)
+      }
+
+      global.app_lunch_count = (KEY_APP_LAUNCH_COUNT + 1);
+
+      if (global.app_lunch_count >= POPUP_LAUNCH_THRESHOLD) {
+        if (LAST_POPUP_TIME && IS_REVIEW_SUBMITTED != "true") {
+          const now = Date.now(); // current timestamp in milliseconds
+          const sevenDaysInMs = global.POPUP_COOLDOWN_DAYS * 24 * 60 * 60 * 1000; // 7 days in milliseconds
+
+          const afterDaysTimestamp = now + sevenDaysInMs;
+
+          if (LAST_POPUP_TIME > afterDaysTimestamp) {
+            setShowModal(true)
+          }
+
+        }
+        else if (IS_REVIEW_SUBMITTED != "true") {
+          setShowModal(true)
+        }
+      }
+
       if (Android_appkey != undefined || iOS_appkey != undefined) {
         if (Platform.OS == 'android') {
           if (Android_appkey.trim().length > 0) {
@@ -172,10 +223,14 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       }
       else {
         if (Platform.OS == 'android') {
-          console.log("Please provide Android_appkey");
+          log.debug("------------------------------------------------------------------------------------------")
+          log.warn("Please provide Android_appkey");
+          log.debug("------------------------------------------------------------------------------------------")
         }
         else if (Platform.OS == 'ios') {
-          console.log("Please provide iOS_appkey");
+          log.debug("------------------------------------------------------------------------------------------")
+          log.warn("Please provide iOS_appkey");
+          log.debug("------------------------------------------------------------------------------------------")
         }
       }
     }
@@ -407,7 +462,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
         </NavigationProvider>
       </GlobalStateProvider>
 
-      <CustomeAlert 
+      <CustomeAlert
         isVisible={isAlert}
         text={isAlertText}
         color={ThemeColor}
@@ -416,6 +471,8 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           setIsAlert(false)
         }}
       />
+
+      <ReviewModal color={ThemeColor} visible={showModal} onClose={() => { setShowModal(false) }} />
     </View>
   )
 }