From 40b63a187ab7cccdbe6ea0debaa428e2d922fb12 Mon Sep 17 00:00:00 2001 From: Calinteodor Date: Tue, 6 Feb 2024 10:54:27 +0200 Subject: [PATCH] feat(conference): remove one2one check for diplaying participants name (#14324) * feat(conference): remove one2one check for diplaying participants name --- .../components/native/Conference.tsx | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/react/features/conference/components/native/Conference.tsx b/react/features/conference/components/native/Conference.tsx index 2dde4735ff..37d08207e5 100644 --- a/react/features/conference/components/native/Conference.tsx +++ b/react/features/conference/components/native/Conference.tsx @@ -17,7 +17,6 @@ import { IReduxState, IStore } from '../../../app/types'; import { CONFERENCE_BLURRED, CONFERENCE_FOCUSED } from '../../../base/conference/actionTypes'; import { FULLSCREEN_ENABLED, PIP_ENABLED } from '../../../base/flags/constants'; import { getFeatureFlag } from '../../../base/flags/functions'; -import { getParticipantCount } from '../../../base/participants/functions'; import Container from '../../../base/react/components/native/Container'; import LoadingIndicator from '../../../base/react/components/native/LoadingIndicator'; import TintedView from '../../../base/react/components/native/TintedView'; @@ -101,11 +100,6 @@ interface IProps extends AbstractProps { */ _fullscreenEnabled: boolean; - /** - * The indicator which determines if the conference type is one to one. - */ - _isOneToOneConference: boolean; - /** * The indicator which determines if the participants pane is open. */ @@ -370,7 +364,6 @@ class Conference extends AbstractConference { _aspectRatio, _connecting, _filmstripVisible, - _isOneToOneConference, _largeVideoParticipantId, _reducedUI, _shouldDisplayTileView, @@ -426,13 +419,11 @@ class Conference extends AbstractConference { { - _shouldDisplayTileView || ( - !_isOneToOneConference - && - - - ) + _shouldDisplayTileView + || + + } { !_shouldDisplayTileView && } @@ -573,7 +564,6 @@ function _mapStateToProps(state: IReduxState, _ownProps: any) { const { backgroundColor } = state['features/dynamic-branding']; const { startCarMode } = state['features/base/settings']; const { enabled: audioOnlyEnabled } = state['features/base/audio-only']; - const participantCount = getParticipantCount(state); const brandingStyles = backgroundColor ? { backgroundColor } : undefined; @@ -587,7 +577,6 @@ function _mapStateToProps(state: IReduxState, _ownProps: any) { _connecting: isConnecting(state), _filmstripVisible: isFilmstripVisible(state), _fullscreenEnabled: getFeatureFlag(state, FULLSCREEN_ENABLED, true), - _isOneToOneConference: Boolean(participantCount === 2), _isParticipantsPaneOpen: isOpen, _largeVideoParticipantId: state['features/large-video'].participantId, _pictureInPictureEnabled: getFeatureFlag(state, PIP_ENABLED),