Skip to content

Commit

Permalink
🩹(loading) fix header doubled when loading room
Browse files Browse the repository at this point in the history
the whole screen wrapper thing is not that great… needs improvements to
prevent that kind of stuff
  • Loading branch information
manuhabitela committed Jul 29, 2024
1 parent 9edb9c2 commit 34e21b7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
20 changes: 9 additions & 11 deletions src/frontend/src/features/rooms/routes/Room.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,14 @@ export const Room = () => {
}

return (
<Screen>
<Conference
roomId={roomId}
mode={mode}
userConfig={{
...existingUserChoices,
...(skipJoinScreen ? { username: user?.email as string } : {}),
...userConfig,
}}
/>
</Screen>
<Conference
roomId={roomId}
mode={mode}
userConfig={{
...existingUserChoices,
...(skipJoinScreen ? { username: user?.email as string } : {}),
...userConfig,
}}
/>
)
}
3 changes: 2 additions & 1 deletion src/frontend/src/layout/QueryAware.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ErrorScreen } from './ErrorScreen'
import { LoadingScreen } from './LoadingScreen'
import { Screen } from './Screen'

export const QueryAware = ({
status,
Expand All @@ -16,5 +17,5 @@ export const QueryAware = ({
return <LoadingScreen />
}

return children
return <Screen>{children}</Screen>
}

0 comments on commit 34e21b7

Please sign in to comment.