chore(deps) updates react-native-webrtc

fix(ios) Fixes RCTBridge not being released when JitsiMeet is trying to destroy its bridge on some OS versions
chore(versions) bump iOS SDK version
2026-05-21 13:47:51 +00:00 · 2021-10-15 12:58:12 +03:00 · 2021-10-14 13:05:37 +02:00 · 2021-10-08 12:29:41 +03:00 · 2021-10-07 11:47:22 +02:00 · 2021-10-07 11:45:53 +02:00
1567 changed files with 67033 additions and 89978 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,15 +3,13 @@ build/*

 # Third-party source code which we (1) do not want to modify or (2) try to
 # modify as little as possible.
+flow-typed/*
 libs/*
 resources/*
 react/features/stream-effects/virtual-background/vendor/*
-react/features/face-landmarks/resources/*
+load-test/*

 # ESLint will by default ignore its own configuration file. However, there does
 # not seem to be a reason why we will want to risk being inconsistent with our
 # remaining JavaScript source code.
 !.eslintrc.js
-
-# Not worth it.
-actionTypes.ts
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,5 @@
 module.exports = {
    'extends': [
-        '@jitsi/eslint-config'
+        'eslint-config-jitsi'
    ]
 };
--- a/.flowconfig
+++ b/.flowconfig
@@ -0,0 +1,118 @@
+[ignore]
+; We fork some components by platform
+.*/*[.]android.js
+
+; Ignore unexpected extra "@providesModule"
+.*/node_modules/.*/node_modules/fbjs/.*
+node_modules/react-native/Libraries/react-native/React.js
+
+; Ignore duplicate module providers
+; For RN Apps installed via npm, "Libraries" folder is inside
+; "node_modules/react-native" but in the source repo it is in the root
+node_modules/react-native/Libraries/react-native/React.js
+
+; Flow doesn't support platforms
+.*/Libraries/Utilities/LoadingView.js
+
+; Ignore polyfills
+node_modules/react-native/Libraries/polyfills/.*
+
+; These should not be required directly
+; require from fbjs/lib instead: require('fbjs/lib/warning')
+node_modules/warning/.*
+
+; Flow doesn't support platforms
+.*/Libraries/Utilities/HMRLoadingView.js
+
+[untyped]
+.*/node_modules/@react-native-community/cli/.*/.*
+
+; Ignore packages in node_modules which we (i.e. the jitsi-meet project) have
+; seen to cause errors and we have chosen not to fix.
+.*/node_modules/@atlaskit/.*/*.js.flow
+.*/node_modules/react-native-keep-awake/.*
+.*/node_modules/react-native-permissions/.*
+.*/node_modules/styled-components/.*
+
+.*/\.git/.*
+
+[include]
+
+[libs]
+node_modules/react-native/Libraries/react-native/react-native-interface.js
+node_modules/react-native/flow/
+
+[options]
+emoji=true
+
+esproposal.optional_chaining=enable
+esproposal.nullish_coalescing=enable
+
+; We (i.e. the jitsi-meet project) are using the haste module system on Web as
+; well, not only on React Native. Unfortunately, Flow does not support .web.js
+; by default. Override Flow's defaults to include .web.js as well. Technically,
+; we have .native.js as well so the choice of .web.js may lead to errors.
+; Practically though, it is a potential future problem that we do not have at
+; the time of this writing.
+module.file_ext=.web.js
+; Flow's defaults:
+module.file_ext=.js
+module.file_ext=.json
+module.file_ext=.ios.js
+
+module.system=haste
+module.system.haste.use_name_reducers=true
+# get basename
+module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
+# strip .js or .js.flow suffix
+module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
+# strip .ios suffix
+module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
+module.system.haste.paths.blacklist=.*/__tests__/.*
+module.system.haste.paths.blacklist=.*/__mocks__/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
+
+munge_underscores=true
+
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
+
+suppress_type=$FlowIssue
+suppress_type=$FlowFixMe
+suppress_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
+
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
+
+[lints]
+sketchy-null-number=warn
+sketchy-null-mixed=warn
+sketchy-number=warn
+untyped-type-import=warn
+nonstrict-import=warn
+deprecated-type=warn
+unsafe-getters-setters=warn
+inexact-spread=warn
+unnecessary-invariant=warn
+signature-verification-failure=warn
+deprecated-utility=error
+
+[strict]
+deprecated-type
+nonstrict-import
+sketchy-null
+unclear-type
+unsafe-getters-setters
+untyped-import
+untyped-type-import
+
+[version]
+^0.104.0
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,14 +10,9 @@ jobs:
    - uses: actions/checkout@v2
    - uses: actions/setup-node@v1
      with:
-        node-version: '16.x'
+        node-version: '12.x'
    - run: npm install
-    - name: Check git status
-      run: git status
-    - name: Normalize lang files to ensure sorted
-      run: npm run lang-sort
    - name: Check if the git repository is clean
-      run: $(exit $(git status --porcelain --untracked-files=no | head -255 | wc -l)) || (echo "Dirty git tree"; git diff; exit 1)
+      run: exit $( git status --porcelain --untracked-files=no | head -255 | wc -l )
    - run: npm run lint
-    - run: for file in lang/*.json; do npx --yes jsonlint -q $file || exit 1; done
    - run: make
--- a/.npmrc
+++ b/.npmrc
@@ -1,3 +1 @@
 package-lock=true
-; FIXME Set legacy-peer-deps=false when we upgrade RN.
-legacy-peer-deps=true
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-16
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,8 +3,8 @@ We would love to have your help. Before you start working however, please read
 and follow this short guide.

 # Reporting Issues
-Provide as much information as possible. Mention the version of Jitsi Meet,
-Jicofo and JVB you are using, and explain (as detailed as you can) how the
+Provide as much information as possible. Mention the version of Jitsi Meet, 
+Jicofo and JVB you are using, and explain (as detailed as you can) how the 
 problem can be reproduced.

 # Code contributions
@@ -130,7 +130,7 @@ When adding a new feature, this would be the usual layout.

 ```
 react/features/sample/
-├── actionTypes.ts
+├── actionTypes.js
 ├── actions.js
 ├── components
 │   ├── AnotherComponent.js
--- a/77
+++ b/77
@@ -1,13 +1,12 @@
 BUILD_DIR = build
 CLEANCSS = ./node_modules/.bin/cleancss
 DEPLOY_DIR = libs
-LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet
+LIBJITSIMEET_DIR = node_modules/lib-jitsi-meet/
+LIBFLAC_DIR = node_modules/libflacjs/dist/min/
 OLM_DIR = node_modules/@matrix-org/olm
-TF_WASM_DIR = node_modules/@tensorflow/tfjs-backend-wasm/dist/
-RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist
+RNNOISE_WASM_DIR = node_modules/rnnoise-wasm/dist/
 TFLITE_WASM = react/features/stream-effects/virtual-background/vendor/tflite
-MEET_MODELS_DIR  = react/features/stream-effects/virtual-background/vendor/models
-FACE_MODELS_DIR = node_modules/@vladmandic/human-models/models
+MEET_MODELS_DIR  = react/features/stream-effects/virtual-background/vendor/models/
 NODE_SASS = ./node_modules/.bin/sass
 NPM = npm
 OUTPUT_DIR = .
@@ -15,18 +14,21 @@ STYLES_BUNDLE = css/all.bundle.css
 STYLES_DESTINATION = css/all.css
 STYLES_MAIN = css/main.scss
 WEBPACK = ./node_modules/.bin/webpack
-WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack serve --mode development
+WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack-dev-server

 all: compile deploy clean

-compile:
-	$(WEBPACK)
+compile: compile-load-test
+	$(WEBPACK) -p
+
+compile-load-test:
+	${NPM} install --prefix resources/load-test && ${NPM} run build --prefix resources/load-test

 clean:
 	rm -fr $(BUILD_DIR)

 .NOTPARALLEL:
-deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-olm deploy-tf-wasm deploy-css deploy-local deploy-face-landmarks
+deploy: deploy-init deploy-appbundle deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-libflac deploy-olm deploy-css deploy-local

 deploy-init:
 	rm -fr $(DEPLOY_DIR)
@@ -35,45 +37,44 @@ deploy-init:
 deploy-appbundle:
 	cp \
 		$(BUILD_DIR)/app.bundle.min.js \
-		$(BUILD_DIR)/app.bundle.min.js.map \
+		$(BUILD_DIR)/app.bundle.min.map \
 		$(BUILD_DIR)/do_external_connect.min.js \
-		$(BUILD_DIR)/do_external_connect.min.js.map \
+		$(BUILD_DIR)/do_external_connect.min.map \
 		$(BUILD_DIR)/external_api.min.js \
-		$(BUILD_DIR)/external_api.min.js.map \
+		$(BUILD_DIR)/external_api.min.map \
+		$(BUILD_DIR)/flacEncodeWorker.min.js \
+		$(BUILD_DIR)/flacEncodeWorker.min.map \
 		$(BUILD_DIR)/dial_in_info_bundle.min.js \
-		$(BUILD_DIR)/dial_in_info_bundle.min.js.map \
+		$(BUILD_DIR)/dial_in_info_bundle.min.map \
 		$(BUILD_DIR)/alwaysontop.min.js \
-		$(BUILD_DIR)/alwaysontop.min.js.map \
+		$(BUILD_DIR)/alwaysontop.min.map \
 		$(OUTPUT_DIR)/analytics-ga.js \
 		$(BUILD_DIR)/analytics-ga.min.js \
-		$(BUILD_DIR)/analytics-ga.min.js.map \
-		$(BUILD_DIR)/face-landmarks-worker.min.js \
-		$(BUILD_DIR)/face-landmarks-worker.min.js.map \
-		$(DEPLOY_DIR)
-	cp \
+		$(BUILD_DIR)/analytics-ga.min.map \
 		$(BUILD_DIR)/close3.min.js \
-		$(BUILD_DIR)/close3.min.js.map \
-		$(DEPLOY_DIR) || true
+		$(BUILD_DIR)/close3.min.map \
+		$(DEPLOY_DIR)

 deploy-lib-jitsi-meet:
 	cp \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.min.js \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.min.map \
-		$(LIBJITSIMEET_DIR)/dist/umd/lib-jitsi-meet.e2ee-worker.js \
+		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.js \
+		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.min.map \
+		$(LIBJITSIMEET_DIR)/lib-jitsi-meet.e2ee-worker.js \
 		$(LIBJITSIMEET_DIR)/connection_optimization/external_connect.js \
 		$(LIBJITSIMEET_DIR)/modules/browser/capabilities.json \
 		$(DEPLOY_DIR)

+deploy-libflac:
+	cp \
+		$(LIBFLAC_DIR)/libflac4-1.3.2.min.js \
+		$(LIBFLAC_DIR)/libflac4-1.3.2.min.js.mem \
+		$(DEPLOY_DIR)
+
 deploy-olm:
 	cp \
 		$(OLM_DIR)/olm.wasm \
 		$(DEPLOY_DIR)

-deploy-tf-wasm:
-	cp \
-		$(TF_WASM_DIR)/*.wasm \
-		$(DEPLOY_DIR)
-
 deploy-rnnoise-binary:
 	cp \
 		$(RNNOISE_WASM_DIR)/rnnoise.wasm \
@@ -82,32 +83,24 @@ deploy-rnnoise-binary:
 deploy-tflite:
 	cp \
 		$(TFLITE_WASM)/*.wasm \
-		$(DEPLOY_DIR)
+		$(DEPLOY_DIR)		

 deploy-meet-models:
 	cp \
 		$(MEET_MODELS_DIR)/*.tflite \
-		$(DEPLOY_DIR)
-
-deploy-face-landmarks:
-	cp \
-		$(FACE_MODELS_DIR)/blazeface-front.bin \
-		$(FACE_MODELS_DIR)/blazeface-front.json \
-		$(FACE_MODELS_DIR)/emotion.bin \
-		$(FACE_MODELS_DIR)/emotion.json \
-		$(DEPLOY_DIR)
+		$(DEPLOY_DIR)	

 deploy-css:
 	$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
-	$(CLEANCSS) --skip-rebase $(STYLES_BUNDLE) > $(STYLES_DESTINATION) && \
+	$(CLEANCSS) --skip-rebase $(STYLES_BUNDLE) > $(STYLES_DESTINATION) ; \
 	rm $(STYLES_BUNDLE)

 deploy-local:
 	([ ! -x deploy-local.sh ] || ./deploy-local.sh)

 .NOTPARALLEL:
-dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-olm deploy-tf-wasm deploy-face-landmarks
-	$(WEBPACK_DEV_SERVER)
+dev: deploy-init deploy-css deploy-rnnoise-binary deploy-tflite deploy-meet-models deploy-lib-jitsi-meet deploy-libflac deploy-olm
+	$(WEBPACK_DEV_SERVER) --detect-circular-deps

 source-package:
 	mkdir -p source_package/jitsi-meet/css && \
--- a/README.md
+++ b/README.md
@@ -45,12 +45,12 @@ developed you can also sign up for our open beta testing here:

 ## Running your own instance

-If you'd like to run your own Jitsi Meet installation head over to the [handbook](https://jitsi.github.io/handbook/docs/devops-guide/) to get started.
+If you'd like to run your own Jitsi Meet installation head over to the [handbook](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-start) to get started.

 We provide Debian packages and a comprehensive Docker setup to make deployments as simple as possible.
 Advanced users also have the possibility of building all the components from source.

-You can check the latest releases [here](https://jitsi.github.io/handbook/docs/releases).
+You can check the latest releases [[here](https://jitsi.github.io/handbook/docs/releases).

 ## Jitsi as a Service

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -76,7 +76,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'

    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'

--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -85,9 +85,4 @@
 # ^^^ We added the above when we switched minifyEnabled on.

 # Rule to avoid build errors related to SVGs.
-keep public class com.horcrux.svg.** {*;}
-
-# https://github.com/facebook/fresco/issues/2638
-keep public class com.facebook.imageutils.** {
-   public *;
-}
+-keep public class com.horcrux.svg.** {*;}
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,14 +7,13 @@
      android:extractNativeLibs="true"
      android:icon="@mipmap/ic_launcher"
      android:label="@string/app_name"
-      android:name=".MainApplication"
      android:networkSecurityConfig="@xml/network_security_config"
      android:theme="@style/AppTheme">
    <meta-data
        android:name="android.content.APP_RESTRICTIONS"
        android:resource="@xml/app_restrictions" />
    <activity
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
        android:exported="true"
        android:label="@string/app_name"
        android:launchMode="singleTask"
--- a/android/app/src/main/java/org/jitsi/meet/MainActivity.java
+++ b/android/app/src/main/java/org/jitsi/meet/MainActivity.java
@@ -82,7 +82,7 @@ public class MainActivity extends JitsiMeetActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        JitsiMeet.showSplashScreen(this);
-        super.onCreate(null);
+        super.onCreate(savedInstanceState);
    }

    @Override
@@ -150,8 +150,8 @@ public class MainActivity extends JitsiMeetActivity {
        // Set default options
        JitsiMeetConferenceOptions defaultOptions
            = new JitsiMeetConferenceOptions.Builder()
+            .setWelcomePageEnabled(true)
            .setServerURL(buildURL(defaultURL))
-            .setFeatureFlag("welcomepage.enabled", true)
            .setFeatureFlag("call-integration.enabled", false)
            .setFeatureFlag("resolution", 360)
            .setFeatureFlag("server-url-change.enabled", !configurationByRestrictions)
@@ -182,6 +182,11 @@ public class MainActivity extends JitsiMeetActivity {
        }
    }

+    @Override
+    protected void onConferenceTerminated(HashMap<String, Object> extraData) {
+        Log.d(TAG, "Conference terminated: " + extraData);
+    }
+
    // Activity lifecycle method overrides
    //

--- a/android/app/src/main/java/org/jitsi/meet/MainApplication.java
+++ b/android/app/src/main/java/org/jitsi/meet/MainApplication.java
@@ -1,47 +0,0 @@
-/*
- * Copyright @ 2022-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;
-
-import android.app.Application;
-import android.util.Log;
-
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactNativeHost;
-
-import org.jitsi.meet.sdk.JitsiReactNativeHost;
-
-/**
- * Application class for Jitsi Meet. The only reason why this exists is for Detox
- * to believe our app is a "greenfield" app. SDK users need not use this.
- */
-public class MainApplication extends Application implements ReactApplication {
-    private final ReactNativeHost mReactNativeHost = new JitsiReactNativeHost(this);
-
-    @Override
-    public ReactNativeHost getReactNativeHost() {
-        return mReactNativeHost;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        // Initialize RN
-        Log.d(this.getClass().getCanonicalName(), "app onCreate");
-        getReactNativeHost().getReactInstanceManager();
-    }
-}
--- a/android/app/src/main/res/drawable/rn_edit_text_material.xml
+++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     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.
-->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetTop="@dimen/abc_edit_text_inset_top_material"
-       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
-
-    <selector>
-        <!-- 
-          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
-          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
-          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
-
-          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-
-          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
-        -->
-        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
-    </selector>
-
-</inset>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,8 +1,7 @@
 <resources>
+    <!-- Base application theme. -->
    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
-        <item name="android:forceDarkAllowed">false</item>
+        <!-- Customize your theme here. -->
        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-        <item name="android:windowDisablePreview">true</item>
-   </style>
+    </style>
 </resources>
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,4 @@
 import groovy.json.JsonSlurper
-import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.util.VersionNumber

 // Top-level build file where you can add configuration options common to all
@@ -8,34 +7,22 @@ import org.gradle.util.VersionNumber
 buildscript {
    repositories {
        google()
-        mavenCentral()
+        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
    }
 }

 ext {
-    buildToolsVersion = "31.0.0"
+    buildToolsVersion = "30.0.3"
    compileSdkVersion = 31
    minSdkVersion    = 23
    targetSdkVersion = 31
    supportLibVersion = "28.0.0"

-    if (System.properties['os.arch'] == "aarch64") {
-        // For M1 Users we need to use the NDK 24 which added support for aarch64
-        ndkVersion = "24.0.8215888"
-    } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-        // For Android Users, we need to use NDK 23, otherwise the build will
-        // fail due to paths longer than the OS limit
-        ndkVersion = "23.1.7779620"
-    } else {
-        // Otherwise we default to the side-by-side NDK version from AGP.
-        ndkVersion = "21.4.7075529"
-    }
-
    // The Maven artifact groupdId of the third-party react-native modules which
    // Jitsi Meet SDK for Android depends on and which are not available in
    // third-party Maven repositories so we have to deploy to a Maven repository
