mirror of
https://github.com/cinnyapp/cinny.git
synced 2025-11-06 15:30:27 +03:00
fix bug with calls disabling dm and lobby
This commit is contained in:
parent
7a03b91c93
commit
6ad8b477d1
1 changed files with 17 additions and 17 deletions
|
|
@ -32,7 +32,7 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const roomId = useSelectedRoom();
|
const roomId = useSelectedRoom();
|
||||||
const clientConfig = useClientConfig();
|
const clientConfig = useClientConfig();
|
||||||
const room = mx.getRoom(roomId);
|
const room = mx.getRoom(roomId) ?? null;
|
||||||
|
|
||||||
logger.info(room);
|
logger.info(room);
|
||||||
|
|
||||||
|
|
@ -145,7 +145,7 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
|
||||||
return (
|
return (
|
||||||
<Page style={containerStyle}>
|
<Page style={containerStyle}>
|
||||||
<Box direction="Row" grow="Yes" style={{ height: '100%', width: '100%' }}>
|
<Box direction="Row" grow="Yes" style={{ height: '100%', width: '100%' }}>
|
||||||
{activeCallRoomId && roomId && (
|
{activeCallRoomId && roomId && room !== null && (
|
||||||
<Box
|
<Box
|
||||||
shrink="No"
|
shrink="No"
|
||||||
style={{
|
style={{
|
||||||
|
|
@ -153,15 +153,15 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
|
||||||
overflowY: 'auto',
|
overflowY: 'auto',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<PowerLevelsContainer>
|
<PowerLevelsContainer>
|
||||||
<PageRoot
|
<PageRoot
|
||||||
nav={
|
nav={
|
||||||
<MobileFriendlyPageNav path={SPACE_PATH}>
|
<MobileFriendlyPageNav path={SPACE_PATH}>
|
||||||
<Space />
|
<Space />
|
||||||
</MobileFriendlyPageNav>
|
</MobileFriendlyPageNav>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</PowerLevelsContainer>
|
</PowerLevelsContainer>
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|
@ -169,11 +169,11 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
|
||||||
direction="Column"
|
direction="Column"
|
||||||
style={{ position: 'relative', height: '100%', width: '100%', overflow: 'hidden' }}
|
style={{ position: 'relative', height: '100%', width: '100%', overflow: 'hidden' }}
|
||||||
>
|
>
|
||||||
{activeCallRoomId && roomId && (
|
{activeCallRoomId && roomId && room !== null && (
|
||||||
<Box direction="Column" style={{ width: '100%' }}>
|
<Box direction="Column" style={{ width: '100%' }}>
|
||||||
<PowerLevelsContainer>
|
<PowerLevelsContainer>
|
||||||
<RoomViewHeader />
|
<RoomViewHeader />
|
||||||
</PowerLevelsContainer>
|
</PowerLevelsContainer>
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
<Box grow="Yes" style={{ position: 'relative' }}>
|
<Box grow="Yes" style={{ position: 'relative' }}>
|
||||||
|
|
@ -195,10 +195,10 @@ export function PersistentCallContainer({ isVisible }: PersistentCallContainerPr
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
<Box direction="Column" style={{ position: 'relative' }}>
|
<Box direction="Column" style={{ position: 'relative' }}>
|
||||||
{activeCallRoomId && roomId !== null && (
|
{activeCallRoomId && roomId && room !== null && (
|
||||||
<PowerLevelsContainer>
|
<PowerLevelsContainer>
|
||||||
<RoomView room={room} eventId={eventId} />
|
<RoomView room={room} eventId={eventId} />
|
||||||
</PowerLevelsContainer>
|
</PowerLevelsContainer>
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue