haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(prejoin) use the conference display name instead of the room name 

The room name could be a UUID and the conference display name an actual
name, using the subject.
This commit is contained in:
Saúl Ibarra Corretgé 2022-08-26 10:53:47 +02:00 committed by Saúl Ibarra Corretgé
parent 1010955393
commit 7dba5f8a7e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
react/features/base/premeeting/components/web/PreMeetingScreen.js
View File

@ -6,7 +6,7 @@ import React, { PureComponent } from 'react';
import { connect } from '../../../../base/redux'; import { connect } from '../../../../base/redux';
import DeviceStatus from '../../../../prejoin/components/preview/DeviceStatus'; import DeviceStatus from '../../../../prejoin/components/preview/DeviceStatus';
import { Toolbox } from '../../../../toolbox/components/web'; import { Toolbox } from '../../../../toolbox/components/web';
import { getRoomName } from '../../../conference'; import { getConferenceName } from '../../../conference/functions';
import { PREMEETING_BUTTONS, THIRD_PARTY_PREJOIN_BUTTONS } from '../../../config/constants'; import { PREMEETING_BUTTONS, THIRD_PARTY_PREJOIN_BUTTONS } from '../../../config/constants';
import { getToolbarButtons, isToolbarButtonEnabled } from '../../../config/functions.web'; import { getToolbarButtons, isToolbarButtonEnabled } from '../../../config/functions.web';
import { withPixelLineHeight } from '../../../styles/functions.web'; import { withPixelLineHeight } from '../../../styles/functions.web';
@ -206,7 +206,7 @@ function mapStateToProps(state, ownProps): Object {
? premeetingButtons ? premeetingButtons
: premeetingButtons.filter(b => isToolbarButtonEnabled(b, toolbarButtons)), : premeetingButtons.filter(b => isToolbarButtonEnabled(b, toolbarButtons)),
_premeetingBackground: premeetingBackground, _premeetingBackground: premeetingBackground,
_roomName: getRoomName(state) _roomName: getConferenceName(state)
}; };
} }

4
react/features/lobby/components/native/LobbyScreen.js
View File

@ -3,7 +3,7 @@
import React from 'react'; import React from 'react';
import { Text, View, TextInput } from 'react-native'; import { Text, View, TextInput } from 'react-native';
import { getRoomName } from '../../../base/conference'; import { getConferenceName } from '../../../base/conference/functions';
import { translate } from '../../../base/i18n'; import { translate } from '../../../base/i18n';
import JitsiScreen from '../../../base/modal/components/JitsiScreen'; import JitsiScreen from '../../../base/modal/components/JitsiScreen';
import { LoadingIndicator } from '../../../base/react'; import { LoadingIndicator } from '../../../base/react';
@ -301,7 +301,7 @@ function _mapStateToProps(state: Object, ownProps: Props) {
return { return {
...abstractMapStateToProps(state, ownProps), ...abstractMapStateToProps(state, ownProps),
_aspectRatio: state['features/base/responsive-ui'].aspectRatio, _aspectRatio: state['features/base/responsive-ui'].aspectRatio,
_roomName: getRoomName(state) _roomName: getConferenceName(state)
}; };
} }

4
react/features/prejoin/components/Prejoin.native.tsx
View File

@ -18,7 +18,7 @@ import { appNavigate } from '../../app/actions.native';
// @ts-ignore // @ts-ignore
import { setAudioOnly } from '../../base/audio-only/actions'; import { setAudioOnly } from '../../base/audio-only/actions';
// @ts-ignore // @ts-ignore
import { getRoomName } from '../../base/conference/functions'; import { getConferenceName } from '../../base/conference/functions';
// @ts-ignore // @ts-ignore
import { connect } from '../../base/connection/actions.native'; import { connect } from '../../base/connection/actions.native';
import { IconClose } from '../../base/icons/svg/index'; import { IconClose } from '../../base/icons/svg/index';
@ -64,7 +64,7 @@ const Prejoin: React.FC<PrejoinProps> = ({ navigation }: PrejoinProps) => {
); );
const localParticipant = useSelector((state: any) => getLocalParticipant(state)); const localParticipant = useSelector((state: any) => getLocalParticipant(state));
const isDisplayNameMandatory = useSelector(state => isDisplayNameRequired(state)); const isDisplayNameMandatory = useSelector(state => isDisplayNameRequired(state));
const roomName = useSelector(state => getRoomName(state)); const roomName = useSelector(state => getConferenceName(state));
const participantName = localParticipant?.name; const participantName = localParticipant?.name;
const [ displayName, setDisplayName ] const [ displayName, setDisplayName ]
= useState(participantName || ''); = useState(participantName || '');