fix(ios,fastlane) adjust scheme name after rename

fix(android) avoid crashes if view is null
This may happen due to API misuse, but also in complex applications where activity lifetimes are not straightforward.
2026-01-24 15:40:18 +00:00 · 2020-12-22 14:07:10 +01:00 · 2020-12-22 13:53:39 +01:00 · 2020-12-22 10:36:10 +01:00 · 2020-12-22 10:12:52 +01:00 · 2020-12-21 13:00:59 +02:00
74 changed files with 2057 additions and 1703 deletions
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -25,10 +25,6 @@ android {
    sourceSets {
        main {
            java {
-                if (rootProject.ext.libreBuild) {
-                    srcDir "src"
-                    exclude "**/AmplitudeModule.java"
-                }
                exclude "test/"
            }
        }
@@ -52,18 +48,18 @@ dependencies {
    implementation 'com.squareup.duktape:duktape-android:1.3.0'

    if (!rootProject.ext.libreBuild) {
-        implementation 'com.amplitude:android-sdk:2.14.1'
        implementation(project(":react-native-google-signin")) {
            exclude group: 'com.google.android.gms'
            exclude group: 'androidx'
        }
    }

+    implementation project(':react-native-async-storage')
    implementation project(':react-native-background-timer')
    implementation project(':react-native-calendar-events')
-    implementation project(':react-native-community-async-storage')
    implementation project(':react-native-community_netinfo')
    implementation project(':react-native-default-preference')
+    implementation project(':react-native-device-info')
    implementation project(':react-native-immersive')
    implementation project(':react-native-keep-awake')
    implementation project(':react-native-linear-gradient')
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java
@@ -1,122 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReadableMap;
-
-import com.amplitude.api.Amplitude;
-import com.facebook.react.module.annotations.ReactModule;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Implements the react-native module for the Amplitude integration.
- */
-@ReactModule(name = AmplitudeModule.NAME)
-class AmplitudeModule
-        extends ReactContextBaseJavaModule {
-
-    public static final String NAME = "Amplitude";
-    public static final String JITSI_PREFERENCES = "jitsi-preferences";
-    public static final String AMPLITUDE_DEVICE_ID_KEY = "amplitudeDeviceId";
-
-    public AmplitudeModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    /**
-     * Initializes the Amplitude SDK.
-     *
-     * @param instanceName The name of the Amplitude instance. Should
-     * be used only for multi-project logging.
-     * @param apiKey The API_KEY of the Amplitude project.
-     */
-    @ReactMethod
-    @SuppressLint("HardwareIds")
-    public void init(String instanceName, String apiKey) {
-        Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
-
-        // Set the device ID to something consistent.
-        SharedPreferences sharedPreferences = getReactApplicationContext().getSharedPreferences(JITSI_PREFERENCES, Context.MODE_PRIVATE);
-        String android_id = sharedPreferences.getString(AMPLITUDE_DEVICE_ID_KEY, "");
-        if (!TextUtils.isEmpty(android_id)) {
-            Amplitude.getInstance(instanceName).setDeviceId(android_id);
-        } else {
-            String amplitudeId = Amplitude.getInstance(instanceName).getDeviceId();
-            SharedPreferences.Editor editor = sharedPreferences.edit();
-            editor.putString(JITSI_PREFERENCES, amplitudeId).apply();
-        }
-    }
-
-    /**
-     * Sets the user ID for an Amplitude instance.
-     *
-     * @param instanceName The name of the Amplitude instance.
-     * @param userId The new value for the user ID.
-     */
-    @ReactMethod
-    public void setUserId(String instanceName, String userId) {
-            Amplitude.getInstance(instanceName).setUserId(userId);
-    }
-
-    /**
-     * Sets the user properties for an Amplitude instance.
-     *
-     * @param instanceName The name of the Amplitude instance.
-     * @param userProps JSON string with user properties to be set.
-     */
-    @ReactMethod
-    public void setUserProperties(String instanceName, ReadableMap userProps) {
-        if (userProps != null) {
-            Amplitude.getInstance(instanceName).setUserProperties(
-                    new JSONObject(userProps.toHashMap()));
-        }
-    }
-
-    /**
-     * Log an analytics event.
-     *
-     * @param instanceName The name of the Amplitude instance.
-     * @param eventType The event type.
-     * @param eventPropsString JSON string with the event properties.
-     */
-    @ReactMethod
-    public void logEvent(String instanceName, String eventType, String eventPropsString) {
-        try {
-            JSONObject eventProps = new JSONObject(eventPropsString);
-            Amplitude.getInstance(instanceName).logEvent(eventType, eventProps);
-        } catch (JSONException e) {
-            JitsiMeetLogger.e(e, "Error logging event");
-        }
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
@@ -107,7 +107,7 @@ public class JitsiMeetActivity extends FragmentActivity
    protected JitsiMeetView getJitsiView() {
        JitsiMeetFragment fragment
            = (JitsiMeetFragment) getSupportFragmentManager().findFragmentById(R.id.jitsiFragment);
-        return fragment.getJitsiView();
+        return fragment != null ? fragment.getJitsiView() : null;
    }

    public void join(@Nullable String url) {
@@ -119,11 +119,23 @@ public class JitsiMeetActivity extends FragmentActivity
    }

    public void join(JitsiMeetConferenceOptions options) {
-        getJitsiView().join(options);
+        JitsiMeetView view = getJitsiView();
+
+        if (view != null) {
+            view.join(options);
+        } else {
+            JitsiMeetLogger.w("Cannot join, view is null");
+        }
    }

    public void leave() {
-        getJitsiView().leave();
+        JitsiMeetView view = getJitsiView();
+
+        if (view != null) {
+            view.leave();
+        } else {
+            JitsiMeetLogger.w("Cannot leave, view is null");
+        }
    }

    private @Nullable JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
@@ -191,7 +203,11 @@ public class JitsiMeetActivity extends FragmentActivity

    @Override
    protected void onUserLeaveHint() {
-        getJitsiView().enterPictureInPicture();
+        JitsiMeetView view = getJitsiView();
+
+        if (view != null) {
+            view.enterPictureInPicture();
+        }
    }

    // JitsiMeetActivityInterface
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@@ -91,14 +91,6 @@ class ReactInstanceManagerHolder {

        nativeModules.add(new WebRTCModule(reactContext, options));

-        try {
-            Class<?> amplitudeModuleClass = Class.forName("org.jitsi.meet.sdk.AmplitudeModule");
-            Constructor constructor = amplitudeModuleClass.getConstructor(ReactApplicationContext.class);
-            nativeModules.add((NativeModule)constructor.newInstance(reactContext));
-        } catch (Exception e) {
-            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-        }
-
        return nativeModules;
    }

@@ -192,6 +184,7 @@ class ReactInstanceManagerHolder {
                new com.facebook.react.shell.MainReactPackage(),
                new com.horcrux.svg.SvgPackage(),
                new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(),
+                new com.learnium.RNDeviceInfo.RNDeviceInfo(),
                new com.ocetnik.timer.BackgroundTimerPackage(),
                new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                new com.reactnativecommunity.netinfo.NetInfoPackage(),
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,16 +1,18 @@
 rootProject.name = 'jitsi-meet'

 include ':app', ':sdk'
+include ':react-native-async-storage'
+project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
 include ':react-native-background-timer'
 project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
 include ':react-native-calendar-events'
 project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android')
-include ':react-native-community-async-storage'
-project(':react-native-community-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
 include ':react-native-community_netinfo'
 project(':react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
 include ':react-native-default-preference'
 project(':react-native-default-preference').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-default-preference/android')
+include ':react-native-device-info'
+project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
 include ':react-native-google-signin'
 project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
 include ':react-native-immersive'
--- a/conference.js
+++ b/conference.js
@@ -2011,6 +2011,7 @@ export default {
                            formattedDisplayName
                                || interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME)
                });
+                APP.UI.changeDisplayName(id, formattedDisplayName);
            }
        );
        room.on(
@@ -2049,7 +2050,10 @@ export default {
            (...args) => APP.store.dispatch(lockStateChanged(room, ...args)));

        room.on(JitsiConferenceEvents.KICKED, participant => {
+            APP.UI.hideStats();
            APP.store.dispatch(kickedOut(room, participant));
+
+            // FIXME close
        });

        room.on(JitsiConferenceEvents.PARTICIPANT_KICKED, (kicker, kicked) => {
@@ -2382,6 +2386,11 @@ export default {
        APP.keyboardshortcut.init();

        APP.store.dispatch(conferenceJoined(room));
+
+        const displayName
+            = APP.store.getState()['features/base/settings'].displayName;
+
+        APP.UI.changeDisplayName('localVideoContainer', displayName);
    },

    /**
@@ -2859,6 +2868,10 @@ export default {
        APP.store.dispatch(updateSettings({
            displayName: formattedNickname
        }));
+
+        if (room) {
+            APP.UI.changeDisplayName(id, formattedNickname);
+        }
    },

    /**
--- a/config.js
+++ b/config.js
@@ -616,7 +616,7 @@ var config = {
         logoImageUrl: 'https://example.com/logo-img.png'
     }
    */
-    // brandingDataUrl: '',
+    // dynamicBrandingUrl: '',

    // The URL of the moderated rooms microservice, if available. If it
    // is present, a link to the service will be rendered on the welcome page,
--- a/css/_welcome_page.scss
+++ b/css/_welcome_page.scss
@@ -90,7 +90,7 @@ body.welcome-page {
                    color: $defaultWarningColor;
                    display: flex;
                    flex-direction: row;
-                    margin-top: 5px;
+                    margin-top: 15px;

                    .jitsi-icon {
                        margin-right: 15px;
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -3,7 +3,7 @@ workspace 'jitsi-meet'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 install! 'cocoapods', :deterministic_uuids => false

-target 'jitsi-meet' do
+target 'JitsiMeet' do
  project 'app/app.xcodeproj'

  pod 'Firebase/Analytics', '~> 6.33.0'
@@ -11,7 +11,7 @@ target 'jitsi-meet' do
  pod 'Firebase/DynamicLinks', '~> 6.33.0'
 end

-target 'JitsiMeet' do
+target 'JitsiMeetSDK' do
  project 'sdk/sdk.xcodeproj'

  # React Native and its dependencies
@@ -58,21 +58,21 @@ target 'JitsiMeet' do
  pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events'
  pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake'
  pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
+  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
  pod 'react-native-webview', :path => '../node_modules/react-native-webview'
  pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
  pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
-  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage'
+  pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-async-storage/async-storage'
+  pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
  pod 'RNGoogleSignin', :path => '../node_modules/@react-native-community/google-signin'
  pod 'RNSound', :path => '../node_modules/react-native-sound'
  pod 'RNSVG', :path => '../node_modules/react-native-svg'
  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
  pod 'RNDefaultPreference', :path => '../node_modules/react-native-default-preference'
-  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'

  # Native pod dependencies
  #

-  pod 'Amplitude-iOS', '~> 4.0.4'
  pod 'CocoaLumberjack', '~>3.5.3'
  pod 'ObjectiveDropboxOfficial', '~> 3.9.4'

--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,5 +1,4 @@
 PODS:
-  - Amplitude-iOS (4.0.4)
  - AppAuth (1.2.0):
    - AppAuth/Core (= 1.2.0)
    - AppAuth/ExternalUserAgent (= 1.2.0)
@@ -293,7 +292,7 @@ PODS:
    - React
  - react-native-splash-screen (3.2.0):
    - React
-  - react-native-webrtc (1.87.1):
+  - react-native-webrtc (1.87.2):
    - React-Core
  - react-native-webview (11.0.2):
    - React-Core
@@ -351,10 +350,12 @@ PODS:
    - React-jsi (= 0.61.5-jitsi.2)
    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.2)
    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.2)
-  - RNCAsyncStorage (1.3.4):
+  - RNCAsyncStorage (1.13.2):
    - React
  - RNDefaultPreference (1.4.2):
    - React
+  - RNDeviceInfo (7.3.1):
+    - React-Core
  - RNGoogleSignin (3.0.1):
    - GoogleSignIn (~> 5.0.0)
    - React
@@ -370,7 +371,6 @@ PODS:
  - Yoga (1.14.0)

 DEPENDENCIES:
-  - Amplitude-iOS (~> 4.0.4)
  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
  - CocoaLumberjack (~> 3.5.3)
  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
@@ -410,8 +410,9 @@ DEPENDENCIES:
  - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
  - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
  - ReactCommon/turbomodule (from `../node_modules/react-native/ReactCommon`)
-  - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
+  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
  - RNDefaultPreference (from `../node_modules/react-native-default-preference`)
+  - RNDeviceInfo (from `../node_modules/react-native-device-info`)
  - "RNGoogleSignin (from `../node_modules/@react-native-community/google-signin`)"
  - RNSound (from `../node_modules/react-native-sound`)
  - RNSVG (from `../node_modules/react-native-svg`)
@@ -420,7 +421,6 @@ DEPENDENCIES:

 SPEC REPOS:
  trunk:
-    - Amplitude-iOS
    - AppAuth
    - boost-for-react-native
    - CocoaLumberjack
@@ -507,9 +507,11 @@ EXTERNAL SOURCES:
  ReactCommon:
    :path: "../node_modules/react-native/ReactCommon"
  RNCAsyncStorage:
-    :path: "../node_modules/@react-native-community/async-storage"
+    :path: "../node_modules/@react-native-async-storage/async-storage"
  RNDefaultPreference:
    :path: "../node_modules/react-native-default-preference"
+  RNDeviceInfo:
+    :path: "../node_modules/react-native-device-info"
  RNGoogleSignin:
    :path: "../node_modules/@react-native-community/google-signin"
  RNSound:
@@ -522,7 +524,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon/yoga"

 SPEC CHECKSUMS:
-  Amplitude-iOS: 2ad4d7270c99186236c1272a3a9425463b1ae1a7
  AppAuth: bce82c76043657c99d91e7882e8a9e1a93650cd4
  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
@@ -562,7 +563,7 @@ SPEC CHECKSUMS:
  react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
  react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
  react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webrtc: 40eca4cac200fda34fb843da07e3402211bbbd10
+  react-native-webrtc: e6fca8432542dd1c77afa6c59629f0176ed78ee6
  react-native-webview: b2542d6fd424bcc3e3b2ec5f854f0abb4ec86c87
  React-RCTActionSheet: bcbc311dc3b47bc8efb2737ff0940239a45789a9
  React-RCTAnimation: 65f61080ce632f6dea23d52e354ffac9948396c6
@@ -574,14 +575,15 @@ SPEC CHECKSUMS:
  React-RCTText: 4f1b99f228278d2a5e9008eced8dc9c974c4a270
  React-RCTVibration: c1041024893fdfdb8371e7c720c437751b711676
  ReactCommon: 18014e1d98dbeb9141e935cfe35fc93bd511ffb6
-  RNCAsyncStorage: 8e31405a9f12fbf42c2bb330e4560bfd79c18323
+  RNCAsyncStorage: bc2f81cc1df90c267ce9ed30bb2dbc93b945a8ee
  RNDefaultPreference: 56a405ce61033ac77b95004dccd7ac54c2eb50d1
+  RNDeviceInfo: 57bb2806fb7bd982a1434e9f0b4e6a6ab1f6702e
  RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
  RNSound: c980916b596cc15c8dcd2f6ecd3b13c4881dbe20
  RNSVG: 069864be08c9fe065a2cf7e63656a34c78653c99
  RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3
  Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c

-PODFILE CHECKSUM: f6626cd705333112182cedbe175ae2f9006e8874
+PODFILE CHECKSUM: 5be5132e41831a98362eeed760558227a4df89ae

 COCOAPODS: 1.10.0
--- a/ios/app/app.xcodeproj/project.pbxproj
+++ b/ios/app/app.xcodeproj/project.pbxproj
@@ -7,8 +7,6 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		0B26BE6E1EC5BC3C00EEFB41 /* JitsiMeet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */; };
-		0B26BE6F1EC5BC3C00EEFB41 /* JitsiMeet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		0B412F1F1EDEE6E800B1A0A6 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */; };
 		0B412F211EDEE95300B1A0A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0B412F201EDEE95300B1A0A6 /* Main.storyboard */; };
 		0B5418471F7C5D8C00A2DD86 /* MeetingRowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */; };
@@ -25,10 +23,12 @@
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */; };
+		55BEDABDA92D47D399A70A5E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */; };
 		DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; };
 		DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; };
+		DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; };
+		DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E588011722789D43008B0561 /* JitsiMeetContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58801132278944E008B0561 /* JitsiMeetContext.swift */; };
 		E5C97B63227A1EB400199214 /* JitsiMeetCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */; };
 /* End PBXBuildFile section */
@@ -57,8 +57,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */,
 				DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */,
-				0B26BE6F1EC5BC3C00EEFB41 /* JitsiMeet.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -115,14 +115,17 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-jitsi-meet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-jitsi-meet/Pods-jitsi-meet.debug.xcconfig"; sourceTree = "<group>"; };
-		489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-jitsi-meet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = "<group>"; };
+		D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE050388256E904600DEE3A5 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/apple/WebRTC.xcframework"; sourceTree = "<group>"; };
 		DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = "<group>"; };
 		DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = "<group>"; };
+		DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.xcframework"; sourceTree = "<group>"; };
 		E58801132278944E008B0561 /* JitsiMeetContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetContext.swift; sourceTree = "<group>"; };
 		E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetCommands.swift; sourceTree = "<group>"; };
+		FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -137,9 +140,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0B26BE6E1EC5BC3C00EEFB41 /* JitsiMeet.framework in Frameworks */,
-				695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */,
 				DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */,
+				DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */,
+				55BEDABDA92D47D399A70A5E /* libPods-JitsiMeet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -156,11 +159,12 @@
 		0B26BE711EC5BC4D00EEFB41 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */,
 				DE050388256E904600DEE3A5 /* WebRTC.xcframework */,
 				0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */,
 				DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */,
 				0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */,
-				489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */,
+				D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -217,6 +221,8 @@
 			children = (
 				4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */,
 				09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */,
+				609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */,
+				FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -284,9 +290,9 @@
 			productReference = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */;
 			productType = "com.apple.product-type.watchkit2-extension";
 		};
-		13B07F861A680F5B00A75B9A /* jitsi-meet */ = {
+		13B07F861A680F5B00A75B9A /* JitsiMeet */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */;
+			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
 			buildPhases = (
 				B6607F42A5CF0C76E98929E2 /* [CP] Check Pods Manifest.lock */,
 				0BBA83C41EC9F7600075A103 /* Run React packager */,
@@ -305,7 +311,7 @@
 			dependencies = (
 				0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */,
 			);
-			name = "jitsi-meet";
+			name = JitsiMeet;
 			productName = "Jitsi Meet";
 			productReference = 13B07F961A680F5B00A75B9A /* jitsi-meet.app */;
 			productType = "com.apple.product-type.application";
@@ -356,7 +362,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				13B07F861A680F5B00A75B9A /* jitsi-meet */,
+				13B07F861A680F5B00A75B9A /* JitsiMeet */,
 				0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */,
 				0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */,
 			);
@@ -437,7 +443,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-jitsi-meet-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-JitsiMeet-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -707,7 +713,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */;
+			baseConfigurationReference = 609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
@@ -736,7 +742,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */;
+			baseConfigurationReference = FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
@@ -897,7 +903,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */ = {
+		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				13B07F941A680F5B00A75B9A /* Debug */,
--- a/ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme
+++ b/ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme
@@ -15,8 +15,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-               BuildableName = "JitsiMeet.framework"
-               BlueprintName = "JitsiMeet"
+               BuildableName = "JitsiMeetSDK.framework"
+               BlueprintName = "JitsiMeetSDK"
               ReferencedContainer = "container:../sdk/sdk.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -30,7 +30,7 @@
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
               BuildableName = "jitsi-meet.app"
-               BlueprintName = "jitsi-meet"
+               BlueprintName = "JitsiMeet"
               ReferencedContainer = "container:app.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -46,7 +46,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
            BuildableName = "jitsi-meet.app"
-            BlueprintName = "jitsi-meet"
+            BlueprintName = "JitsiMeet"
            ReferencedContainer = "container:app.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -69,7 +69,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
            BuildableName = "jitsi-meet.app"
-            BlueprintName = "jitsi-meet"
+            BlueprintName = "JitsiMeet"
            ReferencedContainer = "container:app.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
@@ -86,7 +86,7 @@
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
            BuildableName = "jitsi-meet.app"
-            BlueprintName = "jitsi-meet"
+            BlueprintName = "JitsiMeet"
            ReferencedContainer = "container:app.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
--- a/ios/app/src/AppDelegate.m
+++ b/ios/app/src/AppDelegate.m
@@ -21,7 +21,7 @@
 #import "ViewController.h"

@import Firebase;
-@import JitsiMeet;
+@import JitsiMeetSDK;

@implementation AppDelegate

--- a/ios/app/src/FIRUtilities.m
+++ b/ios/app/src/FIRUtilities.m
@@ -16,7 +16,7 @@

 #import "FIRUtilities.h"

-@import JitsiMeet;
+@import JitsiMeetSDK;

@implementation FIRUtilities

--- a/ios/app/src/ViewController.h
+++ b/ios/app/src/ViewController.h
@@ -14,9 +14,8 @@
 * limitations under the License.
 */

-#import <UIKit/UIKit.h>
-
-#import <JitsiMeet/JitsiMeet.h>
+@import UIKit;
+@import JitsiMeetSDK;

@interface ViewController : UIViewController<JitsiMeetViewDelegate>

--- a/ios/app/src/ViewController.m
+++ b/ios/app/src/ViewController.m
@@ -21,7 +21,7 @@
@import MobileCoreServices;
@import Intents;  // Needed for NSUserActivity suggestedInvocationPhrase

-@import JitsiMeet;
+@import JitsiMeetSDK;

 #import "Types.h"
 #import "ViewController.h"
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -54,7 +54,7 @@ platform :ios do

    # Actually build the app
    build_app(
-        scheme: "jitsi-meet",
+        scheme: "JitsiMeet",
        include_bitcode: true,
        include_symbols: true,
        export_xcargs: "-allowProvisioningUpdates"
--- a/ios/scripts/release-sdk.sh
+++ b/ios/scripts/release-sdk.sh
@@ -27,10 +27,10 @@ pushd ${PROJECT_REPO}
 rm -rf ios/sdk/out
 xcodebuild clean \
    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeet
+    -scheme JitsiMeetSDK
 xcodebuild archive \
    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeet  \
+    -scheme JitsiMeetSDK  \
    -configuration Release \
    -sdk iphonesimulator \
    -destination='generic/platform=iOS Simulator' \
@@ -41,7 +41,7 @@ xcodebuild archive \
    BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 xcodebuild archive \
    -workspace ios/jitsi-meet.xcworkspace \
-    -scheme JitsiMeet  \
+    -scheme JitsiMeetSDK  \
    -configuration Release \
    -sdk iphoneos \
    -destination='generic/platform=iOS' \
@@ -51,9 +51,9 @@ xcodebuild archive \
    SKIP_INSTALL=NO \
    BUILD_LIBRARY_FOR_DISTRIBUTION=YES
 xcodebuild -create-xcframework \
-    -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeet.framework \
-    -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeet.framework \
-    -output ios/sdk/out/JitsiMeet.xcframework
+    -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
+    -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
+    -output ios/sdk/out/JitsiMeetSDK.xcframework
 if [[ $DO_GIT_TAG == 1 ]]; then
    git tag ios-sdk-${SDK_VERSION}
 fi
@@ -62,7 +62,7 @@ popd
 pushd ${RELEASE_REPO}

 # Put the new files in the repo
-cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeet.xcframework Frameworks/
+cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeetSDK.xcframework Frameworks/
 cp -a ${PROJECT_REPO}/node_modules/react-native-webrtc/apple/WebRTC.xcframework Frameworks/

 # Add all files to git
--- a/ios/sdk/sdk.xcodeproj/project.pbxproj
+++ b/ios/sdk/sdk.xcodeproj/project.pbxproj
@@ -24,14 +24,13 @@
 		0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495D1EC4B6C600B793EE /* POSIX.m */; };
 		0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495E1EC4B6C600B793EE /* Proximity.m */; };
 		0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */; };
 		6C31EDC820C06D490089C899 /* recordingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC720C06D490089C899 /* recordingOn.mp3 */; };
 		6C31EDCA20C06D530089C899 /* recordingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC920C06D530089C899 /* recordingOff.mp3 */; };
+		6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */; };
 		75635B0A20751D6D00F29C9F /* joined.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0820751D6D00F29C9F /* joined.wav */; };
 		75635B0B20751D6D00F29C9F /* left.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0920751D6D00F29C9F /* left.wav */; };
 		87FE6F3321E52437004A5DC7 /* incomingMessage.wav in Resources */ = {isa = PBXBuildFile; fileRef = 87FE6F3221E52437004A5DC7 /* incomingMessage.wav */; };
 		A4414AE020B37F1A003546E6 /* rejected.wav in Resources */ = {isa = PBXBuildFile; fileRef = A4414ADF20B37F1A003546E6 /* rejected.wav */; };
-		A480429C21EE335600289B73 /* AmplitudeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = A480429B21EE335600289B73 /* AmplitudeModule.m */; };
 		A4A934E9212F3ADB001E9388 /* Dropbox.m in Sources */ = {isa = PBXBuildFile; fileRef = A4A934E8212F3ADB001E9388 /* Dropbox.m */; };
 		C30F88D0CB0F4F5593216D24 /* liveStreamingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */; };
 		C30F88D2CB0F4F5593216D24 /* liveStreamingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = C30F88D3CB0F4F5593216D24 /* liveStreamingOn.mp3 */; };
@@ -54,6 +53,7 @@
 		DE81A2D92316AC7600AE1940 /* LogBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2D72316AC7600AE1940 /* LogBridge.m */; };
 		DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DE81A2DF2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */; };
+		DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */; };
 		DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAFA778229EAD520033A7FA /* RNRootView.m */; };
@@ -63,7 +63,7 @@
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
-		03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.debug.xcconfig"; sourceTree = "<group>"; };
 		0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JitsiMeetView.h; sourceTree = "<group>"; };
 		0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetView.m; sourceTree = "<group>"; };
 		0B412F1B1EDEC80100B1A0A6 /* JitsiMeetViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetViewDelegate.h; sourceTree = "<group>"; };
@@ -81,7 +81,7 @@
 		0BCA495C1EC4B6C600B793EE /* AudioMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioMode.m; sourceTree = "<group>"; };
 		0BCA495D1EC4B6C600B793EE /* POSIX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POSIX.m; sourceTree = "<group>"; };
 		0BCA495E1EC4B6C600B793EE /* Proximity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Proximity.m; sourceTree = "<group>"; };
-		0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0BD906E81EC0C00300C8C18E /* JitsiMeet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeet.h; sourceTree = "<group>"; };
 		0BD906E91EC0C00300C8C18E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6C31EDC720C06D490089C899 /* recordingOn.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = recordingOn.mp3; path = ../../sounds/recordingOn.mp3; sourceTree = "<group>"; };
@@ -89,10 +89,10 @@
 		75635B0820751D6D00F29C9F /* joined.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = joined.wav; path = ../../sounds/joined.wav; sourceTree = "<group>"; };
 		75635B0920751D6D00F29C9F /* left.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = left.wav; path = ../../sounds/left.wav; sourceTree = "<group>"; };
 		87FE6F3221E52437004A5DC7 /* incomingMessage.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = incomingMessage.wav; path = ../../sounds/incomingMessage.wav; sourceTree = "<group>"; };
+		891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.release.xcconfig"; sourceTree = "<group>"; };
 		98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 		A4414ADF20B37F1A003546E6 /* rejected.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = rejected.wav; path = ../../sounds/rejected.wav; sourceTree = "<group>"; };
-		A480429B21EE335600289B73 /* AmplitudeModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AmplitudeModule.m; path = src/analytics/AmplitudeModule.m; sourceTree = SOURCE_ROOT; };
 		A4A934E8212F3ADB001E9388 /* Dropbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Dropbox.m; sourceTree = "<group>"; };
 		A4A934EB21349A06001E9388 /* Dropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Dropbox.h; sourceTree = "<group>"; };
 		C30F88D1CB0F4F5593216D24 /* liveStreamingOff.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = liveStreamingOff.mp3; path = ../../sounds/liveStreamingOff.mp3; sourceTree = "<group>"; };
@@ -118,6 +118,7 @@
 		DE81A2D72316AC7600AE1940 /* LogBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LogBridge.m; sourceTree = "<group>"; };
 		DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetBaseLogHandler.h; sourceTree = "<group>"; };
 		DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetBaseLogHandler.m; sourceTree = "<group>"; };
+		DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetSDK.h; sourceTree = "<group>"; };
 		DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetConferenceOptions.h; sourceTree = "<group>"; };
 		DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetConferenceOptions.m; sourceTree = "<group>"; };
 		DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetConferenceOptions+Private.h"; sourceTree = "<group>"; };
@@ -128,6 +129,7 @@
 		DEFE535521FB2E8300011A3A /* ReactUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactUtils.m; sourceTree = "<group>"; };
 		DEFE535721FB2E9E00011A3A /* ReactUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactUtils.h; sourceTree = "<group>"; };
 		DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeet+Private.h"; sourceTree = "<group>"; };
+		E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeetSDK.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -137,7 +139,7 @@
 			files = (
 				0BB9AD791F5EC6D7001C08DB /* Intents.framework in Frameworks */,
 				0BB9AD771F5EC6CE001C08DB /* CallKit.framework in Frameworks */,
-				0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */,
+				6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -178,7 +180,7 @@
 		0BD906E61EC0C00300C8C18E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */,
