shakebug-react-native 2.4.1 → 2.4.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "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",
   "scripts": {

package/src/Componanats/NavigationContext.js

@@ -23,16 +23,14 @@ export const NavigationProvider = ({ children }) => {
     }
   };
 
-  useFocusEffect(
-    React.useCallback(() => {
-      if (navigationState && navigationState.length > 0) {
-        setFocusedScreen(navigationState[navigationState.length - 1].name);
-      }
-      return () => {
-        setFocusedScreen('');
-      };
-    }, [navigationState])
-  );
+  React.useEffect(() => {
+    if (navigationState && navigationState.length > 0) {
+      setFocusedScreen(navigationState[navigationState.length - 1].name);
+    }
+    return () => {
+      setFocusedScreen('');
+    };
+  }, [navigationState]);
 
   return (
     <NavigationContext.Provider value={{ navigationState, navigate, goBack, focusedScreen, goToScreenAtIndex}}>

package/src/Componanats/ShakeFunction.js

@@ -301,9 +301,10 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
             }, 200)
           }
 
-          if (Platform.OS == 'android' && global.isRecording == false && global.isTrigger == false && isBugReportingEnabled()) {
+          if (Platform.OS == 'android' && global.isRecording == false && global.isTrigger == false && isBugReportingEnabled() && !global.isShakebugSDKOpen) {
             if (calculate.toFixed(2) >= 18) {
               if (global.isAndroidValid == true && global.application_id != "" && global.application_id != undefined && global.isTrigger == false) {
+                global.isShakebugSDKOpen = true; // Lock immediately to prevent double navigation
                 setIsScreenShot(true)
                 let ImgUrl = null;
                 try {
@@ -315,10 +316,10 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
                   if (ImgUrl != undefined || ImgUrl != null) {
                     subscription.unsubscribe();
                     global.IsBackground = false
-                    global.isShakebugSDKOpen = true
                     navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
                   }
                   else {
+                    global.isShakebugSDKOpen = false;
                     setIsScreenShot(false)
                   }
                 }
@@ -328,9 +329,10 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
               }
             }
           }
-          else if (Platform.OS == 'ios' && global.isRecording == false && global.isTrigger == false && isBugReportingEnabled()) {
+          else if (Platform.OS == 'ios' && global.isRecording == false && global.isTrigger == false && isBugReportingEnabled() && !global.isShakebugSDKOpen) {
             if (calculate.toFixed(2) >= 2.00) {
               if (global.isIOSValid == true && global.application_id != "" && global.application_id != undefined) {
+                global.isShakebugSDKOpen = true; // Lock immediately to prevent double navigation
                 setIsScreenShot(true)
                 
                 let ImgUrl = null;
@@ -348,10 +350,10 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
                 }
                 if (ImgUrl != undefined || ImgUrl != null) {
                   subscription.unsubscribe();
-                  global.isShakebugSDKOpen = true
                   navigate("FirstScreen", { img: `${ImgUrl}`, themeColor: `${themeColor}`, SDKScreenTitle: `${SDKScreenTitle}` })
                 }
                 else {
+                  global.isShakebugSDKOpen = false;
                   setIsScreenShot(false)
                 }
 

package/src/Screens/AddDetailsScreen.js

@@ -285,11 +285,11 @@ const AddDetailsScreen = ({ media, updateParent, mediaType, themeColor, SDKScree
     }
 
     return (
-        <SafeAreaView style={{ width: "100%", height: "100%", backgroundColor: themeColor, paddingTop: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 && StatusBar.currentHeight : 0 , paddingBottom: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 && StatusBar.currentHeight : 0}}>
+        <SafeAreaView style={{ flex: 1, width: Dimensions.get('window').width, height: Dimensions.get('window').height, backgroundColor: themeColor, paddingTop: Platform.OS == 'android' && DeviceInfo?.getSystemVersion() > 14 ? StatusBar.currentHeight : 0 , paddingBottom: Platform.OS == 'android' && DeviceInfo?.getSystemVersion() > 14 ? StatusBar.currentHeight : 0}}>
             <StatusBar backgroundColor={ThemeColor} hidden={false} />
             <KeyboardAvoidingWrapper>
                 <>
-                    <View style={{ width: "100%", height: "100%", backgroundColor: "#ffffff" }}>
+                    <View style={{ flex: 1, width: '100%', height: '100%', backgroundColor: "#ffffff" }}>
                         <View style={{ height: '6%', padding: 5, paddingHorizontal: 15, backgroundColor: ThemeColor, flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between' }}>
                             <TouchableOpacity
                                 style={{

package/src/Screens/FirstScreen.js

@@ -309,10 +309,10 @@ const FirstScreen = ({ img, themeColor, SDKScreenTitle }) => {
   // backgroundColor: "#181818"
 
   return (
-    <SafeAreaView style={{ width: "100%", height: '100%', backgroundColor: themeColor, paddingTop: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 && StatusBar.currentHeight : 0 , paddingBottom: Platform.OS == 'android' ? DeviceInfo?.getSystemVersion() > 14 && StatusBar.currentHeight : 0}}>
+    <SafeAreaView style={{ flex: 1, width: Dimensions.get('window').width, height: Dimensions.get('window').height, backgroundColor: themeColor, paddingTop: Platform.OS == 'android' && DeviceInfo?.getSystemVersion() > 14 ? StatusBar.currentHeight : 0 , paddingBottom: Platform.OS == 'android' && DeviceInfo?.getSystemVersion() > 14 ? StatusBar.currentHeight : 0}}>
       <StatusBar backgroundColor={ThemeColor} />
 
-      <View style={{ width: "100%", height: "100%", backgroundColor: "#e4fdfd" }}>
+      <View style={{ flex: 1, width: '100%', height: '100%', backgroundColor: "#e4fdfd" }}>
         <View style={{ height: '6%', padding: 5, paddingHorizontal: 15, backgroundColor: ThemeColor, flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between' }}>
           <TouchableOpacity
             style={{

package/src/Screens/Shakebug.js

@@ -53,7 +53,7 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.4.1";
+global.sdk_version = "2.4.2";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
@@ -76,16 +76,14 @@ const NavigationContainer = ({ screens, setFocusedScreen }) => {
   const animation = React.useRef(new Animated.Value(0)).current;
   const { width } = Dimensions.get('window');
 
-  useFocusEffect(
-    React.useCallback(() => {
-      if (navigationState && navigationState.length > 0) {
-        setFocusedScreen(navigationState[navigationState.length - 1].name);
-      }
-      return () => {
-        setFocusedScreen('');
-      };
-    }, [navigationState, setFocusedScreen])
-  );
+  React.useEffect(() => {
+    if (navigationState && navigationState.length > 0) {
+      setFocusedScreen(navigationState[navigationState.length - 1].name);
+    }
+    return () => {
+      setFocusedScreen('');
+    };
+  }, [navigationState, setFocusedScreen]);
 
   React.useEffect(() => {
     Animated.timing(animation, {
@@ -468,7 +466,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
         setAllowCrashFlag(global.allowCrashReport);
         setAllowEventFlag(global.allowEvent);
         setAllowReviewFlag(global.allowReview);
-        setAllowSessionFlag(global.allowSession);  log.debug("------------------------------------------------------------------------------------------");
+        setAllowSessionFlag(global.allowSession); log.debug("------------------------------------------------------------------------------------------");
         log.info('API response:', message);
         log.debug("------------------------------------------------------------------------------------------");
         if (global.allowSession) { StartSession(); }
@@ -542,6 +540,8 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       <View
         style={{
           flex: 1,
+          width: '100%',
+          height: '100%'
         }}
       >
         <GlobalStateProvider>
@@ -638,9 +638,19 @@ export const AddEvent = async (name, value) => {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
+    width: Dimensions.get('window').width,
+    height: Dimensions.get('window').height,
     position: 'relative',
   },
   screen: {
-    ...StyleSheet.absoluteFillObject,
+    flex: 1,
+    width: Dimensions.get('window').width,
+    height: Dimensions.get('window').height,
+    backgroundColor: "yellow",
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    left: 0,
+    right: 0,
   },
 });

package/src/Screens/TutorialScreen.js

@@ -8,7 +8,7 @@ const TutorialScreen = () => {
     const { goBack } = useNavigation();
 
     return (
-        <SafeAreaView style={{ width: '100%', height: '100%', backgroundColor: '#FFF', alignItems: 'center', justifyContent: 'center' }}>
+        <SafeAreaView style={{ flex: 1, width: '100%', height: '100%', backgroundColor: '#FFF', alignItems: 'center', justifyContent: 'center' }}>
             <StatusBar 
                 backgroundColor='#fff'
                 barStyle={'dark-content'}