Merge branch 'main' of https://github.com/inlivedev/inlive-room

inlivedev · Feb 7, 2024 · 27570dd · 27570dd
2 parents d607abf + bcc3335
commit 27570dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/_features/room/components/conference-lobby.tsx b/app/_features/room/components/conference-lobby.tsx
@@ -54,7 +54,7 @@ export default function ConferenceLobby({ roomID }: LobbyProps) {
     []
   );
 
-  const { clientName } = useClientContext();
+  const { clientID, clientName } = useClientContext();
 
   const openUpdateClientForm = useCallback(() => {
     document.dispatchEvent(new CustomEvent('open:set-display-name-modal'));
@@ -187,6 +187,8 @@ export default function ConferenceLobby({ roomID }: LobbyProps) {
     }
   }, [videoConstraints, audioConstraints, roomID, isSubmitting]);
 
+  const isError = !clientID || !clientName;
+
   return (
     <>
       <SetDisplayNameModal roomID={roomID} />
@@ -294,9 +296,9 @@ export default function ConferenceLobby({ roomID }: LobbyProps) {
                     <Button
                       className="w-full rounded-lg bg-red-700 px-4 py-2 font-semibold text-zinc-200 antialiased hover:bg-red-600 active:bg-red-500"
                       onClick={openConferenceRoom}
-                      isDisabled={isSubmitting}
-                      aria-disabled={isSubmitting}
-                      disabled={isSubmitting}
+                      isDisabled={isSubmitting || isError}
+                      aria-disabled={isSubmitting || isError}
+                      disabled={isSubmitting || isError}
                     >
                       {isSubmitting ? (
                         <div className="flex gap-2">

diff --git a/app/_shared/middlewares/room.ts b/app/_shared/middlewares/room.ts
@@ -18,8 +18,8 @@ const registerClient = async (roomID: string, clientName: string) => {
     const data = response.data || {};
 
     const client: ClientType.ClientData = {
-      clientID: data.clientID,
-      clientName: data.name,
+      clientID: data.clientID || '',
+      clientName: data.name || clientName,
     };
 
     return client;