From af0f96f702948a58e0c68f82e95a63894fdf9308 Mon Sep 17 00:00:00 2001
From: Tomasz Mazur <47872060+AHGIJMKLKKZNPJKQR@users.noreply.github.com>
Date: Wed, 21 Jan 2026 13:39:35 +0100
Subject: [PATCH 1/2] Use async-await

---
 src/App.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 168ffa4..4a3c0e7 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -14,9 +14,10 @@ function App() {
 
   useEffect(() => {
     if (!room) return;
-    getSandboxPeerToken(room, peer).then((peerToken) =>
-      joinRoom({ peerToken, peerMetadata: { name: peer } }),
-    );
+    (async () => {
+      const peerToken = await getSandboxPeerToken(room, peer);
+      await joinRoom({ peerToken, peerMetadata: { name: peer } });
+    })();
   }, [joinRoom, getSandboxPeerToken, room, peer]);
 
   return (

From b0e62ede79d1fe65f10d86568cf2def5e7a6dc35 Mon Sep 17 00:00:00 2001
From: Tomasz Mazur <47872060+AHGIJMKLKKZNPJKQR@users.noreply.github.com>
Date: Wed, 21 Jan 2026 14:52:11 +0100
Subject: [PATCH 2/2] Fix connecting

---
 src/App.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 4a3c0e7..2e8660d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -7,18 +7,20 @@ import Footer from "./components/Footer";
 import { Toaster } from "./components/ui/sonner";
 
 function App() {
-  const { joinRoom } = useConnection();
+  const { joinRoom, peerStatus } = useConnection();
   const { room } = useParams();
   const peer = useMemo(() => crypto.randomUUID(), []);
   const { getSandboxPeerToken } = useSandbox();
 
   useEffect(() => {
-    if (!room) return;
-    (async () => {
+    const join = async () => {
+      if (!room || peerStatus === "connected" || peerStatus === "connecting")
+        return;
       const peerToken = await getSandboxPeerToken(room, peer);
       await joinRoom({ peerToken, peerMetadata: { name: peer } });
-    })();
-  }, [joinRoom, getSandboxPeerToken, room, peer]);
+    };
+    join();
+  }, [peer, room, getSandboxPeerToken, joinRoom, peerStatus]);
 
   return (
     <>