shakebug-react-native 2.4.3 → 2.4.5

package/README.md

@@ -49,12 +49,7 @@ Or if you prefer to use Yarn instead of npm:
 <key>NSPhotoLibraryUsageDescription</key>
 <string></string>
 ```
-2. Manage Architecture:
-```bash
-    ENV['RCT_NEW_ARCH_ENABLED'] = '0'
-```
-
-3. CocoaPods installation:
+2. CocoaPods installation:
 
 ```bash
     cd ios && pod install && cd ..
@@ -162,6 +157,26 @@ export default App = () => {
 
 ```
 
+Add Custom User
+
+You can attach a custom user's details (like ID, name, email, country, and other info) to the bug reports and events using the `addCustomUser` method.
+
+```javascript
+
+import { Button } from 'react-native';
+import { addCustomUser } from 'react-native-shakebug';
+
+export default App = () => {
+    return(
+       <Button 
+            title='Prees'
+            onPress={() => {
+                addCustomUser("user_id", "John Doe", "john@example.com", "US", "Any other info")
+            }}
+        />
+    )
+}
+
 ## Properties
 
 <table>
@@ -252,6 +267,16 @@ export default App = () => {
         <td>If you want add event to any screen or activity use following method</td>
         <td>addEventKey("Key_name", value)</td>
     </tr>
+    <tr>
+        <td>fetchRemoteCodeValue</td>
+        <td>Fetch dynamic configuration values based on predefined keys</td>
+        <td>fetchRemoteCodeValue("key")</td>
+    </tr>
+    <tr>
+        <td>addCustomUser</td>
+        <td>Add custom user details to reports and events</td>
+        <td>addCustomUser(id, name, email, country, other)</td>
+    </tr>
 </table>
 
 ## Documentation

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "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/shakebug-react-native.podspec

@@ -28,22 +28,7 @@ Pod::Spec.new do |s|
   if respond_to?(:install_modules_dependencies, true)
     install_modules_dependencies(s)
   else
-  s.dependency "React-Core"
-
-
-if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-   end
+    s.dependency "React-Core"
   end    
 end
 

package/src/APIs/AddReview.js

@@ -17,7 +17,7 @@ async function AddReviewApi(rating, review, applicationsid, session_id) {
         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);
+        formData.append("custom_user_id", Custom_User_Id || "");
 
         const response = await fetch(BASE_URL, {
             method: 'POST',

package/src/APIs/Event.js

@@ -5,7 +5,7 @@ import NetInfo from "../../NetInfo/src";
 const BASE_URL = global.ShakebugSDKEndPointURL;
 const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
-async function EventApi(application_id, name, value) {
+async function EventApi(application_id, name, value, session_id) {
     try {
 
         const { ShakebugSDKSharedPreferencesModule } = NativeModules;
@@ -17,6 +17,7 @@ async function EventApi(application_id, name, value) {
         formData.append("applicationsid", application_id);
         formData.append("name", name);
         formData.append("value", value);
+        formData.append("session_id", session_id);
         formData.append("custom_user_id", Custom_User_Id || "")
         formData.append("sdk_version", global.sdk_version)
 

package/src/APIs/FetchRemoteCodeAPI.js

@@ -4,7 +4,7 @@ import DeviceInfo from "../../DeviceInfo";
 const BASE_URL = global.ShakebugSDKEndPointURL;
 const API_KEY = global.ShakebugSDKEndPointURLheaderKey;
 
-async function FetchRemoteCodeAPI(config_key, applicationsid) {
+async function FetchRemoteCodeAPI(config_key, applicationsid, session_id) {
 
     try {
         const { ShakebugSDKSharedPreferencesModule } = NativeModules;
@@ -18,7 +18,8 @@ async function FetchRemoteCodeAPI(config_key, applicationsid) {
         formData.append("config_key", config_key);
         formData.append("sdkversion", global.sdk_version);
         formData.append("appVersion", DeviceInfo?.getVersion());
-        formData.append("custom_user_id", Custom_User_Id);
+        formData.append("session_id", session_id);
+        formData.append("custom_user_id", Custom_User_Id || "");
 
         const response = await fetch(BASE_URL, {
             method: "POST",

package/src/Componanats/NavigationContext.js

@@ -23,14 +23,16 @@ export const NavigationProvider = ({ children }) => {
     }
   };
 
-  React.useEffect(() => {
-    if (navigationState && navigationState.length > 0) {
-      setFocusedScreen(navigationState[navigationState.length - 1].name);
-    }
-    return () => {
-      setFocusedScreen('');
-    };
-  }, [navigationState]);
+  useFocusEffect(
+    React.useCallback(() => {
+      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,10 +301,9 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
             }, 200)
           }
 
-          if (Platform.OS == 'android' && global.isRecording == false && global.isTrigger == false && isBugReportingEnabled() && !global.isShakebugSDKOpen) {
+          if (Platform.OS == 'android' && global.isRecording == false && global.isTrigger == false && isBugReportingEnabled()) {
             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 {
@@ -316,10 +315,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)
                   }
                 }
@@ -329,10 +328,9 @@ const ShakeFunction = ({ children, themeColor, showTutorialScreen, SDKScreenTitl
               }
             }
           }
-          else if (Platform.OS == 'ios' && global.isRecording == false && global.isTrigger == false && isBugReportingEnabled() && !global.isShakebugSDKOpen) {
+          else if (Platform.OS == 'ios' && global.isRecording == false && global.isTrigger == false && isBugReportingEnabled()) {
             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;
@@ -350,10 +348,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={{ 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}}>
+        <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}}>
             <StatusBar backgroundColor={ThemeColor} hidden={false} />
             <KeyboardAvoidingWrapper>
                 <>
-                    <View style={{ flex: 1, width: '100%', height: '100%', backgroundColor: "#ffffff" }}>
+                    <View style={{ 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={{ 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}}>
+    <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}}>
       <StatusBar backgroundColor={ThemeColor} />
 
-      <View style={{ flex: 1, width: '100%', height: '100%', backgroundColor: "#e4fdfd" }}>
+      <View style={{ 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.3";
+global.sdk_version = "2.4.5";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
@@ -76,14 +76,16 @@ const NavigationContainer = ({ screens, setFocusedScreen }) => {
   const animation = React.useRef(new Animated.Value(0)).current;
   const { width } = Dimensions.get('window');
 
-  React.useEffect(() => {
-    if (navigationState && navigationState.length > 0) {
-      setFocusedScreen(navigationState[navigationState.length - 1].name);
-    }
-    return () => {
-      setFocusedScreen('');
-    };
-  }, [navigationState, setFocusedScreen]);
+  useFocusEffect(
+    React.useCallback(() => {
+      if (navigationState && navigationState.length > 0) {
+        setFocusedScreen(navigationState[navigationState.length - 1].name);
+      }
+      return () => {
+        setFocusedScreen('');
+      };
+    }, [navigationState, setFocusedScreen])
+  );
 
   React.useEffect(() => {
     Animated.timing(animation, {
@@ -466,7 +468,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(); }
@@ -540,8 +542,6 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
       <View
         style={{
           flex: 1,
-          width: '100%',
-          height: '100%'
         }}
       >
         <GlobalStateProvider>
@@ -614,7 +614,7 @@ export const AddEvent = async (name, value) => {
 
   if (global.application_id != "") {
     try {
-      const { success, message } = await EventApi(global.application_id, name, value);
+      const { success, message } = await EventApi(global.application_id, name, value, global.session_id);
       if (success) {
         log.debug("------------------------------------------------------------------------------------------")
         log.info('API response:', message);
@@ -638,18 +638,9 @@ 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: {
-    flex: 1,
-    width: Dimensions.get('window').width,
-    height: Dimensions.get('window').height,
-    position: 'absolute',
-    top: 0,
-    bottom: 0,
-    left: 0,
-    right: 0,
+    ...StyleSheet.absoluteFillObject,
   },
 });

package/src/Screens/TutorialScreen.js

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

package/src/index.tsx

@@ -125,7 +125,7 @@ export const addCustomUser = (id, name, email, country, other) => {
 
 export const fetchRemoteCodeValue = async (key: String) => {
   try {
-    const result = await FetchRemoteCodeAPI(key, global.application_id);
+    const result = await FetchRemoteCodeAPI(key, global.application_id, global.session_id);
 
     if (result?.success) {
       return result?.data