Merge pull request #2205 from Nuzhy-Deriv/nuzhy/fcwidget-check

nuzhy/_/condition to check fcWidget
deriv-com · Nov 22, 2024 · b1f8c9e · b1f8c9e
2 parents 380dcb2 + 1a38399
commit b1f8c9e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 12 deletions.
diff --git a/public/scripts/freshchat/freshchat-1.0.1.js b/public/scripts/freshchat/freshchat-1.0.1.js
@@ -36,8 +36,12 @@ class FreshChat {
   constructor({ token = null, hideButton = false } = {}) {
     this.authToken = token;
     this.hideButton = hideButton;
-    const config_url = localStorage.getItem("config.server_url")?.replace(/^['"]+|['"]+$/g, "");
-    const config_appID = localStorage.getItem("config.app_id")?.replace(/^['"]+|['"]+$/g, "");
+    const config_url = localStorage
+      .getItem("config.server_url")
+      ?.replace(/^['"]+|['"]+$/g, "");
+    const config_appID = localStorage
+      .getItem("config.app_id")
+      ?.replace(/^['"]+|['"]+$/g, "");
     this.hostname =
       config_url && config_url.trim() !== "" ? config_url : "green.derivws.com";
     this.appId =

diff --git a/public/scripts/freshchat/v1.0.2.js b/public/scripts/freshchat/v1.0.2.js
@@ -36,8 +36,12 @@ class FreshChat {
   constructor({ token = null, hideButton = false } = {}) {
     this.authToken = token;
     this.hideButton = hideButton;
-    const config_url = localStorage.getItem("config.server_url")?.replace(/^['"]+|['"]+$/g, "");
-    const config_appID = localStorage.getItem("config.app_id")?.replace(/^['"]+|['"]+$/g, "");
+    const config_url = localStorage
+      .getItem("config.server_url")
+      ?.replace(/^['"]+|['"]+$/g, "");
+    const config_appID = localStorage
+      .getItem("config.app_id")
+      ?.replace(/^['"]+|['"]+$/g, "");
     this.hostname =
       config_url && config_url.trim() !== "" ? config_url : "green.derivws.com";
     this.appId =
@@ -46,7 +50,11 @@ class FreshChat {
   }
 
   static async initialize(options) {
-    return new FreshChat(options);
+    try {
+      return new FreshChat(options);
+    } catch (error) {
+      console.warn("Error initializing FreshChat:", error);
+    }
   }
 
   init = async () => {
@@ -81,9 +89,14 @@ class FreshChat {
 
     script.onload = function () {
       if (jwt) {
-        window.fcWidget?.user?.setProperties({
-          cf_user_jwt: jwt,
-        });
+        const checkWidget = setInterval(() => {
+          if (window.fcWidget?.user) {
+            window.fcWidget.user?.setProperties({
+              cf_user_jwt: jwt,
+            });
+            clearInterval(checkWidget);
+          }
+        }, 500);
       }
     };
   };

diff --git a/public/scripts/freshchat/v1.0.3.js b/public/scripts/freshchat/v1.0.3.js
@@ -52,7 +52,11 @@ class FreshChat {
   }
 
   static async initialize(options) {
-    return new FreshChat(options);
+    try {
+      return new FreshChat(options);
+    } catch (error) {
+      console.warn("Error initializing FreshChat:", error);
+    }
   }
 
   init = async () => {
@@ -89,9 +93,14 @@ class FreshChat {
 
     script.onload = function () {
       if (jwt) {
-        window.fcWidget?.user?.setProperties({
-          cf_user_jwt: jwt,
-        });
+        const checkWidget = setInterval(() => {
+          if (window.fcWidget?.user) {
+            window.fcWidget.user?.setProperties({
+              cf_user_jwt: jwt,
+            });
+            clearInterval(checkWidget);
+          }
+        }, 500);
       }
     };
   };