From 6b4d25c0d360c1ea2cf8f83c76b7ce644dba8ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Thu, 18 Mar 2021 11:56:06 +0100
Subject: [PATCH] fix(rn,ui) move top labels to navbar component

---
 react/features/conference/components/native/Conference.js    | 3 ---
 react/features/conference/components/native/NavigationBar.js | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/react/features/conference/components/native/Conference.js b/react/features/conference/components/native/Conference.js
index 1808e2bed..4da1ac484 100644
--- a/react/features/conference/components/native/Conference.js
+++ b/react/features/conference/components/native/Conference.js
@@ -33,7 +33,6 @@ import {
 } from '../AbstractConference';
 import type { AbstractProps } from '../AbstractConference';
 
-import Labels from './Labels';
 import LonelyMeetingExperience from './LonelyMeetingExperience';
 import NavigationBar from './NavigationBar';
 import styles from './styles';
@@ -277,8 +276,6 @@ class Conference extends AbstractConference<Props, *> {
                     pointerEvents = 'box-none'
                     style = { styles.toolboxAndFilmstripContainer }>
 
-                    <Labels />
-
                     <Captions onPress = { this._onClick } />
 
                     { _shouldDisplayTileView || <Container style = { styles.displayNameContainer }>
diff --git a/react/features/conference/components/native/NavigationBar.js b/react/features/conference/components/native/NavigationBar.js
index 177613438..f5c24c7ae 100644
--- a/react/features/conference/components/native/NavigationBar.js
+++ b/react/features/conference/components/native/NavigationBar.js
@@ -10,6 +10,7 @@ import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
 import { isToolboxVisible } from '../../../toolbox/functions.native';
 import ConferenceTimer from '../ConferenceTimer';
 
+import Labels from './Labels';
 import styles from './styles';
 
 
@@ -68,6 +69,7 @@ const NavigationBar = (props: Props) => {
                 {
                     props._conferenceTimerEnabled && <ConferenceTimer />
                 }
+                <Labels />
             </View>
         </View>
     );