From febad263268bcfd851d4a6d579a1e09a60ecbe7c Mon Sep 17 00:00:00 2001
From: kamilkifer <47425451+kamilkifer@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:45:30 +0100
Subject: [PATCH] fix: remove configLoaded in favour of using cookie name /
 clean up svgs

---
 src/images/link.svg |  4 ----
 src/images/open.svg |  4 ----
 src/main.ts         | 28 +++++++++++++++++++---------
 3 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 src/images/link.svg
 delete mode 100644 src/images/open.svg

diff --git a/src/images/link.svg b/src/images/link.svg
deleted file mode 100644
index 08d13d8..0000000
--- a/src/images/link.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/>
-</svg>
diff --git a/src/images/open.svg b/src/images/open.svg
deleted file mode 100644
index 02bbef7..0000000
--- a/src/images/open.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24">
-    <path d="M0 0h24v24H0z" fill="none"/>
-    <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"/>
-</svg>
diff --git a/src/main.ts b/src/main.ts
index 50f5dea..617c57d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,7 +8,6 @@ import _getUserAgentInfo from './userAgentInfo';
 import userSession, { UserSession } from './userSession';
 
 const userAgentInfo = _getUserAgentInfo();
-let configLoaded = false;
 export const tests: SplitTest[] = [];
 export const testsObservable: BehavioralSubject<SplitTest[]> = new BehavioralSubject(tests);
 
@@ -39,7 +38,6 @@ export function config(userConfig: Partial<Config> = {}) {
             _config.userSessionDaysToLive,
         );
     }
-    configLoaded = true;
 }
 
 /**
@@ -128,20 +126,32 @@ export function reset(): void {
     _config.onVariationChange();
 }
 
-const waitUntil = (condition: () => any, checkInterval = 100) => {
-    return new Promise<void>((resolve) => {
+//auto resolves the promise after 2 seconds if the condition is not met - stops a hanging promise
+const waitUntil = (condition: () => any, checkInterval = 100, timeout = 2000) => {
+    return new Promise<void>((resolve, reject) => {
+        const startTime = Date.now();
         const interval = setInterval(() => {
-            if (!condition()) {
-                return;
+            if (condition()) {
+                clearInterval(interval);
+                clearTimeout(safetyTimeout);
+                resolve();
+            } else if (Date.now() - startTime >= timeout) {
+                clearInterval(interval);
+                clearTimeout(safetyTimeout);
+                reject(new Error("Timeout"));
             }
-            clearInterval(interval);
-            resolve();
         }, checkInterval);
+
+        const safetyTimeout = setTimeout(() => {
+            clearInterval(interval);
+            reject(new Error("Timeout"));
+        }, timeout);
     });
 };
 
 export async function shouldShowUI() {
-    await waitUntil(() => configLoaded);
+    // cookie name is provided from split test package user config. Ensures it's loaded before calling the shouldShowUI function
+    await waitUntil(() => _config.cookieName === "trustpilotABTest").catch(()=>{});
     const promises = [
         _config.globalCondition(userAgentInfo),
         _config.uiCondition(userAgentInfo),