diff --git a/lang/main.json b/lang/main.json index 2585859f08..306f902ae2 100644 --- a/lang/main.json +++ b/lang/main.json @@ -939,7 +939,7 @@ "or": "or", "premeeting": "Pre meeting", "proceedAnyway": "Proceed anyway", - "recordingWarning": "This call might be recorded", + "recordingWarning": "Other participants may be recording this call", "screenSharingError": "Screen sharing error:", "showScreen": "Enable pre meeting screen", "startWithPhone": "Start with phone audio", diff --git a/react/features/base/premeeting/components/web/PreMeetingScreen.tsx b/react/features/base/premeeting/components/web/PreMeetingScreen.tsx index 1ccbd60182..4933bf09df 100644 --- a/react/features/base/premeeting/components/web/PreMeetingScreen.tsx +++ b/react/features/base/premeeting/components/web/PreMeetingScreen.tsx @@ -206,9 +206,9 @@ const PreMeetingScreen = ({ {children} {_buttons.length && } {skipPrejoinButton} - {showRecordingWarning && } {showUnsafeRoomWarning && } {showDeviceStatus && } + {showRecordingWarning && } diff --git a/react/features/base/premeeting/components/web/RecordingWarning.tsx b/react/features/base/premeeting/components/web/RecordingWarning.tsx index 73d41985b0..7c9cccd5da 100644 --- a/react/features/base/premeeting/components/web/RecordingWarning.tsx +++ b/react/features/base/premeeting/components/web/RecordingWarning.tsx @@ -2,53 +2,37 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; -import Icon from '../../../icons/components/Icon'; -import { IconRecord } from '../../../icons/svg'; import { withPixelLineHeight } from '../../../styles/functions.web'; const useStyles = makeStyles()(theme => { return { - container: { - backgroundColor: theme.palette.warning01, - borderRadius: theme.shape.borderRadius, - color: theme.palette.text04, + warning: { + bottom: 0, + color: theme.palette.text03, display: 'flex', justifyContent: 'center', ...withPixelLineHeight(theme.typography.bodyShortRegular), marginBottom: theme.spacing(3), marginTop: theme.spacing(2), - paddingBottom: theme.spacing(2), - paddingTop: theme.spacing(2), - width: '100%' - }, - warning: { - alignItems: 'center', - display: 'flex', paddingLeft: theme.spacing(3), - paddingRight: theme.spacing(3) - }, - text: { - fontWeight: 600, - paddingLeft: theme.spacing(2) + paddingRight: theme.spacing(3), + position: 'absolute', + width: '100%', + + '@media (max-width: 720px)': { + position: 'relative' + } } }; }); const RecordingWarning = () => { const { t } = useTranslation(); - const { classes, theme } = useStyles(); - const color = theme.palette.icon04; + const { classes } = useStyles(); return ( -
-
- - - {t('prejoin.recordingWarning')} - -
+
+ {t('prejoin.recordingWarning')}
); }; diff --git a/react/features/prejoin/components/native/Prejoin.tsx b/react/features/prejoin/components/native/Prejoin.tsx index 40eda717a1..bc71101e09 100644 --- a/react/features/prejoin/components/native/Prejoin.tsx +++ b/react/features/prejoin/components/native/Prejoin.tsx @@ -42,7 +42,6 @@ import { isDisplayNameRequired, isRoomNameEnabled } from '../../functions'; import { IPrejoinProps } from '../../types'; import { hasDisplayName } from '../../utils'; -import RecordingWarning from './RecordingWarning'; import { preJoinStyles as styles } from './styles'; @@ -60,8 +59,6 @@ const Prejoin: React.FC = ({ navigation }: IPrejoinProps) => { const isDisplayNameReadonly = useSelector(isNameReadOnly); const roomName = useSelector((state: IReduxState) => getConferenceName(state)); const roomNameEnabled = useSelector((state: IReduxState) => isRoomNameEnabled(state)); - const showRecordingWarning - = useSelector((state: IReduxState) => state['features/base/config'].recordings?.showPrejoinWarning); const participantName = localParticipant?.name; const [ displayName, setDisplayName ] = useState(participantName || ''); @@ -182,7 +179,6 @@ const Prejoin: React.FC = ({ navigation }: IPrejoinProps) => { )} - {showRecordingWarning && } diff --git a/react/features/prejoin/components/native/RecordingWarning.tsx b/react/features/prejoin/components/native/RecordingWarning.tsx index 79cd70f2a3..99ea8f860b 100644 --- a/react/features/prejoin/components/native/RecordingWarning.tsx +++ b/react/features/prejoin/components/native/RecordingWarning.tsx @@ -8,30 +8,19 @@ import { ViewStyle } from 'react-native'; -import Icon from '../../../base/icons/components/Icon'; -import { IconRecord } from '../../../base/icons/svg'; -import BaseTheme from '../../../base/ui/components/BaseTheme.native'; - import { preJoinStyles as styles } from './styles'; const RecordingWarning = (): JSX.Element => { const { t } = useTranslation(); - const color = BaseTheme.palette.icon04; return ( - }> - }> - - }> - { t('prejoin.recordingWarning') } - - + }> + }> + { t('prejoin.recordingWarning') } + ); }; diff --git a/react/features/prejoin/components/native/styles.ts b/react/features/prejoin/components/native/styles.ts index 4105e02ea2..e2f8dbe2e8 100644 --- a/react/features/prejoin/components/native/styles.ts +++ b/react/features/prejoin/components/native/styles.ts @@ -122,30 +122,16 @@ export const preJoinStyles = { paddingHorizontal: BaseTheme.spacing[3], paddingVertical: BaseTheme.spacing[1] }, - recordingWarningContainer: { - backgroundColor: BaseTheme.palette.warning01, - borderRadius: BaseTheme.shape.borderRadius, - color: BaseTheme.palette.text04, + recordingWarning: { display: 'flex', justifyContent: 'center', lineHeight: 22, marginBottom: BaseTheme.spacing[2], marginTop: BaseTheme.spacing[1], - paddingBottom: BaseTheme.spacing[1], - paddingTop: BaseTheme.spacing[1], width: 'auto' }, - recordingWarning: { - alignItems: 'center', - display: 'flex', - flexDirection: 'row', - justifyContent: 'center', - paddingLeft: BaseTheme.spacing[2], - paddingRight: BaseTheme.spacing[2] - }, recordingWarningText: { - fontWeight: '600', - paddingLeft: BaseTheme.spacing[1] + color: BaseTheme.palette.text03 }, unsafeRoomWarningContainer: { height: '100%',