Skip to content

Commit ef53604

Browse files
authored
Merge branch 'epic/AC-DC' into TTS-269
2 parents 9667744 + 07f6b75 commit ef53604

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

src/Components/ExternalStreamsDrawer.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ import {
1313
ListItemText,
1414
ListItemSecondaryAction,
1515
CircularProgress,
16+
Tooltip,
1617
} from '@mui/material';
1718
import { useTranslation } from 'react-i18next';
1819
import CloseDrawerButton from './DrawerButton';
1920
import { getRed5DrawerStyle } from '../styles/themeUtil';
2021
import { SvgIcon } from './SvgIcon';
2122
import { ExternalStream } from '../hooks/useExternalStreams';
2223

23-
import { parseMetaData } from '../utils/utils';
24+
import { parseMetaData, truncateText } from '../utils/utils';
2425
import { MetaDataKeys } from '../constants/metaDataKeys';
2526

2627
interface ExternalStreamsDrawerProps {
@@ -179,10 +180,12 @@ const ExternalStreamsDrawer = React.memo<ExternalStreamsDrawerProps>((props) =>
179180
},
180181
}}
181182
>
182-
<ListItemText
183-
primary={stream.streamName}
184-
secondary={isJoined ? t('Joined') : null}
185-
/>
183+
<Tooltip title={stream.streamName} placement="top">
184+
<ListItemText
185+
primary={truncateText(stream.streamName, 8)}
186+
secondary={isJoined ? t('Joined') : null}
187+
/>
188+
</Tooltip>
186189
<ListItemSecondaryAction>
187190
<Button
188191
variant={isJoined ? 'outlined' : 'contained'}

src/pages/LeftTheRoom/LeftTheRoom.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ function LeftTheRoom({
138138
)}
139139

140140
{hasRecording && (
141-
<Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1, margin: '21px' }}>
141+
<Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1, mt: 2 }}>
142142
<Button
143143
size="small"
144144
color="primary"
145145
variant="outlined"
146146
onClick={() => downloadLocalRecording?.()}
147-
sx={{ whiteSpace: 'nowrap', width: '100%' }}
147+
sx={{ width: '100%' }}
148148
>
149149
{t('Download Recording')}
150150
</Button>
@@ -155,7 +155,7 @@ function LeftTheRoom({
155155
variant="contained"
156156
startIcon={<ReplayIcon />}
157157
onClick={() => retryUploadLocalRecording?.()}
158-
sx={{ whiteSpace: 'nowrap', width: '100%' }}
158+
sx={{ width: '100%' }}
159159
>
160160
{t('Retry Upload')}
161161
</Button>

src/pages/Meeting/MeetingPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ const MeetingPage = React.memo<MeetingPageProps>((props) => {
143143
props.isMyCamTurnedOff,
144144
props.isRaiseHand,
145145
props.currentConferenceClient,
146+
props.selectedBackgroundMode,
146147
]);
147148

148149
const keyboardShortcuts = useKeyboardShortcuts({

0 commit comments

Comments
 (0)