Update JitsiMeet.h

2026-01-01 20:32:27 +00:00 · 2022-11-17 15:40:20 +02:00
607 changed files with 8134 additions and 13243 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,15 +0,0 @@
-{
-  "name": "Jitsi Meet Dev Container",
-  "image": "mcr.microsoft.com/devcontainers/universal:2",
-  "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "16"
-    }
-  },
-  "hostRequirements": {
-    "cpus": 4,
-    "memory": "8gb",
-    "storage": "32gb" 
-  },
-  "postCreateCommand": "bash -i -c 'nvm use && npm install && cp tsconfig.web.json tsconfig.json'"
-}
--- a/.github/workflows/ci-lua.yml
+++ b/.github/workflows/ci-lua.yml
@@ -1,25 +0,0 @@
-name: Lua CI
-
-on: [pull_request]
-
-jobs:
-  luacheck:
-    name: Luacheck
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install luarocks
-      run: sudo apt-get --install-recommends -y install luarocks
-
-    - name: Install luacheck
-      run: sudo luarocks install luacheck
-
-    - name: Check lua codes
-      run: |
-        set -o pipefail && luacheck . | awk -F: '
-          {
-            print $0
-            printf "::warning file=%s,line=%s,col=%s::%s\n", $1, $2, $3, $4
-          }
-        '
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
    name: Lint
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - uses: actions/setup-node@v3
      with:
        node-version: 16
@@ -20,11 +20,12 @@ jobs:
    - 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: npm run lint:ci
+    - run: for file in lang/*.json; do npx --yes jsonlint -q $file || exit 1; done
  linux-build:
    name: Build Frontend (Linux)
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - uses: actions/setup-node@v3
      with:
        node-version: 16
@@ -35,7 +36,7 @@ jobs:
    name: Build Frontend (macOS)
    runs-on: macOS-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - uses: actions/setup-node@v3
      with:
        node-version: 16
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -1,8 +0,0 @@
-global = false
-unused = false
-redefined = false
-ignore = { "581" }
-max_line_length = false
-color = false
-formatter = "plain"
-quiet = 1
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,7 +141,7 @@ react/features/sample/
 ```

 The middleware must be imported in `react/features/app/` specifically
-in `middlewares.any.ts`, `middlewares.native.ts` or `middlewares.web.ts` where appropriate.
+in `middlewares.any`, `middlewares.native.js` or `middlewares.web.js` where appropriate.
 Likewise for the reducer.

 An `index.js` file must not be provided for exporting actions, action types and
--- 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.5.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'

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

--- a/android/app/src/main/res/drawable-hdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-hdpi/ic_notification.png
--- a/android/app/src/main/res/drawable-mdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-mdpi/ic_notification.png
--- a/android/app/src/main/res/drawable-xhdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-xhdpi/ic_notification.png
--- a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
--- a/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
--- a/android/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -1,70 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="262.91376dp"
-    android:height="262.91376dp"
-    android:viewportWidth="262.91376"
-    android:viewportHeight="262.91376">
-  <group android:scaleX="0.75" android:scaleY="0.75" android:translateX="35" android:translateY="35">
-    <clip-path
-        android:pathData="m0,0 l262.914,-0L262.914,262.914 0,262.914 0,0Z"/>
-    <path
-        android:pathData="m142.646,105.099c0.117,0.026 0.255,0.036 0.406,0.036 3.186,-0 10.297,-4.615 11.617,-6.721l0.1,-0.17 0.153,-0.135c0.451,-0.441 1.746,-2.773 2.374,-4.17 -6.751,-2.023 -7.49,-5.677 -8.153,-8.919 -0.069,-0.376 -0.138,-0.717 -0.204,-1.019 -0.074,-0.397 -0.153,-0.8 -0.226,-1.112C138.668,86.221 135.593,88.094 133.921,89.483 133.056,90.201 132.542,92.251 135.042,97.926 136.323,100.816 140.727,104.733 142.646,105.099"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="m115.413,146.042c5.934,-0 18.464,-3.543 26.748,-5.887 1.21,-0.336 2.33,-0.66 3.351,-0.944 0.166,-0.046 0.321,-0.091 0.472,-0.124 -0.463,-0.461 -1.239,-1.159 -2.497,-2.216 -5.521,-3.741 -10.736,-5.484 -16.403,-5.484 -1.237,-0 -2.522,0.071 -3.923,0.231 -4.801,0.55 -8.8,1.69 -10.722,2.237 -0.967,0.284 -1.263,0.366 -1.567,0.366 -0.58,-0 -1.079,-0.341 -1.273,-0.878 -0.194,-0.534 -0.027,-1.121 0.425,-1.507l0.024,-0.011c3.316,-2.784 9.489,-7.951 21.198,-10.256 2.027,-0.401 4.202,-0.605 6.454,-0.605 5.242,-0 10.67,1.086 16.125,3.219 7.436,2.899 12.521,6.625 16.602,9.62 2.199,1.609 4.105,3.007 5.755,3.771 0.421,0.2 0.637,0.255 0.746,0.265 0.074,-0.095 0.23,-0.365 0.474,-1.069 0.066,-0.185 0.529,-2.161 -2.806,-13.374 -1.931,-6.51 -4.264,-13.156 -5.479,-16.104 -2.356,-5.711 -1.778,-9.76 -1.051,-12.125 -1.999,0.735 -4.033,1.87 -6.174,3.446L161.758,98.711C160.694,99.506 159.599,100.404 158.426,101.454 151.517,107.64 146.344,110.864 143.035,111.04l-0.093,0.004 -0.093,-0.009c-2.912,-0.245 -7.324,-4.489 -9.133,-6.634 -0.373,-0.251 -0.8,-0.366 -1.366,-0.366 -0.564,-0 -1.202,0.116 -1.82,0.235C130.086,104.354 129.623,104.441 129.167,104.489 127.708,104.632 125.668,105.106 123.694,105.561 122.746,105.777 121.762,106.005 120.864,106.189 120.851,106.19 120.463,106.272 119.774,106.454 114.903,107.891 111.228,109.55 109.432,111.111 109.414,111.127 109.352,111.174 109.266,111.242 108.048,112.105 105.124,114.567 104.248,118.762L104.237,118.795C102.398,126.516 105.187,136.087 108.892,141.554 110.636,144.125 112.513,145.727 114.048,145.959 114.437,146.015 114.891,146.042 115.413,146.042"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="m90.093,173.175c-1.252,-1.472 -1.783,-3.324 -1.574,-5.521 0.884,-10.642 -0.329,-13.215 -0.891,-13.829 -0.131,-0.144 -0.207,-0.144 -0.265,-0.144 -0.022,-0 -0.041,0.003 -0.064,0.003 -1.044,0.248 -8.066,5.002 -9.615,19.171 -0.749,6.845 0.561,15.63 1.679,20.974 0.897,-3.155 2.314,-6.624 5.057,-10.204 2.556,-3.326 5.345,-5.955 8.801,-8.253C92.143,174.93 90.991,174.235 90.093,173.175"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="m94.906,156.389c-0.03,2.229 -0.326,4.36 -0.61,6.445 -0.151,1.119 -0.314,2.286 -0.434,3.46 -0.161,2.341 0.346,3.166 0.571,3.406 0.127,0.136 0.326,0.287 0.76,0.287 0.339,-0 0.741,-0.091 1.161,-0.268 4.202,-1.756 8.195,-4.815 10.115,-6.515C103.522,161.892 98.995,159.058 94.906,156.389"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="m154.002,81.595c-0.031,0.074 -0.065,0.148 -0.101,0.216 -0.821,2.403 0.306,5.664 2.419,6.898 0.561,0.327 1.106,0.526 1.624,0.596 0.072,0.006 0.148,0.009 0.219,0.009 1.645,-0 2.971,-1.199 3.961,-3.561C162.752,83.959 162.836,81.827 162.37,79.904 162.003,78.409 161.057,76.627 160.453,75.738 159.332,76.509 157.111,78.207 155.585,79.553 154.518,80.582 154.136,81.229 154.002,81.595"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="M148.97,77.699C153.957,73.194 156.988,65.754 158.253,61.334 153.915,65.513 148.633,67.758 145.25,69.198 144.084,69.695 143.08,70.124 142.477,70.476 142.224,70.623 141.965,70.77 141.708,70.919 139.654,72.109 136.55,73.905 136.1,75.011l-0.012,0.036 -0.012,0.034c-1.406,2.956 -2.199,7.401 -2.457,9.95 3.266,-1.99 6.625,-3.322 9.416,-4.42C145.628,79.585 147.863,78.703 148.97,77.699"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="m164.464,51.921c-0.84,5.539 -2.205,10.799 -4.751,16.347 2.781,-3.144 4.396,-6.568 4.941,-10.401C164.886,56.275 165.097,54.756 164.464,51.921"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="M148.749,142.639C148.718,142.598 148.684,142.56 148.658,142.519 148.523,142.539 148.307,142.584 147.972,142.683l-0.14,0.04c-1.726,0.644 -4.899,1.708 -8.556,2.946 -4.396,1.479 -9.365,3.154 -13.526,4.649 -5.297,1.975 -7.021,2.755 -7.557,3.024 -0.098,0.266 -0.203,0.599 -0.327,0.965 -1.254,3.816 -4.125,12.541 -18.276,18.653 2.928,2.956 9.289,8.27 21.809,8.27 1.082,-0 2.21,-0.036 3.341,-0.12 9.451,-0.666 18.342,-4.855 25.026,-11.78 6.087,-6.291 9.538,-14.136 9.585,-21.7C157.876,147.509 155.367,147.135 153.043,146.033 153.014,146.02 150.361,144.745 148.749,142.639"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="m189.478,117.853c-0.523,9.749 -2.122,18.424 -4.744,25.8 -2.128,5.988 -4.94,11.134 -8.356,15.316 -5.676,6.931 -11.555,9.256 -12.804,9.304 -0.866,-0 -1.313,-0.309 -3.046,-1.528 -0.17,-0.114 -0.37,-0.252 -0.581,-0.4 -3.313,5.953 -8.505,11.097 -15.065,14.959 -7.079,4.144 -15.297,6.423 -23.157,6.423 -9.078,-0 -17.13,-2.924 -23.341,-8.456 -7.467,4.799 -12.31,9.074 -16.267,27.005l-1.363,6.17 -2.971,-5.564c-0.424,-0.786 -1.929,-3.731 -3.332,-8.887 -1.934,-7.104 -2.86,-15.181 -2.758,-24.01 0.117,-10.049 3.154,-16.526 5.68,-20.186 2.98,-4.314 6.837,-6.994 10.076,-6.994 0.216,-0 0.428,0.006 0.616,0.035 5.159,0.575 8.435,2.75 14.396,6.686l1.899,1.252c2.059,1.344 4.481,2.7 5.259,2.989 0.54,-0.284 1.749,-2.3 2.155,-5.271l0.069,-0.451c0.005,-0.045 0.009,-0.091 0.014,-0.131 -0.036,-0.02 -0.065,-0.029 -0.094,-0.041 -4.008,-1.375 -9.539,-7.7 -12.364,-17.134 -2.684,-9.382 -2.129,-17.185 1.644,-23.193 6.12,-9.736 19.198,-11.974 23.466,-12.702 1.331,-0.266 2.716,-0.511 4.041,-0.717 0.255,-0.061 0.469,-0.121 0.642,-0.168 -0.031,-0.126 -0.071,-0.265 -0.114,-0.43 -0.108,-0.417 -0.23,-0.891 -0.354,-1.447 -1.345,-6.035 -0.664,-11.069 0.181,-15.193 0.928,-4.546 1.489,-7.287 3.747,-9.936 3.029,-4.165 8.319,-5.936 11.479,-6.991 0.746,-0.249 1.511,-0.509 1.894,-0.689 8.988,-4.31 11.82,-8.739 12.615,-11.694 0.656,-2.451 1.699,-8.884 1.251,-13.335 -0.085,-0.805 0.129,-1.521 0.621,-2.065 0.45,-0.505 1.101,-0.794 1.778,-0.794 1.515,-0 2.82,-0 7.511,14.598 2.481,7.698 0.645,14.903 -5.45,21.424l-0.226,0.231c0.024,0.044 0.049,0.09 0.08,0.144 2.57,4.236 3.963,9.54 3.553,13.51 -0.099,0.906 -0.265,1.775 -0.419,2.549 -0.003,0.01 -0.003,0.016 -0.004,0.029 0.516,-0.032 1.119,-0.055 1.775,-0.055 3.052,-0 7.435,0.474 10.989,2.735 2.135,1.352 4.845,3.439 6.835,7.615C189.223,102.942 190.076,109.575 189.478,117.853m4.77,-23.191c-2.916,-6.1 -6.989,-9.177 -9.793,-10.96 -2.355,-1.494 -5.064,-2.584 -8.077,-3.24l-0.676,-0.146 -0.111,-0.689c-0.339,-2.119 -0.918,-4.275 -1.715,-6.406l-0.185,-0.49 0.292,-0.434c5.095,-7.594 6.323,-16.17 3.54,-24.802 -2.191,-6.824 -3.895,-11.211 -5.341,-13.799 -2.954,-5.305 -7.006,-6.417 -9.891,-6.417 -2.964,-0 -5.8,1.261 -7.789,3.457 -2.043,2.254 -2.993,5.207 -2.678,8.31 0.316,3.134 -0.494,8.516 -1.014,10.439 -0.04,0.117 -0.975,2.929 -8.201,6.428 -0.162,0.056 -0.512,0.179 -1.053,0.359 -3.729,1.246 -10.666,3.571 -15.258,9.64 -3.465,4.205 -4.332,8.441 -5.338,13.346 -0.586,2.865 -1.236,6.744 -1.079,11.344l0.026,0.841 -0.824,0.188c-11.646,2.585 -20.025,7.835 -24.909,15.605 -5.054,8.04 -5.919,18.055 -2.543,29.853 0.063,0.204 0.126,0.407 0.189,0.615l0.527,1.608 -1.665,-0.286c-0.561,-0.101 -1.135,-0.18 -1.729,-0.241 -0.493,-0.06 -1.001,-0.082 -1.509,-0.082 -5.633,-0 -11.663,3.585 -16.128,9.592 -3.451,4.641 -7.588,12.849 -7.735,25.601 -0.114,9.573 0.906,18.401 3.038,26.228 1.581,5.795 3.326,9.329 4.004,10.577l13.306,24.94 6.096,-27.619c2.454,-11.09 4.864,-15.262 7.725,-18.111l0.561,-0.563 0.679,0.411c6.605,3.977 14.466,6.084 22.73,6.084 9.286,-0 18.965,-2.682 27.259,-7.551 5.38,-3.16 9.974,-7.036 13.649,-11.531l0.45,-0.369 0.85,-0.02c2.156,-0.068 5.16,-1.164 8.222,-3.004 2.6,-1.555 6.543,-4.428 10.501,-9.262 3.997,-4.884 7.274,-10.854 9.716,-17.734 2.876,-8.073 4.625,-17.489 5.204,-28.004 0.689,-9.668 -0.434,-17.641 -3.327,-23.704"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="m180.026,98.414c-1.67,-2.596 -3.771,-4.206 -5.475,-4.206 -0.313,-0 -0.613,0.051 -0.895,0.161 -0.911,0.361 -2.356,4.532 -1.714,7.566 0.434,2.066 2.938,9.04 4.151,12.394 0.456,1.281 0.68,1.91 0.754,2.142 0.064,0.183 0.145,0.448 0.256,0.774 0.97,2.971 3.467,10.586 4.206,16.761 1.549,-6.579 2.424,-14.512 2.085,-23.997C183.235,105.662 182.04,101.538 180.026,98.414"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="M168.088,142.604C169.896,142.111 171.33,141.705 172.398,141.395 170.213,139.874 167.689,137.979 164.247,135.304c-8.418,-6.546 -17.449,-9.87 -26.839,-9.87 -5.135,-0 -9.611,0.991 -13.156,2.186 0.882,-0.05 1.779,-0.079 2.7,-0.079 1.1,-0 2.247,0.04 3.411,0.119 3.652,0.246 13.061,1.901 21.565,12.047 1.714,2.039 3.559,3.73 8.794,3.73 1.873,-0 4.051,-0.207 6.662,-0.645C167.544,142.751 167.793,142.678 168.088,142.604"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-    <path
-        android:pathData="m164.3,147.583c-0.122,1.563 -0.376,4.509 -0.782,6.76 -0.495,2.719 -1.31,5.02 -1.791,6.226 0.85,0.786 1.694,1.553 2.247,2.043 2.214,-1.447 9.47,-6.96 14.483,-19.474C176.847,144.229 174.59,145.178 171.671,146.018 168.701,146.861 165.82,147.357 164.3,147.583"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"
-        android:fillType="nonZero"/>
-  </group>
-</vector>
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,4 +1,5 @@
 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
@@ -11,16 +12,16 @@ buildscript {
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath 'com.google.gms:google-services:4.3.14'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
    }
 }

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

    if (System.properties['os.arch'] == "aarch64") {
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -76,6 +76,7 @@ dependencies {
    implementation project(':react-native-get-random-values')
    implementation project(':react-native-immersive')
    implementation project(':react-native-keep-awake')
+    implementation project(':react-native-masked-view_masked-view')
    implementation project(':react-native-orientation-locker')
    implementation project(':react-native-pager-view')
    implementation project(':react-native-performance')
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
@@ -81,8 +81,6 @@ public class JitsiMeetView extends FrameLayout {
                result.putBoolean(key, (Boolean)bValue);
            } else if (valueType.contentEquals("String")) {
                result.putString(key, (String)bValue);
-            } else if (valueType.contentEquals("Integer")) {
-                result.putInt(key, (int)bValue);
            } else if (valueType.contentEquals("Bundle")) {
                result.putBundle(key, mergeProps((Bundle)aValue, (Bundle)bValue));
            } else {
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@@ -73,6 +73,7 @@ class ReactInstanceManagerHolder {
                new SplashScreenModule(reactContext),
                new PictureInPictureModule(reactContext),
                new ProximityModule(reactContext),
+                new WiFiStatsModule(reactContext),
                new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)));

        if (AudioModeModule.useConnectionService()) {
@@ -119,10 +120,11 @@ class ReactInstanceManagerHolder {
            new com.oblador.performance.PerformancePackage(),
            new com.reactnativecommunity.slider.ReactSliderPackage(),
            new com.brentvatne.react.ReactVideoPackage(),
+            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.RNGestureHandlerPackage(),
+            new com.swmansion.gesturehandler.react.RNGestureHandlerPackage(),
            new org.linusu.RNGetRandomValuesPackage(),
            new com.rnimmersive.RNImmersivePackage(),
            new com.swmansion.rnscreens.RNScreensPackage(),
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/WebRTCVideoDecoderFactory.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/WebRTCVideoDecoderFactory.java
@@ -42,10 +42,10 @@ public class WebRTCVideoDecoderFactory implements VideoDecoderFactory {
    public VideoCodecInfo[] getSupportedCodecs() {
        List<VideoCodecInfo> codecs = new ArrayList<>();

-        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);
        codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP8.name(), new HashMap<>()));
        codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
        codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
+        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);

        return codecs.toArray(new VideoCodecInfo[codecs.size()]);
    }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/WebRTCVideoEncoderFactory.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/WebRTCVideoEncoderFactory.java
@@ -43,10 +43,10 @@ public class WebRTCVideoEncoderFactory implements VideoEncoderFactory {
    public VideoCodecInfo[] getSupportedCodecs() {
        List<VideoCodecInfo> codecs = new ArrayList<>();

-        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);
        codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP8.name(), new HashMap<>()));
        codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
        codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
+        codecs.add(H264Utils.DEFAULT_H264_BASELINE_PROFILE_CODEC);

        return codecs.toArray(new VideoCodecInfo[codecs.size()]);
    }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/WiFiStatsModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/WiFiStatsModule.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright @ 2017-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;
+
+import android.content.Context;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.module.annotations.ReactModule;
+
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Module exposing WiFi statistics.
+ *
+ * Gathers rssi, signal in percentage, timestamp and the addresses of the wifi
+ * device.
+ */
+@ReactModule(name = WiFiStatsModule.NAME)
+class WiFiStatsModule
+    extends ReactContextBaseJavaModule {
+
+    public static final String NAME = "WiFiStats";
+
+    /**
+     * The {@code Log} tag {@code WiFiStatsModule} is to log messages with.
+     */
+    static final String TAG = NAME;
+
+    /**
+     * The scale used for the signal value. A level of the signal, given in the
+     * range of 0 to SIGNAL_LEVEL_SCALE-1 (both inclusive).
+     */
+    public final static int SIGNAL_LEVEL_SCALE = 101;
+
+    /**
+     * {@link ExecutorService} for running all operations on a dedicated thread.
+     */
+    private static final ExecutorService executor
+        = Executors.newSingleThreadExecutor();
+
+    /**
+     * Initializes a new module instance. There shall be a single instance of
+     * this module throughout the lifetime of the application.
+     *
+     * @param reactContext the {@link ReactApplicationContext} where this module
+     * is created.
+     */
+    public WiFiStatsModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    /**
+     * Gets the name for this module to be used in the React Native bridge.
+     *
+     * @return a string with the module name.
+     */
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    /**
+     * Returns the {@link InetAddress} represented by this int.
+     *
+     * @param value the int representation of the ip address.
+     * @return the {@link InetAddress}.
+     * @throws UnknownHostException - if IP address is of illegal length.
+     */
+    public static InetAddress toInetAddress(int value)
+            throws UnknownHostException {
+        return InetAddress.getByAddress(
+            new byte[] {
+                    (byte) value,
+                    (byte) (value >> 8),
+                    (byte) (value >> 16),
+                    (byte) (value >> 24)
+            });
+    }
+
+    /**
+     * Public method to retrieve WiFi stats.
+     *
+     * @param promise a {@link Promise} which will be resolved if WiFi stats are
+     * retrieved successfully, and it will be rejected otherwise.
+     */
+    @ReactMethod
+    public void getWiFiStats(final Promise promise) {
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Context context
+                        = getReactApplicationContext().getApplicationContext();
+                    WifiManager wifiManager
+                        = (WifiManager) context
+                            .getSystemService(Context.WIFI_SERVICE);
+
+                    if (!wifiManager.isWifiEnabled()) {
+                        promise.reject(new Exception("Wifi not enabled"));
+                        return;
+                    }
+
+                    WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+
+                    if (wifiInfo.getNetworkId() == -1) {
+                        promise.reject(new Exception("Wifi not connected"));
+                        return;
+                    }
+
+                    int rssi = wifiInfo.getRssi();
+                    int signalLevel
+                        = WifiManager.calculateSignalLevel(
+                            rssi, SIGNAL_LEVEL_SCALE);
+
+                    JSONObject result = new JSONObject();
+                    result.put("rssi", rssi)
+                        .put("signal", signalLevel)
+                        .put("timestamp", System.currentTimeMillis());
+
+                    JSONArray addresses = new JSONArray();
+
+                    InetAddress wifiAddress
+                        = toInetAddress(wifiInfo.getIpAddress());
+
+                    try {
+                        Enumeration<NetworkInterface> e
+                            =  NetworkInterface.getNetworkInterfaces();
+                        while (e.hasMoreElements()) {
+                            NetworkInterface networkInterface = e.nextElement();
+                            boolean found = false;
+
+                            // first check whether this is the desired interface
+                            Enumeration<InetAddress> as
+                                = networkInterface.getInetAddresses();
+                            while (as.hasMoreElements()) {
+                                InetAddress a = as.nextElement();
+                                if(a.equals(wifiAddress)) {
+                                    found = true;
+                                    break;
+                                }
+                            }
+
+                            if (found) {
+                                // interface found let's put addresses
+                                // to the result object
+                                as = networkInterface.getInetAddresses();
+                                while (as.hasMoreElements()) {
+                                    InetAddress a = as.nextElement();
+                                    if (a.isLinkLocalAddress())
+                                        continue;
+
+                                    addresses.put(a.getHostAddress());
+                                }
+                            }
+
+                        }
+                    } catch (SocketException e) {
+                        JitsiMeetLogger.e(e, TAG + " Unable to NetworkInterface.getNetworkInterfaces()");
+                    }
+
+                    result.put("addresses", addresses);
+                    promise.resolve(result.toString());
+
+                    JitsiMeetLogger.d(TAG + " WiFi stats: " + result.toString());
+                } catch (Throwable e) {
+                    JitsiMeetLogger.e(e, TAG + " Failed to obtain wifi stats");
+                    promise.reject(
+                        new Exception("Failed to obtain wifi stats"));
+                }
+            }
+        };
+        executor.execute(r);
+    }
+}
--- a/android/sdk/src/main/res/drawable-hdpi/ic_notification.png
+++ b/android/sdk/src/main/res/drawable-hdpi/ic_notification.png
--- a/android/sdk/src/main/res/drawable-mdpi/ic_notification.png
+++ b/android/sdk/src/main/res/drawable-mdpi/ic_notification.png
--- a/android/sdk/src/main/res/drawable-xhdpi/ic_notification.png
+++ b/android/sdk/src/main/res/drawable-xhdpi/ic_notification.png
--- a/android/sdk/src/main/res/drawable-xxhdpi/ic_notification.png
+++ b/android/sdk/src/main/res/drawable-xxhdpi/ic_notification.png
--- a/android/sdk/src/main/res/drawable-xxxhdpi/ic_notification.png
+++ b/android/sdk/src/main/res/drawable-xxxhdpi/ic_notification.png
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -31,6 +31,8 @@ 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-orientation-locker'
 project(':react-native-orientation-locker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation-locker/android')
 include ':react-native-pager-view'