@@ -55,19 +42,12 @@ ext {

 allprojects {
    repositories {
+        google()
+        jcenter()
        // React Native (JS, Obj-C sources, Android binaries) is installed from npm.
        maven { url "$rootDir/../node_modules/react-native/android" }
        // Android JSC is installed from npm.
        maven { url("$rootDir/../node_modules/jsc-android/dist") }
-        mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
-        google()
-        maven { url 'https://www.jitpack.io' }
    }

    // Make sure we use the react-native version in node_modules and not the one
@@ -130,7 +110,7 @@ allprojects {

            project.version = "${json.version}-jitsi-${versionQualifierNumber}"

-            task jitsiAndroidSourcesJar(type: Jar) {
+            task androidSourcesJar(type: Jar) {
                classifier = 'sources'
                from android.sourceSets.main.java.source
            }
@@ -144,7 +124,7 @@ allprojects {
                    artifact("${project.buildDir}/outputs/aar/${project.name}-release.aar") {
                        extension "aar"
                    }
-                    artifact(jitsiAndroidSourcesJar)
+                    artifact(androidSourcesJar)
                    pom.withXml {
                        def pomXml = asNode()
                        pomXml.appendNode('name', project.name)
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -9,7 +9,7 @@

 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# Default value: -Xmx10248m -XX:MaxPermSize=256m

 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false

-appVersion=22.3.0
-sdkVersion=5.2.0
+appVersion=21.4.1
+sdkVersion=3.10.2
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Sep 23 11:48:00 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
--- a/android/gradlew
+++ b/android/gradlew
@@ -1,129 +1,78 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# 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
-#
-#      https://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.
-#
+#!/usr/bin/env sh

 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################

 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"

 warn () {
    echo "$*"
-} >&2
+}

 die () {
    echo
    echo "$*"
    echo
    exit 1
-} >&2
+}

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +81,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD=java
+    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +89,84 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi

-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`

-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option

-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi

 exec "$JAVACMD" "$@"
--- a/android/gradlew.bat
+++ b/android/gradlew.bat
@@ -1,89 +1,84 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'maven-publish'

 android {
    compileSdkVersion rootProject.ext.compileSdkVersion
-    ndkVersion rootProject.ext.ndkVersion

    defaultConfig {
        minSdkVersion rootProject.ext.minSdkVersion
@@ -34,8 +33,9 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.fragment:fragment:1.4.1'
+
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.fragment:fragment:1.2.5'
    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

@@ -44,12 +44,10 @@ dependencies {
    //noinspection GradleDynamicVersion
    implementation 'org.webkit:android-jsc:+'

-    implementation 'com.facebook.fresco:animated-gif:2.5.0'
    implementation 'com.dropbox.core:dropbox-core-sdk:4.0.1'
    implementation 'com.jakewharton.timber:timber:4.7.1'
    implementation 'com.squareup.duktape:duktape-android:1.3.0'
    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation "androidx.startup:startup-runtime:1.1.0"

    if (rootProject.ext.libreBuild) {
        implementation(project(':react-native-device-info')) {
@@ -69,20 +67,11 @@ dependencies {
    implementation project(':react-native-async-storage')
    implementation project(':react-native-background-timer')
    implementation project(':react-native-calendar-events')
-    implementation project(':react-native-community_clipboard')
    implementation project(':react-native-community_netinfo')
    implementation project(':react-native-default-preference')
-    implementation project(':react-native-gesture-handler')
-    implementation project(':react-native-get-random-values')
-    implementation project(':react-native-giphy')
    implementation project(':react-native-immersive')
    implementation project(':react-native-keep-awake')
-    implementation project(':react-native-masked-view_masked-view')
-    implementation project(':react-native-pager-view')
    implementation project(':react-native-performance')
-    implementation project(':react-native-reanimated')
-    implementation project(':react-native-safe-area-context')
-    implementation project(':react-native-screens')
    implementation project(':react-native-slider')
    implementation project(':react-native-sound')
    implementation project(':react-native-splash-screen')
@@ -221,7 +210,7 @@ publishing {
                    def groupId = it.moduleGroup
                    def artifactId = it.moduleName

-                    if (artifactId.startsWith('react-native-')) {
+                    if (artifactId.startsWith('react-native-') && groupId.equals('jitsi-meet')) {
                        groupId = rootProject.ext.moduleGroupId
                    }

--- a/android/sdk/src/debug/AndroidManifest.xml
+++ b/android/sdk/src/debug/AndroidManifest.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
-    <application android:usesCleartextTraffic="true">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
-    </application>
-</manifest>
--- a/android/sdk/src/main/AndroidManifest.xml
+++ b/android/sdk/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -30,11 +31,12 @@
        android:supportsRtl="true">
        <activity
            android:name=".JitsiMeetActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
            android:launchMode="singleTask"
            android:resizeableActivity="true"
            android:supportsPictureInPicture="true"
            android:windowSoftInputMode="adjustResize"/>
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />

        <service
            android:name=".ConnectionService"
@@ -55,14 +57,6 @@
            android:enabled="false"
            tools:replace="android:authorities">
        </provider>
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false">
-            <meta-data  android:name="org.jitsi.meet.sdk.JitsiInitializer"
-                android:value="androidx.startup" />
-        </provider>
-
    </application>

 </manifest>
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java
@@ -16,7 +16,6 @@

 package org.jitsi.meet.sdk;

-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.media.AudioManager;
@@ -55,7 +54,6 @@ import java.util.concurrent.Executors;
 * Before a call has started and after it has ended the
 * {@code AudioModeModule.DEFAULT} mode should be used.
 */
-@SuppressLint("AnnotateVersionCheck")
@ReactModule(name = AudioModeModule.NAME)
 class AudioModeModule extends ReactContextBaseJavaModule {
    public static final String NAME = "AudioMode";
@@ -81,6 +79,7 @@ class AudioModeModule extends ReactContextBaseJavaModule {
    /**
     * Whether or not the ConnectionService is used for selecting audio devices.
     */
+
    private static final boolean supportsConnectionService = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
    private static boolean useConnectionService_ = supportsConnectionService;

@@ -149,16 +148,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
        audioManager = (AudioManager)reactContext.getSystemService(Context.AUDIO_SERVICE);
    }

-    @ReactMethod
-    public void addListener(String eventName) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
    /**
     * Gets a mapping with the constants this module is exporting.
     *
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BaseReactView.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BaseReactView.java
@@ -20,7 +20,6 @@ package org.jitsi.meet.sdk;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -94,7 +93,7 @@ public abstract class BaseReactView<ListenerT>
     * inspired by postis which we use on Web for the similar purposes of the
     * iframe-based external API.
     */
-    protected String externalAPIScope;
+    protected final String externalAPIScope;

    /**
     * The listener (e.g. {@link JitsiMeetViewListener}) instance for reporting
@@ -110,17 +109,16 @@ public abstract class BaseReactView<ListenerT>

    public BaseReactView(@NonNull Context context) {
        super(context);
-        initialize((Activity)context);
-    }

-    public BaseReactView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initialize((Activity)context);
-    }
+        setBackgroundColor(BACKGROUND_COLOR);

-    public BaseReactView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        initialize((Activity)context);
+        ReactInstanceManagerHolder.initReactInstanceManager((Activity)context);
+
+        // Hook this BaseReactView into ExternalAPI.
+        externalAPIScope = UUID.randomUUID().toString();
+        synchronized (views) {
+            views.add(this);
+        }
    }

    /**
@@ -225,16 +223,4 @@ public abstract class BaseReactView<ListenerT>
    public void setListener(ListenerT listener) {
        this.listener = listener;
    }
-
-    private void initialize(Activity activity) {
-        setBackgroundColor(BACKGROUND_COLOR);
-
-        ReactInstanceManagerHolder.initReactInstanceManager(activity);
-
-        // Hook this BaseReactView into ExternalAPI.
-        externalAPIScope = UUID.randomUUID().toString();
-        synchronized (views) {
-            views.add(this);
-        }
-    }
 }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastEvent.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastEvent.java
@@ -86,8 +86,8 @@ public class BroadcastEvent {
        PARTICIPANTS_INFO_RETRIEVED("org.jitsi.meet.PARTICIPANTS_INFO_RETRIEVED"),
        CHAT_MESSAGE_RECEIVED("org.jitsi.meet.CHAT_MESSAGE_RECEIVED"),
        CHAT_TOGGLED("org.jitsi.meet.CHAT_TOGGLED"),
-        VIDEO_MUTED_CHANGED("org.jitsi.meet.VIDEO_MUTED_CHANGED"),
-        READY_TO_CLOSE("org.jitsi.meet.READY_TO_CLOSE");
+        VIDEO_MUTED_CHANGED("org.jitsi.meet.VIDEO_MUTED_CHANGED");
+

        private static final String CONFERENCE_WILL_JOIN_NAME = "CONFERENCE_WILL_JOIN";
        private static final String CONFERENCE_JOINED_NAME = "CONFERENCE_JOINED";
@@ -101,7 +101,6 @@ public class BroadcastEvent {
        private static final String CHAT_MESSAGE_RECEIVED_NAME = "CHAT_MESSAGE_RECEIVED";
        private static final String CHAT_TOGGLED_NAME = "CHAT_TOGGLED";
        private static final String VIDEO_MUTED_CHANGED_NAME = "VIDEO_MUTED_CHANGED";
-        private static final String READY_TO_CLOSE_NAME = "READY_TO_CLOSE";

        private final String action;

@@ -148,8 +147,6 @@ public class BroadcastEvent {
                    return CHAT_TOGGLED;
                case VIDEO_MUTED_CHANGED_NAME:
                    return VIDEO_MUTED_CHANGED;
-                case READY_TO_CLOSE_NAME:
-                    return READY_TO_CLOSE;
            }

            return null;
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java
@@ -31,7 +31,8 @@ import java.util.Map;
 * Module implementing an API for sending events from JavaScript to native code.
 */
@ReactModule(name = ExternalAPIModule.NAME)
-class ExternalAPIModule extends ReactContextBaseJavaModule {
+class ExternalAPIModule
+    extends ReactContextBaseJavaModule {

    public static final String NAME = "ExternalAPI";

@@ -56,16 +57,6 @@ class ExternalAPIModule extends ReactContextBaseJavaModule {
        ParticipantsService.init(reactContext);
    }

-    @ReactMethod
-    public void addListener(String eventName) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
    /**
     * Gets the name of this module to be used in the React Native bridge.
     *
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiInitializer.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiInitializer.java
@@ -1,48 +0,0 @@
-/*
- * Copyright @ 2021-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.content.Context;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.startup.Initializer;
-
-import com.facebook.soloader.SoLoader;
-
-import java.util.Collections;
-import java.util.List;
-
-public class JitsiInitializer implements Initializer<Boolean> {
-
-    @NonNull
-    @Override
-    public Boolean create(@NonNull Context context) {
-        Log.d(this.getClass().getCanonicalName(), "create");
-
-        SoLoader.init(context, /* native exopackage */ false);
-
-        // Register our uncaught exception handler.
-        JitsiMeetUncaughtExceptionHandler.register();
-        return true;
-    }
-
-    @NonNull
-    @Override
-    public List<Class<? extends Initializer<?>>> dependencies() {
-        return Collections.emptyList();
-    }
-}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
@@ -16,7 +16,6 @@

 package org.jitsi.meet.sdk;

-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -25,7 +24,7 @@ import android.net.Uri;
 import android.os.Bundle;

 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

 import com.facebook.react.modules.core.PermissionListener;
@@ -33,18 +32,13 @@ import com.facebook.react.modules.core.PermissionListener;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;

 import java.util.HashMap;
+import android.app.Activity;

 /**
- * A base activity for SDK users to embed.  It contains all the required wiring
- * between the {@code JitsiMeetView} and the Activity lifecycle methods.
- *
- * In this activity we use a single {@code JitsiMeetView} instance. This
- * instance gives us access to a view which displays the welcome page and the
- * conference itself. All lifecycle methods associated with this Activity are
- * hooked to the React Native subsystem via proxy calls through the
- * {@code JitsiMeetActivityDelegate} static methods.
+ * A base activity for SDK users to embed. It uses {@link JitsiMeetFragment} to do the heavy
+ * lifting and wires the remaining Activity lifecycle methods so it works out of the box.
 */
-public class JitsiMeetActivity extends AppCompatActivity
+public class JitsiMeetActivity extends FragmentActivity
    implements JitsiMeetActivityInterface {

    protected static final String TAG = JitsiMeetActivity.class.getSimpleName();
@@ -58,12 +52,6 @@ public class JitsiMeetActivity extends AppCompatActivity
            onBroadcastReceived(intent);
        }
    };
-
-    /**
-     * Instance of the {@link JitsiMeetView} which this activity will display.
-     */
-    private JitsiMeetView jitsiView;
-
    // Helpers for starting the activity
    //

@@ -91,7 +79,6 @@ public class JitsiMeetActivity extends AppCompatActivity
        super.onCreate(savedInstanceState);

        setContentView(R.layout.activity_jitsi_meet);
-        this.jitsiView = findViewById(R.id.jitsiView);

        registerForBroadcastMessages();

@@ -100,18 +87,6 @@ public class JitsiMeetActivity extends AppCompatActivity
        }
    }

-    @Override
-    public void onResume() {
-        super.onResume();
-        JitsiMeetActivityDelegate.onHostResume(this);
-    }
-
-    @Override
-    public void onStop() {
-        JitsiMeetActivityDelegate.onHostPause(this);
-        super.onStop();
-    }
-
    @Override
    public void onDestroy() {
        // Here we are trying to handle the following corner case: an application using the SDK
@@ -122,9 +97,6 @@ public class JitsiMeetActivity extends AppCompatActivity
        // be operational so the external API won't be able to notify the native side that the
        // conference terminated. Thus, try our best to clean up.
        leave();
-
-        this.jitsiView = null;
-
        if (AudioModeModule.useConnectionService()) {
            ConnectionService.abortConnections();
        }
@@ -132,8 +104,6 @@ public class JitsiMeetActivity extends AppCompatActivity

        LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver);

-        JitsiMeetActivityDelegate.onHostDestroy(this);
-
        super.onDestroy();
    }

@@ -148,7 +118,9 @@ public class JitsiMeetActivity extends AppCompatActivity
    //

    protected JitsiMeetView getJitsiView() {
-        return jitsiView;
+        JitsiMeetFragment fragment
+            = (JitsiMeetFragment) getSupportFragmentManager().findFragmentById(R.id.jitsiFragment);
+        return fragment != null ? fragment.getJitsiView() : null;
    }

    public void join(@Nullable String url) {
@@ -160,16 +132,20 @@ public class JitsiMeetActivity extends AppCompatActivity
    }

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

    public void leave() {
-        if (this.jitsiView  != null) {
-            this.jitsiView .leave();
+        JitsiMeetView view = getJitsiView();
+
+        if (view != null) {
+            view.leave();
        } else {
            JitsiMeetLogger.w("Cannot leave, view is null");
        }
@@ -218,6 +194,7 @@ public class JitsiMeetActivity extends AppCompatActivity

    protected void onConferenceTerminated(HashMap<String, Object> extraData) {
        JitsiMeetLogger.i("Conference terminated: " + extraData);
+        finish();
    }

    protected void onConferenceWillJoin(HashMap<String, Object> extraData) {
@@ -240,11 +217,6 @@ public class JitsiMeetActivity extends AppCompatActivity
        }
    }

-    protected void onReadyToClose() {
-        JitsiMeetLogger.i("SDK is ready to close");
-        finish();
-    }
-
    // Activity lifecycle methods
    //

@@ -276,8 +248,10 @@ public class JitsiMeetActivity extends AppCompatActivity

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

@@ -324,9 +298,6 @@ public class JitsiMeetActivity extends AppCompatActivity
                case PARTICIPANT_LEFT:
                    onParticipantLeft(event.getData());
                    break;
-                case READY_TO_CLOSE:
-                    onReadyToClose();
-                    break;
            }
        }
    }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
@@ -45,6 +45,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     */
    private String token;

+    /**
+     * Color scheme override, see: https://github.com/jitsi/jitsi-meet/blob/dbedee5e22e5dcf9c92db96ef5bb3c9982fc526d/react/features/base/color-scheme/defaultScheme.js
+     */
+    private Bundle colorScheme;
+
    /**
     * Config. See: https://github.com/jitsi/jitsi-meet/blob/master/config.js
     */
@@ -72,6 +77,10 @@ public class JitsiMeetConferenceOptions implements Parcelable {
        return token;
    }

+    public Bundle getColorScheme() {
+        return colorScheme;
+    }
+
    public Bundle getFeatureFlags() {
        return featureFlags;
    }
@@ -88,6 +97,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
        private String room;
        private String token;

+        private Bundle colorScheme;
        private Bundle config;
        private Bundle featureFlags;

@@ -142,6 +152,19 @@ public class JitsiMeetConferenceOptions implements Parcelable {
            return this;
        }

+        /**
+         * Sets the color scheme override so the app is themed. See:
+         * https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/color-scheme/defaultScheme.js
+         * for the structure.
+         * @param colorScheme - A color scheme to be applied to the app.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setColorScheme(Bundle colorScheme) {
+            this.colorScheme = colorScheme;
+
+            return this;
+        }
+
        /**
         * Indicates the conference will be joined with the microphone muted.
         * @param audioMuted - Muted indication.
@@ -175,6 +198,19 @@ public class JitsiMeetConferenceOptions implements Parcelable {
            return this;
        }

+        /**
+         * Sets the welcome page enabled / disabled. The welcome page lists recent meetings and
+         * calendar appointments and it's meant to be used by standalone applications. Defaults to
+         * false.
+         * @param enabled - Whether the welcome page should be enabled or not.
+         * @return - The {@link Builder} object itself so the method calls can be chained.
+         */
+        public Builder setWelcomePageEnabled(boolean enabled) {
+            this.featureFlags.putBoolean("welcomepage.enabled", enabled);
+
+            return this;
+        }
+
        public Builder setFeatureFlag(String flag, boolean value) {
            this.featureFlags.putBoolean(flag, value);

@@ -240,6 +276,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
            options.serverURL = this.serverURL;
            options.room = this.room;
            options.token = this.token;
+            options.colorScheme = this.colorScheme;
            options.config = this.config;
            options.featureFlags = this.featureFlags;
            options.userInfo = this.userInfo;
@@ -255,9 +292,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
        serverURL = (URL) in.readSerializable();
        room = in.readString();
        token = in.readString();
+        colorScheme = in.readBundle();
        config = in.readBundle();
        featureFlags = in.readBundle();
        userInfo = new JitsiMeetUserInfo(in.readBundle());
+        byte tmpAudioMuted = in.readByte();
    }

    Bundle asProps() {
@@ -270,6 +309,10 @@ public class JitsiMeetConferenceOptions implements Parcelable {

        props.putBundle("flags", featureFlags);

+        if (colorScheme != null) {
+            props.putBundle("colorScheme", colorScheme);
+        }
+
        Bundle urlProps = new Bundle();

        // The room is fully qualified
@@ -318,6 +361,7 @@ public class JitsiMeetConferenceOptions implements Parcelable {
        dest.writeSerializable(serverURL);
        dest.writeString(room);
        dest.writeString(token);
+        dest.writeBundle(colorScheme);
        dest.writeBundle(config);
        dest.writeBundle(featureFlags);
        dest.writeBundle(userInfo != null ? userInfo.asBundle() : new Bundle());
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java
@@ -17,6 +17,7 @@

 package org.jitsi.meet.sdk;

+import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -36,10 +37,7 @@ import android.view.ViewGroup;
 * conference itself. All lifecycle methods associated with this Fragment are
 * hooked to the React Native subsystem via proxy calls through the
 * {@code JitsiMeetActivityDelegate} static methods.
- *
- * @deprecated use {@link JitsiMeetActivity} or directly {@link JitsiMeetView}
 */
-@Deprecated
 public class JitsiMeetFragment extends Fragment {

    /**
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
@@ -51,20 +51,11 @@ public class JitsiMeetOngoingConferenceService extends Service
        intent.setAction(Action.START.getName());

        ComponentName componentName;
-
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                componentName = context.startForegroundService(intent);
-            } else {
-                componentName = context.startService(intent);
-            }
-        } catch (RuntimeException e) {
-            // Avoid crashing due to ForegroundServiceStartNotAllowedException (API level 31).
-            // See: https://developer.android.com/guide/components/foreground-services#background-start-restrictions
-            JitsiMeetLogger.w(TAG + " Ongoing conference service not started", e);
-            return;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            componentName = context.startForegroundService(intent);
+        } else {
+            componentName = context.startService(intent);
        }
-
        if (componentName == null) {
            JitsiMeetLogger.w(TAG + " Ongoing conference service not started");
        }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
@@ -18,8 +18,6 @@ package org.jitsi.meet.sdk;

 import android.content.Context;
 import android.os.Bundle;
-import android.util.AttributeSet;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

@@ -30,6 +28,7 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import java.lang.reflect.Method;
 import java.util.Map;

+
 public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
        implements OngoingConferenceTracker.OngoingConferenceListener {

@@ -96,17 +95,14 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>

    public JitsiMeetView(@NonNull Context context) {
        super(context);
-        initialize(context);
-    }

-    public JitsiMeetView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initialize(context);
-    }
+        // Check if the parent Activity implements JitsiMeetActivityInterface,
+        // otherwise things may go wrong.
+        if (!(context instanceof JitsiMeetActivityInterface)) {
+            throw new RuntimeException("Enclosing Activity must implement JitsiMeetActivityInterface");
+        }

-    public JitsiMeetView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        initialize(context);
+        OngoingConferenceTracker.getInstance().addListener(this);
    }

    @Override
@@ -211,14 +207,4 @@ public class JitsiMeetView extends BaseReactView<JitsiMeetViewListener>
        dispose();
        super.onDetachedFromWindow();
    }
-
-    private void initialize(@NonNull Context context) {
-        // Check if the parent Activity implements JitsiMeetActivityInterface,
-        // otherwise things may go wrong.
-        if (!(context instanceof JitsiMeetActivityInterface)) {
-            throw new RuntimeException("Enclosing Activity must implement JitsiMeetActivityInterface");
-        }
-
-        OngoingConferenceTracker.getInstance().addListener(this);
-    }
 }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiReactNativeHost.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiReactNativeHost.java
@@ -1,41 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.app.Application;
-
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-
-import java.util.List;
-
-/**
- * This is the minimal implementation of ReactNativeHost that will make things like the
- * Detox testing framework believe we are a "greenfield" app.
- *
- * Generally speaking, apps using the SDK (other than the Jitsi Meet app itself) should not
- * need to use this because the
- */
-public class JitsiReactNativeHost extends ReactNativeHost {
-    public JitsiReactNativeHost(Application application) {
-        super(application);
-    }
-
-    @Override
-    public boolean getUseDeveloperSupport() {
-        // Unused since we override `createReactInstanceManager`.
-        return false;
-    }
-
-    @Override
-    protected List<ReactPackage> getPackages() {
-        // Unused since we override `createReactInstanceManager`.
-        return null;
-    }
-
-    @Override
-    protected ReactInstanceManager createReactInstanceManager() {
-        ReactInstanceManagerHolder.initReactInstanceManager(this.getApplication());
-
-        return ReactInstanceManagerHolder.getReactInstanceManager();
-    }
-}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/NotificationChannels.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/NotificationChannels.java
@@ -5,6 +5,7 @@ import java.util.List;

 public class NotificationChannels {
    static final String ONGOING_CONFERENCE_CHANNEL_ID = "JitsiOngoingConferenceChannel";
+    static final String ONGOING_CONFERNCE_CHANNEL_NAME = "Ongoing Conference Notifications";

    public static List<String> allIds = new ArrayList<String>() {{ add(ONGOING_CONFERENCE_CHANNEL_ID); }};
 }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
@@ -17,6 +17,7 @@
 package org.jitsi.meet.sdk;

 import static org.jitsi.meet.sdk.NotificationChannels.ONGOING_CONFERENCE_CHANNEL_ID;
+import static org.jitsi.meet.sdk.NotificationChannels.ONGOING_CONFERNCE_CHANNEL_NAME;

 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -65,7 +66,7 @@ class OngoingNotification {
            return;
        }

-        channel = new NotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID, context.getString(R.string.ongoing_notification_action_unmute), NotificationManager.IMPORTANCE_DEFAULT);
+        channel = new NotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID, ONGOING_CONFERNCE_CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT);
        channel.enableLights(false);
        channel.enableVibration(false);
        channel.setShowBadge(false);
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java
@@ -59,16 +59,6 @@ class RNConnectionService extends ReactContextBaseJavaModule {
        super(reactContext);
    }

-    @ReactMethod
-    public void addListener(String eventName) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
-    @ReactMethod
-    public void removeListeners(Integer count) {
-        // Keep: Required for RN built in Event Emitter Calls.
-    }
-
    /**
     * Starts a new outgoing call.
     *
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@@ -17,8 +17,6 @@
 package org.jitsi.meet.sdk;

 import android.app.Activity;
-import android.app.Application;
-import android.util.Log;

 import androidx.annotation.Nullable;

@@ -28,9 +26,11 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.LifecycleState;
+import com.facebook.react.devsupport.DevInternalSettings;
 import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
+import com.facebook.soloader.SoLoader;
 import com.oney.WebRTCModule.RTCVideoViewManager;
 import com.oney.WebRTCModule.WebRTCModule;

@@ -101,70 +101,6 @@ class ReactInstanceManagerHolder {
        );
    }

-    static List<ReactPackage> getReactNativePackages() {
-        List<ReactPackage> packages
-            = new ArrayList<>(Arrays.asList(
-            new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
-            new com.ocetnik.timer.BackgroundTimerPackage(),
-            new com.calendarevents.RNCalendarEventsPackage(),
-            new com.corbt.keepawake.KCKeepAwakePackage(),
-            new com.facebook.react.shell.MainReactPackage(),
-            new com.reactnativecommunity.clipboard.ClipboardPackage(),
-            new com.giphyreactnativesdk.GiphyReactNativeSdkPackage(),
-            new com.reactnativecommunity.netinfo.NetInfoPackage(),
-            new com.reactnativepagerview.PagerViewPackage(),
-            new com.oblador.performance.PerformancePackage(),
-            new com.reactnativecommunity.slider.ReactSliderPackage(),
-            new com.brentvatne.react.ReactVideoPackage(),
-            new com.swmansion.reanimated.ReanimatedPackage(),
-            new org.reactnative.maskedview.RNCMaskedViewPackage(),
-            new com.reactnativecommunity.webview.RNCWebViewPackage(),
-            new com.kevinresol.react_native_default_preference.RNDefaultPreferencePackage(),
-            new com.learnium.RNDeviceInfo.RNDeviceInfo(),
-            new com.swmansion.gesturehandler.react.RNGestureHandlerPackage(),
-            new org.linusu.RNGetRandomValuesPackage(),
-            new com.rnimmersive.RNImmersivePackage(),
-            new com.swmansion.rnscreens.RNScreensPackage(),
-            new com.zmxv.RNSound.RNSoundPackage(),
-            new com.th3rdwave.safeareacontext.SafeAreaContextPackage(),
-            new com.horcrux.svg.SvgPackage(),
-            new ReactPackageAdapter() {
-                @Override
-                public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-                    return ReactInstanceManagerHolder.createNativeModules(reactContext);
-                }
-                @Override
-                public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-                    return ReactInstanceManagerHolder.createViewManagers(reactContext);
-                }
-            }));
-
-        // AmplitudeReactNativePackage
-        try {
-            Class<?> amplitudePackageClass = Class.forName("com.amplitude.reactnative.AmplitudeReactNativePackage");
-            Constructor constructor = amplitudePackageClass.getConstructor();
-            packages.add((ReactPackage)constructor.newInstance());
-        } catch (Exception e) {
-            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-        }
-
-        // RNGoogleSignInPackage
-        try {
-            Class<?> googlePackageClass = Class.forName("com.reactnativegooglesignin.RNGoogleSigninPackage");
-            Constructor constructor = googlePackageClass.getConstructor();
-            packages.add((ReactPackage)constructor.newInstance());
-        } catch (Exception e) {
-            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-        }
-
-        return packages;
-    }
-
-    static JSCExecutorFactory getReactNativeJSFactory() {
-        // Keep on using JSC, the jury is out on Hermes.
-        return new JSCExecutorFactory("", "");
-    }
-
    /**
     * Helper function to send an event to JavaScript.
     *
@@ -225,35 +161,6 @@ class ReactInstanceManagerHolder {
        return reactInstanceManager;
    }

-    /**
-     * Internal method to initialize the React Native instance manager. We
-     * create a single instance in order to load the JavaScript bundle a single
-     * time. All {@code ReactRootView} instances will be tied to the one and
-     * only {@code ReactInstanceManager}.
-     *
-     * This method is only meant to be called when integrating with {@code JitsiReactNativeHost}.
-     *
-     * @param app {@code Application} current running Application.
-     */
-    static void initReactInstanceManager(Application app) {
-        if (reactInstanceManager != null) {
-            return;
-        }
-
-        Log.d(ReactInstanceManagerHolder.class.getCanonicalName(), "initializing RN with Application");
-
-        reactInstanceManager
-            = ReactInstanceManager.builder()
-                .setApplication(app)
-                .setBundleAssetName("index.android.bundle")
-                .setJSMainModulePath("index.android")
-                .setJavaScriptExecutorFactory(getReactNativeJSFactory())
-                .addPackages(getReactNativePackages())
-                .setUseDeveloperSupport(BuildConfig.DEBUG)
-                .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
-                .build();
-    }
-
    /**
     * Internal method to initialize the React Native instance manager. We
     * create a single instance in order to load the JavaScript bundle a single
@@ -267,7 +174,57 @@ class ReactInstanceManagerHolder {
            return;
        }

-        Log.d(ReactInstanceManagerHolder.class.getCanonicalName(), "initializing RN with Activity");
+        SoLoader.init(activity.getApplication(), /* native exopackage */ false);
+
+        List<ReactPackage> packages
+            = new ArrayList<>(Arrays.asList(
+                new com.calendarevents.CalendarEventsPackage(),
+                new com.corbt.keepawake.KCKeepAwakePackage(),
+                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.oblador.performance.PerformancePackage(),
+                new com.ocetnik.timer.BackgroundTimerPackage(),
+                new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
+                new com.reactnativecommunity.netinfo.NetInfoPackage(),
+                new com.reactnativecommunity.slider.ReactSliderPackage(),
+                new com.reactnativecommunity.webview.RNCWebViewPackage(),
+                new com.rnimmersive.RNImmersivePackage(),
+                new com.zmxv.RNSound.RNSoundPackage(),
+                new com.brentvatne.react.ReactVideoPackage(),
+                new ReactPackageAdapter() {
+                    @Override
+                    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+                        return ReactInstanceManagerHolder.createNativeModules(reactContext);
+                    }
+                    @Override
+                    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+                        return ReactInstanceManagerHolder.createViewManagers(reactContext);
+                    }
+                }));
+
+        // AmplitudeReactNativePackage
+        try {
+            Class<?> amplitudePackageClass = Class.forName("com.amplitude.reactnative.AmplitudeReactNativePackage");
+            Constructor constructor = amplitudePackageClass.getConstructor();
+            packages.add((ReactPackage)constructor.newInstance());
+        } catch (Exception e) {
+            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
+        }
+
+        // RNGoogleSigninPackage
+        try {
+            Class<?> googlePackageClass = Class.forName("co.apptailor.googlesignin.RNGoogleSigninPackage");
+            Constructor constructor = googlePackageClass.getConstructor();
+            packages.add((ReactPackage)constructor.newInstance());
+        } catch (Exception e) {
+            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
+        }
+
+        // Keep on using JSC, the jury is out on Hermes.
+        JSCExecutorFactory jsFactory
+            = new JSCExecutorFactory("", "");

        reactInstanceManager
            = ReactInstanceManager.builder()
@@ -275,10 +232,20 @@ class ReactInstanceManagerHolder {
                .setCurrentActivity(activity)
                .setBundleAssetName("index.android.bundle")
                .setJSMainModulePath("index.android")
-                .setJavaScriptExecutorFactory(getReactNativeJSFactory())
-                .addPackages(getReactNativePackages())
+                .setJavaScriptExecutorFactory(jsFactory)
+                .addPackages(packages)
                .setUseDeveloperSupport(BuildConfig.DEBUG)
                .setInitialLifecycleState(LifecycleState.RESUMED)
                .build();
+
+        // Disable delta updates on Android, they have caused trouble.
+        DevInternalSettings devSettings
+            = (DevInternalSettings)reactInstanceManager.getDevSupportManager().getDevSettings();
+        if (devSettings != null) {
+            devSettings.setBundleDeltasEnabled(false);
+        }
+
+        // Register our uncaught exception handler.
+        JitsiMeetUncaughtExceptionHandler.register();
    }
 }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/incoming_call/IncomingCallInfo.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/incoming_call/IncomingCallInfo.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright @ 2018-present Atlassian Pty Ltd
+ *
+ * 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.incoming_call;
+
+import androidx.annotation.NonNull;
+
+public class IncomingCallInfo {
+    /**
+     * URL for the caller avatar.
+     */
+    private final String callerAvatarURL;
+
+    /**
+     * Caller's name.
+     */
+    private final String callerName;
+
+    /**
+     * Whether this is a regular call or a video call.
+     */
+    private final boolean hasVideo;
+
+    public IncomingCallInfo(
+            @NonNull String callerName,
+            @NonNull String callerAvatarURL,
+            boolean hasVideo) {
+        this.callerName = callerName;
+        this.callerAvatarURL = callerAvatarURL;
+        this.hasVideo = hasVideo;
+    }
+
+    /**
+     * Gets the caller's avatar URL.
+     * 
+     * @return - The URL as a string.
+     */
+    public String getCallerAvatarURL() {
+        return callerAvatarURL;
+    }
+
+    /**
+     * Gets the caller's name.
+     *
+     * @return - The caller's name.
+     */
+    public String getCallerName() {
+        return callerName;
+    }
+
+    /**
+     * Gets whether the call is a video call or not.
+     *
+     * @return - {@code true} if this call has video; {@code false}, otherwise.
+     */
+    public boolean hasVideo() {
+        return hasVideo;
+    }
+}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/incoming_call/IncomingCallView.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/incoming_call/IncomingCallView.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright @ 2018-present Atlassian Pty Ltd
+ *
+ * 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.incoming_call;
+
+import android.content.Context;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReadableMap;
+
+import org.jitsi.meet.sdk.BaseReactView;
+import org.jitsi.meet.sdk.ListenerUtils;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+public class IncomingCallView
+    extends BaseReactView<IncomingCallViewListener> {
+
+    /**
+     * The {@code Method}s of {@code JitsiMeetViewListener} by event name i.e.
+     * redux action types.
+     */
+    private static final Map<String, Method> LISTENER_METHODS
+        = ListenerUtils.mapListenerMethods(IncomingCallViewListener.class);
+
+    public IncomingCallView(@NonNull Context context) {
+        super(context);
+    }
+
+    /**
+     * Handler for {@link ExternalAPIModule} events.
+     *
+     * @param name The name of the event.
+     * @param data The details/specifics of the event to send determined
+     * by/associated with the specified {@code name}.
+     */
+    @Override
+    protected void onExternalAPIEvent(String name, ReadableMap data) {
+        onExternalAPIEvent(LISTENER_METHODS, name, data);
+    }
+
+    /**
+     * Sets the information for the incoming call this {@code IncomingCallView}
+     * represents.
+     *
+     * @param callInfo - {@link IncomingCallInfo} object representing the caller
+     * information.
+     */
+    public void setIncomingCallInfo(IncomingCallInfo callInfo) {
+        Bundle props = new Bundle();
+
+        props.putString("callerAvatarURL", callInfo.getCallerAvatarURL());
+        props.putString("callerName", callInfo.getCallerName());
+        props.putBoolean("hasVideo", callInfo.hasVideo());
+
+        createReactRootView("IncomingCallApp", props);
+    }
+}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/incoming_call/IncomingCallViewListener.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/incoming_call/IncomingCallViewListener.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright @ 2018-present Atlassian Pty Ltd
+ *
+ * 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.incoming_call;
+
+import java.util.Map;
+
+/**
+ * Interface for listening to events coming from Jitsi Meet, related to
+ * {@link IncomingCallView}.
+ */
+public interface IncomingCallViewListener {
+    /**
+     * Called when the user presses the "Answer" button on the
+     * {@link IncomingCallView}.
+     *
+     * @param data - Unused at the moment.
+     */
+    void onIncomingCallAnswered(Map<String, Object> data);
+
+    /**
+     * Called when the user presses the "Decline" button on the
+     * {@link IncomingCallView}.
+     *
+     * @param data - Unused at the moment.
+     */
+    void onIncomingCallDeclined(Map<String, Object> data);
+}
--- a/android/sdk/src/main/res/layout/activity_jitsi_meet.xml
+++ b/android/sdk/src/main/res/layout/activity_jitsi_meet.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/jitsi_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    tools:context=".JitsiMeetActivity">
-
-    <org.jitsi.meet.sdk.JitsiMeetView
-        android:id="@+id/jitsiView"
+    <fragment
        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:name="org.jitsi.meet.sdk.JitsiMeetFragment"
+        android:id="@+id/jitsiFragment"/>
 </FrameLayout>
--- a/android/sdk/src/main/res/values/strings.xml
+++ b/android/sdk/src/main/res/values/strings.xml
@@ -6,5 +6,4 @@
    <string name="ongoing_notification_action_hang_up">Hang up</string>
    <string name="ongoing_notification_action_mute">Mute</string>
    <string name="ongoing_notification_action_unmute">Unmute</string>
-    <string name="ongoing_notification_channel_name">Ongoing Conference Notifications</string>
 </resources>
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,8 +1,6 @@
 rootProject.name = 'jitsi-meet'

 include ':app', ':sdk'
-includeBuild('../node_modules/react-native-gradle-plugin')
-
 include ':react-native-amplitude'
 project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native//android')
 include ':react-native-async-storage'
@@ -11,38 +9,20 @@ 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_clipboard'
-project(':react-native-community_clipboard').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/clipboard/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-gesture-handler'
-project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
-include ':react-native-get-random-values'
-project(':react-native-get-random-values').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-get-random-values/android')
-include ':react-native-giphy'
-project(':react-native-giphy').projectDir = new File(rootProject.projectDir, '../node_modules/@giphy/react-native-sdk/android')
 include ':react-native-google-signin'
-project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-google-signin/google-signin/android')
+project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/google-signin/android')
 include ':react-native-immersive'
 project(':react-native-immersive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive/android')
 include ':react-native-keep-awake'
 project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
-include ':react-native-masked-view_masked-view'
-project(':react-native-masked-view_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-masked-view/masked-view/android')
-include ':react-native-pager-view'
-project(':react-native-pager-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-pager-view/android')
 include ':react-native-performance'
 project(':react-native-performance').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-performance/android')
-include ':react-native-reanimated'
-project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
-include ':react-native-safe-area-context'
-project(':react-native-safe-area-context').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-safe-area-context/android')
-include ':react-native-screens'
-project(':react-native-screens').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-screens/android')
 include ':react-native-slider'
 project(':react-native-slider').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/slider/android')
 include ':react-native-sound'
--- a/conference.js
+++ b/conference.js
--- a/config.js
+++ b/config.js
@@ -1,11 +1,5 @@
-
 /* eslint-disable no-unused-vars, no-var */

-/*
- * NOTE: If you add a new option please remember to document it here:
- * https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-configuration
- */
-
 var config = {
    // Connection
    //
@@ -74,56 +68,21 @@ var config = {
        // or disabled for the screenshare.
        // capScreenshareBitrate: 1 // 0 to disable - deprecated.

-        // Whether to use fake constraints (height: 99999, width: 99999) when calling getDisplayMedia on
-        // Chromium based browsers. This is intended as a workaround for
-        // https://bugs.chromium.org/p/chromium/issues/detail?id=1056311
-        // setScreenSharingResolutionConstraints: true
-
        // Enable callstats only for a percentage of users.
        // This takes a value between 0 and 100 which determines the probability for
        // the callstats to be enabled.
        // callStatsThreshold: 5 // enable callstats for 5% of the users.
    },

-    // Feature Flags.
-    flags: {
-        // Enables source names in the signaling.
-        // sourceNameSignaling: false,
-
-        // Enables sending multiple video streams, i.e., camera and desktop tracks can be shared in the conference
-        // separately as two different streams instead of one composite stream.
-        // sendMultipleVideoStreams: false
-    },
-
    // Disables moderator indicators.
    // disableModeratorIndicator: false,

    // Disables the reactions feature.
    // disableReactions: true,

-    // Disables the reactions moderation feature.
-    // disableReactionsModeration: false,
-
    // Disables polls feature.
    // disablePolls: false,

-    // Disables self-view tile. (hides it from tile view and from filmstrip)
-    // disableSelfView: false,
-
-    // Disables self-view settings in UI
-    // disableSelfViewSettings: false,
-
-    // screenshotCapture : {
-    //      Enables the screensharing capture feature.
-    //      enabled: false,
-    //
-    //      The mode for the screenshot capture feature.
-    //      Can be either 'recording' - screensharing screenshots are taken
-    //      only when the recording is also on,
-    //      or 'always' - screensharing screenshots are always taken.
-    //      mode: 'recording'
-    // }
-
    // Disables ICE/UDP by filtering out local and remote UDP candidates in
    // signalling.
    // webrtcIceUdpDisable: false,
@@ -262,11 +221,7 @@ var config = {
    //     max: 5
    // },

-    // This option has been deprecated since it is no longer supported as per the w3c spec.
-    // https://w3c.github.io/mediacapture-screen-share/#dom-mediadevices-getdisplaymedia. If the user has not
-    // interacted with the webpage before the getDisplayMedia call, the promise will be rejected by the browser. This
-    // has already been implemented in Firefox and Safari and will be implemented in Chrome soon.
-    // https://bugs.chromium.org/p/chromium/issues/detail?id=1198918
+    // Try to start calls with screen-sharing instead of camera video.
    // startScreenSharing: false,

    // Recording
@@ -295,9 +250,6 @@ var config = {
    // Whether to enable live streaming or not.
    // liveStreamingEnabled: false,

-    // Whether to enable local recording or not.
-    // enableLocalRecording: false,
-
    // Transcription (in interface_config,
    // subtitles and buttons can be configured)
    // transcribingEnabled: false,
@@ -327,7 +279,6 @@ var config = {
    //     autoHide: true,
    //     autoHideTimeout: 5000,
    //     disabled: false,
-    //     disableDetails: false,
    //     inactiveDisabled: false
    // },

@@ -423,13 +374,6 @@ var config = {
    //    resizeDesktopForPresenter: false
    // },

-    // Notification timeouts
-    // notificationTimeouts: {
-    //     short: 2500,
-    //     medium: 5000,
-    //     long: 10000
-    // },
-
    // // Options for the recording limit notification.
    // recordingLimit: {
    //
@@ -448,9 +392,6 @@ var config = {
    // Disables or enables RTX (RFC 4588) (defaults to false).
    // disableRtx: false,

-    // Moves all Jitsi Meet 'beforeunload' logic (cleanup, leaving, disconnecting, etc) to the 'unload' event.
-    // disableBeforeUnloadHandlers: true,
-
    // Disables or enables TCC support in this client (default: enabled).
    // enableTcc: true,

@@ -488,16 +429,6 @@ var config = {
    // Hides lobby button
    // hideLobbyButton: false,

-    // If Lobby is enabled starts knocking automatically.
-    // autoKnockLobby: false,
-
-    // Enable lobby chat.
-    // enableLobbyChat: true,
-
-    // DEPRECATED! Use `breakoutRooms.hideAddRoomButton` instead.
-    // Hides add breakout room button
-    // hideAddRoomButton: false,
-
    // Require users to always specify a display name.
    // requireDisplayName: true,

@@ -521,27 +452,12 @@ var config = {
    // when the toolbar is shown on mouse movements
    // disable1On1Mode: null | false | true,

-    // Default local name to be displayed
-    // defaultLocalDisplayName: 'me',
-
-    // Default remote name to be displayed
-    // defaultRemoteDisplayName: 'Fellow Jitster',
-
-    // Hides the display name from the participant thumbnail
-    // hideDisplayName: false,
-
-    // Hides the dominant speaker name badge that hovers above the toolbox
-    // hideDominantSpeakerBadge: false,
-
-    // Default language for the user interface. Cannot be overwritten.
+    // Default language for the user interface.
    // defaultLanguage: 'en',

    // Disables profile and the edit of all fields from the profile settings (display name and email)
    // disableProfile: false,

-    // Hides the email section under profile settings.
-    // hideEmailInSettings: false,
-
    // Whether or not some features are checked based on token.
    // enableFeaturesBasedOnToken: false,

@@ -557,22 +473,8 @@ var config = {
    // and microsoftApiApplicationClientID
    // enableCalendarIntegration: false,

-    // Configs for prejoin page.
-    // prejoinConfig: {
-    //     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
-    //     // This replaces `prejoinPageEnabled`.
-    //     enabled: true,
-    //     // Hides the participant name editing field in the prejoin screen.
-    //     // If requireDisplayName is also set as true, a name should still be provided through
-    //     // either the jwt or the userInfo from the iframe api init object in order for this to have an effect.
-    //     hideDisplayName: false,
-    //     // List of buttons to hide from the extra join options dropdown.
-    //     hideExtraJoinButtons: ['no-audio', 'by-phone']
-    // },
-
-    // When 'true', the user cannot edit the display name.
-    // (Mainly useful when used in conjuction with the JWT so the JWT name becomes read only.)
-    // readOnlyName: false,
+    // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
+    // prejoinPageEnabled: false,

    // If etherpad integration is enabled, setting this to true will
    // automatically open the etherpad when a participant joins.  This
@@ -590,20 +492,8 @@ var config = {
    // Document should be focused for this option to work
    // enableAutomaticUrlCopy: false,

-    // Array with avatar URL prefixes that need to use CORS.
-    // corsAvatarURLs: [ 'https://www.gravatar.com/avatar/' ],
-
-    // Base URL for a Gravatar-compatible service. Defaults to Gravatar.
-    // DEPRECATED! Use `gravatar.baseUrl` instead.
-    // gravatarBaseURL: 'https://www.gravatar.com/avatar/',
-
-    // Setup for Gravatar-compatible services.
-    // gravatar: {
-    //     // Defaults to Gravatar.
-    //     baseUrl: 'https://www.gravatar.com/avatar/',
-    //     // True if Gravatar should be disabled.
-    //     disabled: false
-    // },
+    // Base URL for a Gravatar-compatible service. Defaults to libravatar.
+    // gravatarBaseURL: 'https://seccdn.libravatar.org/avatar/',

    // App name to be displayed in the invitation email subject, as an alternative to
    // interfaceConfig.APP_NAME.
@@ -625,7 +515,6 @@ var config = {
    //    'chat',
    //    'closedcaptions',
    //    'desktop',
-    //    'dock-iframe'
    //    'download',
    //    'embedmeeting',
    //    'etherpad',
@@ -634,11 +523,11 @@ var config = {
    //    'fullscreen',
    //    'hangup',
    //    'help',
-    //    'highlight',
    //    'invite',
-    //    'linktosalesforce',
    //    'livestreaming',
    //    'microphone',
+    //    'mute-everyone',
+    //    'mute-video-everyone',
    //    'participants-pane',
    //    'profile',
    //    'raisehand',
@@ -652,81 +541,45 @@ var config = {
    //    'stats',
    //    'tileview',
    //    'toggle-camera',
-    //    'undock-iframe',
    //    'videoquality',
    //    '__end'
    // ],

-    // Holds values related to toolbar visibility control.
-    // toolbarConfig: {
-    //     // Moved from interfaceConfig.INITIAL_TOOLBAR_TIMEOUT
-    //     // The initial numer of miliseconds for the toolbar buttons to be visible on screen.
-    //     initialTimeout: 20000,
-    //     // Moved from interfaceConfig.TOOLBAR_TIMEOUT
-    //     // Number of miliseconds for the toolbar buttons to be visible on screen.
-    //     timeout: 4000,
-    //     // Moved from interfaceConfig.TOOLBAR_ALWAYS_VISIBLE
-    //     // Whether toolbar should be always visible or should hide after x miliseconds.
-    //     alwaysVisible: false,
-    //     // Indicates whether the toolbar should still autohide when chat is open
-    //     autoHideWhileChatIsOpen: false
-    // },
-
-    // Toolbar buttons which have their click/tap event exposed through the API on
-    // `toolbarButtonClicked`. Passing a string for the button key will
-    // prevent execution of the click/tap routine; passing an object with `key` and
-    // `preventExecution` flag on false will not prevent execution of the click/tap
-    // routine. Below array with mixed mode for passing the buttons.
+    // Toolbar buttons which have their click event exposed through the API on
+    // `toolbarButtonClicked` event instead of executing the normal click routine.
    // buttonsWithNotifyClick: [
-    //     'camera',
-    //     {
-    //         key: 'chat',
-    //         preventExecution: false
-    //     },
-    //     {
-    //         key: 'closedcaptions',
-    //         preventExecution: true
-    //     },
-    //     'desktop',
-    //     'download',
-    //     'embedmeeting',
-    //     'etherpad',
-    //     'feedback',
-    //     'filmstrip',
-    //     'fullscreen',
-    //     'hangup',
-    //     'help',
-    //     {
-    //         key: 'invite',
-    //         preventExecution: false
-    //     },
-    //     'livestreaming',
-    //     'microphone',
-    //     'mute-everyone',
-    //     'mute-video-everyone',
-    //     'participants-pane',
-    //     'profile',
-    //     {
-    //         key: 'raisehand',
-    //         preventExecution: true
-    //     },
-    //     'recording',
-    //     'security',
-    //     'select-background',
-    //     'settings',
-    //     'shareaudio',
-    //     'sharedvideo',
-    //     'shortcuts',
-    //     'stats',
-    //     'tileview',
-    //     'toggle-camera',
-    //     'videoquality',
-    //     // The add passcode button from the security dialog.
-    //     {
-    //         key: 'add-passcode',
-    //         preventExecution: false
-    //     }
-    //     '__end'
+    //    'camera',
+    //    'chat',
+    //    'closedcaptions',
+    //    'desktop',
+    //    'download',
+    //    'embedmeeting',
+    //    'etherpad',
+    //    'feedback',
+    //    'filmstrip',
+    //    'fullscreen',
+    //    'hangup',
+    //    'help',
+    //    'invite',
+    //    'livestreaming',
+    //    'microphone',
+    //    'mute-everyone',
+    //    'mute-video-everyone',
+    //    'participants-pane',
+    //    'profile',
+    //    'raisehand',
+    //    'recording',
+    //    'security',
+    //    'select-background',
+    //    'settings',
+    //    'shareaudio',
+    //    'sharedvideo',
+    //    'shortcuts',
+    //    'stats',
+    //    'tileview',
+    //    'toggle-camera',
+    //    'videoquality',
+    //    '__end'
    // ],

    // List of pre meeting screens buttons to hide. The values must be one or more of the 5 allowed buttons:
@@ -778,26 +631,6 @@ var config = {
    // Enables sending participants' emails (if available) to callstats and other analytics
    // enableEmailInStats: false,

-    // faceLandmarks: {
-    //     // Enables sharing your face coordinates. Used for centering faces within a video.
-    //     enableFaceCentering: false,
-
-    //     // Enables detecting face expressions and sharing data with other participants
-    //     enableFaceExpressionsDetection: false,
-
-    //     // Enables displaying face expressions in speaker stats
-    //     enableDisplayFaceExpressions: false,
-
-    //     // Minimum required face movement percentage threshold for sending new face centering coordinates data.
-    //     faceCenteringThreshold: 10,
-
-    //     // Milliseconds for processing a new image capture in order to detect face coordinates if they exist.
-    //     captureInterval: 1000,
-
-    //     // Maximum number of faces that can be detected from a video track.
-    //     maxFacesDetected: 4
-    // },
-
    // Controls the percentage of automatic feedback shown to participants when callstats is enabled.
    // The default value is 100%. If set to 0, no automatic feedback will be requested
    // feedbackPercentage: 100,
@@ -880,7 +713,7 @@ var config = {
        // module connects to the provided rtcstatsEndpoint and sends statistics regarding
        // PeerConnection states along with getStats metrics polled at the specified
        // interval.
-        // rtcstatsEnabled: false,
+        // rtcstatsEnabled: true,

        // In order to enable rtcstats one needs to provide a endpoint url.
        // rtcstatsEndpoint: wss://rtcstats-server-pilot.jitsi.net/,
@@ -926,7 +759,6 @@ var config = {
    // - 'PARTICIPANT_JOINED_SOUND'
    // - 'PARTICIPANT_LEFT_SOUND'
    // - 'RAISE_HAND_SOUND'
-    // - 'REACTION_SOUND'
    // - 'RECORDING_OFF_SOUND'
    // - 'RECORDING_ON_SOUND'
    // - 'TALK_WHILE_MUTED_SOUND'
@@ -959,25 +791,34 @@ var config = {
    //     ]
    // },

-    // e2ee: {
-    //   labels,
-    //   externallyManagedKey: false
+    // Local Recording
+    //
+
+    // localRecording: {
+    // Enables local recording.
+    // Additionally, 'localrecording' (all lowercase) needs to be added to
+    // the `toolbarButtons`-array for the Local Recording button to show up
+    // on the toolbar.
+    //
+    //     enabled: true,
+    //
+
+    // The recording format, can be one of 'ogg', 'flac' or 'wav'.
+    //     format: 'flac'
+    //
+
    // },

    // Options related to end-to-end (participant to participant) ping.
    // e2eping: {
-    //   // Whether ene-to-end pings should be enabled.
-    //   enabled: false,
+    //   // The interval in milliseconds at which pings will be sent.
+    //   // Defaults to 10000, set to <= 0 to disable.
+    //   pingInterval: 10000,
    //
-    //   // The number of responses to wait for.
-    //   numRequests: 5,
-    //
-    //   // The max conference size in which e2e pings will be sent.
-    //   maxConferenceSize: 200,
-    //
-    //   // The maximum number of e2e ping messages per second for the whole conference to aim for.
-    //   // This is used to contol the pacing of messages in order to reduce the load on the backend.
-    //   maxMessagesPerSecond: 250
+    //   // The interval in milliseconds at which analytics events
+    //   // with the measured RTT will be sent. Defaults to 60000, set
+    //   // to <= 0 to disable.
+    //   analyticsInterval: 60000,
    //   },

    // If set, will attempt to use the provided video input device label when
@@ -1004,8 +845,7 @@ var config = {
    // Disables all invite functions from the app (share, invite, dial out...etc)
    // disableInviteFunctions: true,

-    // Disables storing the room name to the recents list. When in an iframe this is ignored and
-    // the room is never stored in the recents list.
+    // Disables storing the room name to the recents list
    // doNotStoreRoom: true,

    // Deployment specific URLs.
@@ -1020,25 +860,12 @@ var config = {

    // Options related to the remote participant menu.
    // remoteVideoMenu: {
-    //     // Whether the remote video context menu to be rendered or not.
-    //     disabled: true,
    //     // If set to true the 'Kick out' button will be disabled.
    //     disableKick: true,
    //     // If set to true the 'Grant moderator' button will be disabled.
-    //     disableGrantModerator: true,
-    //     // If set to true the 'Send private message' button will be disabled.
-    //     disablePrivateChat: true
+    //     disableGrantModerator: true
    // },

-    // Endpoint that enables support for salesforce integration with in-meeting resource linking
-    // This is required for:
-    // listing the most recent records - salesforceUrl/records/recents
-    // searching records - salesforceUrl/records?text=${text}
-    // retrieving record details - salesforceUrl/records/${id}?type=${type}
-    // and linking the meeting - salesforceUrl/sessions/${sessionId}/records/${id}
-    //
-    // salesforceUrl: 'https://api.example.com/',
-
    // If set to true all muting operations of remote participants will be disabled.
    // disableRemoteMute: true,

@@ -1050,85 +877,25 @@ var config = {
     If there is no url set or there are missing fields, the defaults are applied.
     The config file should be in JSON.
     None of the fields are mandatory and the response must have the shape:
-    {
-        // The domain url to apply (will replace the domain in the sharing conference link/embed section)
-        inviteDomain: 'example-company.org,
-        // The hex value for the colour used as background
-        backgroundColor: '#fff',
-        // The url for the image used as background
-        backgroundImageUrl: 'https://example.com/background-img.png',
-        // The anchor url used when clicking the logo image
-        logoClickUrl: 'https://example-company.org',
-        // The url used for the image used as logo
-        logoImageUrl: 'https://example.com/logo-img.png',
-        // Overwrite for pool of background images for avatars
-        avatarBackgrounds: ['url(https://example.com/avatar-background-1.png)', '#FFF'],
-        // The lobby/prejoin screen background
-        premeetingBackground: 'url(https://example.com/premeeting-background.png)',
-        // A list of images that can be used as video backgrounds.
-        // When this field is present, the default images will be replaced with those provided.
-        virtualBackgrounds: ['https://example.com/img.jpg'],
-        // Object containing a theme's properties. It also supports partial overwrites of the main theme.
-        // For a list of all possible theme tokens and their current defaults, please check:
-        // https://github.com/jitsi/jitsi-meet/tree/master/resources/custom-theme/custom-theme.json
-        // For a short explanations on each of the tokens, please check:
-        // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/ui/Tokens.js
-        // IMPORTANT!: This is work in progress so many of the various tokens are not yet applied in code
-        // or they are partially applied.
-        customTheme: {
-            palette: {
-                ui01: "orange !important",
-                ui02: "maroon",
-                surface02: 'darkgreen',
-                ui03: "violet",
-                ui04: "magenta",
-                ui05: "blueviolet",
-                field02Hover: 'red',
-                action01: 'green',
-                action01Hover: 'lightgreen',
-                action02Disabled: 'beige',
-                success02: 'cadetblue',
-                action02Hover: 'aliceblue'
-            },
-            typography: {
-                labelRegular: {
-                    fontSize: 25,
-                    lineHeight: 30,
-                    fontWeight: 500
-                }
-            }
-        }
-    }
+     {
+         // The domain url to apply (will replace the domain in the sharing conference link/embed section)
+         inviteDomain: 'example-company.org,
+         // The hex value for the colour used as background
+         backgroundColor: '#fff',
+         // The url for the image used as background
+         backgroundImageUrl: 'https://example.com/background-img.png',
+         // The anchor url used when clicking the logo image
+         logoClickUrl: 'https://example-company.org',
+         // The url used for the image used as logo
+         logoImageUrl: 'https://example.com/logo-img.png',
+         // Overwrite for pool of background images for avatars
+         avatarBackgrounds: ['url(https://example.com/avatar-background-1.png)', '#FFF'],
+         // The lobby/prejoin screen background
+         premeetingBackground: 'url(https://example.com/premeeting-background.png)'
+     }
    */
    // dynamicBrandingUrl: '',

-    // Options related to the participants pane.
-    // participantsPane: {
-    //     // Hides the moderator settings tab.
-    //     hideModeratorSettingsTab: false,
-    //     // Hides the more actions button.
-    //     hideMoreActionsButton: false,
-    //     // Hides the mute all button.
-    //     hideMuteAllButton: false
-    // },
-
-    // Options related to the breakout rooms feature.
-    // breakoutRooms: {
-    //     // Hides the add breakout room button. This replaces `hideAddRoomButton`.
-    //     hideAddRoomButton: false,
-    //     // Hides the auto assign participants button.
-    //     hideAutoAssignButton: false,
-    //     // Hides the join breakout room button.
-    //     hideJoinRoomButton: false
-    // },
-
-    // When true the user cannot add more images to be used as virtual background.
-    // Only the default ones from will be available.
-    // disableAddingBackgroundImages: false,
-
-    // Disables using screensharing as virtual background.
-    // disableScreensharingVirtualBackground: false,
-
    // Sets the background transparency level. '0' is fully transparent, '1' is opaque.
    // backgroundAlpha: 1,

@@ -1140,15 +907,11 @@ var config = {
    // If true, tile view will not be enabled automatically when the participants count threshold is reached.
    // disableTileView: true,

-    // If true, the tiles will be displayed contained within the available space rather than enlarged to cover it,
-    // with a 16:9 aspect ratio (old behaviour).
-    // disableTileEnlargement: true,
-
    // Controls the visibility and behavior of the top header conference info labels.
    // If a label's id is not in any of the 2 arrays, it will not be visible at all on the header.
    // conferenceInfo: {
    //     // those labels will not be hidden in tandem with the toolbox.
-    //     alwaysVisible: ['recording', 'raised-hands-count'],
+    //     alwaysVisible: ['recording', 'local-recording'],
    //     // those labels will be auto-hidden in tandem with the toolbox buttons.
    //     autoHide: [
    //         'subject',
@@ -1157,16 +920,15 @@ var config = {
    //         'e2ee',
    //         'transcribing',
    //         'video-quality',
-    //         'insecure-room',
-    //         'highlight-moment'
+    //         'insecure-room'
    //     ]
    // },

    // Hides the conference subject
-    // hideConferenceSubject: false,
+    // hideConferenceSubject: true,

    // Hides the conference timer.
-    // hideConferenceTimer: false,
+    // hideConferenceTimer: true,

    // Hides the recording label
    // hideRecordingLabel: false,
@@ -1177,9 +939,6 @@ var config = {
    // Sets the conference subject
    // subject: 'Conference Subject',

-    // Sets the conference local subject
-    // localSubject: 'Conference Local Subject',
-
    // This property is related to the use case when jitsi-meet is used via the IFrame API. When the property is true
    // jitsi-meet will use the local storage of the host page instead of its own. This option is useful if the browser
    // is not persisting the local storage inside the iframe.
@@ -1192,17 +951,10 @@ var config = {
    // will open an etherpad document.
    // etherpad_base: 'https://your-etherpad-installati.on/p/',

-    // To enable information about dial-in access to meetings you need to provide
-    // dialInNumbersUrl and dialInConfCodeUrl.
-    // dialInNumbersUrl returns a json array of numbers that can be used for dial-in.
-    // {"countryCode":"US","tollFree":false,"formattedNumber":"+1 123-456-7890"}
-    // dialInConfCodeUrl is the conference mapper converting a meeting id to a PIN used for dial-in
-    // or the other way around (more info in resources/cloud-api.swagger)
-    //
-    // For JaaS customers the default values are:
-    // dialInNumbersUrl: 'https://conference-mapper.jitsi.net/v1/access/dids',
-    // dialInConfCodeUrl: 'https://conference-mapper.jitsi.net/v1/access',
-    //
+    // If etherpad_base is set, and useRoomAsSharedDocumentName is set to true,
+    // open a pad with the name of the room (lowercased) instead of a pad with a
+    // random UUID.
+    // useRoomAsSharedDocumentName: true,

    // List of undocumented settings used in jitsi-meet
    /**
@@ -1210,6 +962,8 @@ var config = {
     debug
     debugAudioLevels
     deploymentInfo
+     dialInConfCodeUrl
+     dialInNumbersUrl
     dialOutAuthUrl
     dialOutCodesUrl
     disableRemoteControl
@@ -1252,7 +1006,6 @@ var config = {
     forceJVB121Ratio
     forceTurnRelay
     hiddenDomain
-     hiddenFromRecorderFeatureEnabled
     ignoreStartMuted
     websocketKeepAlive
     websocketKeepAliveUrl
@@ -1294,20 +1047,16 @@ var config = {
    //     'liveStreaming.unavailableTitle', // shown when livestreaming service is not reachable
    //     'lobby.joinRejectedMessage', // shown when while in a lobby, user's request to join is rejected
    //     'lobby.notificationTitle', // shown when lobby is toggled and when join requests are allowed / denied
-    //     'notify.chatMessages', // shown when receiving chat messages while the chat window is closed
+    //     'localRecording.localRecording', // shown when a local recording is started
    //     'notify.disconnected', // shown when a participant has left
    //     'notify.connectedOneMember', // show when a participant joined
    //     'notify.connectedTwoMembers', // show when two participants joined simultaneously
    //     'notify.connectedThreePlusMembers', // show when more than 2 participants joined simultaneously
-    //     'notify.leftOneMember', // show when a participant left
-    //     'notify.leftTwoMembers', // show when two participants left simultaneously
-    //     'notify.leftThreePlusMembers', // show when more than 2 participants left simultaneously
    //     'notify.grantedTo', // shown when moderator rights were granted to a participant
    //     'notify.invitedOneMember', // shown when 1 participant has been invited
    //     'notify.invitedThreePlusMembers', // shown when 3+ participants have been invited
    //     'notify.invitedTwoMembers', // shown when 2 participants have been invited
    //     'notify.kickParticipant', // shown when a participant is kicked
-    //     'notify.linkToSalesforce', // shown when joining a meeting with salesforce integration
    //     'notify.moderationStartedTitle', // shown when AV moderation is activated
    //     'notify.moderationStoppedTitle', // shown when AV moderation is deactivated
    //     'notify.moderationInEffectTitle', // shown when user attempts to unmute audio during AV moderation
@@ -1317,13 +1066,11 @@ var config = {
    //     'notify.mutedTitle', // shown when user has been muted upon joining,
    //     'notify.newDeviceAudioTitle', // prompts the user to use a newly detected audio device
    //     'notify.newDeviceCameraTitle', // prompts the user to use a newly detected camera
-    //     'notify.participantWantsToJoin', // shown when lobby is enabled and participant requests to join meeting
    //     'notify.passwordRemovedRemotely', // shown when a password has been removed remotely
    //     'notify.passwordSetRemotely', // shown when a password has been set remotely
    //     'notify.raisedHand', // shown when a partcipant used raise hand,
    //     'notify.startSilentTitle', // shown when user joined with no audio
    //     'notify.unmute', // shown to moderator when user raises hand during AV moderation
-    //     'notify.hostAskedUnmute', // shown to participant when host asks them to unmute
    //     'prejoin.errorDialOut',
    //     'prejoin.errorDialOutDisconnected',
    //     'prejoin.errorDialOutFailed',
@@ -1339,47 +1086,12 @@ var config = {
    //     'transcribing.failedToStart' // shown when transcribing fails to start
    // ],

-    // List of notifications to be disabled. Works in tandem with the above setting.
-    // disabledNotifications: [],
-
    // Prevent the filmstrip from autohiding when screen width is under a certain threshold
    // disableFilmstripAutohiding: false,

-    // filmstrip: {
-    //     // Disables user resizable filmstrip. Also, allows configuration of the filmstrip
-    //     // (width, tiles aspect ratios) through the interfaceConfig options.
-    //     disableResizable: false,
-
-    //     // Disables the stage filmstrip
-    //     // (displaying multiple participants on stage besides the vertical filmstrip)
-    //     disableStageFilmstrip: false
-    // },
-
-    // Tile view related config options.
-    // tileView: {
-    //     // The optimal number of tiles that are going to be shown in tile view. Depending on the screen size it may
-    //     // not be possible to show the exact number of participants specified here.
-    //     numberOfVisibleTiles: 25
-    // },
-
    // Specifies whether the chat emoticons are disabled or not
    // disableChatSmileys: false,

-    // Settings for the GIPHY integration.
-    // giphy: {
-    //     // Whether the feature is enabled or not.
-    //     enabled: false,
-    //     // SDK API Key from Giphy.
-    //     sdkKey: '',
-    //     // Display mode can be one of:
-    //     // - tile: show the GIF on the tile of the participant that sent it.
-    //     // - chat: show the GIF as a message in chat
-    //     // - all: all of the above. This is the default option
-    //     displayMode: 'all',
-    //     // How long the GIF should be displayed on the tile (in miliseconds).
-    //     tileTime: 5000
-    // },
-
    // Allow all above example options to include a trailing comma and
    // prevent fear when commenting out the last value.
    makeJsonParserHappy: 'even if last key had a trailing comma'
--- a/connection.js
+++ b/connection.js
@@ -1,7 +1,7 @@
 /* global APP, JitsiMeetJS, config */

 import { jitsiLocalStorage } from '@jitsi/js-utils';
-import Logger from '@jitsi/logger';
+import Logger from 'jitsi-meet-logger';

 import { redirectToTokenAuthService } from './modules/UI/authentication/AuthHandler';
 import { LoginDialog } from './react/features/authentication/components';
@@ -13,10 +13,10 @@ import {
 import { openDialog } from './react/features/base/dialog/actions';
 import { setJWT } from './react/features/base/jwt';
 import {
+    isFatalJitsiConnectionError,
    JitsiConnectionErrors,
    JitsiConnectionEvents
 } from './react/features/base/lib-jitsi-meet';
-import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions';
 import { getCustomerDetails } from './react/features/jaas/actions.any';
 import { isVpaasMeeting, getJaasJWT } from './react/features/jaas/functions';
 import { setPrejoinDisplayNameRequired } from './react/features/prejoin/actions';
--- a/css/404.scss
+++ b/css/404.scss
@@ -4,12 +4,11 @@
    text-align: center;

    h2 {
-        font-size: 48px;
-        color : #f2f2f2;
+        font-size: 36px;
    }

    &__message {
        font-size: 24px;
        margin-top: 20px;
    }
-}
+}
--- a/css/_atlaskit_overrides.scss
+++ b/css/_atlaskit_overrides.scss
@@ -24,11 +24,74 @@
    bottom: calc(#{$newToolbarSizeWithPadding}) !important;
 }

+.modal-dialog-form {
+    /**
+     * Override @atlaskit/dropdown-menu styling when in a modal because the
+     * dropdown backgrounds clash with the modal backgrounds.
+     */
+    .dropdown-menu div[style*="transform"] {
+        outline: 1px solid #455166;
+    }
+    .dropdown-menu button:not(:active):not(:hover) > span {
+        color: #B8C7E0;
+    }
+
+    /**
+    * Override @atlaskit/tab styling when in a modal because the
+    * tab text color clash with the modal backgrounds.
+    */
+    div[role="tablist"] > div:not([data-selected]):not(:hover),
+    label > div > span {
+        color: #B8C7E0 !important;
+    }
+}
+
+/**
+ * Override @atlaskit/modal-dialog header styling
+ */
+.atlaskit-portal [role="dialog"] header {
+    box-shadow: none;
+    .jitsi-icon {
+        cursor: pointer;
+    }
+
+    .jitsi-icon svg {
+        fill: #B8C7E0;
+    }
+}
+
+/**
+ * Override @atlaskit/modal-dialog footer styling.
+ */
+ .atlaskit-portal [role="dialog"] footer {
+     box-shadow: none;
+ }
+
+/**
+ * Make header close button more easily tappable on mobile.
+ */
+.mobile-browser .atlaskit-portal [role="dialog"] header .jitsi-icon {
+    display: grid;
+    place-items: center;
+    height: 48px;
+    width: 48px;
+    background: #2a3a4b;
+    border-radius: 3px;
+}
+
+/**
+ * Override @atlaskit/theme styling for the top toolbar so it displays over
+ * the video thumbnail while obscuring as little as possible.
+ */
+.videocontainer__toptoolbar > div > div {
+    background: none;
+}
+

 /**
 * Keep overflow menu within screen vertical bounds and make it scrollable.
 */
-.toolbox-button-wth-dialog > div:nth-child(2) {
+ .toolbox-button-wth-dialog > div:nth-child(2) {
    background: $menuBG;
    max-height: calc(100vh - #{$newToolbarSizeWithPadding} - 46px);
    margin-bottom: 4px;
@@ -36,22 +99,19 @@
    overflow-y: auto;
 }

-/**
- * Remove background color and box-shadow for the context menu container.
- */
-.toolbox-button-wth-dialog.context-menu > div:nth-child(2) {
-    background: transparent;
-    box-shadow: none;
-    overflow-y: initial;
-}
-
 .audio-preview > div:nth-child(2),
-.video-preview > div:nth-child(2) {
+.video-preview > div:nth-child(2),
+.reactions-menu-popup > div:nth-child(2) {
    margin-bottom: 4px;
    outline: none;
    padding: 0;
 }

+.reactions-menu-popup > div:nth-child(2) {
+    margin-bottom: 6px;
+    box-shadow: none;
+}
+
 /**
 * The following selectors keep the chat modal full-size anywhere between 100px
 * and 580px for desktop or 680px for mobile.
@@ -98,20 +158,3 @@ div.Tooltip {
    line-height: 14px;
    padding: 8px;
 }
-
-// make modal full screen on landscape orientation
-@media (max-height: 420px) {
-    .atlaskit-portal {
-        .css-1oc7v0j {
-            height: 100%;
-            padding: 0;
-            max-width: 100%;
-            top: 0;
-            width: 100%;
-
-            &> div {
-                height: 100%;
-            }
-        }
-    }
-}
--- a/css/_audio-preview.scss
+++ b/css/_audio-preview.scss
@@ -121,18 +121,9 @@
            }
        }

-        &--nometer {
-            .audio-preview-entry-text {
-                max-width: 238px;
-            }
+        .audio-preview-entry-text {
+            max-width: 178px;
        }
-
-        &--withmeter {
-            .audio-preview-entry-text {
-                max-width: 178px;
-            }
-        }
-
    }

    &-icon {
--- a/css/_aui_reset.scss
+++ b/css/_aui_reset.scss
@@ -48,7 +48,6 @@ canvas,
 progress,
 video {
  display: inline-block;
-  transition: object-position 0.5s ease 0s;
  vertical-align: baseline;
 }
 audio:not([controls]) {
--- a/css/_avatar.scss
+++ b/css/_avatar.scss
@@ -0,0 +1,50 @@
+.avatar {
+    background-color: #AAA;
+    border-radius: 50%;
+    color: rgba(255, 255, 255, 1);
+    font-weight: 100;
+    object-fit: cover;
+
+    &.avatar-small {
+        height: 28px !important;
+        width: 28px !important;
+    }
+
+    &.avatar-xsmall {
+        height: 16px !important;
+        width: 16px !important;
+    }
+
+    .jitsi-icon {
+        transform: translateY(50%);
+    }
+}
+
+.avatar-svg {
+    height: 100%;
+    width: 100%;
+}
+
+.avatar-badge {
+    position: relative;
+
+    &-available::after {
+        @include avatarBadge;
+        background-color: $presence-available;
+    }
+
+    &-away::after {
+        @include avatarBadge;
+        background-color: $presence-away;
+    }
+
+    &-busy::after {
+        @include avatarBadge;
+        background-color: $presence-busy;
+    }
+
+    &-idle::after {
+        @include avatarBadge;
+        background-color: $presence-idle;
+    }
+}
--- a/css/_base.scss
+++ b/css/_base.scss
@@ -6,10 +6,6 @@
 * {
    -webkit-user-select: none;
    user-select: none;
-
-    // Firefox only
-    scrollbar-width: thin;
-    scrollbar-color: rgba(0, 0, 0, .5) transparent;
 }

 input,
@@ -43,6 +39,18 @@ body {
  outline: none;
 }

+/**
+ * AtlasKit sets a default margin on the rendered modals, so
+ * when the shift-right class is set when the chat opens, we
+ * pad the modal container in order for the modals to be centered
+ * while also taking the chat size into consideration.
+*/
+@media (min-width: 581px) {
+    .shift-right .atlaskit-portal > div:not(.Tooltip) {
+        padding-left: $sidebarWidth;
+    }
+}
+
 .jitsi-icon {
    &-default svg {
        fill: white;
@@ -152,6 +160,16 @@ form {
    font-size: 12px;
 }

+/**
+* Dialogs fade
+*/
+.aui-blanket {
+    background: #000;
+    transition: opacity 0.2s, visibility 0.2s;
+    transition-delay: 0.1s;
+    visibility: visible;
+}
+
 #inviteLinkRef {
    -webkit-user-select: text;
    user-select: text;
--- a/css/_chat.scss
+++ b/css/_chat.scss
@@ -1,45 +1,35 @@
 #sideToolbarContainer {
    background-color: $chatBackgroundColor;
-    flex-shrink: 0;
+    box-sizing: border-box;
+    color: #FFF;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    left: -$sidebarWidth;
    overflow: hidden;
-    position: relative;
-    transition: width .16s ease-in-out;
+    position: absolute;
+    top: 0;
    width: $sidebarWidth;
    z-index: $sideToolbarContainerZ;

-    @media (max-width: 580px) {
-        height: 100vh;
-        height: -webkit-fill-available;
+    /**
+     * The sidebar (chat) is off-screen when hidden. Move it flush to the left
+     * side of the window when it should be visible.
+     */
+    &.slideInExt {
        left: 0;
-        position: fixed;
-        right: 0;
-        top: 0;
-        width: auto;
    }
 }

-.chat-panel {
-    display: flex;
-    flex-direction: column;
-    // extract header + tabs height
-    height: calc(100% - 102px);
-}
-
-.chat-panel-no-tabs {
-    // extract header height
-    height: calc(100% - 70px);
-}
-
 #chatconversation {
    box-sizing: border-box;
    flex: 1;
    font-size: 10pt;
-    // extract message input height
-    height: calc(100% - 68px);
    line-height: 20px;
    overflow: auto;
    padding: 16px;
    text-align: left;
+    width: $sidebarWidth;
    word-wrap: break-word;

    display: flex;
@@ -68,6 +58,28 @@
    a:active {
        color: black;
    }
+
+    &::-webkit-scrollbar {
+        background: #06a5df;
+        width: 7px;
+    }
+
+    &::-webkit-scrollbar-button {
+        display: none;
+    }
+
+    &::-webkit-scrollbar-track {
+        background: black;
+    }
+
+    &::-webkit-scrollbar-track-piece {
+        background: black;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        background: #06a5df;
+        border-radius: 4px;
+    }
 }

 #chat-recipient {
@@ -90,10 +102,6 @@
            fill: white;
        }
    }
-
-    &.lobby-chat-recipient {
-        background-color: $chatLobbyMessageBackgroundColor;
-    }
 }


@@ -205,7 +213,6 @@
 }

 #usermsg {
-    -ms-overflow-style: none;
    border: 0px none;
    border-radius:0;
    box-shadow: none;
@@ -214,13 +221,8 @@
    padding: 10px;
    overflow-y: auto;
    resize: none;
-    scrollbar-width: none;
    width: 100%;
    word-break: break-word;
-
-    &::-webkit-scrollbar {
-        display: none;
-    }
 }

 #usermsg:hover {
@@ -311,6 +313,10 @@
        text-overflow: ellipsis;
        overflow: hidden;
    }
+
+    @media (max-width: 580px) {
+        display: none !important;
+    }
 }

 .sr-only {
@@ -464,9 +470,6 @@
            &.privatemessage {
                background-color: $chatPrivateMessageBackgroundColor;
            }
-            &.lobbymessage {
-                background-color: $chatLobbyMessageBackgroundColor;
-            }
        }

        .display-name {
@@ -506,10 +509,6 @@
                justify-content: center;
                padding: 5px;

-                &.lobbychatmessageactions {
-                    border-left-color: $chatLobbyActionsSeparatorColor;
-                }
-
                .toolbox-icon {
                    cursor: pointer;
                }
@@ -527,9 +526,6 @@
        &.privatemessage {
            background-color: $chatPrivateMessageBackgroundColor;
        }
-        &.lobbymessage {
-            background-color: $chatLobbyMessageBackgroundColor;
-        }
    }
 }

@@ -561,6 +557,11 @@
    }
 }

+.touchmove-hack {
+    display: flex;
+    flex: 1;
+    overflow: auto;
+}

 /**
 * Make header close button more easily tappable on mobile.
--- a/css/_connection-info.scss
+++ b/css/_connection-info.scss
@@ -0,0 +1,56 @@
+%connection-info {
+    font-size: 12px;
+    font-weight: 400;
+
+    td {
+        padding: 2px 0;
+    }
+}
+
+.connection-info
+{
+    @extend %connection-info;
+
+    /**
+     * Apply negative margin to reduce the appearance of padding in AtlasKit
+     * InlineDialog.
+     */
+    margin: -15px;
+
+    > table {
+        white-space: nowrap;
+        @extend %connection-info;
+    }
+
+    td:nth-child(n-1) {
+        padding-left: 5px;
+    }
+
+    &__icon {
+        margin-right: 2px;
+    }
+
+    &__download
+    {
+        @extend .connection-info__icon;
+    }
+
+    &__status
+    {
+        font-weight: bold;
+    }
+
+    &__upload
+    {
+        @extend .connection-info__icon;
+    }
+
+    &__mobile {
+      margin: 15px;
+    }
+
+    .connection-actions {
+        margin: 10px auto;
+        text-align: center;
+    }
+}
--- a/css/_drawer.scss
+++ b/css/_drawer.scss
@@ -5,10 +5,6 @@
    bottom: 0;
    z-index: $drawerZ;
    border-radius: 16px 16px 0 0;
-
-    &.notification-portal {
-        z-index: $dropdownZ;
-    }
 }

 .drawer-portal::after {
@@ -24,9 +20,10 @@
 }

 .drawer-menu {
+    max-height: calc(80vh - 64px);
    background: #242528;
    border-radius: 16px 16px 0 0;
-    overflow-y: auto;
+    overflow-y: scroll;
    margin-bottom: env(safe-area-inset-bottom, 0);
    width: 100%;

@@ -42,6 +39,15 @@
        }
    }

+    .popupmenu {
+        margin: auto;
+        width: 100%;
+    }
+
+    .popupmenu__item {
+        height: 48px;
+    }
+
    &#{&} .overflow-menu {
        margin: auto;
        font-size: 1.2em;
--- a/css/_keyboard-shortcuts.scss
+++ b/css/_keyboard-shortcuts.scss
@@ -0,0 +1,10 @@
+.shortcuts-list {
+    list-style-type: none;
+    padding: 0;
+
+    &__item {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: em(7, 14);
+    }
+}
--- a/css/_labels.scss
+++ b/css/_labels.scss
@@ -0,0 +1,37 @@
+.label {
+    align-items: center;
+    background: #36383C;
+    border-radius: 3px;
+    color: #fff;
+    display: flex;
+    font-size: 12px;
+    font-weight: 600;
+    height: 28px;
+    margin: 0 0 4px 4px;
+    padding: 0 8px;
+
+    &--green {
+        background: #31B76A;
+    }
+
+    &--red {
+        background: #E34F56
+    }
+
+    &--white {
+        background: #fff;
+        color: #5e6d7a;
+
+        svg {
+            fill: #5e6d7a;
+        }
+    }
+}
+
+.label-text-with-icon {
+    margin-left: 8px;
+}
+
+.participants-count {
+    cursor: pointer;
+}
--- a/css/_mixins.scss
+++ b/css/_mixins.scss
@@ -195,15 +195,14 @@
 }

 /**
- * Change the direction of the current element to LTR, but do not change the direction
- * of its children; Keep them RTL.
+ * Avatar status badge mixin
 */
-@mixin ltr {
-    body[dir=rtl] & {
-        direction: ltr;
-
-        & > * {
-            direction: rtl;
-        }
-    }
+@mixin avatarBadge {
+    border-radius: 50%;
+    content: '';
+    display: block;
+    height: 35%;
+    position: absolute;
+    bottom: 0;
+    width: 35%;
 }
--- a/css/_notifications.scss
+++ b/css/_notifications.scss
@@ -1,23 +0,0 @@
-.notification-appear, .notification-enter {
-    opacity: 0;
-    position: relative;
-    left: -200px;
-    transition: all .2s !important; // !important needed to overwrite atlaskit default style
-
-    &-active {
-        opacity: 1;
-        left: 0;
-    }
-}
-
-.notification-exit {
-    opacity: 1;
-    position: relative;
-    left: 0;
-    transition: all .2s !important; // !important needed to overwrite atlaskit default style
-
-    &-active {
-        opacity: 0;
-        left: -200px;
-    }
-}
--- a/css/_participants-pane.scss
+++ b/css/_participants-pane.scss
@@ -6,6 +6,10 @@
    transition: width .16s ease-in-out;
    width: 315px;
    z-index: $zindex0;
+
+    &--closed {
+        width: 0;
+    }
 }

 .participants_pane-content {
@@ -21,6 +25,10 @@
    }
 }

+.participant-avatar {
+    margin: 8px 16px 8px 0;
+}
+
@media (max-width: 580px) {
    .participants_pane {
        height: 100vh;
@@ -30,6 +38,11 @@
        right: 0;
        top: 0;
        width: auto;
+
+        &--closed {
+            display: none;
+            width: auto;
+        }
    }

    .participants_pane-content {
@@ -43,9 +56,3 @@
        border-radius: 3px;
    }
 }
-
-.mobile-browser.shift-right {
-    .participants_pane {
-        z-index: -1;
-    }
-}
--- a/css/_polls.scss
+++ b/css/_polls.scss
@@ -1,7 +1,5 @@
 .poll-dialog {
-    font-size: 14px;
-    font-weight: 400;
-    line-height: 20px;
+    font-size: 1rem;

    h1, span, li, strong {
        color: #bce;
@@ -18,50 +16,20 @@
 }

 .poll-header {
-    margin-bottom: 8px;
+    padding: 8px 16px;
 }

-.poll-creator {
-    color: #C2C2C2;
-    font-weight: 600;
-    margin: 4px 0 16px 0;
-}
-
-.poll-answer-container {
+.poll-answer-container{
+    padding: 8px;
    background: #3D3D3D;
    border-radius: 3px;
    margin-bottom: 8px;
-
-    @media (max-width: 580px) {
-      &> span {
-        padding: 8px 0;
-      }
-
-      svg {
-        margin-top: 6px;
-      }
-    }
-}
-
-.poll-answer-option {
-   font-weight: 400;
-   display: block;
-   margin: 4px;
-
-   @media (max-width: 580px) {
-      font-size: 16px;
-      margin: 11px 8px
-   }
 }

 .poll-answer-field-list, .poll-answer-list, .poll-result-list {
    list-style-type: none;
-    padding: 0;
-    margin: 0;
-}
-
-.poll-answer-field-list {
    padding: 0 16px;
+    margin: 0;
 }

 ol.poll-result-list {
@@ -69,7 +37,7 @@ ol.poll-result-list {
 }

 .poll-result-list > li {
-    margin-bottom: 16px;
+    margin-bottom: 8px;
 }

 .poll-answer-field {
@@ -92,7 +60,7 @@ ol.poll-result-list {
 .poll-create-container .jsYMHu {
    background: #292929;
    border-color: #808090;
-    color: #fff // #808090
+    color: white // #808090
 }

 .poll-add-button {
@@ -104,7 +72,7 @@ ol.poll-result-list {
 .poll-remove-option-button {
    background: 0 0;
    border: none;
-    color: #E04757;
+    color: #8B8B8B;
    padding-left: 0;
 }

@@ -117,7 +85,7 @@ ol.poll-result-list {

 .poll-icon-button, .poll-drag-handle {
    .jitsi-icon svg {
-        fill: #929292;
+        fill: #bce;
    }
 }

@@ -126,7 +94,6 @@ ol.poll-result-list {
    border: none;
    cursor: grab;
    padding-left: 8;
-    padding-top: 8px;
    display: flex;
 }

@@ -138,12 +105,13 @@ ol.poll-result-list {
 }

 .poll-question {
-    font-size: 16px;
+    font-size: 1.2em;
    font-weight: 600;
-    line-height: 26px;
+    margin-bottom: 0.5em;
 }

 .poll-answer-voters {
+    font-size: 1em;
    font-weight: lighter;
    list-style-type: none;
    border: #616161 solid 1px;
@@ -223,36 +191,29 @@ ol.poll-result-list {
    display: flex;
    flex-direction: row;
    justify-content: space-between;
-
-    a.poll-detail-link, a.poll-change-vote-link {
-      color: #669AEC;
-      cursor: pointer;
-      font-weight: 600;
-      text-decoration: none;
-
-      &:hover {
-        color: #669AEC;
-      }
-
-      &:visited {
-        color: #669AEC;
-      }
-    }
 }

+a.poll-detail-link, a.poll-change-vote-link {
+    color: #246FE5;
+    cursor: pointer;
+    text-decoration: none;
+}

 .polls-pane-content {
-    height: 100%;
-    position: relative;
+    display: flex;
+    flex-direction: column;
+    font-weight: 600;
+    height: 85%;
+    align-items: stretch;
 }

 .pane-content{
    display: flex;
    flex-direction: column;
-    height: 100%;
    justify-content: center;
    align-items: center;
    width: 100%;
+    height: 100%;
 }

 .empty-pane-icon {
@@ -267,41 +228,36 @@ ol.poll-result-list {
 }

 .empty-pane-message {
-    color: #fff;
-    padding: 0 16px;
    text-align: center;
-
-}
-
-.poll-results, .poll-answer {
-    background: #292929;
-    border-radius: 8px;
-    border: 1px solid #666666;
-    margin: 16px;
-    padding: 16px;
-    word-break: break-word;
 }

 .poll-results {
-    color: #fff;
+    color: white;
 }

 .poll-answer {
-
    h1, strong ,span {
-        color: #fff;
+        color: white;
    }
 }

+.poll-results, .poll-answer {
+    margin-bottom: 16px;
+    background: #292929;
+    border-radius: 8px;
+    padding: 12px 8px;
+    border-width: thin;
+    border-style: solid;
+    border-color: #616161;
+}
+
 .poll-create-label {
-    color: #C2C2C2;
-    display: flex;
-    font-weight: 400;
+    color: white;
    margin-bottom: 4;
+    display: flex;
 }

 .expandable-input{
-    line-height: 18px;
    resize: none;
    width: 100%;
    height: 40px;
@@ -314,31 +270,24 @@ ol.poll-result-list {
    padding: 10px 16px;
 }

-#polls-panel {
-    height: calc(100% - 102px);
-}
-
 .poll-container {
-    font-size: 14px;
-    font-weight: 600;
-    height: calc(100% - 88px);
-    line-height: 20px;
+    box-sizing: border-box;
+    flex: 1;
    overflow-y: auto;
    position: relative;
+    padding: 16px;

    & > * + *:not(.ignore-child) {
        margin-top: 16px;
    }

-    @media (max-width: 580px) {
-        height: calc(100% - 102px);
+    &::-webkit-scrollbar {
+        display: none;
    }
 }

 .poll-create-header {
-    color: #fff;
    font-size: 20px;
-    line-height: 28px;
    margin: 20px 16px;
    font-weight: 600;
 }
@@ -347,45 +296,28 @@ ol.poll-result-list {
    padding: 8px 0;
 }

-.poll-create-footer {
-    background-color: #141414;
-    bottom: 0;
-    position: absolute;
-    width: calc(100% - 32px);
-}
-
 .poll-footer {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 16px 16px 16px;
+    display: flex;
+    justify-content: flex-end;
+    padding: 8px 16px;
+    height: 40px;
+    align-items: stretch;
+
+    & > *:not(:last-child) {
+        margin-right: 16px;
+    }
 }

-.poll-answer-footer {
-  padding: 8px 0 0 0;
-}
-
-.poll-button {
-   align-items: center;
-   border: 0;
-   border-radius: 6px;
-   font-size: 14px;
-   font-weight: 600;
-   display: flex;
-   justify-content: center;
-   min-height: 40px;
-   width: 100%;
-
-   &:disabled {
-     cursor: initial;
-   }
-
-   @media (max-width: 580px) {
-     min-height: 48px;
-   }
-}
-
-.poll-button-primary {
+.poll-primary-button {
+    align-items: center;
    background-color: #0056E0;
+    border: 0;
+    border-radius: 6px;
+    display: flex;
+    font-weight: unset;
+    justify-content: center;
+    font-size: 15px;
+    flex: 1;

    &:hover {
        background-color: #246FE5;
@@ -404,10 +336,23 @@ ol.poll-result-list {
        background-color: #00225A;
        color: #858585;
    }
+
+    & > *:not(:last-child) {
+        margin-right: 8px;
+    }
 }

-.poll-button-secondary {
+.poll-secondary-button {
+    align-items: center;
    background-color: #3D3D3D;
+    border: 0;
+    border-radius: 6px;
+    display: flex;
+    font-weight: unset;
+    justify-content: center;
+    font-size: 15px;
+    height: 40px;
+    width: 100%;

    &:hover {
        background-color: #525252;
@@ -426,19 +371,78 @@ ol.poll-result-list {
        background-color: #141414;
        color: #858585;
    }
+
+    & > *:not(:last-child) {
+        margin-right: 8px;
+    }
 }

-.poll-button-short {
-  max-width: 132px;
+.poll-small-primary-button {
+    align-items: center;
+    background-color: #0056E0;
+    border: 0;
+    border-radius: 6px;
+    display: flex;
+    font-weight: unset;
+    justify-content: center;
+    font-size: 15px;
+    height: 40px;
+    width: 50%;
+
+    &:hover {
+        background-color: #246FE5;
+    }
+
+    &:active {
+        background-color: #0045B3;
+    }
+
+    &:focus {
+        background-color: #0045B3;
+        border: 3px solid #99BBF3;
+    }
+
+    &:disabled {
+        background-color: #00225A;
+        color: #858585;
+    }
+
+    & > *:not(:last-child) {
+        margin-right: 8px;
+    }
 }

-.poll-button-shortest {
-  max-width: 117px;
-}
+.poll-small-secondary-button {
+    align-items: center;
+    background-color: #3D3D3D;
+    border: 0;
+    border-radius: 6px;
+    display: flex;
+    font-weight: unset;
+    justify-content: center;
+    font-size: 15px;
+    height: 40px;
+    width: 50%;

-.poll-button-short,
-.poll-button-shortest {
-   @media (max-width: 580px) {
-     min-width: 49%;
-   }
+    &:hover {
+        background-color: #525252;
+    }
+
+    &:active {
+        background-color: #292929;
+    }
+
+    &:focus {
+        background-color: #292929;
+        border: 3px solid #858585;
+    }
+
+    &:disabled {
+        background-color: #141414;
+        color: #858585;
+    }
+
+    & > *:not(:last-child) {
+        margin-right: 8px;
+    }
 }
--- a/css/_popover.scss
+++ b/css/_popover.scss
@@ -3,45 +3,49 @@
 * to allow mouse movement from the popover trigger to the popover itself
 * without triggering a mouseleave event.
 */
+.popover-mousemove-padding-bottom {
+    bottom: -15px;
+    height: 20px;
+    position: absolute;
+    right: 0;
+    width: 100%;
+}
+
 %vertical-popover-padding {
    height: 100%;
    position: absolute;
    top: 0;
-    width: 20px;
-    padding: 20px 0;
-    top: -20px;
-}
-
-%horizontal-popover-padding {
-    height: 25px;
-    position: absolute;
-    right: 0;
-    width: 100%;
-    padding: 0 35px;
-    left: -35px;
+    width: 40px;
 }

 .popover-mousemove-padding-left {
    @extend %vertical-popover-padding;
-    left: -35px;
+    left: -20px;
 }

 .popover-mousemove-padding-right {
    @extend %vertical-popover-padding;
-    right: -35px;
+    right: -20px;
 }

-.popover-mousemove-padding-bottom {
-    @extend %horizontal-popover-padding;
-    bottom: -40px;
-}
-
-.popover-mousemove-padding-top {
-    @extend %horizontal-popover-padding;
-    top: -40px;
+/**
+ * An invisible element is added to the top of the popover to ensure the mouse
+ * stays over the popover when the popover's height is shrunk, which would then
+ * normally leave the mouse outside of the popover itself and cause a mouseleave
+ * event.
+ */
+.popover-mouse-padding-top {
+    height: 30px;
+    position: absolute;
+    right: 0;
+    top: -25px;
+    width: 100%;
 }

 .popover {
+    background-color: $popoverBg;
+    border-radius: 3px;
    margin: -16px -24px;
+    padding: 16px 24px;
    z-index: $popoverZ;
 }
--- a/css/_popup_menu.scss
+++ b/css/_popup_menu.scss
@@ -2,18 +2,116 @@
 * Initialize
 **/

-.popupmenu__contents {
-    .popupmenu__volume-slider {
-            &::-webkit-slider-runnable-track {
-                background-color: $popupSliderColor;
-            }
+.popupmenu {
+    background-color: $menuBG;
+    border-radius: 3px;
+    min-width: 150px;
+    text-align: left;
+    padding: 0px;
+    white-space: nowrap;

-            &::-moz-range-track {
-                background-color: $popupSliderColor;
-            }
+    &__item {
+        list-style-type: none;
+        height: 35px;
+    }

-            &::-ms-fill-lower {
-                background-color: $popupSliderColor;
+    // Link Appearance
+    &__link,
+    &__contents {
+        display: block;
+        box-sizing: border-box;
+        text-decoration: none;
+        height: 100%;
+        font-size: 9pt;
+        width: 100%;
+        cursor: pointer;
+        padding: 0 5px;
+        color: $popupMenuColor;
+
+        &:hover {
+            background-color: $popupMenuHoverBackground;
+            color: $popupMenuHoverColor;
+        }
+
+        &.disabled {
+            pointer-events: none;
+        }
+    }
+
+    &__text {
+        display: inline-block;
+        margin-left: 8px;
+        vertical-align: middle;
+    }
+
+    &__link {
+        i {
+            cursor: pointer;
+        }
+    }
+
+    &__contents {
+        display: flex;
+
+        /**
+         * Positioning styles on the slider and its container are used to make
+         * the container fit the popup width, by removing the slider from the
+         * page flow, and then making the slider fit the container.
+         */
+        .popupmenu__slider_container {
+            position: relative;
+            width: 100%;
+
+            .popupmenu__slider {
+                position: absolute;
+                top: 50%;
+                transform: translate(0, -50%);
+                width: 100%;
+
+                &::-webkit-slider-runnable-track {
+                    background-color: $popupSliderColor;
+                }
+
+                &::-moz-range-track {
+                    background-color: $popupSliderColor;
+                }
+
+                &::-ms-fill-lower {
+                    background-color: $popupSliderColor;
+                }
            }
        }
+    }
+
+    &__icon {
+        vertical-align: middle;
+        position: relative;
+        display: inline-block;
+        min-width: 20px;
+        height: 100%;
+        padding-right: 10px;
+
+        > * {
+            @include absoluteAligning();
+        }
+    }
+
+    .icon-kick,
+    .icon-play,
+    .icon-stop {
+        font-size: 8pt;
+    }
+}
+
+/**
+ * Override reset css styling modifying all lists and set negative margin to
+ * reduce the visibility of padding on AtlasKit
+ * InlineDialogs.
+ */
+ul.popupmenu {
+    margin: -16px -24px;
+}
+
+span.localvideomenu:hover ul.popupmenu, span.remotevideomenu:hover ul.popupmenu, ul.popupmenu:hover {
+    display:block !important;
 }
--- a/css/_reactions-menu.scss
+++ b/css/_reactions-menu.scss
@@ -7,20 +7,13 @@
 	border-radius: 3px;
 	padding: 16px;

-	&.with-gif {
-		width: 328px;
-
-		.reactions-row .toolbox-button:last-of-type {
-			top: 3px;
-
-			& .toolbox-icon.toggled {
-				background-color: #000000;
-			}
-		}
-	}
-
 	&.overflow {
-		width: 100%;
+		width: auto;
+		padding-bottom: max(env(safe-area-inset-bottom, 0), 16px);
+		background-color: #141414;
+		box-shadow: none;
+		border-radius: 0;
+		position: relative;

 		.toolbox-icon {
 			width: 48px;
@@ -40,10 +33,6 @@
 			.toolbox-button {
 				margin-right: 0;
 			}
-
-			.toolbox-button:last-of-type {
-				top: 0;
-			}
 		}
 	}

@@ -73,7 +62,6 @@
 		.toolbox-button {
 			margin-right: 8px;
 			touch-action: manipulation;
-			position: relative;
 		}

 		.toolbox-button:last-of-type {
@@ -104,10 +92,6 @@
 	}
 }

-.reactions-menu-container {
-	padding-bottom: 6px;
-}
-
 .reactions-animations-container {
 	position: absolute;
 	width: 20%;
@@ -116,7 +100,8 @@
 	height: 0;
 }

-.reactions-menu-popup-container {
+.reactions-menu-popup-container,
+.reactions-menu-popup {
 	display: inline-block;
 	position: relative;
 }
--- a/css/_recording.scss
+++ b/css/_recording.scss
@@ -7,29 +7,22 @@
    flex-direction: column;

    .recording-header {
-        align-items: center;
        display: flex;
        flex: 0;
        flex-direction: row;
        justify-content: space-between;
+        padding-top: 32px;

        .recording-title {
            display: inline-flex;
            align-items: center;
-            font-size: 14px;
+            font-size: 16px;
            margin-left: 16px;
        }
    }

    .recording-header-line {
        border-top: 1px solid #5e6d7a;
-        padding-top: 16px;
-        margin-top: 16px;
-    }
-
-    .local-recording-warning {
-        margin-top: 4px;
-        display: block;
    }

    .recording-switch-disabled {
@@ -41,79 +34,10 @@
        align-items: center;
    }

-    .file-sharing-icon-container {
-        background-color: #525252;
-        border-radius: 4px;
-        height: 40px;
-        justify-content: center;
-        width: 56px;
-    }
-
-    .cloud-content-recording-icon-container {
-        background-color: #FFFFFF;
-        border-radius: 4px;
-        height: 40px;
-        justify-content: center;
-        width: 40px;
-    }
-
-    .jitsi-recording-header {
-        margin-bottom: 32px;
-    }
-
-    .jitsi-content-recording-icon-container-with-switch {
-        background-color: #FFFFFF;
-        border-radius: 4px;
-        height: 40px;
-        width: 56px;
-    }
-
-    .jitsi-content-recording-icon-container-without-switch {
-        background-color: #FFFFFF;
-        border-radius: 4px;
-        height: 40px;
-        width: 46px;
-    }
-
    .recording-icon {
-        height: 40px;
+        width: 32px;
+        height: 32px;
        object-fit: contain;
-        width: 40px;
-    }
-
-    .content-recording-icon {
-        height: 18px;
-        margin: 10px 0 0 10px;
-        object-fit: contain;
-        width: 18px;
-    }
-
-    .recording-file-sharing-icon {
-        height: 18px;
-        object-fit: contain;
-        width: 18px;
-    }
-
-    .recording-info{
-        background-color: #FFD740;
-        color: black;
-        display: inline-flex;
-        margin: 32px 0;
-        width: 100%;
-    }
-
-    .recording-info-icon {
-        align-self: center;
-        height: 14px;
-        margin: 0 24px 0 16px;
-        object-fit: contain;
-        width: 14px;
-    }
-
-    .recording-info-title {
-        display: inline-flex;
-        font-size: 14px;
-        width: 290px
    }

    .recording-switch {
--- a/css/_settings-button.scss
+++ b/css/_settings-button.scss
@@ -60,15 +60,3 @@
        }
    }
 }
-
-.settings-button-small-icon-container {
-    position: absolute;
-    right: -4px;
-    top: -3px;
-
-    & .settings-button-small-icon {
-        position: relative;
-        top: 0;
-        right: 0;
-    }
-}
--- a/css/_subject.scss
+++ b/css/_subject.scss
@@ -1,25 +1,11 @@
 .subject {
    color: #fff;
-    transition: opacity .6s ease-in-out;
-    z-index: $toolbarZ + 2;
-    margin-top: 20px;
-    opacity: 0;
+    margin-top: -120px;
+    transition: margin-top .3s ease-in;
+    z-index: $zindex3;

    &.visible {
-        opacity: 1;
-    }
-
-    &#autoHide.with-always-on {
-        overflow: hidden;
-        animation: hideSubject forwards .6s ease-out;
-
-        & > .subject-info-container {
-            justify-content: flex-start;
-        }
-
-        &.visible {
-            animation: showSubject forwards .6s ease-out;
-        }
+        margin-top: 20px;
    }
 }

@@ -50,7 +36,10 @@
    line-height: 28px;
    padding: 0 16px;
    height: 28px;
-    max-width: 324px;
+
+    @media (max-width: 700px) {
+        max-width: 100px;
+    }

    @media (max-width: 300px) {
        display: none;
@@ -85,25 +74,4 @@
    position: absolute;
    top: 0;
    height: 48px;
-    max-width: calc(100% - 24px);
-}
-
-@keyframes hideSubject {
-    0% {
-        max-width: 100%;
-    }
-
-    100% {
-        max-width: 0;
-    }
-}
-
-@keyframes showSubject {
-    0% {
-        max-width: 0%;
-    }
-
-    100% {
-        max-width: 100%;
-    }
 }
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -29,8 +29,7 @@
    right: 0;
    transition: bottom .3s ease-in;
    width: 100%;
-    pointer-events: none;
-    z-index: $toolbarZ + 2;
+

    &.visible {
        bottom: 0;
@@ -39,6 +38,13 @@
    &.no-buttons {
        display: none;
    }
+
+    @media (min-width: 581px) {
+        &.shift-right {
+            margin-left: $sidebarWidth;
+            width: calc(100% - #{$sidebarWidth});
+        }
+    }
 }

 .toolbox-content {
@@ -70,6 +76,14 @@
    }
 }

+.toolbox-button {
+    color: $toolbarButtonColor;
+    cursor: pointer;
+    display: inline-block;
+    line-height: $newToolbarSize;
+    text-align: center;
+}
+
 .toolbar-button-with-badge {
    display: inline-block;
    position: relative;
@@ -92,10 +106,6 @@
    max-width: 100%;
    pointer-events: all;
    border-radius: 6px;
-
-    .toolbox-content-items {
-        @include ltr;
-    }
 }

 .toolbox-content-wrapper::after {
@@ -104,6 +114,86 @@
    padding-bottom: env(safe-area-inset-bottom, 0);
 }

+.toolbox-content-items {
+    background: $newToolbarBackgroundColor;
+    border-radius: 6px;
+    margin: 0 auto;
+    padding: 6px;
+    text-align: center;
+    pointer-events: all;
+    box-shadow: 0px 2px 8px 4px rgba(0, 0, 0, 0.25), 0px 0px 0px 1px rgba(0, 0, 0, 0.15);
+
+    >div {
+        margin-left: 8px;
+
+        &:first-child {
+            margin-left: 0;
+        }
+    }
+}
+
+.overflow-menu {
+    font-size: 14px;
+    list-style-type: none;
+    padding: 8px 0;
+    background-color: $menuBG;
+
+    .profile-text {
+        max-width: 150px;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+}
+
+.overflow-menu-item {
+    align-items: center;
+    color: $overflowMenuItemColor;
+    cursor: pointer;
+    display: flex;
+    font-size: 14px;
+    font-weight: 400;
+    height: 40px;
+    line-height: 24px;
+    padding: 8px 16px;
+    box-sizing: border-box;
+
+    @media (hover: hover) and (pointer: fine) {
+        &:hover {
+            background: $overflowMenuItemBackground;
+        }
+    }
+
+    div {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+    }
+
+    &.unclickable {
+        cursor: default;
+    }
+    &.disabled {
+        cursor: initial;
+        color: #929292;
+
+        &:hover {
+            background: none;
+        }
+
+        svg {
+            fill: #929292;
+        }
+
+    }
+
+    @media (hover: hover) and (pointer: fine) {
+        &.unclickable:hover {
+            background: inherit;
+        }
+    }
+}
+
 .beta-tag {
    background: #36383C;
    border-radius: 3px;
@@ -114,12 +204,73 @@
    text-transform: uppercase;
 }

+.overflow-menu-item-icon {
+    margin-right: 16px;
+
+    i {
+        display: inline;
+        font-size: 24px;
+    }
+
+    @media (hover: hover) and (pointer: fine) {
+        i:hover {
+            background-color: initial;
+        }
+    }
+
+    img {
+        max-width: 24px;
+        max-height: 24px;
+    }
+
+    svg {
+        fill: #fff;
+        height: 20px;
+        width: 20px;
+    }
+}
+
+
 .overflow-menu-hr {
    border-top: 1px solid #4C4D50;
    border-bottom: 0;
    margin: 8px 0;
 }

+.toolbox-icon {
+    display: flex;
+    border-radius: 3px;
+    flex-direction: column;
+    font-size: 24px;
+    height: $newToolbarSize;
+    justify-content: center;
+    width: $newToolbarSize;
+
+    @media (hover: hover) and (pointer: fine) {
+        &:hover {
+            background: $newToolbarButtonHoverColor;
+        }
+    }
+
+    @media (max-width: 320px) {
+        height: 36px;
+        width: 36px;
+    }
+
+    &.toggled {
+        background: $newToolbarButtonToggleColor;
+    }
+
+    &.disabled {
+        cursor: initial !important;
+        background-color: #36383c !important;
+
+        svg {
+            fill: #929292 !important;
+        }
+    }
+}
+
 .hangup-button {
    background-color: $hangupColor;

@@ -180,7 +331,6 @@
        }

        .toolbox-content-items {
-            @include ltr;
            border-radius: 0;
            display: flex;
            justify-content: space-evenly;
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -13,6 +13,9 @@ $hangupFontSize: 2em;
 */

 // Video layout.
+$thumbnailToolbarHeight: 22px;
+$thumbnailIndicatorBorder: 2px;
+$thumbnailIndicatorSize: $thumbnailToolbarHeight;
 $thumbnailVideoMargin: 2px;
 $thumbnailsBorder: 2px;
 $thumbnailVideoBorder: 2px;
@@ -28,6 +31,10 @@ $defaultSemiDarkColor: #ACACAC;
 $defaultDarkColor: #2b3d5c;
 $defaultWarningColor: rgb(215, 121, 118);
 $participantsPaneBgColor: #141414;
+$presence-available: rgb(110, 176, 5);
+$presence-away: rgb(250, 201, 20);
+$presence-busy: rgb(233, 0, 27);
+$presence-idle: rgb(172, 172, 172);

 /**
 * Toolbar
@@ -49,12 +56,19 @@ $overflowMenuItemBackground: #36383C;
 /**
 * Video layout
 */
+$videoThumbnailHovered: rgba(22, 94, 204, .4);
+$videoThumbnailSelected: #165ECC;
 $participantNameColor: #fff;
+$thumbnailPictogramColor: #fff;
+$dominantSpeakerBg: #165ecc;
+$raiseHandBg: #D6D61E;
 $audioLevelBg: #44A5FF;
+$connectionIndicatorBg: #165ecc;
 $audioLevelShadow: rgba(9, 36, 77, 0.9);
 $videoStateIndicatorColor: $defaultColor;
 $videoStateIndicatorBackground: $toolbarBackground;
 $videoStateIndicatorSize: 40px;
+$remoteVideoMenuIconMargin: initial;

 /**
 * Feedback Modal
@@ -79,8 +93,6 @@ $modalTextColor: #333;
 $chatActionsSeparatorColor: rgb(173, 105, 112);
 $chatBackgroundColor: #131519;
 $chatInputSeparatorColor: #A4B8D1;
-$chatLobbyMessageBackgroundColor: #6A50D3;
-$chatLobbyActionsSeparatorColor: #6A50D3;
 $chatLocalMessageBackgroundColor: #484A4F;
 $chatPrivateMessageBackgroundColor: rgb(153, 69, 77);
 $chatRemoteMessageBackgroundColor:  #242528;
@@ -90,6 +102,7 @@ $sidebarWidth: 315px;
 * Misc.
 */
 $borderRadius: 4px;
+$popoverMenuPadding: 13px;
 $happySoftwareBackground: transparent;
 $desktopAppDragBarHeight: 25px;
 $scrollHeight: 7px;
@@ -105,10 +118,11 @@ $toolbarBackgroundZ: 4;
 $labelsZ: 5;
 $subtitlesZ: 7;
 $popoverZ: 8;
+$zindex10: 10;
 $reloadZ: 20;
 $poweredByZ: 100;
 $ringingZ: 300;
-$sideToolbarContainerZ: 300;
+$sideToolbarContainerZ: 200;
 $toolbarZ: 250;
 $drawerZ: 351;
 $tooltipsZ: 401;
@@ -255,4 +269,4 @@ $verySmallScreen: 500px;
 * Prejoin / premeeting screen
 */

-$prejoinDefaultContentWidth: 336px;
+$prejoinDefaultContentWidth: 336px;
--- a/css/_video-preview.scss
+++ b/css/_video-preview.scss
@@ -1,9 +1,9 @@
 .video-preview {
    background: none;
    display: inline-block;
+    max-height: 344px;

    &-container {
-        max-height: 344px;
        background: $menuBG;
        border-radius: 3px;
        overflow: auto;
--- a/css/_videolayout_default.scss
+++ b/css/_videolayout_default.scss
@@ -6,7 +6,6 @@
 }

 #layout_wrapper {
-    @include ltr;
    display: flex;
    height: 100%;
 }
@@ -44,7 +43,161 @@
 .videocontainer {
    position: relative;
    text-align: center;
-    overflow: 'hidden';
+
+    &__background {
+        @include topLeft();
+        background-color: black;
+        border-radius: $borderRadius;
+        width: 100%;
+        height: 100%;
+    }
+
+    /**
+     * The toolbar of the video thumbnail.
+     */
+    &__toolbar,
+    &__toptoolbar {
+        position: absolute;
+        left: 0;
+        pointer-events: none;
+        z-index: $zindex10;
+        width: 100%;
+        box-sizing: border-box; // Includes the padding in the 100% width.
+
+        /**
+         * FIXME (lenny): Disabling pointer-events is a pretty big sin that
+         * sidesteps the problems. There are z-index wars occurring within
+         * videocontainer and AtlasKit Tooltips rely on their parent z-indexe
+         * being higher than whatever they need to appear over. So set a higher
+         * z-index for the tooltip containers but make any empty space not block
+         * mouse overs for various mouseover triggers.
+         */
+        pointer-events: none;
+
+        * {
+            pointer-events: auto;
+        }
+
+        .indicator-container {
+            display: inline-block;
+            float: left;
+            pointer-events: all;
+        }
+    }
+
+    &__toolbar {
+        bottom: 0;
+        height: $thumbnailToolbarHeight;
+        padding: 0 5px 0 5px;
+    }
+
+    &__toptoolbar {
+        $toolbarIconMargin: 5px;
+        top: 0;
+        padding-bottom: 0;
+        /**
+         * Override text-align center as icons need to be left justified.
+         */
+        text-align: left;
+
+        /**
+         * Intentionally use margin on the icon itself as AtlasKit InlineDialog
+         * positioning depends on the trigger (indicator icon).
+         */
+        .indicator {
+            margin-left: 5px;
+            margin-top: $toolbarIconMargin;
+        }
+
+        .indicator-container:nth-child(1) .indicator {
+            margin-left: $toolbarIconMargin;
+        }
+
+        .indicator-container {
+            display: inline-block;
+            vertical-align: top;
+
+            .popover-trigger {
+                display: inline-block;
+            }
+        }
+
+        .connection-indicator,
+        .indicator {
+            position: relative;
+            font-size: 8px;
+            text-align: center;
+            line-height: $thumbnailIndicatorSize;
+            padding: 0;
+            @include circle($thumbnailIndicatorSize);
+            box-sizing: border-box;
+            z-index: $zindex3;
+            background: $dominantSpeakerBg;
+            color: $thumbnailPictogramColor;
+            border: $thumbnailIndicatorBorder solid $thumbnailPictogramColor;
+
+            .indicatoricon {
+                @include absoluteAligning();
+            }
+
+            .connection {
+                position: relative;
+                display: inline-block;
+                margin: 0 auto;
+                left: 0;
+                @include transform(translate(0, -50%));
+
+                &_empty,
+                &_lost
+                {
+                    color: #8B8B8B;/*#FFFFFF*/
+                    overflow: hidden;
+                }
+
+                &_full
+                {
+                    @include topLeft();
+                    color: #FFFFFF;/*#15A1ED*/
+                    overflow: hidden;
+                }
+
+                &_ninja
+                {
+                    font-size: 1.5em;
+                }
+            }
+
+            .icon-gsm-bars {
+                cursor: pointer;
+                font-size: 1em;
+            }
+        }
+
+        .hide-connection-indicator {
+            display: none;
+        }
+    }
+
+    &__hoverOverlay {
+        background: rgba(0,0,0,.6);
+        border-radius: $borderRadius;
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        height: 100%;
+        visibility: hidden;
+        z-index: $zindex2;
+    }
+
+    @media (min-width: 581px) {
+        &.shift-right {
+            &#largeVideoContainer {
+                margin-left: $sidebarWidth;
+                width: calc(100% - #{$sidebarWidth});
+            }
+        }
+    }
 }

 #localVideoWrapper {
@@ -70,10 +223,6 @@
 #largeVideoContainer {
    overflow: hidden;
    text-align: center;
-
-    &.transition {
-        transition: width 1s, height 1s, top 1s;
-    }
 }

 #largeVideoContainer {
@@ -126,6 +275,29 @@
    z-index: $zindex0;
 }

+/**
+ * Positions video thumbnail display name and editor.
+ */
+#alwaysOnTop .displayname,
+.videocontainer .displayname,
+.videocontainer .editdisplayname {
+    display: inline-block;
+    position: absolute;
+    left: 10%;
+    width: 80%;
+    top: 50%;
+    @include transform(translateY(-40%));
+    color: $participantNameColor;
+    text-align: center;
+    text-overflow: ellipsis;
+    font-size: 12px;
+    font-weight: 100;
+    overflow: hidden;
+    white-space: nowrap;
+    line-height: $thumbnailToolbarHeight;
+    z-index: $zindex2;
+}
+
 #alwaysOnTop .displayname {
    font-size: 15px;
    position: inherit;
@@ -135,6 +307,141 @@
    margin-top: 10px;
 }

+/**
+ * Positions video thumbnail display name editor.
+ */
+.videocontainer .editdisplayname {
+    outline: none;
+    border: none;
+    background: none;
+    box-shadow: none;
+    padding: 0;
+}
+
+#localVideoContainer .displayname:hover {
+    cursor: text;
+}
+
+.videocontainer .displayname {
+    pointer-events: none;
+    padding: 0 3px 0 3px;
+}
+
+.videocontainer .editdisplayname {
+    height: auto;
+}
+
+#localDisplayName {
+    pointer-events: auto !important;
+}
+
+.videocontainer>a.displayname {
+    display: inline-block;
+    position: absolute;
+    color: #FFFFFF;
+    bottom: 0;
+    right: 0;
+    padding: 3px 5px;
+    font-size: 9pt;
+    cursor: pointer;
+    z-index: $zindex2;
+}
+
+/**
+ * Video thumbnail toolbar icon.
+ */
+.videocontainer .toolbar-icon {
+    font-size: 8pt;
+    text-align: center;
+    text-shadow: 0px 1px 0px rgba(255,255,255,.3), 0px -1px 0px rgba(0,0,0,.7);
+    color: #FFFFFF;
+    width: 12px;
+    line-height: $thumbnailToolbarHeight;
+    height: $thumbnailToolbarHeight;
+    padding: 0;
+    border: 0;
+    margin: 0px 5px 0px 0px;
+}
+
+/**
+ * Toolbar icon internal i elements (font icons).
+ */
+.toolbar-icon>div {
+    height: $thumbnailToolbarHeight;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+/**
+ * Toolbar icons positioned on the right.
+ */
+.moderator-icon {
+    display: inline-block;
+
+    &.right {
+        float: right;
+        margin: 0px 0px 0px 5px;
+    }
+
+    .toolbar-icon {
+        margin: 0;
+    }
+}
+
+.raisehandindicator {
+  background: $raiseHandBg;
+}
+
+.connection-indicator {
+    background: $connectionIndicatorBg;
+
+    &.status-high {
+        background: green;
+    }
+
+    &.status-med {
+        background: #FFD740;
+    }
+
+    &.status-lost {
+        background: gray;
+    }
+
+    &.status-low {
+        background: #BF2117;
+    }
+
+    &.status-other {
+        background: $connectionIndicatorBg;
+    }
+}
+
+.local-video-menu-trigger,
+.remote-video-menu-trigger,
+.localvideomenu,
+.remotevideomenu
+{
+    display: inline-block;
+    position: absolute;
+    top: 0px;
+    right: 0;
+    z-index: $zindex2;
+    width: 18px;
+    height: 18px;
+    color: #FFF;
+    font-size: 10pt;
+    margin-right: $remoteVideoMenuIconMargin;
+
+    >i{
+        cursor: hand;
+    }
+}
+.local-video-menu-trigger,
+.remote-video-menu-trigger {
+    margin-top: 7px;
+}
+
 /**
 * Audio indicator on video thumbnails.
 */
@@ -311,11 +618,74 @@
    display: none;
 }

+.display-avatar-with-name {
+    .avatar-container {
+        visibility: visible;
+    }
+
+    .displayNameContainer {
+        visibility: visible;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: visible;
+    }
+
+    video {
+        visibility: hidden;
+    }
+}
+
+.display-name-on-black {
+    .avatar-container {
+        visibility: hidden;
+    }
+
+    .displayNameContainer {
+        visibility: visible;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: hidden;
+    }
+
+    video {
+        opacity: 0.2;
+        visibility: visible;
+    }
+}
+
 .display-video {
    .avatar-container {
        visibility: hidden;
    }

+    .displayNameContainer {
+        visibility: hidden;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: hidden;
+    }
+
+    video {
+        visibility: visible;
+    }
+}
+
+.display-name-on-video {
+    .avatar-container {
+        visibility: hidden;
+    }
+
+    .displayNameContainer {
+        visibility: visible;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: visible;
+    }
+
    video {
        visibility: visible;
    }
@@ -326,6 +696,14 @@
        visibility: visible;
    }

+    .displayNameContainer {
+        visibility: hidden;
+    }
+
+    .videocontainer__hoverOverlay {
+        visibility: hidden;
+    }
+
    video {
        visibility: hidden;
    }
--- a/css/aui-components/dropdown.scss
+++ b/css/aui-components/dropdown.scss
@@ -0,0 +1,68 @@
+.select2-container.aui-select2-container {
+    background-color: transparent !important;
+    margin-top: 2px;
+
+    a.select2-choice {
+        height: 28px !important;
+        line-height: 18px !important;
+        width: 100% !important;
+        background-color: $selectBg !important;
+        border-color: $selectBg !important;
+        color: $selectFontColor !important;
+        text-shadow: none !important;
+        font-size: 12px !important;
+        margin: 0 auto !important;
+
+        &:after {
+            border-top-color: $selectFontColor;
+        }
+    }
+
+    &.select2-dropdown-open{
+        a.select2-choice {
+            background-color: $selectActiveBg !important;
+            border-color: $selectActiveBg !important;
+        }
+    }
+}
+
+.select2-drop.aui-select2-drop.aui-style-default {
+    z-index: $dropdownZ;
+    background-color: $selectActiveBg;
+    border-color: $selectActiveBg;
+
+    .select2-results{
+        background-color: $selectActiveBg;
+        border-color: $selectActiveBg;
+
+        &::-webkit-scrollbar {
+            background-color: transparent;
+        }
+        &::-webkit-scrollbar-track {
+            background-color: transparent;
+        }
+        &::-webkit-scrollbar-track-piece {
+            background-color: transparent;
+        }
+        &::-webkit-scrollbar-thumb {
+            background-color: $selectActiveItemBg;
+        }
+
+        .select2-result{
+            &.select2-highlighted{
+                background-color: $selectActiveItemBg;
+            }
+
+            .select2-result-label{
+                font-size: 12px;
+                color: $selectFontColor !important;
+                line-height: 20px;
+            }
+        }
+
+    }
+}
+
+.select2-drop-mask {
+    z-index: $dropdownMaskZ;
+}
--- a/css/buttons/copy.scss
+++ b/css/buttons/copy.scss
@@ -0,0 +1,38 @@
+.copy-button {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 8px 8px 8px 16px;
+    margin-top: 5px;
+    width: calc(100% - 24px);
+    height: 24px;
+
+    background: #0376DA;
+    border-radius: 4px;
+    cursor: pointer;
+
+    &:hover {
+        background: #278ADF;
+        font-weight: 600;
+    }
+
+    &-content {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width: 292px;
+        margin-right: 16px;
+
+        &.selected {
+            font-weight: 600;
+        }
+    }
+
+    &.clicked {
+        background: #31B76A;
+    }
+
+    & > div > svg > path {
+        fill: #fff;
+    }
+}
--- a/css/filmstrip/_filmstrip_toolbar.scss
+++ b/css/filmstrip/_filmstrip_toolbar.scss
@@ -0,0 +1,30 @@
+.filmstrip__toolbar {
+    @include flex();
+    flex-direction: column-reverse;
+    flex-wrap: nowrap;
+    position: relative;
+    width: $filmstripToggleButtonWidth;
+
+    button {
+        font-size: 14px;
+        line-height: 1.2;
+        text-align: center;
+        background: transparent;
+        opacity: 0.7;
+        height: auto;
+        width: 100%;
+        padding: 0;
+        margin: 0;
+        border: none;
+
+        -webkit-appearance: none;
+
+        &:hover {
+            opacity: 1;
+        }
+
+        i {
+            cursor: pointer;
+        }
+    }
+}
--- a/css/filmstrip/_horizontal_filmstrip.scss
+++ b/css/filmstrip/_horizontal_filmstrip.scss
@@ -6,8 +6,11 @@
 }

 .horizontal-filmstrip .filmstrip {
+    bottom: 0;
+    right: 0;
    padding: 10px 5px;
    @extend %align-right;
+    transition: bottom .3s;
    z-index: $filmstripVideosZ;
    box-sizing: border-box;
    width: 100%;
@@ -48,21 +51,18 @@
        /**
         * The local video identifier.
         */
-        &#filmstripLocalVideo,
-        &#filmstripLocalScreenShare {
+        &#filmstripLocalVideo {
            align-self: flex-end;
            display: block;
            margin-bottom: 8px;
        }

        &.hidden {
-            bottom: calc(-196px - #{$newToolbarSizeWithPadding} + 50px);
+            bottom: calc(-196px - #{$newToolbarSizeWithPadding});
        }
    }

    .remote-videos {
-        overscroll-behavior: contain;
-
        & > div {
            transition: opacity 1s;
            position: absolute;
--- a/css/filmstrip/_small_video.scss
+++ b/css/filmstrip/_small_video.scss
@@ -6,10 +6,37 @@
    border-radius: $borderRadius;
    margin: 0 $thumbnailVideoMargin;

-    &:hover {
+    &.videoContainerFocused, &:hover {
        cursor: hand;
    }

+    /**
+     * Focused video thumbnail.
+     */
+    &.videoContainerFocused {
+        border: $thumbnailVideoBorder solid $videoThumbnailSelected;
+        box-shadow: inset 0 0 3px $videoThumbnailSelected,
+        0 0 3px $videoThumbnailSelected;
+    }
+
+    .remotevideomenu > .icon-menu, .localvideomenu > .icon-menu {
+        display: none;
+    }
+
+    /**
+     * Hovered video thumbnail.
+     */
+    &:hover:not(.videoContainerFocused):not(.active-speaker) {
+        cursor: hand;
+        border: $thumbnailVideoBorder solid $videoThumbnailHovered;
+        box-shadow: inset 0 0 3px $videoThumbnailHovered,
+        0 0 3px $videoThumbnailHovered;
+
+        .remotevideomenu > .icon-menu, .localvideomenu > .icon-menu {
+            display: inline-block;
+        }
+    }
+
    & > video {
        cursor: hand;
        border-radius: $borderRadius;
--- a/css/filmstrip/_tile_view.scss
+++ b/css/filmstrip/_tile_view.scss
@@ -2,10 +2,19 @@
 * CSS styles that are specific to the filmstrip that shows the thumbnail tiles.
 */
 .tile-view {
+    /**
+     * Add a border around the active speaker to make the thumbnail easier to
+     * see.
+     */
+    .active-speaker {
+        box-shadow: 0px 0px 1px 1.5px black, 0px 0px 1.3px 4px $videoThumbnailSelected;
+    }
+
    .remote-videos {
        align-items: center;
        box-sizing: border-box;
-        overscroll-behavior: contain;
+        display: flex;
+        flex-direction: column;
    }

    .filmstrip__videos .videocontainer {
@@ -39,6 +48,17 @@
        top: 0;
        width: 100%;

+        @media (min-width: 581px) {
+            &.shift-right {
+                margin-left: $sidebarWidth;
+                width: calc(100% - #{$sidebarWidth});
+
+                .remote-videos {
+                    width: calc(100vw - #{$sidebarWidth});
+                }
+            }
+        }
+
        &.collapse {
            #remoteVideos {
                height: calc(100% - #{$newToolbarSizeMobile}) !important;
@@ -60,10 +80,6 @@
        display: block;
    }

-    .filmstrip__videos.has-scroll {
-        padding-left: 7px;
-    }
-
    .remote-videos {
        box-sizing: border-box;

@@ -81,6 +97,7 @@
            margin-top: auto;
            margin-bottom: auto;
            justify-content: center;
+            position: absolute;

            .videocontainer {
                border: 0;
@@ -88,6 +105,19 @@
                display: block;
                margin: 2px;
            }
+
+            video {
+                object-fit: contain;
+            }
+
+            /**
+            * Max-width corresponding to the ASPECT_RATIO_BREAKPOINT from features/filmstrip/constants.
+            */
+            @media only screen and (max-width: 500px) {
+                video {
+                    object-fit: cover;
+                }
+            }
        }
    }
 }
@@ -103,3 +133,7 @@
        }
    }
 }
+
+.indicator-icon-container {
+    display: inline-block;
+}
--- a/css/filmstrip/_tile_view_overrides.scss
+++ b/css/filmstrip/_tile_view_overrides.scss
@@ -2,8 +2,7 @@
 * Various overrides outside of the filmstrip to style the app to support a
 * tiled thumbnail experience.
 */
-.tile-view,
-.stage-filmstrip {
+.tile-view {
    /**
     * Let the avatar grow with the tile.
     */
@@ -16,9 +15,10 @@
     * Hide various features that should not be displayed while in tile view.
     */
    #dominantSpeaker,
+    #filmstripLocalVideoThumbnail,
    #largeVideoElementsContainer,
    #sharedVideo,
-    .stage-participant-label {
+    .filmstrip__toolbar {
        display: none;
    }

@@ -35,4 +35,16 @@
    #remotePresenceMessage {
        display: none !important;
    }
+
+    /**
+     * Thumbnail popover menus can overlap other thumbnails. Setting an auto
+     * z-index will allow AtlasKit InlineDialog's large z-index to be
+     * respected and thereby display over elements in other thumbnails,
+     * specifically the various status icons.
+     */
+    .remotevideomenu,
+    .localvideomenu,
+    .videocontainer__toptoolbar {
+        z-index: auto;
+    }
 }
--- a/css/filmstrip/_vertical_filmstrip.scss
+++ b/css/filmstrip/_vertical_filmstrip.scss
@@ -1,177 +1,127 @@
-.vertical-filmstrip, .stage-filmstrip {
-    span:not(.tile-view) .filmstrip {
-        &.hide-videos {
-            .remote-videos {
-                & > div {
-                    opacity: 0;
-                    pointer-events: none;
-                }
-            }
-        }
-
-        /*
-         * Firefox sets flex items to min-height: auto and min-width: auto,
-         * preventing flex children from shrinking like they do on other browsers.
-         * Setting min-height and min-width 0 is a workaround for the issue so
-         * Firefox behaves like other browsers.
-         * https://bugzilla.mozilla.org/show_bug.cgi?id=1043520
-         */
-        @mixin minHWAutoFix() {
-            min-height: 0;
-            min-width: 0;
-        }
-
-        @extend %align-right;
-        align-items: flex-end;
-        bottom: 0;
-        box-sizing: border-box;
-        display: flex;
-        flex-direction: column-reverse;
-        height: 100%;
-        width: 100%;
-        padding: 0;
-        /**
-         * fixed positioning is necessary for remote menus and tooltips to pop
-         * out of the scrolling filmstrip. AtlasKit dialogs and tooltips use
-         * a library called popper which will position its elements fixed if
-         * any parent is also fixed.
-         */
-        position: fixed;
-        top: 0;
-        right: 0;
-        z-index: $filmstripVideosZ;
-
-        &.no-vertical-padding {
-            padding: 0;
-        }
-
-        /**
-         * Hide videos by making them slight to the right.
-         */
-        .filmstrip__videos {
-            @extend %align-right;
-            bottom: 0;
-            padding: 0;
-            position:relative;
-            right: 0;
-            width: auto;
-
-            /**
-             * An id selector is used to match id specificity with existing
-             * filmstrip styles.
-             */
-            &#remoteVideos {
-                border: $thumbnailsBorder solid transparent;
-                padding-left: 0;
-                border-left: 0;
-                width: 100%;
-                height: 100%;
-                justify-content: center;
-            }
-        }
-
-        /**
-         * Re-styles the local Video to better fit vertical filmstrip layout.
-         */
-        #filmstripLocalVideo {
-            align-self: initial;
-            margin-bottom: 5px;
-            display: flex;
-            flex-direction: column-reverse;
-            height: auto;
-            justify-content: flex-start;
-            width: 100%;
-
-            #filmstripLocalVideoThumbnail {
-                width: calc(100% - 15px);
-
-                .videocontainer {
-                    height: 0px;
-                    width: 100%;
-                }
-            }
-        }
-
-        #filmstripLocalScreenShare {
-            align-self: initial;
-            margin-bottom: 5px;
-            display: flex;
-            flex-direction: column-reverse;
-            height: auto;
-            justify-content: flex-start;
-            width: 100%;
-
-            #filmstripLocalScreenShareThumbnail {
-                width: calc(100% - 15px);
-
-                .videocontainer {
-                    height: 0px;
-                    width: 100%;
-                }
-            }
-        }
-
-        /**
-         * Remove unnecssary padding that is normally used to prevent horizontal
-         * filmstrip from overlapping the left edge of the screen.
-         */
-        #filmstripLocalVideo,
-        #filmstripLocalScreenShare,
+.vertical-filmstrip .filmstrip {
+    &.hide-videos {
        .remote-videos {
-            padding: 0;
-        }
-
-        #remoteVideos {
-            @include minHWAutoFix();
-
-            flex-direction: column;
-            flex-grow: 1;
-        }
-
-        .resizable-filmstrip #remoteVideos .videocontainer {
-            border-left: 0;
-            margin: 0;
-        }
-
-        &.reduce-height {
-            height: calc(100% - calc(#{$newToolbarSizeWithPadding} + #{$scrollHeight}));
-        }
-
-        .filmstrip__videos.vertical-view-grid#remoteVideos {
-            align-items: 'center';
-            border: 0px;
-            padding-right: 7px;
-
-            &.has-scroll {
-                padding-right: 0px;
-            }
-
-            .remote-videos > div {
-                left: 0px; // fixes an issue on FF - the div is aligned to the right by default for some reason
-            }
-
-            .videocontainer {
-                border: 0px;
-                margin: 2px;
-            }
-        }
-
-        .remote-videos {
-            display: flex;
-            overscroll-behavior: contain;
-
-            &.height-transition {
-                transition: height .3s ease-in;
-            }
-
            & > div {
-                position: absolute;
-                transition: opacity 1s;
-            }
-
-            &.is-not-overflowing > div {
-                bottom: 0px;
+                opacity: 0;
+                pointer-events: none;
            }
        }
    }
+
+    /*
+     * Firefox sets flex items to min-height: auto and min-width: auto,
+     * preventing flex children from shrinking like they do on other browsers.
+     * Setting min-height and min-width 0 is a workaround for the issue so
+     * Firefox behaves like other browsers.
+     * https://bugzilla.mozilla.org/show_bug.cgi?id=1043520
+     */
+    @mixin minHWAutoFix() {
+        min-height: 0;
+        min-width: 0;
+    }
+
+    @extend %align-right;
+    align-items: flex-end;
+    bottom: 0;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column-reverse;
+    height: 100%;
+    width: 100%;
+    padding: ($desktopAppDragBarHeight - 5px) 5px calc(env(safe-area-inset-bottom, 0) + 10px);
+    /**
+     * fixed positioning is necessary for remote menus and tooltips to pop
+     * out of the scrolling filmstrip. AtlasKit dialogs and tooltips use
+     * a library called popper which will position its elements fixed if
+     * any parent is also fixed.
+     */
+    position: fixed;
+    top: 0;
+    transition: height .3s ease-in;
+    right: 0;
+    z-index: $filmstripVideosZ;
+
+    /**
+     * Hide videos by making them slight to the right.
+     */
+    .filmstrip__videos {
+        @extend %align-right;
+        bottom: 0;
+        padding: 0;
+        position:relative;
+        right: 0;
+        width: auto;
+
+        &.hidden {
+            bottom: auto;
+            right: -196px;
+        }
+
+        /**
+         * An id selector is used to match id specificity with existing
+         * filmstrip styles.
+         */
+        &#remoteVideos {
+            border: $thumbnailsBorder solid transparent;
+            padding-left: 0;
+            transition: right 2s;
+            width: 100%;
+        }
+    }
+
+    /**
+     * Re-styles the local Video to better fit vertical filmstrip layout.
+     */
+    #filmstripLocalVideo {
+        align-self: initial;
+        bottom: 5px;
+        display: flex;
+        flex-direction: column-reverse;
+        height: auto;
+        justify-content: flex-start;
+
+        #filmstripLocalVideoThumbnail {
+            width: calc(100% - 15px);
+
+            .videocontainer {
+                height: 0px;
+                width: 100%;
+    }
+        }
+
+    }
+
+    /**
+     * Remove unnecssary padding that is normally used to prevent horizontal
+     * filmstrip from overlapping the left edge of the screen.
+     */
+    #filmstripLocalVideo,
+    .remote-videos {
+        padding: 0;
+    }
+
+    #remoteVideos {
+        @include minHWAutoFix();
+
+        flex-direction: column;
+        flex-grow: 1;
+    }
+
+    &.reduce-height {
+        height: calc(100% - calc(#{$newToolbarSizeWithPadding} + #{$scrollHeight}));
+    }
+
+    .remote-videos {
+        display: flex;
+        transition: height .3s ease-in;
+
+        & > div {
+            position: absolute;
+            transition: opacity 1s;
+        }
+
+        &.is-not-overflowing > div {
+            bottom: 0px;
+        }
+    }
 }
--- a/css/filmstrip/_vertical_filmstrip_overrides.scss
+++ b/css/filmstrip/_vertical_filmstrip_overrides.scss
@@ -1,19 +1,90 @@
+/**
+ * Rotate the hide filmstrip icon so it points towards the right edge
+ * of the screen.
+ */
+.vertical-filmstrip .filmstrip__toolbar {
+    transform: rotate(-90deg);
+}
+
 /**
 * Overrides for video containers that should not be centered aligned to avoid=
 * clashing with the filmstrip.
 */
 .vertical-filmstrip #etherpad,
-.stage-filmstrip #etherpad,
-.vertical-filmstrip #sharedvideo,
-.stage-filmstrip #sharedvideo {
+.vertical-filmstrip #sharedvideo {
    text-align: left;
 }

 /**
 * Overrides for small videos in vertical filmstrip mode.
 */
-.vertical-filmstrip .filmstrip__videos .videocontainer,
-.stage-filmstrip .filmstrip__videos .videocontainer {
+.vertical-filmstrip .filmstrip__videos .videocontainer {
+    /**
+     * Move status icons to the bottom right of the thumbnail.
+     */
+    .videocontainer__toolbar {
+        /**
+         * FIXME: disable pointer to allow any elements moved below to still
+         * be clickable. The real fix would to make sure those moved elements
+         * are actually part of the toolbar instead of positioning being faked.
+         */
+        pointer-events: none;
+        text-align: right;
+
+        > div {
+            pointer-events: none;
+        }
+
+        .right {
+            float: none;
+            margin: auto;
+        }
+
+        .toolbar-icon {
+            pointer-events: all;
+        }
+    }
+
+    /**
+     * Apply hardware acceleration to prevent flickering on scroll. The
+     * selectors are specific to icon wrappers to prevent fixed position dialogs
+     * and tooltips from getting a new location context due to translate3d.
+     */
+    .connection-indicator,
+    .local-video-menu-trigger,
+    .remote-video-menu-trigger,
+    .indicator-icon-container {
+        transform: translate3d(0, 0, 0);
+    }
+
+    .indicator-icon-container {
+        display: inline-block;
+    }
+
+    .indicator-container {
+        float: none;
+    }
+
+    /**
+     * Move the remote video menu trigger to the bottom left of the video
+     * thumbnail.
+     */
+    .localvideomenu,
+    .remotevideomenu,
+    .local-video-menu-trigger,
+    .remote-video-menu-trigger {
+        bottom: 0;
+        left: 0;
+        top: auto;
+        right: auto;
+    }
+
+    .local-video-menu-trigger,
+    .remote-video-menu-trigger {
+        margin-bottom: 3px;
+        margin-left: $remoteVideoMenuIconMargin;
+    }
+
    .self-view-mobile-portrait video {
        object-fit: contain;
    }
@@ -30,8 +101,7 @@
 * The class opening is for when the filmstrip is transitioning from hidden
 * to visible.
 */
-.vertical-filmstrip .large-video-labels,
-.stage-filmstrip .large-video-labels {
+.vertical-filmstrip .large-video-labels {
    &.with-filmstrip {
        right: 150px;
    }
@@ -51,7 +121,6 @@
 * Overrides for self view when in portrait mode on mobile.
 * This is done in order to keep the aspect ratio.
 */
-.vertical-filmstrip .self-view-mobile-portrait #localVideo_container,
-.stage-filmstrip .self-view-mobile-portrait #localVideo_container {
+.vertical-filmstrip .self-view-mobile-portrait #localVideo_container {
    object-fit: contain;
 }
--- a/css/main.scss
+++ b/css/main.scss
@@ -24,7 +24,8 @@ $flagsImagePath: "../images/";
 /* Flags END */

 /* Modules BEGIN */
-@import 'reset';
+
+@import 'aui_reset';
@import 'atlaskit_overrides';
@import 'base';
@import 'utils';
@@ -32,14 +33,20 @@ $flagsImagePath: "../images/";
@import 'inlay';
@import 'reload_overlay/reload_overlay';
@import 'mini_toolbox';
+@import 'buttons/copy.scss';
@import 'modals/desktop-picker/desktop-picker';
@import 'modals/device-selection/device-selection';
@import 'modals/dialog';
@import 'modals/embed-meeting/embed-meeting';
@import 'modals/feedback/feedback';
@import 'modals/invite/info';
+@import 'modals/settings/settings';
@import 'modals/screen-share/share-audio';
@import 'modals/screen-share/share-screen-warning';
+@import 'modals/speaker_stats/speaker_stats';
+@import 'modals/video-quality/video-quality';
+@import 'modals/virtual-background/virtual-background';
+@import 'modals/local-recording/local-recording';
@import 'videolayout_default';
@import 'notice';
@import 'subject';
@@ -52,21 +59,26 @@ $flagsImagePath: "../images/";
@import 'welcome_page_content';
@import 'welcome_page_settings_toolbar';
@import 'toolbars';
+@import 'keyboard-shortcuts';
@import 'redirect_page';
@import 'components/form-control';
@import 'components/link';
@import 'components/button-control';
@import 'components/input-control';
@import 'components/input-slider';
+@import "connection-info";
+@import 'aui-components/dropdown';
@import '404';
@import 'policy';
@import 'popover';
+@import 'filmstrip/filmstrip_toolbar';
@import 'filmstrip/horizontal_filmstrip';
@import 'filmstrip/small_video';
@import 'filmstrip/tile_view';
@import 'filmstrip/tile_view_overrides';
@import 'filmstrip/vertical_filmstrip';
@import 'filmstrip/vertical_filmstrip_overrides';
+@import 'labels';
@import 'unsupported-browser/main';
@import 'modals/invite/add-people';
@import 'deep-linking/main';
@@ -75,6 +87,7 @@ $flagsImagePath: "../images/";
@import 'navigate_section_list';
@import 'third-party-branding/google';
@import 'third-party-branding/microsoft';
+@import 'avatar';
@import 'promotional-footer';
@import 'chrome-extension-banner';
@import 'settings-button';
@@ -85,6 +98,7 @@ $flagsImagePath: "../images/";
@import 'country-picker';
@import 'modals/invite/invite_more';
@import 'modals/security/security';
+@import 'modals/mute/mute-dialog';
@import 'e2ee';
@import 'responsive';
@import 'drawer';
@@ -92,6 +106,5 @@ $flagsImagePath: "../images/";
@import 'reactions-menu';
@import 'plan-limit';
@import 'polls';
-@import 'notifications';

 /* Modules END */
--- a/css/modals/_dialog.scss
+++ b/css/modals/_dialog.scss
@@ -1,3 +1,114 @@
+.dialog {
+    box-sizing: border-box;
+    height: auto;
+    min-height: 131px;
+    overflow: visible;
+    visibility: visible;
+    width: 400px;
+
+    h1, h2, h3, h4, h5, h6 {
+        color: $auiDialogColor;
+    }
+
+    .aui {
+
+        &-dialog2 {
+            &-header, &-footer {
+                background-color: $auiDialogBg;
+                border: none;
+            }
+
+            &-header {
+                border-bottom: 1px solid $auiBorderColor;
+                border-radius: 5px 5px 0 0;
+                box-sizing: border-box;
+                color: #333;
+                display: table;
+                font-weight: normal;
+                height: em(58, 12);
+                margin-top: -69px;
+                padding: 0 20px;
+                width: 100%;
+
+                h2 {
+                    font-size: em(20, 12);
+                    font-weight: $dialogTitleFontWeight;
+                    color: $auiDialogColor;
+                }
+
+                &-main {
+                    display: table-cell;
+                    padding-right: 0;
+                    max-width: 400px;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    vertical-align: middle;
+                    white-space: nowrap;
+
+                }
+            }
+
+            &-footer {
+                border-top: 1px solid $auiBorderColor;
+                border-radius: 0 0 5px 5px;
+                box-sizing: border-box;
+                height: 51px;
+                overflow: hidden;
+                padding: 10px 20px;
+                width: 100%;
+
+                &:empty {
+                    height: 5px;
+                    padding: 0;
+                }
+            }
+
+            &-content {
+                background-color: $auiDialogBg;
+                box-sizing: border-box;
+                color: $auiDialogColor;
+                font-size: em(14, 12);
+                overflow: auto;
+                max-height: 100%;
+                padding: 20px;
+
+                p,span, h3 {
+                    font-weight: $labelFontWeight;
+                }
+
+                &:last-child {
+                    border-bottom-right-radius: 5px;
+                    border-bottom-left-radius: 5px;
+                }
+
+                &:first-child {
+                    border-top-right-radius: 5px;
+                    border-top-left-radius: 5px;
+                }
+            }
+        }
+
+        &-hide {
+            display: none;
+        }
+    }
+
+    .input-control {
+        background-color: $auiDialogContentBg;
+        color: $auiDialogColor;
+    }
+
+    .form-control:not(:last-child) {
+        border-bottom: 1px solid $auiBorderColor;
+    }
+}
+
+@media all and (max-width: 420px) {
+  .aui-dialog2-small .aui-dialog2-content {
+    height: 100%;
+  }
+}
+
 .modal-dialog-form {
    margin-top: 5px !important;

@@ -11,6 +122,9 @@
        margin-bottom: 8px;
    }
 }
+.modal-dialog-footer {
+    font-size: $modalButtonFontSize;
+}

 /**
 * Styling inline dialog errors.
@@ -29,12 +143,3 @@
        margin: 16px auto 0 auto;
    }
 }
-
-/**
- * Styling shared video dialog errors.
- */
-.shared-video-dialog-error {
-    color: #E04757;
-    margin-top: 2px;
-    display: block;
-}
--- a/css/modals/local-recording/_local-recording.scss
+++ b/css/modals/local-recording/_local-recording.scss
@@ -0,0 +1,92 @@
+.localrec-participant-stats {
+    list-style: none;
+    padding: 0;
+    width: 100%;
+    font-weight: 500;
+
+    .localrec-participant-stats-item__status-dot {
+        position: relative;
+        display: block;
+        width: 9px;
+        height: 9px;
+        border-radius: 50%;
+        margin: 0 auto;
+
+        &.status-on {
+            background: green;
+        }
+
+        &.status-off {
+            background: gray;
+        }
+
+        &.status-unknown {
+            background: darkgoldenrod;
+        }
+
+        &.status-error {
+            background: darkred;
+        }
+    }
+
+    .localrec-participant-stats-item__status,
+    .localrec-participant-stats-item__name,
+    .localrec-participant-stats-item__sessionid {
+        display: inline-block;
+        margin: 5px 0;
+        vertical-align: middle;
+    }
+    .localrec-participant-stats-item__status {
+        width: 5%;
+    }
+    .localrec-participant-stats-item__name {
+        width: 40%;
+    }
+    .localrec-participant-stats-item__sessionid {
+        width: 55%;
+    }
+
+    .localrec-participant-stats-item__name,
+    .localrec-participant-stats-item__sessionid {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+
+.localrec-control-info-label {
+    font-weight: bold;
+}
+
+.localrec-control-info-label:after {
+    content: ' ';
+}
+
+.localrec-control-action-link {
+    display: inline-block;
+    line-height: 1.5em;
+
+    a {
+        cursor: pointer;
+        vertical-align: middle;
+    }
+}
+
+.localrec-control-action-link:before {
+    color: $linkFontColor;
+    content: '\2022';
+    font-size: 1.5em;
+    padding: 0 10px;
+    vertical-align: middle;
+}
+
+.localrec-control-action-link:first-child:before {
+    content: '';
+    padding: 0;
+}
+
+.localrec-control-action-links {
+    font-weight: bold;
+    margin-top: 10px;
+    white-space: nowrap;
+}
--- a/css/modals/mute/_mute-dialog.scss
+++ b/css/modals/mute/_mute-dialog.scss
@@ -0,0 +1,19 @@
+.mute-dialog {
+	.separator-line {
+        margin: 24px 0 24px -20px;
+        padding: 0 20px;
+        width: 100%;
+        height: 1px;
+        background: #5E6D7A;
+    }
+
+	.control-row {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 15px;
+
+        label {
+            font-size: 14px;
+        }
+    }
+}
--- a/css/modals/settings/_settings.scss
+++ b/css/modals/settings/_settings.scss
@@ -0,0 +1,97 @@
+.settings-pane {
+    display: flex;
+    width: 100%;
+
+    &.profile-pane {
+        flex-direction: column;
+    }
+
+    .auth-name {
+        margin-bottom: 4px;
+    }
+
+    .calendar-tab,
+    .device-selection {
+        margin-top: 20px;
+    }
+
+    .mock-atlaskit-label {
+        color: #b8c7e0;
+        font-size: 12px;
+        font-weight: 600;
+        line-height: 1.33;
+        padding: 20px 0px 4px 0px;
+    }
+    input[type="checkbox"]:checked + svg {
+        --checkbox-background-color: #6492e7;
+        --checkbox-border-color: #6492e7;
+    }
+    input[type="checkbox"] + svg + span {
+        color: #b8c7e0;
+    }
+
+    input[type="checkbox"] + svg + span {
+        color: #9FB0CC;
+    }
+
+    .calendar-tab,
+    .more-tab,
+    .box {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+    }
+
+    .profile-edit {
+        display: flex;
+        width: 100%;
+    }
+
+    .profile-edit-field {
+        flex: 1;
+    }
+    .settings-sub-pane {
+        flex: 1;
+    }
+
+    .settings-sub-pane .right {
+        flex: 1;
+    }
+    .settings-sub-pane .left {
+        flex: 1;
+    }
+
+    .settings-sub-pane-element {
+        text-align: left;
+        flex: 1;
+    }
+    .profile-edit-field {
+        margin-right: 20px;
+    }
+
+    .calendar-tab {
+        align-items: center;
+        flex-direction: column;
+        font-size: 14px;
+        min-height: 100px;
+        text-align: center;
+    }
+
+    .calendar-tab-sign-in {
+        margin-top: 20px;
+    }
+
+    .sign-out-cta {
+        margin-bottom: 20px;
+    }
+
+    @media only screen and (max-width: $smallScreen) {
+        .device-selection {
+            display: flex;
+            flex-direction: column;
+        }
+        .more-tab {
+            flex-direction: column;
+        }
+    }
+}
--- a/css/modals/speaker_stats/_speaker_stats.scss
+++ b/css/modals/speaker_stats/_speaker_stats.scss
@@ -0,0 +1,51 @@
+.speaker-stats {
+    list-style: none;
+    padding: 0;
+    width: 100%;
+    font-weight: 500;
+
+    .speaker-stats-item__status-dot {
+        position: relative;
+        display: block;
+        width: 9px;
+        height: 9px;
+        border-radius: 50%;
+        margin: 0 auto;
+
+        &.status-active {
+            background: green;
+        }
+
+        &.status-inactive {
+            background: gray;
+        }
+    }
+
+    .status-user-left {
+        color: $placeHolderColor;
+    }
+
+    .speaker-stats-item__status,
+    .speaker-stats-item__name,
+    .speaker-stats-item__time {
+        display: inline-block;
+        margin: 5px 0;
+        vertical-align: middle;
+    }
+    .speaker-stats-item__status {
+        width: 5%;
+    }
+    .speaker-stats-item__name {
+        width: 40%;
+    }
+    .speaker-stats-item__time {
+        width: 55%;
+    }
+
+    .speaker-stats-item__name,
+    .speaker-stats-item__time {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
--- a/css/modals/video-quality/_video-quality.scss
+++ b/css/modals/video-quality/_video-quality.scss
@@ -0,0 +1,114 @@
+.video-quality-dialog {
+    .video-quality-dialog-title {
+        margin-bottom: 10px;
+    }
+
+    .video-quality-dialog-contents {
+        align-items: center;
+        display: flex;
+        flex-direction: column;
+        padding: 10px;
+        min-width: 250px;
+
+        .video-quality-dialog-slider-container {
+            width: 100%;
+            text-align: center;
+        }
+
+        .video-quality-dialog-slider {
+            width: calc(100% - 5px);
+
+            @mixin sliderTrackStyles() {
+                height: 15px;
+                border-radius: 10px;
+                background: rgb(14, 22, 36);
+            }
+
+            &::-ms-track {
+                @include sliderTrackStyles();
+            }
+
+            &::-moz-range-track {
+                @include sliderTrackStyles();
+            }
+
+            &::-webkit-slider-runnable-track {
+                @include sliderTrackStyles();
+            }
+
+            @mixin sliderThumbStyles() {
+                top: 50%;
+                border: none;
+                position: relative;
+                opacity: 0;
+            }
+
+            &::-ms-thumb {
+                @include sliderThumbStyles();
+            }
+
+            &::-moz-range-thumb {
+                @include sliderThumbStyles();
+
+            }
+
+            &::-webkit-slider-thumb {
+                @include sliderThumbStyles();
+            }
+        }
+
+        .video-quality-dialog-labels {
+            box-sizing: border-box;
+            display: flex;
+            margin-top: 5px;
+            position: relative;
+            width: 90%;
+        }
+
+        .video-quality-dialog-label-container {
+            position: absolute;
+            text-align: center;
+            transform: translate(-50%, 0%);
+
+            &::before {
+                content: '';
+                border-radius: 50%;
+                left: 0;
+                height: 6px;
+                margin: 0 auto;
+                pointer-events: none;
+                position: absolute;
+                right: 0;
+                top: -16px;
+                width: 6px;
+            }
+        }
+
+        .video-quality-dialog-label-container.active {
+            color: $videoQualityActive;
+            font-weight: bold;
+
+            &::before {
+                background: $videoQualityActive;
+                height: 12px;
+                top: -19px;
+                width: 12px;
+            }
+        }
+
+        .video-quality-dialog-label-container:first-child {
+            position: relative;
+        }
+
+        .video-quality-dialog-label {
+            display: table-caption;
+            word-spacing: unset;
+        }
+    }
+}
+
+.modal-dialog-form {
+    .video-quality-dialog-title {
+        display: none;
+    }
+}
--- a/css/modals/virtual-background/_virtual-background.scss
+++ b/css/modals/virtual-background/_virtual-background.scss
@@ -0,0 +1,203 @@
+.virtual-background-dialog {
+    margin-left: -10px;
+    position: relative;
+    max-height: 300px;
+    color: white;
+    display: inline-grid;
+    grid-template-columns: auto auto auto auto auto;
+    column-gap: 9px;
+    cursor: pointer;
+    .desktop-share:hover,
+    .thumbnail:hover,
+    .blur:hover,
+    .slight-blur:hover,
+    .virtual-background-none:hover {
+        opacity: 0.5;
+        border: 2px solid #99bbf3;
+        @media (max-width: 632px) {
+            height: 60px;
+            width: 60px;
+        }
+    }
+    .background-option {
+        margin-top: 8px;
+        border-radius: 6px;
+        height: 60px;
+        width: 107px;
+        text-align: center;
+        justify-content: center;
+        font-weight: bold;
+        box-sizing: border-box;
+        display: flex;
+        align-items: center;
+    }
+    .thumbnail {
+        object-fit: cover;
+    }
+
+    .thumbnail:hover ~ .delete-image-icon {
+        display: block;
+    }
+    .thumbnail-selected {
+        object-fit: cover;
+        border: 2px solid #246fe5;
+    }
+    .blur {
+        box-shadow: inset 0 0 12px #000000;
+        background: #7e8287;
+        padding: 0 10px;
+    }
+    .blur-selected {
+        box-shadow: inset 0 0 12px #000000;
+        background: #7e8287;
+        border: 2px solid #246fe5;
+        padding: 0 10px;
+    }
+    .slight-blur {
+        box-shadow: inset 0 0 12px #000000;
+        background: #a4a4a4;
+        padding: 0 10px;
+    }
+    .slight-blur-selected {
+        box-shadow: inset 0 0 12px #000000;
+        background: #a4a4a4;
+        border: 2px solid #246fe5;
+        padding: 0 10px;
+    }
+    .virtual-background-none {
+        background: #525252;
+        padding: 0 10px;
+    }
+    .none-selected {
+        background: #525252;
+        border: 2px solid #246fe5;
+        padding: 0 10px;
+    }
+
+    .desktop-share {
+        background: #525252;
+    }
+    .desktop-share-selected {
+        background: #525252;
+        border: 2px solid #246fe5;
+        padding: 0 10px;
+    }
+
+    @media (max-width: 632px) {
+        font-size: 1.5vw;
+        .desktop-share,
+        .virtual-background-none,
+        .thumbnail,
+        .blur,
+        .slight-blur {
+            height: 60px;
+            width: 60px;
+        }
+        .desktop-share-selected,
+        .thumbnail-selected,
+        .none-selected,
+        .blur-selected,
+        .slight-blur-selected {
+            height: 60px;
+            width: 60px;
+        }
+    }
+    @media (max-width: 360px) {
+        grid-template-columns: auto auto auto;
+    }
+}
+
+.modal-dialog-form .virtual-background-loading {
+    overflow: hidden;
+    position: fixed;
+    left: 50%;
+    margin-top: 10px;
+    transform: translateX(-50%);
+}
+.modal-dialog-form .video-preview {
+    height: 250px;
+}
+.file-upload-btn {
+    display: none;
+}
+.file-upload-label {
+    font-size: 14px;
+    font-weight: 600;
+    line-height: 20px;
+    margin-left: -10px;
+    margin-top: 16px;
+    margin-bottom: 8px;
+    color: #669aec;
+    display: inline-flex;
+    cursor: pointer;
+}
+
+.delete-image-icon {
+    background: #3d3d3d;
+    position: absolute;
+    display: none;
+    left: 96;
+    bottom: 51;
+    @media (max-width: 632px) {
+        left: 51px;
+    }
+}
+
+.delete-image-icon:hover {
+    display: block;
+}
+
+.thumbnail-container {
+    position: relative;
+    &:focus-within {
+        .thumbnail ~ .delete-image-icon {
+            display: block;
+        }
+    }
+}
+
+.add-background {
+    margin-right: 8px;
+}
+
+.apply-background-btn {
+    margin-top: 16px;
+    float: right;
+}
+
+.video-background-preview-entry {
+    margin-left: -10px;
+    height: 250px;
+    width: 570px;
+    margin-bottom: 8px;
+    z-index: 2;
+    @media (max-width: 632px) {
+        max-width: 336;
+    }
+}
+
+.virtual-background-preview-video {
+    margin-left: -10;
+    border-radius: 6px;
+    height: 100%;
+    object-fit: cover;
+    width: 100%;
+}
+.video-preview-loader {
+    border-radius: 6px;
+    background-color: transparent;
+    height: 250px;
+    margin-bottom: 8px;
+    width: 572px;
+    position: fixed;
+    z-index: 2;
+    @media (min-width: 432px) and (max-width: 632px) {
+        width: 340px;
+    }
+}
+
+.video-preview-loader svg {
+    position: absolute;
+    top: 40%;
+    left: 45%;
+}
--- a/css/premeeting/_connection-status.scss
+++ b/css/premeeting/_connection-status.scss
@@ -0,0 +1,71 @@
+.con-status {
+    border-radius: 6px;
+    color: #fff;
+    font-size: 12px;
+    letter-spacing: 0.16px;
+    line-height: 16px;
+    position: absolute;
+    width: 100%;
+
+    &-header {
+        background-color: rgba(0, 0, 0, 0.7);
+        align-items: center;
+        display: flex;
+        padding: 14px 16px;
+    }
+
+    &-circle {
+        border-radius: 50%;
+        display: inline-block;
+        padding: 4px;
+        margin-right: 16px;
+    }
+
+    &--good {
+        background: #31B76A;
+    }
+
+    &--poor {
+        background: #E12D2D;
+    }
+
+    &--non-optimal {
+        background: #E39623;
+    }
+
+    &-arrow {
+        margin-left: auto;
+        transition: background-color 0.16s ease-out;
+
+        &--up {
+            transform: rotate(180deg);
+        }
+
+        &>svg {
+            cursor: pointer;
+        }
+
+        &:hover {
+            background-color: rgba(1,1,1, 0.1);
+        }
+    }
+
+    &-text {
+        text-align: center;
+    }
+
+    &-details {
+        background-color: rgba(0, 0, 0, 0.7);
+        border-top: 1px solid #5E6D7A;
+        padding: 16px;
+        transition: opacity 0.16s ease-out;
+
+        &-visible {
+            opacity: 1;
+        }
+
+        &-hidden {
+            opacity: 0;
+        }
+    }
+}
--- a/css/premeeting/_device-status.scss
+++ b/css/premeeting/_device-status.scss
@@ -0,0 +1,38 @@
+.device {
+    &-status {
+        align-items: center;
+        color: #fff;
+        display: flex;
+        font-size: 14px;
+        line-height: 20px;
+        padding: 6px;
+        text-align: center;
+
+        &-error {
+            align-items: flex-start;
+            background-color: #F8AE1A;
+            border-radius: 6px;
+            color: #040404;
+            padding: 12px 16px;
+            text-align: left;
+        }
+
+        span {
+            margin-left: 16px;
+        }
+    }
+
+    &-icon {
+        background-position: center;
+        background-repeat: no-repeat;
+        display: inline-block;
+        height: 16px;
+        width: 16px;
+
+        &--ok {
+            svg path {
+                fill: #189b55;
+            }
+        }
+    }
+}
--- a/css/premeeting/_lobby.scss
+++ b/css/premeeting/_lobby.scss
@@ -12,29 +12,11 @@
            margin: 8px;
        }

-        .lobby-chat-container {
-            background-color: $chatBackgroundColor;
-            width: 100%;
-            height: 314px;
-            display: flex;
-            flex-direction: column;
-            align-items: stretch;
-            margin-bottom: 16px;
-            border-radius: 5px;
-            .lobby-chat-header {
-                display: none;
-            }
-        }
-
        .joining-message {
            color: white;
            margin: 24px auto;
            text-align: center;
        }
-
-        .open-chat-button {
-            display: none;
-        }
    }
 }

@@ -81,10 +63,6 @@
        top: 120px;
    }

-    &.avoid-chat {
-        left: 315px;
-    }
-
    .title {
        background-color: rgba(0, 0, 0, .2);
        font-size: 1.2em;
@@ -165,42 +143,3 @@
        }
    }
 }
-
-@media (max-width: 1000px) {
-    .lobby-screen-content {
-
-        .lobby-chat-container {
-            position: fixed;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            z-index: 255;
-
-            &.hidden {
-                display: none;
-            }
-
-            .lobby-chat-header {
-                display: flex;
-                flex-direction: row;
-                padding-top: 20px;
-                padding-left: 16px;
-                padding-right: 16px;
-
-                .title {
-                    flex: 1;
-                    color: #fff;
-                    font-size: 20px;
-                    font-weight: 600;
-                    line-height: 28px;
-                    letter-spacing: -1.2%;
-                }
-            }
-        }
-
-        .open-chat-button {
-            display: block;
-        }
-    }
-}
--- a/css/premeeting/_main.scss
+++ b/css/premeeting/_main.scss
@@ -1,3 +1,5 @@
+@import 'connection-status';
+@import 'device-status';
@import 'lobby';
@import 'premeeting-screens';
@import 'prejoin';
--- a/css/premeeting/_prejoin-dialog.scss
+++ b/css/premeeting/_prejoin-dialog.scss
@@ -116,3 +116,72 @@
        margin: 8px 0 16px 0;
    }
 }
+
+.prejoin-dialog-dialin {
+    text-align: center;
+
+    &-header {
+        align-items: center;
+        margin: 16px 0 32px 16px;
+        display: flex;
+    }
+
+    &-icon {
+        margin-right: 16px;
+    }
+
+    &-num {
+        background: #3e474f;
+        border-radius: 4px;
+        display: inline-block;
+        font-size: 15px;
+        line-height: 24px;
+        margin: 4px;
+        padding: 8px;
+
+        &-container {
+            min-height: 48px;
+            margin: 8px 0;
+        }
+    }
+
+    &-link {
+        color: #6FB1EA;
+        cursor: pointer;
+        display: inline-block;
+        font-size: 13px;
+        line-height: 20px;
+        margin-bottom: 24px;
+    }
+
+    &-spaced-label {
+        margin-bottom: 16px;
+        margin-top: 28px;
+    }
+
+    &-btns {
+        &> div {
+            margin-bottom: 16px;
+        }
+    }
+}
+
+.prejoin-dialog-calling {
+    padding: 16px;
+    text-align: center;
+
+    &-header {
+        text-align: right;
+    }
+
+    &-label {
+        font-size: 15px;
+        margin: 8px 0 16px 0;
+    }
+
+    &-number {
+        font-size: 19px;
+        line-height: 28px;
+        margin: 16px 0;
+    }
+}
--- a/css/premeeting/_prejoin.scss
+++ b/css/premeeting/_prejoin.scss
@@ -3,24 +3,6 @@
        width: 100%;
    }

-    &-avatar {
-        margin: 8px auto 16px;
-
-        &-name {
-            color: white;
-            font-size: 16px;
-            font-weight: 600;
-            line-height: 26px;
-            margin-bottom: 32px;
-            text-align: center;
-        }
-
-        &-container {
-            display: flex;
-            flex-direction: column;
-        }
-    }
-
    &-error {
        background-color: #E04757;
        border-radius: 6px;
@@ -39,6 +21,31 @@
 .prejoin-preview {
    &-dropdown-btns {
        padding: 8px 0;
+        width: calc(100% - 48px);
+    }
+  
+    &-dropdown-btn {
+        align-items: center;
+        color: #1C2025;
+        cursor: pointer;
+        display: flex;
+        height: 40px;
+        font-size: 15px;
+        line-height: 24px;
+        padding: 0 16px;
+  
+        &:hover {
+            background-color: #DAEBFA;
+        }
+    }
+  
+    &-dropdown-icon {
+        display: inline-block;
+        margin-right: 16px;
+  
+        & > svg {
+            fill:  #1C2025;
+        }
    }
  
    &-dropdown-container {
@@ -52,6 +59,8 @@
            background: #fff;
            padding: 0;
            position: absolute !important;
+            top: 48px !important;
+            transform: none !important;
            width: 100%;
        }
    }
--- a/css/premeeting/_premeeting-screens.scss
+++ b/css/premeeting/_premeeting-screens.scss
@@ -7,7 +7,7 @@
    position: absolute;
    right: 0;
    top: 0;
-    z-index: $toolbarZ + 2;
+    z-index: $toolbarZ + 1;

    .action-btn {
        border-radius: 6px;
@@ -82,7 +82,7 @@
        flex-direction: column;
        flex-shrink: 0;
        height: 100%;
-        margin: 0 30px;
+        margin: 0 110px;
        padding: 24px 0 16px;
        position: relative;
        width: $prejoinDefaultContentWidth;
@@ -137,8 +137,8 @@
                }

                .toolbox-content-items {
-                    @include ltr;
                    background: transparent;
+                    border-radius: 0;
                    box-shadow: none;
                    display: flex;
                    justify-content: space-evenly;
@@ -155,19 +155,19 @@
        }
    }

-    @media (max-width: 720px) {
+    @media (max-width: 1000px) {
        flex-direction: column-reverse;

        .content {
            height: auto;
            margin: 0 auto;
        }
-    }

-    // mobile phone landscape
-    @media (max-height: 420px) {
-        div.content {
-            padding: 16px 16px 0 16px;
+        .con-status {
+            margin: 24px auto;
+            position: fixed;
+            top: 0;
+            width: $prejoinDefaultContentWidth;
        }
    }

@@ -188,6 +188,11 @@
            }
        }

+        .con-status {
+            margin: 0;
+            width: 100%;
+        }
+
        .device-status-error {
            border-radius: 0;
            margin: 0 -16px;
@@ -221,6 +226,8 @@
    .avatar {
        text {
            fill: white;
+            font-size: 26px;
+            font-weight: 400;
        }
    }

--- a/css/themes/_light.scss
+++ b/css/themes/_light.scss
@@ -46,6 +46,11 @@ $reloadProgressBarBg: #0074E0;
 /**
 * Dialog colors
 **/
+$auiDialogColor: #eceef1;
+$auiDialogBg: #253858;
+$auiDialogContentBg: #344563;
+$auiBorderColor: #253858;
+$dialogTitleFontWeight: 400;
 $dialogErrorText: #344563;

 /**
@@ -70,7 +75,11 @@ $errorColor: #c61600;
 $feedbackCancelFontColor: #333;

 // Popover colors
+$popoverBg: initial;
 $popoverFontColor: #ffffff !important;
+$popupMenuColor: #ffffff !important;
+$popupMenuHoverColor: #ffffff !important;
+$popupMenuHoverBackground: rgba(255, 255, 255, 0.1);
 $popupSliderColor: #0376da;

 // Toolbar
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: Configuration for web serving of Jitsi Meet

 Package: jitsi-meet-prosody
 Architecture: all
-Depends: openssl, prosody (>= 0.11.0) | prosody-trunk | prosody-0.12 | prosody-0.11, lua-sec, lua-basexx, lua-luaossl, lua-cjson
+Depends: openssl, prosody (>= 0.11.0) | prosody-trunk | prosody-0.11, lua-sec
 Replaces: jitsi-meet-tokens
 Description: Prosody configuration for Jitsi Meet
 Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
@@ -47,11 +47,12 @@ Description: Prosody configuration for Jitsi Meet

 Package: jitsi-meet-tokens
 Architecture: all
-Depends: ${misc:Depends}, prosody-trunk | prosody-0.11 | prosody-0.12 | prosody (>= 0.11.2), jitsi-meet-prosody
+Depends: ${misc:Depends}, prosody-trunk (>= 1nightly747) | prosody-0.11 | prosody (>= 0.11.2), libssl1.0-dev | libssl-dev, luarocks, jitsi-meet-prosody, git
 Description: Prosody token authentication plugin for Jitsi Meet

 Package: jitsi-meet-turnserver
 Architecture: all
+Breaks: apache2
 Pre-Depends: jitsi-meet-web-config
-Depends: ${misc:Depends}, jitsi-meet-prosody, coturn, dnsutils
+Depends: ${misc:Depends}, nginx (>= 1.13.10) | nginx-full (>= 1.13.10) | nginx-extras (>= 1.13.10), jitsi-meet-prosody, coturn, dnsutils
 Description: Configures coturn to be used with Jitsi Meet
--- a/debian/jitsi-meet-prosody.postinst
+++ b/debian/jitsi-meet-prosody.postinst
@@ -130,8 +130,6 @@ case "$1" in
            echo -e "    storage = \"memory\"" >> $PROSODY_HOST_CONFIG
            echo -e "    modules_enabled = { \"ping\"; }" >> $PROSODY_HOST_CONFIG
            echo -e "    admins = { \"$JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN\", \"jvb@$JICOFO_AUTH_DOMAIN\" }" >> $PROSODY_HOST_CONFIG
-            echo -e "    muc_room_locking = false" >> $PROSODY_HOST_CONFIG
-            echo -e "    muc_room_default_public_jids = true" >> $PROSODY_HOST_CONFIG
        fi

        # Convert the old focus component config to the new one.
@@ -204,8 +202,6 @@ case "$1" in
            fi
        fi

-        CERT_ADDED_TO_TRUST="false"
-
        if [ ! -f /var/lib/prosody/$JICOFO_AUTH_DOMAIN.crt ]; then
            # prosodyctl takes care for the permissions
            # echo for using all default values
@@ -222,8 +218,6 @@ case "$1" in
            # store not get re-generated with latest changes
            update-ca-certificates -f

-            CERT_ADDED_TO_TRUST="true"
-
            # don't fail on systems with custom config ($PROSODY_HOST_CONFIG is missing)
            if [ -f $PROSODY_HOST_CONFIG ]; then
                # now let's add the ssl cert for the auth. domain (we use # as a sed delimiter cause filepaths are confused with default / delimiter)
@@ -236,11 +230,6 @@ case "$1" in

        if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
            invoke-rc.d prosody restart || true
-
-            # In case we had updated the certificates and restarted prosody, let's restart and the bridge if possible
-            if [ -d /run/systemd/system ] && [ "$CERT_ADDED_TO_TRUST" = "true" ]; then
-                systemctl restart jitsi-videobridge2.service >/dev/null || true
-            fi
        fi
    ;;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
titus.moldovan	63754f01a5	chore(deps) updates react-native-webrtc	2021-10-15 12:58:12 +03:00
Zoltán Ulrich	dcf677bdf0	fix(ios) Fixes RCTBridge not being released when JitsiMeet is trying to destroy its bridge on some OS versions	2021-10-14 13:05:37 +02:00
titus.moldovan	eaea2cdef0	chore(versions) bump iOS SDK version	2021-10-08 12:29:41 +03:00
Saúl Ibarra Corretgé	bcad87e894	chore(versions) bump iOS app version	2021-10-07 11:47:22 +02:00
Saúl Ibarra Corretgé	d500493649	chore(deps) update lib-jitsi-meet to fix iOS 15 issue Not unmuting when "everyone starts muted".	2021-10-07 11:45:53 +02:00
tmoldovan8x8	8ad3ef0022	chore(versions) bump Android SDK version	2021-10-05 09:24:39 +03:00
Saúl Ibarra Corretgé	d0664d9ea0	chore(versions) bump iOS SDK version	2021-10-01 15:49:11 +02:00
Saúl Ibarra Corretgé	45c40d7afc	chore(versions) bump iOS app version	2021-10-01 15:48:09 +02:00
Saúl Ibarra Corretgé	e33edfd2a5	fix(rn,conference) fix unmute when "everyone starts muted" is set Since iOS 15 we really need the audio stream to exist, so make sure we don't destroy it even when "everyone starts muted" is set, we'll just mute it. Fixes: https://github.com/jitsi/jitsi-meet/issues/10053	2021-10-01 15:47:22 +02:00
Saúl Ibarra Corretgé	96b2a07172	chore(versions) bump iOS app version	2021-09-30 15:18:26 +02:00
Saúl Ibarra Corretgé	0e8c01af75	fix(ios) fix crash on WebSocket errors Bacckport `748aa13747` Fixes: ~~~ Fatal Exception: NSInvalidArgumentException 0 CoreFoundation 0x129708 __exceptionPreprocess 1 libobjc.A.dylib 0x287a8 objc_exception_throw 2 CoreFoundation 0x19b9c8 -[__NSCFString characterAtIndex:].cold.1 3 CoreFoundation 0x1a7a20 -[__NSPlaceholderDictionary initWithCapacity:].cold.1 4 CoreFoundation 0x164c0 -[__NSPlaceholderDictionary initWithObjects:forKeys:count:] 5 CoreFoundation 0x8de0 +[NSDictionary dictionaryWithObjects:forKeys:count:] 6 JitsiMeetSDK 0x5704b4 -[RCTWebSocketModule webSocket:didFailWithError:] + 168 (RCTWebSocketModule.m:168) 7 JitsiMeetSDK 0x54a5ec __33-[RCTSRWebSocket _failWithError:]_block_invoke_2 + 622 (RCTSRWebSocket.m:622) 8 libdispatch.dylib 0x2a84 _dispatch_call_block_and_release 9 libdispatch.dylib 0x481c _dispatch_client_callout 10 libdispatch.dylib 0xc004 _dispatch_lane_serial_drain 11 libdispatch.dylib 0xcc00 _dispatch_lane_invoke 12 libdispatch.dylib 0x174bc _dispatch_workloop_worker_thread 13 libsystem_pthread.dylib 0x37a4 _pthread_wqthread 14 libsystem_pthread.dylib 0xa74c start_wqthread ~~~	2021-09-30 15:12:46 +02:00
tmoldovan8x8	3049ad6dbf	feat(android) target sdk 31	2021-09-30 14:06:37 +02:00
Saúl Ibarra Corretgé	9a30ad87a7	chore(versions) bump Android sdk version	2021-09-29 14:49:03 +02:00
Saúl Ibarra Corretgé	11c05560c4	chore(versions) bump Android app version	2021-09-29 14:15:43 +02:00
titus.moldovan	d92fa59c74	fix(android) disables uncompressed native libs usage	2021-09-29 14:15:11 +02:00
Saúl Ibarra Corretgé	4eb1d16faa	chore(deps): update react-native-webrtc@1.92.2 Fixes a crash on Android	2021-09-29 14:13:47 +02:00
Saúl Ibarra Corretgé	91adc70724	chore(rn,versions) bump sdk version	2021-09-24 11:09:25 +02:00
Saúl Ibarra Corretgé	15b083c182	fix(ios) create audio track early In iOS 15 we observe that not creating the audio track early may result in not getting audio after unmuting for the first time. Creating the audio track early means the first unmute doesn't need to add the track to the conference, resulting in a much faster operation. Note that creating the track early doesn't mean we will start unmuted, the track will be muted.	2021-09-24 11:01:33 +02:00
titus.moldovan	26fdaf7b8d	fix(rn) add default value when retrieving e2ee redux state	2021-09-24 10:11:52 +02:00
Saúl Ibarra Corretgé	64a9874d63	chore(rn,versions) bump sdk version	2021-09-23 14:13:51 +02:00
Saúl Ibarra Corretgé	753cffc458	fix(ios) fix black screen when using Bluetooth in iOS 15 Fixes: https://github.com/jitsi/jitsi-meet/issues/9996 On iOS 15 Bluetooth devices are reported twice for some reason, one with the normal type "Bluetooth" but another type without a know (to me) type, and the uid ends in "-reference". While we send those unkwno devices to JS, we were not filtering them properly. This patch skips them altogether.	2021-09-23 14:11:49 +02:00