+				0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -186,7 +188,6 @@
 		0BD906E71EC0C00300C8C18E /* src */ = {
 			isa = PBXGroup;
 			children = (
-				A480429821ECE2D800289B73 /* analytics */,
 				0BB9AD7C1F60356D001C08DB /* AppInfo.m */,
 				0BCA495C1EC4B6C600B793EE /* AudioMode.m */,
 				C69EFA02209A0EFD0027712B /* callkit */,
@@ -196,6 +197,7 @@
 				DE438CD82350934700DD541D /* JavaScriptSandbox.m */,
 				0BD906E81EC0C00300C8C18E /* JitsiMeet.h */,
 				DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */,
+				DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */,
 				DEFE535321FB1BF800011A3A /* JitsiMeet.m */,
 				DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */,
 				DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */,
@@ -236,20 +238,11 @@
 				0BB9AD761F5EC6CE001C08DB /* CallKit.framework */,
 				0B93EF7A1EC608550030D24D /* CoreText.framework */,
 				0BB9AD781F5EC6D7001C08DB /* Intents.framework */,
-				03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */,
+				E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		A480429821ECE2D800289B73 /* analytics */ = {
-			isa = PBXGroup;
-			children = (
-				A480429B21EE335600289B73 /* AmplitudeModule.m */,
-			);
-			name = analytics;
-			path = "New Group";
-			sourceTree = "<group>";
-		};
 		A4A934E7212F3AB8001E9388 /* dropbox */ = {
 			isa = PBXGroup;
 			children = (
@@ -264,6 +257,8 @@
 			children = (
 				98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */,
 				9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */,
+				09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */,
+				891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -299,6 +294,7 @@
 				0B412F181EDEC65D00B1A0A6 /* JitsiMeetView.h in Headers */,
 				0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */,
 				DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */,
+				DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */,
 				DE65AACC2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h in Headers */,
 				0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */,
 				0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */,
@@ -312,9 +308,9 @@
 /* End PBXHeadersBuildPhase section */

 /* Begin PBXNativeTarget section */
-		0BD906E41EC0C00300C8C18E /* JitsiMeet */ = {
+		0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
+			buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeetSDK" */;
 			buildPhases = (
 				26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */,
 				0BD906E01EC0C00300C8C18E /* Sources */,
@@ -328,9 +324,9 @@
 			);
 			dependencies = (
 			);
-			name = JitsiMeet;
+			name = JitsiMeetSDK;
 			productName = "Jitsi Meet SDK";
-			productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */;
+			productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -362,7 +358,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				0BD906E41EC0C00300C8C18E /* JitsiMeet */,
+				0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */,
 			);
 		};
 /* End PBXProject section */
@@ -416,7 +412,7 @@
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-JitsiMeet-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-JitsiMeetSDK-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -429,24 +425,16 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh",
-				"${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der",
-				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der",
-				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaCA.der",
-				"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaDomainValidationCA.der",
+				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh",
 				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/api.amplitude.com.der",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoCaLimitedRsaCertificationAuthority.der",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaCA.der",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -471,7 +459,6 @@
 				DEFC743F21B178FA00E4DD96 /* LocaleDetector.m in Sources */,
 				0BCA495F1EC4B6C600B793EE /* AudioMode.m in Sources */,
 				0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */,
-				A480429C21EE335600289B73 /* AmplitudeModule.m in Sources */,
 				C69EFA0C209A0F660027712B /* JMCallKitEmitter.swift in Sources */,
 				DEFE535621FB2E8300011A3A /* ReactUtils.m in Sources */,
 				C6A34261204EF76800E062DD /* DragGestureController.swift in Sources */,
@@ -609,7 +596,7 @@
 		};
 		0BD906EE1EC0C00300C8C18E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */;
+			baseConfigurationReference = 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CLANG_ENABLE_MODULES = YES;
@@ -636,7 +623,7 @@
 		};
 		0BD906EF1EC0C00300C8C18E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */;
+			baseConfigurationReference = 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				CLANG_ENABLE_MODULES = YES;
@@ -672,7 +659,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = {
+		0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeetSDK" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0BD906EE1EC0C00300C8C18E /* Debug */,
--- a/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeetSDK.xcscheme
+++ b/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeetSDK.xcscheme
@@ -15,8 +15,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-               BuildableName = "JitsiMeet.framework"
-               BlueprintName = "JitsiMeet"
+               BuildableName = "JitsiMeetSDK.framework"
+               BlueprintName = "JitsiMeetSDK"
               ReferencedContainer = "container:sdk.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -44,8 +44,8 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-            BuildableName = "JitsiMeet.framework"
-            BlueprintName = "JitsiMeet"
+            BuildableName = "JitsiMeetSDK.framework"
+            BlueprintName = "JitsiMeetSDK"
            ReferencedContainer = "container:sdk.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
@@ -60,8 +60,8 @@
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "0BD906E41EC0C00300C8C18E"
-            BuildableName = "JitsiMeet.framework"
-            BlueprintName = "JitsiMeet"
+            BuildableName = "JitsiMeetSDK.framework"
+            BlueprintName = "JitsiMeetSDK"
            ReferencedContainer = "container:sdk.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
--- a/ios/sdk/src/Info.plist
+++ b/ios/sdk/src/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.12.0</string>
+	<string>3.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
--- a/ios/sdk/src/JitsiMeet.h
+++ b/ios/sdk/src/JitsiMeet.h
@@ -1,6 +1,5 @@
 /*
- * Copyright @ 2018-present 8x8, Inc.
- * Copyright @ 2017-2018 Atlassian Pty Ltd
+ * Copyright @ 2017-present 8x8, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,13 +14,10 @@
 * limitations under the License.
 */

-#import <JitsiMeet/JitsiMeetView.h>
-#import <JitsiMeet/JitsiMeetViewDelegate.h>
-#import <JitsiMeet/JitsiMeetConferenceOptions.h>
-#import <JitsiMeet/JitsiMeetLogger.h>
-#import <JitsiMeet/JitsiMeetBaseLogHandler.h>
-#import <JitsiMeet/InfoPlistUtil.h>
+@import UIKit;
+@import Foundation;

+#import <JitsiMeetSDK/JitsiMeetConferenceOptions.h>

@interface JitsiMeet : NSObject

--- a/ios/sdk/src/JitsiMeetSDK.h
+++ b/ios/sdk/src/JitsiMeetSDK.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright @ 2020-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <JitsiMeetSDK/JitsiMeet.h>
+#import <JitsiMeetSDK/JitsiMeetView.h>
+#import <JitsiMeetSDK/JitsiMeetViewDelegate.h>
+#import <JitsiMeetSDK/JitsiMeetConferenceOptions.h>
+#import <JitsiMeetSDK/JitsiMeetLogger.h>
+#import <JitsiMeetSDK/JitsiMeetBaseLogHandler.h>
+#import <JitsiMeetSDK/InfoPlistUtil.h>
--- a/ios/sdk/src/analytics/AmplitudeModule.m
+++ b/ios/sdk/src/analytics/AmplitudeModule.m
@@ -1,61 +0,0 @@
-/*
- * Copyright @ 2018-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <React/RCTBridgeModule.h>
-
-#import "Amplitude.h"
-#import "LogUtils.h"
-
-
-@interface AmplitudeModule : NSObject<RCTBridgeModule>
-@end
-
-@implementation AmplitudeModule
-
-RCT_EXPORT_MODULE(Amplitude)
-
-+ (BOOL)requiresMainQueueSetup {
-    return NO;
-}
-
-RCT_EXPORT_METHOD(init:(NSString*)instanceName API_KEY:(NSString*)apiKey) {
-    [[Amplitude instanceWithName:instanceName] initializeApiKey:apiKey];
-}
-
-RCT_EXPORT_METHOD(setUserId:(NSString*)instanceName userId: (NSString *) userId) {
-    [[Amplitude instanceWithName:instanceName] setUserId:userId];
-}
-
-RCT_EXPORT_METHOD(setUserProperties:(NSString*)instanceName userPropsString:(NSDictionary*)userProps) {
-    if (userProps != nil) {
-        [[Amplitude instanceWithName:instanceName] setUserProperties:userProps];
-    }
-}
-
-RCT_EXPORT_METHOD(logEvent:(NSString*)instanceName eventType:(NSString*)eventType eventPropsString:(NSString*)eventPropsString) {
-    NSError *error;
-    NSData *eventPropsData = [eventPropsString dataUsingEncoding:NSUTF8StringEncoding];
-    NSDictionary *eventProperties = [NSJSONSerialization JSONObjectWithData:eventPropsData
-                                                                   options:NSJSONReadingMutableContainers
-                                                                     error:&error];
-    if (eventProperties == nil) {
-        DDLogError(@"[Amplitude] Error parsing event properties: %@", error);
-    } else {
-        [[Amplitude instanceWithName:instanceName] logEvent:eventType withEventProperties:eventProperties];
-    }
-}
-
-@end
--- a/ios/sdk/src/callkit/CallKit.m
+++ b/ios/sdk/src/callkit/CallKit.m
@@ -28,9 +28,9 @@
 #import <React/RCTUtils.h>
 #import <WebRTC/WebRTC.h>

-#import <JitsiMeet/JitsiMeet-Swift.h>
+#import <JitsiMeetSDK/JitsiMeetSDK-Swift.h>

-#import "LogUtils.h"
+#import "../LogUtils.h"


 // The events emitted/supported by RNCallKit:
--- a/ios/sdk/src/picture-in-picture/DragGestureController.swift
+++ b/ios/sdk/src/picture-in-picture/DragGestureController.swift
@@ -14,6 +14,8 @@
 * limitations under the License.
 */

+import UIKit
+
 final class DragGestureController {

    var insets: UIEdgeInsets = UIEdgeInsets.zero
--- a/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift
+++ b/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift
@@ -14,6 +14,8 @@
 * limitations under the License.
 */

+import UIKit
+
 public typealias AnimationCompletion = (Bool) -> Void

 public protocol PiPViewCoordinatorDelegate: class {
--- a/lang/languages-gl.json
+++ b/lang/languages-gl.json
@@ -1,34 +1,50 @@
 {
    "en": "Inglés",
    "af": "Afrikans",
+    "ar": "Árabe",
    "bg": "Búlgaro",
    "ca": "Catalán",
    "cs": "Checo",
+    "da": "Dinamarqués",
    "de": "Alemán",
    "el": "Grego",
-    "enGB": "Inglés (RU)",
+    "enGB": "Inglés (Reino Unido)",
    "eo": "Esperanto",
-    "es": "Castelán",
+    "es": "Español",
    "esUS": "Español (Hispanoamérica)",
-    "fi": "Finés",
+    "et": "Estoniano",
+    "eu": "Éuscaro",
+    "fi": "Finlandés",
    "fr": "Francés",
    "frCA": "Francés (Canadá)",
+    "he": "Hebreo",
+    "mr":"Marathi",
    "hr": "Croata",
    "hu": "Húngaro",
    "hy": "Armenio",
+    "id": "Indonesio",
    "it": "Italiano",
    "ja": "Xaponés",
+    "kab": "Cabila",
    "ko": "Coreano",
-    "nl": "Neerlandés",
+    "lt": "Lituano",
+    "ml": "Malayalam",
+    "lv": "Letón",
+    "nl": "Holandés",
    "oc": "Occitano",
    "pl": "Polaco",
    "ptBR": "Portugués (Brasil)",
    "ru": "Ruso",
+    "ro": "Romanés",
+    "sc": "Sardo",
+    "sk": "Eslovaco",
+    "sl": "Esloveno",
+    "sr": "Serbio",
    "sv": "Sueco",
+    "th": "Tailandés",
    "tr": "Turco",
+    "uk": "Ucraíno",
    "vi": "Vietnamita",
    "zhCN": "Chinés (China)",
-    "zhTW": "Chinés (Taiwan)",
-    "et": "Estoniano",
-    "da": "Dinamarqués"
+    "zhTW": "Chinés (Taiwán)"
 }
--- a/lang/main-enGB.json
+++ b/lang/main-enGB.json
@@ -83,6 +83,7 @@
        "bandwidth": "Estimated bandwidth:",
        "bitrate": "Bitrate:",
        "bridgeCount": "Server count: ",
+        "codecs": "Codecs (A/V): ",
        "connectedTo": "Connected to:",
        "framerate": "Frame rate:",
        "less": "Show less",
--- a/lang/main-gl.json
+++ b/lang/main-gl.json
@@ -2,7 +2,7 @@
    "addPeople": {
        "add": "Convidar",
        "countryNotSupported": "Aínda non é posíbel chamar a este destino",
-        "countryReminder": "Chamar fóra dos EE.UU. ? Asegúrese de comezar co código de país!",
+        "countryReminder": "Quere chamar fóra dos EEUU? Asegúrese de comezar co código de país!",
        "disabled": "Non pode convidar xente.",
        "failedToAdd": "Produciuse un erro ao engadir participantes",
        "footerText": "As chamadas están desactivadas",
@@ -62,7 +62,7 @@
    "chromeExtensionBanner": {
        "installExtensionText": "Instala a extensión para a integración con Google Calendar e Office 365",
        "buttonText": "Instalar Extensión Chrome",
-        "dontShowAgain": ""
+        "dontShowAgain": "Non mostrar isto máis"
    },
    "connectingOverlay": {
        "joiningRoom": "Está a conectar coa reunión…"
@@ -632,8 +632,8 @@
        "noAudioSignalTitle": "Non hai sinal de entrada desde o seu micro!",
        "noAudioSignalDesc": "Se vostede non o silenciou adrede na configuración do seu sistema ou hardware, considere cambiar de dispositivo.",
        "noAudioSignalDescSuggestion": "Se vostede non o silenciou adrede na configuración do sistema ou no hardware, considere utilizar o seguinte dispositivo:",
-        "noisyAudioInputTitle": "",
-        "noisyAudioInputDesc": "",
+        "noisyAudioInputTitle": "Parece que seu micrófono fai moito ruído",
+        "noisyAudioInputDesc": "Parece que o seu micrófono está a crear ruído. Considere a posibilidade de calalo ou de cambiar de dispositivo",
        "openChat": "Abrir chat",
        "pip": "Entrar no modo Picture-in-Picture",
        "privateMessage": "Enviar mensaxe privada",
@@ -716,7 +716,7 @@
        "moderator": "Moderador",
        "mute": "O participante está silenciado",
        "muted": "Silenciado",
-        "remoteControl": "",
+        "remoteControl": "Iniciar / Deter control remoto",
        "show": "Amosar en primeiro plano",
        "videomute": "O participante parou a cámara"
    },
--- a/lang/main-it.json
+++ b/lang/main-it.json
@@ -2,26 +2,26 @@
    "addPeople": {
        "add": "Invita",
        "addContacts": "Invita tuoi contatti",
-        "copyInvite": "Copia invito della riunione",
-        "copyLink": "Copia collegamento della riunione",
+        "copyInvite": "Copia invito alla riunione",
+        "copyLink": "Copia collegamento alla riunione",
        "copyStream": "Copia collegamento della diretta",
        "countryNotSupported": "Non supportiamo ancora questa destinazione.",
        "countryReminder": "Stai chiamando fuori dagli Stati Uniti? Assicurati d'inserire il prefisso internazionale!",
-        "defaultEmail": "Tua Email di default",
+        "defaultEmail": "Tua e-mail di default",
        "disabled": "Non puoi invitare persone.",
        "failedToAdd": "L'aggiunta di nuove persone è fallita",
        "footerText": "La chiamata all'esterno è disabilitata.",
-        "googleEmail": "Email Google",
-        "inviteMoreHeader": "Sei l'unico presente alla riunione",
+        "googleEmail": "E-mail Google",
+        "inviteMoreHeader": "Sei l'unico presente nella riunione",
        "inviteMoreMailSubject": "Unisciti alla riunione {{appName}}",
-        "inviteMorePrompt": "Invita altra gente",
+        "inviteMorePrompt": "Invita altre persone",
        "linkCopied": "Collegamento copiato negli appunti",
        "loading": "Sto cercando persone e numeri di telefono",
-        "loadingNumber": "Sto validando il numero di telefono",
+        "loadingNumber": "Sto controllando il numero di telefono",
        "loadingPeople": "Sto cercando le persone da invitare",
        "noResults": "Nessun risultato corrispondente",
        "noValidNumbers": "Per favore inserire un numero di telefono",
-        "outlookEmail": "Email Outlook",
+        "outlookEmail": "E-mail Outlook",
        "searchNumbers": "Aggiungi numeri di telefono",
        "searchPeople": "Cerca persone",
        "searchPeopleAndNumbers": "Cerca persone o aggiungi i loro numeri di telefono",
@@ -30,20 +30,20 @@
        "shareStream": "Condividi il collegamento alla diretta",
        "telephone": "Telefono: {{number}}",
        "title": "Invita persone a questa riunione",
-        "yahooEmail": "Email Yahoo"
+        "yahooEmail": "E-mail Yahoo"
    },
    "audioDevices": {
        "bluetooth": "Bluetooth",
        "headphones": "Cuffie",
        "phone": "Telefono",
        "speaker": "Vivavoce",
-        "none": "Nessun disposistivo audio esistente"
+        "none": "Nessun dispositivo audio esistente"
    },
    "audioOnly": {
-        "audioOnly": "Solo audio"
+        "audioOnly": "Utilizzo di minore banda"
    },
    "calendarSync": {
-        "addMeetingURL": "Aggiungi un collegamento alla conferenza",
+        "addMeetingURL": "Aggiungi un collegamento alla riunione",
        "confirmAddLink": "Vuoi aggiungere un collegamento Jitsi a questo evento?",
        "error": {
            "appConfiguration": "L'integrazione del calendario non è configurata in modo appropriato.",
@@ -51,27 +51,27 @@
            "notSignedIn": "È stato riscontrato un errore durante l'autenticazione per la visualizzazione degli eventi del calendario. Controllare le impostazioni del calendario e provare a ripetere l'accesso."
        },
        "join": "Partecipa",
-        "joinTooltip": "Partecipa alla conferenza",
-        "nextMeeting": "prossimo meeting",
+        "joinTooltip": "Partecipa alla riunione",
+        "nextMeeting": "prossima riunione",
        "noEvents": "Non ci sono eventi programmati a breve.",
-        "ongoingMeeting": "conferenza in corso",
+        "ongoingMeeting": "riunione in corso",
        "permissionButton": "Apri impostazioni",
-        "permissionMessage": "Per visualizzare la lista delle conferenze nell'app è richiesto il permesso Calendario",
+        "permissionMessage": "Per visualizzare la lista delle riunioni nell'app è richiesto il permesso Calendario",
        "refresh": "Aggiorna calendario",
        "today": "Oggi"
    },
    "chat": {
-        "error": "Errore: il tuo messaggio “{{originalText}}” non e’ stato inviato. Motivo: {{error}}",
+        "error": "Errore: il tuo messaggio non è stato inviato. Motivo: {{error}}",
        "fieldPlaceHolder": "Scrivi qui il tuo messaggio",
        "messagebox": "Digitare un messaggio",
        "messageTo": "Messaggio privato per {{recipient}}",
        "noMessagesMessage": "Non ci sono ancora messaggi nella riunione. Comincia una conversazione, qui!",
        "nickname": {
            "popover": "Scegli un nickname",
-            "title": "Inserire un nickname per utilizzare la chat"
+            "title": "Inserire un nickname per utilizzare la conversazione"
        },
        "privateNotice": "Messaggio privato per {{recipient}}",
-        "title": "Chat",
+        "title": "Conversazione",
        "you": "tu"
    },
    "chromeExtensionBanner": {
@@ -80,21 +80,21 @@
        "dontShowAgain": "Non mostrare più questo messaggio"
    },
    "connectingOverlay": {
-        "joiningRoom": "Collegamento alla riunione in corso…"
+        "joiningRoom": "Collegamento alla riunione in corso..."
    },
    "connection": {
        "ATTACHED": "Collegato",
-        "AUTHENTICATING": "Autenticazione",
+        "AUTHENTICATING": "Autenticazione in corso",
        "AUTHFAIL": "Autenticazione fallita",
        "CONNECTED": "Connesso",
-        "CONNECTING": "Connessione",
+        "CONNECTING": "Connessione in corso",
        "CONNFAIL": "Connessione non riuscita",
        "DISCONNECTED": "Disconnesso",
        "DISCONNECTING": "Disconnessione in corso",
        "ERROR": "Errore",
        "FETCH_SESSION_ID": "Sto ottenendo ID di sessione...",
-        "GET_SESSION_ID_ERROR": "Id dell'errore di sessione: {{code}}",
-        "GOT_SESSION_ID": "Ricevuto ID di sessione",
+        "GET_SESSION_ID_ERROR": "Errore nell'ottenere ID di sessione: {{code}}",
+        "GOT_SESSION_ID": "Sto ottenendo ID di sessione... completato",
        "LOW_BANDWIDTH": "Il video per {{displayName}} è stato interrotto per risparmiare banda"
    },
    "connectionindicator": {
@@ -102,7 +102,7 @@
        "audio_ssrc": "Audio SSRC:",
        "bandwidth": "Banda stimata:",
        "bitrate": "Bitrate:",
-        "bridgeCount": "Contatore server:",
+        "bridgeCount": "Conteggio server:",
        "codecs": "Codec (A/V): ",
        "connectedTo": "Connesso a:",
        "e2e_rtt": "E2E RTT:",
@@ -140,15 +140,15 @@
        "yesterday": "Ieri"
    },
    "deepLinking": {
-        "appNotInstalled": "Per partecipare a questo meeting sul tuo telefono ti serve l'app mobile di {{app}}",
-        "description": "Non è successo nulla? Abbiamo provato ad avviare la tua videoconferenza sull'app desktop di {{app}}. Prova di nuovo o avviala nell'app web di {{app}}.",
-        "descriptionWithoutWeb": "Non è successo niente? Abbiamo provato ad avviare la riunione nell'app per desktop {{app}}",
+        "appNotInstalled": "Per partecipare a questa riunione sul tuo telefono ti serve l'app mobile {{app}}.",
+        "description": "Non è successo nulla? Abbiamo provato ad avviare la tua riunione sull'app desktop {{app}}. Prova di nuovo o avviala nell'app web {{app}}.",
+        "descriptionWithoutWeb": "Non è successo niente? Abbiamo provato ad avviare la riunione nell'app desktop {{app}}",
        "downloadApp": "Scarica l'app",
        "ifDoNotHaveApp": "Se non hai ancora l'app:",
        "ifHaveApp": "Se hai già l'app:",
        "joinInApp": "Entra in riunione usando l'app",
        "launchWebButton": "Avvia sul web",
-        "title": "Sto avviando la tua videoconferenza su {{app}}…",
+        "title": "Sto avviando la tua riunione su {{app}}...",
        "tryAgainButton": "Prova di nuovo sul desktop"
    },
    "defaultLink": "es. {{url}}",
@@ -171,38 +171,38 @@
        },
        "add": "Aggiungi",
        "allow": "Consenti",
-        "alreadySharedVideoMsg": "Un altro utente sta condividendo un video. Questa conferenza permette di condividere un solo video alla volta.",
+        "alreadySharedVideoMsg": "Un altro utente sta condividendo un video. Questa riunione permette di condividere un solo video alla volta.",
        "alreadySharedVideoTitle": "È permesso un solo video alla volta",
-        "applicationWindow": "Finestra applicazione",
+        "applicationWindow": "Finestra dell'applicazione",
        "Back": "Indietro",
-        "cameraConstraintFailedError": "La tua videocamera non soddisfa alcuni dei requisiti richiesti.",
+        "cameraConstraintFailedError": "La tua videocamera non soddisfa alcuni dei requisiti.",
        "cameraNotFoundError": "Videocamera non trovata.",
        "cameraNotSendingData": "Non possiamo accedere alla tua videocamera. Controlla che non sia già usata da un'altra applicazione, seleziona un altro dispositivo dalle impostazioni o prova a ricaricare l'applicazione.",
        "cameraNotSendingDataTitle": "Impossibile accedere alla videocamera",
-        "cameraPermissionDeniedError": "Non hai concesso il permesso di usare la videocamera. Potrai partecipare comunque alla conferenza ma gli altri non potranno vederti. Usa il pulsante a forma di videocamera nella barra degli indirizzi per risolvere il problema.",
+        "cameraPermissionDeniedError": "Non hai concesso il permesso di usare la videocamera. Potrai partecipare comunque alla riunione ma gli altri non potranno vederti. Usa il pulsante a forma di videocamera nella barra degli indirizzi per risolvere il problema.",
        "cameraUnknownError": "Impossibile usare la videocamera per un motivo sconosciuto.",
        "cameraUnsupportedResolutionError": "La tua videocamera non supporta la risoluzione richiesta.",
        "Cancel": "Annulla",
        "close": "Chiudi",
-        "conferenceDisconnectMsg": "Controlla la tua connessione. Riconnessione in {{seconds}} secondi…",
+        "conferenceDisconnectMsg": "Controlla la tua connessione. Riconnessione in {{seconds}} secondi...",
        "conferenceDisconnectTitle": "Sei stato disconnesso.",
-        "conferenceReloadMsg": "Stiamo cercando di risolvere il problema. Riconnessione in {{seconds}} secondi…",
+        "conferenceReloadMsg": "Stiamo cercando di risolvere il problema. Riconnessione in {{seconds}} secondi...",
        "conferenceReloadTitle": "Purtroppo qualcosa è andato storto.",
        "confirm": "Conferma",
        "confirmNo": "No",
        "confirmYes": "Sì",
-        "connectError": "Oh! Qualcosa è andato storto e non ti puoi collegare alla conferenza.",
-        "connectErrorWithMsg": "Oops! Qualcosa è andato storto e non ti puoi collegare alla conferenza: {{msg}}",
-        "connecting": "Connessione",
+        "connectError": "Oh! Qualcosa è andato storto e non ti puoi collegare alla riunione.",
+        "connectErrorWithMsg": "Oops! Qualcosa è andato storto e non ti puoi collegare alla riunione: {{msg}}",
+        "connecting": "Connessione in corso",
        "contactSupport": "Contatta il supporto",
        "copied": "Copiato",
        "copy": "Copia",
        "dismiss": "Scarta",
-        "displayNameRequired": "Tutti devono avere un nome",
+        "displayNameRequired": "Ciao, qual è il tuo nome",
        "done": "Fatto",
-        "e2eeDescription": "La crittografia punto-a-punto al momento è SPERIMENTALE. Tieni presente che attivandola disabiliterai i servizi svolti dal server, come: la registrazione su Dropobox, le dirette streaming e la partecipazione usando solo telefoni. Tieni anche presente che la riunione funzionerà solo per chi si collega usando browser che supportano flussi inseribili (insertable streams).",
+        "e2eeDescription": "La crittografia punto-a-punto al momento è SPERIMENTALE. Tieni presente che attivandola disabiliterai i servizi svolti dal server, come: la registrazione, la dirette streaming e la partecipazione usando telefoni. Tieni anche presente che la riunione funzionerà solo per chi si collega usando browser che supportano flussi inseribili (insertable streams).",
        "e2eeLabel": "Attiva la crittografia punto-a-punto",
-        "e2eeWarning": "ATTENZIONE: non tutti i partecipanti a questa riunione sembrano supportare le funzionalità di crittografia punto-a-punto. Se la attivi, non potranno sentirti, o vederti.",
+        "e2eeWarning": "ATTENZIONE: non tutti i partecipanti a questa riunione sembrano supportare le funzionalità di crittografia punto-a-punto. Se la attivi, non potranno sentirti o vederti.",
        "enterDisplayName": "Inserisci qui il tuo nome",
        "error": "Errore",
        "gracefulShutdown": "Il nostro servizio è al momento spento per manutenzione. Si prega di riprovare più tardi.",
@@ -213,58 +213,58 @@
        "incorrectPassword": "Nome utente o password errati",
        "internalError": "Ops! Qualcosa è andato storto. Questo è l'errore: {{error}}",
        "internalErrorTitle": "Errore interno",
-        "kickMessage": "Acc! Sei stato espulso dal meeting!",
-        "kickParticipantButton": "Butta fuori",
-        "kickParticipantDialog": "Sei sicuro di voler espellere questo partecipante?",
-        "kickParticipantTitle": "Espellere questi partecipante?",
-        "kickTitle": "Espulso dal meeting",
+        "kickMessage": "Puoi contattare {{participantDisplayName}} per maggiori dettagli.",
+        "kickParticipantButton": "Escludi",
+        "kickParticipantDialog": "Sei sicuro di voler escludere questo partecipante?",
+        "kickParticipantTitle": "Escludi questo partecipante?",
+        "kickTitle": "Escluso dalla riunione",
        "liveStreaming": "Diretta",
-        "liveStreamingDisabledForGuestTooltip": "Gli ospiti non possono avviare una diretta.",
+        "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Impossibile durante la registrazione.",
        "liveStreamingDisabledTooltip": "Trasmissioni in diretta disabilitate.",
-        "lockMessage": "Impossibile bloccare la conferenza.",
-        "lockRoom": "Aggiungi una password al meeting",
+        "lockMessage": "Impossibile bloccare la riunione.",
+        "lockRoom": "Aggiungi una $t(lockRoomPasswordUppercase) alla riunione",
        "lockTitle": "Blocco fallito",
-        "logoutQuestion": "Vuoi disconnetterti e interrompere la conferenza ?",
-        "logoutTitle": "Logout",
-        "maxUsersLimitReached": "È stato raggiunto il numero massimo di partecipanti. La conferenza è al completo. Contatta l'organizzatore, o riprova più tardi!",
-        "maxUsersLimitReachedTitle": "Raggiunto limite partecipanti",
-        "micConstraintFailedError": "Il tuo microfono non soddisfa alcuni dei requisiti richiesti.",
+        "logoutQuestion": "Vuoi disconnetterti e interrompere la riunione?",
+        "logoutTitle": "Disconnessione",
+        "maxUsersLimitReached": "È stato raggiunto il numero massimo di partecipanti. La riunione è al completo. Contatta l'organizzatore o riprova più tardi!",
+        "maxUsersLimitReachedTitle": "Raggiunto limite massimo partecipanti",
+        "micConstraintFailedError": "Il tuo microfono non soddisfa alcuni dei requisiti.",
        "micNotFoundError": "Microfono non trovato.",
-        "micNotSendingData": "Non riusciamo a ricevere suoni dal microfono scelto. Prova a selezionare nelle impostazioni un microfono diverso, o a riavviare l'applicazione.",
-        "micNotSendingDataTitle": "Impossibile accedere al microfono",
-        "micPermissionDeniedError": "Non hai concesso il permesso di usare il microfono. Puoi comunque partecipare alla conferenza ma gli altri non potranno sentirti. Usa il bottone a forma di telecamera nella barra degli indirizzi per cambiare impostazioni.",
+        "micNotSendingData": "Apri le impostazioni del computer per togliere il «muto» al microfono e imposta il volume.",
+        "micNotSendingDataTitle": "Il microfono è muto per impostazione di sistema",
+        "micPermissionDeniedError": "Non hai concesso il permesso di usare il microfono. Puoi comunque partecipare alla riunione ma gli altri non potranno sentirti. Usa il bottone a forma di telecamera nella barra degli indirizzi per cambiare impostazioni.",
        "micUnknownError": "Impossibile usare il microfono per un motivo sconosciuto.",
        "muteEveryoneElseDialog": "Una volta zittiti, non potrai riattivargli i microfoni, ma loro potranno farlo in qualsiasi momento.",
        "muteEveryoneElseTitle": "Zittisco tutti eccetto {{whom}}?",
        "muteEveryoneDialog": "Sei sicuro di voler zittire tutti? Non potrai riattivar loro il microfono, ma loro potranno farlo in qualsiasi momento.",
        "muteEveryoneTitle": "Zittisco tutti?",
        "muteEveryoneSelf": "te stesso",
-        "muteEveryoneStartMuted": "Tutti cominciano a microfono spento, d'adessp in avanti",
+        "muteEveryoneStartMuted": "Tutti cominciano a microfono spento, d'adesso in avanti",
        "muteParticipantBody": "Non sarai in grado di riattivare il loro microfono, ma loro potranno riattivarlo in qualsiasi momento.",
        "muteParticipantButton": "Zittisci",
-        "muteParticipantDialog": "Sei sicuro di voler zittire questo partecipante? Saranno lui a doversi riattivare l'audio, per parlare.",
+        "muteParticipantDialog": "Sei sicuro di voler zittire questo partecipante? Sarà lui a dovere riattivare l'audio, per parlare.",
        "muteParticipantTitle": "Zittisco questo partecipante?",
        "Ok": "OK",
        "passwordLabel": "La riunione è stata bloccata da un partecipante. Immetti la $t(lockRoomPassword) per collegarti, per favore.",
-        "passwordNotSupported": "Le password per le riunioni non sono supportate.",
+        "passwordNotSupported": "Impostare una $t(lockRoomPassword) non è supportato.",
        "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) non supportato",
-        "passwordRequired": "E' richiesto $t(lockRoomPasswordUppercase)",
+        "passwordRequired": "$t(lockRoomPasswordUppercase) richiesta",
        "popupError": "Il tuo browser sta bloccando i pop-up da questo sito. Per favore abilita i pop-up dalle impostazioni di sicurezza del browser e riprova.",
        "popupErrorTitle": "Pop-up bloccato",
-        "readMore": "altro",
+        "readMore": "continua",
        "recording": "Registrazione",
-        "recordingDisabledForGuestTooltip": "Gli ospiti non possono avviare una registrazione.",
+        "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Impossibile durante una diretta.",
        "recordingDisabledTooltip": "Registrazione disabilitata.",
        "rejoinNow": "Ricollegati ora",
        "remoteControlAllowedMessage": "{{user}} ha accettato la tua richiesta di controllo remoto!",
        "remoteControlDeniedMessage": "{{user}} ha respinto la tua richiesta di controllo remoto!",
        "remoteControlErrorMessage": "Si è verificato un errore mentre si cercava di richiedere il controllo remoto a {{user}}!",
        "remoteControlRequestMessage": "Vuoi consentire ad {{user}} di controllare da remoto il tuo desktop?",
-        "remoteControlShareScreenWarning": "Tieni conto che premendo \"Permetti\" condividerai il tuo schermo.",
+        "remoteControlShareScreenWarning": "Tieni conto che premendo «Permetti» condividerai il tuo schermo.",
        "remoteControlStopMessage": "Sessione di controllo remoto terminata!",
        "remoteControlTitle": "Connessione desktop remoto",
        "Remove": "Rimuovi",
-        "removePassword": "Togli la password",
+        "removePassword": "Togli la $t(lockRoomPassword)",
        "removeSharedVideoMsg": "Sei sicuro di voler rimuovere il tuo video condiviso?",
        "removeSharedVideoTitle": "Rimuovi video condiviso",
        "reservationError": "Errore di sistema in prenotazione",
@@ -273,11 +273,11 @@
        "screenSharingAudio": "Condividi audio",
        "screenSharingFailed": "Ops! Non è stato possibile avviare la condivisione dello schermo!",
        "screenSharingFailedTitle": "Condivisione dello schermo fallita!",
-        "screenSharingPermissionDeniedError": "Qualcosa non funziona nei permessi di condivisione dello schermo. Ricarica e prova ancora, autorizzando la condivisione.",
-        "sendPrivateMessage": "Hai ricevuto un messaggio privato, poco fa. Vorresti rispondergli privatamente, o vuoi mandare la risposta al gruppo?",
+        "screenSharingPermissionDeniedError": "Qualcosa non funziona nei permessi di condivisione dello schermo. Ricarica e riprova.",
+        "sendPrivateMessage": "Hai ricevuto un messaggio privato poco fa. Vorresti rispondergli privatamente o vuoi mandare la risposta al gruppo?",
        "sendPrivateMessageCancel": "Invia al gruppo",
        "sendPrivateMessageOk": "Invia privatamente",
-        "sendPrivateMessageTitle": "Mando privatamente?",
+        "sendPrivateMessageTitle": "Invio privatamente?",
        "serviceUnavailable": "Servizio non disponibile",
        "sessTerminated": "Chiamata terminata",
        "Share": "Condividi",
@@ -298,12 +298,13 @@
        "token": "token",
        "tokenAuthFailed": "Ci dispiace ma non sei autorizzato a partecipare a questa chiamata.",
        "tokenAuthFailedTitle": "Autenticazione fallita",
-        "transcribing": "Trascrizione",
-        "unlockRoom": "Togli la password al meeting",
+        "transcribing": "Trascrizione in corso",
+        "unlockRoom": "Togli la $t(lockRoomPassword) alla riunione",
+        "user": "utente",
        "userPassword": "password utente",
-        "WaitForHostMsg": "La conferenza <b>{{room}}</b> non è ancora cominciata. Se sei l'organizzatore, per favore autenticati. Altrimenti, aspetta l'arrivo dell'organizzatore.",
-        "WaitForHostMsgWOk": "La conferenza <b>{{room}}</b> non è ancora cominciata. Se sei l'organizzatore, allora premi OK per autenticarti. Altrimenti, aspetta l'arrivo dell'organizzatore.",
-        "WaitingForHost": "In attesa dell'organizzatore ...",
+        "WaitForHostMsg": "La riunione <b>{{room}}</b> non è ancora cominciata. Se sei l'organizzatore, per favore autenticati. Altrimenti, aspetta l'arrivo dell'organizzatore.",
+        "WaitForHostMsgWOk": "La riunione <b>{{room}}</b> non è ancora cominciata. Se sei l'organizzatore, allora premi OK per autenticarti. Altrimenti, aspetta l'arrivo dell'organizzatore.",
+        "WaitingForHost": "In attesa dell'organizzatore...",
        "Yes": "Sì",
        "yourEntireScreen": "Schermo intero"
    },
@@ -317,7 +318,7 @@
        "labelToolTip": "Le comunicazioni audio e video di questa chiamata, sono crittografate dall'origine alla destinazione"
    },
    "embedMeeting": {
-        "title": "Incorpora questa riunione altrove"
+        "title": "Incorpora questa riunione"
    },
    "feedback": {
        "average": "Media",
@@ -326,19 +327,19 @@
        "good": "Buona",
        "rateExperience": "Valuta la qualità della videoconferenza.",
        "veryBad": "Pessima",
-        "veryGood": "Molto Buona"
+        "veryGood": "Ottima"
    },
    "incomingCall": {
        "answer": "Rispondi",
        "audioCallTitle": "Chiamata in arrivo",
-        "decline": "Scarta",
+        "decline": "Chiudi",
        "productLabel": "da Jitsi Meet",
        "videoCallTitle": "Videochiamata in arrivo"
    },
    "info": {
        "accessibilityLabel": "Mostra informazioni",
-        "addPassword": "Aggiungi password",
-        "cancelPassword": "Togli password",
+        "addPassword": "Aggiungi $t(lockRoomPassword)",
+        "cancelPassword": "Togli $t(lockRoomPassword)",
        "conferenceURL": "Collegamento:",
        "country": "Paese",
        "dialANumber": "Per collegarti telefonicamente al meeting, chiama uno di questi numeri e metti il pin.",
@@ -348,12 +349,12 @@
        "dialInSummaryError": "Errore nella ricerca dei numeri telefonici. Riprova più tardi.",
        "dialInTollFree": "Numero verde",
        "genericError": "Ops, qualcosa è andato storto.",
-        "inviteLiveStream": "Per vedere la diretta di questo meeting, clicca su questo link: {{url}}",
-        "invitePhone": "ATTENZIONE E' UNA CHIAMATA INTERNAZIONALE A PAGAMENTO! NON E' GRATUITA. Per seguire solo telefonicamente, clicca:  {{number}},,{{conferenceID}}#",
+        "inviteLiveStream": "Per vedere la diretta di questa riunione, fai click su questo link: {{url}}",
+        "invitePhone": "Per seguire solo telefonicamente, fai click:  {{number}},,{{conferenceID}}#",
        "invitePhoneAlternatives": "Cerchi un numero diverso da chiamare?\nEcco dei numeri telefonici per collegarsi alle riunioni: {{url}}\n\n\nSe entri in riunione anche col computer, entra senza attivare l'audio: {{silentUrl}}",
-        "inviteURLFirstPartGeneral": "Invito a connettersi ad una conferenza.",
-        "inviteURLFirstPartPersonal": "{{name}} ti sta invitando ad un meeting.\n",
-        "inviteURLSecondPart": "\nPartecipa al meeting:\n{{url}}\n",
+        "inviteURLFirstPartGeneral": "Invito a connettersi ad una riunione.",
+        "inviteURLFirstPartPersonal": "{{name}} ti sta invitando ad una riunione.\n",
+        "inviteURLSecondPart": "\nPartecipa alla riunione:\n{{url}}\n",
        "liveStreamURL": "Trasmissione in diretta:",
        "moreNumbers": "Più numeri",
        "noNumbers": "Nessun numero da chiamare.",
@@ -362,8 +363,8 @@
        "numbers": "Numeri da chiamare",
        "password": "$t(lockRoomPasswordUppercase):",
        "title": "Condividi",
-        "tooltip": "Invia il collegamento e i numeri telefonici di questa conferenza",
-        "label": "Informazioni meeting"
+        "tooltip": "Invia il collegamento e i numeri telefonici di questa riunione",
+        "label": "Informazioni riunione"
    },
    "inviteDialog": {
        "alertText": "Errore nell'invitare alcuni partecipanti.",
@@ -389,12 +390,11 @@
        "pushToTalk": "Premi per parlare",
        "raiseHand": "Alza o abbassa la mano",
        "showSpeakerStats": "Mostra statistiche",
-        "toggleChat": "Apri o chiudi la chat",
-        "toggleFilmstrip": "Mostra o nascondi anteprime video",
+        "toggleChat": "Apri o chiudi la conversazione",
+        "toggleFilmstrip": "Mostra o nascondi miniature video",
        "toggleScreensharing": "Cambia modalità tra videocamera e condivisione schermo",
        "toggleShortcuts": "Mostra o nascondi le scorciatoie",
-        "videoMute": "Accendo o spegni la videocamera",
-        "videoQuality": "Imposta qualità della telefonata"
+        "videoMute": "Accendi o spegni la videocamera"
    },
    "liveStreaming": {
        "limitNotificationDescriptionWeb": "Data l'alta domanda la tua diretta sarà limitata a {{limit}} minuti. Per dirette illimitate, prova <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
@@ -403,32 +403,32 @@
        "busyTitle": "Tutti gli streamer sono impegnati al momento",
        "changeSignIn": "Cambia account",
        "choose": "Scegli una trasmissione in diretta",
-        "chooseCTA": "Scegli un'opzione di trasmissione. Attualmente sei loggato come {{email}}.",
+        "chooseCTA": "Scegli un'opzione di trasmissione. Attualmente sei collegato come {{email}}.",
        "enterStreamKey": "Inserisci qui la tua chiave YouTube per le trasmissioni in diretta.",
        "error": "Diretta fallita. Prova di nuovo.",
-        "errorAPI": "Si è verificato un errore durante l'accesso ai tuoi broadcast YouTube. Prova a effettuare nuovamente il login.",
+        "errorAPI": "Si è verificato un errore durante l'accesso alle tue trasmissioni YouTube. Prova a effettuare nuovamente il login.",
        "errorLiveStreamNotEnabled": "La diretta non è attivata su {{email}}. Per favore abilita la diretta o effettua l'accesso con un account abilitato alle dirette.",
        "expandedOff": "La diretta è stata interrotta",
-        "expandedOn": "La conferenza è attualmente in diretta su YouTube.",
+        "expandedOn": "La riunione è attualmente in diretta su YouTube.",
        "expandedPending": "La diretta è in fase di avvio...",
        "failedToStart": "Avvio trasmissione in diretta fallito",
        "getStreamKeyManually": "Non siamo stati in grado di trovare nessuna trasmissione dal vivo. Prova ad ottenere una chiave stream da Youtube",
-        "invalidStreamKey": "La chiave stream potrebbe non essere corretta.",
+        "invalidStreamKey": "La chiave per le dirette potrebbe non essere corretta.",
        "off": "La diretta si è interrotta",
        "offBy": "{{name}} ha fermato la diretta",
        "on": "Trasmissione in diretta",
        "onBy": "{{name}} ha iniziato la diretta",
        "pending": "Avvio diretta...",
-        "serviceName": "Servizio live streaming",
+        "serviceName": "Servizio dirette",
        "signedInAs": "Sei attualmente collegato come:",
-        "signIn": "Registrati con Google",
-        "signInCTA": "Registrati o inserisci la tua chiave YouTube per la trasmissione in diretta.",
-        "signOut": "Esci",
+        "signIn": "Collegati con Google",
+        "signInCTA": "Collegati o inserisci la tua chiave YouTube per la trasmissione in diretta.",
+        "signOut": "Scollegati",
        "start": "Inizia una diretta",
        "streamIdHelp": "Cos'è questo?",
        "unavailableTitle": "La diretta non è disponibile",
-        "youtubeTerms": "YouTube terms of services",
-        "googlePrivacyPolicy": "Google Privacy Policy"
+        "youtubeTerms": "Condizioni di utilizzo di YouTube",
+        "googlePrivacyPolicy": "Norme sulla riservatezza di Google"
    },
    "localRecording": {
        "clientState": {
@@ -436,9 +436,9 @@
            "on": "Acceso",
            "unknown": "Sconosciuto"
        },
-        "dialogTitle": "Controlli di registrazione",
+        "dialogTitle": "Controlli di registrazione locale",
        "duration": "Durata",
-        "durationNA": "N/A",
+        "durationNA": "N/D",
        "encoding": "Codifica",
        "label": "LOR",
        "labelToolTip": "Registrazione locale avviata",
@@ -447,14 +447,14 @@
        "messages": {
            "engaged": "Registrazione locale avviata.",
            "finished": "La registrazione della sessione {{token}} è terminata. Invia il file della registrazione al moderatore.",
-            "finishedModerator": "La registrazione della sessione {{token}} è terminata. Il file della traccia local è stato salvato. Richiedere ai partecipanti di inviare le loro registrazioni.",
+            "finishedModerator": "La registrazione della sessione {{token}} è terminata. Il registrazione della traccia è stata salvata. Richiedere ai partecipanti di inviare le loro registrazioni.",
            "notModerator": "Non sei un moderatore. Non puoi avviare o interrompere la registrazione"
        },
        "moderator": "Moderatore",
        "no": "No",
        "participant": "Partecipante",
        "participantStats": "Statistiche partecipanti",
-        "sessionToken": "Token della sessione ",
+        "sessionToken": "Token della sessione",
        "start": "Avvia Registrazione",
        "stop": "Ferma registrazione",
        "yes": "Sì"
@@ -467,9 +467,9 @@
        "connectedThreePlusMembers": "{{name}} e altri {{count}} si sono connessi",
        "connectedTwoMembers": "{{first}} e {{second}} si sono connessi",
        "disconnected": "disconnesso",
-        "focus": "Focus su conferenza",
+        "focus": "Focus su riunione",
        "focusFail": "{{component}} non disponibile - riprova in {{ms}} sec",
-        "grantedTo": "Permessi di moderatore garantiti a {{to}}!",
+        "grantedTo": "Permessi di moderatore accordati a {{to}}!",
        "invitedOneMember": "{{displayName}} è stato invitato",
        "invitedThreePlusMembers": "Hai invitato {{name}} e altri {{count}}",
        "invitedTwoMembers": "Hai invitato {{first}} e {{second}}",
@@ -484,16 +484,16 @@
        "passwordSetRemotely": "$t(lockRoomPasswordUppercase) è stata messa da un altro partecipante",
        "raisedHand": "{{name}} vorrebbe intervenire.",
        "somebody": "Qualcuno",
-        "startSilentTitle": "Sei entrato in riunione senza aver scelto un dispositivo audio per sentire!",
-        "startSilentDescription": "Entra di nuovo in riunione, per attivare l'audio",
-        "suboptimalExperienceDescription": "Ehm... temiamo che la tua esperienza con {{appName}} non sarà granché su questo browser. Stiamo cercando di migliorare la situazione ma, per il momento, prova ad utilizzare uno di questi <a href='{{recommendedBrowserPageLink}}' target='_blank'>browser supportati</a>.",
-        "suboptimalExperienceTitle": "Problemi con il browser",
+        "startSilentTitle": "Sei entrato nella riunione senza aver scelto un dispositivo audio per sentire!",
+        "startSilentDescription": "Entra di nuovo nella riunione, per attivare l'audio",
+        "suboptimalBrowserWarning": "Temiamo che la tua esperienza non sarà granché su questo browser. Stiamo cercando di migliorare la situazione ma, per il momento, prova ad utilizzare uno di questi <a href='{{recommendedBrowserPageLink}}' target='_blank'>browser supportati</a>.",
+        "suboptimalExperienceTitle": "Avviso sul browser",
        "unmute": "Accendi microfono",
        "newDeviceCameraTitle": "Trovata nuova videocamera",
        "newDeviceAudioTitle": "Trovata nuova origine audio",
        "newDeviceAction": "OK, usala",
        "OldElectronAPPTitle": "Falla di sicurezza!",
-        "oldElectronClientDescription1": "Sembri stare usando una versione obsoleta di Jitsi Meet che ha delle falle di sicurezza note. Assicurati di aggiornarla presso il nostro ",
+        "oldElectronClientDescription1": "Sembri stare usando una versione obsoleta del client Jitsi Meet che ha dei problemi di sicurezza noti. Assicurati di aggiornarla presso il nostro ",
        "oldElectronClientDescription2": "ultima build",
        "oldElectronClientDescription3": " ora!"
    },
@@ -505,7 +505,7 @@
        "audioDeviceProblem": "C'è un problema con il tuo microfono",
        "audioOnlyError": "Errore audio:",
        "audioTrackError": "Impossibile creare traccia audio.",
-        "calling": "Chiamando",
+        "calling": "Chiamata in corso",
        "callMe": "Chiamami",
        "callMeAtNumber": "Chiamami a questo numero:",
        "configuringDevices": "Configurazione dispositivi...",
@@ -522,7 +522,7 @@
          "goodQuality": "Ottimo! La tue funzioni multimediali andranno alla grande.",
          "noMediaConnectivity": "Non siamo riusciti a stabilire una connessione multimediale per fare questo test. Questo è tipicamente causato da un firewall o dal NAT.",
          "noVideo": "Ci aspettiamo una pessima qualità video.",
-          "undetectable": "Se non riesci ancora a fare chiamate nel browser, ti consigliamo di verificare che il microfono e la tua videocamera siano configurate correttamente, che tu abbia dato al browser i permessi di usare microfono e videocamera, e che il tuo browser sia aggiornato all'ultima versione. Se hai ancora problemi, dovresti contattare lo sviluppatore dell'applicazione web.",
+          "undetectable": "Se non riesci ancora a fare chiamate nel browser, ti consigliamo di verificare che il microfono e la videocamera siano configurate correttamente, che tu abbia dato al browser i permessi di usare microfono e videocamera e che il tuo browser sia aggiornato all'ultima versione. Se hai ancora problemi, dovresti contattare lo sviluppatore dell'applicazione web.",
          "veryPoorConnection": "Ci aspettiamo una qualità della chiamata davvero terribile.",
          "videoFreezing": "Ci aspettiamo che il video si blocchi, sparisca, o sia molto pixelato.",
          "videoHighQuality": "Ci aspettiamo che il video sia di buona qualità.",
@@ -535,7 +535,7 @@
        "dialing": "Chiamata",
        "doNotShow": "Non mostrare più questa finestra",
        "errorDialOut": "Impossibile fare la chiamata",
-        "errorDialOutDisconnected": "Impossibile fare la chiamata. Occupato",
+        "errorDialOutDisconnected": "Impossibile fare la chiamata. Scollegato",
        "errorDialOutFailed": "Impossibile fare la chiamata. Chiamata fallita",
        "errorDialOutStatus": "Errore nel ricevere lo stato della rete",
        "errorMissingName": "Inserire il proprio nome, per accedere alla riunione",
@@ -559,22 +559,22 @@
    },
    "presenceStatus": {
        "busy": "Occupato",
-        "calling": "Chiamata…",
+        "calling": "Chiamata...",
        "connected": "Connesso",
        "connecting": "Connessione...",
        "connecting2": "Connessione*...",
-        "disconnected": "Occupato",
+        "disconnected": "Scollegato",
        "expired": "Scaduto",
        "ignored": "Ignorato",
-        "initializingCall": "Inizializzazione chiamata…",
+        "initializingCall": "Inizializzazione chiamata...",
        "invited": "Invitato",
        "rejected": "Rifiutato",
-        "ringing": "Sta suonando…"
+        "ringing": "Sta suonando..."
    },
    "profile": {
        "setDisplayNameLabel": "Imposta il nome da visualizzare",
        "setEmailInput": "Inserisci e-mail",
-        "setEmailLabel": "Imposta la mail gravatar",
+        "setEmailLabel": "Imposta l'e-mail gravatar",
        "title": "Profilo"
    },
    "raisedHand": "Vorrebbe parlare",
@@ -588,17 +588,17 @@
        "busyTitle": "Tutti i registratori sono occupati",
        "error": "Registrazione fallita. Prova di nuovo.",
        "expandedOff": "Registrazione interrotta",
-        "expandedOn": "La registrazione della conferenza è attiva.",
-        "expandedPending": "La registrazione è in fase di avvio…",
+        "expandedOn": "La registrazione della riunione è attiva.",
+        "expandedPending": "La registrazione è in fase di avvio...",
        "failedToStart": "Non è stato possibile avviare la registrazione",
        "fileSharingdescription": "Condividi la registrazione con i partecipanti alla riunione",
        "live": "DIRETTA",
        "loggedIn": "Accesso effettuato come {{userName}}",
        "off": "Registrazione interrotta",
-        "offBy": "{{name}} registrazione fermata",
+        "offBy": "{{name}} ha interrotto la registrazione",
        "on": "Registrazione",
-        "onBy": "{{name}} registrazione iniziata",
-        "pending": "In preparazione alla registrazione della conferenza…",
+        "onBy": "Registrazione iniziata da {{name}}",
+        "pending": "In preparazione alla registrazione della riunione",
        "rec": "REC",
        "serviceDescription": "La tua registrazione verrà salvata dal servizio di registrazione che hai scelto",
        "serviceName": "Servizio di registrazione",
@@ -613,15 +613,15 @@
    "security": {
        "about": "Puoi aggiungere alla riunione una $t(lockRoomPassword). I partecipanti dovranno fornire la $t(lockRoomPassword) per essere autorizzati a partecipare alla riunione.",
        "aboutReadOnly": "I moderatori della riunione possono aggiungere $t(lockRoomPassword). I partecipanti dovranno fornire la $t(lockRoomPassword) per essere autorizzati a partecipare alla riunione.",
-        "insecureRoomNameWarning": "La riunione non è protetta. Dei partecipanti indesiderati potrebbero unirsi alla riunione. Puoi proteggere l'accesso alla riunione col bottone sicurezza.",
-        "securityOptions": "Impostazioni sicurezza"
+        "insecureRoomNameWarning": "Il nome della riunione non è sicuro. Dei partecipanti indesiderati potrebbero unirsi alla riunione. Puoi proteggere l'accesso alla riunione col bottone sicurezza.",
+        "securityOptions": "Impostazioni di sicurezza"
    },
    "settings": {
        "calendar": {
-            "about": "L’integrazione del calendario con {{appName}} e’ consigliata per accedere in sicurezza al proprio calendario per poter leggere i prossimi appuntamenti ",
+            "about": "L’integrazione del calendario con {{appName}} è usata per accedere in sicurezza al proprio calendario per poter leggere i prossimi appuntamenti ",
            "disconnect": "Disconnetti",
            "microsoftSignIn": "Connettiti con un account Microsoft",
-            "signedIn": "Sto accedendo agli eventi del calendario per {{email}}. Clicca su Disconnetti per interrompere l’accesso agli eventi del calendario.",
+            "signedIn": "Sto accedendo agli eventi del calendario per {{email}}. Fai click su «Disconnetti» per interrompere l’accesso agli eventi del calendario.",
            "title": "Calendario"
        },
        "devices": "Dispositivi",
@@ -637,9 +637,7 @@
        "selectMic": "Microfono",
        "startAudioMuted": "Tutti cominciano con il microfono disattivato",
        "startVideoMuted": "Tutti cominciano con il video disattivato",
-        "title": "Impostazioni",
-        "speakers": "Altoparlanti",
-        "microphones": "Microfoni"
+        "title": "Impostazioni"
    },
    "settingsView": {
        "advanced": "Avanzate",
@@ -648,13 +646,13 @@
        "alertTitle": "Attenzione",
        "alertURLText": "L'URL del server inserito non è valido",
        "buildInfoSection": "Versione",
-        "conferenceSection": "Conferenza",
+        "conferenceSection": "Riunione",
        "disableCallIntegration": "Disattiva l'integrazione delle chiamate native",
        "disableP2P": "Disattiva la modalità punto-punto",
        "disableCrashReporting": "Disattiva la diagnostica dei crash",
        "disableCrashReportingWarning": "Sei sicuro di voler disattivare la diagnostica dei crash? Quest'impostazione verrà eseguita al prossimo avvio dell'app.",
        "displayName": "Nome visualizzato",
-        "email": "Email",
+        "email": "e-mail",
        "header": "Impostazioni",
        "profileSection": "Profilo",
        "serverURL": "URL del server",
@@ -664,8 +662,8 @@
        "version": "Versione"
    },
    "share": {
-        "dialInfoText": "\n\n=====\n\nVuoi solo ascoltare la conferenza da un telefono?\n\n{{defaultDialInNumber}}Clicca questo link per vedere i numeri telefonici di questo meeting\n{{dialInfoPageUrl}}",
-        "mainText": "Clicca sul link seguente per partecipare alla conferenza:\n{{roomUrl}}"
+        "dialInfoText": "\n\n=====\n\nVuoi solo ascoltare la riunione da un telefono?\n\n{{defaultDialInNumber}}Clicca questo link per vedere i numeri telefonici di questo meeting\n{{dialInfoPageUrl}}",
+        "mainText": "Fai click sul link seguente per partecipare alla riunione:\n{{roomUrl}}"
    },
    "speaker": "Relatore",
    "speakerStats": {
@@ -677,7 +675,7 @@
        "speakerTime": "Tempo"
    },
    "startupoverlay": {
-        "policyText": "   ",
+        "policyText": " ",
        "genericTitle": "Per la riunione devono essere usati il tuo microfono e la tua videocamera.",
        "title": "{{app}} ha bisogno di usare il tuo microfono e la tua videocamera."
    },
@@ -692,19 +690,19 @@
            "audioRoute": "Scegli l'uscita audio",
            "callQuality": "Imposta qualità della chiamata",
            "cc": "Attiva/disattiva sottotitoli",
-            "chat": "Attiva/disattiva la chat",
+            "chat": "Attiva/disattiva la conversazione",
            "document": "Attiva/disattiva documento condiviso",
            "download": "Scarica le nostre app",
            "embedMeeting": "Incorpora riunione altrove",
            "feedback": "Lascia un feedback",
            "fullScreen": "Attiva/disattiva schermo intero",
-            "grantModerator": "Autorizza Moderator",
-            "hangup": "Lascia la conferenza",
+            "grantModerator": "Autorizza moderatore",
+            "hangup": "Lascia la riunione",
            "help": "Aiuto",
            "invite": "Invita persone",
            "kick": "Espelli partecipante",
            "lobbyButton": "Attiva/disattiva sala d'attesa",
-            "localRecording": "Abilita controlli di registrazione locale",
+            "localRecording": "Abilita/disattiva controlli di registrazione locale",
            "lockRoom": "Attiva o disattiva password",
            "moreActions": "Attiva o disattiva menu avanzato",
            "moreActionsMenu": "Menu avanzato",
@@ -717,7 +715,7 @@
            "raiseHand": "Attiva/disattiva alzata di mano",
            "recording": "Attiva/disattiva registrazione",
            "remoteMute": "Zittisci partecipante",
-            "security": "Impostazioni sicurezza",
+            "security": "Impostazioni di sicurezza",
            "Settings": "Attiva/disattiva impostazioni",
            "sharedvideo": "Attiva/disattiva condivisione YouTube",
            "shareRoom": "Invita qualcuno",
@@ -732,13 +730,13 @@
            "videoblur": "Attiva/disattiva offuscamento video"
        },
        "addPeople": "Aggiungi persone alla chiamata",
-        "audioOnlyOff": "Anche video",
-        "audioOnlyOn": "Solo audio",
+        "audioOnlyOff": "Disabilita modalità per banda limitata",
+        "audioOnlyOn": "Abilita modalità per banda limitatao",
        "audioRoute": "Scegli l'uscita audio",
        "authenticate": "Autenticazione",
-        "callQuality": "Imposta qualità della chiamata",
-        "chat": "Apri / Chiudi chat",
-        "closeChat": "Chiudi chat",
+        "callQuality": "Imposta qualità video",
+        "chat": "Apri / Chiudi conversazione",
+        "closeChat": "Chiudi conversazione",
        "documentClose": "Chiudi documento condiviso",
        "documentOpen": "Apri documento condiviso",
        "download": "Scarica le nostre app",
@@ -754,8 +752,8 @@
        "invite": "Invita persone",
        "lobbyButtonDisable": "Disabilita sala d'attesa",
        "lobbyButtonEnable": "Abilita sala d'attesa",
-        "login": "Login",
-        "logout": "Logout",
+        "login": "Accedi",
+        "logout": "Scollegati",
        "lowerYourHand": "Abbassa la mano",
        "moreActions": "Più azioni",
        "moreOptions": "Più opzioni",
@@ -768,13 +766,13 @@
        "noAudioSignalDialInLinkDesc": "Numberi di telefono",
        "noisyAudioInputTitle": "Il tuo microfono sembra rumoroso!",
        "noisyAudioInputDesc": "Sembra che il tuo microfono faccia dei rumori, prova a spegnerlo o cambiarlo per favore.",
-        "openChat": "Apri una chat",
-        "pip": "Abilita visualizzazione immagine nell’immagine",
+        "openChat": "Apri una conversazione",
+        "pip": "Abilita visualizzazione immagine nell'immagine",
        "privateMessage": "invia un messaggio privato",
        "profile": "Modifica profilo",
        "raiseHand": "Alza / Abbassa la mano",
        "raiseYourHand": "Alza la mano",
-        "security": "Impostazioni sicurezza",
+        "security": "Impostazioni di sicurezza",
        "Settings": "Impostazioni",
        "sharedvideo": "Condividi un video Youtube",
        "shareRoom": "Invita partecipante",
@@ -789,17 +787,17 @@
        "tileViewToggle": "Vedi tutti i partecipanti insieme, o uno solo",
        "toggleCamera": "Cambia videocamera",
        "videomute": "Attiva / Disattiva videocamera",
-        "startvideoblur": "Offusca il video",
-        "stopvideoblur": "Non offuscare il video"
+        "startvideoblur": "Sfoca lo sfondo del video",
+        "stopvideoblur": "Non sfocare lo sfondo video"
    },
    "transcribing": {
        "ccButtonTooltip": "Inizia / Ferma i sottotitoli",
-        "error": "Registrazione fallita. Prova di nuovo.",
-        "expandedLabel": "La trascrizione della conferenza è attiva",
-        "failedToStart": "C’è stato un errore nell’avvio del servizio di trascrizione.",
+        "error": "Trascrizione fallita. Prova di nuovo.",
+        "expandedLabel": "La trascrizione della riunione è attiva",
+        "failedToStart": "C'è stato un errore nell'avvio del servizio di trascrizione.",
        "labelToolTip": "Il servizio di trascrizione è in fase di avvio",
        "off": "Trascrizione interrotta",
-        "pending": "Avvio del servizio di trascrizione della conferenza…",
+        "pending": "Avvio del servizio di trascrizione della riunione...",
        "start": "Avvia visualizzazione sottotitoli",
        "stop": "Interrompi la visualizzazione dei sottotitoli",
        "tr": "TR"
@@ -807,7 +805,7 @@
    "userMedia": {
        "androidGrantPermissions": "Seleziona <b><i>consenti</i></b> quando richiesto dal browser.",
        "chromeGrantPermissions": "Seleziona <b><i>consenti</i></b> quando richiesto dal browser.",
-        "edgeGrantPermissions": "Seleziona <b><i>Si</i></b> quando richiesto dal browser.",
+        "edgeGrantPermissions": "Seleziona <b><i>Sì</i></b> quando richiesto dal browser.",
        "electronGrantPermissions": "Concedi l'autorizzazione ad usare telecamera e microfono",
        "firefoxGrantPermissions": "Seleziona <b><i>condividi i dispositivi selezionati</i></b> quando richiesto dal browser.",
        "iexplorerGrantPermissions": "Seleziona <b><i>OK</i></b> quando richiesto dal browser.",
@@ -820,7 +818,7 @@
        "busy": "Stiamo lavorando per liberare le risorse. Riprova tra qualche minuto.",
        "busyTitle": "Il servizio Stanza al momento è occupato",
        "errorAlreadyInvited": "{{displayName}} già invitato",
-        "errorInvite": "Conferenza non ancora stabilita. Riprova più tardi.",
+        "errorInvite": "Riunione non ancora stabilita. Riprova più tardi.",
        "errorInviteFailed": "Stiamo lavorando per risolvere il problema. Riprova più tardi.",
        "errorInviteFailedTitle": "Invito a {{displayName}} fallito",
        "errorInviteTitle": "Errore nell'invito alla stanza",
@@ -828,13 +826,13 @@
    },
    "videoStatus": {
        "audioOnly": "AUD",
-        "audioOnlyExpanded": "Hai attivato la modalità solo audio. Questa modalità permette di risparmiare banda, ma non vedrai gli altri partecipanti.",
+        "audioOnlyExpanded": "Hai attivato la modalità con banda limitata. Questa modalità permette di risparmiare banda, ma non vedrai gli altri partecipanti.",
        "callQuality": "Qualità video",
        "hd": "HD",
        "hdTooltip": "Stai vedendo in alta definizione",
        "highDefinition": "Alta definizione",
        "labelTooiltipNoVideo": "Nessun video",
-        "labelTooltipAudioOnly": "Hai attivato la modalità solo audio",
+        "labelTooltipAudioOnly": "Hai attivato la modalità con banda limitata",
        "ld": "LD",
        "ldTooltip": "Stai vedendo a bassa definizione",
        "lowDefinition": "Bassa definizione",
@@ -847,53 +845,53 @@
        "domuteOthers": "Zittisci tutti gli altri",
        "flip": "Rifletti",
        "grantModerator": "Autorizza moderatore",
-        "kick": "Butta fuori",
+        "kick": "Espelli",
        "moderator": "Moderatore",
        "mute": "Il partecipante ha il microfono spento",
        "muted": "Audio disattivato",
-        "remoteControl": "Controllo remoto",
+        "remoteControl": "Avvia/ferma il controllo remoto",
        "show": "Mostra in primo piano",
        "videomute": "Il partecipante ha la videocamera spenta"
    },
    "welcomepage": {
        "accessibilityLabel": {
-            "join": "Tap per accedere",
+            "join": "Tocca per accedere",
            "roomname": "Inserisci nome stanza"
        },
-        "appDescription": "Avvia una videochiamata con tutto il team. Invita tutti quelli che conosci.  {{app}} è una soluzione per effettuare videoconferenze totalmente crittografata, 100% open source, che puoi usare sempre, ogni giorno, gratuitamente – senza bisogno di un account.",
+        "appDescription": "Avvia una videochiamata con tutto il team. Invita tutti quelli che conosci. {{app}} è una soluzione per effettuare videoconferenze totalmente crittografata, 100% open source, che puoi usare sempre, ogni giorno, gratuitamente – senza bisogno di un account.",
        "audioVideoSwitch": {
            "audio": "Voce",
            "video": "Video"
        },
        "calendar": "Calendario",
        "connectCalendarButton": "Collega calendario",
-        "connectCalendarText": "Connetti il tuo calendario per vedere tutte le riunione dentro {{app}}. Poi, aggiungi {{provider}} di riunioni al tuo calendario, per avviarle con un clic.",
-        "enterRoomTitle": "Avvia una nuova conferenza",
+        "connectCalendarText": "Connetti il tuo calendario per vedere tutte le riunione dentro {{app}}. Poi, aggiungi {{provider}} di riunione al tuo calendario, per avviarle con un clic.",
+        "enterRoomTitle": "Avvia una nuova riunione",
        "getHelp": "Trova aiuto",
        "go": "VAI",
        "goSmall": "VAI",
        "headerTitle": "Jitsi Meet",
-        "headerSubtitle": "Secure and high quality meetings",
+        "headerSubtitle": "Riunioni sicure e di alta qualità",
        "info": "Informazioni chiamata",
-        "join": "UNISCITI",
+        "join": "CREA / UNISCITI",
        "jitsiOnMobile": "Jitsi su mobile – scarica le nostre app e dai inizio ad una riunione dovunque tu sia",
        "moderatedMessage": "O <a href=\"{{url}}\" rel=\"noopener noreferrer\" target=\"_blank\">prepara una URL</a> in anticipo, per le riunioni di cui sei il moderatore.",
-        "privacy": "Privacy",
-        "recentList": "Recente",
+        "privacy": "Riservatezza",
+        "recentList": "Recenti",
        "recentListDelete": "Cancella",
-        "recentListEmpty": "La tua lista è vuota. Chatta con qualcuno del tuo team e lo vedrai apparire nella lista di meeting recenti.",
+        "recentListEmpty": "La tua lista è vuota. Conversa con qualcuno del tuo team e lo vedrai apparire nella lista delle riunioni recenti.",
        "reducedUIText": "Benvenuto in {{app}}!",
        "roomNameAllowedChars": "Il nome della riunione non deve contenere questi caratteri: ?, &, :, ', \", %, #.",
-        "roomname": "Inserisci nome stanza",
-        "roomnameHint": "Inserisci il nome o l'URL della stanza alla quale vuoi accedere. Puoi anche inventarti un nome, assicurati solo che le persone che vuoi contattare lo sappiano, così che possano inserire lo stesso nome.",
+        "roomname": "Inserisci il nome della stanza",
+        "roomnameHint": "Inserisci il nome o l'URL della stanza alla quale vuoi accedere. Puoi anche inventarti un nome, assicurati solo che le persone che vuoi contattare lo conoscano, così che possano inserire lo stesso nome.",
        "sendFeedback": "Invia feedback",
        "startMeeting": "Inizia riunione",
        "terms": "Termini di utilizzo",
        "title": "Il sistema di videoconferenza sicuro, funzionale e completamente gratuito."
    },
    "lonelyMeetingExperience": {
-        "button": "invita altri",
-        "youAreAlone": "Sei l'unico in riunione"
+        "button": "Invita altri",
+        "youAreAlone": "Sei l'unico nella riunione"
    },
    "helpView": {
        "header": "Aiuto"
@@ -901,25 +899,25 @@
    "lobby": {
        "knockingParticipantList": "Lista dei partecipanti in attesa",
        "allow": "Autorizza",
-        "backToKnockModeButton": "No password, ask to join instead",
+        "backToKnockModeButton": "Nessuna password, richiedi l'accesso",
        "dialogTitle": "Sala d'attesa",
        "disableDialogContent": "Sala d'attesa attiva. Questa funzione ti permette di non dare accesso alla riunione a partecipanti indesiderati. Vuoi disattivarla?",
        "disableDialogSubmit": "Disattiva",
-        "emailField": "Inserisci il tuo indirizzo Email",
+        "emailField": "Inserisci il tuo indirizzo e-mail",
        "enableDialogPasswordField": "Imposta password (opzionale)",
        "enableDialogSubmit": "Attiva",
        "enableDialogText": "La sala d'attesa ti permette di proteggere la tua riunione concedendo l'ingresso solo alle persone autorizzate da un moderatore.",
        "enterPasswordButton": "Inserisci password riunione",
        "enterPasswordTitle": "Inserisci la password per entrare nella riunione",
        "invalidPassword": "Password errata",
-        "joiningMessage": "Entrerai nella riunione, non appena qualcuno approva la tua richiesta",
+        "joiningMessage": "Entrerai nella riunione non appena qualcuno approva la tua richiesta",
        "joinWithPasswordMessage": "Ho inviato la password per entrare, attendi...",
        "joinRejectedMessage": "La tua richiesta d'accesso è stata respinta da un moderatore.",
-        "joinTitle": "Entra in riunione",
+        "joinTitle": "Entra nella riunione",
        "joiningTitle": "Richiesta inviata...",
-        "joiningWithPasswordTitle": "Entrando con la password...",
+        "joiningWithPasswordTitle": "Accesso con password...",
        "knockButton": "Chiedi d'entrare",
-        "knockTitle": "Qualcuno vuole entrare in riunione",
+        "knockTitle": "Qualcuno vuole entrare nella riunione",
        "nameField": "Scrivi il tuo nome",
        "notificationLobbyAccessDenied": "{{targetParticipantName}} è stato respinto da {{originParticipantName}}",
        "notificationLobbyAccessGranted": "{{targetParticipantName}} è stato autorizzato ad entrare da {{originParticipantName}}",
--- a/lang/main-ko.json
+++ b/lang/main-ko.json
@@ -2,7 +2,7 @@
    "addPeople": {
        "add": "초대",
        "addContacts": "연락처로 초대하세요",
-        "copyInvite": "호의 초대 복사",
+        "copyInvite": "회의 초대 복사",
        "copyLink": "회의 링크 복사",
        "copyStream": "라이브 스트리밍 링크 복사",
        "countryNotSupported": "아직 해당 지역을 지원하지 않습니다.",
@@ -17,7 +17,7 @@
        "inviteMorePrompt": "더 많은 사람을 초대하세요",
        "linkCopied": "링크가 클립보드에 복사되었습니다.",
        "loading": "사람 및 전화번호 검색",
-        "loadingNumber": "전화번호 확인 중",
+        "loadingNumber": "전화번호 확인중",
        "loadingPeople": "초대할 사람 찾기",
        "noResults": "일치하는 검색 결과 없음",
        "noValidNumbers": "전화 번호를 입력하십시오.",
@@ -80,21 +80,21 @@
        "dontShowAgain": "다시 보지 않기"
    },
    "connectingOverlay": {
-        "joiningRoom": "회의에 연결 중 ..."
+        "joiningRoom": "회의에 연결중 ..."
    },
    "connection": {
        "ATTACHED": "첨부",
-        "AUTHENTICATING": "인증 중",
+        "AUTHENTICATING": "인증중",
        "AUTHFAIL": "인증 실패",
-        "CONNECTED": "연결 됨",
-        "CONNECTING": "연결 중",
+        "CONNECTED": "연결됨",
+        "CONNECTING": "연결중",
        "CONNFAIL": "연결 실패",
        "DISCONNECTED": "연결 끊김",
-        "DISCONNECTING": "연결 종료 중",
+        "DISCONNECTING": "연결 종료중",
        "ERROR": "에러",
-        "RECONNECTING": "네트워크 문제가 발생했습니다. 다시 연결 중...",
-        "GET_SESSION_ID_ERROR": "세션 ID 가져 오기 오류 : {{code}}",
-        "GOT_SESSION_ID": "세션 ID를 가져 오는 중 ... 완료",
+        "RECONNECTING": "네트워크 문제가 발생했습니다. 다시 연결중...",
+        "GET_SESSION_ID_ERROR": "세션 ID 가져오기 오류 : {{code}}",
+        "GOT_SESSION_ID": "세션 ID를 가져오는중 ... 완료",
        "LOW_BANDWIDTH": "대역폭을 절약하기 위해 {{displayName}}의 동영상이 중지되었습니다."
    },
    "connectionindicator": {
@@ -160,16 +160,16 @@
        },
        "add": "추가",
        "allow": "허락",
-        "alreadySharedVideoMsg": "다른 참가자가 이미 비디오를 공유하고 있습니다. 이 회의는 한 번에 하나의 공유 비디오 만 허용합니다.",
-        "alreadySharedVideoTitle": "한 번에 하나의 공유 비디오 만 허용됩니다",
+        "alreadySharedVideoMsg": "다른 참가자가 이미 비디오를 공유하고 있습니다. 이 회의는 한 번에 하나의 공유 비디오만 허용합니다.",
+        "alreadySharedVideoTitle": "한 번에 하나의 공유 비디오만 허용됩니다",
        "applicationWindow": "응용 프로그램 창",
        "Back": "뒤로가기",
        "cameraConstraintFailedError": "카메라가 필요한 제약 조건 중 일부를 만족하지 못합니다",
        "cameraNotFoundError": "카메라를 찾을 수 없습니다",
-        "cameraNotSendingData": "카메라에 액세스 할 수 없습니다. 다른 응용 프로그램이이 장치를 사용하고 있는지 확인한 후 설정 메뉴에서 다른 장치를 선택하거나 응용 프로그램을 다시로드하십시오.",
+        "cameraNotSendingData": "카메라에 액세스 할 수 없습니다. 다른 응용 프로그램이 장치를 사용하고 있는지 확인한 후 설정 메뉴에서 다른 장치를 선택하거나 응용 프로그램을 다시 로드하십시오.",
        "cameraNotSendingDataTitle": "카메라에 액세스 할 수 없습니다",
        "cameraPermissionDeniedError": "카메라 사용 권한을 부여하지 않았습니다. 회의에 계속 참여할 수 있지만 다른 참석자는 귀하를 볼 수 없습니다. 검색 주소창의 카메라 버튼을 사용하여 문제를 해결하십시오.",
-        "cameraUnknownError": "알 수없는 이유로 카메라를 사용할 수 없습니다",
+        "cameraUnknownError": "알 수 없는 이유로 카메라를 사용할 수 없습니다",
        "cameraUnsupportedResolutionError": "카메라가 필요한 비디오 해상도를 지원하지 않습니다",
        "Cancel": "취소",
        "close": "닫기",
@@ -182,7 +182,7 @@
        "confirmYes": "예",
        "connectError": "죄송합니다. 문제가 발생하여 회의에 연결할 수 없습니다",
        "connectErrorWithMsg": "죄송합니다. 뭔가 잘못되어 회의에 연결할 수 없습니다: {{msg}}",
-        "connecting": "연결 중",
+        "connecting": "연결중",
        "contactSupport": "지원 연락처",
        "copy": "복사",
        "dismiss": "",
@@ -190,7 +190,7 @@
        "done": "완료",
        "enterDisplayName": "당신의 이름을 입력해주세요.",
        "error": "에러",
-        "externalInstallationMsg": "데스크톱 공유 확장 프로그램을 설치해야합니다",
+        "externalInstallationMsg": "데스크톱 공유 확장 프로그램을 설치해야 합니다",
        "externalInstallationTitle": "확장 프로그램이 필요합니다",
        "goToStore": "웹 스토어로 이동",
        "gracefulShutdown": "서비스는 현재 유지 관리를 위해 중단되었습니다. 나중에 다시 시도 해주십시오.",
@@ -227,7 +227,7 @@
        "muteParticipantDialog": "",
        "muteParticipantTitle": "이 참가자를 음소거 하시겠습니까?",
        "Ok": "확인",
-        "passwordLabel": "잠긴 회의 입니다. 회의에 참여하려면 비밀번호를 입력하세요.",
+        "passwordLabel": "잠긴 회의입니다. 회의에 참여하려면 비밀번호를 입력하세요.",
        "passwordNotSupported": "회의 비밀번호 설정은 지원되지 않습니다",
        "passwordNotSupportedTitle": "비밀번호 미지원",
        "passwordRequired": "비밀번호 필수",
@@ -285,8 +285,8 @@
        "transcribing": "",
        "unlockRoom": "회의 비밀번호 제거",
        "userPassword": "사용자 비밀번호",
-        "WaitForHostMsg": "<b>{{room}}</b> 회의가 시작되지 않았습니다. 호스트 인 경우 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
-        "WaitForHostMsgWOk": "<b>{{room}}</b> 회의가 아직 시작되지 않았습니다. 호스트 인 경우 확인을 눌러 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
+        "WaitForHostMsg": "<b>{{room}}</b> 회의가 시작되지 않았습니다. 호스트인 경우 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
+        "WaitForHostMsgWOk": "<b>{{room}}</b> 회의가 아직 시작되지 않았습니다. 호스트인 경우 확인을 눌러 인증하십시오. 그렇지 않으면 호스트가 도착할 때까지 기다리십시오.",
        "WaitingForHost": "호스트를 기다리는 중입니다…",
        "Yes": "예",
        "yourEntireScreen": "전체 화면"
@@ -371,7 +371,8 @@
        "toggleFilmstrip": "동영상 표시 또는 숨기기",
        "toggleScreensharing": "카메라와 화면 공유간에 전환",
        "toggleShortcuts": "도움말 메뉴 표시 또는 숨기기",
-        "videoMute": "카메라 시작 또는 중지"
+        "videoMute": "카메라 시작 또는 중지",
+        "videoQuality": "비디오 품질"
    },
    "liveStreaming": {
        "busy": "스트리밍 자원을 확보하기 위해 노력하고 있습니다. 몇 분 후에 다시 시도하십시오.",
@@ -382,7 +383,7 @@
        "enterStreamKey": "YouTube 실시간 스트리밍 키를 입력하십시오",
        "error": "실시간 스트리밍에 실패했습니다. 다시 시도하십시오.",
        "errorAPI": "YouTube 방송에 액세스하는 중에 오류가 발생했습니다. 다시 로그인하십시오.",
-        "errorLiveStreamNotEnabled": "{{email}}에 의해 라이브 스트리밍이 활성화되지 않았습니다. 라이브 스트리밍을 활성화하거나 라이브 스트리밍이 활성화 된 계정으로 로그인하십시오.",
+        "errorLiveStreamNotEnabled": "{{email}}에 의해 라이브 스트리밍이 활성화되지 않았습니다. 라이브 스트리밍을 활성화하거나 라이브 스트리밍이 활성화된 계정으로 로그인하십시오.",
        "expandedOff": "라이브 스트리밍이 중지되었습니다",
        "expandedOn": "현재 회의가 YouTube로 스트리밍되고 있습니다.",
        "expandedPending": "라이브 스트리밍이 시작됩니다 ...",
@@ -471,17 +472,17 @@
    "poweredby": "powered by",
    "presenceStatus": {
        "busy": "바쁨",
-        "calling": "전화 거는 중",
-        "connected": "연결 됨",
-        "connecting": "연결 중",
-        "connecting2": "연결 중*",
+        "calling": "전화 거는중",
+        "connected": "연결됨",
+        "connecting": "연결중",
+        "connecting2": "연결중*",
        "disconnected": "연결 끊김",
-        "expired": "만료 됨",
-        "ignored": "무시 됨",
-        "initializingCall": "통화 초기화 중",
-        "invited": "초대 됨",
-        "rejected": "거부 됨",
-        "ringing": "전화 중"
+        "expired": "만료됨",
+        "ignored": "무시됨",
+        "initializingCall": "통화 초기화중",
+        "invited": "초대됨",
+        "rejected": "거부됨",
+        "ringing": "전화중"
    },
    "profile": {
        "setDisplayNameLabel": "표시 이름 설정",
@@ -494,10 +495,10 @@
        "availableSpace": "사용 가능한 공간 : {{spaceLeft}}MB (약 {{duration}}분 녹화)",
        "beta": "베타",
        "busy": "레코딩 자원을 확보하고 있습니다. 몇 분 후에 다시 시도하십시오.",
-        "busyTitle": "모든 레코더가 현재 사용 중입니다",
+        "busyTitle": "모든 레코더가 현재 사용중입니다",
        "error": "레코딩이 실패했습니다. 다시 시도하십시오.",
        "expandedOff": "레코딩이 중지됨",
-        "expandedOn": "회의가 현재 녹화 중입니다.",
+        "expandedOn": "회의가 현재 녹화중입니다.",
        "expandedPending": "녹화가 시작됩니다 ...",
        "failedToStart": "레코딩을 시작하지 못했습니다",
        "fileSharingdescription": "회의 참가자와 녹음 공유",
@@ -618,7 +619,7 @@
        "audioOnlyOff": "음성전용 모드 끄기",
        "audioOnlyOn": "음성전용 모드 끄기",
        "audioRoute": "음성 장비 선택하기",
-        "authenticate": "인증 중",
+        "authenticate": "인증중",
        "callQuality": "품질 설정하기",
        "chat": "대화 열기/닫기",
        "closeChat": "대화 닫기",
@@ -665,7 +666,7 @@
    "transcribing": {
        "ccButtonTooltip": "자막 시작/종료",
        "error": "레코딩이 실패했습니다. 다시 시도하십시오.",
-        "expandedLabel": "현재 스크립트 작성 중",
+        "expandedLabel": "현재 스크립트 작성중",
        "failedToStart": "스크립트 작성을 시작하지 못했습니다.",
        "labelToolTip": "회의가 기록되고 있습니다.",
        "off": "스크립트 작성이 중지되었습니다.",
@@ -698,7 +699,7 @@
    },
    "videoStatus": {
        "audioOnly": "오디오 전용",
-        "audioOnlyExpanded": "낮은 대역폭 모드에 있습니다. 이 모드에서는 오디오 및 화면 공유 만 수신합니다.",
+        "audioOnlyExpanded": "낮은 대역폭 모드에 있습니다. 이 모드에서는 오디오 및 화면 공유만 수신합니다.",
        "callQuality": "비디오 품질",
        "hd": "HD",
        "highDefinition": "고해상도",
--- a/lang/main.json
+++ b/lang/main.json
@@ -601,6 +601,7 @@
        "pending": "Preparing to record the meeting...",
        "rec": "REC",
        "serviceDescription": "Your recording will be saved by the recording service",
+        "serviceDescriptionCloud": "Cloud recording",
        "serviceName": "Recording service",
        "signIn": "Sign in",
        "signOut": "Sign out",
@@ -843,6 +844,7 @@
        "standardDefinition": "Standard definition"
    },
    "videothumbnail": {
+        "connectionInfo": "Connection Info",
        "domute": "Mute",
        "domuteOthers": "Mute everyone else",
        "flip": "Flip",
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -7,6 +7,7 @@ import EventEmitter from 'events';
 import Logger from 'jitsi-meet-logger';

 import { isMobileBrowser } from '../../react/features/base/environment/utils';
+import { getLocalParticipant } from '../../react/features/base/participants';
 import { toggleChat } from '../../react/features/chat';
 import { setDocumentUrl } from '../../react/features/etherpad';
 import { setFilmstripVisible } from '../../react/features/filmstrip';
@@ -90,11 +91,29 @@ UI.notifyReservationError = function(code, msg) {
    });
 };

+/**
+ * Change nickname for the user.
+ * @param {string} id user id
+ * @param {string} displayName new nickname
+ */
+UI.changeDisplayName = function(id, displayName) {
+    VideoLayout.onDisplayNameChanged(id, displayName);
+};
+
 /**
 * Initialize conference UI.
 */
 UI.initConference = function() {
+    const { getState } = APP.store;
+    const { id, name } = getLocalParticipant(getState);
+
    UI.showToolbar();
+
+    const displayName = config.displayJids ? id : name;
+
+    if (displayName) {
+        UI.changeDisplayName('localVideoContainer', displayName);
+    }
 };

 /**
@@ -219,12 +238,19 @@ UI.getSharedDocumentManager = () => etherpadManager;
 * @param {JitsiParticipant} user
 */
 UI.addUser = function(user) {
+    const id = user.getId();
+    const displayName = user.getDisplayName();
    const status = user.getStatus();

    if (status) {
        // FIXME: move updateUserStatus in participantPresenceChanged action
        UI.updateUserStatus(user, status);
    }
+
+    // set initial display name
+    if (displayName) {
+        UI.changeDisplayName(id, displayName);
+    }
 };

 /**
@@ -416,6 +442,14 @@ UI.handleLastNEndpoints = function(leavingIds, enteringIds) {
 */
 UI.setAudioLevel = (id, lvl) => VideoLayout.setAudioLevel(id, lvl);

+/**
+ * Hide connection quality statistics from UI.
+ */
+UI.hideStats = function() {
+    VideoLayout.hideStats();
+};
+
+
 UI.notifyTokenAuthFailed = function() {
    messageHandler.showError({
        descriptionKey: 'dialog.tokenAuthFailed',
--- a/modules/UI/shared_video/SharedVideoThumb.js
+++ b/modules/UI/shared_video/SharedVideoThumb.js
@@ -1,15 +1,10 @@
-/* global $, APP */
+/* global $ */

-/* eslint-disable no-unused-vars */
-import React, { Component } from 'react';
-import ReactDOM from 'react-dom';
-import { I18nextProvider } from 'react-i18next';
-import { Provider } from 'react-redux';
+import Logger from 'jitsi-meet-logger';

-import { i18next } from '../../../react/features/base/i18n';
-import Thumbnail from '../../../react/features/filmstrip/components/web/Thumbnail';
 import SmallVideo from '../videolayout/SmallVideo';
-/* eslint-enable no-unused-vars */
+
+const logger = Logger.getLogger(__filename);

 /**
 *
@@ -29,12 +24,17 @@ export default class SharedVideoThumb extends SmallVideo {
        this.videoSpanId = 'sharedVideoContainer';
        this.container = this.createContainer(this.videoSpanId);
        this.$container = $(this.container);
-        this.renderThumbnail();
        this._setThumbnailSize();
        this.bindHoverHandler();
+        this.updateDisplayName();
        this.container.onclick = this._onContainerClick;
    }

+    /**
+     *
+     */
+    initializeAvatar() {} // eslint-disable-line no-empty-function
+
    /**
     *
     * @param {*} spanId
@@ -45,6 +45,18 @@ export default class SharedVideoThumb extends SmallVideo {
        container.id = spanId;
        container.className = 'videocontainer';

+        // add the avatar
+        const avatar = document.createElement('img');
+
+        avatar.className = 'sharedVideoAvatar';
+        avatar.src = `https://img.youtube.com/vi/${this.url}/0.jpg`;
+        container.appendChild(avatar);
+
+        const displayNameContainer = document.createElement('div');
+
+        displayNameContainer.className = 'displayNameContainer';
+        container.appendChild(displayNameContainer);
+
        const remoteVideosContainer
            = document.getElementById('filmstripRemoteVideosContainer');
        const localVideoContainer
@@ -56,14 +68,21 @@ export default class SharedVideoThumb extends SmallVideo {
    }

    /**
-     * Renders the thumbnail.
+     * Triggers re-rendering of the display name using current instance state.
+     *
+     * @returns {void}
     */
-    renderThumbnail(isHovered = false) {
-        ReactDOM.render(
-            <Provider store = { APP.store }>
-                <I18nextProvider i18n = { i18next }>
-                    <Thumbnail participantID = { this.id } isHovered = { isHovered } />
-                </I18nextProvider>
-            </Provider>, this.container);
+    updateDisplayName() {
+        if (!this.container) {
+            logger.warn(`Unable to set displayName - ${this.videoSpanId
+            } does not exist`);
+
+            return;
+        }
+
+        this._renderDisplayName({
+            elementID: `${this.videoSpanId}_name`,
+            participantID: this.id
+        });
    }
 }
--- a/modules/UI/videolayout/Filmstrip.js
+++ b/modules/UI/videolayout/Filmstrip.js
@@ -37,6 +37,7 @@ const Filmstrip = {
     */
    resizeThumbnailsForTileView(width, height, forceUpdate = false) {
        const thumbs = this._getThumbs(!forceUpdate);
+        const avatarSize = height / 2;

        if (thumbs.localThumb) {
            thumbs.localThumb.css({
@@ -57,6 +58,11 @@ const Filmstrip = {
                width: `${width}px`
            });
        }
+
+        $('.avatar-container').css({
+            height: `${avatarSize}px`,
+            width: `${avatarSize}px`
+        });
    },

    /**
@@ -71,6 +77,7 @@ const Filmstrip = {

        if (thumbs.localThumb) {
            const { height, width } = local;
+            const avatarSize = height / 2;

            thumbs.localThumb.css({
                height: `${height}px`,
@@ -78,10 +85,15 @@ const Filmstrip = {
                'min-width': `${width}px`,
                width: `${width}px`
            });
+            $('#localVideoContainer > .avatar-container').css({
+                height: `${avatarSize}px`,
+                width: `${avatarSize}px`
+            });
        }

        if (thumbs.remoteThumbs) {
            const { height, width } = remote;
+            const avatarSize = height / 2;

            thumbs.remoteThumbs.css({
                height: `${height}px`,
@@ -89,6 +101,10 @@ const Filmstrip = {
                'min-width': `${width}px`,
                width: `${width}px`
            });
+            $('#filmstripRemoteVideosContainer > span > .avatar-container').css({
+                height: `${avatarSize}px`,
+                width: `${avatarSize}px`
+            });
        }
    },

@@ -110,6 +126,10 @@ const Filmstrip = {
                'min-width': '',
                'min-height': ''
            });
+            $('#localVideoContainer > .avatar-container').css({
+                height: '50%',
+                width: `${heightToWidthPercent / 2}%`
+            });
        }

        if (thumbs.remoteThumbs) {
@@ -122,6 +142,10 @@ const Filmstrip = {
                'min-width': '',
                'min-height': ''
            });
+            $('#filmstripRemoteVideosContainer > span > .avatar-container').css({
+                height: '50%',
+                width: `${heightToWidthPercent / 2}%`
+            });
        }
    },

--- a/modules/UI/videolayout/LargeVideoManager.js
+++ b/modules/UI/videolayout/LargeVideoManager.js
@@ -6,18 +6,21 @@ import ReactDOM from 'react-dom';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';

+import { createScreenSharingIssueEvent, sendAnalytics } from '../../../react/features/analytics';
 import { Avatar } from '../../../react/features/base/avatar';
 import { i18next } from '../../../react/features/base/i18n';
 import {
    JitsiParticipantConnectionStatus
 } from '../../../react/features/base/lib-jitsi-meet';
-import { VIDEO_TYPE } from '../../../react/features/base/media';
+import { MEDIA_TYPE, VIDEO_TYPE } from '../../../react/features/base/media';
 import { getParticipantById } from '../../../react/features/base/participants';
+import { getTrackByMediaTypeAndParticipant } from '../../../react/features/base/tracks';
 import { CHAT_SIZE } from '../../../react/features/chat';
 import {
    updateKnownLargeVideoResolution
 } from '../../../react/features/large-video/actions';
 import { PresenceLabel } from '../../../react/features/presence-status';
+import { shouldDisplayTileView } from '../../../react/features/video-layout';
 /* eslint-enable no-unused-vars */
 import UIEvents from '../../../service/UI/UIEvents';
 import { createDeferred } from '../../util/helpers';
@@ -203,8 +206,7 @@ export default class LargeVideoManager {
            // FIXME this does not really make sense, because the videoType
            // (camera or desktop) is a completely different thing than
            // the video container type (Etherpad, SharedVideo, VideoContainer).
-            const isVideoContainer
-                = LargeVideoManager.isVideoContainer(videoType);
+            const isVideoContainer = LargeVideoManager.isVideoContainer(videoType);

            this.newStreamData = null;

@@ -219,14 +221,15 @@ export default class LargeVideoManager {
            this.updateAvatar();

            const isVideoMuted = !stream || stream.isMuted();
-            const participant = getParticipantById(APP.store.getState(), id);
+            const state = APP.store.getState();
+            const participant = getParticipantById(state, id);
            const connectionStatus = participant?.connectionStatus;
            const isVideoRenderable = !isVideoMuted
                && (APP.conference.isLocalId(id) || connectionStatus === JitsiParticipantConnectionStatus.ACTIVE);
-
+            const isAudioOnly = APP.conference.isAudioOnly();
            const showAvatar
                = isVideoContainer
-                    && ((APP.conference.isAudioOnly() && videoType !== VIDEO_TYPE.DESKTOP) || !isVideoRenderable);
+                    && ((isAudioOnly && videoType !== VIDEO_TYPE.DESKTOP) || !isVideoRenderable);

            let promise;

@@ -238,6 +241,29 @@ export default class LargeVideoManager {
                // If the intention of this switch is to show the avatar
                // we need to make sure that the video is hidden
                promise = container.hide();
+
+                if ((!shouldDisplayTileView(state) || participant?.pinned) // In theory the tile view may not be
+                // enabled yet when we auto pin the participant.
+
+                        && participant && !participant.local && !participant.isFakeParticipant) {
+                    // remote participant only
+                    const track = getTrackByMediaTypeAndParticipant(
+                        state['features/base/tracks'], MEDIA_TYPE.VIDEO, id);
+                    const isScreenSharing = track?.videoType === 'desktop';
+
+                    if (isScreenSharing) {
+                        // send the event
+                        sendAnalytics(createScreenSharingIssueEvent({
+                            source: 'large-video',
+                            connectionStatus,
+                            isVideoMuted,
+                            isAudioOnly,
+                            isVideoContainer,
+                            videoType
+                        }));
+                    }
+                }
+
            } else {
                promise = container.show();
            }
--- a/modules/UI/videolayout/LocalVideo.js
+++ b/modules/UI/videolayout/LocalVideo.js
@@ -1,23 +1,23 @@
-/* global $, config, APP */
+/* global $, config, interfaceConfig, APP */

+import Logger from 'jitsi-meet-logger';
 /* eslint-disable no-unused-vars */
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';

-import { i18next } from '../../../react/features/base/i18n';
 import { JitsiTrackEvents } from '../../../react/features/base/lib-jitsi-meet';
 import { VideoTrack } from '../../../react/features/base/media';
 import { updateSettings } from '../../../react/features/base/settings';
 import { getLocalVideoTrack } from '../../../react/features/base/tracks';
-import Thumbnail from '../../../react/features/filmstrip/components/web/Thumbnail';
 import { shouldDisplayTileView } from '../../../react/features/video-layout';
 /* eslint-enable no-unused-vars */
 import UIEvents from '../../../service/UI/UIEvents';

 import SmallVideo from './SmallVideo';

+const logger = Logger.getLogger(__filename);
+
 /**
 *
 */
@@ -37,7 +37,6 @@ export default class LocalVideo extends SmallVideo {
        this.isLocal = true;
        this._setThumbnailSize();
        this.updateDOMLocation();
-        this.renderThumbnail();

        this.localVideoId = null;
        this.bindHoverHandler();
@@ -45,6 +44,7 @@ export default class LocalVideo extends SmallVideo {
            this._buildContextMenu();
        }
        this.emitter = emitter;
+        this.statsPopoverLocation = interfaceConfig.VERTICAL_FILMSTRIP ? 'left top' : 'top center';

        Object.defineProperty(this, 'id', {
            get() {
@@ -53,6 +53,18 @@ export default class LocalVideo extends SmallVideo {
        });
        this.initBrowserSpecificProperties();

+        // Set default display name.
+        this.updateDisplayName();
+
+        // Initialize the avatar display with an avatar url selected from the redux
+        // state. Redux stores the local user with a hardcoded participant id of
+        // 'local' if no id has been assigned yet.
+        this.initializeAvatar();
+
+        this.addAudioLevelIndicator();
+        this.updateIndicators();
+        this.updateStatusBar();
+
        this.container.onclick = this._onContainerClick;
    }

@@ -65,19 +77,38 @@ export default class LocalVideo extends SmallVideo {
        containerSpan.classList.add('videocontainer');
        containerSpan.id = this.videoSpanId;

+        containerSpan.innerHTML = `
+            <div class = 'videocontainer__background'></div>
+            <span id = 'localVideoWrapper'></span>
+            <div class = 'videocontainer__toolbar'></div>
+            <div class = 'videocontainer__toptoolbar'></div>
+            <div class = 'videocontainer__hoverOverlay'></div>
+            <div class = 'displayNameContainer'></div>
+            <div class = 'avatar-container'></div>`;
+
        return containerSpan;
    }

    /**
-     * Renders the thumbnail.
+     * Triggers re-rendering of the display name using current instance state.
+     *
+     * @returns {void}
     */
-    renderThumbnail(isHovered = false) {
-        ReactDOM.render(
-            <Provider store = { APP.store }>
-                <I18nextProvider i18n = { i18next }>
-                    <Thumbnail participantID = { this.id } isHovered = { isHovered } />
-                </I18nextProvider>
-            </Provider>, this.container);
+    updateDisplayName() {
+        if (!this.container) {
+            logger.warn(
+                    `Unable to set displayName - ${this.videoSpanId
+                    } does not exist`);
+
+            return;
+        }
+
+        this._renderDisplayName({
+            allowEditing: !config.disableProfile,
+            displayNameSuffix: interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME,
+            elementID: 'localDisplayName',
+            participantID: this.id
+        });
    }

    /**
@@ -85,7 +116,9 @@ export default class LocalVideo extends SmallVideo {
     * @param {*} stream
     */
    changeVideo(stream) {
+        this.videoStream = stream;
        this.localVideoId = `localVideo_${stream.getId()}`;
+        this._updateVideoElement();

        // eslint-disable-next-line eqeqeq
        const isVideo = stream.videoType != 'desktop';
@@ -95,6 +128,17 @@ export default class LocalVideo extends SmallVideo {
        this.setFlipX(isVideo ? settings.localFlipX : false);

        const endedHandler = () => {
+            const localVideoContainer
+                = document.getElementById('localVideoWrapper');
+
+            // Only remove if there is no video and not a transition state.
+            // Previous non-react logic created a new video element with each track
+            // removal whereas react reuses the video component so it could be the
+            // stream ended but a new one is being used.
+            if (localVideoContainer && this.videoStream.isEnded()) {
+                ReactDOM.unmountComponentAtNode(localVideoContainer);
+            }
+
            this._notifyOfStreamEnded();
            stream.off(JitsiTrackEvents.LOCAL_TRACK_STOPPED, endedHandler);
        };
@@ -210,5 +254,35 @@ export default class LocalVideo extends SmallVideo {
            : document.getElementById('filmstripLocalVideoThumbnail');

        appendTarget && appendTarget.appendChild(this.container);
+        this._updateVideoElement();
+    }
+
+    /**
+     * Renders the React Element for displaying video in {@code LocalVideo}.
+     *
+     */
+    _updateVideoElement() {
+        const localVideoContainer = document.getElementById('localVideoWrapper');
+        const videoTrack
+            = getLocalVideoTrack(APP.store.getState()['features/base/tracks']);
+
+        ReactDOM.render(
+            <Provider store = { APP.store }>
+                <VideoTrack
+                    id = 'localVideo_container'
+                    videoTrack = { videoTrack } />
+            </Provider>,
+            localVideoContainer
+        );
+
+        // Ensure the video gets play() called on it. This may be necessary in the
+        // case where the local video container was moved and re-attached, in which
+        // case video does not autoplay. Also, set the playsinline attribute on the
+        // video element so that local video doesn't open in full screen by default
+        // in Safari browser on iOS.
+        const video = this.container.querySelector('video');
+
+        video && video.setAttribute('playsinline', 'true');
+        video && !config.testing?.noAutoPlayVideo && video.play();
    }
 }
--- a/modules/UI/videolayout/RemoteVideo.js
+++ b/modules/UI/videolayout/RemoteVideo.js
@@ -1,4 +1,4 @@
-/* global $, APP, config */
+/* global $, APP, interfaceConfig */

 /* eslint-disable no-unused-vars */
 import { AtlasKitThemeProvider } from '@atlaskit/theme';
@@ -15,7 +15,6 @@ import {
 import { getParticipantById } from '../../../react/features/base/participants';
 import { isTestModeEnabled } from '../../../react/features/base/testing';
 import { updateLastTrackVideoMediaEvent } from '../../../react/features/base/tracks';
-import { Thumbnail, isVideoPlayable } from '../../../react/features/filmstrip';
 import { PresenceLabel } from '../../../react/features/presence-status';
 import { stopController, requestRemoteControl } from '../../../react/features/remote-control';
 import { RemoteVideoMenuTriggerButton } from '../../../react/features/remote-video-menu';
@@ -45,6 +44,16 @@ function createContainer(spanId) {
    container.id = spanId;
    container.className = 'videocontainer';

+    container.innerHTML = `
+        <div class = 'videocontainer__background'></div>
+        <div class = 'videocontainer__toptoolbar'></div>
+        <div class = 'videocontainer__toolbar'></div>
+        <div class = 'videocontainer__hoverOverlay'></div>
+        <div class = 'displayNameContainer'></div>
+        <div class = 'avatar-container'></div>
+        <div class ='presence-label-container'></div>
+        <span class = 'remotevideomenu'></span>`;
+
    const remoteVideosContainer
        = document.getElementById('filmstripRemoteVideosContainer');
    const localVideoContainer
@@ -73,7 +82,11 @@ export default class RemoteVideo extends SmallVideo {
        this.id = user.getId();
        this.videoSpanId = `participant_${this.id}`;

+        this._audioStreamElement = null;
+        this.statsPopoverLocation = interfaceConfig.VERTICAL_FILMSTRIP ? 'left bottom' : 'top center';
        this.addRemoteVideoContainer();
+        this.updateIndicators();
+        this.updateDisplayName();
        this.bindHoverHandler();
        this.flipX = false;
        this.isLocal = false;
@@ -87,6 +100,11 @@ export default class RemoteVideo extends SmallVideo {
         */
        this._canPlayEventReceived = false;

+        // Bind event handlers so they are only bound once for every instance.
+        // TODO The event handlers should be turned into actions so changes can be
+        // handled through reducers and middleware.
+        this._setAudioVolume = this._setAudioVolume.bind(this);
+
        this.container.onclick = this._onContainerClick;
    }

@@ -96,23 +114,76 @@ export default class RemoteVideo extends SmallVideo {
    addRemoteVideoContainer() {
        this.container = createContainer(this.videoSpanId);
        this.$container = $(this.container);
-        this.renderThumbnail();
+        this.initializeAvatar();
        this._setThumbnailSize();
        this.initBrowserSpecificProperties();
+        this.updateRemoteVideoMenu();
+        this.updateStatusBar();
+        this.addAudioLevelIndicator();
+        this.addPresenceLabel();

        return this.container;
    }

    /**
-     * Renders the thumbnail.
+     * Generates the popup menu content.
+     *
+     * @returns {Element|*} the constructed element, containing popup menu items
+     * @private
     */
-    renderThumbnail(isHovered = false) {
+    _generatePopupContent() {
+        const remoteVideoMenuContainer
+            = this.container.querySelector('.remotevideomenu');
+
+        if (!remoteVideoMenuContainer) {
+            return;
+        }
+
+        const initialVolumeValue = this._audioStreamElement && this._audioStreamElement.volume;
+
+        // hide volume when in silent mode
+        const onVolumeChange
+            = APP.store.getState()['features/base/config'].startSilent ? undefined : this._setAudioVolume;
+
        ReactDOM.render(
            <Provider store = { APP.store }>
                <I18nextProvider i18n = { i18next }>
-                    <Thumbnail participantID = { this.id } isHovered = { isHovered } />
+                    <AtlasKitThemeProvider mode = 'dark'>
+                        <RemoteVideoMenuTriggerButton
+                            initialVolumeValue = { initialVolumeValue }
+                            onMenuDisplay
+                                = {this._onRemoteVideoMenuDisplay.bind(this)}
+                            onVolumeChange = { onVolumeChange }
+                            participantID = { this.id } />
+                    </AtlasKitThemeProvider>
                </I18nextProvider>
-            </Provider>, this.container);
+            </Provider>,
+            remoteVideoMenuContainer);
+    }
+
+    /**
+     *
+     */
+    _onRemoteVideoMenuDisplay() {
+        this.updateRemoteVideoMenu();
+    }
+
+    /**
+     * Change the remote participant's volume level.
+     *
+     * @param {int} newVal - The value to set the slider to.
+     */
+    _setAudioVolume(newVal) {
+        if (this._audioStreamElement) {
+            this._audioStreamElement.volume = newVal;
+        }
+    }
+
+    /**
+     * Updates the remote video menu.
+     */
+    updateRemoteVideoMenu() {
+        this._generatePopupContent();
    }

    /**
@@ -128,7 +199,7 @@ export default class RemoteVideo extends SmallVideo {
        }

        const isVideo = stream.isVideoTrack();
-        const elementID = `remoteVideo_${stream.getId()}`;
+        const elementID = SmallVideo.getStreamElementID(stream);
        const select = $(`#${elementID}`);

        select.remove();
@@ -136,7 +207,11 @@ export default class RemoteVideo extends SmallVideo {
            this._canPlayEventReceived = false;
        }

-        logger.info(`Video removed ${this.id}`, select);
+        logger.info(`${isVideo ? 'Video' : 'Audio'} removed ${this.id}`, select);
+
+        if (stream === this.videoStream) {
+            this.videoStream = null;
+        }

        this.updateView();
    }
@@ -148,7 +223,14 @@ export default class RemoteVideo extends SmallVideo {
     * @override
     */
    isVideoPlayable() {
-        return isVideoPlayable(APP.store.getState(), this.id) && this._canPlayEventReceived;
+        const participant = getParticipantById(APP.store.getState(), this.id);
+        const { connectionStatus } = participant || {};
+
+        return (
+            super.isVideoPlayable()
+                && this._canPlayEventReceived
+                && connectionStatus === JitsiParticipantConnectionStatus.ACTIVE
+        );
    }

    /**
@@ -163,8 +245,9 @@ export default class RemoteVideo extends SmallVideo {
     * Removes RemoteVideo from the page.
     */
    remove() {
-        ReactDOM.unmountComponentAtNode(this.container);
        super.remove();
+        this.removePresenceLabel();
+        this.removeRemoteVideoMenu();
    }

    /**
@@ -212,16 +295,19 @@ export default class RemoteVideo extends SmallVideo {

        const isVideo = stream.isVideoTrack();

+        if (isVideo) {
+            this.videoStream = stream;
+        } else {
+            this.audioStream = stream;
+        }
+
        if (!stream.getOriginalStream()) {
            logger.debug('Remote video stream has no original stream');

            return;
        }

-        let streamElement = document.createElement('video');
-
-        streamElement.autoplay = !config.testing?.noAutoPlayVideo;
-        streamElement.id = `remoteVideo_${stream.getId()}`;
+        let streamElement = SmallVideo.createStreamElement(stream);

        // Put new stream element always in front
        streamElement = UIUtils.prependChild(this.container, streamElement);
@@ -229,7 +315,14 @@ export default class RemoteVideo extends SmallVideo {
        this.waitForPlayback(streamElement, stream);
        stream.attach(streamElement);

-        if (isVideo && isTestModeEnabled(APP.store.getState())) {
+        if (!isVideo) {
+            this._audioStreamElement = streamElement;
+
+            // If the remote video menu was created before the audio stream was
+            // attached we need to update the menu in order to show the volume
+            // slider.
+            this.updateRemoteVideoMenu();
+        } else if (isTestModeEnabled(APP.store.getState())) {

            const cb = name => APP.store.dispatch(updateLastTrackVideoMediaEvent(stream, name));

@@ -238,4 +331,72 @@ export default class RemoteVideo extends SmallVideo {
            });
        }
    }
+
+    /**
+     * Triggers re-rendering of the display name using current instance state.
+     *
+     * @returns {void}
+     */
+    updateDisplayName() {
+        if (!this.container) {
+            logger.warn(`Unable to set displayName - ${this.videoSpanId} does not exist`);
+
+            return;
+        }
+
+        this._renderDisplayName({
+            elementID: `${this.videoSpanId}_name`,
+            participantID: this.id
+        });
+    }
+
+    /**
+     * Removes remote video menu element from video element identified by
+     * given <tt>videoElementId</tt>.
+     *
+     * @param videoElementId the id of local or remote video element.
+     */
+    removeRemoteVideoMenu() {
+        const menuSpan = this.$container.find('.remotevideomenu');
+
+        if (menuSpan.length) {
+            ReactDOM.unmountComponentAtNode(menuSpan.get(0));
+            menuSpan.remove();
+        }
+    }
+
+    /**
+     * Mounts the {@code PresenceLabel} for displaying the participant's current
+     * presence status.
+     *
+     * @return {void}
+     */
+    addPresenceLabel() {
+        const presenceLabelContainer = this.container.querySelector('.presence-label-container');
+
+        if (presenceLabelContainer) {
+            ReactDOM.render(
+                <Provider store = { APP.store }>
+                    <I18nextProvider i18n = { i18next }>
+                        <PresenceLabel
+                            participantID = { this.id }
+                            className = 'presence-label' />
+                    </I18nextProvider>
+                </Provider>,
+                presenceLabelContainer);
+        }
+    }
+
+    /**
+     * Unmounts the {@code PresenceLabel} component.
+     *
+     * @return {void}
+     */
+    removePresenceLabel() {
+        const presenceLabelContainer = this.container.querySelector('.presence-label-container');
+
+        if (presenceLabelContainer) {
+            ReactDOM.unmountComponentAtNode(presenceLabelContainer);
+        }
+    }
 }
--- a/modules/UI/videolayout/SmallVideo.js
+++ b/modules/UI/videolayout/SmallVideo.js
@@ -1,4 +1,4 @@
-/* global $, APP, interfaceConfig */
+/* global $, APP, config, interfaceConfig */

 /* eslint-disable no-unused-vars */
 import { AtlasKitThemeProvider } from '@atlaskit/theme';
@@ -8,6 +8,7 @@ import ReactDOM from 'react-dom';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';

+import { createScreenSharingIssueEvent, sendAnalytics } from '../../../react/features/analytics';
 import { AudioLevelIndicator } from '../../../react/features/audio-level-indicator';
 import { Avatar as AvatarDisplay } from '../../../react/features/base/avatar';
 import { i18next } from '../../../react/features/base/i18n';
@@ -20,7 +21,6 @@ import {
    pinParticipant
 } from '../../../react/features/base/participants';
 import {
-    getLocalVideoTrack,
    getTrackByMediaTypeAndParticipant,
    isLocalTrackMuted,
    isRemoteTrackMuted
@@ -29,7 +29,6 @@ import { ConnectionIndicator } from '../../../react/features/connection-indicato
 import { DisplayName } from '../../../react/features/display-name';
 import {
    DominantSpeakerIndicator,
-    isVideoPlayable,
    RaisedHandIndicator,
    StatusIndicators
 } from '../../../react/features/filmstrip';
@@ -91,10 +90,36 @@ export default class SmallVideo {
     * Constructor.
     */
    constructor(VideoLayout) {
+        this.videoStream = null;
+        this.audioStream = null;
        this.VideoLayout = VideoLayout;
        this.videoIsHovered = false;
        this.videoType = undefined;

+        /**
+         * Whether or not the connection indicator should be displayed.
+         *
+         * @private
+         * @type {boolean}
+         */
+        this._showConnectionIndicator = !interfaceConfig.CONNECTION_INDICATOR_DISABLED;
+
+        /**
+         * Whether or not the dominant speaker indicator should be displayed.
+         *
+         * @private
+         * @type {boolean}
+         */
+        this._showDominantSpeaker = false;
+
+        /**
+         * Whether or not the raised hand indicator should be displayed.
+         *
+         * @private
+         * @type {boolean}
+         */
+        this._showRaisedHand = false;
+
        // Bind event handlers so they are only bound once for every instance.
        this.updateView = this.updateView.bind(this);

@@ -120,6 +145,33 @@ export default class SmallVideo {
        return this.$container.is(':visible');
    }

+    /**
+     * Creates an audio or video element for a particular MediaStream.
+     */
+    static createStreamElement(stream) {
+        const isVideo = stream.isVideoTrack();
+        const element = isVideo ? document.createElement('video') : document.createElement('audio');
+
+        if (isVideo) {
+            element.setAttribute('muted', 'true');
+            element.setAttribute('playsInline', 'true'); /* for Safari on iOS to work */
+        } else if (config.startSilent) {
+            element.muted = true;
+        }
+
+        element.autoplay = !config.testing?.noAutoPlayVideo;
+        element.id = SmallVideo.getStreamElementID(stream);
+
+        return element;
+    }
+
+    /**
+     * Returns the element id for a particular MediaStream.
+     */
+    static getStreamElementID(stream) {
+        return (stream.isVideoTrack() ? 'remoteVideo_' : 'remoteAudio_') + stream.getId();
+    }
+
    /**
     * Configures hoverIn/hoverOut handlers. Depends on connection indicator.
     */
@@ -128,22 +180,103 @@ export default class SmallVideo {
        this.$container.hover(
            () => {
                this.videoIsHovered = true;
-                this.renderThumbnail(true);
                this.updateView();
+                this.updateIndicators();
            },
            () => {
                this.videoIsHovered = false;
-                this.renderThumbnail(false);
                this.updateView();
+                this.updateIndicators();
            }
        );
    }

    /**
-     * Renders the thumbnail.
+     * Unmounts the ConnectionIndicator component.
+
+    * @returns {void}
+    */
+    removeConnectionIndicator() {
+        this._showConnectionIndicator = false;
+        this.updateIndicators();
+    }
+
+    /**
+     * Create or updates the ReactElement for displaying status indicators about
+     * audio mute, video mute, and moderator status.
+     *
+     * @returns {void}
     */
-    renderThumbnail() {
-        // Should be implemented by in subclasses.
+    updateStatusBar() {
+        const statusBarContainer = this.container.querySelector('.videocontainer__toolbar');
+
+        if (!statusBarContainer) {
+            return;
+        }
+
+        ReactDOM.render(
+            <Provider store = { APP.store }>
+                <I18nextProvider i18n = { i18next }>
+                    <StatusIndicators
+                        participantID = { this.id } />
+                </I18nextProvider>
+            </Provider>,
+            statusBarContainer);
+    }
+
+    /**
+     * Adds the element indicating the audio level of the participant.
+     *
+     * @returns {void}
+     */
+    addAudioLevelIndicator() {
+        let audioLevelContainer = this._getAudioLevelContainer();
+
+        if (audioLevelContainer) {
+            return;
+        }
+
+        audioLevelContainer = document.createElement('span');
+        audioLevelContainer.className = 'audioindicator-container';
+        this.container.appendChild(audioLevelContainer);
+        this.updateAudioLevelIndicator();
+    }
+
+    /**
+     * Removes the element indicating the audio level of the participant.
+     *
+     * @returns {void}
+     */
+    removeAudioLevelIndicator() {
+        const audioLevelContainer = this._getAudioLevelContainer();
+
+        if (audioLevelContainer) {
+            ReactDOM.unmountComponentAtNode(audioLevelContainer);
+        }
+    }
+
+    /**
+     * Updates the audio level for this small video.
+     *
+     * @param lvl the new audio level to set
+     * @returns {void}
+     */
+    updateAudioLevelIndicator(lvl = 0) {
+        const audioLevelContainer = this._getAudioLevelContainer();
+
+        if (audioLevelContainer) {
+            ReactDOM.render(<AudioLevelIndicator audioLevel = { lvl }/>, audioLevelContainer);
+        }
+    }
+
+    /**
+     * Queries the component's DOM for the element that should be the parent to the
+     * AudioLevelIndicator.
+     *
+     * @returns {HTMLElement} The DOM element that holds the AudioLevelIndicator.
+     */
+    _getAudioLevelContainer() {
+        return this.container.querySelector('.audioindicator-container');
    }

    /**
@@ -160,6 +293,62 @@ export default class SmallVideo {
        return $($(this.container).find('video')[0]);
    }

+    /**
+     * Selects the HTML image element which displays user's avatar.
+     *
+     * @return {jQuery|HTMLElement} a jQuery selector pointing to the HTML image
+     * element which displays the user's avatar.
+     */
+    $avatar() {
+        return this.$container.find('.avatar-container');
+    }
+
+    /**
+     * Returns the display name element, which appears on the video thumbnail.
+     *
+     * @return {jQuery} a jQuery selector pointing to the display name element of
+     * the video thumbnail
+     */
+    $displayName() {
+        return this.$container.find('.displayNameContainer');
+    }
+
+    /**
+     * Creates or updates the participant's display name that is shown over the
+     * video preview.
+     *
+     * @param {Object} props - The React {@code Component} props to pass into the
+     * {@code DisplayName} component.
+     * @returns {void}
+     */
+    _renderDisplayName(props) {
+        const displayNameContainer = this.container.querySelector('.displayNameContainer');
+
+        if (displayNameContainer) {
+            ReactDOM.render(
+                <Provider store = { APP.store }>
+                    <I18nextProvider i18n = { i18next }>
+                        <DisplayName { ...props } />
+                    </I18nextProvider>
+                </Provider>,
+                displayNameContainer);
+        }
+    }
+
+    /**
+     * Removes the component responsible for showing the participant's display name,
+     * if its container is present.
+     *
+     * @returns {void}
+     */
+    removeDisplayName() {
+        const displayNameContainer = this.container.querySelector('.displayNameContainer');
+
+        if (displayNameContainer) {
+            ReactDOM.unmountComponentAtNode(displayNameContainer);
+        }
+    }
+
    /**
     * Enables / disables the css responsible for focusing/pinning a video
     * thumbnail.
@@ -203,7 +392,18 @@ export default class SmallVideo {
     * or <tt>false</tt> otherwise.
     */
    isVideoPlayable() {
-        return isVideoPlayable(APP.store.getState(), this.id);
+        const state = APP.store.getState();
+        const tracks = state['features/base/tracks'];
+        const participant = this.id ? getParticipantById(state, this.id) : getLocalParticipant(state);
+        let isVideoMuted = true;
+
+        if (participant?.local) {
+            isVideoMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.VIDEO);
+        } else if (!participant?.isFakeParticipant) { // remote participants excluding shared video
+            isVideoMuted = isRemoteTrackMuted(tracks, MEDIA_TYPE.VIDEO, this.id);
+        }
+
+        return this.videoStream && !isVideoMuted && !APP.conference.isAudioOnly();
    }

    /**
@@ -236,15 +436,13 @@ export default class SmallVideo {
        let isScreenSharing = false;
        let connectionStatus;
        const state = APP.store.getState();
-        const id = this.id;
-        const participant = getParticipantById(state, id);
-        const isLocal = participant?.local ?? true;
-        const tracks = state['features/base/tracks'];
-        const videoTrack
-            = isLocal ? getLocalVideoTrack(tracks) : getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.VIDEO, id);
+        const participant = getParticipantById(state, this.id);

        if (typeof participant !== 'undefined' && !participant.isFakeParticipant && !participant.local) {
-            isScreenSharing = typeof track !== 'undefined' && videoTrack?.videoType === 'desktop';
+            const tracks = state['features/base/tracks'];
+            const track = getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.VIDEO, this.id);
+
+            isScreenSharing = typeof track !== 'undefined' && track.videoType === 'desktop';
            connectionStatus = participant.connectionStatus;
        }

@@ -257,9 +455,9 @@ export default class SmallVideo {
            hasVideo: Boolean(this.selectVideoElement().length),
            connectionStatus,
            canPlayEventReceived: this._canPlayEventReceived,
-            videoStream: Boolean(videoTrack),
+            videoStream: Boolean(this.videoStream),
            isScreenSharing,
-            videoStreamMuted: videoTrack ? videoTrack.muted : 'no stream'
+            videoStreamMuted: this.videoStream ? this.videoStream.isMuted() : 'no stream'
        };
    }

@@ -315,6 +513,55 @@ export default class SmallVideo {
        if (this.displayMode !== oldDisplayMode) {
            logger.debug(`Displaying ${displayModeString} for ${this.id}, data: [${JSON.stringify(displayModeInput)}]`);
        }
+
+        if (this.displayMode !== DISPLAY_VIDEO
+            && this.displayMode !== DISPLAY_VIDEO_WITH_NAME
+            && displayModeInput.tileViewActive
+            && displayModeInput.isScreenSharing
+            && !displayModeInput.isAudioOnly) {
+            // send the event
+            sendAnalytics(createScreenSharingIssueEvent({
+                source: 'thumbnail',
+                ...displayModeInput
+            }));
+        }
+    }
+
+    /**
+     * Updates the react component displaying the avatar with the passed in avatar
+     * url.
+     *
+     * @returns {void}
+     */
+    initializeAvatar() {
+        const thumbnail = this.$avatar().get(0);
+
+        if (thumbnail) {
+            // Maybe add a special case for local participant, as on init of
+            // LocalVideo.js the id is set to "local" but will get updated later.
+            ReactDOM.render(
+                <Provider store = { APP.store }>
+                    <AvatarDisplay
+                        className = 'userAvatar'
+                        participantId = { this.id } />
+                </Provider>,
+                thumbnail
+            );
+        }
+    }
+
+    /**
+     * Unmounts any attached react components (particular the avatar image) from
+     * the avatar container.
+     *
+     * @returns {void}
+     */
+    removeAvatar() {
+        const thumbnail = this.$avatar().get(0);
+
+        if (thumbnail) {
+            ReactDOM.unmountComponentAtNode(thumbnail);
+        }
    }

    /**
@@ -333,8 +580,30 @@ export default class SmallVideo {

            return;
        }
+        if (this._showDominantSpeaker === show) {
+            return;
+        }

-        this.$container.toggleClass('active-speaker', show);
+        this._showDominantSpeaker = show;
+        this.$container.toggleClass('active-speaker', this._showDominantSpeaker);
+        this.updateIndicators();
+        this.updateView();
+    }
+
+    /**
+     * Shows or hides the raised hand indicator.
+     * @param show whether to show or hide.
+     */
+    showRaisedHandIndicator(show) {
+        if (!this.container) {
+            logger.warn(`Unable to raised hand indication - ${
+                this.videoSpanId} does not exist`);
+
+            return;
+        }
+
+        this._showRaisedHand = show;
+        this.updateIndicators();
    }

    /**
@@ -365,7 +634,19 @@ export default class SmallVideo {
     */
    remove() {
        logger.log('Remove thumbnail', this.id);
-        this._unmountThumbnail();
+        this.removeAudioLevelIndicator();
+
+        const toolbarContainer
+            = this.container.querySelector('.videocontainer__toolbar');
+
+        if (toolbarContainer) {
+            ReactDOM.unmountComponentAtNode(toolbarContainer);
+        }
+
+        this.removeConnectionIndicator();
+        this.removeDisplayName();
+        this.removeAvatar();
+        this._unmountIndicators();

        // Remove whole container
        if (this.container.parentNode) {
@@ -380,9 +661,76 @@ export default class SmallVideo {
     * @returns {void}
     */
    rerender() {
+        this.updateIndicators();
+        this.updateStatusBar();
        this.updateView();
    }

+    /**
+     * Updates the React element responsible for showing connection status, dominant
+     * speaker, and raised hand icons. Uses instance variables to get the necessary
+     * state to display. Will create the React element if not already created.
+     *
+     * @private
+     * @returns {void}
+     */
+    updateIndicators() {
+        const indicatorToolbar = this.container.querySelector('.videocontainer__toptoolbar');
+
+        if (!indicatorToolbar) {
+            return;
+        }
+
+        const { NORMAL = 8 } = interfaceConfig.INDICATOR_FONT_SIZES || {};
+        const iconSize = NORMAL;
+        const showConnectionIndicator = this.videoIsHovered || !interfaceConfig.CONNECTION_INDICATOR_AUTO_HIDE_ENABLED;
+        const state = APP.store.getState();
+        const currentLayout = getCurrentLayout(state);
+        const participantCount = getParticipantCount(state);
+        let statsPopoverPosition, tooltipPosition;
+
+        if (currentLayout === LAYOUTS.TILE_VIEW) {
+            statsPopoverPosition = 'right top';
+            tooltipPosition = 'right';
+        } else if (currentLayout === LAYOUTS.VERTICAL_FILMSTRIP_VIEW) {
+            statsPopoverPosition = this.statsPopoverLocation;
+            tooltipPosition = 'left';
+        } else {
+            statsPopoverPosition = this.statsPopoverLocation;
+            tooltipPosition = 'top';
+        }
+
+        ReactDOM.render(
+            <Provider store = { APP.store }>
+                <I18nextProvider i18n = { i18next }>
+                    <div>
+                        <AtlasKitThemeProvider mode = 'dark'>
+                            { this._showConnectionIndicator
+                                ? <ConnectionIndicator
+                                    alwaysVisible = { showConnectionIndicator }
+                                    iconSize = { iconSize }
+                                    isLocalVideo = { this.isLocal }
+                                    enableStatsDisplay = { true }
+                                    participantId = { this.id }
+                                    statsPopoverPosition = { statsPopoverPosition } />
+                                : null }
+                            <RaisedHandIndicator
+                                iconSize = { iconSize }
+                                participantId = { this.id }
+                                tooltipPosition = { tooltipPosition } />
+                            { this._showDominantSpeaker && participantCount > 2
+                                ? <DominantSpeakerIndicator
+                                    iconSize = { iconSize }
+                                    tooltipPosition = { tooltipPosition } />
+                                : null }
+                        </AtlasKitThemeProvider>
+                    </div>
+                </I18nextProvider>
+            </Provider>,
+            indicatorToolbar
+        );
+    }
+
    /**
     * Callback invoked when the thumbnail is clicked and potentially trigger
     * pinning of the participant.
@@ -440,10 +788,18 @@ export default class SmallVideo {
    }

    /**
-     * Unmounts the thumbnail.
+     * Removes the React element responsible for showing connection status, dominant
+     * speaker, and raised hand icons.
+     *
+     * @private
+     * @returns {void}
     */
-    _unmountThumbnail() {
-        ReactDOM.unmountComponentAtNode(this.container);
+    _unmountIndicators() {
+        const indicatorToolbar = this.container.querySelector('.videocontainer__toptoolbar');
+
+        if (indicatorToolbar) {
+            ReactDOM.unmountComponentAtNode(indicatorToolbar);
+        }
    }

    /**
@@ -457,6 +813,10 @@ export default class SmallVideo {
        switch (layout) {
        case LAYOUTS.VERTICAL_FILMSTRIP_VIEW: {
            this.$container.css('padding-top', `${heightToWidthPercent}%`);
+            this.$avatar().css({
+                height: '50%',
+                width: `${heightToWidthPercent / 2}%`
+            });
            break;
        }
        case LAYOUTS.HORIZONTAL_FILMSTRIP_VIEW: {
@@ -466,6 +826,7 @@ export default class SmallVideo {

            if (typeof size !== 'undefined') {
                const { height, width } = size;
+                const avatarSize = height / 2;

                this.$container.css({
                    height: `${height}px`,
@@ -473,6 +834,10 @@ export default class SmallVideo {
                    'min-width': `${width}px`,
                    width: `${width}px`
                });
+                this.$avatar().css({
+                    height: `${avatarSize}px`,
+                    width: `${avatarSize}px`
+                });
            }
            break;
        }
@@ -482,6 +847,7 @@ export default class SmallVideo {

            if (typeof thumbnailSize !== 'undefined') {
                const { height, width } = thumbnailSize;
+                const avatarSize = height / 2;

                this.$container.css({
                    height: `${height}px`,
@@ -489,6 +855,10 @@ export default class SmallVideo {
                    'min-width': `${width}px`,
                    width: `${width}px`
                });
+                this.$avatar().css({
+                    height: `${avatarSize}px`,
+                    width: `${avatarSize}px`
+                });
            }
            break;
        }
--- a/modules/UI/videolayout/VideoLayout.js
+++ b/modules/UI/videolayout/VideoLayout.js
@@ -116,6 +116,12 @@ const VideoLayout = {
     * @param lvl the new audio level to update to
     */
    setAudioLevel(id, lvl) {
+        const smallVideo = this.getSmallVideo(id);
+
+        if (smallVideo) {
+            smallVideo.updateAudioLevelIndicator(lvl);
+        }
+
        if (largeVideo && id === largeVideo.id) {
            largeVideo.updateLargeVideoAudioLevel(lvl);
        }
@@ -131,6 +137,19 @@ const VideoLayout = {
        this._updateLargeVideoIfDisplayed(localId);
    },

+    /**
+     * Get's the localID of the conference and set it to the local video
+     * (small one). This needs to be called as early as possible, when muc is
+     * actually joined. Otherwise events can come with information like email
+     * and setting them assume the id is already set.
+     */
+    mucJoined() {
+        // FIXME: replace this call with a generic update call once SmallVideo
+        // only contains a ReactElement. Then remove this call once the
+        // Filmstrip is fully in React.
+        localVideoThumbnail.updateIndicators();
+    },
+
    /**
     * Shows/hides local video.
     * @param {boolean} true to make the local video visible, false - otherwise
@@ -153,8 +172,11 @@ const VideoLayout = {

        remoteVideo.addRemoteStreamElement(stream);

-        this.onVideoMute(id);
-        remoteVideo.updateView();
+        // Make sure track's muted state is reflected
+        if (stream.getType() !== 'audio') {
+            this.onVideoMute(id);
+            remoteVideo.updateView();
+        }
    },

    onRemoteStreamRemoved(stream) {
@@ -162,12 +184,13 @@ const VideoLayout = {
        const remoteVideo = remoteVideos[id];

        // Remote stream may be removed after participant left the conference.
+
        if (remoteVideo) {
            remoteVideo.removeRemoteStreamElement(stream);
            remoteVideo.updateView();
        }

-        this.updateVideoMutedForNoTracks(id);
+        this.updateMutedForNoTracks(id, stream.getType());
    },

    /**
@@ -176,12 +199,19 @@ const VideoLayout = {
     *
     * If participant has no tracks will make the UI display muted status.
     * @param {string} participantId
+     * @param {string} mediaType 'audio' or 'video'
     */
-    updateVideoMutedForNoTracks(participantId) {
+    updateMutedForNoTracks(participantId, mediaType) {
        const participant = APP.conference.getParticipantById(participantId);

-        if (participant && !participant.getTracksByMediaType('video').length) {
-            APP.UI.setVideoMuted(participantId);
+        if (participant && !participant.getTracksByMediaType(mediaType).length) {
+            if (mediaType === 'audio') {
+                APP.UI.setAudioMuted(participantId, true);
+            } else if (mediaType === 'video') {
+                APP.UI.setVideoMuted(participantId);
+            } else {
+                logger.error(`Unsupported media type: ${mediaType}`);
+            }
        }
    },

@@ -264,7 +294,9 @@ const VideoLayout = {
        const remoteVideo = new RemoteVideo(jitsiParticipant, VideoLayout);

        this.addRemoteVideoContainer(id, remoteVideo);
-        this.updateVideoMutedForNoTracks(id);
+
+        this.updateMutedForNoTracks(id, 'audio');
+        this.updateMutedForNoTracks(id, 'video');
    },

    /**
@@ -299,6 +331,22 @@ const VideoLayout = {
        this._updateLargeVideoIfDisplayed(id, true);
    },

+    /**
+     * Display name changed.
+     */
+    onDisplayNameChanged(id) {
+        if (id === 'localVideoContainer'
+            || APP.conference.isLocalId(id)) {
+            localVideoThumbnail.updateDisplayName();
+        } else {
+            const remoteVideo = remoteVideos[id];
+
+            if (remoteVideo) {
+                remoteVideo.updateDisplayName();
+            }
+        }
+    },
+
    /**
     * On dominant speaker changed event.
     *
@@ -365,6 +413,20 @@ const VideoLayout = {
        }
    },

+    /**
+     * Hides all the indicators
+     */
+    hideStats() {
+        for (const video in remoteVideos) { // eslint-disable-line guard-for-in
+            const remoteVideo = remoteVideos[video];
+
+            if (remoteVideo) {
+                remoteVideo.removeConnectionIndicator();
+            }
+        }
+        localVideoThumbnail.removeConnectionIndicator();
+    },
+
    removeParticipantContainer(id) {
        // Unlock large video
        if (this.getPinnedId() === id) {
@@ -415,6 +477,15 @@ const VideoLayout = {
    },

    changeUserAvatar(id, avatarUrl) {
+        const smallVideo = VideoLayout.getSmallVideo(id);
+
+        if (smallVideo) {
+            smallVideo.initializeAvatar();
+        } else {
+            logger.warn(
+                `Missed avatar update - no small video yet for ${id}`
+            );
+        }
        if (this.isCurrentlyOnLarge(id)) {
            largeVideo.updateAvatar(avatarUrl);
        }
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,11 +4,34 @@
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
+    "@amplitude/eslint-config-typescript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/eslint-config-typescript/-/eslint-config-typescript-1.1.0.tgz",
+      "integrity": "sha512-N8sKkwtFakPD2/cSOrBnM5Wudjp4qeDD69U1cG7dZ6DDczxBhUEqnJDJ0wiYmKMPXqr+bmFOsDdbCcOmb/CLYA=="
+    },
+    "@amplitude/types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.1.0.tgz",
+      "integrity": "sha512-aJebJlI1hfRrzsbcRzW1heTDEClhElwEJ4ODyYZbBacKzH29q3OKZCkgNfaEYdxfgLpoDSh/ffHYpl7fWm3SQA==",
+      "requires": {
+        "@amplitude/eslint-config-typescript": "^1.1.0"
+      }
+    },
    "@amplitude/ua-parser-js": {
      "version": "0.7.24",
      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.24.tgz",
      "integrity": "sha512-VbQuJymJ20WEw0HtI2np7EdC3NJGUWi8+Xdbc7uk8WfMIF308T0howpzkQ3JFMN7ejnrcSM/OyNGveeE3TP3TA=="
    },
+    "@amplitude/utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.1.0.tgz",
+      "integrity": "sha512-TbKgBZNSRFu5RfYTKpprn/DFlZqr8jnmjXASZyQ/m8XDdbD2VoRqHDmKUwFiruX9OhAb2m9BhjLuaiwRYHCcqQ==",
+      "requires": {
+        "@amplitude/eslint-config-typescript": "^1.1.0",
+        "@amplitude/types": "^1.1.0",
+        "tslib": "^1.9.3"
+      }
+    },
    "@atlaskit/analytics-next": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-3.2.1.tgz",
@@ -3343,10 +3366,13 @@
        "isomorphic-fetch": "^2.2.1"
      }
    },
-    "@react-native-community/async-storage": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@react-native-community/async-storage/-/async-storage-1.3.4.tgz",
-      "integrity": "sha512-fJmzL27x0BEjhmMXPnDPnUNCZK7bph+NBVCfAz9fzHzAamaiOkdUwuL3PvE4Oj4Kw4knP8ocw5VRDGorAidZ2g=="
+    "@react-native-async-storage/async-storage": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.13.2.tgz",
+      "integrity": "sha512-isTDvUApRJPVWFxV15yrQSOGqarX7cIedq/y4N5yWSnotf68D9qvDEv1I7rCXhkBDi0u4OJt6GA9dksUT0D3wg==",
+      "requires": {
+        "deep-assign": "^3.0.0"
+      }
    },
    "@react-native-community/cli-debugger-ui": {
      "version": "3.0.0",
@@ -4922,11 +4948,12 @@
      "dev": true
    },
    "amplitude-js": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-7.3.1.tgz",
-      "integrity": "sha512-dsJU9MdtDDAOtKnbHrJuVBgsL5UGxD1P2B7doGdAQ1hxxT/5mFrmJTFzi1tKe+2ir3QtcRa9B0qvH8TMsGw22A==",
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-7.3.3.tgz",
+      "integrity": "sha512-krSXUXeHqbQk15ozx0kC3h0K3i7wQ1ycSG08OfZBga2Vfbi3Y30CP6UXLdtJX4AiBB8EkjMePdMgU6kyuIpi/A==",
      "requires": {
        "@amplitude/ua-parser-js": "0.7.24",
+        "@amplitude/utils": "^1.0.5",
        "blueimp-md5": "^2.10.0",
        "query-string": "5"
      }
@@ -7246,6 +7273,14 @@
      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
    },
+    "deep-assign": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-3.0.0.tgz",
+      "integrity": "sha512-YX2i9XjJ7h5q/aQ/IM9PEwEnDqETAIYbggmdDB3HLTlSgo1CxPsj6pvhPG68rq6SVE0+p+6Ywsm5fTYNrYtBWw==",
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
    "deep-equal": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -10245,6 +10280,11 @@
        "kind-of": "^3.0.2"
      }
    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+    },
    "is-path-cwd": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
@@ -10776,8 +10816,8 @@
      }
    },
    "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#9f65e8fab3635ff2e05a5dcff7cc16b33215b6be",
-      "from": "github:jitsi/lib-jitsi-meet#9f65e8fab3635ff2e05a5dcff7cc16b33215b6be",
+      "version": "github:jitsi/lib-jitsi-meet#310983c5b0398d213a2ca054c2eb0e9797fa1ae0",
+      "from": "github:jitsi/lib-jitsi-meet#310983c5b0398d213a2ca054c2eb0e9797fa1ae0",
      "requires": {
        "@jitsi/js-utils": "1.0.2",
        "@jitsi/sdp-interop": "1.0.3",
@@ -10806,10 +10846,6 @@
            "js-md5": "0.7.3"
          }
        },
-        "jitsi-meet-logger": {
-          "version": "github:jitsi/jitsi-meet-logger#4add5bac2e4cea73a05f42b7596ee03c7f7a2567",
-          "from": "github:jitsi/jitsi-meet-logger#v1.0.0"
-        },
        "js-md5": {
          "version": "0.7.3",
          "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
@@ -14162,6 +14198,11 @@
      "resolved": "https://registry.npmjs.org/react-native-default-preference/-/react-native-default-preference-1.4.2.tgz",
      "integrity": "sha512-kNhBLv8s6kO2gJJFEKM7qew7oRvJnygjgG1CU2ZEY6SlG5qsRX8z1Ms7z1Oo/XB7fVfyXrAoZDGhIvy+uiByrg=="
    },
+    "react-native-device-info": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-7.3.1.tgz",
+      "integrity": "sha512-RQP3etbmXsOlcaxHeHNug68nRli02S9iGC7TbaXpkvyyevIuRogfnrI71sWtqmlT91kdpYAOYKmNfRL9LOSKVw=="
+    },
    "react-native-immersive": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/react-native-immersive/-/react-native-immersive-2.0.0.tgz",
@@ -14288,9 +14329,9 @@
      "integrity": "sha512-iqdJ1KpZbR4XGahgVmaeibB7kDhyMT7wrylINgJaYBY38IAiI0LF32VX1umO4pko6n21YF5I/kSeNQ+OXGqqow=="
    },
    "react-native-webrtc": {
-      "version": "1.87.1",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.87.1.tgz",
-      "integrity": "sha512-XIztid40ohLUoOIDqpavskyAPzopWIjNOoC/y3AtTymt+o+W/rIHZ9Qw8JZCaIjWh2AIrcO2wtb/f1aMWSz2Zw==",
+      "version": "1.87.2",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.87.2.tgz",
+      "integrity": "sha512-bUMoMvfK17nT8S2w16bpL1uMMyDvDwOmhVjGrP6FDrCS7lAx/w2jVMUtZlNVS6zCJXN92wTkYJ6P3z+nr2hhNg==",
      "requires": {
        "base64-js": "^1.1.2",
        "cross-os": "^1.3.0",
--- a/package.json
+++ b/package.json
@@ -34,13 +34,13 @@
    "@atlaskit/tooltip": "12.1.13",
    "@jitsi/js-utils": "1.0.3",
    "@microsoft/microsoft-graph-client": "1.1.0",
-    "@react-native-community/async-storage": "1.3.4",
+    "@react-native-async-storage/async-storage": "1.13.2",
    "@react-native-community/google-signin": "3.0.1",
    "@react-native-community/netinfo": "4.1.5",
    "@svgr/webpack": "4.3.2",
    "@tensorflow-models/body-pix": "2.0.4",
    "@tensorflow/tfjs": "1.5.1",
-    "amplitude-js": "7.3.1",
+    "amplitude-js": "7.3.3",
    "base64-js": "1.3.1",
    "bc-css-flags": "3.0.0",
    "dropbox": "4.0.9",
@@ -56,7 +56,7 @@
    "jquery-i18next": "1.2.1",
    "js-md5": "0.6.1",
    "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#9f65e8fab3635ff2e05a5dcff7cc16b33215b6be",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#310983c5b0398d213a2ca054c2eb0e9797fa1ae0",
    "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
    "lodash": "4.17.19",
    "moment": "2.19.4",
@@ -75,6 +75,7 @@
    "react-native-callstats": "3.61.0",
    "react-native-collapsible": "1.5.1",
    "react-native-default-preference": "1.4.2",
+    "react-native-device-info": "7.3.1",
    "react-native-immersive": "2.0.0",
    "react-native-keep-awake": "4.0.0",
    "react-native-linear-gradient": "2.5.6",
@@ -84,7 +85,7 @@
    "react-native-svg-transformer": "0.14.3",
    "react-native-url-polyfill": "1.2.0",
    "react-native-watch-connectivity": "0.4.3",
-    "react-native-webrtc": "1.87.1",
+    "react-native-webrtc": "1.87.2",
    "react-native-webview": "11.0.2",
    "react-native-youtube-iframe": "1.2.3",
    "react-redux": "7.1.0",
--- a/react/features/analytics/AnalyticsEvents.js
+++ b/react/features/analytics/AnalyticsEvents.js
@@ -588,6 +588,19 @@ export function createScreenSharingEvent(action) {
    };
 }

+/**
+ * Creates an event which indicates the screen sharing video is not displayed when it needs to be displayed.
+ *
+ * @param {Object} attributes - Additional information that describes the issue.
+ * @returns {Object} The event in a format suitable for sending via sendAnalytics.
+ */
+export function createScreenSharingIssueEvent(attributes) {
+    return {
+        action: 'screen.sharing.issue',
+        attributes
+    };
+}
+
 /**
 * The local participant failed to send a "selected endpoint" message to the
 * bridge.
--- a/react/features/analytics/handlers/AmplitudeHandler.js
+++ b/react/features/analytics/handlers/AmplitudeHandler.js
@@ -1,5 +1,9 @@
+import amplitude from 'amplitude-js';
+
+import logger from '../logger';
+
 import AbstractHandler from './AbstractHandler';
-import { amplitude, fixDeviceID } from './amplitude';
+import { fixDeviceID } from './amplitude';

 /**
 * Analytics handler for Amplitude.
@@ -17,24 +21,39 @@ export default class AmplitudeHandler extends AbstractHandler {

        const { amplitudeAPPKey, host, user } = options;

-        if (!amplitudeAPPKey) {
-            throw new Error('Failed to initialize Amplitude handler, no APP key');
-        }
-
        this._enabled = true;
+        this._host = host; // Only used on React Native.

-        this._amplitudeOptions = {
-            host
+        const onError = e => {
+            logger.error('Error initializing Amplitude', e);
+            this._enabled = false;
        };

-        amplitude.getInstance(this._amplitudeOptions).init(amplitudeAPPKey, undefined, { includeReferrer: true });
-        fixDeviceID(amplitude.getInstance(this._amplitudeOptions));
+        const amplitudeOptions = {
+            domain: navigator.product === 'ReactNative' ? host : undefined,
+            includeReferrer: true,
+            onError
+        };
+
+        this._getInstance().init(amplitudeAPPKey, undefined, amplitudeOptions);
+        fixDeviceID(this._getInstance());

        if (user) {
-            amplitude.getInstance(this._amplitudeOptions).setUserId(user);
+            this._getInstance().setUserId(user);
        }
    }

+    /**
+     * Returns the AmplitudeClient instance.
+     *
+     * @returns {AmplitudeClient}
+     */
+    _getInstance() {
+        const name = navigator.product === 'ReactNative' ? this._host : undefined;
+
+        return amplitude.getInstance(name);
+    }
+
    /**
     * Sets the Amplitude user properties.
     *
@@ -43,8 +62,7 @@ export default class AmplitudeHandler extends AbstractHandler {
     */
    setUserProperties(userProps) {
        if (this._enabled) {
-            amplitude.getInstance(this._amplitudeOptions)
-                .setUserProperties(userProps);
+            this._getInstance().setUserProperties(userProps);
        }
    }

@@ -61,9 +79,7 @@ export default class AmplitudeHandler extends AbstractHandler {
            return;
        }

-        amplitude.getInstance(this._amplitudeOptions).logEvent(
-            this._extractName(event),
-            event);
+        this._getInstance().logEvent(this._extractName(event), event);
    }

    /**
@@ -72,15 +88,10 @@ export default class AmplitudeHandler extends AbstractHandler {
     * @returns {Object}
     */
    getIdentityProps() {
-        // TODO: Remove when web and native Aplitude implementations are unified.
-        if (navigator.product === 'ReactNative') {
-            return {};
-        }
-
        return {
-            sessionId: amplitude.getInstance(this._amplitudeOptions).getSessionId(),
-            deviceId: amplitude.getInstance(this._amplitudeOptions).options.deviceId,
-            userId: amplitude.getInstance(this._amplitudeOptions).options.userId
+            sessionId: this._getInstance().getSessionId(),
+            deviceId: this._getInstance().options.deviceId,
+            userId: this._getInstance().options.userId
        };
    }
 }
--- a/react/features/analytics/handlers/amplitude/Amplitude.native.js
+++ b/react/features/analytics/handlers/amplitude/Amplitude.native.js
@@ -1,115 +0,0 @@
-import { NativeModules } from 'react-native';
-
-const { Amplitude: AmplitudeNative } = NativeModules;
-
-/**
- * Wrapper for the Amplitude native module.
- */
-class Amplitude {
-    /**
-     * Create new Amplitude instance.
-     *
-     * @param {string} instanceName - The name of the Amplitude instance. Should
-     * be used only for multi-project logging.
-     */
-    constructor(instanceName) {
-        // It might not have been included in the build.
-        if (!AmplitudeNative) {
-            throw new Error('Amplitude analytics is not supported');
-        }
-
-        this._instanceName = instanceName;
-    }
-
-    /**
-     * Initializes the Amplitude SDK.
-     *
-     * @param {string} apiKey - The API_KEY of the Amplitude project.
-     * @returns {void}
-     */
-    init(apiKey) {
-        AmplitudeNative.init(this._instanceName, apiKey);
-    }
-
-    /**
-     * Sets an identifier for the current user.
-     *
-     * @param {string} userId - The new user id.
-     * @param {string} opt_userId - Currently not used.
-     * @param {Object} opt_config - Currently not used.
-     * @param {Function} opt_callback - Currently not used.
-     * @returns {void}
-     */
-    setUserId(userId, opt_userId, opt_config, opt_callback) { // eslint-disable-line camelcase, no-unused-vars
-        AmplitudeNative.setUserId(this._instanceName, userId);
-    }
-
-    /**
-     * Sets user properties for the current user.
-     *
-     * @param {Object} userProperties - The user properties to be set.
-     * @returns {void}
-     */
-    setUserProperties(userProperties) {
-        AmplitudeNative.setUserProperties(this._instanceName, userProperties);
-    }
-
-    /**
-     * Log an event with eventType and eventProperties.
-     *
-     * @param {string} eventType - The type of the event.
-     * @param {Object} eventProperties - The properties of the event.
-     * @returns {void}
-     */
-    logEvent(eventType, eventProperties) {
-        // The event properties are converted to JSON string because of known
-        // performance issue when passing objects trough the RN bridge too
-        // often (a few times a second).
-        AmplitudeNative.logEvent(
-            this._instanceName, eventType, JSON.stringify(eventProperties));
-    }
-
-}
-
-/**
- * Cache of <tt>Amplitude</tt> instances by instanceName.
- */
-const instances = {};
-
-/**
- * The default (with instanceName - undefined) <tt>Amplitude</tt> instance.
- */
-let defaultInstance;
-
-export default {
-    /**
-     * Returns a <tt>Amplitude</tt> instance.
-     *
-     * @param {Object} options - Optional parameters.
-     * @param {string} options.host - The host property from the current URL.
-     * @param {string|undefined} options.instanceName - The name of the
-     * amplitude instance. Should be used only for multi-project logging.
-     * @returns {Amplitude}
-     */
-    getInstance(options = {}) {
-        let instance;
-
-        const { host = '', instanceName = '' } = options;
-
-        let internalInstanceName = host;
-
-        if (instanceName !== '') {
-            internalInstanceName += `-${instanceName}`;
-        }
-
-        if (internalInstanceName === '') {
-            instance = defaultInstance = defaultInstance || new Amplitude();
-        } else {
-            instance = instances[internalInstanceName]
-                = instances[internalInstanceName]
-                    || new Amplitude(internalInstanceName);
-        }
-
-        return instance;
-    }
-};
--- a/react/features/analytics/handlers/amplitude/Amplitude.web.js
+++ b/react/features/analytics/handlers/amplitude/Amplitude.web.js
@@ -1,14 +0,0 @@
-import amplitude from 'amplitude-js';
-
-export default {
-    /**
-     * Returns the AmplitudeClient instance.
-     *
-     * @param {Object} options - Optional parameters.
-     * @property {string} options.instanceName - The name of the AmplitudeClient instance.
-     * @returns {AmplitudeClient}
-     */
-    getInstance(options = {}) {
-        return amplitude.getInstance(options.instanceName);
-    }
-};
--- a/react/features/analytics/handlers/amplitude/fixDeviceID.native.js
+++ b/react/features/analytics/handlers/amplitude/fixDeviceID.native.js
@@ -1,9 +1,23 @@
+import DefaultPreference from 'react-native-default-preference';
+import DeviceInfo from 'react-native-device-info';
+
 /**
 * Custom logic for setting the correct device id.
 *
 * @param {AmplitudeClient} amplitude - The amplitude instance.
 * @returns {void}
 */
-export function fixDeviceID(amplitude) { // eslint-disable-line no-unused-vars
+export async function fixDeviceID(amplitude) {
+    await DefaultPreference.setName('jitsi-preferences');

+    const current = await DefaultPreference.get('amplitudeDeviceId');
+
+    if (current) {
+        amplitude.setDeviceId(current);
+    } else {
+        const uid = DeviceInfo.getUniqueId();
+
+        amplitude.setDeviceId(uid);
+        DefaultPreference.set('amplitudeDeviceId', uid);
+    }
 }
--- a/react/features/analytics/handlers/amplitude/index.js
+++ b/react/features/analytics/handlers/amplitude/index.js
@@ -1,2 +1 @@
-export { default as amplitude } from './Amplitude';
 export * from './fixDeviceID';
--- a/react/features/base/conference/middleware.any.js
+++ b/react/features/base/conference/middleware.any.js
@@ -128,6 +128,9 @@ function _conferenceFailed({ dispatch, getState }, next, action) {
            titleKey: 'dialog.sessTerminated'
        }));

+        if (typeof APP !== 'undefined') {
+            APP.UI.hideStats();
+        }
        break;
    }
    case JitsiConferenceErrors.CONNECTION_ERROR: {
--- a/react/features/base/config/configWhitelist.js
+++ b/react/features/base/config/configWhitelist.js
@@ -91,6 +91,7 @@ export default [
    'disableRtx',
    'disableSimulcast',
    'disableThirdPartyRequests',
+    'displayJids',
    'doNotStoreRoom',
    'e2eping',
    'enableDisplayNameInStats',
--- a/react/features/base/icons/svg/arrow_down_large.svg
+++ b/react/features/base/icons/svg/arrow_down_large.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<path d="M12 24l-8-9h6v-15h4v15h6z"/>
+</svg>
--- a/react/features/base/icons/svg/arrow_up_large.svg
+++ b/react/features/base/icons/svg/arrow_up_large.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<path d="M12 0l8 9h-6v15h-4v-15h-6z"/>
+</svg>
--- a/react/features/base/icons/svg/index.js
+++ b/react/features/base/icons/svg/index.js
@@ -4,8 +4,10 @@ export { default as IconAdd } from './add.svg';
 export { default as IconAddPeople } from './link.svg';
 export { default as IconArrowBack } from './arrow_back.svg';
 export { default as IconArrowDown } from './arrow_down.svg';
+export { default as IconArrowDownLarge } from './arrow_down_large.svg';
 export { default as IconArrowDownSmall } from './arrow-down-small.svg';
 export { default as IconArrowUp } from './arrow_up.svg';
+export { default as IconArrowUpLarge } from './arrow_up_large.svg';
 export { default as IconArrowLeft } from './arrow-left.svg';
 export { default as IconAudioOnly } from './visibility.svg';
 export { default as IconAudioOnlyOff } from './visibility-off.svg';
--- a/react/features/base/media/components/web/AudioTrack.js
+++ b/react/features/base/media/components/web/AudioTrack.js
@@ -1,211 +0,0 @@
-// @flow
-
-import React, { Component } from 'react';
-
-/**
- * The type of the React {@code Component} props of {@link Video}.
- */
-type Props = {
-
-    /**
-     * The value of the id attribute of the video. Used by the torture tests to
-     * locate video elements.
-     */
-    id: string,
-
-
-    /**
-     * The audio track.
-     */
-    audioTrack: ?Object,
-
-    /**
-     * Used to determine the value of the autoplay attribute of the underlying
-     * audio element.
-     */
-    autoPlay: boolean,
-
-    muted: ?Boolean,
-
-    volume: ?number,
-
-    onAudioElementReferenceChanged: Function
-};
-
-/**
- * The React/Web {@link Component} which is similar to and wraps around
- * {@code HTMLAudioElement} in order to facilitate cross-platform source code.
- */
-export default class AudioTrack extends Component<Props> {
-    /**
-     * Reference to the HTML audio element, stored until the file is ready.
-     */
-    _ref: ?HTMLAudioElement;
-
-    /**
-     * Default values for {@code AudioTrack} component's properties.
-     *
-     * @static
-     */
-    static defaultProps = {
-        autoPlay: true,
-        id: ''
-    };
-
-
-    /**
-     * Creates new <code>Audio</code> element instance with given props.
-     *
-     * @param {Object} props - The read-only properties with which the new
-     * instance is to be initialized.
-     */
-    constructor(props: Props) {
-        super(props);
-
-        // Bind event handlers so they are only bound once for every instance.
-        this._setRef = this._setRef.bind(this);
-    }
-
-
-    /**
-     * Invokes the library for rendering the video on initial display. Sets the
-     * volume level to zero to ensure no sound plays.
-     *
-     * @inheritdoc
-     * @returns {void}
-     */
-    componentDidMount() {
-        this._attachTrack(this.props.audioTrack);
-
-        if (this._ref) {
-            const { autoPlay, muted, volume } = this.props;
-
-            if (autoPlay) {
-                // Ensure the audio gets play() called on it. This may be necessary in the
-                // case where the local video container was moved and re-attached, in which
-                // case video does not autoplay.
-                this._ref.play();
-            }
-
-            if (typeof volume === 'number') {
-                this._ref.volume = volume;
-            }
-
-            if (typeof muted === 'boolean') {
-                this._ref.muted = muted;
-            }
-        }
-    }
-
-    /**
-     * Remove any existing associations between the current video track and the
-     * component's video element.
-     *
-     * @inheritdoc
-     * @returns {void}
-     */
-    componentWillUnmount() {
-        this._detachTrack(this.props.audioTrack);
-    }
-
-    /**
-     * Updates the video display only if a new track is added. This component's
-     * updating is blackboxed from React to prevent re-rendering of video
-     * element, as the lib uses {@code track.attach(videoElement)} instead.
-     *
-     * @inheritdoc
-     * @returns {boolean} - False is always returned to blackbox this component
-     * from React.
-     */
-    shouldComponentUpdate(nextProps: Props) {
-        const currentJitsiTrack = this.props.audioTrack && this.props.audioTrack.jitsiTrack;
-        const nextJitsiTrack = nextProps.audioTrack && nextProps.audioTrack.jitsiTrack;
-
-        if (currentJitsiTrack !== nextJitsiTrack) {
-            this._detachTrack(this.props.audioTrack);
-            this._attachTrack(nextProps.audioTrack);
-        }
-
-        if (this._ref) {
-            const currentVolume = this._ref.volume;
-            const nextVolume = nextProps.volume;
-
-            if (typeof nextVolume === 'number' && currentVolume !== nextVolume) {
-                this._ref.volume = nextVolume;
-            }
-
-            const currentMuted = this._ref.muted;
-            const nextMuted = nextProps.muted;
-
-            if (typeof nextMuted === 'boolean' && currentMuted !== nextVolume) {
-                this._ref.muted = nextMuted;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Implements React's {@link Component#render()}.
-     *
-     * @inheritdoc
-     * @returns {ReactElement}
-     */
-    render() {
-        const { autoPlay, id } = this.props;
-
-        return (
-            <audio
-                autoPlay = { autoPlay }
-                id = { id }
-                ref = { this._setRef } />
-        );
-    }
-
-    /**
-     * Calls into the passed in track to associate the track with the component's audio element.
-     *
-     * @param {Object} track - The redux representation of the {@code JitsiLocalTrack}.
-     * @private
-     * @returns {void}
-     */
-    _attachTrack(track) {
-        if (!track || !track.jitsiTrack) {
-            return;
-        }
-
-        track.jitsiTrack.attach(this._ref);
-    }
-
-    /**
-     * Removes the association to the component's audio element from the passed
-     * in redux representation of jitsi audio track.
-     *
-     * @param {Object} track -  The redux representation of the {@code JitsiLocalTrack}.
-     * @private
-     * @returns {void}
-     */
-    _detachTrack(track) {
-        if (this._ref && track && track.jitsiTrack) {
-            track.jitsiTrack.detach(this._ref);
-        }
-    }
-
-    _setRef: (?HTMLAudioElement) => void;
-
-    /**
-     * Sets the reference to the HTML audio element.
-     *
-     * @param {HTMLAudioElement} audioElement - The HTML audio element instance.
-     * @private
-     * @returns {void}
-     */
-    _setRef(audioElement: ?HTMLAudioElement) {
-        this._ref = audioElement;
-        const { onAudioElementReferenceChanged } = this.props;
-
-        if (this._ref && onAudioElementReferenceChanged) {
-            onAudioElementReferenceChanged({ volume: this._ref.volume });
-        }
-    }
-}
--- a/react/features/base/media/components/web/Video.js
+++ b/react/features/base/media/components/web/Video.js
@@ -99,13 +99,6 @@ class Video extends Component<Props> {
        }

        this._attachTrack(this.props.videoTrack);
-
-        if (this._videoElement && this.props.autoPlay) {
-            // Ensure the video gets play() called on it. This may be necessary in the
-            // case where the local video container was moved and re-attached, in which
-            // case video does not autoplay.
-            this._videoElement.play();
-        }
    }

    /**
@@ -149,8 +142,6 @@ class Video extends Component<Props> {
     * @returns {ReactElement}
     */
    render() {
-        // NOTE: Maybe we should render null if we don't have video track or if the video track has ended.
-
        return (
            <video
                autoPlay = { this.props.autoPlay }
--- a/react/features/base/react/components/native/BaseIndicator.js
+++ b/react/features/base/react/components/native/BaseIndicator.js
@@ -7,6 +7,7 @@ import { Icon } from '../../../icons';
 import { type StyleType } from '../../../styles';

 import styles from './indicatorstyles';
+import { BASE_INDICATOR } from './styles';

 type Props = {

@@ -40,7 +41,9 @@ export default class BaseIndicator extends Component<Props> {
        const { highlight, icon, iconStyle } = this.props;

        return (
-            <View style = { highlight ? styles.highlightedIndicator : null }>
+            <View
+                style = { [ BASE_INDICATOR,
+                    highlight ? styles.highlightedIndicator : null ] }>
                <Icon
                    src = { icon }
                    style = { [
--- a/react/features/base/react/components/native/styles.js
+++ b/react/features/base/react/components/native/styles.js
@@ -208,6 +208,11 @@ export const TINTED_VIEW_DEFAULT = {
    opacity: 0.8
 };

+export const BASE_INDICATOR = {
+    alignItems: 'center',
+    justifyContent: 'center'
+};
+
 /**
 * The styles of the generic React {@code Component}s implemented by the feature
 * base/react.
--- a/react/features/dynamic-branding/actions.js
+++ b/react/features/dynamic-branding/actions.js
@@ -9,10 +9,11 @@ import {
    SET_DYNAMIC_BRANDING_FAILED,
    SET_DYNAMIC_BRANDING_READY
 } from './actionTypes';
-import { extractFqnFromPath } from './functions';
+import { getDynamicBrandingUrl } from './functions';

 const logger = getLogger(__filename);

+
 /**
 * Fetches custom branding data.
 * If there is no data or the request fails, sets the `customizationReady` flag
@@ -23,15 +24,14 @@ const logger = getLogger(__filename);
 export function fetchCustomBrandingData() {
    return async function(dispatch: Function, getState: Function) {
        const state = getState();
-        const baseUrl = state['features/base/config'].brandingDataUrl;
        const { customizationReady } = state['features/dynamic-branding'];

        if (!customizationReady) {
-            const fqn = extractFqnFromPath(state['features/base/connection'].locationURL.pathname);
+            const url = getDynamicBrandingUrl(state);

-            if (baseUrl && fqn) {
+            if (url) {
                try {
-                    const res = await doGetJSON(`${baseUrl}?conferenceFqn=${encodeURIComponent(fqn)}`);
+                    const res = await doGetJSON(url);

                    return dispatch(setDynamicBrandingData(res));
                } catch (err) {
--- a/react/features/dynamic-branding/functions.js
+++ b/react/features/dynamic-branding/functions.js
@@ -13,3 +13,24 @@ export function extractFqnFromPath(path: string) {

    return parts.length > 2 ? `${parts[len - 2]}/${parts[len - 1]}` : '';
 }
+
+/**
+ * Returns the url used for fetching dynamic branding.
+ *
+ * @param {Object} state - The state of the app.
+ * @returns {string}
+ */
+export function getDynamicBrandingUrl(state: Object) {
+    const { dynamicBrandingUrl } = state['features/base/config'];
+
+    if (dynamicBrandingUrl) {
+        return dynamicBrandingUrl;
+    }
+
+    const baseUrl = state['features/base/config'].brandingDataUrl;
+    const fqn = extractFqnFromPath(state['features/base/connection'].locationURL.pathname);
+
+    if (baseUrl && fqn) {
+        return `${baseUrl}?conferenceFqn=${encodeURIComponent(fqn)}`;
+    }
+}
--- a/react/features/filmstrip/components/native/Thumbnail.js
+++ b/react/features/filmstrip/components/native/Thumbnail.js
@@ -21,6 +21,7 @@ import { getTrackByMediaTypeAndParticipant } from '../../../base/tracks';
 import { ConnectionIndicator } from '../../../connection-indicator';
 import { DisplayNameLabel } from '../../../display-name';
 import { RemoteVideoMenu } from '../../../remote-video-menu';
+import ConnectionStatusComponent from '../../../remote-video-menu/components/native/ConnectionStatusComponent';
 import { toggleToolboxVisible } from '../../../toolbox/actions.native';

 import AudioMutedIndicator from './AudioMutedIndicator';
@@ -54,7 +55,7 @@ type Props = {
    /**
     * Handles long press on the thumbnail.
     */
-    _onShowRemoteVideoMenu: ?Function,
+    _onThumbnailLongPress: ?Function,

    /**
     * Whether to show the dominant speaker indicator or not.
@@ -120,7 +121,7 @@ function Thumbnail(props: Props) {
        _audioMuted: audioMuted,
        _largeVideo: largeVideo,
        _onClick,
-        _onShowRemoteVideoMenu,
+        _onThumbnailLongPress,
        _renderDominantSpeakerIndicator: renderDominantSpeakerIndicator,
        _renderModeratorIndicator: renderModeratorIndicator,
        _styles,
@@ -140,7 +141,7 @@ function Thumbnail(props: Props) {
    return (
        <Container
            onClick = { _onClick }
-            onLongPress = { participant.local ? undefined : _onShowRemoteVideoMenu }
+            onLongPress = { _onThumbnailLongPress }
            style = { [
                styles.thumbnail,
                participant.pinned && !tileView
@@ -230,12 +231,18 @@ function _mapDispatchToProps(dispatch: Function, ownProps): Object {
         *
         * @returns {void}
         */
-        _onShowRemoteVideoMenu() {
+        _onThumbnailLongPress() {
            const { participant } = ownProps;

-            dispatch(openDialog(RemoteVideoMenu, {
-                participant
-            }));
+            if (participant.local) {
+                dispatch(openDialog(ConnectionStatusComponent, {
+                    participantID: participant.id
+                }));
+            } else {
+                dispatch(openDialog(RemoteVideoMenu, {
+                    participant
+                }));
+            }
        }
    };
 }
--- a/react/features/filmstrip/components/web/Thumbnail.js
+++ b/react/features/filmstrip/components/web/Thumbnail.js
@@ -1,612 +0,0 @@
-// @flow
-
-import { AtlasKitThemeProvider } from '@atlaskit/theme';
-import React, { Component } from 'react';
-
-import { AudioLevelIndicator } from '../../../audio-level-indicator';
-import { Avatar } from '../../../base/avatar';
-import JitsiMeetJS from '../../../base/lib-jitsi-meet/_';
-import { MEDIA_TYPE, VideoTrack } from '../../../base/media';
-import AudioTrack from '../../../base/media/components/web/AudioTrack';
-import {
-    getLocalParticipant,
-    getParticipantById,
-    getParticipantCount
-} from '../../../base/participants';
-import { connect } from '../../../base/redux';
-import { getLocalAudioTrack, getLocalVideoTrack, getTrackByMediaTypeAndParticipant } from '../../../base/tracks';
-import { ConnectionIndicator } from '../../../connection-indicator';
-import { DisplayName } from '../../../display-name';
-import { StatusIndicators, RaisedHandIndicator, DominantSpeakerIndicator } from '../../../filmstrip';
-import { PresenceLabel } from '../../../presence-status';
-import { RemoteVideoMenuTriggerButton } from '../../../remote-video-menu';
-import { getCurrentLayout, LAYOUTS } from '../../../video-layout';
-
-const JitsiTrackEvents = JitsiMeetJS.events.track;
-
-declare var interfaceConfig: Object;
-
-type State = {
-    audioLevel: number,
-    volume: ?number
-};
-
-/**
- * The type of the React {@code Component} props of {@link Thumbnail}.
- */
-type Props = {
-
-    /**
-     * The current layout of the filmstrip.
-     */
-    _currentLayout: string,
-
-    _height: number,
-
-    _heightToWidthPercent: number,
-
-    /**
-     * The video track that will be displayed in the thumbnail.
-     */
-    _videoTrack: ?Object,
-
-    /**
-     * The audio track related to the participant.
-     */
-    _audioTrack: ?Object,
-
-    _width: number,
-
-
-    /**
-     * The ID of the participant related to the thumbnaul.
-     */
-    _participant: Object,
-    _defaultLocalDisplayName: string,
-    _disableProfile: boolean,
-    _participantCount: number,
-    _isFilmstripOnly: boolean,
-    _connectionIndicatorDisabled: boolean,
-    _connectionIndicatorAutoHideEnabled: boolean,
-    _isDominantSpeakerDisabled: boolean,
-    _startSilent: Boolean,
-    participantID: ?string,
-    isHovered: ?boolean,
-
-    dispatch: Function
-};
-
-/**
- * TODO.
- *
- * @returns {number}
- */
-function _getIndicatorsIconSize() {
-    const { NORMAL = 8 } = interfaceConfig.INDICATOR_FONT_SIZES || {};
-
-    return NORMAL;
-}
-
-/**
- * Implements a thumbnail.
- *
- * @extends Component
- */
-class Thumbnail extends Component<Props, State> {
-
-    /**
-     * Initializes a new Thumbnail instance.
-     *
-     * @param {Object} props - The read-only React Component props with which
-     * the new instance is to be initialized.
-     */
-    constructor(props: Props) {
-        super(props);
-
-        this.state = {
-            audioLevel: 0,
-            volume: undefined
-        };
-
-        this._updateAudioLevel = this._updateAudioLevel.bind(this);
-        this._onVolumeChange = this._onVolumeChange.bind(this);
-        this._onAudioElementReferenceChanged = this._onAudioElementReferenceChanged.bind(this);
-    }
-
-    /**
-     * Starts listening for audio level updates after the initial render.
-     *
-     * @inheritdoc
-     * @returns {void}
-     */
-    componentDidMount() {
-        this._listenForAudioUpdates();
-    }
-
-    /**
-     * Stops listening for audio level updates on the old track and starts
-     * listening instead on the new track.
-     *
-     * @inheritdoc
-     * @returns {void}
-     */
-    componentDidUpdate(prevProps: Props) {
-        if (prevProps._audioTrack !== this.props._audioTrack) {
-            this._stopListeningForAudioUpdates(prevProps._audioTrack);
-            this._listenForAudioUpdates();
-            this._updateAudioLevel(0);
-        }
-    }
-
-    /**
-     * Unsubscribe from audio level updates.
-     *
-     * @inheritdoc
-     * @returns {void}
-     */
-    componentWillUnmount() {
-        this._stopListeningForAudioUpdates(this.props._audioTrack);
-    }
-
-    /**
-     * Starts listening for audio level updates from the library.
-     *
-     * @private
-     * @returns {void}
-     */
-    _listenForAudioUpdates() {
-        const { _audioTrack } = this.props;
-
-        if (_audioTrack) {
-            const { jitsiTrack } = _audioTrack;
-
-            jitsiTrack && jitsiTrack.on(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED, this._updateAudioLevel);
-        }
-    }
-
-    /**
-     * Stops listening to further updates from the passed track.
-     *
-     * @param {Object} audioTrack - The track.
-     * @private
-     * @returns {void}
-     */
-    _stopListeningForAudioUpdates(audioTrack) {
-        if (audioTrack) {
-            const { jitsiTrack } = audioTrack;
-
-            jitsiTrack && jitsiTrack.off(JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED, this._updateAudioLevel);
-        }
-    }
-
-    _updateAudioLevel: (number) => void;
-
-    /**
-     * Updates the internal state of the last know audio level. The level should
-     * be between 0 and 1, as the level will be used as a percentage out of 1.
-     *
-     * @param {number} audioLevel - The new audio level for the track.
-     * @private
-     * @returns {void}
-     */
-    _updateAudioLevel(audioLevel) {
-        this.setState({
-            audioLevel
-        });
-    }
-
-    /**
-     * Returns an object with the styles for the video container and the avatar container.
-     *
-     * @returns {Object} - The styles for the video container and the avatar container.
-     */
-    _getStyles(): Object {
-        const { _height, _heightToWidthPercent, _currentLayout } = this.props;
-        let styles;
-
-        switch (_currentLayout) {
-        case LAYOUTS.TILE_VIEW:
-        case LAYOUTS.HORIZONTAL_FILMSTRIP_VIEW: {
-            const avatarSize = _height / 2;
-
-            styles = {
-                avatarContainer: {
-                    height: `${avatarSize}px`,
-                    width: `${avatarSize}px`
-                }
-            };
-            break;
-        }
-        case LAYOUTS.VERTICAL_FILMSTRIP_VIEW: {
-            styles = {
-                avatarContainer: {
-                    height: '50%',
-                    width: `${_heightToWidthPercent / 2}%`
-                }
-            };
-            break;
-        }
-        }
-
-        return styles;
-    }
-
-    /**
-     * Renders  a fake participant (youtube video) thumbnail.
-     *
-     * @param {string} id - The id of the participant.
-     * @returns {ReactElement}
-     */
-    _renderFakeParticipant(id) {
-        return (
-            <>
-                <img
-                    className = 'sharedVideoAvatar'
-                    src = { `https://img.youtube.com/vi/${id}/0.jpg` } />
-                <div className = 'displayNameContainer'>
-                    <DisplayName
-                        elementID = 'sharedVideoContainer_name'
-                        participantID = { id } />
-                </div>
-            </>
-        );
-    }
-
-    /**
-     * Renders the local participant's thumbnail.
-     *
-     * @param {string} id - The ID of the participant.
-     * @returns {ReactElement}
-     */
-    _renderLocalParticipant(id) {
-        const styles = this._getStyles();
-        const {
-            _participant,
-            _participantCount,
-            _videoTrack,
-            _defaultLocalDisplayName,
-            _disableProfile,
-            _isFilmstripOnly,
-            _isDominantSpeakerDisabled,
-            _connectionIndicatorDisabled,
-            _connectionIndicatorAutoHideEnabled,
-            _currentLayout
-        } = this.props;
-        const { audioLevel = 0 } = this.state;
-        const iconSize = _getIndicatorsIconSize();
-        const showConnectionIndicator = this.props.isHovered || !_connectionIndicatorAutoHideEnabled;
-        const { dominantSpeaker = false } = _participant;
-        const showDominantSpeaker = !_isDominantSpeakerDisabled && dominantSpeaker;
-
-        let statsPopoverPosition, tooltipPosition;
-
-        switch (_currentLayout) {
-        case LAYOUTS.TILE_VIEW:
-            statsPopoverPosition = 'right top';
-            tooltipPosition = 'right';
-            break;
-        case LAYOUTS.VERTICAL_FILMSTRIP_VIEW:
-            statsPopoverPosition = 'left top';
-            tooltipPosition = 'left';
-            break;
-        default:
-            statsPopoverPosition = 'top center';
-            tooltipPosition = 'top';
-        }
-
-        return (
-            <>
-                <div className = 'videocontainer__background' />
-                <span id = 'localVideoWrapper'>
-                    <VideoTrack
-                        id = 'localVideo_container'
-                        videoTrack = { _videoTrack } />
-                </span>
-                <div className = 'videocontainer__toolbar'>
-                    <StatusIndicators participantID = { id } />
-                </div>
-                <div className = 'videocontainer__toptoolbar'>
-                    <div>
-                        <AtlasKitThemeProvider mode = 'dark'>
-                            { _connectionIndicatorDisabled
-                                ? null
-                                : <ConnectionIndicator
-                                    alwaysVisible = { showConnectionIndicator }
-                                    enableStatsDisplay = { !_isFilmstripOnly }
-                                    iconSize = { iconSize }
-                                    isLocalVideo = { true }
-                                    participantId = { id }
-                                    statsPopoverPosition = { statsPopoverPosition } />
-                            }
-                            <RaisedHandIndicator
-                                iconSize = { iconSize }
-                                participantId = { id }
-                                tooltipPosition = { tooltipPosition } />
-                            { showDominantSpeaker && _participantCount > 2
-                                ? <DominantSpeakerIndicator
-                                    iconSize = { iconSize }
-                                    tooltipPosition = { tooltipPosition } />
-                                : null }
-                        </AtlasKitThemeProvider>
-                    </div>
-                </div>
-                <div className = 'videocontainer__hoverOverlay' />
-                <div className = 'displayNameContainer'>
-                    <DisplayName
-                        allowEditing = { !_disableProfile }
-                        displayNameSuffix = { _defaultLocalDisplayName }
-                        elementID = 'localDisplayName'
-                        participantID = { _participant?.id } />
-                </div>
-                <div
-                    className = 'avatar-container'
-                    style = { styles.avatarContainer }>
-                    <Avatar
-                        className = 'userAvatar'
-                        participantId = { id } />
-                </div>
-                <span className = 'audioindicator-container'>
-                    <AudioLevelIndicator audioLevel = { audioLevel } />
-                </span>
-            </>
-        );
-    }
-
-
-    /**
-     * Renders a remote participant's 'thumbnail.
-     *
-     * @param {string} id - The id of the participant.
-     * @returns {ReactElement}
-     */
-    _renderRemoteParticipant(id) {
-        const styles = this._getStyles();
-        const {
-            _audioTrack,
-            _participant,
-            _participantCount,
-            _isFilmstripOnly,
-            _currentLayout,
-            _connectionIndicatorDisabled,
-            _connectionIndicatorAutoHideEnabled,
-            _isDominantSpeakerDisabled,
-            _startSilent
-        } = this.props;
-        const { audioLevel = 0, volume = 1 } = this.state;
-        const showConnectionIndicator = this.props.isHovered || !_connectionIndicatorAutoHideEnabled;
-        const { dominantSpeaker = false } = _participant;
-        const showDominantSpeaker = !_isDominantSpeakerDisabled && dominantSpeaker;
-        const iconSize = _getIndicatorsIconSize();
-        let statsPopoverPosition, tooltipPosition;
-
-        // hide volume when in silent mode
-        const onVolumeChange = _startSilent ? undefined : this._onVolumeChange;
-        const { jitsiTrack } = _audioTrack ?? {};
-        const audioTrackId = jitsiTrack && jitsiTrack.getId();
-
-        switch (_currentLayout) {
-        case LAYOUTS.TILE_VIEW:
-            statsPopoverPosition = 'right top';
-            tooltipPosition = 'right';
-            break;
-        case LAYOUTS.VERTICAL_FILMSTRIP_VIEW:
-            statsPopoverPosition = 'left bottom';
-            tooltipPosition = 'left';
-            break;
-        default:
-            statsPopoverPosition = 'top center';
-            tooltipPosition = 'top';
-        }
-
-        return (
-            <>
-                {
-                    _audioTrack
-                        ? <AudioTrack
-                            audioTrack = { _audioTrack }
-                            id = { `remoteAudio_${audioTrackId}` }
-                            muted = { _startSilent }
-                            onAudioElementReferenceChanged = { this._onAudioElementReferenceChanged }
-                            volume = { this.state.volume } />
-                        : null
-
-                }
-                <div className = 'videocontainer__background' />
-                <div className = 'videocontainer__toptoolbar'>
-                    <div>
-                        <AtlasKitThemeProvider mode = 'dark'>
-                            { _connectionIndicatorDisabled
-                                ? null
-                                : <ConnectionIndicator
-                                    alwaysVisible = { showConnectionIndicator }
-                                    enableStatsDisplay = { !_isFilmstripOnly }
-                                    iconSize = { iconSize }
-                                    isLocalVideo = { false }
-                                    participantId = { id }
-                                    statsPopoverPosition = { statsPopoverPosition } />
-                            }
-                            <RaisedHandIndicator
-                                iconSize = { iconSize }
-                                participantId = { id }
-                                tooltipPosition = { tooltipPosition } />
-                            { showDominantSpeaker && _participantCount > 2
-                                ? <DominantSpeakerIndicator
-                                    iconSize = { iconSize }
-                                    tooltipPosition = { tooltipPosition } />
-                                : null }
-                        </AtlasKitThemeProvider>
-                    </div>
-                </div>
-                <div className = 'videocontainer__toolbar'>
-                    <StatusIndicators participantID = { id } />
-                </div>
-                <div className = 'videocontainer__hoverOverlay' />
-                <div className = 'displayNameContainer'>
-                    <DisplayName
-                        elementID = { `participant_${id}_name` }
-                        participantID = { id } />
-                </div>
-                <div
-                    className = 'avatar-container'
-                    style = { styles.avatarContainer }>
-                    <Avatar
-                        className = 'userAvatar'
-                        participantId = { id } />
-                </div>
-                <div className = 'presence-label-container'>
-                    <PresenceLabel
-                        className = 'presence-label'
-                        participantID = { id } />
-                </div>
-                <span className = 'remotevideomenu'>
-                    <AtlasKitThemeProvider mode = 'dark'>
-                        <RemoteVideoMenuTriggerButton
-                            initialVolumeValue = { volume }
-                            onVolumeChange = { onVolumeChange }
-                            participantID = { id } />
-                    </AtlasKitThemeProvider>
-                </span>
-                <span className = 'audioindicator-container'>
-                    <AudioLevelIndicator audioLevel = { audioLevel } />
-                </span>
-            </>
-        );
-    }
-
-    _onAudioElementReferenceChanged: Object => void;
-
-    /**
-     * Handles audio element references changes by receiving some properties from the audio element.
-     *
-     * @param {Obejct} audioElementProps - Properties of the audio element.
-     * @returns {void}
-     */
-    _onAudioElementReferenceChanged({ volume }) {
-        if (this.state.volume !== volume) {
-            this.setState({ volume });
-        }
-    }
-
-    _onVolumeChange: number => void;
-
-    /**
-     * Handles volume changes.
-     *
-     * @param {number} value - The new value for the volume.
-     * @returns {void}
-     */
-    _onVolumeChange(value) {
-        this.setState({ volume: value });
-    }
-
-
-    /**
-     * Implements React's {@link Component#render()}.
-     *
-     * @inheritdoc
-     * @returns {ReactElement}
-     */
-    render() {
-        const { _participant } = this.props;
-
-        if (!_participant) {
-            return null;
-        }
-
-        const { id, isFakeParticipant, local = false } = _participant;
-
-        if (local) {
-            return this._renderLocalParticipant(id);
-        }
-
-        if (isFakeParticipant) {
-            return this._renderFakeParticipant(id);
-        }
-
-        return this._renderRemoteParticipant(id);
-    }
-}
-
-/**
- * Maps (parts of) the redux state to the associated props for this component.
- *
- * @param {Object} state - The Redux state.
- * @param {Object} ownProps - The own props of the component.
- * @private
- * @returns {{
- *     _videoTrack: Object
- * }}
- */
-function _mapStateToProps(state, ownProps): Object {
-    const { participantID } = ownProps;
-
-
-    // Only the local participant won't have id for the time when the conference is not yet joined.
-    const participant = participantID ? getParticipantById(state, participantID) : getLocalParticipant(state);
-    const isLocal = participant?.local ?? true;
-    const _videoTrack = isLocal
-        ? getLocalVideoTrack(state['features/base/tracks'])
-        : getTrackByMediaTypeAndParticipant(state['features/base/tracks'], MEDIA_TYPE.VIDEO, participantID);
-    const _audioTrack = isLocal
-        ? getLocalAudioTrack(state['features/base/tracks'])
-        : getTrackByMediaTypeAndParticipant(state['features/base/tracks'], MEDIA_TYPE.AUDIO, participantID);
-    const _currentLayout = getCurrentLayout(state);
-    let size = {};
-    const { startSilent, disableProfile = false } = state['features/base/config'];
-
-
-    switch (_currentLayout) {
-    case LAYOUTS.HORIZONTAL_FILMSTRIP_VIEW: {
-        const {
-            horizontalViewDimensions = {
-                local: {},
-                remote: {}
-            }
-        } = state['features/filmstrip'];
-        const { local, remote } = horizontalViewDimensions;
-        const { width, height } = isLocal ? local : remote;
-
-        size = {
-            _width: width,
-            _height: height
-        };
-
-        break;
-    }
-    case LAYOUTS.VERTICAL_FILMSTRIP_VIEW:
-        size = {
-            _heightToWidthPercent: isLocal
-                ? 100 / interfaceConfig.LOCAL_THUMBNAIL_RATIO
-                : 100 / interfaceConfig.REMOTE_THUMBNAIL_RATIO
-        };
-        break;
-    case LAYOUTS.TILE_VIEW: {
-        const { width, height } = state['features/filmstrip'].tileViewDimensions.thumbnailSize;
-
-        size = {
-            _width: width,
-            _height: height
-        };
-        break;
-    }
-    }
-
-
-    return {
-        _videoTrack,
-        _audioTrack,
-        _currentLayout,
-        _participant: participant,
-        _participantCount: getParticipantCount(state),
-        _isFilmstripOnly: interfaceConfig.filmStripOnly,
-        _defaultLocalDisplayName: interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME,
-        _disableProfile: disableProfile,
-        _connectionIndicatorDisabled: interfaceConfig.CONNECTION_INDICATOR_DISABLED,
-        _connectionIndicatorAutoHideEnabled: interfaceConfig.CONNECTION_INDICATOR_AUTO_HIDE_ENABLED,
-        _isDominantSpeakerDisabled: interfaceConfig.DISABLE_DOMINANT_SPEAKER_INDICATOR,
-        _startSilent: Boolean(startSilent),
-        ...size
-    };
-}
-
-export default connect(_mapStateToProps)(Thumbnail);
--- a/react/features/filmstrip/components/web/index.js
+++ b/react/features/filmstrip/components/web/index.js
@@ -7,4 +7,3 @@ export { default as ModeratorIndicator } from './ModeratorIndicator';
 export { default as RaisedHandIndicator } from './RaisedHandIndicator';
 export { default as StatusIndicators } from './StatusIndicators';
 export { default as VideoMutedIndicator } from './VideoMutedIndicator';
-export { default as Thumbnail } from './Thumbnail';
--- a/react/features/filmstrip/functions.web.js
+++ b/react/features/filmstrip/functions.web.js
@@ -1,20 +1,10 @@
 // @flow

-import { JitsiParticipantConnectionStatus } from '../base/lib-jitsi-meet';
-import { MEDIA_TYPE } from '../base/media';
 import {
-    getLocalParticipant,
-    getParticipantById,
    getParticipantCountWithFake,
    getPinnedParticipant
 } from '../base/participants';
 import { toState } from '../base/redux';
-import {
-    getLocalVideoTrack,
-    getTrackByMediaTypeAndParticipant,
-    isLocalTrackMuted,
-    isRemoteTrackMuted
-} from '../base/tracks';

 import { TILE_ASPECT_RATIO } from './constants';

@@ -69,40 +59,6 @@ export function shouldRemoteVideosBeVisible(state: Object) {
            || state['features/base/config'].disable1On1Mode);
 }

-/**
- * Checks whether there is a playable video stream available for the user
- * associated with this <tt>SmallVideo</tt>.
- *
- * @param {Object | Function} stateful - The Object or Function that can be
- * resolved to a Redux state object with the toState function.
- * @param {string} id - The id of the participant.
- * @returns {boolean} <tt>true</tt> if there is a playable video stream available
- * or <tt>false</tt> otherwise.
- */
-export function isVideoPlayable(stateful: Object | Function, id: String) {
-    const state = toState(stateful);
-    const tracks = state['features/base/tracks'];
-    const participant = id ? getParticipantById(state, id) : getLocalParticipant(state);
-    let isVideoMuted = true;
-    const isLocal = participant?.local ?? true;
-    const { connectionStatus } = participant || {};
-    const videoTrack
-        = isLocal ? getLocalVideoTrack(tracks) : getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.VIDEO, id);
-    const isAudioOnly = Boolean(state['features/base/audio-only'].enabled);
-    let isPlayable = false;
-
-    if (participant?.local) {
-        isVideoMuted = isLocalTrackMuted(tracks, MEDIA_TYPE.VIDEO);
-        isPlayable = Boolean(videoTrack) && !isVideoMuted && !isAudioOnly;
-    } else if (!participant?.isFakeParticipant) { // remote participants excluding shared video
-        isVideoMuted = isRemoteTrackMuted(tracks, MEDIA_TYPE.VIDEO, id);
-        isPlayable = Boolean(videoTrack) && !isVideoMuted && !isAudioOnly
-            && connectionStatus === JitsiParticipantConnectionStatus.ACTIVE;
-    }
-
-    return isPlayable;
-}
-
 /**
 * Calculates the size for thumbnails when in horizontal view layout.
 *
--- a/react/features/mobile/polyfills/Storage.js
+++ b/react/features/mobile/polyfills/Storage.js
@@ -1,4 +1,4 @@
-import AsyncStorage from '@react-native-community/async-storage';
+import AsyncStorage from '@react-native-async-storage/async-storage';

 /**
 * A Web Sorage API implementation used for polyfilling
--- a/react/features/recording/components/Recording/StartRecordingDialogContent.js
+++ b/react/features/recording/components/Recording/StartRecordingDialogContent.js
@@ -162,7 +162,9 @@ class StartRecordingDialogContent extends Component<Props> {
     * @returns {React$Component}
     */
    _renderFileSharingContent() {
-        if (!this.props.fileRecordingsServiceSharingEnabled) {
+        const { fileRecordingsServiceSharingEnabled, isVpaas } = this.props;
+
+        if (!fileRecordingsServiceSharingEnabled || isVpaas) {
            return null;
        }

@@ -247,6 +249,7 @@ class StartRecordingDialogContent extends Component<Props> {
                ) : null;

        const icon = isVpaas ? ICON_SHARE : JITSI_LOGO;
+        const label = isVpaas ? t('recording.serviceDescriptionCloud') : t('recording.serviceDescription');

        return (
            <Container
@@ -265,7 +268,7 @@ class StartRecordingDialogContent extends Component<Props> {
                        ..._dialogStyles.text,
                        ...styles.title
                    }}>
-                    { t('recording.serviceDescription') }
+                    { label }
                </Text>
                { switchContent }
            </Container>
--- a/react/features/remote-video-menu/components/native/ConnectionStatusButton.js
+++ b/react/features/remote-video-menu/components/native/ConnectionStatusButton.js
@@ -0,0 +1,51 @@
+// @flow
+
+import { openDialog } from '../../../base/dialog';
+import { translate } from '../../../base/i18n';
+import { IconInfo } from '../../../base/icons';
+import { connect } from '../../../base/redux';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+
+import ConnectionStatusComponent from './ConnectionStatusComponent';
+
+export type Props = AbstractButtonProps & {
+
+    /**
+     * The redux {@code dispatch} function.
+     */
+    dispatch: Function,
+
+    /**
+     * The ID of the participant that this button is supposed to pin.
+     */
+    participantID: string,
+
+    /**
+     * The function to be used to translate i18n labels.
+     */
+    t: Function
+};
+
+/**
+ * A remote video menu button which shows the connection statistics.
+ */
+class ConnectionStatusButton extends AbstractButton<Props, *> {
+    icon = IconInfo;
+    label = 'videothumbnail.connectionInfo';
+
+    /**
+     * Handles clicking / pressing the button, and kicks the participant.
+     *
+     * @private
+     * @returns {void}
+     */
+    _handleClick() {
+        const { dispatch, participantID } = this.props;
+
+        dispatch(openDialog(ConnectionStatusComponent, {
+            participantID
+        }));
+    }
+}
+
+export default translate(connect()(ConnectionStatusButton));
--- a/react/features/remote-video-menu/components/native/ConnectionStatusComponent.js
+++ b/react/features/remote-video-menu/components/native/ConnectionStatusComponent.js
@@ -0,0 +1,431 @@
+// @flow
+
+import React, { Component } from 'react';
+import { Text, View } from 'react-native';
+
+import { Avatar } from '../../../base/avatar';
+import { ColorSchemeRegistry } from '../../../base/color-scheme';
+import { BottomSheet, isDialogOpen, hideDialog } from '../../../base/dialog';
+import { translate } from '../../../base/i18n';
+import { IconArrowDownLarge, IconArrowUpLarge } from '../../../base/icons';
+import { getParticipantDisplayName } from '../../../base/participants';
+import { BaseIndicator } from '../../../base/react';
+import { connect } from '../../../base/redux';
+import { StyleType, ColorPalette } from '../../../base/styles';
+import statsEmitter from '../../../connection-indicator/statsEmitter';
+
+import styles from './styles';
+
+/**
+ * Size of the rendered avatar in the menu.
+ */
+const AVATAR_SIZE = 25;
+
+const CONNECTION_QUALITY = [
+    'Low',
+    'Medium',
+    'Good'
+];
+
+export type Props = {
+
+    /**
+     * The Redux dispatch function.
+     */
+    dispatch: Function,
+
+    /**
+     * The ID of the participant that this button is supposed to pin.
+     */
+    participantID: string,
+
+    /**
+     * The color-schemed stylesheet of the BottomSheet.
+     */
+    _bottomSheetStyles: StyleType,
+
+    /**
+     * True if the menu is currently open, false otherwise.
+     */
+    _isOpen: boolean,
+
+    /**
+     * Display name of the participant retreived from Redux.
+     */
+    _participantDisplayName: string,
+
+    /**
+     * The function to be used to translate i18n labels.
+     */
+    t: Function
+}
+
+/**
+ * The type of the React {@code Component} state of {@link ConnectionStatusComponent}.
+ */
+type State = {
+    resolutionString: string,
+    downloadString: string,
+    uploadString: string,
+    packetLostDownloadString: string,
+    packetLostUploadString: string,
+    serverRegionString: string,
+    codecString: string,
+    connectionString: string
+};
+
+// eslint-disable-next-line prefer-const
+let ConnectionStatusComponent_;
+
+/**
+ * Class to implement a popup menu that show the connection statistics.
+ */
+class ConnectionStatusComponent extends Component<Props, State> {
+
+    /**
+     * Constructor of the component.
+     *
+     * @param {P} props - The read-only properties with which the new
+     * instance is to be initialized.
+     *
+     * @inheritdoc
+     */
+    constructor(props: Props) {
+        super(props);
+
+        this._onStatsUpdated = this._onStatsUpdated.bind(this);
+        this._onCancel = this._onCancel.bind(this);
+        this._renderMenuHeader = this._renderMenuHeader.bind(this);
+
+        this.state = {
+            resolutionString: 'N/A',
+            downloadString: 'N/A',
+            uploadString: 'N/A',
+            packetLostDownloadString: 'N/A',
+            packetLostUploadString: 'N/A',
+            serverRegionString: 'N/A',
+            codecString: 'N/A',
+            connectionString: 'N/A'
+        };
+    }
+
+    /**
+     * Implements React's {@link Component#render()}.
+     *
+     * @inheritdoc
+     * @returns {React$Node}
+     */
+    render(): React$Node {
+        const { t } = this.props;
+
+        return (
+            <BottomSheet
+                onCancel = { this._onCancel }
+                renderHeader = { this._renderMenuHeader }>
+                <View style = { styles.statsWrapper }>
+                    <View style = { styles.statsInfoCell }>
+                        <Text style = { styles.statsTitleText }>
+                            { `${t('connectionindicator.status')} ` }
+                        </Text>
+                        <Text style = { styles.statsInfoText }>
+                            { this.state.connectionString }
+                        </Text>
+                    </View>
+                    <View style = { styles.statsInfoCell }>
+                        <Text style = { styles.statsTitleText }>
+                            { `${t('connectionindicator.bitrate')}` }
+                        </Text>
+                        <BaseIndicator
+                            icon = { IconArrowDownLarge }
+                            iconStyle = {{
+                                color: ColorPalette.darkGrey
+                            }} />
+                        <Text style = { styles.statsInfoText }>
+                            { this.state.downloadString }
+                        </Text>
+                        <BaseIndicator
+                            icon = { IconArrowUpLarge }
+                            iconStyle = {{
+                                color: ColorPalette.darkGrey
+                            }} />
+                        <Text style = { styles.statsInfoText }>
+                            { `${this.state.uploadString} Kbps` }
+                        </Text>
+                    </View>
+                    <View style = { styles.statsInfoCell }>
+                        <Text style = { styles.statsTitleText }>
+                            { `${t('connectionindicator.packetloss')}` }
+                        </Text>
+                        <BaseIndicator
+                            icon = { IconArrowDownLarge }
+                            iconStyle = {{
+                                color: ColorPalette.darkGrey
+                            }} />
+                        <Text style = { styles.statsInfoText }>
+                            { this.state.packetLostDownloadString }
+                        </Text>
+                        <BaseIndicator
+                            icon = { IconArrowUpLarge }
+                            iconStyle = {{
+                                color: ColorPalette.darkGrey
+                            }} />
+                        <Text style = { styles.statsInfoText }>
+                            { this.state.packetLostUploadString }
+                        </Text>
+                    </View>
+                    <View style = { styles.statsInfoCell }>
+                        <Text style = { styles.statsTitleText }>
+                            { `${t('connectionindicator.resolution')} ` }
+                        </Text>
+                        <Text style = { styles.statsInfoText }>
+                            { this.state.resolutionString }
+                        </Text>
+                    </View>
+                    <View style = { styles.statsInfoCell }>
+                        <Text style = { styles.statsTitleText }>
+                            { `${t('connectionindicator.codecs')}` }
+                        </Text>
+                        <Text style = { styles.statsInfoText }>
+                            { this.state.codecString }
+                        </Text>
+                    </View>
+                </View>
+            </BottomSheet>
+        );
+    }
+
+    /**
+     * Starts listening for stat updates.
+     *
+     * @inheritdoc
+     * returns {void}
+     */
+    componentDidMount() {
+        statsEmitter.subscribeToClientStats(
+            this.props.participantID, this._onStatsUpdated);
+    }
+
+    /**
+     * Updates which user's stats are being listened to.
+     *
+     * @inheritdoc
+     * returns {void}
+     */
+    componentDidUpdate(prevProps: Props) {
+        if (prevProps.participantID !== this.props.participantID) {
+            statsEmitter.unsubscribeToClientStats(
+                prevProps.participantID, this._onStatsUpdated);
+            statsEmitter.subscribeToClientStats(
+                this.props.participantID, this._onStatsUpdated);
+        }
+    }
+
+    _onStatsUpdated: Object => void;
+
+    /**
+     * Callback invoked when new connection stats associated with the passed in
+     * user ID are available. Will update the component's display of current
+     * statistics.
+     *
+     * @param {Object} stats - Connection stats from the library.
+     * @private
+     * @returns {void}
+     */
+    _onStatsUpdated(stats = {}) {
+        const newState = this._buildState(stats);
+
+        this.setState(newState);
+    }
+
+    /**
+     * Extracts statistics and builds the state object.
+     *
+     * @param {Object} stats - Connection stats from the library.
+     * @private
+     * @returns {State}
+     */
+    _buildState(stats) {
+        const { download: downloadBitrate, upload: uploadBitrate } = this._extractBitrate(stats) ?? {};
+
+        const { download: downloadPacketLost, upload: uploadPacketLost } = this._extractPacketLost(stats) ?? {};
+
+        return {
+            resolutionString: this._extractResolutionString(stats) ?? this.state.resolutionString,
+            downloadString: downloadBitrate ?? this.state.downloadString,
+            uploadString: uploadBitrate ?? this.state.uploadString,
+            packetLostDownloadString: downloadPacketLost === undefined
+                ? this.state.packetLostDownloadString : `${downloadPacketLost}%`,
+            packetLostUploadString: uploadPacketLost === undefined
+                ? this.state.packetLostUploadString : `${uploadPacketLost}%`,
+            serverRegionString: this._extractServer(stats) ?? this.state.serverRegionString,
+            codecString: this._extractCodecs(stats) ?? this.state.codecString,
+            connectionString: this._extractConnection(stats) ?? this.state.connectionString
+        };
+    }
+
+    /**
+     * Extracts the resolution and framerate.
+     *
+     * @param {Object} stats - Connection stats from the library.
+     * @private
+     * @returns {string}
+     */
+    _extractResolutionString(stats) {
+        const { framerate, resolution } = stats;
+
+        const resolutionString = Object.keys(resolution || {})
+        .map(ssrc => {
+            const { width, height } = resolution[ssrc];
+
+            return `${width}x${height}`;
+        })
+        .join(', ') || null;
+
+        const frameRateString = Object.keys(framerate || {})
+            .map(ssrc => framerate[ssrc])
+            .join(', ') || null;
+
+        return resolutionString && frameRateString ? `${resolutionString}@${frameRateString}fps` : undefined;
+    }
+
+    /**
+     * Extracts the download and upload bitrates.
+     *
+     * @param {Object} stats - Connection stats from the library.
+     * @private
+     * @returns {{ download, upload }}
+     */
+    _extractBitrate(stats) {
+        return stats.bitrate;
+    }
+
+    /**
+     * Extracts the download and upload packet lost.
+     *
+     * @param {Object} stats - Connection stats from the library.
+     * @private
+     * @returns {{ download, upload }}
+     */
+    _extractPacketLost(stats) {
+        return stats.packetLoss;
+    }
+
+    /**
+     * Extracts the server name.
+     *
+     * @param {Object} stats - Connection stats from the library.
+     * @private
+     * @returns {string}
+     */
+    _extractServer(stats) {
+        return stats.serverRegion;
+    }
+
+    /**
+     * Extracts the audio and video codecs names.
+     *
+     * @param {Object} stats - Connection stats from the library.
+     * @private
+     * @returns {string}
+     */
+    _extractCodecs(stats) {
+        const { codec } = stats;
+
+        let codecString;
+
+        // Only report one codec, in case there are multiple for a user.
+        Object.keys(codec || {})
+            .forEach(ssrc => {
+                const { audio, video } = codec[ssrc];
+
+                codecString = `${audio}, ${video}`;
+            });
+
+        return codecString;
+    }
+
+    /**
+     * Extracts the connection percentage and sets connection quality.
+     *
+     * @param {Object} stats - Connection stats from the library.
+     * @private
+     * @returns {string}
+     */
+    _extractConnection(stats) {
+        const { connectionQuality } = stats;
+
+        if (connectionQuality) {
+            const signalLevel = Math.floor(connectionQuality / 33.4);
+
+            return CONNECTION_QUALITY[signalLevel];
+        }
+    }
+
+    _onCancel: () => boolean;
+
+    /**
+     * Callback to hide the {@code ConnectionStatusComponent}.
+     *
+     * @private
+     * @returns {boolean}
+     */
+    _onCancel() {
+        statsEmitter.unsubscribeToClientStats(
+            this.props.participantID, this._onStatsUpdated);
+
+        if (this.props._isOpen) {
+            this.props.dispatch(hideDialog(ConnectionStatusComponent_));
+
+            return true;
+        }
+
+        return false;
+    }
+
+    _renderMenuHeader: () => React$Element<any>;
+
+    /**
+     * Function to render the menu's header.
+     *
+     * @returns {React$Element}
+     */
+    _renderMenuHeader() {
+        const { _bottomSheetStyles, participantID } = this.props;
+
+        return (
+            <View
+                style = { [
+                    _bottomSheetStyles.sheet,
+                    styles.participantNameContainer ] }>
+                <Avatar
+                    participantId = { participantID }
+                    size = { AVATAR_SIZE } />
+                <Text style = { styles.participantNameLabel }>
+                    { this.props._participantDisplayName }
+                </Text>
+            </View>
+        );
+    }
+}
+
+/**
+ * Function that maps parts of Redux state tree into component props.
+ *
+ * @param {Object} state - Redux state.
+ * @param {Object} ownProps - Properties of component.
+ * @private
+ * @returns {Props}
+ */
+function _mapStateToProps(state, ownProps) {
+    const { participantID } = ownProps;
+
+    return {
+        _bottomSheetStyles: ColorSchemeRegistry.get(state, 'BottomSheet'),
+        _isOpen: isDialogOpen(state, ConnectionStatusComponent_),
+        _participantDisplayName: getParticipantDisplayName(state, participantID)
+    };
+}
+
+ConnectionStatusComponent_ = translate(connect(_mapStateToProps)(ConnectionStatusComponent));
+
+export default ConnectionStatusComponent_;
--- a/react/features/remote-video-menu/components/native/RemoteVideoMenu.js
+++ b/react/features/remote-video-menu/components/native/RemoteVideoMenu.js
@@ -13,6 +13,7 @@ import { StyleType } from '../../../base/styles';
 import { PrivateMessageButton } from '../../../chat';
 import { hideRemoteVideoMenu } from '../../actions';

+import ConnectionStatusButton from './ConnectionStatusButton';
 import GrantModeratorButton from './GrantModeratorButton';
 import KickButton from './KickButton';
 import MuteButton from './MuteButton';
@@ -106,6 +107,7 @@ class RemoteVideoMenu extends PureComponent<Props> {
                <PinButton { ...buttonProps } />
                <PrivateMessageButton { ...buttonProps } />
                <MuteEveryoneElseButton { ...buttonProps } />
+                <ConnectionStatusButton { ...buttonProps } />
            </BottomSheet>
        );
    }
--- a/react/features/remote-video-menu/components/native/styles.js
+++ b/react/features/remote-video-menu/components/native/styles.js
@@ -25,5 +25,28 @@ export default createStyleSheet({
        fontSize: MD_FONT_SIZE,
        marginLeft: MD_ITEM_MARGIN_PADDING,
        opacity: 0.90
+    },
+
+    statsTitleText: {
+        fontSize: 16,
+        fontWeight: 'bold',
+        marginRight: 3
+    },
+
+    statsInfoText: {
+        fontSize: 16,
+        marginRight: 2,
+        marginLeft: 2
+    },
+
+    statsInfoCell: {
+        alignItems: 'center',
+        flexDirection: 'row',
+        height: 30,
+        justifyContent: 'flex-start'
+    },
+
+    statsWrapper: {
+        marginVertical: 10
    }
 });
--- a/react/features/remote-video-menu/components/web/RemoteVideoMenuTriggerButton.js
+++ b/react/features/remote-video-menu/components/web/RemoteVideoMenuTriggerButton.js
@@ -77,6 +77,11 @@ type Props = {
     */
    initialVolumeValue: number,

+    /**
+     * Callback to invoke when the popover has been displayed.
+     */
+    onMenuDisplay: Function,
+
    /**
     * Callback to invoke when changing the level of the participant's
     * audio element.
@@ -106,6 +111,19 @@ class RemoteVideoMenuTriggerButton extends Component<Props> {
     */
    _rootElement = null;

+    /**
+     * Initializes a new {#@code RemoteVideoMenuTriggerButton} instance.
+     *
+     * @param {Object} props - The read-only properties with which the new
+     * instance is to be initialized.
+     */
+    constructor(props: Object) {
+        super(props);
+
+        // Bind event handler so it is only bound once for every instance.
+        this._onShowRemoteMenu = this._onShowRemoteMenu.bind(this);
+    }
+
    /**
     * Implements React's {@link Component#render()}.
     *
@@ -122,6 +140,7 @@ class RemoteVideoMenuTriggerButton extends Component<Props> {
        return (
            <Popover
                content = { content }
+                onPopoverOpen = { this._onShowRemoteMenu }
                position = { this.props._menuPosition }>
                <span
                    className = 'popover-trigger remote-video-menu-trigger'>
@@ -134,6 +153,18 @@ class RemoteVideoMenuTriggerButton extends Component<Props> {
        );
    }

+    _onShowRemoteMenu: () => void;
+
+    /**
+     * Opens the {@code RemoteVideoMenu}.
+     *
+     * @private
+     * @returns {void}
+     */
+    _onShowRemoteMenu() {
+        this.props.onMenuDisplay();
+    }
+
    /**
     * Creates a new {@code RemoteVideoMenu} with buttons for interacting with
     * the remote participant.
--- a/react/features/security/components/security-dialog/PasswordSection.js
+++ b/react/features/security/components/security-dialog/PasswordSection.js
@@ -106,7 +106,11 @@ function PasswordSection({
     */
    function onPasswordSave() {
        if (formRef.current) {
-            formRef.current.querySelector('form').requestSubmit();
+            const { value } = formRef.current.querySelector('form > input');
+
+            if (value) {
+                onPasswordSubmit(value);
+            }
        }
    }

--- a/react/features/video-layout/middleware.web.js
+++ b/react/features/video-layout/middleware.web.js
@@ -1,8 +1,7 @@
 // @flow

 import VideoLayout from '../../../modules/UI/videolayout/VideoLayout.js';
-import { CONFERENCE_WILL_LEAVE } from '../base/conference';
-import { MEDIA_TYPE } from '../base/media/index.js';
+import { CONFERENCE_JOINED, CONFERENCE_WILL_LEAVE } from '../base/conference';
 import {
    DOMINANT_SPEAKER_CHANGED,
    PARTICIPANT_JOINED,
@@ -34,6 +33,10 @@ MiddlewareRegistry.register(store => next => action => {
    const result = next(action);

    switch (action.type) {
+    case CONFERENCE_JOINED:
+        VideoLayout.mucJoined();
+        break;
+
    case CONFERENCE_WILL_LEAVE:
        VideoLayout.reset();
        break;
@@ -74,13 +77,13 @@ MiddlewareRegistry.register(store => next => action => {
        break;

    case TRACK_ADDED:
-        if (!action.track.local && action.track.mediaType !== MEDIA_TYPE.AUDIO) {
+        if (!action.track.local) {
            VideoLayout.onRemoteStreamAdded(action.track.jitsiTrack);
        }

        break;
    case TRACK_REMOVED:
-        if (!action.track.local && action.track.mediaType !== MEDIA_TYPE.AUDIO) {
+        if (!action.track.local) {
            VideoLayout.onRemoteStreamRemoved(action.track.jitsiTrack);
        }

--- a/resources/update-ljm.sh
+++ b/resources/update-ljm.sh
@@ -2,15 +2,49 @@

 set -e -u

+if [[ ! -z $(git status -s --untracked-files=no) ]]; then
+    echo "Git tree is not clean, aborting!"
+    exit 1
+fi
+
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+if [[ "$BRANCH" != "master" ]]; then
+  echo "Not on master, aborting!";
+  exit 1;
+fi
+
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
-LATEST_LJM_COMMIT=$(git ls-remote https://github.com/jitsi/lib-jitsi-meet.git HEAD | awk '{ print $1 }')
+PID=$$
+LJM_TMP="${TMPDIR:-/tmp}/ljm-${PID}"

 pushd ${THIS_DIR}/..
-
-npm install github:jitsi/lib-jitsi-meet#${LATEST_LJM_COMMIT}
-git add package.json package-lock.json
-git commit -m "chore(deps) lib-jitsi-meet@latest"
-
+CURRENT_LJM_COMMIT=$(jq -r '.dependencies."lib-jitsi-meet"' package.json | cut -d "#" -f2)
 popd

-echo "Done! Now push your branch to GH and open a PR!"
+git clone --branch master --single-branch --bare https://github.com/jitsi/lib-jitsi-meet ${LJM_TMP}
+
+pushd ${LJM_TMP}
+LATEST_LJM_COMMIT=$(git rev-parse HEAD)
+LJM_COMMITS=$(git log --oneline --no-decorate --no-merges ${CURRENT_LJM_COMMIT}..HEAD --pretty=format:"%x2a%x20%s")
+popd
+
+if [[ "${CURRENT_LJM_COMMIT}" == "${LATEST_LJM_COMMIT}" ]]; then
+    echo "No need to update, already on the latest commit!"
+    rm -rf ${LJM_TMP}
+    exit 1
+fi
+
+GH_LINK="https://github.com/jitsi/lib-jitsi-meet/compare/${CURRENT_LJM_COMMIT}...${LATEST_LJM_COMMIT}"
+
+pushd ${THIS_DIR}/..
+EPOCH=$(date +%s)
+NEW_BRANCH="update-ljm-${EPOCH}"
+git checkout -b ${NEW_BRANCH}
+npm install github:jitsi/lib-jitsi-meet#${LATEST_LJM_COMMIT}
+git add package.json package-lock.json
+git commit -m "chore(deps) lib-jitsi-meet@latest" -m "${LJM_COMMITS}" -m "${GH_LINK}"
+git push origin ${NEW_BRANCH}
+gh pr create --repo jitsi/jitsi-meet --fill
+popd
+
+rm -rf ${LJM_TMP}
Author	SHA1	Message	Date
Saúl Ibarra Corretgé	5e891caf94	fix(ios,fastlane) adjust scheme name after rename	2020-12-22 14:07:10 +01:00
Saúl Ibarra Corretgé	a01e3e9d8a	fix(android) avoid crashes if view is null This may happen due to API misuse, but also in complex applications where activity lifetimes are not straightforward.	2020-12-22 13:53:39 +01:00
Saúl Ibarra Corretgé	687a6c31ee	feat(analytics) unify Amplitude handlers across web and mobile The amplitude-js library gained React Native support so there is no need to keep separate implementations.	2020-12-22 10:36:10 +01:00
tmoldovan8x8	5ecb5717c7	feat(stats) add stats for mobile	2020-12-22 10:12:52 +01:00
Avram Tudor	8d813a499c	Merge pull request #8293 from jitsi/tavram/update-jaas-rec fix(jaas) update recording label and hide option for jaas users	2020-12-21 13:00:59 +02:00
Tudor-Ovidiu Avram	22384d9094	fix(jaas) update recording label and hide option for jaas users	2020-12-21 12:19:10 +02:00
eppesuig	b3f1f7f46e	lang: Updating and uniforming italian translation (#8288 ) * Updating and uniforming italian translation - translate uniformly «meeting» to «conferenza», «chat» to «conversazione», ellipsys to «...», verbs in -ing with «in corso» - correct a few typos - update a message with old and unused placeholder - translate some English messages * typo - add missing double quotes * Fixed translation for "meeting" to "riunione"	2020-12-20 21:17:49 -06:00
xosecalvo	17350be16c	Updated Galician translation Updated original Weblate translation by https://github.com/meixome	2020-12-20 09:22:49 -06:00
Hristo Terezov	d4596889df	feat(analytics): Adds metric for SS issues.	2020-12-18 15:27:43 -06:00
Mihai-Andrei Uscat	a5fe26bfdb	fix(password): Fix add password button on Safari	2020-12-18 14:47:00 +02:00
Vlad Piersec	33e4324f6d	fix(branding): Use config url for dynamic branding	2020-12-18 13:00:52 +01:00
Saúl Ibarra Corretgé	27d41604df	fix(script) add commits list to update LJM message	2020-12-18 09:45:09 +01:00
Saúl Ibarra Corretgé	99ac60ed74	feat(ios) rename SDK target to JitsiMeetSDK Swift has a longstanding bug where a framework and a type cannot be named the same. We have somehow managed to not run into this, but it now seems to be hitting us. Since this is a breaking change, this starts the road for SDK 3.0.	2020-12-17 23:02:48 +01:00
Дамян Минков	4f52fd5e01	fix: Skip sending multiple times disco-info to jicofo. * fix: Skip sending multiple times disco-info to jicofo. * build(deps): bump ini from 1.3.5 to 1.3.7 `9f65e8fab3...8bb653f1d6`	2020-12-17 13:02:28 -06:00
bhlee	edf415a7da	fix(welcome-page) fix .insecure-room-name-warning margin	2020-12-17 09:28:24 +01:00
bhlee	5637b37fd2	fix(main-ko) add keyboardShortcuts videoQuality (#8264 ) * fix(main-ko.json) Update overall korean spelling & words * fix(_welcome_page.css) update .insecure-room-name-warning_margin-top from 5px to 15px * fix(_welcome_page.css) initialize .insecure-room-name-warning_margin-top from 15px to 5px * fix(main-ko.json) add keyboardShortcuts videoQuality	2020-12-16 23:17:44 -06:00
bhlee	dc0c1f0d93	fix(main-ko.json) Update some korean spelling & words (#8253 ) * fix(main-ko.json) Update overall korean spelling & words * fix(_welcome_page.css) update .insecure-room-name-warning_margin-top from 5px to 15px * fix(_welcome_page.css) initialize .insecure-room-name-warning_margin-top from 15px to 5px	2020-12-16 19:45:24 -06:00