--- a/conference.js
+++ b/conference.js
@@ -44,10 +44,8 @@ import {
    conferenceUniqueIdSet,
    conferenceWillJoin,
    conferenceWillLeave,
-    dataChannelClosed,
    dataChannelOpened,
    e2eRttChanged,
-    generateVisitorConfig,
    getConferenceOptions,
    kickedOut,
    lockStateChanged,
@@ -56,7 +54,10 @@ import {
    p2pStatusChanged,
    sendLocalParticipant
 } from './react/features/base/conference';
-import { getReplaceParticipant } from './react/features/base/config/functions';
+import {
+    getMultipleVideoSendingSupportFeatureFlag,
+    getReplaceParticipant
+} from './react/features/base/config/functions';
 import {
    checkAndNotifyForNewDevice,
    getAvailableDevices,
@@ -103,7 +104,6 @@ import {
    participantMutedUs,
    participantPresenceChanged,
    participantRoleChanged,
-    participantSourcesUpdated,
    participantUpdated,
    screenshareParticipantDisplayNameChanged,
    updateRemoteParticipantFeatures
@@ -134,12 +134,9 @@ import {
 import { maybeSetLobbyChatMessageListener } from './react/features/lobby/actions.any';
 import { setNoiseSuppressionEnabled } from './react/features/noise-suppression/actions';
 import {
-    DATA_CHANNEL_CLOSED_NOTIFICATION_ID,
    NOTIFICATION_TIMEOUT_TYPE,
-    hideNotification,
    isModerationNotificationDisplayed,
-    showNotification,
-    showWarningNotification
+    showNotification
 } from './react/features/notifications';
 import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay';
 import { suspendDetected } from './react/features/power-monitor';
@@ -279,8 +276,7 @@ class ConferenceConnector {
    /**
     *
     */
-    constructor(resolve, reject, conference) {
-        this._conference = conference;
+    constructor(resolve, reject) {
        this._resolve = resolve;
        this._reject = reject;
        this.reconnectTimeout = null;
@@ -339,26 +335,6 @@ class ConferenceConnector {
            break;
        }

-        case JitsiConferenceErrors.REDIRECTED: {
-            generateVisitorConfig(APP.store.getState(), params);
-
-            connection.disconnect().then(() => {
-                connect(this._conference.roomName).then(con => {
-                    const localTracks = getLocalTracks(APP.store.getState()['features/base/tracks']);
-
-                    const jitsiTracks = localTracks.map(t => t.jitsiTrack);
-
-                    // visitors connect muted
-                    jitsiTracks.forEach(t => t.mute());
-
-                    // TODO disable option to unmute audio or video
-                    this._conference.startConference(con, jitsiTracks);
-                });
-            });
-
-            break;
-        }
-
        case JitsiConferenceErrors.GRACEFUL_SHUTDOWN:
            APP.UI.notifyGracefulShutdown();
            break;
@@ -482,11 +458,6 @@ export default {
     */
    _localTracksInitialized: false,

-    /**
-     * Flag used to prevent the creation of another local video track in this.muteVideo if one is already in progress.
-     */
-    isCreatingLocalTrack: false,
-
    isSharingScreen: false,

    /**
@@ -755,7 +726,7 @@ export default {
        // XXX The API will take care of disconnecting from the XMPP
        // server (and, thus, leaving the room) on unload.
        return new Promise((resolve, reject) => {
-            new ConferenceConnector(resolve, reject, this).connect();
+            new ConferenceConnector(resolve, reject).connect();
        });
    },

@@ -1056,13 +1027,11 @@ export default {

        const localVideo = getLocalJitsiVideoTrack(APP.store.getState());

-        if (!localVideo && !mute && !this.isCreatingLocalTrack) {
+        if (!localVideo && !mute) {
            const maybeShowErrorDialog = error => {
                showUI && APP.store.dispatch(notifyCameraError(error));
            };

-            this.isCreatingLocalTrack = true;
-
            // Try to create local video if there wasn't any.
            // This handles the case when user joined with no video
            // (dismissed screen sharing screen or in audio only mode), but
@@ -1084,9 +1053,6 @@ export default {
                    logger.debug(`muteVideo: calling useVideoStream for track: ${videoTrack}`);

                    return this.useVideoStream(videoTrack);
-                })
-                .finally(() => {
-                    this.isCreatingLocalTrack = false;
                });
        } else {
            // FIXME show error dialog if it fails (should be handled by react)
@@ -1372,7 +1338,7 @@ export default {
        this._createRoom(localTracks);

        return new Promise((resolve, reject) => {
-            new ConferenceConnector(resolve, reject, this).connect();
+            new ConferenceConnector(resolve, reject).connect();
        });
    },

@@ -1452,13 +1418,30 @@ export default {
                    return;
                }

-                // Add the track to the conference if there is no existing track, replace it otherwise.
-                const trackAction = oldTrack
-                    ? replaceLocalTrack(oldTrack, newTrack, room)
-                    : addLocalTrack(newTrack);
+                // In the multi-stream mode, add the track to the conference if there is no existing track, replace it
+                // otherwise.
+                if (getMultipleVideoSendingSupportFeatureFlag(state)) {
+                    const trackAction = oldTrack
+                        ? replaceLocalTrack(oldTrack, newTrack, room)
+                        : addLocalTrack(newTrack);

-                APP.store.dispatch(trackAction)
+                    APP.store.dispatch(trackAction)
+                        .then(() => {
+                            this.setVideoMuteStatus();
+                        })
+                        .then(resolve)
+                        .catch(error => {
+                            logger.error(`useVideoStream failed: ${error}`);
+                            reject(error);
+                        })
+                        .then(onFinish);
+
+                    return;
+                }
+                APP.store.dispatch(
+                    replaceLocalTrack(oldTrack, newTrack, room))
                    .then(() => {
+                        this._setSharingScreen(newTrack);
                        this.setVideoMuteStatus();
                    })
                    .then(resolve)
@@ -1988,11 +1971,6 @@ export default {
            APP.store.dispatch(participantKicked(kicker, kicked));
        });

-        room.on(JitsiConferenceEvents.PARTICIPANT_SOURCE_UPDATED,
-            jitsiParticipant => {
-                APP.store.dispatch(participantSourcesUpdated(jitsiParticipant));
-            });
-
        room.on(JitsiConferenceEvents.SUSPEND_DETECTED, () => {
            APP.store.dispatch(suspendDetected());
        });
@@ -2089,18 +2067,6 @@ export default {
        room.on(
            JitsiConferenceEvents.DATA_CHANNEL_OPENED, () => {
                APP.store.dispatch(dataChannelOpened());
-                APP.store.dispatch(hideNotification(DATA_CHANNEL_CLOSED_NOTIFICATION_ID));
-            }
-        );
-
-        room.on(
-            JitsiConferenceEvents.DATA_CHANNEL_CLOSED, ev => {
-                APP.store.dispatch(dataChannelClosed(ev.code, ev.reason));
-                APP.store.dispatch(showWarningNotification({
-                    descriptionKey: 'notify.dataChannelClosedDescription',
-                    titleKey: 'notify.dataChannelClosed',
-                    uid: DATA_CHANNEL_CLOSED_NOTIFICATION_ID
-                }, NOTIFICATION_TIMEOUT_TYPE.STICKY));
            }
        );

@@ -2348,7 +2314,7 @@ export default {
     * @param {MediaDeviceInfo[]} devices
     * @returns {Promise}
     */
-    async _onDeviceListChanged(devices) {
+    _onDeviceListChanged(devices) {
        const oldDevices = APP.store.getState()['features/base/devices'].availableDevices;
        const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
        const localVideo = getLocalJitsiVideoTrack(APP.store.getState());
@@ -2362,10 +2328,13 @@ export default {
        const newDevices
            = mediaDeviceHelper.getNewMediaDevicesAfterDeviceListChanged(
                devices,
+                this.isSharingScreen,
                localVideo,
                localAudio,
                newLabelsOnly);
        const promises = [];
+        const audioWasMuted = this.isLocalAudioMuted();
+        const videoWasMuted = this.isLocalVideoMuted();
        const requestedInput = {
            audio: Boolean(newDevices.audioinput),
            video: Boolean(newDevices.videoinput)
@@ -2377,6 +2346,7 @@ export default {
                = setAudioOutputDeviceId(newDevices.audiooutput, dispatch)
                    .catch(); // Just ignore any errors in catch block.

+
            promises.push(setAudioOutputPromise);
        }

@@ -2393,7 +2363,8 @@ export default {
        }

        // Let's handle unknown/non-preferred devices
-        const newAvailDevices = APP.store.getState()['features/base/devices'].availableDevices;
+        const newAvailDevices
+            = APP.store.getState()['features/base/devices'].availableDevices;
        let newAudioDevices = [];
        let oldAudioDevices = [];

@@ -2409,85 +2380,103 @@ export default {

        // check for audio
        if (newAudioDevices.length > 0) {
-            APP.store.dispatch(checkAndNotifyForNewDevice(newAudioDevices, oldAudioDevices));
+            APP.store.dispatch(
+                checkAndNotifyForNewDevice(newAudioDevices, oldAudioDevices));
        }

        // check for video
        if (!requestedInput.video) {
-            APP.store.dispatch(checkAndNotifyForNewDevice(newAvailDevices.videoInput, oldDevices.videoInput));
+            APP.store.dispatch(
+                checkAndNotifyForNewDevice(newAvailDevices.videoInput, oldDevices.videoInput));
        }

-        // When the 'default' mic needs to be selected, we need to pass the real device id to gUM instead of 'default'
-        // in order to get the correct MediaStreamTrack from chrome because of the following bug.
+        // When the 'default' mic needs to be selected, we need to
+        // pass the real device id to gUM instead of 'default' in order
+        // to get the correct MediaStreamTrack from chrome because of the
+        // following bug.
        // https://bugs.chromium.org/p/chromium/issues/detail?id=997689
        const hasDefaultMicChanged = newDevices.audioinput === 'default';

-        // When the local video is muted and a preferred device is connected, update the settings and remove the track
-        // from the conference. A new track will be created and replaced when the user unmutes their camera.
+        // This is the case when the local video is muted and a preferred device is connected.
        if (requestedInput.video && this.isLocalVideoMuted()) {
-            APP.store.dispatch(updateSettings({
+            // We want to avoid creating a new video track in order to prevent turning on the camera.
+            requestedInput.video = false;
+            APP.store.dispatch(updateSettings({ // Update the current selected camera for the device selection dialog.
                cameraDeviceId: newDevices.videoinput
            }));
-            requestedInput.video = false;
            delete newDevices.videoinput;

-            // Remove the track from the conference.
-            if (localVideo) {
-                await this.useVideoStream(null);
-                logger.debug('_onDeviceListChanged: Removed the current video track.');
-            }
+            // Removing the current video track in order to force the unmute to select the preferred device.
+            logger.debug('_onDeviceListChanged: Removing the current video track.');
+            this.useVideoStream(null);
+
        }

-        // When the local audio is muted and a preferred device is connected, update the settings and remove the track
-        // from the conference. A new track will be created and replaced when the user unmutes their mic.
-        if (requestedInput.audio && this.isLocalAudioMuted()) {
-            APP.store.dispatch(updateSettings({
-                micDeviceId: newDevices.audioinput
-            }));
-            requestedInput.audio = false;
-            delete newDevices.audioinput;
-
-            // Remove the track from the conference.
-            if (localAudio) {
-                await this.useAudioStream(null);
-                logger.debug('_onDeviceListChanged: Removed the current audio track.');
-            }
-        }
-
-        // Create the tracks and replace them only if the user is unmuted.
-        if (requestedInput.audio || requestedInput.video) {
-            let tracks = [];
-
-            try {
-                tracks = await mediaDeviceHelper.createLocalTracksAfterDeviceListChanged(
+        promises.push(
+            mediaDeviceHelper.createLocalTracksAfterDeviceListChanged(
                    createLocalTracksF,
                    newDevices.videoinput,
                    hasDefaultMicChanged
                        ? getDefaultDeviceId(APP.store.getState(), 'audioInput')
-                        : newDevices.audioinput);
-            } catch (error) {
-                logger.error(`Track creation failed on device change, ${error}`);
+                        : newDevices.audioinput)
+                .then(tracks => {
+                    // If audio or video muted before, or we unplugged current
+                    // device and selected new one, then mute new track.
+                    const muteSyncPromises = tracks.map(track => {
+                        if ((track.isVideoTrack() && videoWasMuted)
+                            || (track.isAudioTrack() && audioWasMuted)) {
+                            return track.mute();
+                        }

-                return Promise.reject(error);
-            }
+                        return Promise.resolve();
+                    });

-            for (const track of tracks) {
-                if (track.isAudioTrack()) {
-                    promises.push(
-                        this.useAudioStream(track)
-                            .then(() => {
-                                hasDefaultMicChanged && (track._realDeviceId = track.deviceId = 'default');
-                                this._updateAudioDeviceId();
-                            }));
-                } else {
-                    promises.push(
-                        this.useVideoStream(track)
-                            .then(() => {
-                                this._updateVideoDeviceId();
-                            }));
-                }
-            }
-        }
+                    return Promise.all(muteSyncPromises)
+                        .then(() =>
+                            Promise.all(Object.keys(requestedInput).map(mediaType => {
+                                if (requestedInput[mediaType]) {
+                                    const useStream
+                                        = mediaType === 'audio'
+                                            ? this.useAudioStream.bind(this)
+                                            : this.useVideoStream.bind(this);
+                                    const track = tracks.find(t => t.getType() === mediaType) || null;
+
+                                    // Use the new stream or null if we failed to obtain it.
+                                    return useStream(track)
+                                        .then(() => {
+                                            if (track?.isAudioTrack() && hasDefaultMicChanged) {
+                                                // workaround for the default device to be shown as selected in the
+                                                // settings even when the real device id was passed to gUM because of
+                                                // the above mentioned chrome bug.
+                                                track._realDeviceId = track.deviceId = 'default';
+                                            }
+                                            mediaType === 'audio'
+                                                ? this._updateAudioDeviceId()
+                                                : this._updateVideoDeviceId();
+                                        });
+                                }
+
+                                return Promise.resolve();
+                            })));
+                })
+                .then(() => {
+                    // Log and sync known mute state.
+                    if (audioWasMuted) {
+                        sendAnalytics(createTrackMutedEvent(
+                            'audio',
+                            'device list changed'));
+                        logger.log('Audio mute: device list changed');
+                        muteLocalAudio(true);
+                    }
+
+                    if (!this.isSharingScreen && videoWasMuted) {
+                        sendAnalytics(createTrackMutedEvent(
+                            'video',
+                            'device list changed'));
+                        logger.log('Video mute: device list changed');
+                        muteLocalVideo(true);
+                    }
+                }));

        return Promise.all(promises)
            .then(() => {
--- a/config.js
+++ b/config.js
@@ -79,6 +79,11 @@ var config = {
        // This is useful when the client runs on a host with limited resources.
        // noAutoPlayVideo: false,

+        // 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.
@@ -257,6 +262,17 @@ var config = {
    // applied locally. FIXME: having these 2 options is confusing.
    // startWithVideoMuted: false,

+    // If set to true, prefer to use the H.264 video codec (if supported).
+    // Note that it's not recommended to do this because simulcast is not
+    // supported when  using H.264. For 1-to-1 calls this setting is enabled by
+    // default and can be toggled in the p2p section.
+    // This option has been deprecated, use preferredCodec under videoQuality section instead.
+    // preferH264: true,
+
+    // If set to true, disable H.264 video codec by stripping it out of the
+    // SDP.
+    // disableH264: false,
+
    // Desktop sharing

    // Optional desktop sharing frame rate options. Default value: min:5, max:5.
@@ -418,6 +434,12 @@ var config = {
    //     90: 2,
    // },

+    // Provides a way to translate the legacy bridge signaling messages, 'LastNChangedEvent',
+    // 'SelectedEndpointsChangedEvent' and 'ReceiverVideoConstraint' into the new 'ReceiverVideoConstraints' message
+    // that invokes the new bandwidth allocation algorithm in the bridge which is described here
+    // - https://github.com/jitsi/jitsi-videobridge/blob/master/doc/allocation.md.
+    // useNewBandwidthAllocationStrategy: false,
+
    // Specify the settings for video quality optimizations on the client.
    // videoQuality: {
    //    // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
@@ -542,15 +564,12 @@ var config = {
    // Disables responsive tiles.
    // disableResponsiveTiles: false,

-    // DEPRECATED. Please use `securityUi?.hideLobbyButton` instead.
-    // Hides lobby button.
+    // Hides lobby button
    // hideLobbyButton: false,

-    // DEPRECATED. Please use `lobby?.autoKnock` instead.
    // If Lobby is enabled starts knocking automatically.
    // autoKnockLobby: false,

-    // DEPRECATED. Please use `lobby?.enableChat` instead.
    // Enable lobby chat.
    // enableLobbyChat: true,

@@ -561,35 +580,9 @@ var config = {
    // Require users to always specify a display name.
    // requireDisplayName: true,

-    // DEPRECATED! Use 'welcomePage.disabled' instead.
    // Whether to use a welcome page or not. In case it's false a random room
    // will be joined when no room is specified.
-    // enableWelcomePage: true,
-
-    // Configs for welcome page.
-    // welcomePage: {
-    //     // Whether to disable welcome page. In case it's disabled a random room
-    //     // will be joined when no room is specified.
-    //     disabled: false,
-    //     // If set,landing page will redirect to this URL.
-    //     customUrl: ''
-    // },
-
-    // Configs for the lobby screen.
-    // lobby {
-    //     // If Lobby is enabled, it starts knocking automatically. Replaces `autoKnockLobby`.
-    //     autoKnock: false,
-    //     // Enables the lobby chat. Replaces `enableLobbyChat`.
-    //     enableChat: true,
-    // },
-
-    // Configs for the security related UI elements.
-    // securityUi: {
-    //     // Hides the lobby button. Replaces `hideLobbyButton`.
-    //     hideLobbyButton: false,
-    //     // Hides the possibility to set and enter a lobby password.
-    //     disableLobbyPassword: false,
-    // },
+    enableWelcomePage: true,

    // Disable app shortcuts that are registered upon joining a conference
    // disableShortcuts: false,
@@ -708,6 +701,7 @@ var config = {
    //    'chat',
    //    'closedcaptions',
    //    'desktop',
+    //    'dock-iframe',
    //    'download',
    //    'embedmeeting',
    //    'etherpad',
@@ -735,6 +729,7 @@ var config = {
    //    'stats',
    //    'tileview',
    //    'toggle-camera',
+    //    'undock-iframe',
    //    'videoquality',
    //    'whiteboard',
    // ],
@@ -818,14 +813,6 @@ var config = {
    // 'microphone', 'camera', 'select-background', 'invite', 'settings'
    // hiddenPremeetingButtons: [],

-    // An array with custom option buttons for the participant context menu
-    // type:  Array<{ icon: string; id: string; text: string; }>
-    // customParticipantMenuButtons: [],
-
-    // An array with custom option buttons for the toolbar
-    // type:  Array<{ icon: string; id: string; text: string; }>
-    // customToolbarButtons: [],
-
    // Stats
    //

@@ -928,10 +915,18 @@ var config = {
        // If not set, the effective value is 'all'.
        // iceTransportPolicy: 'all',

+        // If set to true, it will prefer to use H.264 for P2P calls (if H.264
+        // is supported). This setting is deprecated, use preferredCodec instead.
+        // preferH264: true,
+
        // Provides a way to set the video codec preference on the p2p connection. Acceptable
        // codec values are 'VP8', 'VP9' and 'H264'.
        // preferredCodec: 'H264',

+        // If set to true, disable H.264 video codec by stripping it out of the
+        // SDP. This setting is deprecated, use disabledCodec instead.
+        // disableH264: false,
+
        // Provides a way to prevent a video codec from being negotiated on the p2p connection.
        // disabledCodec: '',

@@ -1088,64 +1083,10 @@ var config = {
    // use only.
    // _desktopSharingSourceDevice: 'sample-id-or-label',

-    // DEPRECATED! Use deeplinking.disabled instead.
    // If true, any checks to handoff to another application will be prevented
    // and instead the app will continue to display in the current browser.
    // disableDeepLinking: false,

-    // The deeplinking config.
-    // For information about the properties of
-    // deeplinking.[ios/android].dynamicLink check:
-    // https://firebase.google.com/docs/dynamic-links/create-manually
-    // deeplinking: {
-    //
-    //     // The desktop deeplinking config.
-    //     desktop: {
-    //         appName: 'Jitsi Meet'
-    //     },
-    //     // If true, any checks to handoff to another application will be prevented
-    //     // and instead the app will continue to display in the current browser.
-    //     disabled: false,
-
-    //     // whether to hide the logo on the deep linking pages.
-    //     hideLogo: false,
-
-    //     // The ios deeplinking config.
-    //     ios: {
-    //         appName: 'Jitsi Meet',
-    //         // Specify mobile app scheme for opening the app from the mobile browser.
-    //         appScheme: 'org.jitsi.meet',
-    //         // Custom URL for downloading ios mobile app.
-    //         downloadLink: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905',
-    //         dynamicLink: {
-    //             apn: 'org.jitsi.meet',
-    //             appCode: 'w2atb',
-    //             customDomain: undefined,
-    //             ibi: 'com.atlassian.JitsiMeet.ios',
-    //             isi: '1165103905'
-    //         }
-    //     },
-
-    //     // The android deeplinking config.
-    //     android: {
-    //         appName: 'Jitsi Meet',
-    //         // Specify mobile app scheme for opening the app from the mobile browser.
-    //         appScheme: 'org.jitsi.meet',
-    //         // Custom URL for downloading android mobile app.
-    //         downloadLink: 'https://play.google.com/store/apps/details?id=org.jitsi.meet',
-    //         // Android app package name.
-    //         appPackage: 'org.jitsi.meet',
-    //         fDroidUrl: 'https://f-droid.org/en/packages/org.jitsi.meet/',
-    //         dynamicLink: {
-    //             apn: 'org.jitsi.meet',
-    //             appCode: 'w2atb',
-    //             customDomain: undefined,
-    //             ibi: 'com.atlassian.JitsiMeet.ios',
-    //             isi: '1165103905'
-    //         }
-    //     }
-    // },
-
    // A property to disable the right click context menu for localVideo
    // the menu has option to flip the locally seen video for local presentations
    // disableLocalVideoFlip: false,
@@ -1362,7 +1303,6 @@ var config = {
     deploymentInfo
     dialOutAuthUrl
     dialOutCodesUrl
-     dialOutRegionUrl
     disableRemoteControl
     displayJids
     externalConnectUrl
@@ -1543,8 +1483,6 @@ var config = {
    //     tileTime: 5000,
    //     // Limit results by rating: g, pg, pg-13, r. Default value: g.
    //     rating: 'pg',
-    //     // The proxy server url for giphy requests in the web app.
-    //     proxyUrl: 'https://giphy-proxy.example.com',
    // },

    // Logging
@@ -1574,12 +1512,6 @@ var config = {
    // },
 };

-// Temporary backwards compatibility with old mobile clients.
-config.flags = config.flags || {};
-config.flags.sourceNameSignaling = true;
-config.flags.sendMultipleVideoStreams = true;
-config.flags.receiveMultipleVideoStreams = true;
-
 // Set the default values for JaaS customers
 if (enableJaaS) {
    config.dialInNumbersUrl = 'https://conference-mapper.jitsi.net/v1/access/dids';
--- a/css/_audio-preview.scss
+++ b/css/_audio-preview.scss
@@ -2,13 +2,13 @@
    display: inline-block;

    &-content {
-        position: relative;
-        right: auto;
-        margin-bottom: 8px;
+        background: $menuBG;
+        border-radius: 3px;
+        font-size: 14px;
+        line-height: 24px;
        max-height: 456px;
        overflow: auto;
        width: 300px;
-
        &-ul {
            margin:0;
            padding:0;
@@ -16,37 +16,90 @@
        }
    }

-    &-header:hover {
-        background-color: initial;
-        cursor: initial;
+    &-header {
+        color: #fff;
+        align-items: center;
+        display: flex;
+        margin-top: 8px;
+        padding: 8px 16px;
+
+        &-icon {
+            display: inline-block;
+
+            svg {
+                fill: #fff;
+            }
+        }
+
+        &--bordered {
+            border-bottom: 1px solid #4C4D50;
+        }
+
+        &-text {
+            margin-left: 12px;
+        }
    }

-    &-entry-text {
-        display: inline-block;
-        text-overflow: ellipsis;
-        max-width: 213px;
-        overflow: hidden;
-        white-space: nowrap;
+    &-entry {
+        align-items: center;
+        color: #fff;
+        cursor: pointer;
+        display: flex;
+        padding: 8px 0;
+        margin-left: 48px;

-        &.left-margin {
-            margin-left: 36px;
+        &--selected {
+            background: #131519;
+            cursor: initial;
+            margin-left: 0;
+            padding-left: 18px;
+        }
+
+        &-text {
+            color: #fff;
+            display: inline-block;
+            line-height: 24px;
+            text-overflow: ellipsis;
+            max-width: 213px;
+            overflow: hidden;
+            white-space: nowrap;
        }
    }

    &-speaker {
        position: relative;

+        &-ul {
+            margin:0;
+            padding:0;
+            list-style-type: none;
+        }
+
        &:hover, &:focus-within, &:focus {
+            .audio-preview-entry {
+                background: #36383C;
+                margin-left: 0;
+                padding-left: 48px;
+
+                &--selected {
+                    padding-left: 18px;
+                    background: $newToolbarBackgroundColor;
+                }
+            }
+
            .audio-preview-test-button {
                display: inline-block;
            }

            .audio-preview-entry-text {
                max-width: 178px;
-                margin-right: 0;
            }
        }

+        &:last-child {
+            padding-bottom: 8px;
+        }
+
        .audio-preview-entry-text {
            max-width: 238px;
        }
@@ -55,6 +108,19 @@
    &-microphone {
        position: relative;

+        &:hover {
+            .audio-preview-entry {
+                background: #36383C;
+                margin-left: 0;
+                padding-left: 48px;
+
+                &--selected {
+                    background: $newToolbarBackgroundColor;
+                    padding-left: 18px;
+                }
+            }
+        }
+
        &--nometer {
            .audio-preview-entry-text {
                max-width: 238px;
@@ -74,21 +140,42 @@
        display: inline-block;
        width: 14px;

+        & svg {
+            fill: #1C2025;
+        }
+
+        &--check {
+            background: #31B76A;
+            margin-right: 16px;
+        }
+
        &--exclamation {
            margin-left: 6px;
-
            & svg {
                fill: #E54B4B;
            }
        }
    }

+    &-hr {
+        border-top: 1px solid #4C4D50;
+        border-bottom: 0;
+    }
+
    &-test-button {
        display: none;
-        padding: 4px 10px;
+        background: #FFF;
+        border: 1px solid #D1DBE8;
+        border-radius: 3px;
+        color: #1C2025;
+        cursor: pointer;
+        font-weight: 600;
+        font-size: 0.8rem;
+        line-height: 24px;
+        padding: 2px 8px;
        position: absolute;
        right: 16px;
-        top: 6px;
+        top: 5px;
    }

    &-meter-mic {
@@ -97,7 +184,9 @@
        top: 14px;
    }

-    &-checkbox-container {
-        padding: 10px 16px;
+    // Override @atlaskit/InlineDialog container which is made with styled components
+    & > div:nth-child(2) {
+        outline: none;
+        padding: 0;
    }
 }
--- a/css/_base.scss
+++ b/css/_base.scss
@@ -126,12 +126,6 @@ form {
    background-size: contain;
 }

-.leftwatermarknomargin {
-    background-position: center left;
-    background-repeat: no-repeat;
-    background-size: contain;
-}
-
 .rightwatermark {
    right: 32px;
    top: 32px;
--- a/css/_chat.scss
+++ b/css/_chat.scss
@@ -32,7 +32,7 @@

 #chat-conversation-container {
    // extract message input height
-    height: calc(100% - 64px);
+    height: calc(100% - 68px);
    overflow: hidden;
    position: relative;
 }
@@ -76,6 +76,32 @@
    }
 }

+#chat-recipient {
+    align-items: center;
+    background-color: $chatPrivateMessageBackgroundColor;
+    display: flex;
+    flex-direction: row;
+    font-weight: 100;
+    padding: 10px;
+
+    span {
+        color: white;
+        display: flex;
+        flex: 1;
+    }
+
+    div {
+        svg {
+            cursor: pointer;
+            fill: white;
+        }
+    }
+
+    &.lobby-chat-recipient {
+        background-color: $chatLobbyMessageBackgroundColor;
+    }
+}
+

 .chat-header {
    height: 70px;
@@ -98,12 +124,13 @@
 }

 .chat-input-container {
-    padding: 0 16px 24px;
+    padding: 0 16px 16px;
 }

 #chat-input {
    display: flex;
    align-items: flex-end;
+    padding: 4px;
    position: relative;
 }

@@ -236,6 +263,15 @@
        -webkit-user-select: text;
        user-select: text;
    }
+
+    .display-name {
+        font-size: 12px;
+        font-weight: 600;
+        margin-bottom: 5px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
 }

 .sr-only {
@@ -252,11 +288,24 @@
 }

 .chatmessage {
+    background-color: $chatRemoteMessageBackgroundColor;
+    border-radius: 0px 6px 6px 6px;
+    box-sizing: border-box;
+    color: white;
+    margin-top: 3px;
+    max-width: 100%;
+    position: relative;
+
    &.localuser {
        background-color: $chatLocalMessageBackgroundColor;
        border-radius: 6px 0px 6px 6px;
    }

+    .usermessage {
+        white-space: pre-wrap;
+        font-size: 14px;
+    }
+
    &.error {
        border-radius: 0px;

@@ -271,12 +320,22 @@
        }
    }

+    .privatemessagenotice {
+        font-size: 11px;
+        font-weight: 100;
+    }
+
    .messagecontent {
+        margin: 8px;
        max-width: 100%;
        overflow: hidden;
    }
 }

+.timestamp {
+    color: #757575;
+}
+
 #smileys {
    font-size: 20pt;
    margin: auto;
@@ -350,9 +409,24 @@
 }

 .chat-message-group {
+    display: flex;
+    flex-direction: column;
+
    &.local {
        align-items: flex-end;

+        .chatmessage {
+            background-color: $chatLocalMessageBackgroundColor;
+            border-radius: 6px 0px 6px 6px;
+
+            &.privatemessage {
+                background-color: $chatPrivateMessageBackgroundColor;
+            }
+            &.lobbymessage {
+                background-color: $chatLobbyMessageBackgroundColor;
+            }
+        }
+
        .display-name {
            display: none;
        }
@@ -363,10 +437,58 @@
    }

    &.error {
+        .chatmessage {
+            background-color: $defaultWarningColor;
+            border-radius: 0px;
+            font-weight: 100;
+        }
+
        .display-name {
            display: none;
        }
    }
+
+    .chatmessage-wrapper {
+        max-width: 100%;
+
+        .replywrapper {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            .messageactions {
+                align-self: stretch;
+                border-left: 1px solid $chatActionsSeparatorColor;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                padding: 5px;
+
+                &.lobbychatmessageactions {
+                    border-left-color: $chatLobbyActionsSeparatorColor;
+                }
+
+                .toolbox-icon {
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+
+    .chatmessage {
+        background-color: $chatRemoteMessageBackgroundColor;
+        border-radius: 0px 6px 6px 6px;
+        display: inline-block;
+        margin-top: 3px;
+        color: white;
+
+        &.privatemessage {
+            background-color: $chatPrivateMessageBackgroundColor;
+        }
+        &.lobbymessage {
+            background-color: $chatLobbyMessageBackgroundColor;
+        }
+    }
 }

 .chat-dialog {
--- a/css/_meter.scss
+++ b/css/_meter.scss
@@ -3,28 +3,28 @@
        display: inline-block;

        & > svg {
-            fill: #525252;
+            fill: #4E5E6C;
            width: 38px;
        }
    }

    &.metr--disabled {
        & > svg {
-            fill: #525252;
+            fill: #4E5E6C;
        }
    }
 }

 .metr-l-0 {
    rect:first-child {
-        fill: #1EC26A;
+        fill: #31B76A;
    }
 }

@for $i from 1 through 7 {
    .metr-l-#{$i} {
        rect:nth-child(-n+#{$i+1}) {
-            fill: #1EC26A;
+            fill: #31B76A;
        }
    }
 }
--- a/css/_polls.scss
+++ b/css/_polls.scss
@@ -1,3 +1,360 @@
+.poll-dialog {
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 20px;
+
+    h1, span, li, strong {
+        color: #bce;
+    }
+    ol {
+        margin: 0;
+    }
+}
+
+.poll-question-field {
+    padding: 8px 16px;
+    padding-bottom: 24px;
+    border-bottom: 1px solid #525252;
+}
+
+.poll-header {
+    margin-bottom: 8px;
+}
+
+.poll-creator {
+    color: #C2C2C2;
+    font-weight: 600;
+    margin: 4px 0 16px 0;
+}
+
+.poll-answer-container {
+    display: flex;
+    padding: 4px;
+    background: #3D3D3D;
+    border-radius: 3px;
+    margin-bottom: 8px;
+
+    @media (max-width: 580px) {
+        &> span {
+            padding: 8px 0;
+        }
+
+        svg {
+            margin-top: 6px;
+        }
+    }
+}
+
+.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;
+}
+
+ol.poll-result-list {
+    margin-bottom: 1.5em;
+}
+
+.poll-result-list > li {
+    margin-bottom: 16px;
+}
+
+.poll-answer-field {
+    flex-direction: column;
+    align-items: stretch;
+    margin-bottom: 16;
+
+}
+
+.poll-answer-field:last-child {
+    margin-bottom: 0;
+}
+
+.poll-create-option-row {
+    display: flex;
+    margin-bottom: 4;
+}
+
+// Needed to override atlaskit default blue color
+.poll-create-container .jsYMHu {
+    background: #292929;
+    border-color: #808090;
+    color: #fff // #808090
+}
+
+.poll-add-button {
+    display: flex;
+    justify-content: center;
+    padding: 8px 16px;
+}
+
+.poll-remove-option-button {
+    background: 0 0;
+    border: none;
+    color: #E04757;
+    padding-left: 0;
+}
+
+.poll-create-add-option {
+    border: none;
+    background-color: #292929;
+    padding: 3px;
+    width: 100%;
+}
+
+.poll-icon-button, .poll-drag-handle {
+    .jitsi-icon svg {
+        fill: #929292;
+    }
+}
+
+.poll-drag-handle {
+    background-color: transparent;
+    border: none;
+    cursor: grab;
+    padding-left: 8;
+    padding-top: 8px;
+    display: flex;
+}
+
+.poll-dragged {
+    opacity: 0.5;
+    * {
+        cursor: grabbing !important;
+    }
+}
+
+.poll-question {
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 26px;
+}
+
+.poll-answer-voters {
+    font-weight: lighter;
+    list-style-type: none;
+    border: #616161 solid 1px;
+    border-radius: 3px;
+    padding: 2px 6px;
+    margin: 4px 0px 12px;
+    background-color: #616161;
+}
+
+.poll-answer-header {
+    display: flex;
+    justify-content: space-between;
+}
+
+.poll-answer-vote-name {
+    flex-shrink: 1;
+    overflow-wrap: anywhere
+}
+
+.poll-answer-vote-count-container{
+    display: flex;
+}
+
+.poll-answer-vote-count {
+    margin-left: 10px;
+    white-space: nowrap;
+    flex: 1;
+    text-align: right;
+}
+
+.poll-answer-short-results{
+    display: flex;
+    min-width: 10em;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.poll-bar-container, .poll-bar {
+    border-radius: 3px;
+    height: 6px;
+}
+
+.poll-bar-container {
+    background-color: #616161;
+    max-width: 160px;
+    margin-top: 3px;
+    flex: 1;
+}
+
+.poll-bar {
+    background-color: #246FE5;
+}
+
+.poll-message-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 12px;
+    margin-top: 5px;
+}
+
+.poll-notice {
+    font-weight: 100;
+    margin-right: 10px;
+}
+
+.poll-show-details {
+    background-color: transparent;
+    border: none;
+
+    &:hover {
+        text-decoration: underline;
+    }
+}
+
+.poll-result-links {
+    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;
+      }
+    }
+}
+
+
+.polls-pane-content {
+    height: 100%;
+    position: relative;
+}
+
+.pane-content{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+}
+
+.empty-pane-icon {
+    width: 50%;
+    padding: 24px;
+}
+
+.empty-pane-icon svg {
+    fill: #3D3D3D;
+    width: 100%;
+    height: auto;
+}
+
+.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;
+}
+
+.poll-answer {
+
+    h1, strong ,span {
+        color: #fff;
+    }
+
+    button > span {
+        color: inherit;
+    }
+}
+
+.poll-create-label {
+    color: #C2C2C2;
+    display: flex;
+    font-weight: 400;
+    margin-bottom: 4;
+}
+
+.expandable-input{
+    line-height: 18px;
+    resize: none;
+    width: 100%;
+    height: 40px;
+    box-sizing: border-box;
+    overflow: hidden;
+    border: 1px solid #666666;
+    background-color: #141414;
+    color: #FFF;
+    border-radius: 6px;
+    padding: 10px 16px;
+}
+
 #polls-panel {
    height: calc(100% - 119px);
 }
+
+.poll-container {
+    font-size: 14px;
+    font-weight: 600;
+    height: calc(100% - 88px);
+    line-height: 20px;
+    overflow-y: auto;
+    position: relative;
+
+    & > * + *:not(.ignore-child) {
+        margin-top: 16px;
+    }
+
+    @media (max-width: 580px) {
+        height: calc(100% - 102px);
+    }
+}
+
+.poll-create-header {
+    color: #fff;
+    font-size: 20px;
+    line-height: 28px;
+    margin: 20px 16px;
+    font-weight: 600;
+}
+
+.poll-create-container {
+    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;
+}
+
+.poll-answer-footer {
+  padding: 8px 0 0 0;
+}
--- a/css/_popup_menu.scss
+++ b/css/_popup_menu.scss
@@ -5,15 +5,15 @@
 .popupmenu__contents {
    .popupmenu__volume-slider {
            &::-webkit-slider-runnable-track {
-                background-color: #246FE5;
+                background-color: $popupSliderColor;
            }

            &::-moz-range-track {
-                background-color: #246FE5;
+                background-color: $popupSliderColor;
            }

            &::-ms-fill-lower {
-                background-color: #246FE5;
+                background-color: $popupSliderColor;
            }
        }
 }
--- a/css/_recording.scss
+++ b/css/_recording.scss
@@ -18,7 +18,6 @@
            align-items: center;
            font-size: 14px;
            margin-left: 16px;
-            max-width: 70%;
        }

        &.space-top {
@@ -83,7 +82,7 @@
        background-color: #FFFFFF;
        border-radius: 4px;
        height: 40px;
-        width: 40px;
+        width: 56px;
    }

    .jitsi-content-recording-icon-container-without-switch {
--- a/css/_responsive.scss
+++ b/css/_responsive.scss
@@ -31,6 +31,10 @@
            }
        }

+        .welcome-tabs {
+            display: none;
+        }
+
        .header-text-title {
            text-align: center;
        }
@@ -52,6 +56,13 @@
        .welcome-footer-row-block {
            display: block;
        }
+        .welcome-badge {
+            margin-right: 16px;
+        }
+
+        .welcome-footer {
+            display: none;
+        }
    }
 }

--- a/css/_settings-button.scss
+++ b/css/_settings-button.scss
@@ -30,24 +30,24 @@
    right: -4px;
    top: -3px;

-    &:hover {
+   &:hover {
        background: #F2F3F4;
        box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25), 0px 0px 0px 1px rgba(0, 0, 0, 0.1);

-        & > svg {
-            fill: #040404;
+        &> svg {
+            fill: #000;
        }

        &.settings-button-small-icon--disabled {
            background: #36383C;

            &> svg {
-                fill: #929292;
-            }
+               fill: #929292;
+           }
        }
    }

-    & > svg {
+    &> svg {
        fill: #fff;
    }

--- a/css/_subject.scss
+++ b/css/_subject.scss
@@ -12,6 +12,7 @@
    &#autoHide.with-always-on {
        overflow: hidden;
        animation: hideSubject forwards .6s ease-out;
+        margin-left: 4px;

        & > .subject-info-container {
            justify-content: flex-start;
@@ -42,6 +43,42 @@
    height: 28px;
 }

+.subject-text {
+    background: rgba(0, 0, 0, 0.6);
+    border-radius: 3px 0px 0px 3px;
+    box-sizing: border-box;
+    font-size: 14px;
+    line-height: 28px;
+    padding: 0 16px;
+    height: 28px;
+    max-width: 324px;
+
+    @media (max-width: 300px) {
+        display: none;
+    }
+
+    &--content {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+
+.subject-timer {
+    background: rgba(0, 0, 0, 0.8);
+    border-radius: 0px 3px 3px 0px;
+    box-sizing: border-box;
+    font-size: 12px;
+    line-height: 28px;
+    min-width: 34px;
+    padding: 0 8px;
+    height: 28px;
+
+    @media (max-width: 300px) {
+        display: none;
+    }
+}
+
 .details-container {
    width: 100%;
    display: flex;
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -120,16 +120,12 @@
    margin: 8px 0;
 }

-div.hangup-button {
-    background-color: #CB2233;
+.hangup-button {
+    background-color: $hangupColor;

    @media (hover: hover) and (pointer: fine) {
        &:hover {
-            background-color: #E04757;
-        }
-
-        &:active {
-            background-color: #A21B29;
+            background-color: $hangupHoverColor;
        }
    }

@@ -138,16 +134,12 @@ div.hangup-button {
    }
 }

-div.hangup-menu-button {
-    background-color: #CB2233;
+.hangup-menu-button {
+    background-color: $hangupMenuButtonColor;

    @media (hover: hover) and (pointer: fine) {
        &:hover {
-            background-color: #E04757;
-        }
-
-        &:active {
-            background-color: #A21B29;
+            background-color: $hangupMenuButtonHoverColor;
        }
    }

--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -4,6 +4,10 @@
 * Style variables
 */
 $baseFontFamily: -apple-system, BlinkMacSystemFont, 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+$hangupColor:#DD3849;
+$hangupHoverColor: #F25363;
+$hangupMenuButtonColor:#0056E0;;
+$hangupMenuButtonHoverColor: #246FE5;

 /**
 * Size variables.
@@ -75,6 +79,7 @@ $modalTextColor: #333;
 $chatActionsSeparatorColor: rgb(173, 105, 112);
 $chatBackgroundColor: #131519;
 $chatInputSeparatorColor: #A4B8D1;
+$chatLobbyMessageBackgroundColor: #6A50D3;
 $chatLobbyActionsSeparatorColor: #6A50D3;
 $chatLocalMessageBackgroundColor: #484A4F;
 $chatPrivateMessageBackgroundColor: rgb(153, 69, 77);
@@ -165,9 +170,8 @@ $welcomePageHeaderPaddingBottom: 0px;
 $welcomePageHeaderTitleMaxWidth: initial;
 $welcomePageHeaderTextAlign: center;

-$welcomePageHeaderContainerMarginTop: 104px;
 $welcomePageHeaderContainerDisplay: flex;
-$welcomePageHeaderContainerMargin: $welcomePageHeaderContainerMarginTop auto 0;
+$welcomePageHeaderContainerMargin: 104px 32px 0 32px;

 $welcomePageHeaderTextTitleMarginBottom: 0;
 $welcomePageHeaderTextTitleFontSize: 42px;
--- a/css/_welcome_page.scss
+++ b/css/_welcome_page.scss
@@ -29,16 +29,6 @@ body.welcome-page {
            flex-direction: column;
            margin: $welcomePageHeaderContainerMargin;
            z-index: $zindex2;
-            align-items: center;
-            position: relative;
-            max-width: 688px;
-        }
-
-        .header-watermark-container {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-            margin-top: calc(20px - #{$welcomePageHeaderContainerMarginTop});
        }

        .header-text-title {
@@ -133,11 +123,16 @@ body.welcome-page {
            max-width: calc(100% - 40px);
            padding: 16px 0 39px 0;
            width: $welcomePageEnterRoomWidth;
-            text-align: center;

-            a {
-                color: inherit;
-                font-weight: 600;
+            p {
+                color: $welcomePageDescriptionColor;
+                float: left;
+                text-align: $welcomePageHeaderTextAlign;
+
+                a {
+                    color: inherit;
+                    font-weight: 600;
+                }
            }
        }
    }
@@ -205,8 +200,8 @@ body.welcome-page {
        color: $welcomePageDescriptionColor;
        padding: 4px;
        position: absolute;
-        top: calc(35px - #{$welcomePageHeaderContainerMarginTop});
-        right: 0;
+        top: 32px;
+        right: 32px;
        z-index: $zindex2;

        * {
@@ -229,11 +224,6 @@ body.welcome-page {
            width: $welcomePageWatermarkWidth;
            height: $welcomePageWatermarkHeight;
        }
-
-        .watermark.leftwatermarknomargin {
-            width: $welcomePageWatermarkWidth;
-            height: $welcomePageWatermarkHeight;
-        }
    }

    &.without-content {
@@ -252,17 +242,10 @@ body.welcome-page {
        padding-top: 40px;
    }

-    .welcome-card-column {
+    .welcome-card-row {
        display: flex;
        justify-content: center;
-        flex-direction: column;
-        align-items: center;
-        max-width: 688px;
-        margin: auto;
-
-        > div {
-            margin-bottom: 16px;
-        }
+        padding: 0 32px;
    }

    .welcome-card-text {
@@ -270,7 +253,7 @@ body.welcome-page {
    }

    .welcome-card {
-        width: 100%;
+        width: 49%;
        border-radius: 8px;

        &--dark {
@@ -285,6 +268,10 @@ body.welcome-page {
        &--grey {
            background: #F2F3F4;
        }
+
+        &--shadow {
+            box-shadow: 0px 4px 30px rgba(0, 0, 0, 0.15);
+        }
    }

    .welcome-footer {
--- a/css/premeeting/_prejoin-third-party.scss
+++ b/css/premeeting/_prejoin-third-party.scss
@@ -2,8 +2,7 @@ $sidePanelWidth: 300px;

 .prejoin-third-party {
  flex-direction: column-reverse;
-  z-index: auto;
-
+  
  .content {
      height: auto;
      margin: 0 auto;
--- a/css/premeeting/_prejoin.scss
+++ b/css/premeeting/_prejoin.scss
@@ -41,27 +41,20 @@
    &-dropdown-btns {
        padding: 8px 0;
    }
-
+  
    &-dropdown-container {
        position: relative;
        width: 100%;
-
+  
        /**
        * Override default InlineDialog behaviour, since it does not play nicely with relative widths
        */
        & > div:nth-child(2) {
-            background: #E0E0E0;
+            background: #fff;
            padding: 0;
            position: absolute !important;
            width: 100%;
        }
    }
-}
-
-.prejoin-input {
-    margin-bottom: 16px;
-
-    & input {
-        text-align: center;
-    }
-}
+  }
+  
--- a/css/premeeting/_premeeting-screens.scss
+++ b/css/premeeting/_premeeting-screens.scss
@@ -1,4 +1,14 @@
-.premeeting-screen {
+ .premeeting-screen {
+    background: #292929;
+    bottom: 0;
+    display: flex;
+    font-size: 1.3em;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: $toolbarZ + 2;
+
    .action-btn {
        border-radius: 6px;
        box-sizing: border-box;
@@ -65,44 +75,139 @@
        }
    }

-    #new-toolbox {
-        bottom: 0;
+    .content {
+        align-items: center;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        flex-shrink: 0;
+        height: 100%;
+        margin: 0 30px;
+        padding: 24px 0 16px;
        position: relative;
-        transition: none;
+        width: $prejoinDefaultContentWidth;
+        z-index: $toolbarZ + 2;

-        .toolbox-content {
-            margin-bottom: 4px;
-        }
-
-        .toolbox-content-items {
-            @include ltr;
-            background: transparent;
-            box-shadow: none;
+        &-controls {
+            align-items: center;
            display: flex;
-            justify-content: space-between;
-            padding: 8px 0;
-        }
-
-        .toolbox-content,
-        .toolbox-content-wrapper,
-        .toolbox-content-items {
-            box-sizing: border-box;
+            flex-direction: column;
+            margin: auto;
            width: 100%;
+
+            .title {
+                color: #fff;
+                font-size: 28px;
+                font-weight: 600;
+                letter-spacing: -0.015;
+                line-height: 36px;
+                margin-bottom: 16px;
+                text-align: center;
+            }
+
+            input.field {
+                background-color: white;
+                border: none;
+                outline: none;
+                border-radius: 6px;
+                font-size: 14px;
+                line-height: 20px;
+                margin-bottom: 16px;
+                color: #1C2025;
+                padding: 10px 16px;
+                text-align: center;
+                width: 100%;
+
+                &.error {
+                    border: 1px solid #E04757;
+                }
+
+                &.focused {
+                    box-shadow: 0px 0px 1px 1.5px black, 0px 0px 1.3px 4px white;
+                }
+            }
+
+            #new-toolbox {
+                bottom: 0;
+                position: relative;
+                transition: none;
+
+                .toolbox-content {
+                    margin-bottom: 4px;
+                }
+
+                .toolbox-content-items {
+                    @include ltr;
+                    background: transparent;
+                    box-shadow: none;
+                    display: flex;
+                    justify-content: space-evenly;
+                    padding: 8px 0;
+                }
+
+                .toolbox-content,
+                .toolbox-content-wrapper,
+                .toolbox-content-items {
+                    box-sizing: border-box;
+                    width: 100%;
+                }
+            }
+        }
+    }
+
+    @media (max-width: 720px) {
+        flex-direction: column-reverse;
+
+        .content {
+            height: auto;
+            margin: 0 auto;
+        }
+    }
+
+    // mobile phone landscape
+    @media (max-height: 420px) {
+        div.content {
+            padding: 16px 16px 0 16px;
        }
    }

    @media (max-width: 400px) {
+        .content {
+            padding: 16px;
+            width: 100%;
+
+            &-controls {
+                input.field {
+                    font-size: 16px;
+                    padding: 14px 16px;
+                }
+            }
+
+            .title {
+                display: none;
+            }
+        }
+
        .device-status-error {
            border-radius: 0;
            margin: 0 -16px;
        }

+        input.field {
+            font-size: 16px;
+            padding: 14px 16px;
+        }
+
        .action-btn {
            font-size: 16px;
            margin-bottom: 8px;
            padding: 11px 16px;
        }
    }
+
+    input::placeholder {
+        color: #040404;
+    }
 }

 #preview {
--- a/css/themes/_light.scss
+++ b/css/themes/_light.scss
@@ -65,6 +65,7 @@ $errorColor: #c61600;

 // Popover colors
 $popoverFontColor: #ffffff !important;
+$popupSliderColor: #0376da;

 // Toolbar
 $toolbarBackground: rgba(0, 0, 0, 0.5);
--- a/debian/jitsi-meet-prosody.postinst
+++ b/debian/jitsi-meet-prosody.postinst
@@ -44,7 +44,12 @@ case "$1" in
        fi
        JVB_SECRET="$RET"

-        JICOFO_AUTH_USER="focus"
+        db_get jicofo/jicofo-authuser
+        if [ -z "$RET" ] ; then
+            db_input critical jicofo/jicofo-authuser || true
+            db_go
+        fi
+        JICOFO_AUTH_USER="$RET"

        db_get jicofo/jicofo-authpassword
        if [ -z "$RET" ] ; then
--- a/debian/jitsi-meet-prosody.templates
+++ b/debian/jitsi-meet-prosody.templates
@@ -13,6 +13,12 @@ Type: password
 _Description: Jitsi Videobridge Component secret:
 The secret used by Jitsi Videobridge to connect to xmpp server as component.

+Template: jicofo/jicofo-authuser
+Type: string
+Default: focus
+_Description: Jicofo username:
+ The jicofo needs an authenticated admin user to connect to xmpp server.
+
 Template: jicofo/jicofo-authpassword
 Type: password
 _Description: Jicofo user password:
--- a/debian/jitsi-meet-web-config.postinst
+++ b/debian/jitsi-meet-web-config.postinst
@@ -176,11 +176,6 @@ case "$1" in
        fi

        # Fixes multi-stream flags to workaround problem with mobile joining a multi-stream call with multi-stream disabled
-        FIX_MSG="// Temporary backwards compatibility with old mobile clients."
-        if ! grep -q "^${FIX_MSG}" $JITSI_MEET_CONFIG; then
-            echo  $FIX_MSG >> $JITSI_MEET_CONFIG
-            echo "config.flags = config.flags || {};" >> $JITSI_MEET_CONFIG
-        fi
        if ! grep -q "^config.flags.sourceNameSignaling*" $JITSI_MEET_CONFIG; then
            echo "config.flags.sourceNameSignaling = true;" >> $JITSI_MEET_CONFIG
        fi
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@@ -15,17 +15,6 @@ upstream jvb1 {
    server 127.0.0.1:9090;
    keepalive 2;
 }
-map $arg_vnode $prosody_node {
-    default prosody;
-    v1 v1;
-    v2 v2;
-    v3 v3;
-    v4 v4;
-    v5 v5;
-    v6 v6;
-    v7 v7;
-    v8 v8;
-}
 server {
    listen 80;
    listen [::]:80;
@@ -106,7 +95,7 @@ server {

    # BOSH
    location = /http-bind {
-        proxy_pass http://$prosody_node/http-bind?prefix=$prefix&$args;
+        proxy_pass http://prosody/http-bind?prefix=$prefix&$args;
        proxy_http_version 1.1;
        proxy_set_header X-Forwarded-For $remote_addr;
        proxy_set_header Host $http_host;
@@ -115,7 +104,7 @@ server {

    # xmpp websockets
    location = /xmpp-websocket {
-        proxy_pass http://$prosody_node/xmpp-websocket?prefix=$prefix&$args;
+        proxy_pass http://prosody/xmpp-websocket?prefix=$prefix&$args;
        proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection "upgrade";
--- a/globals.d.ts
+++ b/globals.d.ts
@@ -13,8 +13,6 @@ declare global {
        keyboardshortcut: {
            registerShortcut: Function;
            unregisterShortcut: Function;
-            openDialog: Function;
-            enable: Function;
        }
    };
    const interfaceConfig: any;
@@ -24,7 +22,6 @@ declare global {
        JITSI_MEET_LITE_SDK?: boolean;
        interfaceConfig?: any;
        JitsiMeetJS?: any;
-        JitsiMeetElectron?: any;
    }

    const config: IConfig;
--- a/globals.native.d.ts
+++ b/globals.native.d.ts
@@ -23,8 +23,6 @@ interface IWindow {
    onerror: (event: string, source: any, lineno: any, colno: any, e: Error) => void;
    onunhandledrejection: (event: any) => void;

-    setInterval: typeof setInterval;
-    clearInterval: typeof clearInterval;
    setTimeout: typeof setTimeout;
    clearTimeout: typeof clearTimeout;
    setImmediate: typeof setImmediate;
--- a/interface_config.js
+++ b/interface_config.js
@@ -76,6 +76,11 @@ var interfaceConfig = {

    GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,

+    /**
+     * Hide the logo on the deep linking pages.
+     */
+    HIDE_DEEP_LINKING_LOGO: false,
+
    /**
     * Hide the invite prompt in the header when alone in the meeting.
     */
@@ -103,6 +108,23 @@ var interfaceConfig = {
     */
    MOBILE_APP_PROMO: true,

+    /**
+     * Specify custom URL for downloading android mobile app.
+     */
+    MOBILE_DOWNLOAD_LINK_ANDROID: 'https://play.google.com/store/apps/details?id=org.jitsi.meet',
+
+    /**
+     * Specify custom URL for downloading f droid app.
+     */
+    MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/en/packages/org.jitsi.meet/',
+
+    /**
+     * Specify URL for downloading ios mobile app.
+     */
+    MOBILE_DOWNLOAD_LINK_IOS: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905',
+
+    NATIVE_APP_NAME: 'Jitsi Meet',
+
    // Names of browsers which should show a warning stating the current browser
    // has a suboptimal experience. Browsers which are not listed as optimal or
    // unsupported are considered suboptimal. Valid values are:
@@ -137,6 +159,7 @@ var interfaceConfig = {
     */
    SHOW_CHROME_EXTENSION_BANNER: false,

+    SHOW_DEEP_LINKING_IMAGE: false,
    SHOW_JITSI_WATERMARK: true,
    SHOW_POWERED_BY: false,
    SHOW_PROMOTIONAL_CLOSE_PAGE: false,
@@ -177,31 +200,6 @@ var interfaceConfig = {
     */
    // TILE_VIEW_MAX_COLUMNS: 5,

-    // List of undocumented settings
-    /**
-     INDICATOR_FONT_SIZES
-     PHONE_NUMBER_REGEX
-    */
-
-    // -----------------DEPRECATED CONFIGS BELOW THIS LINE-----------------------------
-
-    /**
-     * Specify URL for downloading ios mobile app.
-     */
-    // MOBILE_DOWNLOAD_LINK_IOS: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905',
-
-    /**
-     * Specify custom URL for downloading android mobile app.
-     */
-    // MOBILE_DOWNLOAD_LINK_ANDROID: 'https://play.google.com/store/apps/details?id=org.jitsi.meet',
-
-    /**
-     * Specify mobile app scheme for opening the app from the mobile browser.
-     */
-    // APP_SCHEME: 'org.jitsi.meet',
-
-    // NATIVE_APP_NAME: 'Jitsi Meet',
-
    /**
     * Specify Firebase dynamic link properties for the mobile apps.
     */
@@ -214,19 +212,22 @@ var interfaceConfig = {
    // },

    /**
-     * Hide the logo on the deep linking pages.
+     * Specify mobile app scheme for opening the app from the mobile browser.
     */
-    // HIDE_DEEP_LINKING_LOGO: false,
+    // APP_SCHEME: 'org.jitsi.meet',

    /**
     * Specify the Android app package name.
     */
    // ANDROID_APP_PACKAGE: 'org.jitsi.meet',

+    // List of undocumented settings
    /**
-     * Specify custom URL for downloading f droid app.
-     */
-    // MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/en/packages/org.jitsi.meet/',
+     INDICATOR_FONT_SIZES
+     PHONE_NUMBER_REGEX
+    */
+
+    // -----------------DEPRECATED CONFIGS BELOW THIS LINE-----------------------------

    // Connection indicators (
    // CONNECTION_INDICATOR_AUTO_HIDE_ENABLED,
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -13,14 +13,14 @@ PODS:
    - CocoaLumberjack/Core (= 3.7.2)
  - CocoaLumberjack/Core (3.7.2)
  - DoubleConversion (1.1.6)
-  - FBLazyVector (0.68.5)
-  - FBReactNativeSpec (0.68.5):
+  - FBLazyVector (0.68.4)
+  - FBReactNativeSpec (0.68.4):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.5)
-    - RCTTypeSafety (= 0.68.5)
-    - React-Core (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
+    - RCTRequired (= 0.68.4)
+    - RCTTypeSafety (= 0.68.4)
+    - React-Core (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
  - Firebase/Analytics (8.15.0):
    - Firebase/Core
  - Firebase/Core (8.15.0):
@@ -163,201 +163,201 @@ PODS:
    - DoubleConversion
    - fmt (~> 6.2.1)
    - glog
-  - RCTRequired (0.68.5)
-  - RCTTypeSafety (0.68.5):
-    - FBLazyVector (= 0.68.5)
+  - RCTRequired (0.68.4)
+  - RCTTypeSafety (0.68.4):
+    - FBLazyVector (= 0.68.4)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.5)
-    - React-Core (= 0.68.5)
-  - React (0.68.5):
-    - React-Core (= 0.68.5)
-    - React-Core/DevSupport (= 0.68.5)
-    - React-Core/RCTWebSocket (= 0.68.5)
-    - React-RCTActionSheet (= 0.68.5)
-    - React-RCTAnimation (= 0.68.5)
-    - React-RCTBlob (= 0.68.5)
-    - React-RCTImage (= 0.68.5)
-    - React-RCTLinking (= 0.68.5)
-    - React-RCTNetwork (= 0.68.5)
-    - React-RCTSettings (= 0.68.5)
-    - React-RCTText (= 0.68.5)
-    - React-RCTVibration (= 0.68.5)
-  - React-callinvoker (0.68.5)
-  - React-Codegen (0.68.5):
-    - FBReactNativeSpec (= 0.68.5)
+    - RCTRequired (= 0.68.4)
+    - React-Core (= 0.68.4)
+  - React (0.68.4):
+    - React-Core (= 0.68.4)
+    - React-Core/DevSupport (= 0.68.4)
+    - React-Core/RCTWebSocket (= 0.68.4)
+    - React-RCTActionSheet (= 0.68.4)
+    - React-RCTAnimation (= 0.68.4)
+    - React-RCTBlob (= 0.68.4)
+    - React-RCTImage (= 0.68.4)
+    - React-RCTLinking (= 0.68.4)
+    - React-RCTNetwork (= 0.68.4)
+    - React-RCTSettings (= 0.68.4)
+    - React-RCTText (= 0.68.4)
+    - React-RCTVibration (= 0.68.4)
+  - React-callinvoker (0.68.4)
+  - React-Codegen (0.68.4):
+    - FBReactNativeSpec (= 0.68.4)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.68.5)
-    - RCTTypeSafety (= 0.68.5)
-    - React-Core (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-Core (0.68.5):
+    - RCTRequired (= 0.68.4)
+    - RCTTypeSafety (= 0.68.4)
+    - React-Core (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-Core (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.5)
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-Core/Default (= 0.68.4)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.68.5):
+  - React-Core/CoreModulesHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/Default (0.68.5):
+  - React-Core/Default (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/DevSupport (0.68.5):
+  - React-Core/DevSupport (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.5)
-    - React-Core/RCTWebSocket (= 0.68.5)
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-jsinspector (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-Core/Default (= 0.68.4)
+    - React-Core/RCTWebSocket (= 0.68.4)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-jsinspector (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.68.5):
+  - React-Core/RCTActionSheetHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.68.5):
+  - React-Core/RCTAnimationHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.68.5):
+  - React-Core/RCTBlobHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTImageHeaders (0.68.5):
+  - React-Core/RCTImageHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.68.5):
+  - React-Core/RCTLinkingHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.68.5):
+  - React-Core/RCTNetworkHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.68.5):
+  - React-Core/RCTSettingsHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTTextHeaders (0.68.5):
+  - React-Core/RCTTextHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.68.5):
+  - React-Core/RCTVibrationHeaders (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-Core/RCTWebSocket (0.68.5):
+  - React-Core/RCTWebSocket (0.68.4):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.68.5)
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsiexecutor (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-Core/Default (= 0.68.4)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsiexecutor (= 0.68.4)
+    - React-perflogger (= 0.68.4)
    - Yoga
-  - React-CoreModules (0.68.5):
+  - React-CoreModules (0.68.4):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.5)
-    - React-Codegen (= 0.68.5)
-    - React-Core/CoreModulesHeaders (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-RCTImage (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-cxxreact (0.68.5):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/CoreModulesHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-RCTImage (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-cxxreact (0.68.4):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-jsinspector (= 0.68.5)
-    - React-logger (= 0.68.5)
-    - React-perflogger (= 0.68.5)
-    - React-runtimeexecutor (= 0.68.5)
-  - React-jsi (0.68.5):
+    - React-callinvoker (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-jsinspector (= 0.68.4)
+    - React-logger (= 0.68.4)
+    - React-perflogger (= 0.68.4)
+    - React-runtimeexecutor (= 0.68.4)
+  - React-jsi (0.68.4):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.68.5)
-  - React-jsi/Default (0.68.5):
+    - React-jsi/Default (= 0.68.4)
+  - React-jsi/Default (0.68.4):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.68.5):
+  - React-jsiexecutor (0.68.4):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-perflogger (= 0.68.5)
-  - React-jsinspector (0.68.5)
-  - React-logger (0.68.5):
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-perflogger (= 0.68.4)
+  - React-jsinspector (0.68.4)
+  - React-logger (0.68.4):
    - glog
  - react-native-background-timer (2.4.1):
    - React-Core
@@ -373,12 +373,8 @@ PODS:
    - React-Core
  - react-native-performance (2.1.0):
    - React-Core
-  - react-native-safe-area-context (4.4.1):
-    - RCT-Folly
-    - RCTRequired
-    - RCTTypeSafety
+  - react-native-safe-area-context (3.3.2):
    - React-Core
-    - ReactCommon/turbomodule/core
  - react-native-slider (4.1.12):
    - React-Core
  - react-native-splash-screen (3.3.0):
@@ -389,87 +385,89 @@ PODS:
  - react-native-video/Video (6.0.0-alpha.1):
    - PromisesSwift
    - React-Core
-  - react-native-webrtc (106.0.5):
+  - react-native-webrtc (1.106.1):
    - JitsiWebRTC (~> 106.0.0)
    - React-Core
  - react-native-webview (11.15.1):
    - React-Core
-  - React-perflogger (0.68.5)
-  - React-RCTActionSheet (0.68.5):
-    - React-Core/RCTActionSheetHeaders (= 0.68.5)
-  - React-RCTAnimation (0.68.5):
+  - React-perflogger (0.68.4)
+  - React-RCTActionSheet (0.68.4):
+    - React-Core/RCTActionSheetHeaders (= 0.68.4)
+  - React-RCTAnimation (0.68.4):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.5)
-    - React-Codegen (= 0.68.5)
-    - React-Core/RCTAnimationHeaders (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-RCTBlob (0.68.5):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTAnimationHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTBlob (0.68.4):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.68.5)
-    - React-Core/RCTBlobHeaders (= 0.68.5)
-    - React-Core/RCTWebSocket (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-RCTNetwork (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-RCTImage (0.68.5):
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTBlobHeaders (= 0.68.4)
+    - React-Core/RCTWebSocket (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-RCTNetwork (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTImage (0.68.4):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.5)
-    - React-Codegen (= 0.68.5)
-    - React-Core/RCTImageHeaders (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-RCTNetwork (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-RCTLinking (0.68.5):
-    - React-Codegen (= 0.68.5)
-    - React-Core/RCTLinkingHeaders (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-RCTNetwork (0.68.5):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTImageHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-RCTNetwork (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTLinking (0.68.4):
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTLinkingHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTNetwork (0.68.4):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.5)
-    - React-Codegen (= 0.68.5)
-    - React-Core/RCTNetworkHeaders (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-RCTSettings (0.68.5):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTNetworkHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTSettings (0.68.4):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.68.5)
-    - React-Codegen (= 0.68.5)
-    - React-Core/RCTSettingsHeaders (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-RCTText (0.68.5):
-    - React-Core/RCTTextHeaders (= 0.68.5)
-  - React-RCTVibration (0.68.5):
+    - RCTTypeSafety (= 0.68.4)
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTSettingsHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-RCTText (0.68.4):
+    - React-Core/RCTTextHeaders (= 0.68.4)
+  - React-RCTVibration (0.68.4):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Codegen (= 0.68.5)
-    - React-Core/RCTVibrationHeaders (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - ReactCommon/turbomodule/core (= 0.68.5)
-  - React-runtimeexecutor (0.68.5):
-    - React-jsi (= 0.68.5)
-  - ReactCommon/turbomodule/core (0.68.5):
+    - React-Codegen (= 0.68.4)
+    - React-Core/RCTVibrationHeaders (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - ReactCommon/turbomodule/core (= 0.68.4)
+  - React-runtimeexecutor (0.68.4):
+    - React-jsi (= 0.68.4)
+  - ReactCommon/turbomodule/core (0.68.4):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.68.5)
-    - React-Core (= 0.68.5)
-    - React-cxxreact (= 0.68.5)
-    - React-jsi (= 0.68.5)
-    - React-logger (= 0.68.5)
-    - React-perflogger (= 0.68.5)
+    - React-callinvoker (= 0.68.4)
+    - React-Core (= 0.68.4)
+    - React-cxxreact (= 0.68.4)
+    - React-jsi (= 0.68.4)
+    - React-logger (= 0.68.4)
+    - React-perflogger (= 0.68.4)
  - RNCalendarEvents (2.2.0):
    - React
  - RNCAsyncStorage (1.17.3):
    - React-Core
  - RNCClipboard (1.5.1):
    - React-Core
+  - RNCMaskedView (0.2.6):
+    - React-Core
  - RNDefaultPreference (1.4.4):
    - React-Core
  - RNDeviceInfo (8.4.8):
    - React-Core
-  - RNGestureHandler (2.9.0):
+  - RNGestureHandler (2.1.0):
    - React-Core
  - RNGoogleSignin (7.0.4):
    - GoogleSignIn (~> 6.0.0)
@@ -545,6 +543,7 @@ DEPENDENCIES:
  - RNCalendarEvents (from `../node_modules/react-native-calendar-events`)
  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
  - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
+  - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
  - RNDefaultPreference (from `../node_modules/react-native-default-preference`)
  - RNDeviceInfo (from `../node_modules/react-native-device-info`)
  - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
@@ -679,6 +678,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/@react-native-async-storage/async-storage"
  RNCClipboard:
    :path: "../node_modules/@react-native-community/clipboard"
+  RNCMaskedView:
+    :path: "../node_modules/@react-native-masked-view/masked-view"
  RNDefaultPreference:
    :path: "../node_modules/react-native-default-preference"
  RNDeviceInfo:
@@ -705,8 +706,8 @@ SPEC CHECKSUMS:
  boost: a7c83b31436843459a1961bfd74b96033dc77234
  CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
-  FBLazyVector: 2b47ff52037bd9ae07cc9b051c9975797814b736
-  FBReactNativeSpec: 0e0d384ef17a33b385f13f0c7f97702c7cd17858
+  FBLazyVector: 023a2028f218d648b588348bfa9261b4914b93db
+  FBReactNativeSpec: 9f4902cc009389d3704ff75de2aa513dee34d5c2
  Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
  FirebaseAnalytics: 7761cbadb00a717d8d0939363eb46041526474fa
  FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1
@@ -731,18 +732,18 @@ SPEC CHECKSUMS:
  PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
  PromisesSwift: 99fddfe4a0ec88a56486644c0da106694c92a604
  RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
-  RCTRequired: 0f06b6068f530932d10e1a01a5352fad4eaacb74
-  RCTTypeSafety: b0ee81f10ef1b7d977605a2b266823dabd565e65
-  React: 3becd12bd51ea8a43bdde7e09d0f40fba7820e03
-  React-callinvoker: 11abfff50e6bf7a55b3a90b4dc2187f71f224593
-  React-Codegen: f8946ce0768fb8e92e092e30944489c4b2955b2d
-  React-Core: 203cdb6ee2657b198d97d41031c249161060e6ca
-  React-CoreModules: 6eb0c06a4a223fde2cb6a8d0f44f58b67e808942
-  React-cxxreact: afb0c6c07d19adbd850747fedeac20c6832d40b9
-  React-jsi: 14d37a6db2af2c1a49f6f5c2e4ee667c364ae45c
-  React-jsiexecutor: 45c0496ca8cef6b02d9fa0274c25cf458fe91a56
-  React-jsinspector: eb202e43b3879aba9a14f3f65788aec85d4e1ea9
-  React-logger: 98f663b292a60967ebbc6d803ae96c1381183b6d
+  RCTRequired: e6003505912d056f21f64465063cf4b79418f2b9
+  RCTTypeSafety: d7ef4745c8d9c9faa65c26b4b6230fc5cd4c4424
+  React: 6692c30fb74ab29078b25c31c9841d863e08cdd9
+  React-callinvoker: fe2b234fa518d8bb7600707c536ab0a3e1f5edba
+  React-Codegen: 9964bb2422c7014894182ac50068caae05f68551
+  React-Core: a07bcd2f15ff93cddc9ceb07eddeec3d2ff8d990
+  React-CoreModules: 7fb4ee0fc35ad2b7daf775f0ef6309efdd8d3d82
+  React-cxxreact: 51a8058a35a2f02ad4175334a7cd24aa5558ced4
+  React-jsi: 69b974b418d2658a3f1799903be7cbcb8ac59755
+  React-jsiexecutor: 4f35a29798ba9d0d892a84001d11f626688dbb8e
+  React-jsinspector: 6f75220cd4b6020976d340ab21c63458dd3cad9e
+  React-logger: 7013d2499df6346e6a72802d4084badaaa82543b
  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
  react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
  react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
@@ -750,36 +751,37 @@ SPEC CHECKSUMS:
  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
  react-native-pager-view: 3ee7d4c7697fb3ef788346e834a60cca97ed8540
  react-native-performance: f4b6604a9d5a8a7407e34a82fab6c641d9a3ec12
-  react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
+  react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
  react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
  react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
-  react-native-webrtc: ef315d8adb68e78298b22100377d12ef168efdb5
+  react-native-webrtc: 4a4c31be61f88d1d3356526eebce72f462a6760e
  react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
-  React-perflogger: 0458a87ea9a7342079e7a31b0d32b3734fb8415f
-  React-RCTActionSheet: 22538001ea2926dea001111dd2846c13a0730bc9
-  React-RCTAnimation: 732ce66878d4aa151d56a0d142b1105aa12fd313
-  React-RCTBlob: 9cb9e3e9a41d27be34aaf89b0e0f52c7ca415d57
-  React-RCTImage: 6bd16627eb9c4bb79903c4cdec7c551266ee1a5b
-  React-RCTLinking: e9edfc8919c8fa9a3f3c7b34362811f58a2ebba4
-  React-RCTNetwork: 880eccd21bbe2660a0b63da5ccba75c46eceeaa6
-  React-RCTSettings: 8c85d8188c97d6c6bd470af6631a6c4555b79bb3
-  React-RCTText: bbd275ee287730c5acbab1aadc0db39c25c5c64e
-  React-RCTVibration: 9819a3bf6230e4b2a99877c21268b0b2416157a1
-  React-runtimeexecutor: b1f1995089b90696dbc2a7ffe0059a80db5c8eb1
-  ReactCommon: 149e2c0acab9bac61378da0db5b2880a1b5ff59b
+  React-perflogger: 0b0500685176e53ea582c45179a653aa82e4ae49
+  React-RCTActionSheet: 38469be9d20242f9c717e43c2983e8e3e6c640c4
+  React-RCTAnimation: 93774f3e8857e7c3c1cbbd277056d02be4496be1
+  React-RCTBlob: 6d0567d7a6561b62feb8c3b1cc33b3c591ba85ab
+  React-RCTImage: 1006a91318a6181a0256b89d2e321b6ea0e2e6e3
+  React-RCTLinking: 0b2300493c879c3bcac2d4c6b0178e8d0e5e2202
+  React-RCTNetwork: b9a33a95703651abed92490e50396d54b7270a17
+  React-RCTSettings: e6464123e5b5062fc23bb5adb51188a6061e9601
+  React-RCTText: 188d6f0ae20cd28891f59ecad41028ee2f793757
+  React-RCTVibration: a67beb7d2f3c73e9b74c4124ef61b84c601be649
+  React-runtimeexecutor: 088723cf020113e64736a709f52719dbb359c73e
+  ReactCommon: 1a4f19f3b4366feec03a98bdbb200b6085c5000f
  RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
  RNCAsyncStorage: 005c0e2f09575360f142d0d1f1f15e4ec575b1af
  RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
+  RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
  RNDefaultPreference: 08bdb06cfa9188d5da97d4642dac745218d7fb31
  RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
-  RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
+  RNGestureHandler: e5c7cab5f214503dcefd6b2b0cefb050e1f51c4a
  RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
  RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
  RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
  RNSVG: f3b60aeeaa81960e2e0536c3a9eef50b667ef3a9
  RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4
-  Yoga: c4d61225a466f250c35c1ee78d2d0b3d41fe661c
+  Yoga: c926c8eec5c78a788b51e6c8a604825d00d694d7

 PODFILE CHECKSUM: e671cdcdb80fab67e305861c36bfae8ed5a5b0ef

--- a/ios/sdk/src/JitsiMeetView.m
+++ b/ios/sdk/src/JitsiMeetView.m
@@ -40,10 +40,19 @@ static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";

 #pragma mark Initializers

+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        [self initWithXXX];
+    }
+
+    return self;
+}
+
 - (instancetype)initWithCoder:(NSCoder *)coder {
    self = [super initWithCoder:coder];
    if (self) {
-        [self doInitialize];
+        [self initWithXXX];
    }

    return self;
@@ -52,7 +61,7 @@ static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";
 - (instancetype)initWithFrame:(CGRect)frame {
    self = [super initWithFrame:frame];
    if (self) {
-        [self doInitialize];
+        [self initWithXXX];
    }

    return self;
@@ -62,9 +71,9 @@ static NSString *const PiPEnabledFeatureFlag = @"pip.enabled";
 * Internal initialization:
 *
 * - sets the background color
- * - registers necessary observers
+ * - initializes the external API scope
 */
- (void)doInitialize {
+- (void)initWithXXX {
    // Set a background color which is in accord with the JavaScript and Android
    // parts of the application and causes less perceived visual flicker than
    // the default background color.
--- a/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift
+++ b/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift
@@ -46,7 +46,7 @@ public class PiPViewCoordinator {
        }
    }

-    public var initialPositionInSuperView: Position = .lowerRightCorner
+    public let initialPositionInSuperView: Position = .lowerRightCorner

    // Unused. Remove on the next major release.
    @available(*, deprecated, message: "The PiP window size is now fixed to 150px.")
--- a/lang/main-ar.json
+++ b/lang/main-ar.json
@@ -1061,6 +1061,7 @@
            "chat": "اظهِر/اخفِ نافذة الدردشة",
            "clap": "تصفيق",
            "collapse": "قلّص",
+            "dock": "إرساء في النافذة الرئيسية",
            "document": "اظهِر/اخفِ الملف المشارك",
            "download": "نزِّل التطبيق",
            "embedMeeting": "ضمِّن المُلتقى",
@@ -1114,6 +1115,7 @@
            "tileView": "اظهِر/اخفِ عرض العنوان",
            "toggleCamera": "بدِّل الكاميرا",
            "toggleFilmstrip": "بدِّل وضع الشريط السينمائي (filmstrip)",
+            "undock": "فك في نافذة منفصلة",
            "videoblur": "استعمل/اخرج من وضع تغبيش خلفية الفيديو",
            "videomute": "بدِّل وضع اخفاء الفيديو"
        },
@@ -1131,6 +1133,7 @@
        "closeReactionsMenu": "إغلاق قائمة ردود الفعل",
        "disableNoiseSuppression": "قم بتعطيل خاصية منع الضوضاء",
        "disableReactionSounds": "يمكنك تعطيل أصوات ردود الفعل لهذا المُلتقى",
+        "dock": "إرساء في النافذة الرئيسية",
        "documentClose": "أغلق الملف المشارك",
        "documentOpen": "افتح الملف المشارك",
        "download": "نزِّل التطبيق",
@@ -1202,6 +1205,7 @@
        "talkWhileMutedPopup": "أتحاول التحدث؟ الميكروفون لديك مكتوم.",
        "tileViewToggle": "بدِّل عنوان العرض",
        "toggleCamera": "بدِّل الكاميرا",
+        "undock": "فك في نافذة منفصلة",
        "videoSettings": "اعدادات الفيديو",
        "videomute": "استعمل / أوقف الكاميرا"
    },
--- a/lang/main-ca.json
+++ b/lang/main-ca.json
@@ -1027,6 +1027,7 @@
            "chat": "Obre o tanca el xat",
            "clap": "Picament de mans",
            "collapse": "Col·lapsa",
+            "dock": "Acobla a la finestra principal",
            "document": "Activa o desactiva el document compartit",
            "download": "Baixeu les nostres aplicacions",
            "embedMeeting": "Insereix la reunió",
@@ -1078,6 +1079,7 @@
            "tileView": "Activa o desactiva el mode mosaic",
            "toggleCamera": "Activa o desactiva la càmera",
            "toggleFilmstrip": "Mostra o amaga la cinta",
+            "undock": "Desacobla en una finestra separada",
            "videoblur": "Activa o desactiva el desenfocament del vídeo",
            "videomute": "Activa o desactiva la càmera"
        },
@@ -1094,6 +1096,7 @@
        "closeChat": "Tanca el xat",
        "closeReactionsMenu": "Tanca el menú de reaccions",
        "disableReactionSounds": "Podeu desactivar els sons de reacció per a aquesta reunió",
+        "dock": "Acobla en la finestra principal",
        "documentClose": "Tanca el document compartit",
        "documentOpen": "Obre el document compartit",
        "download": "Baixeu les nostres aplicacions",
@@ -1163,6 +1166,7 @@
        "talkWhileMutedPopup": "Intenteu parlar? Esteu silenciat.",
        "tileViewToggle": "Activa o desactiva el mode mosaic",
        "toggleCamera": "Activa o desactiva la càmera",
+        "undock": "Desacobla en una finestra principal",
        "videoSettings": "Paràmetres de vídeo",
        "videomute": "Inicia o atura la càmera"
    },
--- a/lang/main-cs.json
+++ b/lang/main-cs.json
@@ -1060,6 +1060,7 @@
            "chat": "Přepnout okno zpráv",
            "clap": "Tleskat",
            "collapse": "Zabalit",
+            "dock": "Dokovat v hlavním okně",
            "document": "Přepnout sdílený dokument",
            "download": "Stáhnout naše aplikace",
            "embedMeeting": "Vložit setkání",
@@ -1113,6 +1114,7 @@
            "tileView": "Přepnout dlaždicové zobrazení",
            "toggleCamera": "Přepnout kameru",
            "toggleFilmstrip": "Přepnout video náhledy",
+            "undock": "Oddokovat do samostatného okna",
            "videoblur": "Přepnout rozmazání videa",
            "videomute": "Přepnout ztišení videa"
        },
@@ -1130,6 +1132,7 @@
        "closeReactionsMenu": "Zavrít menu reakcí",
        "disableNoiseSuppression": "Vypnout potlačení šumu",
        "disableReactionSounds": "Vypnout zvuky reakcí",
+        "dock": "Dokovat v hlavním okně",
        "documentClose": "Zavřít sdílený dokument",
        "documentOpen": "Otevřít sdílený dokument",
        "download": "Stáhnout naše aplikace",
@@ -1201,6 +1204,7 @@
        "talkWhileMutedPopup": "Snažíte se mluvit? Máte ztišený mikrofon.",
        "tileViewToggle": "Přepnout dlaždicové zobrazení",
        "toggleCamera": "Přepnout kameru",
+        "undock": "",
        "videoSettings": "",
        "videomute": "Zapnout / Vypnout kameru"
    },
--- a/lang/main-de.json
+++ b/lang/main-de.json
@@ -147,7 +147,6 @@
        "bridgeCount": "Serverzahl: ",
        "codecs": "Codecs (A/V): ",
        "connectedTo": "Verbunden mit:",
-        "e2eeVerified": "E2EE verifiziert:",
        "framerate": "Bildwiederholrate:",
        "less": "Weniger anzeigen",
        "localaddress": "Lokale Adresse:",
@@ -409,10 +408,6 @@
        "user": "Anmeldename",
        "userIdentifier": "Benutzername",
        "userPassword": "Passwort",
-        "verifyParticipantConfirm": "Sie stimmen überein",
-        "verifyParticipantDismiss": "Sie stimmen nicht überein",
-        "verifyParticipantQuestion": "EXPERIMENTELL: Frage Person {{participantName}} ob sie den selben Inhalt in der selben Reihenfolge sieht.",
-        "verifyParticipantTitle": "Personsverifikation",
        "videoLink": "Video-Link",
        "viewUpgradeOptions": "Upgradeoptionen anzeigen",
        "viewUpgradeOptionsContent": "Sie müssen Ihren Tarif erweitern, um Premium-Features wie Aufnahme, Transkription, RTMP-Streaming und mehr zu nutzen.",
@@ -442,6 +437,9 @@
        "noResults": "Keine Ergebnisse :(",
        "search": "GIPHY durchsuchen"
    },
+    "helpView": {
+        "title": "Hilfecenter"
+    },
    "incomingCall": {
        "answer": "Antworten",
        "audioCallTitle": "Eingehender Anruf",
@@ -565,6 +563,7 @@
    "lobby": {
        "admit": "Zulassen",
        "admitAll": "Alle zulassen",
+        "allow": "Annehmen",
        "backToKnockModeButton": "Kein Passwort, stattdessen Beitritt anfragen",
        "chat": "Chat",
        "dialogTitle": "Lobbymodus",
@@ -650,8 +649,6 @@
        "connectedOneMember": "{{name}} nimmt am Meeting teil",
        "connectedThreePlusMembers": "{{name}} und {{count}} andere Personen nehmen am Meeting teil",
        "connectedTwoMembers": "{{first}} und {{second}} nehmen am Meeting teil",
-        "dataChannelClosed": "Schlechte Videoqualität",
-        "dataChannelClosedDescription": "Die Steuerungsverbindung (Bridge Channel) wurde unterbrochen, daher ist die Videoqulität auf die schlechteste Stufe limitiert.",
        "disconnected": "getrennt",
        "displayNotifications": "Benachrichtigungen anzeigen für",
        "focus": "Konferenzleitung",
@@ -712,8 +709,6 @@
        "reactionSoundsForAll": "Interaktionstöne für alle deaktivieren",
        "screenShareNoAudio": "Die Option \"Audio freigeben\" wurde bei der Auswahl des Fensters nicht ausgewählt.",
        "screenShareNoAudioTitle": "Share audio was not checked",
-        "screenSharingAudioOnlyDescription": "Durch die Bildschirmfreigabe wird der Modus \"Beste Leistung\" beeinflusst und daher mehr Datenrate benötigt.",
-        "screenSharingAudioOnlyTitle": "Modus \"Beste Leistung\"",
        "selfViewTitle": "Sie können die eigene Ansicht immer in den Einstellungen reaktivieren",
        "somebody": "Jemand",
        "startSilentDescription": "Treten Sie dem Meeting noch einmal bei, um Ihr Audio zu aktivieren",
@@ -863,6 +858,9 @@
        "rejected": "Abgelehnt",
        "ringing": "Es klingelt …"
    },
+    "privacyView": {
+        "title": "Datenschutz"
+    },
    "profile": {
        "avatar": "Benutzerbild",
        "setDisplayNameLabel": "Anzeigename festlegen",
@@ -1005,7 +1003,6 @@
        "displayName": "Anzeigename",
        "displayNamePlaceholderText": "z.B. Erika Musterfrau",
        "email": "E-Mail",
-        "emailPlaceholderText": "email@beispiel.de",
        "goTo": "Gehe zu",
        "header": "Einstellungen",
        "help": "Hilfe",
@@ -1014,7 +1011,6 @@
        "profileSection": "Profil",
        "serverURL": "Server-URL",
        "showAdvanced": "Erweiterte Einstellungen anzeigen",
-        "startCarModeInLowBandwidthMode": "Automodus mit Datensparmodus starten",
        "startWithAudioMuted": "Stumm beitreten",
        "startWithVideoMuted": "Ohne Video beitreten",
        "terms": "Nutzungsbedingungen",
@@ -1070,6 +1066,7 @@
            "chat": "Chatfenster öffnen / schließen",
            "clap": "Klatschen",
            "collapse": "Einklappen",
+            "dock": "In Hauptfenster einbinden",
            "document": "Geteiltes Dokument schließen",
            "download": "Unsere Apps herunterladen",
            "embedMeeting": "Konferenz einbetten",
@@ -1123,6 +1120,7 @@
            "tileView": "Kachelansicht ein-/ausschalten",
            "toggleCamera": "Kamera wechseln",
            "toggleFilmstrip": "Miniaturansichten ein-/ausschalten",
+            "undock": "In eigenem Fenster anzeigen",
            "videoblur": "Unscharfer Hintergrund ein-/ausschalten",
            "videomute": "„Video stummschalten“ ein-/ausschalten",
            "whiteboard": "Whiteboard ein-/ausschalten"
@@ -1141,6 +1139,7 @@
        "closeReactionsMenu": "Interaktionsmenü schließen",
        "disableNoiseSuppression": "Rauschunterdrückung deaktivieren",
        "disableReactionSounds": "Sie können die Interaktionstöne für diese Konferenz deaktivieren",
+        "dock": "In Hauptfenster einbinden",
        "documentClose": "Geteiltes Dokument schließen",
        "documentOpen": "Geteiltes Dokument öffnen",
        "download": "Unsere Apps herunterladen",
@@ -1214,6 +1213,7 @@
        "talkWhileMutedPopup": "Versuchen Sie zu sprechen? Ihr Mikrofon ist stummgeschaltet.",
        "tileViewToggle": "Kachelansicht ein-/ausschalten",
        "toggleCamera": "Kamera wechseln",
+        "undock": "In eigenem Fenster anzeigen",
        "videoSettings": "Kameraeinstellungen",
        "videomute": "Kamera starten / stoppen"
    },
@@ -1294,7 +1294,6 @@
        "show": "Im Vordergrund anzeigen",
        "showSelfView": "Eigene Ansicht anzeigen",
        "unpinFromStage": "Lösen",
-        "verify": "Person verifizieren",
        "videoMuted": "Kamera ausgeschaltet",
        "videomute": "Person hat die Kamera angehalten"
    },
@@ -1362,7 +1361,6 @@
        "recentList": "Verlauf",
        "recentListDelete": "Eintrag löschen",
        "recentListEmpty": "Ihr Konferenzverlauf ist derzeit leer. Reden Sie mit Ihrem Team und Ihre vergangenen Konferenzen landen hier.",
-        "recentMeetings": "Ihre letzten Konferenzen",
        "reducedUIText": "Willkommen bei {{app}}!",
        "roomNameAllowedChars": "Der Konferenzname sollte keines der folgenden Zeichen enthalten: ?, &, :, ', \", %, #.",
        "roomname": "Konferenzname eingeben",
@@ -1371,7 +1369,6 @@
        "settings": "Einstellungen",
        "startMeeting": "Meeting starten",
        "terms": "AGB",
-        "title": "Sichere, voll funktionale und komplett kostenlose Videokonferenzen",
-        "upcomingMeetings": "Ihre zukünftigen Konferenzen"
+        "title": "Sichere, voll funktionale und komplett kostenlose Videokonferenzen"
    }
 }
--- a/lang/main-enGB.json
+++ b/lang/main-enGB.json
@@ -365,7 +365,7 @@
        "mute": "Mute or unmute your microphone",
        "pushToTalk": "Press to transmit",
        "raiseHand": "Raise or lower your hand",
-        "showSpeakerStats": "Show participants stats",
+        "showSpeakerStats": "Show speaker stats",
        "toggleChat": "Open or close the chat",
        "toggleFilmstrip": "Show or hide video thumbnails",
        "toggleScreensharing": "Switch between camera and screen sharing",
@@ -579,7 +579,7 @@
        "minutes": "{{count}}m",
        "name": "Name",
        "seconds": "{{count}}s",
-        "speakerStats": "Participants Stats",
+        "speakerStats": "Speaker Stats",
        "speakerTime": "Speaker Time"
    },
    "startupoverlay": {
@@ -626,7 +626,7 @@
            "sharedvideo": "Toggle video sharing",
            "shortcuts": "Toggle shortcuts",
            "show": "Show on stage",
-            "speakerStats": "Toggle participants statistics",
+            "speakerStats": "Toggle speaker statistics",
            "tileView": "Toggle tile view",
            "toggleCamera": "Toggle camera",
            "videoblur": "",
@@ -662,7 +662,7 @@
        "shareRoom": "Invite someone",
        "sharedvideo": "Share video",
        "shortcuts": "View shortcuts",
-        "speakerStats": "Participants stats",
+        "speakerStats": "Speaker stats",
        "startScreenSharing": "Start screen sharing",
        "startSubtitles": "Start subtitles",
        "startvideoblur": "",
--- a/lang/main-eo.json
+++ b/lang/main-eo.json
--- a/lang/main-hr.json
+++ b/lang/main-hr.json
@@ -1067,6 +1067,7 @@
            "chat": "Otvori/Zatvori chat",
            "clap": "Plješći",
            "collapse": "Sklopi",
+            "dock": "Prikvači u glavni prozor",
            "document": "Uključi/Isključi dijeljeni dokument",
            "download": "Preuzmi naše aplikacije",
            "embedMeeting": "Ugradi sastanak",
@@ -1120,6 +1121,7 @@
            "tileView": "Uključi/Isključi pločasti prikaz",
            "toggleCamera": "Uključi/Isključi kameru",
            "toggleFilmstrip": "Uključi/Isključi slike videa",
+            "undock": "Odspoji u zasebni prozor",
            "videoblur": "Uključi/Isključi zamućenje videa",
            "videomute": "Pokreni/Prekini kameru",
            "whiteboard": "Pokaži/Sakrij ploču za prezentacije"
@@ -1138,6 +1140,7 @@
        "closeReactionsMenu": "Zatvori izbornik reakcija",
        "disableNoiseSuppression": "Isključi suzbijanje šumova",
        "disableReactionSounds": "Za ovaj sastanak možeš isključiti zvukove reakcija",
+        "dock": "Prikvači u glavni prozor",
        "documentClose": "Zatvori dijeljeni dokument",
        "documentOpen": "Otvori dijeljeni dokument",
        "download": "Preuzmi naše aplikacije",
@@ -1211,6 +1214,7 @@
        "talkWhileMutedPopup": "Pokušavaš govoriti? Tvoj zvuk je isključen.",
        "tileViewToggle": "Uključi/Isključi pločasti prikaz",
        "toggleCamera": "Uključi/Isključi kameru",
+        "undock": "Odspoji u zasebni prozor",
        "videoSettings": "Videopostavke",
        "videomute": "Pokreni/Prekini kameru"
    },
--- a/lang/main-hsb.json
+++ b/lang/main-hsb.json
@@ -1033,6 +1033,7 @@
            "chat": "chat-woknješko pokazać/schować",
            "clap": "placać",
            "collapse": "pomjeńšić",
+            "dock": "we hłownej wobrazowce fiksěrować",
            "document": "dźěleny dokument začinić",
            "download": "naše aplikacije downloadować ",
            "embedMeeting": "konferencu integrować",
@@ -1084,6 +1085,7 @@
            "tileView": "kachlicowy napohlad zapnyć/hasnyć",
            "toggleCamera": "kameru měnić",
            "toggleFilmstrip": "miniaturowy napohlad zapnyć/hasnyć ",
+            "undock": "rozwjazać",
            "videoblur": "njejasny widejo zapnyć/hasnyć ",
            "videomute": "„něme šaltowanje wideja zapnyć/hasnyć "
        },
@@ -1100,6 +1102,7 @@
        "closeChat": "chat začinić",
        "closeReactionsMenu": "meni za interakcije začinić",
        "disableReactionSounds": "Móžeće zwuki za interakcije za tutu konferencu deaktiwěrować.",
+        "dock": "fiksěrować",
        "documentClose": "dźěleny dokument začinić",
        "documentOpen": "dźěleny dokument wočinić",
        "download": "naše aplikacije downloadować",
@@ -1169,6 +1172,7 @@
        "talkWhileMutedPopup": "Spytaće Wy rěčeć? Waš mikrofon je němy.",
        "tileViewToggle": " kachlicowy napohlad zapnyć/hasnyć ",
        "toggleCamera": "kameru měnić",
+        "undock": "rozwjazać",
        "videoSettings": "nastajenja za widejo",
        "videomute": "kameru startować/hasnyć"
    },
--- a/lang/main-hu.json
+++ b/lang/main-hu.json
@@ -27,25 +27,6 @@
    "audioOnly": {
        "audioOnly": "Alacsony sávszélesség"
    },
-    "breakoutRooms": {
-        "actions": {
-            "add": "Pihenőszoba hozzáadása",
-            "autoAssign": "Automatikus hozzárendelés a pihenőszobákhoz",
-            "close": "Bezárás",
-            "join": "Csatlakozás",
-            "leaveBreakoutRoom": "Pihenőszoba elhagyása",
-            "more": "Bővebben",
-            "remove": "Eltávolítás",
-            "sendToBreakoutRoom": "Résztvevő áthelyezése ide:"
-        },
-        "defaultName": "Pihenőszoba #{{index}}",
-        "mainRoom": "Fő szoba",
-        "notifications": {
-            "joined": "Csatlakozva a \"{{name}}\" pihenőszobához",
-            "joinedMainRoom": "Csatlakozva a fő szobához",
-            "joinedTitle": "Pihenőszobák"
-        }
-    },
    "calendarSync": {
        "addMeetingURL": "Értekezlet hivatkozásának hozzáadása",
        "confirmAddLink": "Hozzáadható egy Jitsi hivatkozás az eseményhez?",
@@ -65,7 +46,6 @@
        "today": "Ma"
    },
    "chat": {
-        "enter": "Belépés a szobába",
        "error": "Hiba: az üzenetet nem sikerült elküldeni. Hiba oka: {{error}}",
        "fieldPlaceHolder": "Írja ide az üzenetét",
        "messageTo": "Privát üzenet a felhasználónak: {{recipient}}",
@@ -78,21 +58,14 @@
        "noMessagesMessage": "A találkozón még nincsenek üzenetek. Itt kezdhet beszélgetést!",
        "privateNotice": "Privát üzenet a felhasználónak: {{recipient}}",
        "sendButton": "Küldés",
-        "tabs": {
-            "chat": "Csevegés",
-            "polls": "Szavazás"
-        },
        "title": "Csevegés",
-        "titleWithPolls": "Csevegés és szavazás",
-        "you": "te"
+        "titleWithPolls": "Csevegés",
+        "you": "neked"
    },
    "chromeExtensionBanner": {
        "buttonText": "Chrome kiterjesztés telepítése",
        "dontShowAgain": "Ne jelenjen meg újra",
-        "installExtensionText": "Kiterjesztés telepítése a Google Calendar és az Office 365 integrációjához",
-        "raiseHandAction": "Kéz felemelése",
-        "reactionSounds": "Hangok kikapcsolása",
-        "reactionSoundsForAll": "Hangok kikapcsolása mindenkinek"
+        "installExtensionText": "Kiterjesztés telepítése a Google Calendar és az Office 365 integrációjához"
    },
    "connectingOverlay": {
        "joiningRoom": "Kapcsolódás az értekezlethez…"
@@ -216,18 +189,12 @@
        "dismiss": "Elutasítás",
        "displayNameRequired": "Helló! Mi a neve?",
        "done": "Kész",
-        "e2eeDescription": "A végpontok közötti titkosítás jelenleg KÍSÉRLETES. Ne feledje, hogy a végpontok közötti titkosítás bekapcsolása hatékonyan letiltja a szerveroldali szolgáltatásokat, például: telefonos részvételt. Ne feledje azt is, hogy az értekezlet csak olyan felhasználók számára működik, akik olyan böngészőkből csatlakoznak, amelyek támogatják a beilleszthető adatfolyamokat.",
-        "e2eeLabel": "Végpontok közötti titkosítás engedélyezése",
-        "embedMeeting": "Meeting beágyazása",
-        "enterDisplayName": "Adja meg a nevét",
+        "enterDisplayName": "Adja meg itt a nevét",
        "error": "Hiba",
        "externalInstallationMsg": "Telepíteni kell a munkaasztal megosztására való kiterjesztést.",
        "externalInstallationTitle": "Kiterjesztésre van szükség",
        "goToStore": "Ugrás az alkalmazásbolthoz",
        "gracefulShutdown": "Jelenleg a szolgáltatás karbantartás miatt nem elérhető. Később próbálja meg ismét.",
-        "grantModeratorDialog": "Biztos, hogy moderátori jogokat kíván adni a következőnek: {{participantName}}?",
-        "grantModeratorTitle": "Moderátori jogok megadása",
-        "hideShareAudioHelper": "Ne mutassa ezt az ablakot többé",
        "incorrectPassword": "Helytelen felhasználói név és jelszó",
        "incorrectRoomLockPassword": "Helytelen jelszó",
        "inlineInstallExtension": "Telepítés azonnal",
@@ -250,34 +217,21 @@
        "maxUsersLimitReached": "A lehetséges résztvevők maximális száma elérve. A konferencia tele van. Lépjen kapcsolatba az értekezlet tulajdonosával vagy próbálkozzon később!",
        "maxUsersLimitReachedTitle": "A lehetséges résztvevők maximális száma elérve",
        "micConstraintFailedError": "A mikrofon nem felel meg bizonyos kikötéseknek.",
-        "micNotFoundError": "A mikrofon nem található.",
+        "micNotFoundError": "Nem található mikrofon.",
        "micNotSendingData": "A számítógép beállításai között kell visszahangosítani a mikrofont vagy beállítani a hangfelvétel szintjét",
        "micNotSendingDataTitle": "A mikrofon le van némítva a rendszerbeállításokban",
        "micPermissionDeniedError": "Nem adott engedélyt a mikrofon használatához. Csatlakozhat a beszélgetéshez, de a többiek nem fogják Önt hallani. A címsorban lévő kamera ikonnal lehet ezt helyrehozni.",
        "micUnknownError": "Ismeretlen ok miatt nem lehet a mikrofont használni.",
-        "moderationAudioLabel": "Engedélyezze a résztvevőknek saját némításuk feloldását",
-        "moderationVideoLabel": "Engedélyezze a résztvevőknek saját kamerájuk elindítását",
        "muteEveryoneDialog": "Valóban mindenki elnémítható? Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
        "muteEveryoneElseDialog": "Némítás után már nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja hangosítani.",
        "muteEveryoneElseTitle": "Mindenki elnémítása, kivéve: {{whom}}?",
-        "muteEveryoneElsesVideoDialog": "A kamera letiltása után nem tudja újra bekapcsolni, de ők bármikor újra bekapcsolhatják.",
-        "muteEveryoneElsesVideoTitle": "Mindenki kamerájának tilátsa, kivéve {{whom}}?",
        "muteEveryoneSelf": "önmagamat",
        "muteEveryoneStartMuted": "Mindenki elnémítva kezd ezután",
        "muteEveryoneTitle": "Mindenki elnémítása?",
-        "muteEveryonesVideoDialog": "A résztvevők bármikor be tudják kapcsolni a kamerájukat.",
-        "muteEveryonesVideoDialogModerationOn": "A résztvevők bármikor kérhetik videójuk bekapcsolását.",
-        "muteEveryonesVideoTitle": "Minden résztvevő kameráját leállítja?",
        "muteParticipantBody": "Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
        "muteParticipantButton": "Némítás",
        "muteParticipantDialog": "Valóban elnémítható ez a résztvevő? Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
        "muteParticipantTitle": "Elnémítható a résztvevő?",
-        "muteParticipantsVideoBody": "Ön nem tudja újra bekapcsolni a kamerát, de ők bármikor újra bekapcsolhatják.",
-        "muteParticipantsVideoButton": "Kamera leállítása",
-        "muteParticipantsVideoDialog": "Biztosan le akarja tiltani ennek a résztvevőnek a kameráját? Ön nem tudja újra bekapcsolni a kamerát, de ők bármikor újra bekapcsolhatják.",
-        "muteParticipantsVideoDialogModerationOn": "Are you sure you want to turn off this participant's camera? You won't be able to turn the camera back on and neither will they.",
-        "muteParticipantsVideoTitle": "Letiltja ennek a résztvevőnek a kameráját?",
-        "password": "Jelszó",
        "passwordLabel": "Az értekezletet zárolta egy résztvevő. Csatlakozáshoz adja meg a $t(lockRoomPassword).",
        "passwordNotSupported": "Az értekezlet $t(lockRoomPassword) beállítása nem támogatott.",
        "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) nem támogatott",
@@ -295,7 +249,6 @@
        "remoteControlShareScreenWarning": "Vegye figyelembe, hogy ha megnyomja az „Engedélyezés” lehetőséget, akkor megosztja a képernyőt!",
        "remoteControlStopMessage": "A távoli munkamenet irányítása befejeződött!",
        "remoteControlTitle": "Távoli asztal vezérlése",
-        "remoteUserControls": "{{username}} vezérlői",
        "removePassword": "$t(lockRoomPassword) eltávolítása",
        "removeSharedVideoMsg": "Valóban eltávolítható a megosztott videó?",
        "removeSharedVideoTitle": "Megosztott videó eltávolítása",
@@ -314,14 +267,11 @@
        "sendPrivateMessageTitle": "Privátban legyen elküldve?",
        "serviceUnavailable": "Szolgáltatás nem elérhető",
        "sessTerminated": "Hívás megszakadt",
-        "shareAudio": "Tovább",
-        "shareAudioTitle": "Hang megosztása",
        "shareVideoLinkError": "Adjon meg egy helyes linket.",
        "shareVideoTitle": "Videó megosztása",
        "shareYourScreen": "Képernyő megosztása",
        "shareYourScreenDisabled": "Képernyőmegosztás letiltva.",
        "shareYourScreenDisabledForGuest": "Vendég nem végezhet képernyőmegosztást.",
-        "sharedVideoLinkPlaceholder": "YouTube link vagy közvetlen videó link",
        "startLiveStreaming": "Élő közvetítés kezdése",
        "startRecording": "Felvétel indítása",
        "startRemoteControlErrorMessage": "Hiba történt a távoli vezérlés munkamenetének indítása közben!",
@@ -337,7 +287,6 @@
        "transcribing": "Átirat készítése",
        "unlockRoom": "Értekezlet $t(lockRoomPassword) eltávolítása",
        "userPassword": "felhasználói jelszó",
-        "videoLink": "Videó link",
        "yourEntireScreen": "A teljes képernyő"
    },
    "documentSharing": {
@@ -418,16 +367,11 @@
        "showSpeakerStats": "Beszéd statisztikák megjelenítése",
        "toggleChat": "Csevegés megnyitása vagy bezárása",
        "toggleFilmstrip": "Videó bélyegképek megjelenítése vagy elrejtése",
-        "toggleParticipantsPane": "A résztvevők panel megjelenítése vagy elrejtése",
        "toggleScreensharing": "Váltás kamera és képernyőmegosztás között",
        "toggleShortcuts": "Gyorsbillentyűk megjelenítése vagy elrejtése",
        "videoMute": "Kamera elindítása vagy leállítása",
        "videoQuality": "Hívás minőségének kezelése"
    },
-    "largeVideo": {
-        "screenIsShared": "Ön megosztja a képernyőjét",
-        "showMeWhatImSharing": "Látni szeretném mit osztok meg"
-    },
    "liveStreaming": {
        "busy": "Dolgozunk a közvetítési erőforrások felszabadításán. Kísérelje meg újra néhány perc múlva.",
        "busyTitle": "Jelenleg minden közvetítő foglalt",
@@ -461,44 +405,6 @@
        "unavailableTitle": "Élő közvetítés elérhetetlen",
        "youtubeTerms": "YouTube szolgáltatási feltételek"
    },
-    "lobby": {
-        "admit": "Engedélyezés",
-        "admitAll": "Mindet engedélyez",
-        "allow": "Engedélyez",
-        "backToKnockModeButton": "Csatlakozási kérelem küldése",
-        "chat": "Chat",
-        "dialogTitle": "Lobby mód",
-        "disableDialogContent": "A lobby mód jelenleg elérhető. Lehetőséged van csak azokat behívni a megbeszélésre, akik erre jogosultak általad. Szeretnéd kikapcsolni?",
-        "disableDialogSubmit": "Elutasítás",
-        "emailField": "Írd be az email címed",
-        "enableDialogPasswordField": "Jelszó megadása (választható)",
-        "enableDialogSubmit": "Elfogadás",
-        "enableDialogText": "A Lobby mód lehetővé teszi a megbeszélés védelmét azáltal, hogy csak a moderátor hivatalos jóváhagyása után engedi be az embereket.",
-        "enterPasswordButton": "Adja meg az értekezlet jelszavát",
-        "enterPasswordTitle": "Adja meg a jelszót az értekezlethez való csatlakozáshoz",
-        "errorMissingPassword": "Kérjük, adja meg az értekezlet jelszavát",
-        "invalidPassword": "Helytelen jelszó",
-        "joinRejectedMessage": "Csatlakozási kérelmét egy moderátor elutasította.",
-        "joinRejectedTitle": "Csatlakozási kérelem elutasítva.",
-        "joinTitle": "Csatlakozás az értekezlethez",
-        "joinWithPasswordMessage": "Csatlakozás jelszóval, kérjük várjon...",
-        "joiningMessage": "Amint valaki elfogadja kérését, csatlakoztatjuk az értekezlethez",
-        "joiningTitle": "Értekezlethez csatlakozás kérése...",
-        "joiningWithPasswordTitle": "Csatlakozás jelszóval...",
-        "knockButton": "Csatlakozási kérelem küldése",
-        "knockTitle": "Valaki szeretne csatlakozni az értekezlethez",
-        "nameField": "Adja meg a nevét",
-        "notificationLobbyAccessDenied": "{{targetParticipantName}} elutasításra került a csatlakozásod {{originParticipantName}} által",
-        "notificationLobbyAccessGranted": "{{targetParticipantName}} a csatlakozozásod elfogadva lett {{originParticipantName}} által",
-        "notificationLobbyDisabled": "Lobby tiltva lett {{originParticipantName}} által.",
-        "notificationLobbyEnabled": "Lobby engedélyezve lett {{originParticipantName}} által.",
-        "notificationTitle": "Lobby",
-        "passwordField": "Adja meg az értekezlet jelszavát",
-        "passwordJoinButton": "Csatlakozás",
-        "reject": "Elutasít",
-        "rejectAll": "Mindet elutasít",
-        "toggleLabel": "Lobby engedélyezése"
-    },
    "localRecording": {
        "clientState": {
            "off": "Kikapcsolva",
@@ -543,18 +449,11 @@
        "focus": "Konferencia fókusza",
        "focusFail": "{{component}} nem elérhető – újrapróbálkozás {{ms}} másodperc múlva",
        "grantedTo": "Moderátori jogok biztosítva {{to}} számára!",
-        "hostAskedUnmute": "Kérlek hangosítsd vissza a mikrofonod.",
        "invitedOneMember": "{{name}} meg lett hívva",
        "invitedThreePlusMembers": "{{name}} és {{count}} másik felhasználó meg lett hívva",
        "invitedTwoMembers": "{{first}} és {{second}} lett meghívva",
        "kickParticipant": "{{kicked}} résztvevőt kirúgta {{kicker}}",
-        "leftOneMember": "{{name}} elhagyta az értekezletet",
-        "leftThreePlusMembers": "{{name}} és mások elhagyták az értekezletet",
-        "leftTwoMembers": "{{first}} és {{second}} elhagyták az értekezletet",
-        "localRecordingStarted": "{{name}} elkezdte rögzíteni az értekezletet.",
-        "localRecordingStopped": "{{name}} leállította a rögzítést.",
        "me": "Én",
-        "moderationInEffectTitle": "A moderátor elnémította a mikrofonját",
        "moderator": "Moderátori jogok biztosítva!",
        "muted": "A beszélgetést elnémítva kezdte meg.",
        "mutedRemotelyDescription": "Bármikor visszahangosíthatja magát, ha készen áll a beszédre. Némítsa le magát ismét, ha a felesleges zajoktól meg kívánja védeni az értekezletet.",
@@ -563,10 +462,6 @@
        "newDeviceAction": "Alkalmaz",
        "newDeviceAudioTitle": "Új hangeszköz észlelve",
        "newDeviceCameraTitle": "Új kamera észlelve",
-        "noiseSuppressionFailedTitle": "Nem sikerült elindítani a zajcsökkentést",
-        "noiseSuppressionNoTrackDescription": "Kérjük, először kapcsolja ki a mikrofon némítását.",
-        "noiseSuppressionStereoDescription": "A sztereó zajcsökkentés jelenleg nem támogatott.",
-        "participantWantsToJoin": "Csatlakozni szeretne az értekezlethez",
        "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) egy másik résztvevő által eltávolítva",
        "passwordSetRemotely": "$t(lockRoomPasswordUppercase) egy másik résztvevő által beállítva",
        "raisedHand": "{{name}} beszélni szeretne.",
@@ -577,115 +472,9 @@
        "suboptimalExperienceTitle": "Böngészőhiba",
        "unmute": "Visszahangosítás"
    },
-    "participantsPane": {
-        "actions": {
-            "allow": "Engedélyezés a résztvevőknek, hogy:",
-            "allowVideo": "Videó engedélyezése",
-            "askUnmute": "Kérje a némítás feloldását",
-            "audioModeration": "A némítást feloldhassák",
-            "blockEveryoneMicCamera": "Block everyone's mic and camera",
-            "invite": "Meghívás",
-            "moreModerationActions": "További moderálási opciók",
-            "moreModerationControls": "További moderálási vezérlők",
-            "moreParticipantOptions": "Résztvevő további beállításai",
-            "mute": "Némítás",
-            "muteAll": "Mindenkit elnémít",
-            "muteEveryoneElse": "Mute everyone else",
-            "stopEveryonesVideo": "Mindenki videójának leállítása",
-            "stopVideo": "Videó leállítása",
-            "unblockEveryoneMicCamera": "Unblock everyone's mic and camera",
-            "videoModeration": "Elindíthassák a videójukat"
-        },
-        "close": "Bezár",
-        "header": "Résztvevők",
-        "headings": {
-            "lobby": "Lobby ({{count}})",
-            "participantsList": "Résztvevők ({{count}})",
-            "waitingLobby": "Lobby-ban várakozók ({{count}})"
-        },
-        "search": "Résztvevők keresése"
-    },
    "passwordDigitsOnly": "Legfeljebb {{number}} szám",
    "passwordSetRemotely": "egy másik résztvevő által beállítva",
-    "polls": {
-        "answer": {
-            "skip": "Kihagyás",
-            "submit": "Küldés"
-        },
-        "by": "Létrehozta: {{ name }}",
-        "create": {
-            "addOption": "Opció hozzáadása",
-            "answerPlaceholder": "Opció {{index}}",
-            "cancel": "Mégsem",
-            "create": "Szavazás létrehozása",
-            "pollOption": "Opció {{index}}",
-            "pollQuestion": "Szavazás kérdése",
-            "questionPlaceholder": "Írja le a kérdést",
-            "removeOption": "Opció eltávolítása",
-            "send": "Küldés"
-        },
-        "notification": {
-            "description": "Szavazás megnyitása",
-            "title": "Új szavazás létrehozva"
-        },
-        "results": {
-            "changeVote": "Módosítás",
-            "empty": "Még nincsenek szavazások. Indítson szavazást itt!",
-            "hideDetailedResults": "Részletek elrejtése",
-            "showDetailedResults": "Részletek",
-            "vote": "Szavazás"
-        }
-    },
    "poweredby": "Működteti a",
-    "prejoin": {
-        "audioAndVideoError": "Hang és videó hiba:",
-        "audioDeviceProblem": "Hiba lépett fel az hangeszközzel",
-        "audioOnlyError": "Hang hiba:",
-        "audioTrackError": "Nem lehet a hangot rögzíteni.",
-        "callMe": "Hívj fel",
-        "callMeAtNumber": "Hívj fel ezen a számon:",
-        "calling": "Hívás",
-        "configuringDevices": "Eszköz beállítás...",
-        "connectedWithAudioQ": "Csak hanggal szeretne csatlakozni?",
-        "connection": {
-            "good": "Az internet kapcsolat jónak tűnik!",
-            "nonOptimal": "Az internet kapcsolat nem optimális",
-            "poor": "Az internet kapcsolat nagyon gyenge!"
-        },
-        "connectionDetails": {
-            "goodQuality": "Fantasztikus! A média minősége kiváló lesz."
-        },
-        "copyAndShare": "Másolom és megosztom az értekezlet linkjét",
-        "dialInMeeting": "Behívás az értekezletbe",
-        "dialInPin": "Behívás az értkezeletbe és megadom a PIN kódot:",
-        "dialing": "Tárcsázás",
-        "doNotShow": "Ne mutassa mégegyszer ezt a képernyőt",
-        "errorDialOut": "Nem sikerült a behívás",
-        "errorDialOutDisconnected": "Nem sikerült a behívás. Kapcsolat bontása",
-        "errorDialOutFailed": "Nem sikerült a behívás. Hiba a hívásban",
-        "errorDialOutStatus": "Hiba a hívás státusz megadásában",
-        "errorMissingName": "Kérlet add meg a neved, hogy csatlakozhass a megbeszéléshez",
-        "errorNoPermissions": "Engedélyeznie kell a mikrofonhoz és a kamerához való hozzáférést",
-        "errorStatusCode": "Hiba a hiváskor, hiba kód: {{status}}",
-        "errorValidation": "Hívószám validációs hiba",
-        "iWantToDialIn": "Hívni szeretném",
-        "initiated": "Hívás felépítés",
-        "joinAudioByPhone": "Csatlakozás telefon beszélgetéssel",
-        "joinMeeting": "Csatlakozás",
-        "joinMeetingInLowBandwidthMode": "Csatlakozás alacsony sávszélességi módban",
-        "joinWithoutAudio": "Csatlakozás hang nélkül",
-        "keyboardShortcuts": "Gyorsbillentyűk engedélyezése",
-        "linkCopied": "A link a vágólapra másolva",
-        "lookGood": "A mikrofon megfelelően működik",
-        "or": "vagy",
-        "premeeting": "Csatlakozás előtt",
-        "screenSharingError": "Képernyő megosztás hiba:",
-        "showScreen": "Csatlakozás előtti kamerakép",
-        "startWithPhone": "Kezdés telefonhanggal",
-        "videoOnlyError": "Videó hiba:",
-        "videoTrackError": "Nem sikerült a videó megjelenítés.",
-        "viewAllNumbers": "Összes szám megjelenítése"
-    },
    "presenceStatus": {
        "busy": "Foglalt",
        "calling": "Hívás…",
@@ -720,19 +509,13 @@
        "failedToStart": "A felvétel indítása meghiúsult",
        "fileSharingdescription": "Felvétel megosztása az értekezlet résztvevőivel",
        "live": "ÉLŐ",
-        "localRecordingNoNotificationWarning": "A felvételt nem közöljük más résztvevőkkel. Értesítenie kell velük, hogy a találkozót rögzítették.",
-        "localRecordingStartWarning": "A megbeszélésből való kilépés előtt feltétlenül állítsa le a felvételt, hogy elmentse azt.",
-        "localRecordingStartWarningTitle": "Állítsa le a felvételt a mentéshez",
-        "localRecordingWarning": "Győződjön meg arról, hogy az aktuális lapot választotta a megfelelő videó és hang használatához. A felvétel jelenleg 1 GB-ra van korlátozva, ami körülbelül 100 perc.",
        "loggedIn": "Belépve mint {{userName}}",
        "off": "Felvétel leállítva",
        "offBy": "{{name}} leállította a felvételt",
        "on": "Felvétel",
        "onBy": "{{name}} elindította a felvételt",
-        "onlyRecordSelf": "Csak az én hang- és videófolyamomat rögzítse",
        "pending": "Értekezlet rögzítésének előkészítése…",
        "rec": "REC",
-        "saveLocalRecording": "Felvétel mentése helyileg (béta)",
        "serviceDescription": "A felvételt a rögzítési szolgáltatás veszi fel",
        "serviceName": "Felvétel szolgáltatás",
        "signIn": "Belépés",
@@ -744,12 +527,6 @@
    "sectionList": {
        "pullToRefresh": "Húzás a frissítéshez"
    },
-    "security": {
-        "about": "Hozzáadhat jelszót az értekezlethez. A résztvevőknek meg kell adniuk a jelszót, mielőtt csatlakozhatnak az értekezlethez.",
-        "aboutReadOnly": "A moderátor résztvevői hozzáadhatnak egy jelszót az értekezlethez. A résztvevőknek meg kell adniuk a jelszót, mielőtt csatlakozhatnak az értekezlethez.",
-        "header": "Biztonsági beállítások",
-        "insecureRoomNameWarning": "The room name is unsafe. Unwanted participants may join your conference. Consider securing your meeting using the security button."
-    },
    "settings": {
        "calendar": {
            "about": "A {{appName}} naptárintegráció a naptár biztonságos elérésére szolgál, így olvasni tudja a soron következő eseményeket.",
@@ -758,13 +535,8 @@
            "signedIn": "Jelenleg ehhez az címhez tartozó naptár eseményei érhetőek el: {{email}}. Alább a „szétkapcsolás” gombra kattintva lehet leállítani a naptár eseményeinek elérését.",
            "title": "Naptár"
        },
-        "desktopShareFramerate": "Képernyőmegosztás sebessége (FPS)",
-        "desktopShareHighFpsWarning": "A nagyobb képkockasebesség az asztali megosztásnál hatással lehet a sávszélességre. Az új beállítások érvénybe léptetéséhez újra kell indítania a képernyőmegosztást.",
-        "desktopShareWarning": "Az új beállítások érvénybe léptetéséhez újra kell indítania a képernyőmegosztást.",
        "devices": "Eszközök",
        "followMe": "Mindenki engem kövessen",
-        "framesPerSecond": "képkocka / másodperc",
-        "incomingMessage": "Bejövő üzenet",
        "language": "Nyelv",
        "loggedIn": "Belépve mint {{name}}",
        "microphones": "Mikrofonok",
@@ -772,22 +544,12 @@
        "more": "Továbbiak",
        "name": "Név",
        "noDevice": "Nincs",
-        "participantJoined": "Résztvevő csatlakozott",
-        "participantKnocking": "Résztvevő belépett a lobby-ba",
-        "participantLeft": "Résztvevő kilépett",
-        "playSounds": "Hangok lejátszása a következőkhöz:",
-        "reactions": "Meeting reakciók",
-        "sameAsSystem": "Rendszerhang ({{label}})",
        "selectAudioOutput": "Hangkimenet",
        "selectCamera": "Kamera",
        "selectMic": "Mikrofon",
-        "selfView": "Saját kép",
-        "sounds": "Hangok",
        "speakers": "Hangszórók",
        "startAudioMuted": "Mindenki elnémítva kezd",
-        "startReactionsMuted": "Reakció hangok némítása mindenki számára",
        "startVideoMuted": "Mindenki videó nélkül kezd",
-        "talkWhileMuted": "Lenémított beszéd",
        "title": "Beállítások"
    },
    "settingsView": {
@@ -815,23 +577,14 @@
    },
    "speaker": "Hangszóró",
    "speakerStats": {
-        "angry": "Mérges",
-        "disgusted": "Felháborodott",
-        "fearful": "Félelmetes",
-        "happy": "Boldog",
        "hours": "{{count}} h",
        "minutes": "{{count}} perc",
        "name": "Név",
-        "neutral": "Semleges",
-        "sad": "Szomorú",
-        "search": "Keresés",
        "seconds": "{{count}} mp",
        "speakerStats": "Beszélő statisztika",
-        "speakerTime": "Beszélő ideje",
-        "surprised": "Meglepett"
+        "speakerTime": "Beszélő ideje"
    },
    "startupoverlay": {
-        "genericTitle": "Az értekezlethez engedélyezni kell a mikrofont és kamerát.",
        "policyText": " ",
        "title": "A {{app}} használni szeretné a mikrofont és a kamerát."
    },
@@ -846,49 +599,36 @@
            "Settings": "Beállítások átváltása",
            "audioOnly": "Csak a hang átváltása",
            "audioRoute": "Hangeszköz kijelölése",
-            "boo": "Szomorú",
            "callQuality": "Videóminőség kezelése",
            "cc": "Feliratok átváltása",
            "chat": "Csevegés ablak átváltása",
-            "clap": "Taps",
            "document": "Megosztott dokumentum átváltása",
            "download": "Alkalmazás letöltése",
-            "embedMeeting": "Meeting beágyazása",
            "feedback": "Visszajelzés küldése",
            "fullScreen": "Teljes képernyő átváltása",
-            "grantModerator": "Moderátori jogok megadása",
            "hangup": "Beszélgetés elhagyása",
            "help": "Súgó",
            "invite": "Személyek meghívása",
            "kick": "Résztvevő kirúgása",
-            "laugh": "Nevetés",
-            "like": "Hüvelykujj fel",
            "localRecording": "Helyi felvétel vezérlőelemeinek átváltása",
            "lockRoom": "Értekezlet jelszavának átváltása",
-            "moreActions": "További műveletek menü átváltása",
-            "moreActionsMenu": "További műveletek menü",
+            "moreActions": "További műveltek menü átváltása",
+            "moreActionsMenu": "További műveltek menü",
            "moreOptions": "További beállítások megjelenítése",
            "mute": "Hang némításának átváltása",
            "muteEveryone": "Mindenki elnémítása",
-            "muteEveryonesVideoStream": "Mindenki videójának leállítása",
-            "noiseSuppression": "Zajcsökkentés",
-            "participants": "Résztvevők",
            "pip": "Kép és képben mód átváltása",
            "privateMessage": "Privát üzenet küldése",
            "profile": "Adja meg a profilját",
            "raiseHand": "Kéz felemelésének átváltása",
            "recording": "Felvétel átváltása",
            "remoteMute": "Résztvevők némítása",
-            "security": "Biztonsági Beállítások",
            "shareRoom": "Valaki meghívása",
            "shareYourScreen": "Képernyőmegosztás átváltása",
-            "shareaudio": "Hang megosztása",
            "sharedvideo": "Videó megosztásának átváltása",
            "shortcuts": "Gyorsbillentyűk átváltása",
            "show": "Megjelenítés a színpadon",
-            "silence": "Néma",
            "speakerStats": "Beszélő statisztika átváltása",
-            "surprised": "Meglepett",
            "tileView": "Mozaikos nézet átváltása",
            "toggleCamera": "Kamera átváltása",
            "toggleFilmstrip": "Filmszalag átváltása",
@@ -899,18 +639,13 @@
        "audioOnlyOff": "Alacsony sávszélességű mód letiltása",
        "audioOnlyOn": "Alacsony sávszélességű mód engedélyezése",
        "audioRoute": "Hangeszköz kijelölése",
-        "audioSettings": "Hangbeállítások",
        "authenticate": "Hitelesítés",
-        "boo": "Szomorú",
        "callQuality": "Videominőség kezelése",
        "chat": "Csevegés megnyitása / bezárása",
-        "clap": "Taps",
        "closeChat": "Csevegés bezárása",
-        "disableReactionSounds": "Kikapcsolhatja a reakcióhangokat a Meeting-en",
        "documentClose": "Megosztott dokumentum bezárása",
        "documentOpen": "Megosztott dokumentum megnyitása",
        "download": "Alkalmazás letöltése",
-        "embedMeeting": "Meeting beágyazása",
        "enterFullScreen": "Teljes képernyős megtekintés",
        "enterTileView": "Mozaikos nézet indítása",
        "exitFullScreen": "Kilépés a teljes képernyőből",
@@ -919,14 +654,10 @@
        "hangup": "Kilépés",
        "help": "Súgó",
        "invite": "Személyek meghívása",
-        "joinBreakoutRoom": "Csatlakozás a pihenőszobához",
-        "laugh": "Nevetés",
-        "leaveBreakoutRoom": "Pihenőszoba elhagyása",
-        "like": "Hüvelykujj fel",
        "login": "Bejelentkezés",
        "logout": "Kijelentkezés",
        "lowerYourHand": "Kéz leengedése",
-        "moreActions": "További műveletek",
+        "moreActions": "További műveltek",
        "moreOptions": "További beállítások",
        "mute": "Némítás / Visszahangosítás",
        "muteEveryone": "Mindenki elnémítása",
@@ -935,42 +666,28 @@
        "noAudioSignalDialInDesc": "Be is tárcsázhat:",
        "noAudioSignalDialInLinkDesc": "Betárcsázási számok",
        "noAudioSignalTitle": "Nincs bemenet a mikrofonjáról!",
-        "noiseSuppression": "Zajcsökkentés",
        "noisyAudioInputDesc": "Úgy tűnik, hogy ez a mikrofon zajos. Le kellene némítani vagy cserélni az eszközt.",
        "noisyAudioInputTitle": "Zajosnak tűnik a mikrofonja!",
        "openChat": "Csevegés megnyitása",
-        "participants": "Résztvevők",
        "pip": "Belépés kép a képben módba",
        "privateMessage": "Privát üzenet küldése",
        "profile": "Adja meg a profilját",
        "raiseHand": "Kéz felemelése / leengedése",
        "raiseYourHand": "Kéz felemelése",
-        "reactionBoo": "Boo reakció küldése",
-        "reactionClap": "Tapsolás reakció küldése",
-        "reactionLaugh": "Nevetés reakció küldése",
-        "reactionLike": "Hüvelykujj fel reakció küldése",
-        "reactionSilence": "Néma arc reakció küldése",
-        "reactionSurprised": "Meglepett reakció küldése",
-        "security": "Biztonsági Beállítások",
-        "selectBackground": "Háttér beállítása",
        "shareRoom": "Valaki meghívása",
-        "shareaudio": "Hang megosztása",
        "sharedvideo": "Videó megosztása",
        "shortcuts": "Gyorsbillentyűk megtekintése",
-        "silence": "Néma",
        "speakerStats": "Beszélő statisztika",
        "startScreenSharing": "Képernyőmegosztás kezdése",
        "startSubtitles": "Feliratok kezdése",
        "startvideoblur": "Háttér elhomályosítása",
        "stopScreenSharing": "Képernyőmegosztás leállítása",
-        "stopSharedVideo": "Kamera leállítása",
+        "stopSharedVideo": "Videó leállítása",
        "stopSubtitles": "Felirat leállítása",
        "stopvideoblur": "Háttér elhomályosításának letiltása",
-        "surprised": "Meglepett",
        "talkWhileMutedPopup": "Úgy tűnik beszélni szeretne, de le van némítva.",
        "tileViewToggle": "Mozaikos nézet átváltása",
        "toggleCamera": "Kamera átváltása",
-        "videoSettings": "Videóbeállítások",
        "videomute": "Kamera indítása / leállítása"
    },
    "transcribing": {
@@ -1008,15 +725,12 @@
        "pending": "{{displayName}} -t meghívta"
    },
    "videoStatus": {
-        "adjustFor": "Igazítsa a legjobb:",
        "audioOnly": "CsH",
        "audioOnlyExpanded": "Jelenleg az alacsony sávszélességű mód az aktív, vagyis csak hangot lehet fogadni és képernyőmegosztást.",
-        "bestPerformance": "Teljesítményhez",
        "callQuality": "Videominőség",
        "hd": "MF",
        "hdTooltip": "Magas felbontású videó megtekintése",
        "highDefinition": "Magas felbontású",
-        "highestQuality": "Minőséghez",
        "labelTooiltipNoVideo": "Nincs videó",
        "labelTooltipAudioOnly": "Alacsony sávszélességű mód aktiválva",
        "ld": "AF",
@@ -1024,7 +738,6 @@
        "lowDefinition": "Alacsony felbontású",
        "onlyAudioAvailable": "„Csak hang” mód elérhető",
        "onlyAudioSupported": "Csak a hang támogatott ebben a böngészőben.",
-        "performanceSettings": "Teljesítménybeállítások",
        "sd": "SF",
        "sdTooltip": "Szabványos felbontású videó megtekintése",
        "standardDefinition": "Szabványos felbontású"
@@ -1032,10 +745,7 @@
    "videothumbnail": {
        "domute": "Némítás",
        "domuteOthers": "Mindenki más elnémítása",
-        "domuteVideoOfOthers": "Mindenki más kamerájának letiltása",
        "flip": "Tükrözés",
-        "grantModerator": "Moderátori jogok megadása",
-        "hideSelfView": "Saját kép elrejtése",
        "kick": "Kirúgás",
        "moderator": "Moderátor",
        "mute": "A résztvevő le van némítva",
@@ -1044,29 +754,6 @@
        "show": "Megjelenítés a színpadon",
        "videomute": "A résztvevő leállította a kameráját"
    },
-    "virtualBackground": {
-        "addBackground": "Háttér hozzáadása",
-        "apply": "Alkalmaz",
-        "backgroundEffectError": "Hiba a háttér effekt hozzáadásnál.",
-        "blur": "Elmosódott",
-        "deleteImage": "Delete image",
-        "desktopShare": "Asztal megosztása",
-        "desktopShareError": "Nem lehet asztalt megosztani",
-        "image1": "Tengerpart",
-        "image2": "Fehér semleges fal",
-        "image3": "Fehér üres szoba",
-        "image4": "Fekete állólámpa",
-        "image5": "Hegy",
-        "image6": "Erdő",
-        "image7": "Napfelkelte",
-        "none": "Nincs",
-        "pleaseWait": "Kérjük várjon...",
-        "removeBackground": "Háttér eltávolítása",
-        "slightBlur": "Enyhén elmosódott",
-        "title": "Virtuális háttérképek",
-        "uploadedImage": "Feltöltött kép {{index}}"
-    },
-    "volumeSlider": "Hangerő szabályzó",
    "welcomepage": {
        "accessibilityLabel": {
            "join": "Koppintson a csatlakozáshoz",
@@ -1084,20 +771,17 @@
        "getHelp": "Segítség kérése",
        "go": "Indítás",
        "goSmall": "Indítás",
-        "headerSubtitle": "Biztonságos és magas színvonalú konferenciák",
        "info": "Információ",
-        "jitsiOnMobile": "Jitsi Mobil – töltse le az app-ot, és indítson megbeszélést bárhonnan",
        "join": "LÉTREHOZ /HOZZÁAD",
        "privacy": "Adatvédelem",
        "recentList": "Legutóbbi",
-        "recentListDelete": "Lista törlés",
+        "recentListDelete": "Törlés",
        "recentListEmpty": "A legutóbbi lista jelenleg üres. Csevegjen a csapattal és minden előző értekezlet itt lesz megtalálható.",
        "reducedUIText": "Üdvözlet a {{app}} programban!",
        "roomNameAllowedChars": "Az értekezlet neve nem tartalmazhatja a következő karaktereket: ?, &, :, ', \", %, #.",
        "roomname": "Adja meg a szoba nevét",
        "roomnameHint": "Adja meg a kívánt nevet vagy URL-t, amelyhez csatlakozni szeretne. Bármiképp elnevezheti, csak ossza meg az értekezlet résztvevőivel, hogy ők ugyanezt a nevet tudják majd megadni.",
        "sendFeedback": "Visszajelzés küldése",
-        "startMeeting": "Csatlakozás",
        "terms": "Feltételek",
        "title": "Biztonságos, maradéktalanul felszerelt és teljesen ingyenes videokonferencia"
    }
--- a/lang/main-it.json
+++ b/lang/main-it.json
@@ -1067,6 +1067,7 @@
            "chat": "Conversazione",
            "clap": "Applaudi",
            "collapse": "Riduci",
+            "dock": "Aggancia alla finestra principale",
            "document": "Documenti condivisi",
            "download": "Scarica le nostre app",
            "embedMeeting": "Incorpora riunione altrove",
@@ -1120,6 +1121,7 @@
            "tileView": "Vedi tutti i partecipanti, o uno solo",
            "toggleCamera": "Cambia videocamera",
            "toggleFilmstrip": "Pellicola",
+            "undock": "Sgancia in una finestra separata",
            "videoblur": "Sfoca video",
            "videomute": "Videocamera",
            "whiteboard": "Usa lavagna"
@@ -1138,6 +1140,7 @@
        "closeReactionsMenu": "Chiudi il menù reazioni",
        "disableNoiseSuppression": "Interrompi riduzione rumore",
        "disableReactionSounds": "Puoi disattivare i suoni delle reaction, in questa riunione",
+        "dock": "Aggancia nella finestra principale",
        "documentClose": "Chiudi documento condiviso",
        "documentOpen": "Apri documento condiviso",
        "download": "Scarica le nostre app",
@@ -1211,6 +1214,7 @@
        "talkWhileMutedPopup": "Stai provando a parlare? Il microfono è disattivato.",
        "tileViewToggle": "Vedi tutti i partecipanti insieme, o uno solo",
        "toggleCamera": "Cambia videocamera",
+        "undock": "Sgancia in una finestra separata",
        "videoSettings": "Impostazioni video",
        "videomute": "Videocamera"
    },
--- a/lang/main-nl.json
+++ b/lang/main-nl.json
@@ -882,7 +882,6 @@
            "document": "Gedeeld document in- of uitschakelen",
            "download": "Download onze apps",
            "embedMeeting": "Vergadering embedden",
-            "endConference": "Vergadering voor iedereen beëindigen",
            "feedback": "Feedback achterlaten",
            "fullScreen": "Volledig scherm in- of uitschakelen",
            "grantModerator": "Moderatorrechten verlenen",
@@ -890,7 +889,6 @@
            "help": "Hulp",
            "invite": "Personen uitnodigen",
            "kick": "Deelnemer verwijderen",
-            "leaveConference": "Vergadering verlaten",
            "lobbyButton": "Lobby-modus in- of uitschakelen",
            "localRecording": "Besturingselementen voor lokale opname in- of uitschakelen",
            "lockRoom": "Wachtwoord voor vergadering in- of uitschakelen",
@@ -940,7 +938,6 @@
        "download": "Download onze apps",
        "e2ee": "Eind-tot-eind-versleuteling",
        "embedMeeting": "Vergadering embedden",
-        "endConference": "Vergadering voor iedereen beëindigen",
        "enterFullScreen": "Volledig scherm weergeven",
        "enterTileView": "Tegelweergave openen",
        "exitFullScreen": "Volledig scherm sluiten",
@@ -951,7 +948,6 @@
        "invite": "Personen uitnodigen",
        "joinBreakoutRoom": "Deelnemen aan aparte vergaderruimte",
        "leaveBreakoutRoom": "Aparte vergaderruimte verlaten",
-        "leaveConference": "Vergadering verlaten",
        "lobbyButtonDisable": "Schakel lobby-modus uit",
        "lobbyButtonEnable": "Schakel lobby-modus in",
        "login": "Aanmelden",
--- a/lang/main-pl.json
+++ b/lang/main-pl.json
@@ -1057,6 +1057,7 @@
            "chat": "Przełączanie okna rozmowy",
            "clap": "Klaskanie",
            "collapse": "Zwiń",
+            "dock": "Zadokuj w głównym oknie",
            "document": "Przełączanie wspólnego dokumentu",
            "download": "Pobierz nasze aplikacje",
            "embedMeeting": "Osadź spotkanie",
@@ -1108,6 +1109,7 @@
            "tileView": "Przełącz widok kafelkowy",
            "toggleCamera": "Przełączanie kamery",
            "toggleFilmstrip": "Przełącz filmstrip",
+            "undock": "Oddokuj w osobnym oknie",
            "videoblur": "Przełącz rozmazanie obrazu",
            "videomute": "Przełączanie wyciszonego filmu wideo"
        },
@@ -1125,6 +1127,7 @@
        "closeReactionsMenu": "Zamknij reakcje",
        "disableNoiseSuppression": "Wyłącz tłumienie szumów",
        "disableReactionSounds": "Wyłącz dźwięki reakcji dla tego spotkania",
+        "dock": "Zadokuj w głównym oknie",
        "documentClose": "Zamknij udostępniony dokument",
        "documentOpen": "Otwarty udostępniony dokument",
        "download": "Pobierz nasze aplikacje",
@@ -1194,6 +1197,7 @@
        "talkWhileMutedPopup": "Próbujesz mówić? Jesteś wyciszony.",
        "tileViewToggle": "Przełączanie kafelkowego widoku",
        "toggleCamera": "Przełączanie kamery",
+        "undock": "Oddokuj w osobnym oknie",
        "videoSettings": "Ustawienia video",
        "videomute": "Włącz / Wyłącz kamerę"
    },
--- a/lang/main-pt.json
+++ b/lang/main-pt.json
@@ -89,7 +89,7 @@
    "chat": {
        "enter": "Entrar na sala",
        "error": "Erro: a sua mensagem não foi enviada. Motivo: {{error}}",
-        "fieldPlaceHolder": "Aa",
+        "fieldPlaceHolder": "Escreva aqui a sua mensagem",
        "lobbyChatMessageTo": "Mensagem de chat na sala de espera para {{recipient}}",
        "message": "Mensagem",
        "messageAccessibleTitle": "{{user}} disse:",
@@ -147,7 +147,6 @@
        "bridgeCount": "Servidores: ",
        "codecs": "Codecs (A/V): ",
        "connectedTo": "Ligado a:",
-        "e2eeVerified": "E2EE verificada:",
        "framerate": "Taxa de frames:",
        "less": "Mostrar menos",
        "localaddress": "Endereço local:",
@@ -267,7 +266,7 @@
        "e2eeWarning": "AVISO: Nem todos os participantes neste encontro parecem ter apoio para a encriptação de ponta a ponta. Se o permitir, eles não o poderão ver nem ouvir.",
        "e2eeWillDisableDueToMaxModeDescription": "AVISO: A encriptação de ponta a ponta será automaticamente desativada se mais participantes aderirem à conferência.",
        "embedMeeting": "Embutir reunião",
-        "enterDisplayName": "Digite o seu nome",
+        "enterDisplayName": "Digite o seu nome aqui",
        "error": "Erro",
        "gracefulShutdown": "O nosso serviço está atualmente em manutenção. Por favor, tente novamente mais tarde.",
        "grantModeratorDialog": "Tem a certeza que quer conceder direitos de moderador a {{participantName}}?",
@@ -409,10 +408,6 @@
        "user": "Utilizador",
        "userIdentifier": "Identificador do utilizador",
        "userPassword": "Palavra-passe do utilizador",
-        "verifyParticipantConfirm": "Coincidem",
-        "verifyParticipantDismiss": "Não coincidem",
-        "verifyParticipantQuestion": "EXPERIMENTAL: Perguntar ao participante {{participantName}} se vêem o mesmo conteúdo, na mesma ordem.",
-        "verifyParticipantTitle": "Verificação pelo utilizador",
        "videoLink": "Link do vídeo",
        "viewUpgradeOptions": "Ver opções de actualização",
        "viewUpgradeOptionsContent": "Para obter acesso ilimitado a funcionalidades premium como gravação, transcrições, RTMP Streaming & mais, terá de actualizar o seu plano.",
@@ -442,6 +437,9 @@
        "noResults": "Não foram encontrados resultados :(",
        "search": "Procurar no GIPHY"
    },
+    "helpView": {
+        "title": "Centro de ajuda"
+    },
    "incomingCall": {
        "answer": "Responder",
        "audioCallTitle": "Chamada recebida",
@@ -565,6 +563,7 @@
    "lobby": {
        "admit": "Aceitar",
        "admitAll": "Aceitar todos",
+        "allow": "Permitir",
        "backToKnockModeButton": "Peça para aderir",
        "chat": "Chat",
        "dialogTitle": "Modo sala de espera",
@@ -650,8 +649,6 @@
        "connectedOneMember": "{{name}} entrou na reunião",
        "connectedThreePlusMembers": "{{name}} e muitos outros entraram na reunião",
        "connectedTwoMembers": "{{first}} e {{second}} entraram na reunião",
-        "dataChannelClosed": "Deficiência na qualidade do vídeo",
-        "dataChannelClosedDescription": "O canal de ponte foi desconectado e, portanto, a qualidade do vídeo está limitada à sua configuração mais baixa.",
        "disconnected": "desconectado",
        "displayNotifications": "Mostrar notificações para",
        "focus": "Foco da conferência",
@@ -712,8 +709,6 @@
        "reactionSoundsForAll": "Desativar sons para todos",
        "screenShareNoAudio": "A caixa de compartilhar áudio não foi marcada no ecrã de seleção da janela.",
        "screenShareNoAudioTitle": "Não foi possível partilhar o áudio do sistema!",
-        "screenSharingAudioOnlyDescription": "Note por favor que ao partilhar o seu ecrã está a afectar o modo \"Melhor desempenho\" e irá utilizar mais largura de banda.",
-        "screenSharingAudioOnlyTitle": "Modo \"Melhor desempenho\"",
        "selfViewTitle": "Pode sempre reexibir a autovisualização a partir das definições",
        "somebody": "Alguém",
        "startSilentDescription": "Volte à reunião para habilitar o áudio",
@@ -863,6 +858,9 @@
        "rejected": "Rejeitado",
        "ringing": "Tocando..."
    },
+    "privacyView": {
+        "title": "Privacidade"
+    },
    "profile": {
        "avatar": "avatar",
        "setDisplayNameLabel": "Definir seu nome de exibição",
@@ -916,7 +914,6 @@
        "localRecordingVideoWarning": "Para gravar o seu vídeo deve tê-lo ligado quando iniciar a gravação",
        "localRecordingWarning": "Certifique-se de selecionar o separador actual a fim de utilizar o vídeo e áudio corretos. A gravação está actualmente limitada a 1 GB, o que é cerca de 100 minutos.",
        "loggedIn": "Conectado como {{userName}}",
-        "noMicPermission": "Não foi possível criar a faixa de microfone. Por favor, conceda permissão para utilizar o microfone.",
        "noStreams": "Não foi detetado nenhum sinal áudio ou vídeo.",
        "off": "Gravação parada",
        "offBy": "{{name}} parou a gravação",
@@ -967,7 +964,7 @@
        "incomingMessage": "Receber uma mensagem",
        "language": "Idioma",
        "loggedIn": "Sessão iniciada como {{name}}",
-        "maxStageParticipants": "Número máximo de participantes que podem ser afixados (EXPERIMENTAL)",
+        "maxStageParticipants": "Número máximo de participantes que podem ser afixados",
        "microphones": "Microfones",
        "moderator": "Moderador",
        "more": "Mais",
@@ -986,7 +983,7 @@
        "sounds": "Sons",
        "speakers": "Participantes",
        "startAudioMuted": "Todos começam com microfone desligado",
-        "startReactionsMuted": "Todos começam com os sons de reação desativados",
+        "startReactionsMuted": "Sons de reação silenciados para todos",
        "startVideoMuted": "Todos começam com câmara desligada",
        "talkWhileMuted": "Falar com o microfone desligado",
        "title": "Definições"
@@ -1006,7 +1003,6 @@
        "displayName": "Nome de exibição",
        "displayNamePlaceholderText": "Ex: João Dias",
        "email": "Email",
-        "emailPlaceholderText": "email@example.com",
        "goTo": "Ir para",
        "header": "Configurações",
        "help": "Ajuda",
@@ -1071,6 +1067,7 @@
            "chat": "Abrir / Fechar chat",
            "clap": "Aplausos",
            "collapse": "Colapsar",
+            "dock": "Ancorar na janela principal",
            "document": "Mudar para documento partilhado",
            "download": "Descarregar as nossas aplicações",
            "embedMeeting": "Reunião incorporada",
@@ -1124,6 +1121,7 @@
            "tileView": "Mudar a vista em quadrícula",
            "toggleCamera": "Mudar a câmara",
            "toggleFilmstrip": "Mudar a película de filme",
+            "undock": "Desancorar numa janela separada",
            "videoblur": "Mudar o desfoque de vídeo",
            "videomute": "Iniciar / Parar câmara",
            "whiteboard": "Mostrar / Esconder quadro branco"
@@ -1142,6 +1140,7 @@
        "closeReactionsMenu": "Fechar menu de reações",
        "disableNoiseSuppression": "Desativar a supressão de ruído",
        "disableReactionSounds": "Pode desactivar os sons de reacção para esta reunião",
+        "dock": "Ancorar na janela principal",
        "documentClose": "Fechar documento partilhado",
        "documentOpen": "Abrir documento partilhado",
        "download": "Descarregar as nossas aplicações",
@@ -1215,6 +1214,7 @@
        "talkWhileMutedPopup": "Está a tentar falar? Está com o microfone desativado.",
        "tileViewToggle": "Mudar para vista em quadrícula",
        "toggleCamera": "Mudar a câmara",
+        "undock": "Desancorar numa janela separada",
        "videoSettings": "Definições de vídeo",
        "videomute": "Iniciar / Parar câmara"
    },
@@ -1295,7 +1295,6 @@
        "show": "Mostrar no palco",
        "showSelfView": "Mostrar autovisualização",
        "unpinFromStage": "Desafixar",
-        "verify": "Verificar participante",
        "videoMuted": "Câmara desativada",
        "videomute": "Participante parou a câmara"
    },
@@ -1363,7 +1362,6 @@
        "recentList": "Recente",
        "recentListDelete": "Remover",
        "recentListEmpty": "A sua lista recente está atualmente vazia. Converse com a sua equipa e encontrará aqui todas as suas reuniões recentes.",
-        "recentMeetings": "As suas reuniões recentes",
        "reducedUIText": "Bem-vindo ao {{app}}!",
        "roomNameAllowedChars": "Nome da reunião não deve conter qualquer um destes caracteres: ?. &, :, ', \", %, #.",
        "roomname": "Digite o nome da sala",
@@ -1372,7 +1370,6 @@
        "settings": "Definições",
        "startMeeting": "Iniciar reunião",
        "terms": "Termos",
-        "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas",
-        "upcomingMeetings": "As suas próximas reuniões"
+        "title": "Videoconferências mais seguras, flexíveis e totalmente gratuitas"
    }
 }
--- a/lang/main-sv.json
+++ b/lang/main-sv.json
@@ -1067,6 +1067,7 @@
            "chat": "Öppna eller stäng chattfönster",
            "clap": "Klappa",
            "collapse": "Kollaps",
+            "dock": "Docka i huvudfönstret",
            "document": "Öppna eller stäng delat dokument",
            "download": "Ladda ner app",
            "embedMeeting": "Bädda in möte",
@@ -1120,6 +1121,7 @@
            "tileView": "Öppna eller stäng panelvyn",
            "toggleCamera": "Växla kamera",
            "toggleFilmstrip": "Växla filmremsa",
+            "undock": "Lossa till ett separat fönster",
            "videoblur": "Växla videooskärpa",
            "videomute": "Sätt på eller stäng av mikrofonen",
            "whiteboard": "Visa/dölj whiteboardtavlan"
@@ -1138,6 +1140,7 @@
        "closeReactionsMenu": "Stäng meny för reaktioner",
        "disableNoiseSuppression": "Inaktivera brusreducering",
        "disableReactionSounds": "Du kan inaktivera reaktionsljud för det här mötet",
+        "dock": "Docka i huvudfönstret",
        "documentClose": "Stäng delat dokument",
        "documentOpen": "Öppna delat dokument",
        "download": "Ladda ner vår app",
@@ -1211,6 +1214,7 @@
        "talkWhileMutedPopup": "Försöker du tala? Din mikrofon är tystad.",
        "tileViewToggle": "Öppna eller stäng panelvyn",
        "toggleCamera": "Byta kamera",
+        "undock": "Lossa till ett separat fönster",
        "videoSettings": "Video inställningar",
        "videomute": "Aktivera / avaktivera kameran"
    },
--- a/lang/main-tr.json
+++ b/lang/main-tr.json
@@ -1067,6 +1067,7 @@
            "chat": "Mesajlaşma penceresini aç/kapat",
            "clap": "Alkış",
            "collapse": "Daralt",
+            "dock": "Ana pencerede sabitleyin",
            "document": "Paylaşılan dokümanı aç/kapat",
            "download": "Uygulamalarımızı indirin",
            "embedMeeting": "Toplantıyı yerleştir",
@@ -1120,6 +1121,7 @@
            "tileView": "Döşeme görünümünü aç/kapat",
            "toggleCamera": "Kamerayı değiştir",
            "toggleFilmstrip": "Film şeridini aç/kapat",
+            "undock": "Ayrı pencereye çıkarın",
            "videoblur": "Video bulanıklaştırma aç/kapat",
            "videomute": "Sessiz videoyu aç/kapat",
            "whiteboard": "Beyaztahtayı Göster / Gizle"
@@ -1138,6 +1140,7 @@
        "closeReactionsMenu": "Reaksiyon menüsünü kapat",
        "disableNoiseSuppression": "",
        "disableReactionSounds": "Toplantı için reaksiyon seslerini devre dışı bırak",
+        "dock": "Ana pencerede sabitleyin",
        "documentClose": "Paylaşılan dokümanı kapat",
        "documentOpen": "Paylaşılan dokümanı aç",
        "download": "Uygulamalarımızı indirin",
@@ -1211,6 +1214,7 @@
        "talkWhileMutedPopup": "Bir şey mi dediniz? Mikrofonunuz kapalı.",
        "tileViewToggle": "Döşeme görünümünü aç/kapat",
        "toggleCamera": "Kamerayı değiştir",
+        "undock": "Ayrı pencereye çıkarın",
        "videoSettings": "Video ayarları",
        "videomute": "Kamera başlat / durdur"
    },
--- a/lang/main-uk.json
+++ b/lang/main-uk.json
@@ -1067,6 +1067,7 @@
            "chat": "Показати/приховати чат",
            "clap": "Овації",
            "collapse": "Згорнути",
+            "dock": "Закріпити в головному вікні",
            "document": "Відкрити/закрити спільний документ",
            "download": "Звантажити мобільний застосунок",
            "embedMeeting": "Вставити зустріч",
@@ -1120,6 +1121,7 @@
            "tileView": "Увімкнути/вимкнути плитки",
            "toggleCamera": "Увімкнути/вимкнути камеру",
            "toggleFilmstrip": "Показати/приховати панель видів",
+            "undock": "Відкріпити в окремому вікні",
            "videoblur": "Увімкнути/вимкнути розмиття фону",
            "videomute": "Увімкнути/вимкнути камеру",
            "whiteboard": "Показати/приховати дошку"
@@ -1138,6 +1140,7 @@
        "closeReactionsMenu": "Закрити меню реакцій",
        "disableNoiseSuppression": "Вимкнути придушення шуму",
        "disableReactionSounds": "Ви можете вимкнути звуки реакції для цієї зустрічі",
+        "dock": "Закріпити в головному вікні",
        "documentClose": "Закрити спільний документ",
        "documentOpen": "Відкрити спільний документ",
        "download": "Звантажити мобільний застосунок",
@@ -1211,6 +1214,7 @@
        "talkWhileMutedPopup": "Намагаєтесь говорити? Ваш мікрофон вимкнено.",
        "tileViewToggle": "Плитки",
        "toggleCamera": "Увімкнути/вимкнути камеру",
+        "undock": "Відкріпити в окремому вікні",
        "videoSettings": "Налаштування камери",
        "videomute": "Камера"
    },
--- a/lang/main-zhCN.json
+++ b/lang/main-zhCN.json
@@ -1067,6 +1067,7 @@
            "chat": "打开/关闭聊天窗口",
            "clap": "鼓掌",
            "collapse": "收起",
+            "dock": "在主窗口停靠",
            "document": "开启/关闭文件共享",
            "download": "下载应用",
            "embedMeeting": "嵌入会议",
@@ -1120,6 +1121,7 @@
            "tileView": "开启/关闭画廊视图",
            "toggleCamera": "开启/关闭摄像头",
            "toggleFilmstrip": "开启/关闭幻灯片",
+            "undock": "取消停靠到单独的窗口",
            "videoblur": "开启/关闭视频模糊",
            "videomute": "启动/停止摄像头",
            "whiteboard": "显示/隐藏白板"
@@ -1138,6 +1140,7 @@
        "closeReactionsMenu": "关闭反应菜单",
        "disableNoiseSuppression": "关闭噪音抑制",
        "disableReactionSounds": "你可以禁用此会议的反应声音",
+        "dock": "在主窗口停靠",
        "documentClose": "关闭文件共享",
        "documentOpen": "开启文件共享",
        "download": "下载我们的APP",
@@ -1211,6 +1214,7 @@
        "talkWhileMutedPopup": "你在尝试发言吗? 当前你是静音状态。",
        "tileViewToggle": "画面模式",
        "toggleCamera": "开启/关闭摄像头",
+        "undock": "取消停靠到单独的窗口",
        "videoSettings": "视频设置",
        "videomute": "开启/关闭摄像头"
    },
--- a/lang/main-zhTW.json
+++ b/lang/main-zhTW.json
@@ -1067,6 +1067,7 @@
            "chat": "打開/關閉聊天視窗",
            "clap": "鼓掌",
            "collapse": "收回",
+            "dock": "停靠在主視窗中",
            "document": "啟用/停用分享文檔",
            "download": "下載我們的應用程式",
            "embedMeeting": "嵌入會議",
@@ -1120,6 +1121,7 @@
            "tileView": "啟用/停用畫廊檢視",
            "toggleCamera": "啟用/停用網路攝影機",
            "toggleFilmstrip": "啟用/停用簡報",
+            "undock": "取消停靠到單獨的视窗",
            "videoblur": "啟用/停用畫面模糊",
            "videomute": "啟用/停用網路攝影機",
            "whiteboard": "啟用/停用白板"
@@ -1138,6 +1140,7 @@
        "closeReactionsMenu": "關閉反應選單",
        "disableNoiseSuppression": "停用雜訊抑制",
        "disableReactionSounds": "您可以停用此會議的反應音效",
+        "dock": "停靠在主視窗中",
        "documentClose": "關閉分享檔案欄",
        "documentOpen": "開啟分享檔案欄",
        "download": "下載我們的應用程式",
@@ -1211,6 +1214,7 @@
        "talkWhileMutedPopup": "您要發言嗎？目前您處於靜音。",
        "tileViewToggle": "啟動/停用畫廊檢視",
        "toggleCamera": "啟動/停用網路攝影機",
+        "undock": "取消停靠到單獨的视窗",
        "videoSettings": "視訊設定",
        "videomute": "啟動/停用網路攝影機"
    },
--- a/lang/main.json
+++ b/lang/main.json
@@ -147,7 +147,6 @@
        "bridgeCount": "Server count: ",
        "codecs": "Codecs (A/V): ",
        "connectedTo": "Connected to:",
-        "e2eeVerified": "E2EE verified:",
        "framerate": "Frame rate:",
        "less": "Show less",
        "localaddress": "Local address:",
@@ -409,10 +408,6 @@
        "user": "User",
        "userIdentifier": "User identifier",
        "userPassword": "User password",
-        "verifyParticipantConfirm": "They match",
-        "verifyParticipantDismiss": "They do not match",
-        "verifyParticipantQuestion": "EXPERIMENTAL: Ask participant {{participantName}} if they see the same content, in the same order.",
-        "verifyParticipantTitle": "User verification",
        "videoLink": "Video link",
        "viewUpgradeOptions": "View upgrade options",
        "viewUpgradeOptionsContent": "To get unlimited access to premium features like recording, transcriptions, RTMP Streaming & more, you'll need to upgrade your plan.",
@@ -442,6 +437,9 @@
        "noResults": "No results found :(",
        "search": "Search GIPHY"
    },
+    "helpView": {
+        "title": "Help center"
+    },
    "incomingCall": {
        "answer": "Answer",
        "audioCallTitle": "Incoming call",
@@ -513,7 +511,7 @@
        "mute": "Mute or unmute your microphone",
        "pushToTalk": "Push to talk",
        "raiseHand": "Raise or lower your hand",
-        "showSpeakerStats": "Show participants stats",
+        "showSpeakerStats": "Show speaker stats",
        "toggleChat": "Open or close the chat",
        "toggleFilmstrip": "Show or hide video thumbnails",
        "toggleParticipantsPane": "Show or hide the participants pane",
@@ -565,6 +563,7 @@
    "lobby": {
        "admit": "Admit",
        "admitAll": "Admit all",
+        "allow": "Allow",
        "backToKnockModeButton": "Ask to join",
        "chat": "Chat",
        "dialogTitle": "Lobby mode",
@@ -650,8 +649,6 @@
        "connectedOneMember": "{{name}} joined the meeting",
        "connectedThreePlusMembers": "{{name}} and many others joined the meeting",
        "connectedTwoMembers": "{{first}} and {{second}} joined the meeting",
-        "dataChannelClosed": "Video quality impaired",
-        "dataChannelClosedDescription": "The bridge channel has been disconnected and thus video quality is limited to its lowest setting.",
        "disconnected": "disconnected",
        "displayNotifications": "Display notifications for",
        "focus": "Conference focus",
@@ -712,8 +709,6 @@
        "reactionSoundsForAll": "Disable sounds for all",
        "screenShareNoAudio": "Share audio box was not checked in the window selection screen.",
        "screenShareNoAudioTitle": "Couldn't share system audio!",
-        "screenSharingAudioOnlyDescription": "Please note that by sharing your screen you're affecting the \"Best performance\" mode and you will use more bandwidth.",
-        "screenSharingAudioOnlyTitle": "\"Best performance\" mode",
        "selfViewTitle": "You can always un-hide the self-view from settings",
        "somebody": "Somebody",
        "startSilentDescription": "Rejoin the meeting to enable audio",
@@ -863,6 +858,9 @@
        "rejected": "Rejected",
        "ringing": "Ringing..."
    },
+    "privacyView": {
+        "title": "Privacy"
+    },
    "profile": {
        "avatar": "avatar",
        "setDisplayNameLabel": "Set your display name",
@@ -916,7 +914,6 @@
        "localRecordingVideoWarning": "To record your video you must have it on when starting the recording",
        "localRecordingWarning": "Make sure you select the current tab in order to use the right video and audio. The recording is currently limited to 1GB, which is around 100 minutes.",
        "loggedIn": "Logged in as {{userName}}",
-        "noMicPermission": "Microphone track could not be created. Please grant permission to use the microphone.",
        "noStreams": "No audio or video stream detected.",
        "off": "Recording stopped",
        "offBy": "{{name}} stopped the recording",
@@ -1039,7 +1036,7 @@
        "sad": "Sad",
        "search": "Search",
        "seconds": "{{count}}s",
-        "speakerStats": "Participants Stats",
+        "speakerStats": "Speaker Stats",
        "speakerTime": "Speaker Time",
        "surprised": "Surprised"
    },
@@ -1071,6 +1068,7 @@
            "chat": "Open / Close chat",
            "clap": "Clap",
            "collapse": "Collapse",
+            "dock": "Dock in main window",
            "document": "Toggle shared document",
            "download": "Download our apps",
            "embedMeeting": "Embed meeting",
@@ -1119,11 +1117,12 @@
            "shortcuts": "Toggle shortcuts",
            "show": "Show on stage",
            "silence": "Silence",
-            "speakerStats": "Toggle participants statistics",
+            "speakerStats": "Toggle speaker statistics",
            "surprised": "Surprised",
            "tileView": "Toggle tile view",
            "toggleCamera": "Toggle camera",
            "toggleFilmstrip": "Toggle filmstrip",
+            "undock": "Undock into separate window",
            "videoblur": "Toggle video blur",
            "videomute": "Start / Stop camera",
            "whiteboard": "Show / Hide whiteboard"
@@ -1142,6 +1141,7 @@
        "closeReactionsMenu": "Close reactions menu",
        "disableNoiseSuppression": "Disable noise suppression",
        "disableReactionSounds": "You can disable reaction sounds for this meeting",
+        "dock": "Dock in main window",
        "documentClose": "Close shared document",
        "documentOpen": "Open shared document",
        "download": "Download our apps",
@@ -1204,7 +1204,7 @@
        "shortcuts": "View shortcuts",
        "showWhiteboard": "Show whiteboard",
        "silence": "Silence",
-        "speakerStats": "Participants stats",
+        "speakerStats": "Speaker stats",
        "startScreenSharing": "Start screen sharing",
        "startSubtitles": "Subtitles • {{language}}",
        "stopAudioSharing": "Stop audio sharing",
@@ -1215,6 +1215,7 @@
        "talkWhileMutedPopup": "Trying to speak? You are muted.",
        "tileViewToggle": "Toggle tile view",
        "toggleCamera": "Toggle camera",
+        "undock": "Undock into separate window",
        "videoSettings": "Video settings",
        "videomute": "Start / Stop camera"
    },
@@ -1295,7 +1296,6 @@
        "show": "Show on stage",
        "showSelfView": "Show self view",
        "unpinFromStage": "Unpin",
-        "verify": "Verify participant",
        "videoMuted": "Camera disabled",
        "videomute": "Participant has stopped the camera"
    },
@@ -1363,7 +1363,6 @@
        "recentList": "Recent",
        "recentListDelete": "Delete entry",
        "recentListEmpty": "Your recent list is currently empty. Chat with your team and you will find all your recent meetings here.",
-        "recentMeetings": "Your recent meetings",
        "reducedUIText": "Welcome to {{app}}!",
        "roomNameAllowedChars": "Meeting name should not contain any of these characters: ?, &, :, ', \", %, #.",
        "roomname": "Enter room name",
@@ -1372,7 +1371,6 @@
        "settings": "Settings",
        "startMeeting": "Start meeting",
        "terms": "Terms",
-        "title": "Secure, fully featured, and completely free video conferencing",
-        "upcomingMeetings": "Your upcoming meetings"
+        "title": "Secure, fully featured, and completely free video conferencing"
    }
 }
--- a/modules/API/API.js
+++ b/modules/API/API.js
@@ -644,15 +644,15 @@ function initCommands() {
            }

            let recordingConfig;
+            const { recordingService } = state['features/base/config'];
+
+            if (!recordingService.enabled && !dropboxToken) {
+                logger.error('Failed starting recording: the recording service is not enabled');
+
+                return;
+            }

            if (mode === JitsiRecordingConstants.mode.FILE) {
-                const { recordingService } = state['features/base/config'];
-
-                if (!recordingService.enabled && !dropboxToken) {
-                    logger.error('Failed starting recording: the recording service is not enabled');
-
-                    return;
-                }
                if (dropboxToken) {
                    recordingConfig = {
                        mode: JitsiRecordingConstants.mode.FILE,
@@ -1450,22 +1450,6 @@ class API {
        });
    }

-    /**
-     * Notify external application that the data channel has been closed.
-     *
-     * @param {number} code - The close code.
-     * @param {string} reason - The close reason.
-     *
-     * @returns {void}
-     */
-    notifyDataChannelClosed(code: number, reason: string) {
-        this._sendEvent({
-            name: 'data-channel-closed',
-            code,
-            reason
-        });
-    }
-
    /**
     * Notify external application that the data channel has been opened.
     *
@@ -1671,6 +1655,22 @@ class API {
        });
    }

+    /**
+     * Notify external application (if API is enabled) that the iframe
+     * docked state has been changed. The responsibility for implementing
+     * the dock / undock functionality lies with the external application.
+     *
+     * @param {boolean} docked - Whether or not the iframe has been set to
+     * be docked or undocked.
+     * @returns {void}
+     */
+    notifyIframeDockStateChanged(docked: boolean) {
+        this._sendEvent({
+            name: 'iframe-dock-state-changed',
+            docked
+        });
+    }
+
    /**
     * Notify external application of a participant, remote or local, being
     * removed from the conference by another participant.
@@ -1920,42 +1920,6 @@ class API {
        });
    }

-    /**
-     * Notify the external application that a PeerConnection lost connectivity. This event is fired only if
-     * a PC `failed` but connectivity to the rtcstats server is still maintained signaling that there is a
-     * problem establishing a link between the app and the JVB server or the remote peer in case of P2P.
-     * Will only fire if rtcstats is enabled.
-     *
-     * @param {boolean} isP2P - Type of PC.
-     * @param {boolean} wasConnected - Was this connection previously connected. If it was it could mean
-     * that connectivity was disrupted, if not it most likely means that the app could not reach
-     * the JVB server, or the other peer in case of P2P.
-     *
-     * @returns {void}
-     */
-    notifyPeerConnectionFailure(isP2P, wasConnected) {
-        this._sendEvent({
-            name: 'peer-connection-failure',
-            isP2P,
-            wasConnected
-        });
-    }
-
-    /**
-     * Notify external application ( if API is enabled) that a participant menu button was clicked.
-     *
-     * @param {string} key - The key of the participant menu button.
-     * @param {string} participantId - The ID of the participant for with the participant menu button was clicked.
-     * @returns {void}
-     */
-    notifyParticipantMenuButtonClicked(key, participantId) {
-        this._sendEvent({
-            name: 'participant-menu-button-clicked',
-            key,
-            participantId
-        });
-    }
-
    /**
     * Disposes the allocated resources.
     *
--- a/modules/API/external/external_api.js
+++ b/modules/API/external/external_api.js
@@ -106,7 +106,6 @@ const events = {
    'camera-error': 'cameraError',
    'chat-updated': 'chatUpdated',
    'content-sharing-participants-changed': 'contentSharingParticipantsChanged',
-    'data-channel-closed': 'dataChannelClosed',
    'data-channel-opened': 'dataChannelOpened',
    'device-list-changed': 'deviceListChanged',
    'display-name-change': 'displayNameChange',
@@ -117,6 +116,7 @@ const events = {
    'feedback-submitted': 'feedbackSubmitted',
    'feedback-prompt-displayed': 'feedbackPromptDisplayed',
    'filmstrip-display-changed': 'filmstripDisplayChanged',
+    'iframe-dock-state-changed': 'iframeDockStateChanged',
    'incoming-message': 'incomingMessage',
    'knocking-participant': 'knockingParticipant',
    'log': 'log',
@@ -134,13 +134,11 @@ const events = {
    'participant-role-changed': 'participantRoleChanged',
    'participants-pane-toggled': 'participantsPaneToggled',
    'password-required': 'passwordRequired',
-    'peer-connection-failure': 'peerConnectionFailure',
    'prejoin-screen-loaded': 'prejoinScreenLoaded',
    'proxy-connection-event': 'proxyConnectionEvent',
    'raise-hand-updated': 'raiseHandUpdated',
    'recording-link-available': 'recordingLinkAvailable',
    'recording-status-changed': 'recordingStatusChanged',
-    'participant-menu-button-clicked': 'participantMenuButtonClick',
    'video-ready-to-close': 'readyToClose',
    'video-conference-joined': 'videoConferenceJoined',
    'video-conference-left': 'videoConferenceLeft',
@@ -389,10 +387,10 @@ export default class JitsiMeetExternalAPI extends EventEmitter {

        this._frame = document.createElement('iframe');
        this._frame.allow = 'camera; microphone; display-capture; autoplay; clipboard-write';
+        this._frame.src = this._url;
        this._frame.name = frameName;
        this._frame.id = frameName;
        this._setSize(height, width);
-        this._frame.sandbox = 'allow-scripts allow-same-origin allow-popups allow-forms allow-downloads';
        this._frame.setAttribute('allowFullScreen', 'true');
        this._frame.style.border = 0;

@@ -403,8 +401,6 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
        }

        this._frame = this._parentNode.appendChild(this._frame);
-
-        this._frame.src = this._url;
    }

    /**
--- a/modules/UI/etherpad/Etherpad.js
+++ b/modules/UI/etherpad/Etherpad.js
@@ -8,6 +8,39 @@ import Filmstrip from '../videolayout/Filmstrip';
 import LargeContainer from '../videolayout/LargeContainer';
 import VideoLayout from '../videolayout/VideoLayout';

+/**
+ *
+ */
+function bubbleIframeMouseMove(iframe) {
+    const existingOnMouseMove = iframe.contentWindow.onmousemove;
+
+    iframe.contentWindow.onmousemove = function(e) {
+        if (existingOnMouseMove) {
+            existingOnMouseMove(e);
+        }
+        const evt = document.createEvent('MouseEvents');
+        const boundingClientRect = iframe.getBoundingClientRect();
+
+        evt.initMouseEvent(
+            'mousemove',
+            true, // bubbles
+            false, // not cancelable
+            window,
+            e.detail,
+            e.screenX,
+            e.screenY,
+            e.clientX + boundingClientRect.left,
+            e.clientY + boundingClientRect.top,
+            e.ctrlKey,
+            e.altKey,
+            e.shiftKey,
+            e.metaKey,
+            e.button,
+            null // no related element
+        );
+        iframe.dispatchEvent(evt);
+    };
+}

 /**
 * Default Etherpad frame width.
@@ -35,7 +68,7 @@ class Etherpad extends LargeContainer {

        iframe.id = 'etherpadIFrame';
        iframe.src = url;
-        iframe.style.border = 0;
+        iframe.frameBorder = 0;
        iframe.scrolling = 'no';
        iframe.width = DEFAULT_WIDTH;
        iframe.height = DEFAULT_HEIGHT;
@@ -43,6 +76,26 @@ class Etherpad extends LargeContainer {

        this.container.appendChild(iframe);

+        iframe.onload = function() {
+            // eslint-disable-next-line no-self-assign
+            document.domain = document.domain;
+            bubbleIframeMouseMove(iframe);
+
+            setTimeout(() => {
+                const doc = iframe.contentDocument;
+
+                // the iframes inside of the etherpad are
+                // not yet loaded when the etherpad iframe is loaded
+                const outer = doc.getElementsByName('ace_outer')[0];
+
+                bubbleIframeMouseMove(outer);
+
+                const inner = doc.getElementsByName('ace_inner')[0];
+
+                bubbleIframeMouseMove(inner);
+            }, 2000);
+        };
+
        this.iframe = iframe;
    }

--- a/modules/UI/videolayout/LargeVideoManager.js
+++ b/modules/UI/videolayout/LargeVideoManager.js
@@ -14,13 +14,11 @@ import { i18next } from '../../../react/features/base/i18n';
 import { JitsiTrackEvents } from '../../../react/features/base/lib-jitsi-meet';
 import { VIDEO_TYPE } from '../../../react/features/base/media';
 import {
-    getLocalParticipant,
    getParticipantById,
    getParticipantDisplayName,
    isLocalScreenshareParticipant,
    isScreenShareParticipant
 } from '../../../react/features/base/participants';
-import { getHideSelfView } from '../../../react/features/base/settings/functions.any';
 import {
    getVideoTrackByParticipant,
    trackStreamingStatusChanged
@@ -234,10 +232,6 @@ export default class LargeVideoManager {

        preUpdate.then(() => {
            const { id, stream, videoType, resolve } = this.newStreamData;
-            const state = APP.store.getState();
-            const shouldHideSelfView = getHideSelfView(state);
-            const localId = getLocalParticipant(state)?.id;
-

            // FIXME this does not really make sense, because the videoType
            // (camera or desktop) is a completely different thing than
@@ -251,16 +245,13 @@ export default class LargeVideoManager {
            // eslint-disable-next-line no-shadow
            const container = this.getCurrentContainer();

-            if (shouldHideSelfView && localId === id) {
-                return container.hide();
-            }
-
            container.setStream(id, stream, videoType);

            // change the avatar url on large
            this.updateAvatar();

            const isVideoMuted = !stream || stream.isMuted();
+            const state = APP.store.getState();
            const participant = getParticipantById(state, id);
            const videoTrack = getVideoTrackByParticipant(state, participant);

--- a/modules/devices/mediaDeviceHelper.js
+++ b/modules/devices/mediaDeviceHelper.js
@@ -158,6 +158,7 @@ export default {
     * Determines if currently selected media devices should be changed after
     * list of available devices has been changed.
     * @param {MediaDeviceInfo[]} newDevices
+     * @param {boolean} isSharingScreen
     * @param {JitsiLocalTrack} localVideo
     * @param {JitsiLocalTrack} localAudio
     * @returns {{
@@ -168,12 +169,13 @@ export default {
     */
    getNewMediaDevicesAfterDeviceListChanged( // eslint-disable-line max-params
            newDevices,
+            isSharingScreen,
            localVideo,
            localAudio,
            newLabels) {
        return {
            audioinput: getNewAudioInputDevice(newDevices, localAudio, newLabels),
-            videoinput: getNewVideoInputDevice(newDevices, localVideo, newLabels),
+            videoinput: isSharingScreen ? undefined : getNewVideoInputDevice(newDevices, localVideo, newLabels),
            audiooutput: getNewAudioOutputDevice(newDevices)
        };
    },
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -28,15 +28,15 @@
    "@atlaskit/tooltip": "17.1.2",
    "@emotion/react": "11.10.0",
    "@emotion/styled": "11.10.0",
-    "@giphy/js-fetch-api": "4.7.1",
+    "@giphy/js-fetch-api": "4.1.2",
    "@giphy/react-components": "5.6.0",
    "@giphy/react-native-sdk": "1.7.0",
    "@hapi/bourne": "2.0.0",
-    "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
-    "@jitsi/js-utils": "2.0.5",
+    "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
+    "@jitsi/js-utils": "2.0.4",
    "@jitsi/logger": "2.0.0",
    "@jitsi/rnnoise-wasm": "0.1.0",
-    "@jitsi/rtcstats": "9.5.1",
+    "@jitsi/rtcstats": "9.4.1",
    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
    "@microsoft/microsoft-graph-client": "3.0.1",
    "@mui/material": "5.10.2",
@@ -46,11 +46,12 @@
    "@react-native-community/netinfo": "7.1.7",
    "@react-native-community/slider": "4.1.12",
    "@react-native-google-signin/google-signin": "7.0.4",
-    "@react-navigation/bottom-tabs": "6.5.3",
-    "@react-navigation/elements": "1.3.13",
-    "@react-navigation/material-top-tabs": "6.5.2",
-    "@react-navigation/native": "6.1.2",
-    "@react-navigation/stack": "6.3.11",
+    "@react-native-masked-view/masked-view": "0.2.6",
+    "@react-navigation/bottom-tabs": "6.0.9",
+    "@react-navigation/elements": "1.2.1",
+    "@react-navigation/material-top-tabs": "6.0.6",
+    "@react-navigation/native": "6.0.6",
+    "@react-navigation/stack": "6.2.2",
    "@svgr/webpack": "6.3.1",
    "@tensorflow/tfjs-backend-wasm": "3.13.0",
    "@tensorflow/tfjs-core": "3.13.0",
@@ -59,7 +60,7 @@
    "@types/w3c-image-capture": "1.0.6",
    "@vladmandic/human": "2.6.5",
    "@vladmandic/human-models": "2.5.9",
-    "@xmldom/xmldom": "0.7.9",
+    "@xmldom/xmldom": "0.7.6",
    "amplitude-js": "8.2.1",
    "base64-js": "1.3.1",
    "bc-css-flags": "3.0.0",
@@ -78,7 +79,7 @@
    "js-md5": "0.6.1",
    "js-sha512": "0.8.0",
    "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1578.0.0+5855ca72/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
    "lodash": "4.17.21",
    "moment": "2.29.4",
    "moment-duration-format": "2.2.2",
@@ -92,22 +93,23 @@
    "react-focus-lock": "2.5.1",
    "react-i18next": "10.11.4",
    "react-linkify": "1.0.0-alpha",
-    "react-native": "0.68.5",
+    "react-native": "0.68.4",
    "react-native-background-timer": "2.4.1",
    "react-native-calendar-events": "2.2.0",
    "react-native-callstats": "3.73.7",
+    "react-native-collapsible": "1.6.0",
    "react-native-default-preference": "1.4.4",
    "react-native-device-info": "8.4.8",
    "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
-    "react-native-gesture-handler": "2.9.0",
+    "react-native-gesture-handler": "2.1.0",
    "react-native-get-random-values": "1.7.2",
    "react-native-immersive": "2.0.0",
    "react-native-keep-awake": "4.0.0",
    "react-native-orientation-locker": "1.5.0",
    "react-native-pager-view": "5.4.9",
-    "react-native-paper": "5.1.2",
+    "react-native-paper": "4.11.1",
    "react-native-performance": "2.1.0",
-    "react-native-safe-area-context": "4.4.1",
+    "react-native-safe-area-context": "3.3.2",
    "react-native-screens": "3.13.1",
    "react-native-sound": "0.11.1",
    "react-native-splash-screen": "3.3.0",
@@ -117,14 +119,14 @@
    "react-native-url-polyfill": "1.3.0",
    "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
    "react-native-watch-connectivity": "1.0.11",
-    "react-native-webrtc": "106.0.5",
+    "react-native-webrtc": "1.106.1",
    "react-native-webview": "11.15.1",
    "react-native-youtube-iframe": "2.2.1",
    "react-redux": "7.1.0",
    "react-textarea-autosize": "8.3.0",
    "react-transition-group": "2.4.0",
    "react-window": "1.8.6",
-    "react-youtube": "10.1.0",
+    "react-youtube": "7.13.1",
    "redux": "4.0.4",
    "redux-thunk": "2.4.1",
    "resemblejs": "4.0.0",
@@ -150,9 +152,7 @@
    "@types/js-md5": "0.4.3",
    "@types/lodash": "4.14.182",
    "@types/react": "17.0.14",
-    "@types/react-dom": "17.0.14",
-    "@types/react-linkify": "1.0.1",
-    "@types/react-native": "0.68.9",
+    "@types/react-native": "0.68.7",
    "@types/react-redux": "7.1.24",
    "@types/react-window": "1.8.5",
    "@types/unorm": "1.3.28",
@@ -199,8 +199,7 @@
    "tsc:web": "tsc --noEmit --project tsconfig.web.json",
    "tsc:native": "tsc --noEmit --project tsconfig.native.json",
    "tsc:ci": "npm run tsc:web && npm run tsc:native",
-    "lint:ci": "eslint --ext .js,.ts,.tsx --max-warnings 0 . && npm run tsc:ci && npm run lint:lang",
-    "lint:lang": "for file in lang/*.json; do npx --yes jsonlint -q $file || exit 1; done",
+    "lint:ci": "eslint --ext .js,.ts,.tsx --max-warnings 0 . && npm run tsc:ci",
    "lang-sort": "./resources/lang-sort.sh",
    "lint-fix": "eslint --ext .js,.ts,.tsx --max-warnings 0 --fix .",
    "postinstall": "patch-package --error-on-fail && jetify",
--- a/patches/react-native+0.68.4.patch
+++ b/patches/react-native+0.68.4.patch
--- a/patches/react-native-gesture-handler+2.1.0.patch
+++ b/patches/react-native-gesture-handler+2.1.0.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native-gesture-handler/android/build.gradle b/node_modules/react-native-gesture-handler/android/build.gradle
+index 8afc3d5..4b1f721 100644
+--- a/node_modules/react-native-gesture-handler/android/build.gradle
+++ b/node_modules/react-native-gesture-handler/android/build.gradle
+@@ -26,7 +26,7 @@ def shouldUseCommonInterfaceFromReanimated() {
+         def json = new JsonSlurper().parseText(inputFile.text)
+         def reanimatedVersion = json.version as String
+         def (major, minor, patch) = reanimatedVersion.tokenize('.')
+-        return Integer.parseInt(minor) >= 3
+        return Integer.parseInt(major) >= 2 && Integer.parseInt(minor) >= 3
+     } else {
+         return false
+     }
--- a/react/features/analytics/handlers/AmplitudeHandler.ts
+++ b/react/features/analytics/handlers/AmplitudeHandler.ts
@@ -1,3 +1,5 @@
+/* eslint-disable lines-around-comment */
+
 import logger from '../logger';

 import AbstractHandler, { IEvent } from './AbstractHandler';
@@ -101,10 +103,8 @@ export default class AmplitudeHandler extends AbstractHandler {

        return {
            sessionId: amplitude.getInstance().getSessionId(),
-
            // @ts-ignore
            deviceId: amplitude.getInstance().options.deviceId,
-
            // @ts-ignore
            userId: amplitude.getInstance().options.userId
        };
--- a/react/features/app/actions.web.ts
+++ b/react/features/app/actions.web.ts
@@ -21,7 +21,6 @@ import { isVpaasMeeting } from '../jaas/functions';
 import { clearNotifications, showNotification } from '../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../notifications/constants';
 import { setFatalError } from '../overlay/actions';
-import { isWelcomePageEnabled } from '../welcome/functions';

 import {
    redirectToStaticPage,
@@ -204,7 +203,7 @@ export function maybeRedirectToWelcomePage(options: { feedbackSubmitted?: boolea

        // if Welcome page is enabled redirect to welcome page after 3 sec, if
        // there is a thank you message to be shown, 0.5s otherwise.
-        if (isWelcomePageEnabled(getState())) {
+        if (getState()['features/base/config'].enableWelcomePage) {
            setTimeout(
                () => {
                    dispatch(redirectWithStoredParams('/'));
--- a/react/features/app/getRouteToRender.web.js
+++ b/react/features/app/getRouteToRender.web.js
@@ -8,7 +8,7 @@ import { Conference } from '../conference';
 import { getDeepLinkingPage } from '../deep-linking';
 import { UnsupportedDesktopBrowser } from '../unsupported-browser';
 import { BlankPage, WelcomePage } from '../welcome';
-import { getCustomLandingPageURL, isWelcomePageEnabled } from '../welcome/functions';
+import { isWelcomePageEnabled } from '../welcome/functions';

 /**
 * Determines which route is to be rendered in order to depict a specific Redux
@@ -75,13 +75,7 @@ function _getWebWelcomePageRoute(state) {

    if (isWelcomePageEnabled(state)) {
        if (isSupportedBrowser()) {
-            const customLandingPage = getCustomLandingPageURL(state);
-
-            if (customLandingPage) {
-                route.href = customLandingPage;
-            } else {
-                route.component = WelcomePage;
-            }
+            route.component = WelcomePage;
        } else {
            route.component = UnsupportedDesktopBrowser;
        }
--- a/react/features/app/middlewares.any.js
+++ b/react/features/app/middlewares.any.js
@@ -11,7 +11,6 @@ import '../base/media/middleware';
 import '../base/net-info/middleware';
 import '../base/participants/middleware';
 import '../base/responsive-ui/middleware';
-import '../base/redux/middleware';
 import '../base/settings/middleware';
 import '../base/sounds/middleware';
 import '../base/testing/middleware';
--- a/react/features/app/middlewares.native.js
+++ b/react/features/app/middlewares.native.js
--- a/react/features/app/middlewares.web.js
+++ b/react/features/app/middlewares.web.js
@@ -2,6 +2,7 @@ import '../authentication/middleware';
 import '../base/i18n/middleware';
 import '../base/devices/middleware';
 import '../base/media/middleware';
+import '../base/redux/middleware';
 import '../dynamic-branding/middleware';
 import '../e2ee/middleware';
 import '../external-api/middleware';
--- a/react/features/app/reducers.any.js
+++ b/react/features/app/reducers.any.js
--- a/react/features/app/reducers.native.js
+++ b/react/features/app/reducers.native.js
@@ -6,7 +6,6 @@ import '../mobile/call-integration/reducer';
 import '../mobile/external-api/reducer';
 import '../mobile/full-screen/reducer';
 import '../mobile/watchos/reducer';
-import '../share-room/reducer';

 import './reducer.native';

--- a/react/features/app/reducers.web.js
+++ b/react/features/app/reducers.web.js
--- a/react/features/app/types.ts
+++ b/react/features/app/types.ts
@@ -65,7 +65,6 @@ import { IRecordingState } from '../recording/reducer';
 import { IRemoteControlState } from '../remote-control/reducer';
 import { IScreenShareState } from '../screen-share/reducer';
 import { IScreenshotCaptureState } from '../screenshot-capture/reducer';
-import { IShareRoomState } from '../share-room/reducer';
 import { ISharedVideoState } from '../shared-video/reducer';
 import { ISpeakerStatsState } from '../speaker-stats/reducer';
 import { ISubtitlesState } from '../subtitles/reducer';
@@ -90,7 +89,6 @@ export interface IReduxState {
    'features/background': IBackgroundState;
    'features/base/app': IAppState;
    'features/base/audio-only': IAudioOnlyState;
-    'features/base/color-scheme': any;
    'features/base/conference': IConferenceState;
    'features/base/config': IConfigState;
    'features/base/connection': IConnectionState;
@@ -150,7 +148,6 @@ export interface IReduxState {
    'features/screen-share': IScreenShareState;
    'features/screenshot-capture': IScreenshotCaptureState;
    'features/settings': ISettingsState;
-    'features/share-room': IShareRoomState;
    'features/shared-video': ISharedVideoState;
    'features/speaker-stats': ISpeakerStatsState;
    'features/subtitles': ISubtitlesState;
--- a/react/features/authentication/components/web/LoginDialog.tsx
+++ b/react/features/authentication/components/web/LoginDialog.tsx
@@ -253,7 +253,6 @@ class LoginDialog extends Component<IProps, IState> {

        return (
            <Dialog
-                disableAutoHideOnSubmit = { true }
                disableBackdropClose = { true }
                hideCloseButton = { true }
                ok = {{
--- a/react/features/authentication/middleware.web.ts
+++ b/react/features/authentication/middleware.web.ts
@@ -24,8 +24,9 @@ import {
    openWaitForOwnerDialog,
    stopWaitForOwner
 } from './actions.web';
-import LoginDialog from './components/web/LoginDialog';
-import WaitForOwnerDialog from './components/web/WaitForOwnerDialog';
+// eslint-disable-next-line lines-around-comment
+// @ts-ignore
+import { LoginDialog, WaitForOwnerDialog } from './components';

 /**
 * Middleware that captures connection or conference failed errors and controls
--- a/react/features/base/color-scheme/ColorSchemeRegistry.js
+++ b/react/features/base/color-scheme/ColorSchemeRegistry.js
@@ -1,5 +1,7 @@
-import { toState } from '../redux/functions';
-import { StyleType } from '../styles/functions.any';
+// @flow
+
+import { toState } from '../redux';
+import { StyleType } from '../styles';

 import defaultScheme from './defaultScheme';

@@ -88,7 +90,7 @@ class ColorSchemeRegistry {
            stateful: Object | Function,
            componentName: string,
            style: StyleType): StyleType {
-        let schemedStyle: any;
+        let schemedStyle;

        if (Array.isArray(style)) {
            // The style is an array of styles, we apply the same transformation
@@ -114,7 +116,7 @@ class ColorSchemeRegistry {
                    // The value is another style object, we apply the same
                    // transformation recursively.
                    schemedStyle[styleName]
-                        = this._applyColorScheme( // @ts-ignore
+                        = this._applyColorScheme(
                            stateful, componentName, styleValue);
                } else if (typeof styleValue === 'function') {
                    // The value is a function, which indicates that it's a
@@ -147,14 +149,11 @@ class ColorSchemeRegistry {
            stateful: Object | Function,
            componentName: string,
            colorDefinition: string): string {
-        // @ts-ignore
        const colorScheme = toState(stateful)['features/base/color-scheme'] || {};

        return {
            ...defaultScheme._defaultTheme,
            ...colorScheme._defaultTheme,
-
-            // @ts-ignore
            ...defaultScheme[componentName],
            ...colorScheme[componentName]
        }[colorDefinition];
--- a/react/features/base/color-scheme/defaultScheme.js
+++ b/react/features/base/color-scheme/defaultScheme.js
@@ -1,5 +1,6 @@
-import { ColorPalette } from '../styles/components/styles/ColorPalette';
-import { getRGBAFormat } from '../styles/functions.any';
+// @flow
+
+import { ColorPalette, getRGBAFormat } from '../styles';

 /**
 * The default color scheme of the application.
@@ -13,6 +14,21 @@ export default {
        icon: 'rgb(28, 32, 37)',
        text: 'rgb(28, 32, 37)'
    },
+    'Chat': {
+        displayName: 'rgb(94, 109, 121)',
+        localMsgBackground: 'rgb(215, 230, 249)',
+        lobbyMsgBackground: 'rgb(106, 80, 211)',
+        lobbyMsgNotice: 'rgb(16, 10, 41)',
+        privateMsgBackground: 'rgb(250, 219, 219)',
+        privateMsgNotice: 'rgb(186, 39, 58)',
+        remoteMsgBackground: 'rgb(241, 242, 246)',
+        replyBorder: 'rgb(219, 197, 200)',
+        replyIcon: 'rgb(94, 109, 121)'
+    },
+    'Conference': {
+        inviteButtonBackground: 'rgb(0, 119, 225)',
+        onVideoText: 'white'
+    },
    'Dialog': {},
    'Header': {
        background: ColorPalette.blue,
--- a/react/features/base/color-scheme/functions.js
+++ b/react/features/base/color-scheme/functions.js
@@ -1,3 +1,5 @@
+// @flow
+
 /**
 * A special function to be used in the {@code createColorSchemedStyle} call,
 * that denotes that the color is a dynamic color.
--- a/react/features/base/conference/actionTypes.ts
+++ b/react/features/base/conference/actionTypes.ts
@@ -138,18 +138,6 @@ export const CONFERENCE_WILL_LEAVE = 'CONFERENCE_WILL_LEAVE';
 */
 export const DATA_CHANNEL_OPENED = 'DATA_CHANNEL_OPENED';

-/**
- * The type of (redux) action which signals that the data channel with the
- * bridge has been closed.
- *
- * {
- *     type: DATA_CHANNEL_CLOSED,
- *     code: number,
- *     reason: string
- * }
- */
-export const DATA_CHANNEL_CLOSED = 'DATA_CHANNEL_CLOSED';
-
 /**
 * The type of action which signals that the user has been kicked out from
 * the conference.
--- a/Show More
+++ b/Show More