🩹(loading) fix header doubled when loading room
the whole screen wrapper thing is not that great… needs improvements to prevent that kind of stuff
This commit is contained in:
@@ -32,16 +32,14 @@ export const Room = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Screen>
|
<Conference
|
||||||
<Conference
|
roomId={roomId}
|
||||||
roomId={roomId}
|
mode={mode}
|
||||||
mode={mode}
|
userConfig={{
|
||||||
userConfig={{
|
...existingUserChoices,
|
||||||
...existingUserChoices,
|
...(skipJoinScreen ? { username: user?.email as string } : {}),
|
||||||
...(skipJoinScreen ? { username: user?.email as string } : {}),
|
...userConfig,
|
||||||
...userConfig,
|
}}
|
||||||
}}
|
/>
|
||||||
/>
|
|
||||||
</Screen>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { ErrorScreen } from './ErrorScreen'
|
import { ErrorScreen } from './ErrorScreen'
|
||||||
import { LoadingScreen } from './LoadingScreen'
|
import { LoadingScreen } from './LoadingScreen'
|
||||||
|
import { Screen } from './Screen'
|
||||||
|
|
||||||
export const QueryAware = ({
|
export const QueryAware = ({
|
||||||
status,
|
status,
|
||||||
@@ -16,5 +17,5 @@ export const QueryAware = ({
|
|||||||
return <LoadingScreen />
|
return <LoadingScreen />
|
||||||
}
|
}
|
||||||
|
|
||||||
return children
|
return <Screen>{children}</Screen>
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user