fix(prejoin) fix prejoin app dialogs not being visible

chore(deps): lib-jitsi-meet release-5854
feat(route) Redirect to a custom welcome page
2026-05-09 01:42:32 +00:00 · 2022-12-15 11:01:49 +02:00 · 2022-12-14 16:18:37 +02:00 · 2022-12-13 23:12:05 +02:00 · 2022-12-13 23:12:05 +02:00 · 2022-12-13 18:23:59 +02:00
97 changed files with 567 additions and 3034 deletions
--- 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/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/conference.js
+++ b/conference.js
@@ -47,7 +47,6 @@ import {
    dataChannelClosed,
    dataChannelOpened,
    e2eRttChanged,
-    generateVisitorConfig,
    getConferenceOptions,
    kickedOut,
    lockStateChanged,
@@ -278,8 +277,7 @@ class ConferenceConnector {
    /**
     *
     */
-    constructor(resolve, reject, conference) {
-        this._conference = conference;
+    constructor(resolve, reject) {
        this._resolve = resolve;
        this._reject = reject;
        this.reconnectTimeout = null;
@@ -338,26 +336,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;
@@ -754,7 +732,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();
        });
    },

@@ -1371,7 +1349,7 @@ export default {
        this._createRoom(localTracks);

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

--- a/config.js
+++ b/config.js
@@ -711,6 +711,7 @@ var config = {
    //    'chat',
    //    'closedcaptions',
    //    'desktop',
+    //    'dock-iframe',
    //    'download',
    //    'embedmeeting',
    //    'etherpad',
@@ -738,6 +739,7 @@ var config = {
    //    'stats',
    //    'tileview',
    //    'toggle-camera',
+    //    'undock-iframe',
    //    'videoquality',
    //    'whiteboard',
    // ],
--- a/debian/jitsi-meet-web-config.postinst
+++ b/debian/jitsi-meet-web-config.postinst
@@ -176,10 +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="//Enables multi-stream, do not delete me"
-        if ! grep -q "^${FIX_MSG}" $JITSI_MEET_CONFIG; then
-            sed -i "s#config.flags.sourceNameSignaling#${FIX_MSG}\nconfig.flags = config.flags || {};\nconfig.flags.sourceNameSignaling#g" $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
@@ -24,7 +24,6 @@ declare global {
        JITSI_MEET_LITE_SDK?: boolean;
        interfaceConfig?: any;
        JitsiMeetJS?: any;
-        JitsiMeetElectron?: any;
    }

    const config: IConfig;
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -385,7 +385,7 @@ PODS:
  - react-native-video/Video (6.0.0-alpha.1):
    - PromisesSwift
    - React-Core
-  - react-native-webrtc (106.0.0):
+  - react-native-webrtc (1.106.1):
    - JitsiWebRTC (~> 106.0.0)
    - React-Core
  - react-native-webview (11.15.1):
@@ -755,7 +755,7 @@ SPEC CHECKSUMS:
  react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
  react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
-  react-native-webrtc: 0a407105bf428c9157f2e8d4d6f7c844dc185933
+  react-native-webrtc: 4a4c31be61f88d1d3356526eebce72f462a6760e
  react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
  React-perflogger: 0458a87ea9a7342079e7a31b0d32b3734fb8415f
  React-RCTActionSheet: 22538001ea2926dea001111dd2846c13a0730bc9
--- 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
@@ -1066,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",
@@ -1119,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"
@@ -1137,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",
@@ -1210,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"
    },
--- 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-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-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
@@ -1067,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",
@@ -1120,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"
@@ -1138,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",
@@ -1211,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"
    },
--- 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
@@ -1074,6 +1074,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",
@@ -1127,6 +1128,7 @@
            "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"
@@ -1145,6 +1147,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",
@@ -1218,6 +1221,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"
    },
--- a/modules/API/API.js
+++ b/modules/API/API.js
@@ -1671,6 +1671,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.
--- a/modules/API/external/external_api.js
+++ b/modules/API/external/external_api.js
@@ -117,6 +117,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',
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
        "@jitsi/js-utils": "2.0.5",
        "@jitsi/logger": "2.0.0",
        "@jitsi/rnnoise-wasm": "0.1.0",
-        "@jitsi/rtcstats": "9.5.1",
+        "@jitsi/rtcstats": "9.5.0",
        "@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",
@@ -74,7 +74,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/v1557.0.0+8df33524/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#66877b963df15a23e612166e9151602a8343baf0",
        "lodash": "4.17.21",
        "moment": "2.29.4",
        "moment-duration-format": "2.2.2",
@@ -114,14 +114,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.0",
+        "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",
@@ -3780,9 +3780,9 @@
      "integrity": "sha512-JujivPbOUvdRYa2xqByHYKfKGNGa7ZPyNLaNuh8hEp9XsiNfjaJAHdboq6M1VY9TP+765nyxC0LjpAw1VkikOQ=="
    },
    "node_modules/@jitsi/rtcstats": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/@jitsi/rtcstats/-/rtcstats-9.5.1.tgz",
-      "integrity": "sha512-UDcsNwPvweQ6owV/chwabd6DsQd2aB4qjqrOB+BlJnETZ+zssGYAey3ezaiNK6nxevwBkbHj980/S9v+2y4btg==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/@jitsi/rtcstats/-/rtcstats-9.5.0.tgz",
+      "integrity": "sha512-jKB+1IzKuqynA2etmWAA4uDFF0oAFUZWxRq+m+rOt8FfBp6pXojWbWA7xblcjxerj/3njGc8nEQbcK9qck1How==",
      "dependencies": {
        "@jitsi/js-utils": "^2.0.0",
        "sdp": "^3.0.3",
@@ -13497,8 +13497,8 @@
    },
    "node_modules/lib-jitsi-meet": {
      "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1557.0.0+8df33524/lib-jitsi-meet.tgz",
-      "integrity": "sha512-LH24V3aCAyNxrXkYsr4Syz9G+hDyfGo7JUu3suEbh1bS5Y4w8mwzTBHyGazLnD7/NDG5F783DY19/yCzR7stSQ==",
+      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#66877b963df15a23e612166e9151602a8343baf0",
+      "integrity": "sha512-yX2sYztN6Rj38JFqzZRHUWVX3g9MMkZaTgS74U2u8Vfkn9blsZeRTju+/Ko+ZQezQX8qG/qNRsCtOX0Z16OFhA==",
      "license": "Apache-2.0",
      "dependencies": {
        "@jitsi/js-utils": "2.0.0",
@@ -16501,14 +16501,13 @@
      }
    },
    "node_modules/react-native-webrtc": {
-      "version": "106.0.0",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-106.0.0.tgz",
-      "integrity": "sha512-nFl8WSNGMNxuIiaNAiJvILRcEC65yRxPOWTexLrM+vo44syt/4chEvzN9eOqXiPsOmsECQmwZupCUGR5XABUNg==",
+      "version": "1.106.1",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.106.1.tgz",
+      "integrity": "sha512-955gqWFdISARz9D4hmnPzKQwpaU+AGqUbU+vBjzLCozUseSJ69tTQg2cShyPCBH6A1rwJQE+mrdjcpkeGbx3pQ==",
      "hasInstallScript": true,
      "dependencies": {
        "adm-zip": "0.5.9",
        "base64-js": "1.5.1",
-        "debug": "4.3.4",
        "event-target-shim": "6.0.2",
        "tar": "6.1.11"
      },
@@ -16767,21 +16766,36 @@
      }
    },
    "node_modules/react-youtube": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/react-youtube/-/react-youtube-10.1.0.tgz",
-      "integrity": "sha512-ZfGtcVpk0SSZtWCSTYOQKhfx5/1cfyEW1JN/mugGNfAxT3rmVJeMbGpA9+e78yG21ls5nc/5uZJETE3cm3knBg==",
+      "version": "7.13.1",
+      "resolved": "https://registry.npmjs.org/react-youtube/-/react-youtube-7.13.1.tgz",
+      "integrity": "sha512-b++TLHmHDpd0ZBS1wcbYabbuchU+W4jtx5A2MUQX0BINNKKsaIQX29sn/aLvZ9v5luwAoceia3VGtyz9blaB9w==",
      "dependencies": {
        "fast-deep-equal": "3.1.3",
-        "prop-types": "15.8.1",
+        "prop-types": "15.7.2",
        "youtube-player": "5.5.2"
      },
      "engines": {
-        "node": ">= 14.x"
+        "node": ">= 10.x"
      },
      "peerDependencies": {
        "react": ">=0.14.1"
      }
    },
+    "node_modules/react-youtube/node_modules/prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
+    "node_modules/react-youtube/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
    "node_modules/readable-stream": {
      "version": "3.6.0",
      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -23194,9 +23208,9 @@
      "integrity": "sha512-JujivPbOUvdRYa2xqByHYKfKGNGa7ZPyNLaNuh8hEp9XsiNfjaJAHdboq6M1VY9TP+765nyxC0LjpAw1VkikOQ=="
    },
    "@jitsi/rtcstats": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/@jitsi/rtcstats/-/rtcstats-9.5.1.tgz",
-      "integrity": "sha512-UDcsNwPvweQ6owV/chwabd6DsQd2aB4qjqrOB+BlJnETZ+zssGYAey3ezaiNK6nxevwBkbHj980/S9v+2y4btg==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/@jitsi/rtcstats/-/rtcstats-9.5.0.tgz",
+      "integrity": "sha512-jKB+1IzKuqynA2etmWAA4uDFF0oAFUZWxRq+m+rOt8FfBp6pXojWbWA7xblcjxerj/3njGc8nEQbcK9qck1How==",
      "requires": {
        "@jitsi/js-utils": "^2.0.0",
        "sdp": "^3.0.3",
@@ -30496,8 +30510,9 @@
      }
    },
    "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1557.0.0+8df33524/lib-jitsi-meet.tgz",
-      "integrity": "sha512-LH24V3aCAyNxrXkYsr4Syz9G+hDyfGo7JUu3suEbh1bS5Y4w8mwzTBHyGazLnD7/NDG5F783DY19/yCzR7stSQ==",
+      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#66877b963df15a23e612166e9151602a8343baf0",
+      "integrity": "sha512-yX2sYztN6Rj38JFqzZRHUWVX3g9MMkZaTgS74U2u8Vfkn9blsZeRTju+/Ko+ZQezQX8qG/qNRsCtOX0Z16OFhA==",
+      "from": "lib-jitsi-meet@https://github.com/jitsi/lib-jitsi-meet#66877b963df15a23e612166e9151602a8343baf0",
      "requires": {
        "@jitsi/js-utils": "2.0.0",
        "@jitsi/logger": "2.0.0",
@@ -32790,13 +32805,12 @@
      }
    },
    "react-native-webrtc": {
-      "version": "106.0.0",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-106.0.0.tgz",
-      "integrity": "sha512-nFl8WSNGMNxuIiaNAiJvILRcEC65yRxPOWTexLrM+vo44syt/4chEvzN9eOqXiPsOmsECQmwZupCUGR5XABUNg==",
+      "version": "1.106.1",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.106.1.tgz",
+      "integrity": "sha512-955gqWFdISARz9D4hmnPzKQwpaU+AGqUbU+vBjzLCozUseSJ69tTQg2cShyPCBH6A1rwJQE+mrdjcpkeGbx3pQ==",
      "requires": {
        "adm-zip": "0.5.9",
        "base64-js": "1.5.1",
-        "debug": "4.3.4",
        "event-target-shim": "6.0.2",
        "tar": "6.1.11"
      },
@@ -32965,13 +32979,30 @@
      }
    },
    "react-youtube": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/react-youtube/-/react-youtube-10.1.0.tgz",
