Merge branch 'main' of https://github.com/SuperViz/sv-activation-app …

…into develop
SuperViz · Sep 5, 2024 · 0f6d65d · 0f6d65d
2 parents f27e10c + 382a838
commit 0f6d65d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/components/CardLink/index.tsx b/src/components/CardLink/index.tsx
@@ -31,12 +31,24 @@ export default function CardLink({
       userEmail: user.email,
     }).then(() => {
       if (page === ActivationTypePage.HACKATHON) {
-        window.open("https://47xzvrbdgjk.typeform.com/to/cqzci1gD", "_blank");
+        const url = "https://47xzvrbdgjk.typeform.com/to/cqzci1gD"
+        const newWindow = window.open(url, "_blank");
+
+        if (!newWindow || newWindow.closed || typeof newWindow.closed === 'undefined') {
+          window.location.href = url;
+        }
+
         return;
       }
 
       if (page === ActivationTypePage.NEWSLETTER) {
-        window.open("https://47xzvrbdgjk.typeform.com/to/eGJ6c0Ah", "_blank");
+        const url = "https://47xzvrbdgjk.typeform.com/to/eGJ6c0Ah"
+        const newWindow = window.open(url, "_blank");
+
+        if (!newWindow || newWindow.closed || typeof newWindow.closed === 'undefined') {
+          window.location.href = url;
+        }
+
         return;
       }
 

diff --git a/src/components/UsersDashboard/index.tsx b/src/components/UsersDashboard/index.tsx
@@ -429,7 +429,7 @@ export default function UsersDashboard() {
   function createUser(user: IUser) {
     const ball = createBall(user);
 
-    if (ballsRef.current?.some((ball) => ball.user.id === user.id)) return;
+    if (ballsRef.current?.some((ball) => ball.user.id === user?.id)) return;
 
     ballsRef.current = [...ballsRef.current, ball];
     setBalls((previous) => [...previous, ball]);