shakebug-react-native 2.4.11 → 2.4.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shakebug-react-native",
   "title": "shakebug-react-native",
-  "version": "2.4.11",
+  "version": "2.4.12",
   "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/Screens/Shakebug.js

@@ -63,7 +63,7 @@ global.isScreeenShotTaken = false;
 global.restrictedViews = [];
 global.currentScreen = ""
 global.isShakebugSDKOpen = false;
-global.sdk_version = "2.4.11";
+global.sdk_version = "2.4.12";
 global.app_lunch_count = 0;
 global.POPUP_LAUNCH_THRESHOLD = 3;
 global.POPUP_COOLDOWN_DAYS = 2;
@@ -288,31 +288,14 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
 
       global.app_lunch_count = (parseInt(KEY_APP_LAUNCH_COUNT) + 1);
 
-      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 sevenDaysInMs = global.POPUP_COOLDOWN_DAYS * 24 * 60 * 60 * 1000; // 7 days in milliseconds
-
-          const afterDaysTimestamp = now + sevenDaysInMs;
-
-          if (LAST_POPUP_TIME > afterDaysTimestamp) {
-            setTimeout(() => { setShowModal(true) }, 15000);
-          }
-
-        }
-        else if (IS_REVIEW_SUBMITTED != "true") {
-          setTimeout(() => { setShowModal(true) }, 15000);
-        }
-      }
-
       if (Platform.OS == 'android') {
         if (Android_appkey && Android_appkey.trim().length > 0) {
           try {
             const ismauReached = await ShakebugSDKSharedPreferencesModule.getString('mauReachedTime');
             if (!ismauReached) {
-              MatchKeyFunc(Android_appkey);
+              await MatchKeyFunc(Android_appkey);
             } else if (parseInt(ismauReached) < new Date().getTime()) {
-              MatchKeyFunc(Android_appkey);
+              await MatchKeyFunc(Android_appkey);
               ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", "");
             } else {
               log.debug("------------------------------------------------------------------------------------------");
@@ -330,9 +313,9 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           try {
             const ismauReached = await ShakebugSDKSharedPreferencesModule.getString('mauReachedTime');
             if (!ismauReached) {
-              MatchKeyFunc(iOS_appkey);
+              await MatchKeyFunc(iOS_appkey);
             } else if (parseInt(ismauReached) < new Date().getTime()) {
-              MatchKeyFunc(iOS_appkey);
+              await MatchKeyFunc(iOS_appkey);
               ShakebugSDKSharedPreferencesModule.setString("mauReachedTime", "");
             } else {
               log.debug("------------------------------------------------------------------------------------------");
@@ -346,6 +329,29 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           log.warn("Please provide valid ios appkey");
         }
       }
+
+      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;
+
+          if (now - parseInt(LAST_POPUP_TIME) >= cooldownInMs) {
+            setTimeout(() => {
+              if (global.allowReview) {
+                setShowModal(true);
+              }
+            }, 15000);
+          }
+
+        }
+        else if (IS_REVIEW_SUBMITTED != "true") {
+          setTimeout(() => {
+            if (global.allowReview) {
+              setShowModal(true);
+            }
+          }, 15000);
+        }
+      }
     }
 
     let i = 0;
@@ -433,7 +439,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
         else {
           global.AllowVideo = false;
           global.total_video = total_video;
-          global.used_video - used_video;
+          global.used_video = used_video;
         }
 
         if (total_mau.toString() == used_mau.toString()) {
@@ -519,7 +525,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
     }
     catch (err) {
       log.error("Err", err)
-      if (err = "Network request failed") {
+      if (err === "Network request failed" || err?.message === "Network request failed") {
         log.warn("Please check your internet connection")
       }
     }
@@ -602,7 +608,7 @@ function Shakebug({ children, Android_appkey, iOS_appkey, showTutorialScreenFirs
           }}
         />
 
-        <ReviewModal color={ThemeColor} visible={showModal} onClose={() => { setShowModal(false) }} />
+        <ReviewModal color={ThemeColor} visible={showModal && allowReviewFlag && global.allowReview} onClose={() => { setShowModal(false) }} />
       </View>
     </ShakebugContext.Provider>
   )