-      "integrity": "sha512-ZfGtcVpk0SSZtWCSTYOQKhfx5/1cfyEW1JN/mugGNfAxT3rmVJeMbGpA9+e78yG21ls5nc/5uZJETE3cm3knBg==",
+      "version": "7.13.1",
+      "resolved": "https://registry.npmjs.org/react-youtube/-/react-youtube-7.13.1.tgz",
+      "integrity": "sha512-b++TLHmHDpd0ZBS1wcbYabbuchU+W4jtx5A2MUQX0BINNKKsaIQX29sn/aLvZ9v5luwAoceia3VGtyz9blaB9w==",
      "requires": {
        "fast-deep-equal": "3.1.3",
-        "prop-types": "15.8.1",
+        "prop-types": "15.7.2",
        "youtube-player": "5.5.2"
+      },
+      "dependencies": {
+        "prop-types": {
+          "version": "15.7.2",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+          "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+          "requires": {
+            "loose-envify": "^1.4.0",
+            "object-assign": "^4.1.1",
+            "react-is": "^16.8.1"
+          }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+        }
      }
    },
    "readable-stream": {
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
    "@jitsi/js-utils": "2.0.5",
    "@jitsi/logger": "2.0.0",
    "@jitsi/rnnoise-wasm": "0.1.0",
-    "@jitsi/rtcstats": "9.5.1",
+    "@jitsi/rtcstats": "9.5.0",
    "@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",
@@ -79,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/v1557.0.0+8df33524/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#66877b963df15a23e612166e9151602a8343baf0",
    "lodash": "4.17.21",
    "moment": "2.29.4",
    "moment-duration-format": "2.2.2",
@@ -119,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.0",
+    "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",
--- a/react/features/base/conference/functions.ts
+++ b/react/features/base/conference/functions.ts
@@ -252,34 +252,6 @@ export function getConferenceOptions(stateful: IStateful) {
    return options;
 }

-/**
- * Returns an object aggregating the conference options.
- *
- * @param {IStateful} stateful - The redux store state.
- * @param {Array<string>} params - The received parameters.
- * @returns {void}
- */
-export function generateVisitorConfig(stateful: IStateful, params: Array<string>) {
-    const [ vnode, focusJid ] = params;
-
-    const config = toState(stateful)['features/base/config'];
-
-    if (!config || !config.hosts) {
-        logger.warn('Wrong configuration, missing hosts.');
-
-        return;
-    }
-
-    const oldDomain = config.hosts.domain;
-
-    config.hosts.domain = `${vnode}.meet.jitsi`;
-    config.hosts.muc = config.hosts.muc.replace(oldDomain, config.hosts.domain);
-    config.hosts.visitorFocus = focusJid;
-
-    config.bosh += `?vnode=${vnode}`;
-    config.websocket += `?vnode=${vnode}`;
-}
-
 /**
 * Returns the UTC timestamp when the first participant joined the conference.
 *
--- a/react/features/base/conference/reducer.ts
+++ b/react/features/base/conference/reducer.ts
@@ -46,7 +46,6 @@ export interface IJitsiConference {
    avModerationApprove: Function;
    avModerationReject: Function;
    createVideoSIPGWSession: Function;
-    dial: Function;
    disableAVModeration: Function;
    enableAVModeration: Function;
    end: Function;
@@ -75,7 +74,6 @@ export interface IJitsiConference {
    myUserId: Function;
    off: Function;
    on: Function;
-    options: any;
    removeTrack: Function;
    replaceTrack: Function;
    room: IJitsiConferenceRoom;
--- a/react/features/base/config/configType.ts
+++ b/react/features/base/config/configType.ts
@@ -2,6 +2,7 @@ type ToolbarButtons = 'camera' |
    'chat' |
    'closedcaptions' |
    'desktop' |
+    'dock-iframe' |
    'download' |
    'embedmeeting' |
    'etherpad' |
@@ -28,6 +29,7 @@ type ToolbarButtons = 'camera' |
    'stats' |
    'tileview' |
    'toggle-camera' |
+    'undock-iframe' |
    'videoquality' |
    '__end';

@@ -127,7 +129,6 @@ export interface IConfig {
        preventExecution: boolean;
    }>;
    callDisplayName?: string;
-    callFlowsEnabled?: boolean;
    callStatsConfigParams?: {
        additionalIDs?: {
            customerID?: string;
@@ -340,13 +341,10 @@ export interface IConfig {
        domain: string;
        focus?: string;
        muc: string;
-        visitorFocus: string;
    };
    iAmRecorder?: boolean;
    iAmSipGateway?: boolean;
    inviteAppName?: string | null;
-    inviteServiceCallFlowsUrl?: string;
-    inviteServiceUrl?: string;
    jaasActuatorUrl?: string;
    jaasFeedbackMetadataURL?: string;
    jaasTokenUrl?: string;
--- a/react/features/base/config/functions.any.ts
+++ b/react/features/base/config/functions.any.ts
@@ -60,7 +60,7 @@ export function getMeetingRegion(state: IReduxState) {
 * @returns {boolean}
 */
 export function getMultipleVideoSendingSupportFeatureFlag(state: IReduxState) {
-    return isUnifiedPlanEnabled(state);
+    return navigator.product !== 'ReactNative' && isUnifiedPlanEnabled(state);
 }

 /**
--- a/react/features/base/icons/svg/dock.svg
+++ b/react/features/base/icons/svg/dock.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.3332 3.33329C18.3332 2.41282 17.587 1.66663 16.6665 1.66663H8.33317C7.4127 1.66663 6.6665 2.41282 6.6665 3.33329V4.99996H3.33317C2.4127 4.99996 1.6665 5.74615 1.6665 6.66663V16.6666C1.6665 17.5871 2.4127 18.3333 3.33317 18.3333H13.3332C14.2536 18.3333 14.9998 17.5871 14.9998 16.6666V15H16.6665C17.587 15 18.3332 14.2538 18.3332 13.3333V3.33329ZM8.33317 3.33329H16.6665L16.6665 13.3333H14.9998V6.66663C14.9998 5.74615 14.2536 4.99996 13.3332 4.99996H8.33317V3.33329ZM3.33317 6.66663V16.6666H13.3332V6.66663H3.33317ZM6.6665 12.1024V9.99996C6.6665 9.53972 6.29341 9.16663 5.83317 9.16663C5.37293 9.16663 4.99984 9.53972 4.99984 9.99996V14.1296V14.1666C4.99984 14.5693 5.28549 14.9053 5.66523 14.983C5.71947 14.9941 5.77564 15 5.83317 15L5.83356 14.9992C5.83397 14.9992 5.83439 14.9992 5.8348 14.9992L5.83445 15H5.87022H9.99984C10.4601 15 10.8332 14.6269 10.8332 14.1666C10.8332 13.7064 10.4601 13.3333 9.99984 13.3333H7.89741L11.4116 9.81913C11.7515 9.47922 11.7515 8.92813 11.4116 8.58822C11.0717 8.24832 10.5206 8.24832 10.1807 8.58822L6.6665 12.1024Z" />
+</svg>
--- a/react/features/base/icons/svg/index.ts
+++ b/react/features/base/icons/svg/index.ts
@@ -22,6 +22,7 @@ export { default as IconConnectionInactive } from './ninja.svg';
 export { default as IconCopy } from './copy.svg';
 export { default as IconCrown } from './host.svg';
 export { default as IconDeviceHeadphone } from './headset.svg';
+export { default as IconDock } from './dock.svg';
 export { default as IconDotsHorizontal } from './dots-horizontal.svg';
 export { default as IconDownload } from './download.svg';
 export { default as IconE2EE } from './e2ee.svg';
@@ -87,6 +88,7 @@ export { default as IconStopScreenshare } from './stop-screenshare.svg';
 export { default as IconSubtitles } from './subtitles.svg';
 export { default as IconTileView } from './tile-view.svg';
 export { default as IconTrash } from './trash.svg';
+export { default as IconUndock } from './undock.svg';
 export { default as IconUserDeleted } from './user-deleted.svg';
 export { default as IconUserGroups } from './user-groups.svg';
 export { default as IconUsers } from './users.svg';
--- a/react/features/base/icons/svg/undock.svg
+++ b/react/features/base/icons/svg/undock.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6665 1.66663H6.6665C5.74603 1.66663 4.99984 2.41282 4.99984 3.33329V4.99996H3.33317C2.4127 4.99996 1.6665 5.74615 1.6665 6.66663V16.6666C1.6665 17.5871 2.4127 18.3333 3.33317 18.3333H13.3332C14.2536 18.3333 14.9998 17.5871 14.9998 16.6666V15H16.6665C17.587 15 18.3332 14.2538 18.3332 13.3333V3.33329C18.3332 2.41282 17.587 1.66663 16.6665 1.66663ZM13.3332 16.6666V15H6.6665C5.74603 15 4.99984 14.2538 4.99984 13.3333V6.66663H3.33317V16.6666H13.3332ZM6.6665 3.33329V13.3333H16.6665V3.33329H6.6665ZM9.99984 4.99996C9.5396 4.99996 9.1665 5.37306 9.1665 5.83329C9.1665 6.29353 9.5396 6.66663 9.99984 6.66663H12.1023L8.5881 10.1808C8.24819 10.5207 8.24819 11.0718 8.5881 11.4117C8.928 11.7516 9.4791 11.7516 9.819 11.4117L13.3332 7.89753V9.99996C13.3332 10.4602 13.7063 10.8333 14.1665 10.8333C14.6267 10.8333 14.9998 10.4602 14.9998 9.99996V5.83329C14.9998 5.37306 14.6267 4.99996 14.1665 4.99996H14.1295H9.99984Z" />
+</svg>
--- a/react/features/base/media/constants.ts
+++ b/react/features/base/media/constants.ts
@@ -43,8 +43,7 @@ export const VIDEO_MUTISM_AUTHORITY = {
    AUDIO_ONLY: 1 << 0,
    BACKGROUND: 1 << 1,
    USER: 1 << 2,
-    CAR_MODE: 1 << 3,
-    SCREEN_SHARE: 1 << 4
+    CAR_MODE: 1 << 3
 };

 /* eslint-enable no-bitwise */
--- a/react/features/base/tracks/actions.native.ts
+++ b/react/features/base/tracks/actions.native.ts
@@ -4,17 +4,9 @@ import { IReduxState, IStore } from '../../app/types';
 import { setPictureInPictureEnabled } from '../../mobile/picture-in-picture/functions';
 import { setAudioOnly } from '../audio-only/actions';
 import JitsiMeetJS from '../lib-jitsi-meet';
-import {
-    setScreenshareMuted,
-    setVideoMuted
-} from '../media/actions';
-import {
-    MEDIA_TYPE,
-    VIDEO_MUTISM_AUTHORITY
-} from '../media/constants';

-import { addLocalTrack, replaceLocalTrack } from './actions.any';
-import { getLocalDesktopTrack, getTrackState, isLocalVideoTrackDesktop } from './functions.native';
+import { destroyLocalDesktopTrackIfExists, replaceLocalTrack } from './actions.any';
+import { getLocalVideoTrack, isLocalVideoTrackDesktop } from './functions';

 export * from './actions.any';

@@ -39,8 +31,7 @@ export function toggleScreensharing(enabled: boolean, _ignore1?: boolean, _ignor
                _startScreenSharing(dispatch, state);
            }
        } else {
-            dispatch(setScreenshareMuted(true));
-            dispatch(setVideoMuted(false, MEDIA_TYPE.VIDEO, VIDEO_MUTISM_AUTHORITY.SCREEN_SHARE));
+            dispatch(destroyLocalDesktopTrackIfExists());
            setPictureInPictureEnabled(true);
        }
    };
@@ -56,33 +47,26 @@ export function toggleScreensharing(enabled: boolean, _ignore1?: boolean, _ignor
 * @param {Object} state - The redux state.
 * @returns {void}
 */
-async function _startScreenSharing(dispatch: Function, state: IReduxState) {
+function _startScreenSharing(dispatch: Function, state: IReduxState) {
    setPictureInPictureEnabled(false);

-    try {
-        const tracks: any[] = await JitsiMeetJS.createLocalTracks({ devices: [ 'desktop' ] });
+    JitsiMeetJS.createLocalTracks({ devices: [ 'desktop' ] })
+    .then((tracks: any[]) => {
        const track = tracks[0];
-        const currentLocalDesktopTrack = getLocalDesktopTrack(getTrackState(state));
-        const currentJitsiTrack = currentLocalDesktopTrack?.jitsiTrack;
+        const currentLocalTrack = getLocalVideoTrack(state['features/base/tracks']);
+        const currentJitsiTrack = currentLocalTrack?.jitsiTrack;

-        // The first time the user shares the screen we add the track and create the transceiver.
-        // Afterwards, we just replace the old track, so the transceiver will be reused.
-        if (currentJitsiTrack) {
-            dispatch(replaceLocalTrack(currentJitsiTrack, track));
-        } else {
-            dispatch(addLocalTrack(track));
-        }
-
-        dispatch(setVideoMuted(true, MEDIA_TYPE.VIDEO, VIDEO_MUTISM_AUTHORITY.SCREEN_SHARE));
+        dispatch(replaceLocalTrack(currentJitsiTrack, track));

        const { enabled: audioOnly } = state['features/base/audio-only'];

        if (audioOnly) {
            dispatch(setAudioOnly(false));
        }
-    } catch (error: any) {
+    })
+    .catch((error: any) => {
        console.log('ERROR creating ScreeSharing stream ', error);

        setPictureInPictureEnabled(true);
-    }
+    });
 }
--- a/react/features/base/tracks/functions.any.ts
+++ b/react/features/base/tracks/functions.any.ts
@@ -313,9 +313,9 @@ export function isLocalTrackMuted(tracks: ITrack[], mediaType: MediaType) {
 * @returns {boolean}
 */
 export function isLocalVideoTrackDesktop(state: IReduxState) {
-    const desktopTrack = getLocalDesktopTrack(getTrackState(state));
+    const videoTrack = getLocalVideoTrack(getTrackState(state));

-    return desktopTrack !== undefined && !desktopTrack.muted;
+    return videoTrack && videoTrack.videoType === VIDEO_TYPE.DESKTOP;
 }


--- a/react/features/chrome-extension-banner/logger.js
+++ b/react/features/chrome-extension-banner/logger.js
@@ -1,3 +1,5 @@
+// @flow
+
 import { getLogger } from '../base/logging/functions';

 export default getLogger('features/chrome-banner');
--- a/react/features/desktop-picker/actions.js
+++ b/react/features/desktop-picker/actions.js
@@ -1,6 +1,5 @@
-import { openDialog } from '../base/dialog/actions';
+import { openDialog } from '../base/dialog';

-// @ts-ignore
 import { DesktopPicker } from './components';

 /**
@@ -11,7 +10,7 @@ import { DesktopPicker } from './components';
 * a DesktopCapturerSource has been chosen.
 * @returns {Object}
 */
-export function showDesktopPicker(options: { desktopSharingSources?: any; } = {}, onSourceChoose: Function) {
+export function showDesktopPicker(options = {}, onSourceChoose) {
    const { desktopSharingSources } = options;

    return openDialog(DesktopPicker, {
--- a/react/features/desktop-picker/functions.js
+++ b/react/features/desktop-picker/functions.js
@@ -1,3 +1,4 @@
+
 import logger from './logger';

 /**
@@ -10,8 +11,8 @@ import logger from './logger';
 * return native image object used for the preview image of the source.
 * @returns {Function}
 */
-export function obtainDesktopSources(types: string[], options: { thumbnailSize?: Object; } = {}) {
-    const capturerOptions: any = {
+export function obtainDesktopSources(types, options = {}) {
+    const capturerOptions = {
        types
    };

@@ -22,10 +23,10 @@ export function obtainDesktopSources(types: string[], options: { thumbnailSize?:
    return new Promise((resolve, reject) => {
        const { JitsiMeetElectron } = window;

-        if (JitsiMeetElectron?.obtainDesktopStreams) {
+        if (JitsiMeetElectron && JitsiMeetElectron.obtainDesktopStreams) {
            JitsiMeetElectron.obtainDesktopStreams(
-                (sources: Array<{ id: string; }>) => resolve(_separateSourcesByType(sources)),
-                (error: Error) => {
+                sources => resolve(_separateSourcesByType(sources)),
+                error => {
                    logger.error(
                        `Error while obtaining desktop sources: ${error}`);
                    reject(error);
@@ -53,8 +54,8 @@ export function obtainDesktopSources(types: string[], options: { thumbnailSize?:
 * @returns {Object} An object with the sources split into separate arrays based
 * on source type.
 */
-function _separateSourcesByType(sources: Array<{ id: string; }> = []) {
-    const sourcesByType: any = {
+function _separateSourcesByType(sources = []) {
+    const sourcesByType = {
        screen: [],
        window: []
    };
--- a/react/features/desktop-picker/logger.js
+++ b/react/features/desktop-picker/logger.js
@@ -1,3 +1,5 @@
+// @flow
+
 import { getLogger } from '../base/logging/functions';

 export default getLogger('features/desktop-picker');
--- a/react/features/dynamic-branding/middleware.native.ts
+++ b/react/features/dynamic-branding/middleware.native.ts
@@ -32,13 +32,10 @@ MiddlewareRegistry.register(store => next => action => {
            inviteDomain
        };

-        // The backend may send an empty string, make sure we skip that.
-        if (Array.isArray(avatarBackgrounds)) {
-            // TODO: implement support for gradients.
-            action.value.avatarBackgrounds = avatarBackgrounds.filter(
-                (color: string) => !color.includes('linear-gradient')
-            );
-        }
+        // TODO: implement support for gradients.
+        action.value.avatarBackgrounds = avatarBackgrounds.filter(
+            (color: string) => !color.includes('linear-gradient')
+        );

        break;
    }
--- a/react/features/dynamic-branding/reducer.ts
+++ b/react/features/dynamic-branding/reducer.ts
@@ -156,7 +156,6 @@ export interface IDynamicBrandingState {
    logoImageUrl: string;
    muiBrandedTheme?: boolean;
    premeetingBackground: string;
-    showGiphyIntegration?: boolean;
    useDynamicBrandingData: boolean;
    virtualBackgrounds: Array<Image>;
 }
@@ -179,7 +178,6 @@ ReducerRegistry.register<IDynamicBrandingState>(STORE_NAME, (state = DEFAULT_STA
            logoImageUrl,
            muiBrandedTheme,
            premeetingBackground,
-            showGiphyIntegration,
            virtualBackgrounds
        } = action.value;

@@ -195,7 +193,6 @@ ReducerRegistry.register<IDynamicBrandingState>(STORE_NAME, (state = DEFAULT_STA
            logoImageUrl,
            muiBrandedTheme,
            premeetingBackground,
-            showGiphyIntegration,
            customizationFailed: false,
            customizationReady: true,
            useDynamicBrandingData: true,
--- a/react/features/e2ee/middleware.ts
+++ b/react/features/e2ee/middleware.ts
@@ -271,30 +271,28 @@ StateListenerRegistry.register(
            dispatch(toggleE2EE(false));
        }

-        if (conference) {
-            conference.on(JitsiConferenceEvents.E2EE_VERIFICATION_AVAILABLE, (pId: string) => {
+        conference.on(JitsiConferenceEvents.E2EE_VERIFICATION_AVAILABLE, (pId: string) => {
+            dispatch(participantUpdated({
+                e2eeVerificationAvailable: true,
+                id: pId
+            }));
+        });
+
+        conference.on(JitsiConferenceEvents.E2EE_VERIFICATION_READY, (pId: string, sas: object) => {
+            dispatch(openDialog(ParticipantVerificationDialog, { pId,
+                sas }));
+        });
+
+        conference.on(JitsiConferenceEvents.E2EE_VERIFICATION_COMPLETED,
+            (pId: string, success: boolean, message: string) => {
+                if (message) {
+                    logger.warn('E2EE_VERIFICATION_COMPLETED warning', message);
+                }
                dispatch(participantUpdated({
-                    e2eeVerificationAvailable: true,
+                    e2eeVerified: success,
                    id: pId
                }));
            });
-
-            conference.on(JitsiConferenceEvents.E2EE_VERIFICATION_READY, (pId: string, sas: object) => {
-                dispatch(openDialog(ParticipantVerificationDialog, { pId,
-                    sas }));
-            });
-
-            conference.on(JitsiConferenceEvents.E2EE_VERIFICATION_COMPLETED,
-                (pId: string, success: boolean, message: string) => {
-                    if (message) {
-                        logger.warn('E2EE_VERIFICATION_COMPLETED warning', message);
-                    }
-                    dispatch(participantUpdated({
-                        e2eeVerified: success,
-                        id: pId
-                    }));
-                });
-        }
    });

 /**
--- a/react/features/gifs/function.any.ts
+++ b/react/features/gifs/function.any.ts
@@ -68,13 +68,12 @@ export function getGifAPIKey(state: IReduxState) {
 export function isGifEnabled(state: IReduxState) {
    const { disableThirdPartyRequests } = state['features/base/config'];
    const { giphy } = state['features/base/config'];
-    const showGiphyIntegration = state['features/dynamic-branding']?.showGiphyIntegration !== false;

    if (navigator.product === 'ReactNative' && window.JITSI_MEET_LITE_SDK) {
        return false;
    }

-    return showGiphyIntegration && Boolean(!disableThirdPartyRequests && giphy?.enabled && Boolean(giphy?.sdkKey));
+    return Boolean(!disableThirdPartyRequests && giphy?.enabled && Boolean(giphy?.sdkKey));
 }

 /**
--- a/react/features/invite/_utils.js
+++ b/react/features/invite/_utils.js
@@ -1,10 +1,12 @@
+// @flow
+
 /**
 * Utility class with no dependencies. Used in components that are stripped in separate bundles
 * and requires as less dependencies as possible.
 */

 import { getURLWithoutParams } from '../base/connection/utils';
-import { doGetJSON } from '../base/util/httpUtils';
+import { doGetJSON } from '../base/util';

 /**
 * Formats the conference pin in readable way for UI to display it.
@@ -47,7 +49,7 @@ export function getDialInConferenceID(
        roomName: string,
        mucURL: string,
        url: URL
-): Promise<any> {
+): Promise<Object> {
    const separator = baseUrl.includes('?') ? '&' : '?';
    const conferenceIDURL
        = `${baseUrl}${separator}conference=${roomName}@${mucURL}&url=${getURLWithoutParams(url).href}`;
@@ -73,7 +75,7 @@ export function getDialInNumbers(
        url: string,
        roomName: string,
        mucURL: string
-): Promise<any> {
+): Promise<*> {
    const separator = url.includes('?') ? '&' : '?';

    // when roomName and mucURL are available
--- a/react/features/invite/actions.any.js
+++ b/react/features/invite/actions.any.js
@@ -1,7 +1,10 @@
-import { IStore } from '../app/types';
-import { getInviteURL } from '../base/connection/functions';
-import { getLocalParticipant, getParticipantCount } from '../base/participants/functions';
-import { inviteVideoRooms } from '../videosipgw/actions';
+// @flow
+
+import type { Dispatch } from 'redux';
+
+import { getInviteURL } from '../base/connection';
+import { getLocalParticipant, getParticipantCount } from '../base/participants';
+import { inviteVideoRooms } from '../videosipgw';

 import { getDialInConferenceID, getDialInNumbers } from './_utils';
 import {
@@ -19,7 +22,6 @@ import {
    inviteSipEndpoints
 } from './functions';
 import logger from './logger';
-import { IInvitee } from './types';

 /**
 * Creates a (redux) action to signal that a click/tap has been performed on
@@ -62,11 +64,11 @@ export function hideAddPeopleDialog() {
 * of invitees who were not invited (i.e. Invites were not sent to them).
 */
 export function invite(
-        invitees: IInvitee[],
-        showCalleeInfo = false) {
+        invitees: Array<Object>,
+        showCalleeInfo: boolean = false) {
    return (
-            dispatch: IStore['dispatch'],
-            getState: IStore['getState']): Promise<Array<Object>> => {
+            dispatch: Dispatch<any>,
+            getState: Function): Promise<Array<Object>> => {
        const state = getState();
        const participantsCount = getParticipantCount(state);
        const { calleeInfoVisible } = state['features/invite'];
@@ -87,12 +89,12 @@ export function invite(
            return new Promise(resolve => {
                dispatch(addPendingInviteRequest({
                    invitees,
-                    callback: (failedInvitees: any) => resolve(failedInvitees)
+                    callback: failedInvitees => resolve(failedInvitees)
                }));
            });
        }

-        let allInvitePromises: Promise<any>[] = [];
+        let allInvitePromises = [];
        let invitesLeftToSend = [ ...invitees ];

        const {
@@ -103,8 +105,8 @@ export function invite(
        const inviteUrl = getInviteURL(state);
        const { sipInviteUrl } = state['features/base/config'];
        const { locationURL } = state['features/base/connection'];
-        const { jwt = '' } = state['features/base/jwt'];
-        const { name: displayName } = getLocalParticipant(state) ?? {};
+        const { jwt } = state['features/base/jwt'];
+        const { name: displayName } = getLocalParticipant(state);

        // First create all promises for dialing out.
        const phoneNumbers
@@ -121,7 +123,7 @@ export function invite(
                        = invitesLeftToSend.filter(
                            invitee => invitee !== item);
                })
-                .catch((error: Error) =>
+                .catch(error =>
                    logger.error('Error inviting phone number:', error));
        });

@@ -136,8 +138,8 @@ export function invite(
            // filter all rooms and users from {@link invitesLeftToSend}.
            const peopleInvitePromise
                = invitePeopleAndChatRooms(
-                    (callFlowsEnabled
-                        ? inviteServiceCallFlowsUrl : inviteServiceUrl) ?? '',
+                    callFlowsEnabled
+                        ? inviteServiceCallFlowsUrl : inviteServiceUrl,
                    inviteUrl,
                    jwt,
                    usersAndRooms)
@@ -171,8 +173,6 @@ export function invite(

        conference && inviteSipEndpoints(
            sipEndpoints,
-
-            // @ts-ignore
            locationURL,
            sipInviteUrl,
            jwt,
@@ -196,12 +196,12 @@ export function invite(
 * @returns {Function}
 */
 export function updateDialInNumbers() {
-    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+    return (dispatch: Dispatch<any>, getState: Function) => {
        const state = getState();
        const { dialInConfCodeUrl, dialInNumbersUrl, hosts }
            = state['features/base/config'];
        const { numbersFetched } = state['features/invite'];
-        const mucURL = hosts?.muc;
+        const mucURL = hosts && hosts.muc;

        if (numbersFetched || !dialInConfCodeUrl || !dialInNumbersUrl || !mucURL) {
            // URLs for fetching dial in numbers not defined
@@ -209,10 +209,10 @@ export function updateDialInNumbers() {
        }

        const { locationURL = {} } = state['features/base/connection'];
-        const { room = '' } = state['features/base/conference'];
+        const { room } = state['features/base/conference'];

        Promise.all([
-            getDialInNumbers(dialInNumbersUrl, room, mucURL), // @ts-ignore
+            getDialInNumbers(dialInNumbersUrl, room, mucURL),
            getDialInConferenceID(dialInConfCodeUrl, room, mucURL, locationURL)
        ])
            .then(([ dialInNumbers, { conference, id, message, sipUri } ]) => {
@@ -251,7 +251,7 @@ export function updateDialInNumbers() {
 */
 export function setCalleeInfoVisible(
        calleeInfoVisible: boolean,
-        initialCalleeInfo?: Object) {
+        initialCalleeInfo: ?Object) {
    return {
        type: SET_CALLEE_INFO_VISIBLE,
        calleeInfoVisible,
@@ -269,7 +269,7 @@ export function setCalleeInfoVisible(
 * }}
 */
 export function addPendingInviteRequest(
-        request: { callback: Function; invitees: Array<Object>; }) {
+        request: { invitees: Array<Object>, callback: Function }) {
    return {
        type: ADD_PENDING_INVITE_REQUEST,
        request
--- a/react/features/invite/actions.native.js
+++ b/react/features/invite/actions.native.js
@@ -1,13 +1,11 @@
-/* eslint-disable lines-around-comment */
-import { IStore } from '../app/types';
-import { ADD_PEOPLE_ENABLED } from '../base/flags/constants';
-import { getFeatureFlag } from '../base/flags/functions';
-// @ts-ignore
+// @flow
+
+import type { Dispatch } from 'redux';
+
+import { ADD_PEOPLE_ENABLED, getFeatureFlag } from '../base/flags';
 import { navigate } from '../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
-// @ts-ignore
 import { screen } from '../mobile/navigation/routes';
-import { beginShareRoom } from '../share-room/actions';
-/* eslint-enable lines-around-comment */
+import { beginShareRoom } from '../share-room';

 import { isAddPeopleEnabled, isDialOutEnabled } from './functions';

@@ -20,7 +18,7 @@ export * from './actions.any';
 * @returns {Function}
 */
 export function doInvitePeople() {
-    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+    return (dispatch: Dispatch<any>, getState: Function) => {
        const state = getState();
        const addPeopleEnabled = getFeatureFlag(state, ADD_PEOPLE_ENABLED, true)
            && (isAddPeopleEnabled(state) || isDialOutEnabled(state));
--- a/react/features/invite/actions.web.js
+++ b/react/features/invite/actions.web.js
--- a/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.tsx
+++ b/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.tsx
@@ -205,7 +205,7 @@ function mapStateToProps(state: IReduxState, ownProps: Partial<IProps>) {
    const addPeopleEnabled = isAddPeopleEnabled(state);
    const dialOutEnabled = isDialOutEnabled(state);
    const hideInviteContacts = iAmRecorder || (!addPeopleEnabled && !dialOutEnabled);
-    const dialIn = state['features/invite']; // @ts-ignore
+    const dialIn = state['features/invite'];
    const phoneNumber = dialIn?.numbers ? _getDefaultPhoneNumber(dialIn.numbers) : undefined;

    return {
--- a/react/features/invite/functions.js
+++ b/react/features/invite/functions.js
@@ -1,17 +1,20 @@
-import { IReduxState } from '../app/types';
-import { IStateful } from '../base/app/types';
-import { getRoomName } from '../base/conference/functions';
-import { getInviteURL } from '../base/connection/functions';
+// @flow
+
+import { getActiveSession } from '../../features/recording/functions';
+import { getRoomName } from '../base/conference';
+import { getInviteURL } from '../base/connection';
 import { isIosMobileBrowser } from '../base/environment/utils';
-import i18next from '../base/i18n/i18next';
+import { i18next } from '../base/i18n';
 import { isJwtFeatureEnabled } from '../base/jwt/functions';
 import { JitsiRecordingConstants } from '../base/lib-jitsi-meet';
-import { getLocalParticipant, isLocalParticipantModerator } from '../base/participants/functions';
-import { toState } from '../base/redux/functions';
-import { parseURLParams } from '../base/util/parseURLParams';
-import { appendURLParam, parseURIString } from '../base/util/uri';
+import { getLocalParticipant, isLocalParticipantModerator } from '../base/participants';
+import { toState } from '../base/redux';
+import {
+    appendURLParam,
+    parseURIString,
+    parseURLParams
+} from '../base/util';
 import { isVpaasMeeting } from '../jaas/functions';
-import { getActiveSession } from '../recording/functions';

 import { getDialInConferenceID, getDialInNumbers } from './_utils';
 import {
@@ -21,7 +24,8 @@ import {
 } from './constants';
 import logger from './logger';

-declare let $: any;
+declare var $: Function;
+declare var interfaceConfig: Object;

 export const sharingFeatures = {
    email: 'email',
@@ -40,7 +44,7 @@ export const sharingFeatures = {
 export function checkDialNumber(
        dialNumber: string,
        dialOutAuthUrl: string
-): Promise<{ allow?: boolean; country?: string; phone?: string; }> {
+): Promise<Object> {
    const fullUrl = `${dialOutAuthUrl}?phone=${dialNumber}`;

    return new Promise((resolve, reject) => {
@@ -57,7 +61,7 @@ export function checkDialNumber(
 * numbers.
 * @returns {string} A string with only numbers.
 */
-export function getDigitsOnly(text = ''): string {
+export function getDigitsOnly(text: string = ''): string {
    return text.replace(/\D/g, '');
 }

@@ -66,41 +70,41 @@ export function getDigitsOnly(text = ''): string {
 */
 export type GetInviteResultsOptions = {

-    /**
-     * Whether or not to search for people.
-     */
-    addPeopleEnabled: boolean;
-
    /**
     * The endpoint to use for checking phone number validity.
     */
-    dialOutAuthUrl: string;
+    dialOutAuthUrl: string,
+
+    /**
+     * Whether or not to search for people.
+     */
+    addPeopleEnabled: boolean,

    /**
     * Whether or not to check phone numbers.
     */
-    dialOutEnabled: boolean;
-
-    /**
-     * The jwt token to pass to the search service.
-     */
-    jwt: string;
+    dialOutEnabled: boolean,

    /**
     * Array with the query types that will be executed -
     * "conferenceRooms" | "user" | "room".
     */
-    peopleSearchQueryTypes: Array<string>;
+    peopleSearchQueryTypes: Array<string>,

    /**
     * The url to query for people.
     */
-    peopleSearchUrl: string;
+    peopleSearchUrl: string,

    /**
     * Whether or not to check sip invites.
     */
-    sipInviteEnabled: boolean;
+    sipInviteEnabled: boolean,
+
+    /**
+     * The jwt token to pass to the search service.
+     */
+    jwt: string
 };

 /**
@@ -114,7 +118,8 @@ export type GetInviteResultsOptions = {
 export function getInviteResultsForQuery(
        query: string,
        options: GetInviteResultsOptions
-): Promise<any> {
+): Promise<*> {
+
    const text = query.trim();

    const {
@@ -178,12 +183,12 @@ export function getInviteResultsForQuery(
            phone: text
        });
    } else {
-        phoneNumberPromise = Promise.resolve<{ allow?: boolean; country?: string; phone?: string; }>({});
+        phoneNumberPromise = Promise.resolve({});
    }

    return Promise.all([ peopleSearchPromise, phoneNumberPromise ])
        .then(([ peopleResults, phoneResults ]) => {
-            const results: any[] = [
+            const results = [
                ...peopleResults
            ];

@@ -228,7 +233,7 @@ export function getInviteTextiOS({
    state,
    phoneNumber,
    t
-}: { phoneNumber?: string | null; state: IReduxState; t?: Function; }) {
+}: Object) {
    if (!isIosMobileBrowser()) {
        return '';
    }
@@ -241,23 +246,23 @@ export function getInviteTextiOS({
    const inviteURL = _decodeRoomURI(inviteUrl);

    let invite = localParticipantName
-        ? t?.('info.inviteTextiOSPersonal', { name: localParticipantName })
-        : t?.('info.inviteURLFirstPartGeneral');
+        ? t('info.inviteTextiOSPersonal', { name: localParticipantName })
+        : t('info.inviteURLFirstPartGeneral');

    invite += ' ';

-    invite += t?.('info.inviteTextiOSInviteUrl', { inviteUrl });
+    invite += t('info.inviteTextiOSInviteUrl', { inviteUrl });
    invite += ' ';

    if (shouldDisplayDialIn(dialIn) && isSharingEnabled(sharingFeatures.dialIn)) {
-        invite += t?.('info.inviteTextiOSPhone', {
+        invite += t('info.inviteTextiOSPhone', {
            number: phoneNumber,
            conferenceID: dialIn.conferenceID,
            didUrl: getDialInfoPageURL(state)
        });
    }
    invite += ' ';
-    invite += t?.('info.inviteTextiOSJoinSilent', { silentUrl: `${inviteURL}#config.startSilent=true` });
+    invite += t('info.inviteTextiOSJoinSilent', { silentUrl: `${inviteURL}#config.startSilent=true` });

    return invite;
 }
@@ -271,25 +276,27 @@ export function getInviteText({
    state,
    phoneNumber,
    t
-}: { phoneNumber?: string | null; state: IReduxState; t?: Function; }) {
+}: Object) {
    const dialIn = state['features/invite'];
    const inviteUrl = getInviteURL(state);
    const currentLiveStreamingSession = getActiveSession(state, JitsiRecordingConstants.mode.STREAM);
-    const liveStreamViewURL = currentLiveStreamingSession?.liveStreamViewURL;
+    const liveStreamViewURL
+        = currentLiveStreamingSession
+            && currentLiveStreamingSession.liveStreamViewURL;
    const localParticipant = getLocalParticipant(state);
    const localParticipantName = localParticipant?.name;

    const inviteURL = _decodeRoomURI(inviteUrl);
    let invite = localParticipantName
-        ? t?.('info.inviteURLFirstPartPersonal', { name: localParticipantName })
-        : t?.('info.inviteURLFirstPartGeneral');
+        ? t('info.inviteURLFirstPartPersonal', { name: localParticipantName })
+        : t('info.inviteURLFirstPartGeneral');

-    invite += t?.('info.inviteURLSecondPart', {
+    invite += t('info.inviteURLSecondPart', {
        url: inviteURL
    });

    if (liveStreamViewURL) {
-        const liveStream = t?.('info.inviteLiveStream', {
+        const liveStream = t('info.inviteLiveStream', {
            url: liveStreamViewURL
        });

@@ -297,11 +304,11 @@ export function getInviteText({
    }

    if (shouldDisplayDialIn(dialIn) && isSharingEnabled(sharingFeatures.dialIn)) {
-        const dial = t?.('info.invitePhone', {
+        const dial = t('info.invitePhone', {
            number: phoneNumber,
            conferenceID: dialIn.conferenceID
        });
-        const moreNumbers = t?.('info.invitePhoneAlternatives', {
+        const moreNumbers = t('info.invitePhoneAlternatives', {
            url: getDialInfoPageURL(state),
            silentUrl: `${inviteURL}#config.startSilent=true`
        });
@@ -321,8 +328,8 @@ export function getInviteText({
 * @returns {Object} An object with keys as user types and values as the number
 * of invites for that type.
 */
-export function getInviteTypeCounts(inviteItems: Array<{ type: string; }> = []) {
-    const inviteTypeCounts: any = {};
+export function getInviteTypeCounts(inviteItems: Array<Object> = []) {
+    const inviteTypeCounts = {};

    inviteItems.forEach(({ type }) => {
        if (!inviteTypeCounts[type]) {
@@ -345,51 +352,51 @@ export function getInviteTypeCounts(inviteItems: Array<{ type: string; }> = [])
 * items to invite.
 * @returns {Promise} - The promise created by the request.
 */
-export function invitePeopleAndChatRooms(
+export function invitePeopleAndChatRooms( // eslint-disable-line max-params
        inviteServiceUrl: string,
        inviteUrl: string,
        jwt: string,
        inviteItems: Array<Object>
-): Promise<any> {
+): Promise<void> {

    if (!inviteItems || inviteItems.length === 0) {
        return Promise.resolve();
    }

    return fetch(
-        `${inviteServiceUrl}?token=${jwt}`,
-        {
-            body: JSON.stringify({
-                'invited': inviteItems,
-                'url': inviteUrl
-            }),
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        }
+           `${inviteServiceUrl}?token=${jwt}`,
+           {
+               body: JSON.stringify({
+                   'invited': inviteItems,
+                   'url': inviteUrl
+               }),
+               method: 'POST',
+               headers: {
+                   'Content-Type': 'application/json'
+               }
+           }
    );
 }

 /**
 * Determines if adding people is currently enabled.
 *
- * @param {IReduxState} state - Current state.
+ * @param {boolean} state - Current state.
 * @returns {boolean} Indication of whether adding people is currently enabled.
 */
-export function isAddPeopleEnabled(state: IReduxState): boolean {
+export function isAddPeopleEnabled(state: Object): boolean {
    const { peopleSearchUrl } = state['features/base/config'];

-    return Boolean(state['features/base/jwt'].jwt && Boolean(peopleSearchUrl) && !isVpaasMeeting(state));
+    return state['features/base/jwt'].jwt && Boolean(peopleSearchUrl) && !isVpaasMeeting(state);
 }

 /**
 * Determines if dial out is currently enabled or not.
 *
- * @param {IReduxState} state - Current state.
+ * @param {boolean} state - Current state.
 * @returns {boolean} Indication of whether dial out is currently enabled.
 */
-export function isDialOutEnabled(state: IReduxState): boolean {
+export function isDialOutEnabled(state: Object): boolean {
    const { conference } = state['features/base/conference'];

    return isLocalParticipantModerator(state)
@@ -399,10 +406,10 @@ export function isDialOutEnabled(state: IReduxState): boolean {
 /**
 * Determines if inviting sip endpoints is enabled or not.
 *
- * @param {IReduxState} state - Current state.
+ * @param {Object} state - Current state.
 * @returns {boolean} Indication of whether dial out is currently enabled.
 */
-export function isSipInviteEnabled(state: IReduxState): boolean {
+export function isSipInviteEnabled(state: Object): boolean {
    const { sipInviteUrl } = state['features/base/config'];

    return isJwtFeatureEnabled(state, 'sip-outbound-call') && Boolean(sipInviteUrl);
@@ -466,7 +473,7 @@ export function searchDirectory( // eslint-disable-line max-params
        jwt: string,
        text: string,
        queryTypes: Array<string> = [ 'conferenceRooms', 'user', 'room' ]
-): Promise<Array<{ type: string; }>> {
+): Promise<Array<Object>> {

    const query = encodeURIComponent(text);
    const queryTypesString = encodeURIComponent(JSON.stringify(queryTypes));
@@ -495,13 +502,14 @@ export function searchDirectory( // eslint-disable-line max-params
 * Returns descriptive text that can be used to invite participants to a meeting
 * (share via mobile or use it for calendar event description).
 *
- * @param {IReduxState} state - The current state.
+ * @param {Object} state - The current state.
 * @param {string} inviteUrl - The conference/location URL.
 * @param {boolean} useHtml - Whether to return html text.
 * @returns {Promise<string>} A {@code Promise} resolving with a
 * descriptive text that can be used to invite participants to a meeting.
 */
-export function getShareInfoText(state: IReduxState, inviteUrl: string, useHtml?: boolean): Promise<string> {
+export function getShareInfoText(
+        state: Object, inviteUrl: string, useHtml: ?boolean): Promise<string> {
    let roomUrl = _decodeRoomURI(inviteUrl);
    const includeDialInfo = state['features/base/config'] !== undefined;

@@ -526,7 +534,7 @@ export function getShareInfoText(state: IReduxState, inviteUrl: string, useHtml?
            const { dialInConfCodeUrl, dialInNumbersUrl, hosts }
                = state['features/base/config'];
            const { locationURL = {} } = state['features/base/connection'];
-            const mucURL = hosts?.muc;
+            const mucURL = hosts && hosts.muc;

            if (!dialInConfCodeUrl || !dialInNumbersUrl || !mucURL) {
                // URLs for fetching dial in numbers not defined
@@ -534,7 +542,7 @@ export function getShareInfoText(state: IReduxState, inviteUrl: string, useHtml?
            }

            numbersPromise = Promise.all([
-                getDialInNumbers(dialInNumbersUrl, room, mucURL), // @ts-ignore
+                getDialInNumbers(dialInNumbersUrl, room, mucURL),
                getDialInConferenceID(dialInConfCodeUrl, room, mucURL, locationURL)
            ]).then(([ numbers, {
                conference, id, message } ]) => {
@@ -584,16 +592,16 @@ export function getShareInfoText(state: IReduxState, inviteUrl: string, useHtml?
 /**
 * Generates the URL for the static dial in info page.
 *
- * @param {IReduxState} state - The state from the Redux store.
+ * @param {Object} state - The state from the Redux store.
 * @param {string?} roomName - The conference name. Optional name, if missing will be extracted from state.
 * @returns {string}
 */
-export function getDialInfoPageURL(state: IReduxState, roomName?: string) {
+export function getDialInfoPageURL(state: Object, roomName: ?string) {
    const { didPageUrl } = state['features/dynamic-branding'];
    const conferenceName = roomName ?? getRoomName(state);
    const { locationURL } = state['features/base/connection'];
-    const { href = '' } = locationURL ?? {};
-    const room = _decodeRoomURI(conferenceName ?? '');
+    const { href } = locationURL;
+    const room = _decodeRoomURI(conferenceName);

    const url = didPageUrl || `${href.substring(0, href.lastIndexOf('/'))}/${DIAL_IN_INFO_PAGE_PATH_NAME}`;

@@ -607,7 +615,7 @@ export function getDialInfoPageURL(state: IReduxState, roomName?: string) {
 * @returns {string}
 */
 export function getDialInfoPageURLForURIString(
-        uri?: string) {
+        uri: ?string) {
    if (!uri) {
        return undefined;
    }
@@ -629,7 +637,7 @@ export function getDialInfoPageURLForURIString(
 * @param {Object} dialIn - Dial in information.
 * @returns {boolean}
 */
-export function shouldDisplayDialIn(dialIn: any) {
+export function shouldDisplayDialIn(dialIn: Object) {
    const { conferenceID, numbers, numbersEnabled } = dialIn;
    const phoneNumber = _getDefaultPhoneNumber(numbers);

@@ -648,7 +656,7 @@ export function shouldDisplayDialIn(dialIn: any) {
 * @private
 * @returns {boolean}
 */
-export function hasMultipleNumbers(dialInNumbers?: { numbers: Object; } | string[]) {
+export function hasMultipleNumbers(dialInNumbers: ?Object) {
    if (!dialInNumbers) {
        return false;
    }
@@ -674,7 +682,7 @@ export function hasMultipleNumbers(dialInNumbers?: { numbers: Object; } | string
 * @returns {string|null}
 */
 export function _getDefaultPhoneNumber(
-        dialInNumbers?: { numbers: any; } | Array<{ default: string; formattedNumber: string; }>): string | null {
+        dialInNumbers: ?Object): ?string {

    if (!dialInNumbers) {
        return null;
@@ -735,23 +743,22 @@ export function _decodeRoomURI(url: string) {
 /**
 * Returns the stored conference id.
 *
- * @param {IStateful} stateful - The Object or Function that can be
+ * @param {Object | Function} stateful - The Object or Function that can be
 * resolved to a Redux state object with the toState function.
 * @returns {string}
 */
-export function getConferenceId(stateful: IStateful) {
+export function getConferenceId(stateful: Object | Function) {
    return toState(stateful)['features/invite'].conferenceID;
 }

 /**
 * Returns the default dial in number from the store.
 *
- * @param {IStateful} stateful - The Object or Function that can be
+ * @param {Object | Function} stateful - The Object or Function that can be
 * resolved to a Redux state object with the toState function.
 * @returns {string | null}
 */
-export function getDefaultDialInNumber(stateful: IStateful) {
-    // @ts-ignore
+export function getDefaultDialInNumber(stateful: Object | Function) {
    return _getDefaultPhoneNumber(toState(stateful)['features/invite'].numbers);
 }

@@ -824,14 +831,14 @@ export function isSharingEnabled(sharingFeature: string) {
 * @returns {Promise} - The promise created by the request.
 */
 export function inviteSipEndpoints( // eslint-disable-line max-params
-        inviteItems: Array<{ address: string; }>,
+        inviteItems: Array<Object>,
        locationURL: URL,
        sipInviteUrl: string,
        jwt: string,
        roomName: string,
        roomPassword: String,
        displayName: string
-): Promise<any> {
+): Promise<void> {
    if (inviteItems.length === 0) {
        return Promise.resolve();
    }
@@ -844,26 +851,26 @@ export function inviteSipEndpoints( // eslint-disable-line max-params
    });

    return fetch(
-        sipInviteUrl,
-        {
-            body: JSON.stringify({
-                callParams: {
-                    callUrlInfo: {
-                        baseUrl,
-                        callName: roomName
-                    },
-                    passcode: roomPassword
-                },
-                sipClientParams: {
-                    displayName,
-                    sipAddress: inviteItems.map(item => item.address)
-                }
-            }),
-            method: 'POST',
-            headers: {
-                'Authorization': `Bearer ${jwt}`,
-                'Content-Type': 'application/json'
-            }
-        }
+       sipInviteUrl,
+       {
+           body: JSON.stringify({
+               callParams: {
+                   callUrlInfo: {
+                       baseUrl,
+                       callName: roomName
+                   },
+                   passcode: roomPassword
+               },
+               sipClientParams: {
+                   displayName,
+                   sipAddress: inviteItems.map(item => item.address)
+               }
+           }),
+           method: 'POST',
+           headers: {
+               'Authorization': `Bearer ${jwt}`,
+               'Content-Type': 'application/json'
+           }
+       }
    );
 }
--- a/react/features/invite/middleware.any.js
+++ b/react/features/invite/middleware.any.js
@@ -1,28 +1,27 @@
-import { AnyAction } from 'redux';
+// @flow

-import { IStore } from '../app/types';
-import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app/actionTypes';
-import { CONFERENCE_JOINED } from '../base/conference/actionTypes';
+import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app';
+import {
+    CONFERENCE_JOINED
+} from '../base/conference';
 import {
    PARTICIPANT_JOINED,
+    PARTICIPANT_JOINED_SOUND_ID,
    PARTICIPANT_LEFT,
-    PARTICIPANT_UPDATED
-} from '../base/participants/actionTypes';
-import { pinParticipant } from '../base/participants/actions';
-import { PARTICIPANT_JOINED_SOUND_ID } from '../base/participants/constants';
-import {
+    PARTICIPANT_UPDATED,
    getLocalParticipant,
    getParticipantCount,
    getParticipantPresenceStatus,
-    getRemoteParticipants
-} from '../base/participants/functions';
-import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
+    getRemoteParticipants,
+    pinParticipant
+} from '../base/participants';
+import { MiddlewareRegistry } from '../base/redux';
 import {
    playSound,
    registerSound,
    stopSound,
    unregisterSound
-} from '../base/sounds/actions';
+} from '../base/sounds';
 import {
    CALLING,
    CONNECTED_USER,
@@ -30,7 +29,7 @@ import {
    INVITED,
    REJECTED,
    RINGING
-} from '../presence-status/constants';
+} from '../presence-status';

 import {
    SET_CALLEE_INFO_VISIBLE,
@@ -50,6 +49,8 @@ import {
 import logger from './logger';
 import { sounds } from './sounds';

+declare var interfaceConfig: Object;
+
 /**
 * Maps the presence status with the ID of the sound that will be played when
 * the status is received.
@@ -83,7 +84,7 @@ MiddlewareRegistry.register(store => next => action => {

    if (action.type === SET_CALLEE_INFO_VISIBLE) {
        if (action.calleeInfoVisible) {
-            dispatch(pinParticipant(getLocalParticipant(state)?.id));
+            dispatch(pinParticipant(getLocalParticipant(state).id));
        } else {
            // unpin participant
            dispatch(pinParticipant());
@@ -123,10 +124,10 @@ MiddlewareRegistry.register(store => next => action => {

        const oldSoundId
            = oldParticipantPresence
-            && statusToRingtone[oldParticipantPresence as keyof typeof statusToRingtone];
+                && statusToRingtone[oldParticipantPresence];
        const newSoundId
            = newParticipantPresence
-            && statusToRingtone[newParticipantPresence as keyof typeof statusToRingtone];
+                && statusToRingtone[newParticipantPresence];


        if (oldSoundId === newSoundId) {
@@ -158,10 +159,10 @@ MiddlewareRegistry.register(store => next => action => {
 * (not poltergeist, shared video, etc.) participants in the call.
 *
 * @param {Object} action - The redux action.
- * @param {IStore} store - The redux store.
+ * @param {ReduxStore} store - The redux store.
 * @returns {void}
 */
-function _maybeHideCalleeInfo(action: AnyAction, store: IStore) {
+function _maybeHideCalleeInfo(action, store) {
    const state = store.getState();

    if (!state['features/invite'].calleeInfoVisible) {
@@ -187,10 +188,10 @@ function _maybeHideCalleeInfo(action: AnyAction, store: IStore) {
 /**
 * Executes the pending invitation requests if any.
 *
- * @param {IStore} store - The redux store.
+ * @param {ReduxStore} store - The redux store.
 * @returns {void}
 */
-function _onConferenceJoined(store: IStore) {
+function _onConferenceJoined(store) {
    const { dispatch, getState } = store;

    const pendingInviteRequests
--- a/react/features/invite/middleware.native.js
+++ b/react/features/invite/middleware.native.js
--- a/react/features/invite/middleware.web.js
+++ b/react/features/invite/middleware.web.js
@@ -1,11 +1,10 @@
-import { AnyAction } from 'redux';
+// @flow

-import { IStore } from '../app/types';
-import { hideDialog, openDialog } from '../base/dialog/actions';
-import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
+import { hideDialog, openDialog } from '../base/dialog';
+import { MiddlewareRegistry } from '../base/redux';

 import { BEGIN_ADD_PEOPLE, HIDE_ADD_PEOPLE_DIALOG } from './actionTypes';
-import AddPeopleDialog from './components/add-people-dialog/web/AddPeopleDialog';
+import { AddPeopleDialog } from './components';
 import './middleware.any';

 /**
@@ -38,7 +37,7 @@ MiddlewareRegistry.register(store => next => action => {
 * @private
 * @returns {*} The value returned by {@code next(action)}.
 */
-function _beginAddPeople({ dispatch }: IStore, next: Function, action: AnyAction) {
+function _beginAddPeople({ dispatch }, next, action) {
    const result = next(action);

    dispatch(openDialog(AddPeopleDialog));
@@ -59,7 +58,7 @@ function _beginAddPeople({ dispatch }: IStore, next: Function, action: AnyAction
 * @private
 * @returns {*} The value returned by {@code next(action)}.
 */
-function _hideAddPeopleDialog({ dispatch }: IStore, next: Function, action: AnyAction) {
+function _hideAddPeopleDialog({ dispatch }, next, action) {
    dispatch(hideDialog(AddPeopleDialog));

    return next(action);
--- a/react/features/invite/reducer.ts
+++ b/react/features/invite/reducer.ts
@@ -8,7 +8,6 @@ import {
    UPDATE_DIAL_IN_NUMBERS_SUCCESS
 } from './actionTypes';
 import logger from './logger';
-import { IInvitee } from './types';

 const DEFAULT_STATE = {
    /**
@@ -28,12 +27,12 @@ export interface IInviteState {
    conferenceID?: string | number;
    error?: Error;
    initialCalleeInfo?: Object;
-    numbers?: string[];
+    numbers?: string;
    numbersEnabled: boolean;
    numbersFetched: boolean;
    pendingInviteRequests: Array<{
        callback: Function;
-        invitees: IInvitee[];
+        invitees: Array<Object>;
    }>;
    sipUri?: string;
 }
--- a/react/features/invite/sounds.js
+++ b/react/features/invite/sounds.js
--- a/react/features/invite/types.ts
+++ b/react/features/invite/types.ts
@@ -1,5 +0,0 @@
-export interface IInvitee {
-    address: string;
-    number: string;
-    type: string;
-}
--- a/react/features/prejoin/actions.web.ts
+++ b/react/features/prejoin/actions.web.ts
@@ -92,7 +92,7 @@ function pollForStatus(
                return;
            }

-            const res = await executeDialOutStatusRequest(getDialOutStatusUrl(state) ?? '', reqId);
+            const res = await executeDialOutStatusRequest(getDialOutStatusUrl(state), reqId);

            switch (res) {
            case DIAL_OUT_STATUS.INITIATED:
@@ -153,7 +153,7 @@ export function dialOut(onSuccess: Function, onFail: Function) {
    return async function(dispatch: IStore['dispatch'], getState: IStore['getState']) {
        const state = getState();
        const reqId = uuidv4();
-        const url = getDialOutUrl(state) ?? '';
+        const url = getDialOutUrl(state);
        const conferenceUrl = getDialOutConferenceUrl(state);
        const phoneNumber = getFullDialOutNumber(state);
        const countryCode = getDialOutCountry(state).code.toUpperCase();
--- a/react/features/recent-list/actions.js
+++ b/react/features/recent-list/actions.js
@@ -1,3 +1,5 @@
+// @flow
+
 import {
    DELETE_RECENT_LIST_ENTRY,
    _STORE_CURRENT_CONFERENCE,
--- a/react/features/recent-list/functions.native.js
+++ b/react/features/recent-list/functions.native.js
@@ -1,13 +1,9 @@
 import {
    getLocalizedDateFormatter,
    getLocalizedDurationFormatter
-} from '../base/i18n/dateUtil';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
+} from '../base/i18n';
 import { NavigateSectionList } from '../base/react';
-import { parseURIString, safeDecodeURIComponent } from '../base/util/uri';
-
-import { IRecentItem } from './types';
+import { parseURIString, safeDecodeURIComponent } from '../base/util';

 /**
 * Creates a displayable list item of a recent list entry.
@@ -18,8 +14,7 @@ import { IRecentItem } from './types';
 * @param {Function} t - The translate function.
 * @returns {Object}
 */
-function toDisplayableItem(item: IRecentItem,
-        defaultServerURL: string, t: Function) {
+function toDisplayableItem(item, defaultServerURL, t) {
    const location = parseURIString(item.conference);
    const baseURL = `${location.protocol}//${location.host}`;
    const serverName = baseURL === defaultServerURL ? null : location.host;
@@ -48,7 +43,7 @@ function toDisplayableItem(item: IRecentItem,
 * @param {number} duration - The item's duration.
 * @returns {string}
 */
-function _toDurationString(duration: number) {
+function _toDurationString(duration) {
    if (duration) {
        return getLocalizedDurationFormatter(duration);
    }
@@ -64,7 +59,7 @@ function _toDurationString(duration: number) {
 * @param {Function} t - The translate function.
 * @returns {string}
 */
-function _toDateString(itemDate: number, t: Function) {
+function _toDateString(itemDate, t) {
    const m = getLocalizedDateFormatter(itemDate);
    const date = new Date(itemDate);
    const dateInMs = date.getTime();
@@ -95,8 +90,7 @@ function _toDateString(itemDate: number, t: Function) {
 * @param {string} defaultServerURL - The default server URL.
 * @returns {Array<Object>}
 */
-export function toDisplayableList(recentList: IRecentItem[],
-        t: Function, defaultServerURL: string) {
+export function toDisplayableList(recentList, t, defaultServerURL) {
    const { createSection } = NavigateSectionList;
    const todaySection = createSection(t('dateUtils.today'), 'today');
    const yesterdaySection
--- a/react/features/recent-list/functions.web.js
+++ b/react/features/recent-list/functions.web.js
@@ -1,4 +1,6 @@
-import { parseURIString, safeDecodeURIComponent } from '../base/util/uri';
+/* global interfaceConfig */
+
+import { parseURIString, safeDecodeURIComponent } from '../base/util';


 /**
@@ -8,7 +10,7 @@ import { parseURIString, safeDecodeURIComponent } from '../base/util/uri';
 * @param {Array<Object>} recentList - The recent list form the redux store.
 * @returns {Array<Object>}
 */
-export function toDisplayableList(recentList: Array<{ conference: string; date: Date; duration: number; }>) {
+export function toDisplayableList(recentList) {
    return (
        [ ...recentList ].reverse()
            .map(item => {
--- a/react/features/recent-list/logger.js
+++ b/react/features/recent-list/logger.js
@@ -1,3 +1,5 @@
+// @flow
+
 import { getLogger } from '../base/logging/functions';

 export default getLogger('features/recent-list');
--- a/react/features/recent-list/middleware.js
+++ b/react/features/recent-list/middleware.js
@@ -1,17 +1,21 @@
-import { AnyAction } from 'redux';
+// @flow

-import { IStore } from '../app/types';
-import { APP_WILL_MOUNT } from '../base/app/actionTypes';
-import { CONFERENCE_WILL_LEAVE, SET_ROOM } from '../base/conference/actionTypes';
-import { JITSI_CONFERENCE_URL_KEY } from '../base/conference/constants';
-import { addKnownDomains } from '../base/known-domains/actions';
-import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
+import { APP_WILL_MOUNT } from '../base/app';
+import {
+    CONFERENCE_WILL_LEAVE,
+    JITSI_CONFERENCE_URL_KEY,
+    SET_ROOM
+} from '../base/conference';
+import { addKnownDomains } from '../base/known-domains';
+import { MiddlewareRegistry } from '../base/redux';
+import { parseURIString } from '../base/util';
 import { inIframe } from '../base/util/iframeUtils';
-import { parseURIString } from '../base/util/uri';

 import { _storeCurrentConference, _updateConferenceDuration } from './actions';
 import { isRecentListEnabled } from './functions';

+declare var APP: Object;
+
 /**
 * Middleware that captures joined rooms so they can be saved into
 * {@code window.localStorage}.
@@ -49,7 +53,7 @@ MiddlewareRegistry.register(store => next => action => {
 * @private
 * @returns {*} The result returned by {@code next(action)}.
 */
-function _appWillMount({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
+function _appWillMount({ dispatch, getState }, next, action) {
    const result = next(action);

    // It's an opportune time to transfer the feature recent-list's knowledge
@@ -82,7 +86,7 @@ function _appWillMount({ dispatch, getState }: IStore, next: Function, action: A
 * @private
 * @returns {*} The result returned by {@code next(action)}.
 */
-function _conferenceWillLeave({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
+function _conferenceWillLeave({ dispatch, getState }, next, action) {
    const { doNotStoreRoom } = getState()['features/base/config'];

    if (!doNotStoreRoom && !inIframe()) {
@@ -122,7 +126,7 @@ function _conferenceWillLeave({ dispatch, getState }: IStore, next: Function, ac
 * @private
 * @returns {*} The result returned by {@code next(action)}.
 */
-function _setRoom({ dispatch, getState }: IStore, next: Function, action: AnyAction) {
+function _setRoom({ dispatch, getState }, next, action) {
    const { doNotStoreRoom } = getState()['features/base/config'];

    if (!doNotStoreRoom && !inIframe() && action.room) {
--- a/react/features/recent-list/types.ts
+++ b/react/features/recent-list/types.ts
@@ -1,5 +0,0 @@
-export interface IRecentItem {
-    conference: string;
-    date: number;
-    duration: number;
-}
--- a/react/features/salesforce/components/native/SalesforceLinkDialog.js
+++ b/react/features/salesforce/components/native/SalesforceLinkDialog.js
@@ -44,7 +44,7 @@ const SalesforceLinkDialog = () => {

    const handlePress = useCallback(() => {
        navigate(screen.conference.main);
-        selectedRecord && linkMeeting();
+        linkMeeting();
    }, [ navigate, linkMeeting ]);

    const renderSpinner = () => (
--- a/react/features/salesforce/components/web/SalesforceLinkDialog.tsx
+++ b/react/features/salesforce/components/web/SalesforceLinkDialog.tsx
@@ -18,7 +18,7 @@ import { RecordItem } from './RecordItem';
 const useStyles = makeStyles()(theme => {
    return {
        container: {
-            height: '450px',
+            minHeight: '450px',
            overflowY: 'auto',
            position: 'relative'
        },
@@ -56,38 +56,23 @@ const useStyles = makeStyles()(theme => {
        spinner: {
            alignItems: 'center',
            display: 'flex',
-            height: 'calc(100% - 70px)',
+            height: 'calc(100% - 100px)',
            justifyContent: 'center',
-            width: '100%',
-
-            '@media (max-width: 448px)': {
-                height: 'auto',
-                marginTop: '24px'
-            }
+            width: '100%'
        },
        noRecords: {
            height: 'calc(100% - 150px)',
            display: 'flex',
            alignItems: 'center',
            justifyContent: 'center',
-            flexDirection: 'column',
-
-            '@media (max-width: 448px)': {
-                height: 'auto',
-                marginTop: '24px'
-            }
+            flexDirection: 'column'
        },
        recordsError: {
-            height: 'calc(100% - 42px)',
+            height: 'calc(100% - 80px)',
            display: 'flex',
            alignItems: 'center',
            justifyContent: 'center',
-            flexDirection: 'column',
-
-            '@media (max-width: 448px)': {
-                height: 'auto',
-                marginTop: '24px'
-            }
+            flexDirection: 'column'
        },
        recordList: {
            listStyle: 'none',
@@ -160,7 +145,7 @@ function SalesforceLinkDialog() {

    const handleSubmit = useCallback(() => {
        dispatch(hideDialog());
-        selectedRecord && linkMeeting();
+        linkMeeting();
    }, [ hideDialog, linkMeeting ]);

    const renderSpinner = () => (
--- a/react/features/salesforce/useSalesforceLinkDialog.ts
+++ b/react/features/salesforce/useSalesforceLinkDialog.ts
@@ -83,7 +83,7 @@ export const useSalesforceLinkDialog = () => {
            }
        };

-        selectedRecord && fetchRecordDetails();
+        fetchRecordDetails();
    }, [
        jwt,
        getSessionRecordDetails,
--- a/react/features/screenshot-capture/actions.js
+++ b/react/features/screenshot-capture/actions.js
@@ -1,14 +1,13 @@
-import { IStore } from '../app/types';
-import { getMultipleVideoSendingSupportFeatureFlag } from '../base/config/functions';
-import { getLocalJitsiDesktopTrack, getLocalJitsiVideoTrack } from '../base/tracks/functions';
+// @flow
+
+import { getLocalJitsiDesktopTrack, getLocalJitsiVideoTrack } from '../../features/base/tracks';
+import { getMultipleVideoSendingSupportFeatureFlag } from '../base/config';

 import { SET_SCREENSHOT_CAPTURE } from './actionTypes';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { createScreenshotCaptureSummary } from './functions';
 import logger from './logger';

-let screenshotSummary: any;
+let screenshotSummary;

 /**
 * Marks the on-off state of screenshot captures.
@@ -19,7 +18,7 @@ let screenshotSummary: any;
    *      payload: enabled
    * }}
 */
-function setScreenshotCapture(enabled: boolean) {
+function setScreenshotCapture(enabled) {
    return {
        type: SET_SCREENSHOT_CAPTURE,
        payload: enabled
@@ -33,7 +32,7 @@ function setScreenshotCapture(enabled: boolean) {
 * @returns {Promise}
 */
 export function toggleScreenshotCaptureSummary(enabled: boolean) {
-    return async function(dispatch: IStore['dispatch'], getState: IStore['getState']) {
+    return async function(dispatch: (Object) => Object, getState: () => any) {
        const state = getState();

        if (state['features/screenshot-capture'].capturesEnabled !== enabled) {
--- a/react/features/screenshot-capture/logger.js
+++ b/react/features/screenshot-capture/logger.js
@@ -1,3 +1,5 @@
+// @flow
+
 import { getLogger } from '../base/logging/functions';

 export default getLogger('features/screenshot-capture');
--- a/react/features/share-room/middleware.js
+++ b/react/features/share-room/middleware.js
@@ -1,9 +1,10 @@
+// @flow
+
 import { Share } from 'react-native';

-import { getName } from '../app/functions.native';
-import { IStore } from '../app/types';
-import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
-import { getShareInfoText } from '../invite/functions';
+import { getName } from '../app/functions';
+import { MiddlewareRegistry } from '../base/redux';
+import { getShareInfoText } from '../invite';

 import { BEGIN_SHARE_ROOM } from './actionTypes';
 import { endShareRoom } from './actions';
@@ -34,7 +35,7 @@ MiddlewareRegistry.register(store => next => action => {
 * @private
 * @returns {void}
 */
-function _shareRoom(roomURL: string, { dispatch, getState }: IStore) {
+function _shareRoom(roomURL: string, { dispatch, getState }) {
    getShareInfoText(getState(), roomURL)
        .then(message => {
            const title = `${getName()} Conference`;
--- a/react/features/shared-video/components/web/AbstractVideoManager.js
+++ b/react/features/shared-video/components/web/AbstractVideoManager.js
@@ -209,12 +209,10 @@ class AbstractVideoManager extends PureComponent<Props> {
    /**
     * Handle video error.
     *
-     * @param {Object|undefined} e - The error returned by the API or none.
     * @returns {void}
     */
-    onError(e) {
-        logger.error('Error in the video player', e?.data,
-            e?.data ? 'Check error code at https://developers.google.com/youtube/iframe_api_reference#onError' : '');
+    onError() {
+        logger.error('Error in the video player');
        this.props._stopSharedVideo();
        this.props._displayWarning();
    }
--- a/react/features/shared-video/components/web/YoutubeVideoManager.js
+++ b/react/features/shared-video/components/web/YoutubeVideoManager.js
@@ -201,7 +201,7 @@ class YoutubeVideoManager extends AbstractVideoManager {
                    'rel': 0
                }
            },
-            onError: e => this.onError(e),
+            onError: () => this.onError(),
            onReady: this.onPlayerReady,
            onStateChange: this.onPlayerStateChange,
            videoId
--- a/react/features/toolbox/components/web/DockIframeButton.js
+++ b/react/features/toolbox/components/web/DockIframeButton.js
@@ -0,0 +1,29 @@
+// @flow
+
+import { translate } from '../../../base/i18n';
+import { IconDock } from '../../../base/icons';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+
+declare var APP: Object;
+
+/**
+ * Implementation of a button for notifying integrators that iframe should be docked.
+ */
+class DockIframeButton extends AbstractButton<AbstractButtonProps, *> {
+    accessibilityLabel = 'toolbar.accessibilityLabel.dock';
+    icon = IconDock;
+    label = 'toolbar.dock';
+    tooltip = 'toolbar.dock';
+
+    /**
+     * Handles clicking / pressing the button by triggering external api event.
+     *
+     * @protected
+     * @returns {void}
+     */
+    _handleClick() {
+        APP.API.notifyIframeDockStateChanged(true);
+    }
+}
+
+export default translate(DockIframeButton);
--- a/react/features/toolbox/components/web/Toolbox.tsx
+++ b/react/features/toolbox/components/web/Toolbox.tsx
@@ -118,6 +118,8 @@ import HelpButton from '../HelpButton';

 // @ts-ignore
 import AudioSettingsButton from './AudioSettingsButton';
+// @ts-ignore
+import DockIframeButton from './DockIframeButton';
 import { EndConferenceButton } from './EndConferenceButton';
 // @ts-ignore
 import FullscreenButton from './FullscreenButton';
@@ -136,6 +138,8 @@ import ShareDesktopButton from './ShareDesktopButton';
 // @ts-ignore
 import ToggleCameraButton from './ToggleCameraButton';
 // @ts-ignore
+import UndockIframeButton from './UndockIframeButton';
+// @ts-ignore
 import VideoSettingsButton from './VideoSettingsButton';

 /**
@@ -862,6 +866,18 @@ class Toolbox extends Component<IProps> {
            group: 3
        };

+        const dockIframe = {
+            key: 'dock-iframe',
+            Content: DockIframeButton,
+            group: 3
+        };
+
+        const undockIframe = {
+            key: 'undock-iframe',
+            Content: UndockIframeButton,
+            group: 3
+        };
+
        const speakerStats = !_isSpeakerStatsDisabled && {
            key: 'stats',
            Content: SpeakerStatsButton,
@@ -928,6 +944,8 @@ class Toolbox extends Component<IProps> {
            whiteboard,
            etherpad,
            virtualBackground,
+            dockIframe,
+            undockIframe,
            speakerStats,
            settings,
            shortcuts,
--- a/react/features/toolbox/components/web/UndockIframeButton.js
+++ b/react/features/toolbox/components/web/UndockIframeButton.js
@@ -0,0 +1,29 @@
+// @flow
+
+import { translate } from '../../../base/i18n';
+import { IconUndock } from '../../../base/icons';
+import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components';
+
+declare var APP: Object;
+
+/**
+ * Implementation of a button for notifying integrators that iframe should be undocked.
+ */
+class UndockIframeButton extends AbstractButton<AbstractButtonProps, *> {
+    accessibilityLabel = 'toolbar.accessibilityLabel.undock';
+    icon = IconUndock;
+    label = 'toolbar.undock';
+    tooltip = 'toolbar.undock';
+
+    /**
+     * Handles clicking / pressing the button by triggering external api event.
+     *
+     * @protected
+     * @returns {void}
+     */
+    _handleClick() {
+        APP.API.notifyIframeDockStateChanged(false);
+    }
+}
+
+export default translate(UndockIframeButton);
--- a/resources/extra-large-conference/README.md
+++ b/resources/extra-large-conference/README.md
@@ -1,88 +0,0 @@
-WARNING: This is still a Work In Progress
-
-The final implementation may diverge. Currently, only the participants after a
-configured threshold will be just viewers (visitors) and there is no promotion
-mechanism to become a main participant yet.
-
-TODO:
-* Merge messaging between visitor nodes and main conference
-* Polls
-* Raise hand to be promoted to enter the main conference
-* Make sure it works with tenants.
-
-
-# Low-latency conference streaming to very large audiences
-
-To have a low-latency conference with a very large audience, the media and
-signaling load must be spread  beyond what can be handled by a typical Jitsi
-installation. A call with 10k participants requires around 50 bridges on decent
-vms (8+ cores). The main participants of a conference with a very large
-audience will share a main prosody, like with normal conferences, and
-additional prosody vms are needed to support signaling to the audience.
-
-In the example configuration we use a 16 core machine. Eight of the cores are
-used for the main prosody and other services (nginx, jicofo, etc) and the other
-eight cores are used to run prosody services for visitors, i.e., "visitor
-prosodies".
-
-We consider 2000 participants per visitor node a safe value. So eight visitor
-prosodies will be enough for one 10k participants meeting.
-
-<img src="imgs/visitors-prosody.svg" alt="diagram of a central prosody connected to several visitor prosodies" width="500"/>
-
-# Configuration
-Use the `pre-configure.sh` script to configure your system, passing it the
-number of visitor prosodies to set up.
-`./pre-configure.sh 8`
-
-The script will add for each visitor prosody:
- folders in `/etc/`
- a systemd unit file in `/lib/systemd/system/`
- a user for jicofo
- a config entry in jicofo.conf
-
-Setting up configuration for the main prosody is a manual process:
- Add to the enabled modules list in the general part (e.g. [here](https://github.com/bjc/prosody/blob/76bf6d511f851c7cde8a81257afaaae0fb7a4160/prosody.cfg.lua.dist#L33)):
-```
-      "s2s_bidi";
-      "certs_s2soutinjection";
-      "s2soutinjection";
-      "s2s_whitelist";
-```
-
- Add the following config also in the general part (matching the number of prosodies you generated config for):
-```
-- targets must be IPs, not hostnames
-s2s_connect_overrides = {
-    ["conference.v1.meet.jitsi"] = { "127.0.0.1", 52691 };
-    ["conference.v2.meet.jitsi"] = { "127.0.0.1", 52692 };
-    ["conference.v3.meet.jitsi"] = { "127.0.0.1", 52693 };
-    ["conference.v4.meet.jitsi"] = { "127.0.0.1", 52694 };
-    ["conference.v5.meet.jitsi"] = { "127.0.0.1", 52695 };
-    ["conference.v6.meet.jitsi"] = { "127.0.0.1", 52696 };
-    ["conference.v7.meet.jitsi"] = { "127.0.0.1", 52697 };
-    ["conference.v8.meet.jitsi"] = { "127.0.0.1", 52698 };
-}
-- allowed list of server-2-server connections
-s2s_whitelist = {
-    "conference.v1.meet.jitsi", "conference.v2.meet.jitsi", "conference.v3.meet.jitsi", "conference.v4.meet.jitsi",
-    "conference.v5.meet.jitsi", "conference.v6.meet.jitsi", "conference.v7.meet.jitsi", "conference.v8.meet.jitsi"
-};
-```
-
- Make sure s2s is not in modules_disabled
- Enable `"xxl_conference";` module under the main virtual host (e.g. [here](https://github.com/jitsi/jitsi-meet/blob/f42772ec5bcc87ff6de17423d36df9bcad6e770d/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example#L57))
-
-After configuring you can set the maximum number of main participants, before
-redirecting to visitors.
-```
-hocon -f /etc/jitsi/jicofo/jicofo.conf set "jicofo.visitors.max-participants" 30
-```
-Now restart prosody and jicofo
-```
-service prosody restart
-service jicofo restart
-```
-
-Now after the main 30 participants join, the rest will be visitors using the
-visitor nodes.
--- a/resources/extra-large-conference/imgs/visitors-prosody.svg
+++ b/resources/extra-large-conference/imgs/visitors-prosody.svg
--- a/resources/extra-large-conference/pre-configure.sh
+++ b/resources/extra-large-conference/pre-configure.sh
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=`dirname "$0"`
-cd $SCRIPT_DIR
-
-NUMBER_OF_INSTANCES=$1
-
-if ! [[ $NUMBER_OF_INSTANCES =~ ^[0-9]+([.][0-9]+)?$ ]] ; then
-   echo "error: Not a number param" >&2;
-   exit 1
-fi
-
-echo "Will configure $NUMBER_OF_INSTANCES number of visitor prosodies"
-set -e
-set -x
-
-# Configure prosody instances
-for (( i=1 ; i<=${NUMBER_OF_INSTANCES} ; i++ ));
-do
-    cp prosody-v.service.template /lib/systemd/system/prosody-v${i}.service
-    sed -i "s/vX/v${i}/g" /lib/systemd/system/prosody-v${i}.service
-    mkdir /etc/prosody-v${i}
-    ln -s /etc/prosody/certs /etc/prosody-v${i}/certs
-    cp prosody.cfg.lua.visitor.template /etc/prosody-v${i}/prosody.cfg.lua
-    sed -i "s/vX/v${i}/g" /etc/prosody-v${i}/prosody.cfg.lua
-done
-
-# Configure jicofo
-HOCON_CONFIG="/etc/jitsi/jicofo/jicofo.conf"
-hocon -f $HOCON_CONFIG set "jicofo.bridge.selection-strategy" "VisitorSelectionStrategy"
-hocon -f $HOCON_CONFIG set "jicofo.bridge.visitor-selection-strategy" "RegionBasedBridgeSelectionStrategy"
-hocon -f $HOCON_CONFIG set "jicofo.bridge.topology-strategy" "VisitorTopologyStrategy"
-
-PASS=$(hocon -f $HOCON_CONFIG get "jicofo.xmpp.client.password")
-for (( i=1 ; i<=${NUMBER_OF_INSTANCES} ; i++ ));
-do
-  prosodyctl --config /etc/prosody-v${i}/prosody.cfg.lua register focus auth.meet.jitsi $PASS
-  hocon -f $HOCON_CONFIG set "jicofo.xmpp.visitors.v${i}.enabled" true
-  hocon -f $HOCON_CONFIG set "jicofo.xmpp.visitors.v${i}.conference-service" "conference.v${i}.meet.jitsi"
-  hocon -f $HOCON_CONFIG set "jicofo.xmpp.visitors.v${i}.hostname" 127.0.0.1
-  hocon -f $HOCON_CONFIG set "jicofo.xmpp.visitors.v${i}.port" 5222${i}
-  hocon -f $HOCON_CONFIG set "jicofo.xmpp.visitors.v${i}.domain" "auth.meet.jitsi"
-  hocon -f $HOCON_CONFIG set "jicofo.xmpp.visitors.v${i}.password" "${PASS}"
-  hocon -f $HOCON_CONFIG set "jicofo.xmpp.visitors.v${i}.disable-certificate-verification" true
-done
-
-for (( i=1 ; i<=${NUMBER_OF_INSTANCES} ; i++ ));
-do
-  service prosody-v${i} restart
-done
-service jicofo restart
--- a/resources/extra-large-conference/prosody-v.service.template
+++ b/resources/extra-large-conference/prosody-v.service.template
@@ -1,46 +0,0 @@
-[Unit]
-### see man systemd.unit
-Description=Prosody vX (visitor vX) JVB XMPP Server
-Documentation=https://prosody.im/doc
-
-Requires=network-online.target
-After=network-online.target network.target mariadb.service mysql.service postgresql.service
-Before=biboumi.service
-
-[Service]
-### see man systemd.service
-Type=simple
-
-# Start by executing the main executable
-# Note: -F option requires Prosody 0.11.5 or later
-ExecStart=/usr/bin/prosody --config /etc/prosody-vX/prosody.cfg.lua -F
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abnormal
-
-### see man systemd.exec
-User=prosody
-Group=prosody
-UMask=0027
-
-RuntimeDirectory=prosody-vX
-ConfigurationDirectory=prosody-vX
-StateDirectory=prosody-vX
-StateDirectoryMode=0750
-LogsDirectory=prosody-vX
-WorkingDirectory=~
-
-# Set stdin to /dev/null since Prosody does not need it
-StandardInput=null
-
-# Direct stdout/-err to journald for use with log = "*stdout"
-StandardOutput=journal
-StandardError=inherit
-
-# Allow binding low ports
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-
-[Install]
-### see man systemd.unit
-WantedBy=multi-user.target
-
-# vim: filetype=systemd
--- a/resources/extra-large-conference/prosody.cfg.lua.visitor.template
+++ b/resources/extra-large-conference/prosody.cfg.lua.visitor.template
@@ -1,121 +0,0 @@
---------- Server-wide settings ----------
-s2s_ports = { 52691 };
-c2s_ports = { 52221 }
-http_ports = { 52801 }
-https_ports = { 52811 }
-
-daemonize = true;
-
-- we use a common jid for jicofo
-admins = {
-    'focus@auth.meet.jitsi'
-}
-
-- Enable use of native prosody 0.11 support for epoll over select
-network_backend = 'epoll';
-network_settings = {
-  tcp_backlog = 511;
-}
-
-modules_enabled = {
-      'saslauth';
-      'tls';
-      'disco';
-      'posix';
-
-      'secure_interfaces';
-
-    -- jitsi
-      'websocket';
-      'bosh';
-      's2s_bidi';
-      's2s_whitelist';
-};
-
-s2s_whitelist = {};
-
-external_service_secret = '__turnSecret__';
-
-external_services = {
-    { type = 'stun', host = 'jitmeet.example.com', port = 3478 },
-    { type = 'turn', host = 'jitmeet.example.com', port = 3478, transport = 'udp', secret = true, ttl = 86400, algorithm = 'turn' },
-    { type = 'turns', host = 'jitmeet.example.com', port = 5349, transport = 'tcp', secret = true, ttl = 86400, algorithm = 'turn' }
-};
-
-muc_mapper_domain_base = 'vX.meet.jitsi';
-
-- https://prosody.im/doc/modules/mod_smacks
-smacks_max_unacked_stanzas = 5;
-smacks_hibernation_time = 60;
-- this is dropped in 0.12
-smacks_max_hibernated_sessions = 1;
-smacks_max_old_sessions = 1;
-
-unlimited_jids = { 'focus@auth.meet.jitsi' }
-limits = {
-    c2s = {
-        rate = '512kb/s';
-    };
-}
-
-modules_disabled = {
-    'offline';
-    'pubsub';
-    'register';
-};
-
-allow_registration = false;
-authentication = 'internal_hashed'
-storage = 'internal'
-log = {
-    -- Log files (change 'info' to 'debug' for debug logs):
-    info = '/var/log/prosody-vX/prosody.log';
-    error = '/var/log/prosody-vX/prosody.err';
-}
-
-consider_websocket_secure = true;
-consider_bosh_secure = true;
-bosh_max_inactivity = 60;
-
-plugin_paths = { '/usr/share/jitsi-meet/prosody-plugins/' }
-
----------- Virtual hosts -----------
-VirtualHost 'vX.meet.jitsi'
-    authentication = 'jitsi-anonymous'
-    ssl = {
-        key = '/etc/prosody/certs/jitmeet.example.com.key';
-        certificate = '/etc/prosody/certs/jitmeet.example.com.crt';
-    }
-    modules_enabled = {
-      'bosh';
-      'ping';
-      'external_services';
-      'smacks';
-      'jiconop';
-    }
-    main_muc = 'conference.vX.meet.jitsi';
-
-VirtualHost 'auth.meet.jitsi'
-    modules_enabled = {
-          'limits_exception';
-          'ping';
-    }
-    authentication = 'internal_hashed'
-
-Component 'conference.vX.meet.jitsi' 'muc'
-    storage = 'memory'
-    muc_room_cache_size = 10000
-    restrict_room_creation = true
-    modules_enabled = {
-        'muc_hide_all';
-        'muc_domain_mapper';
-        'muc_meeting_id';
-        'fmuc';
-    }
-    muc_room_default_presence_broadcast = {
-        visitor = false;
-        participant = true;
-        moderator = true;
-    };
-    muc_room_locking = false
-    muc_room_default_public_jids = true
--- a/resources/prosody-plugins/mod_certs_all.lua
+++ b/resources/prosody-plugins/mod_certs_all.lua
@@ -0,0 +1,16 @@
+-- validates all certificates, global module
+-- Warning: use this only for testing purposes as it will accept all kind of certificates for s2s connections
+-- you can use https://modules.prosody.im/mod_s2s_whitelist.html for whitelisting only certain destinations
+module:set_global();
+
+function attach(event)
+    local session = event.session;
+
+    session.cert_chain_status = 'valid';
+    session.cert_identity_status = 'valid';
+
+    return true;
+end
+module:wrap_event('s2s-check-certificate', function (handlers, event_name, event_data)
+    return attach(event_data);
+end);
--- a/resources/prosody-plugins/mod_certs_s2soutinjection.lua
+++ b/resources/prosody-plugins/mod_certs_s2soutinjection.lua
@@ -1,19 +0,0 @@
-- global module
-- validates certificates for all hosts used for s2soutinjection
-module:set_global();
-
-local s2s_overrides = module:get_option("s2s_connect_overrides");
-
-function attach(event)
-    local session = event.session;
-
-    if s2s_overrides and s2s_overrides[event.host] then
-        session.cert_chain_status = 'valid';
-        session.cert_identity_status = 'valid';
-
-        return true;
-    end
-end
-module:wrap_event('s2s-check-certificate', function (handlers, event_name, event_data)
-    return attach(event_data);
-end);
--- a/resources/prosody-plugins/mod_fmuc.lua
+++ b/resources/prosody-plugins/mod_fmuc.lua
@@ -7,6 +7,12 @@
 ---    };
 --- Enable in global modules: 's2s_bidi'
 --- Make sure 's2s' is not in modules_disabled
+--- TODO: Do we need the /etc/hosts changes? We can drop it for https://modules.prosody.im/mod_s2soutinjection.html
+--- In /etc/hosts add:
+--- vmmain-ip-address focus.domain.com
+--- vmmain-ip-address conference.domain.com
+--- vmmain-ip-address domain.com
+--- Open port 5269 on the provider side and on the firewall of the machine, so the core node can access this visitor one
 local jid = require 'util.jid';
 local st = require 'util.stanza';

--- a/resources/prosody-plugins/mod_s2s_whitelist.lua
+++ b/resources/prosody-plugins/mod_s2s_whitelist.lua
@@ -1,20 +0,0 @@
-- Using version https://hg.prosody.im/prosody-modules/file/c1a8ce147885/mod_s2s_whitelist/mod_s2s_whitelist.lua
-local st = require "util.stanza";
-
-local whitelist = module:get_option_inherited_set("s2s_whitelist", {});
-
-module:hook("route/remote", function (event)
-	if not whitelist:contains(event.to_host) then
-		module:send(st.error_reply(event.stanza, "cancel", "not-allowed", "Communication with this domain is restricted"));
-		return true;
-	end
-end, 100);
-
-module:hook("s2s-stream-features", function (event)
-	if not whitelist:contains(event.origin.from_host) then
-		event.origin:close({
-			condition = "policy-violation";
-			text = "Communication with this domain is restricted";
-		});
-	end
-end, 1000);
--- a/resources/prosody-plugins/mod_s2soutinjection.lua
+++ b/resources/prosody-plugins/mod_s2soutinjection.lua
@@ -1,90 +0,0 @@
-- Using version https://hg.prosody.im/prosody-modules/file/4fb922aa0ace/mod_s2soutinjection/mod_s2soutinjection.lua
-local st = require"util.stanza";
-local new_outgoing = require"core.s2smanager".new_outgoing;
-local bounce_sendq = module:depends"s2s".route_to_new_session.bounce_sendq;
-local initialize_filters = require "util.filters".initialize;
-
-local portmanager = require "core.portmanager";
-
-local addclient = require "net.server".addclient;
-
-module:depends("s2s");
-
-local sessions = module:shared("sessions");
-
-local injected = module:get_option("s2s_connect_overrides");
-
-- The proxy_listener handles connection while still connecting to the proxy,
-- then it hands them over to the normal listener (in mod_s2s)
-local proxy_listener = { default_port = nil, default_mode = "*a", default_interface = "*" };
-
-function proxy_listener.onconnect(conn)
-	local session = sessions[conn];
-
-	-- Now the real s2s listener can take over the connection.
-	local listener = portmanager.get_service("s2s").listener;
-
-	local log = session.log;
-
-	local filter = initialize_filters(session);
-
-	session.version = 1;
-
-	session.sends2s = function (t)
-		log("debug", "sending (s2s over proxy): %s", (t.top_tag and t:top_tag()) or t:match("^[^>]*>?"));
-		if t.name then
-			t = filter("stanzas/out", t);
-		end
-		if t then
-			t = filter("bytes/out", tostring(t));
-			if t then
-				return conn:write(tostring(t));
-			end
-		end
-	end
-
-	session.open_stream = function ()
-		session.sends2s(st.stanza("stream:stream", {
-			xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback',
-			["xmlns:stream"]='http://etherx.jabber.org/streams',
-			from=session.from_host, to=session.to_host, version='1.0', ["xml:lang"]='en'}):top_tag());
-	end
-
-	conn.setlistener(conn, listener);
-
-	listener.register_outgoing(conn, session);
-
-	listener.onconnect(conn);
-end
-
-function proxy_listener.register_outgoing(conn, session)
-	session.direction = "outgoing";
-	sessions[conn] = session;
-end
-
-function proxy_listener.ondisconnect(conn, err)
-	sessions[conn]  = nil;
-end
-
-module:hook("route/remote", function(event)
-	local from_host, to_host, stanza = event.from_host, event.to_host, event.stanza;
-	local inject = injected and injected[to_host];
-	if not inject then return end
-	module:log("debug", "opening a new outgoing connection for this stanza");
-	local host_session = new_outgoing(from_host, to_host);
-
-	-- Store in buffer
-	host_session.bounce_sendq = bounce_sendq;
-	host_session.sendq = { {tostring(stanza), stanza.attr.type ~= "error" and stanza.attr.type ~= "result" and st.reply(stanza)} };
-	host_session.log("debug", "stanza [%s] queued until connection complete", tostring(stanza.name));
-
-	local host, port = inject[1] or inject, tonumber(inject[2]) or 5269;
-
-	local conn = addclient(host, port, proxy_listener, "*a");
-
-	proxy_listener.register_outgoing(conn, host_session);
-
-	host_session.conn = conn;
-	return true;
-end, -2);
-
--- a/resources/prosody-plugins/mod_secure_interfaces.lua
+++ b/resources/prosody-plugins/mod_secure_interfaces.lua
@@ -1,20 +0,0 @@
-- Using version https://hg.prosody.im/prosody-modules/file/6c806a99f802/mod_secure_interfaces/mod_secure_interfaces.lua
-local secure_interfaces = module:get_option_set("secure_interfaces", { "127.0.0.1", "::1" });
-
-module:hook("stream-features", function (event)
-	local session = event.origin;
-	if session.type ~= "c2s_unauthed" then return; end
-	local socket = session.conn:socket();
-	if not socket.getsockname then
-		module:log("debug", "Unable to determine local address of incoming connection");
-		return;
-	end
-	local localip = socket:getsockname();
-	if secure_interfaces:contains(localip) then
-		module:log("debug", "Marking session from %s to %s as secure", session.ip or "[?]", localip);
-		session.secure = true;
-		session.conn.starttls = false;
-	else
-		module:log("debug", "Not marking session from %s to %s as secure", session.ip or "[?]", localip);
-	end
-end, 2500);
--- a/resources/prosody-plugins/mod_token_verification.lua
+++ b/resources/prosody-plugins/mod_token_verification.lua
@@ -5,7 +5,6 @@ local log = module._log;
 local host = module.host;
 local st = require "util.stanza";
 local um_is_admin = require "core.usermanager".is_admin;
-local jid_split = require "util.jid".split;


 local function is_admin(jid)
@@ -40,11 +39,8 @@ log("debug",

 -- option to disable room modification (sending muc config form) for guest that do not provide token
 local require_token_for_moderation;
-- option to not require tokens for certain users and domains
-local token_empty_allow_list;
 local function load_config()
    require_token_for_moderation = module:get_option_boolean("token_verification_require_token_for_moderation");
-    token_empty_allow_list = module:get_option_set("token_verification_empty_allow_list");
 end
 load_config();

@@ -61,19 +57,6 @@ local function verify_user(session, stanza)
 		return true;
 	end

-    -- if token is empty and user matches allow list, skip verification and allow user to join
-    local user, domain, res = jid_split(user_jid);
-    if session.auth_token == nil and user ~= nil and domain ~= nil and token_empty_allow_list then
-        if token_empty_allow_list:contains(domain) then
-            log("debug", "Token not required from user: %s in allowed domain: %s", user_jid, domain);
-            return true;
-        end
-        if token_empty_allow_list:contains(user..'@'..domain) then
-            log("debug", "Token not required from user in allowed list: %s", user_jid);
-            return true;
-        end
-    end
-
    log("debug",
        "Will verify token for user: %s, room: %s ", user_jid, stanza.attr.to);
    if not token_util:verify_room(session, stanza.attr.to) then
--- a/resources/prosody-plugins/mod_xxl_conference.lua
+++ b/resources/prosody-plugins/mod_xxl_conference.lua
@@ -56,23 +56,29 @@ local visitors_nodes = {};
 --- Jicofo is connected to the room when sending this error
 module:log('info', 'Hook to iq/host');
 module:hook('iq/full', function(event)
-    local stanza = event.stanza;
+    local session, stanza = event.origin, event.stanza;

-    if stanza.name ~= 'iq' or stanza.attr.type ~= 'result' or stanza.attr.from ~= focus_component_host  then
+    if stanza.name ~= 'iq' or stanza.attr.type ~= 'error' or stanza.attr.from ~= focus_component_host then
        return;  -- not IQ from jicofo. Ignore this event.
    end

-    local conference = stanza:get_child('conference', 'http://jitsi.org/protocol/focus');
-    if not conference then
+    local error = stanza:get_child('error');
+    if error == nil then
+        return; -- not Conference IQ error. Ignore.
+    end
+
+    local redirect = error:get_child('redirect', 'urn:ietf:params:xml:ns:xmpp-stanzas');
+    local redirect_host = error:get_child_text('url', 'http://jitsi.org/jitmeet');
+
+    if not redirect or not redirect_host then
        return;
    end

    -- let's send participants if any from the room to the visitors room
    -- TODO fix room name extract, make sure it works wit tenants
-    local main_room = conference.attr.room;
-    local vnode = conference.attr.vnode;
+    local main_room = error:get_child_text('main-room', 'http://jitsi.org/jitmeet');

-    if not main_room or not vnode then
+    if not main_room then
        return;
    end

@@ -82,7 +88,7 @@ module:hook('iq/full', function(event)
        return;  -- room does not exists. Continue with normal flow
    end

-    local conference_service = muc_domain_prefix..'.'..vnode..'.meet.jitsi';
+    local conference_service = muc_domain_prefix..'.'..redirect_host;

    if visitors_nodes[room.jid] and
        visitors_nodes[room.jid].nodes and
--- a/tsconfig.web.json
+++ b/tsconfig.web.json
@@ -16,7 +16,6 @@
    },
    "exclude": [
        "node_modules",
-        "react/features/share-room",
        "**/mobile/*",
        "**/native/*",
        "**/*.native.ts",
Author	SHA1	Message	Date
Avram Tudor	ea029c61b1	fix(prejoin) fix prejoin app dialogs not being visible	2022-12-15 11:01:49 +02:00
Gabriel Borlea	b035ce7401	chore(deps): lib-jitsi-meet release-5854	2022-12-14 16:18:37 +02:00
Horatiu Muresan	10380eba40	feat(route) Redirect to a custom welcome page	2022-12-13 23:12:05 +02:00
Horatiu Muresan	4c97a82617	fix(prejoin) Fix missing lib error	2022-12-13 23:12:05 +02:00
Gabriel Borlea	c20f212365	chore(deps) lib-jitsi-meet@latest https://github.com/jitsi/lib-jitsi-meet/compare/v1549.0.0+877c4546...v1553.0.0+57646337	2022-12-13 18:23:59 +02:00