fixup!

fixup devcontainer
fix(build) use http for GitHub codespaces
2026-05-27 01:07:47 +00:00 · 2022-12-02 15:58:52 +00:00 · 2022-12-02 15:55:22 +00:00 · 2022-12-02 15:15:56 +00:00 · 2022-12-02 15:50:01 +01:00 · 2022-12-02 15:31:44 +01:00
219 changed files with 3162 additions and 1867 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,15 @@
+{
+  "name": "Jitsi Meet Dev Container",
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "16"
+    }
+  },
+  "hostRequirements": {
+    "cpus": 4,
+    "memory": "8gb",
+    "storage": "32gb" 
+  },
+  "postCreateCommand": "bash -i -c 'nvm use && npm install && cp tsconfig.web.json tsconfig.json'"
+}
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -76,7 +76,7 @@ android {

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

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

--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,4 @@
 import groovy.json.JsonSlurper
-import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.util.VersionNumber

 // Top-level build file where you can add configuration options common to all
@@ -12,16 +11,16 @@ buildscript {
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
+        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
    }
 }

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

    if (System.properties['os.arch'] == "aarch64") {
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/WebRTCVideoDecoderFactory.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/WebRTCVideoDecoderFactory.java
@@ -42,10 +42,10 @@ public class WebRTCVideoDecoderFactory implements VideoDecoderFactory {
    public VideoCodecInfo[] getSupportedCodecs() {
        List<VideoCodecInfo> codecs = new ArrayList<>();

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

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

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

        return codecs.toArray(new VideoCodecInfo[codecs.size()]);
    }
--- a/globals.d.ts
+++ b/globals.d.ts
@@ -13,6 +13,8 @@ declare global {
        keyboardshortcut: {
            registerShortcut: Function;
            unregisterShortcut: Function;
+            openDialog: Function;
+            enable: Function;
        }
    };
    const interfaceConfig: any;
--- a/globals.native.d.ts
+++ b/globals.native.d.ts
@@ -23,6 +23,8 @@ interface IWindow {
    onerror: (event: string, source: any, lineno: any, colno: any, e: Error) => void;
    onunhandledrejection: (event: any) => void;

+    setInterval: typeof setInterval;
+    clearInterval: typeof clearInterval;
    setTimeout: typeof setTimeout;
    clearTimeout: typeof clearTimeout;
    setImmediate: typeof setImmediate;
--- a/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift
+++ b/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift
@@ -46,7 +46,7 @@ public class PiPViewCoordinator {
        }
    }

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

    // Unused. Remove on the next major release.
    @available(*, deprecated, message: "The PiP window size is now fixed to 150px.")
--- a/lang/main-enGB.json
+++ b/lang/main-enGB.json
@@ -365,7 +365,7 @@
        "mute": "Mute or unmute your microphone",
        "pushToTalk": "Press to transmit",
        "raiseHand": "Raise or lower your hand",
-        "showSpeakerStats": "Show speaker stats",
+        "showSpeakerStats": "Show participants stats",
        "toggleChat": "Open or close the chat",
        "toggleFilmstrip": "Show or hide video thumbnails",
        "toggleScreensharing": "Switch between camera and screen sharing",
@@ -579,7 +579,7 @@
        "minutes": "{{count}}m",
        "name": "Name",
        "seconds": "{{count}}s",
-        "speakerStats": "Speaker Stats",
+        "speakerStats": "Participants Stats",
        "speakerTime": "Speaker Time"
    },
    "startupoverlay": {
@@ -626,7 +626,7 @@
            "sharedvideo": "Toggle video sharing",
            "shortcuts": "Toggle shortcuts",
            "show": "Show on stage",
-            "speakerStats": "Toggle speaker statistics",
+            "speakerStats": "Toggle participants statistics",
            "tileView": "Toggle tile view",
            "toggleCamera": "Toggle camera",
            "videoblur": "",
@@ -662,7 +662,7 @@
        "shareRoom": "Invite someone",
        "sharedvideo": "Share video",
        "shortcuts": "View shortcuts",
-        "speakerStats": "Speaker stats",
+        "speakerStats": "Participants stats",
        "startScreenSharing": "Start screen sharing",
        "startSubtitles": "Start subtitles",
        "startvideoblur": "",
--- a/lang/main-hu.json
+++ b/lang/main-hu.json
@@ -27,6 +27,25 @@
    "audioOnly": {
        "audioOnly": "Alacsony sávszélesség"
    },
+    "breakoutRooms": {
+        "actions": {
+            "add": "Pihenőszoba hozzáadása",
+            "autoAssign": "Automatikus hozzárendelés a pihenőszobákhoz",
+            "close": "Bezárás",
+            "join": "Csatlakozás",
+            "leaveBreakoutRoom": "Pihenőszoba elhagyása",
+            "more": "Bővebben",
+            "remove": "Eltávolítás",
+            "sendToBreakoutRoom": "Résztvevő áthelyezése ide:"
+        },
+        "defaultName": "Pihenőszoba #{{index}}",
+        "mainRoom": "Fő szoba",
+        "notifications": {
+            "joined": "Csatlakozva a \"{{name}}\" pihenőszobához",
+            "joinedMainRoom": "Csatlakozva a fő szobához",
+            "joinedTitle": "Pihenőszobák"
+        }
+    },
    "calendarSync": {
        "addMeetingURL": "Értekezlet hivatkozásának hozzáadása",
        "confirmAddLink": "Hozzáadható egy Jitsi hivatkozás az eseményhez?",
@@ -46,6 +65,7 @@
        "today": "Ma"
    },
    "chat": {
+        "enter": "Belépés a szobába",
        "error": "Hiba: az üzenetet nem sikerült elküldeni. Hiba oka: {{error}}",
        "fieldPlaceHolder": "Írja ide az üzenetét",
        "messageTo": "Privát üzenet a felhasználónak: {{recipient}}",
@@ -58,14 +78,21 @@
        "noMessagesMessage": "A találkozón még nincsenek üzenetek. Itt kezdhet beszélgetést!",
        "privateNotice": "Privát üzenet a felhasználónak: {{recipient}}",
        "sendButton": "Küldés",
+        "tabs": {
+            "chat": "Csevegés",
+            "polls": "Szavazás"
+        },
        "title": "Csevegés",
-        "titleWithPolls": "Csevegés",
-        "you": "neked"
+        "titleWithPolls": "Csevegés és szavazás",
+        "you": "te"
    },
    "chromeExtensionBanner": {
        "buttonText": "Chrome kiterjesztés telepítése",
        "dontShowAgain": "Ne jelenjen meg újra",
-        "installExtensionText": "Kiterjesztés telepítése a Google Calendar és az Office 365 integrációjához"
+        "installExtensionText": "Kiterjesztés telepítése a Google Calendar és az Office 365 integrációjához",
+        "raiseHandAction": "Kéz felemelése",
+        "reactionSounds": "Hangok kikapcsolása",
+        "reactionSoundsForAll": "Hangok kikapcsolása mindenkinek"
    },
    "connectingOverlay": {
        "joiningRoom": "Kapcsolódás az értekezlethez…"
@@ -189,12 +216,18 @@
        "dismiss": "Elutasítás",
        "displayNameRequired": "Helló! Mi a neve?",
        "done": "Kész",
-        "enterDisplayName": "Adja meg itt a nevét",
+        "e2eeDescription": "A végpontok közötti titkosítás jelenleg KÍSÉRLETES. Ne feledje, hogy a végpontok közötti titkosítás bekapcsolása hatékonyan letiltja a szerveroldali szolgáltatásokat, például: telefonos részvételt. Ne feledje azt is, hogy az értekezlet csak olyan felhasználók számára működik, akik olyan böngészőkből csatlakoznak, amelyek támogatják a beilleszthető adatfolyamokat.",
+        "e2eeLabel": "Végpontok közötti titkosítás engedélyezése",
+        "embedMeeting": "Meeting beágyazása",
+        "enterDisplayName": "Adja meg a nevét",
        "error": "Hiba",
        "externalInstallationMsg": "Telepíteni kell a munkaasztal megosztására való kiterjesztést.",
        "externalInstallationTitle": "Kiterjesztésre van szükség",
        "goToStore": "Ugrás az alkalmazásbolthoz",
        "gracefulShutdown": "Jelenleg a szolgáltatás karbantartás miatt nem elérhető. Később próbálja meg ismét.",
+        "grantModeratorDialog": "Biztos, hogy moderátori jogokat kíván adni a következőnek: {{participantName}}?",
+        "grantModeratorTitle": "Moderátori jogok megadása",
+        "hideShareAudioHelper": "Ne mutassa ezt az ablakot többé",
        "incorrectPassword": "Helytelen felhasználói név és jelszó",
        "incorrectRoomLockPassword": "Helytelen jelszó",
        "inlineInstallExtension": "Telepítés azonnal",
@@ -217,21 +250,34 @@
        "maxUsersLimitReached": "A lehetséges résztvevők maximális száma elérve. A konferencia tele van. Lépjen kapcsolatba az értekezlet tulajdonosával vagy próbálkozzon később!",
        "maxUsersLimitReachedTitle": "A lehetséges résztvevők maximális száma elérve",
        "micConstraintFailedError": "A mikrofon nem felel meg bizonyos kikötéseknek.",
-        "micNotFoundError": "Nem található mikrofon.",
+        "micNotFoundError": "A mikrofon nem található.",
        "micNotSendingData": "A számítógép beállításai között kell visszahangosítani a mikrofont vagy beállítani a hangfelvétel szintjét",
        "micNotSendingDataTitle": "A mikrofon le van némítva a rendszerbeállításokban",
        "micPermissionDeniedError": "Nem adott engedélyt a mikrofon használatához. Csatlakozhat a beszélgetéshez, de a többiek nem fogják Önt hallani. A címsorban lévő kamera ikonnal lehet ezt helyrehozni.",
        "micUnknownError": "Ismeretlen ok miatt nem lehet a mikrofont használni.",
+        "moderationAudioLabel": "Engedélyezze a résztvevőknek saját némításuk feloldását",
+        "moderationVideoLabel": "Engedélyezze a résztvevőknek saját kamerájuk elindítását",
        "muteEveryoneDialog": "Valóban mindenki elnémítható? Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
        "muteEveryoneElseDialog": "Némítás után már nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja hangosítani.",
        "muteEveryoneElseTitle": "Mindenki elnémítása, kivéve: {{whom}}?",
+        "muteEveryoneElsesVideoDialog": "A kamera letiltása után nem tudja újra bekapcsolni, de ők bármikor újra bekapcsolhatják.",
+        "muteEveryoneElsesVideoTitle": "Mindenki kamerájának tilátsa, kivéve {{whom}}?",
        "muteEveryoneSelf": "önmagamat",
        "muteEveryoneStartMuted": "Mindenki elnémítva kezd ezután",
        "muteEveryoneTitle": "Mindenki elnémítása?",
+        "muteEveryonesVideoDialog": "A résztvevők bármikor be tudják kapcsolni a kamerájukat.",
+        "muteEveryonesVideoDialogModerationOn": "A résztvevők bármikor kérhetik videójuk bekapcsolását.",
+        "muteEveryonesVideoTitle": "Minden résztvevő kameráját leállítja?",
        "muteParticipantBody": "Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
        "muteParticipantButton": "Némítás",
        "muteParticipantDialog": "Valóban elnémítható ez a résztvevő? Nem fogja tudni visszahangosítani, de ő önmagát bármikor vissza tudja majd hangosítani.",
        "muteParticipantTitle": "Elnémítható a résztvevő?",
+        "muteParticipantsVideoBody": "Ön nem tudja újra bekapcsolni a kamerát, de ők bármikor újra bekapcsolhatják.",
+        "muteParticipantsVideoButton": "Kamera leállítása",
+        "muteParticipantsVideoDialog": "Biztosan le akarja tiltani ennek a résztvevőnek a kameráját? Ön nem tudja újra bekapcsolni a kamerát, de ők bármikor újra bekapcsolhatják.",
+        "muteParticipantsVideoDialogModerationOn": "Are you sure you want to turn off this participant's camera? You won't be able to turn the camera back on and neither will they.",
+        "muteParticipantsVideoTitle": "Letiltja ennek a résztvevőnek a kameráját?",
+        "password": "Jelszó",
        "passwordLabel": "Az értekezletet zárolta egy résztvevő. Csatlakozáshoz adja meg a $t(lockRoomPassword).",
        "passwordNotSupported": "Az értekezlet $t(lockRoomPassword) beállítása nem támogatott.",
        "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) nem támogatott",
@@ -249,6 +295,7 @@
        "remoteControlShareScreenWarning": "Vegye figyelembe, hogy ha megnyomja az „Engedélyezés” lehetőséget, akkor megosztja a képernyőt!",
        "remoteControlStopMessage": "A távoli munkamenet irányítása befejeződött!",
        "remoteControlTitle": "Távoli asztal vezérlése",
+        "remoteUserControls": "{{username}} vezérlői",
        "removePassword": "$t(lockRoomPassword) eltávolítása",
        "removeSharedVideoMsg": "Valóban eltávolítható a megosztott videó?",
        "removeSharedVideoTitle": "Megosztott videó eltávolítása",
@@ -267,11 +314,14 @@
        "sendPrivateMessageTitle": "Privátban legyen elküldve?",
        "serviceUnavailable": "Szolgáltatás nem elérhető",
        "sessTerminated": "Hívás megszakadt",
+        "shareAudio": "Tovább",
+        "shareAudioTitle": "Hang megosztása",
        "shareVideoLinkError": "Adjon meg egy helyes linket.",
        "shareVideoTitle": "Videó megosztása",
        "shareYourScreen": "Képernyő megosztása",
        "shareYourScreenDisabled": "Képernyőmegosztás letiltva.",
        "shareYourScreenDisabledForGuest": "Vendég nem végezhet képernyőmegosztást.",
+        "sharedVideoLinkPlaceholder": "YouTube link vagy közvetlen videó link",
        "startLiveStreaming": "Élő közvetítés kezdése",
        "startRecording": "Felvétel indítása",
        "startRemoteControlErrorMessage": "Hiba történt a távoli vezérlés munkamenetének indítása közben!",
@@ -287,6 +337,7 @@
        "transcribing": "Átirat készítése",
        "unlockRoom": "Értekezlet $t(lockRoomPassword) eltávolítása",
        "userPassword": "felhasználói jelszó",
+        "videoLink": "Videó link",
        "yourEntireScreen": "A teljes képernyő"
    },
    "documentSharing": {
@@ -367,11 +418,16 @@
        "showSpeakerStats": "Beszéd statisztikák megjelenítése",
        "toggleChat": "Csevegés megnyitása vagy bezárása",
        "toggleFilmstrip": "Videó bélyegképek megjelenítése vagy elrejtése",
+        "toggleParticipantsPane": "A résztvevők panel megjelenítése vagy elrejtése",
        "toggleScreensharing": "Váltás kamera és képernyőmegosztás között",
        "toggleShortcuts": "Gyorsbillentyűk megjelenítése vagy elrejtése",
        "videoMute": "Kamera elindítása vagy leállítása",
        "videoQuality": "Hívás minőségének kezelése"
    },
+    "largeVideo": {
+        "screenIsShared": "Ön megosztja a képernyőjét",
+        "showMeWhatImSharing": "Látni szeretném mit osztok meg"
+    },
    "liveStreaming": {
        "busy": "Dolgozunk a közvetítési erőforrások felszabadításán. Kísérelje meg újra néhány perc múlva.",
        "busyTitle": "Jelenleg minden közvetítő foglalt",
@@ -405,6 +461,44 @@
        "unavailableTitle": "Élő közvetítés elérhetetlen",
        "youtubeTerms": "YouTube szolgáltatási feltételek"
    },
+    "lobby": {
+        "admit": "Engedélyezés",
+        "admitAll": "Mindet engedélyez",
+        "allow": "Engedélyez",
+        "backToKnockModeButton": "Csatlakozási kérelem küldése",
+        "chat": "Chat",
+        "dialogTitle": "Lobby mód",
+        "disableDialogContent": "A lobby mód jelenleg elérhető. Lehetőséged van csak azokat behívni a megbeszélésre, akik erre jogosultak általad. Szeretnéd kikapcsolni?",
+        "disableDialogSubmit": "Elutasítás",
+        "emailField": "Írd be az email címed",
+        "enableDialogPasswordField": "Jelszó megadása (választható)",
+        "enableDialogSubmit": "Elfogadás",
+        "enableDialogText": "A Lobby mód lehetővé teszi a megbeszélés védelmét azáltal, hogy csak a moderátor hivatalos jóváhagyása után engedi be az embereket.",
+        "enterPasswordButton": "Adja meg az értekezlet jelszavát",
+        "enterPasswordTitle": "Adja meg a jelszót az értekezlethez való csatlakozáshoz",
+        "errorMissingPassword": "Kérjük, adja meg az értekezlet jelszavát",
+        "invalidPassword": "Helytelen jelszó",
+        "joinRejectedMessage": "Csatlakozási kérelmét egy moderátor elutasította.",
+        "joinRejectedTitle": "Csatlakozási kérelem elutasítva.",
+        "joinTitle": "Csatlakozás az értekezlethez",
+        "joinWithPasswordMessage": "Csatlakozás jelszóval, kérjük várjon...",
+        "joiningMessage": "Amint valaki elfogadja kérését, csatlakoztatjuk az értekezlethez",
+        "joiningTitle": "Értekezlethez csatlakozás kérése...",
+        "joiningWithPasswordTitle": "Csatlakozás jelszóval...",
+        "knockButton": "Csatlakozási kérelem küldése",
+        "knockTitle": "Valaki szeretne csatlakozni az értekezlethez",
+        "nameField": "Adja meg a nevét",
+        "notificationLobbyAccessDenied": "{{targetParticipantName}} elutasításra került a csatlakozásod {{originParticipantName}} által",
+        "notificationLobbyAccessGranted": "{{targetParticipantName}} a csatlakozozásod elfogadva lett {{originParticipantName}} által",
+        "notificationLobbyDisabled": "Lobby tiltva lett {{originParticipantName}} által.",
+        "notificationLobbyEnabled": "Lobby engedélyezve lett {{originParticipantName}} által.",
+        "notificationTitle": "Lobby",
+        "passwordField": "Adja meg az értekezlet jelszavát",
+        "passwordJoinButton": "Csatlakozás",
+        "reject": "Elutasít",
+        "rejectAll": "Mindet elutasít",
+        "toggleLabel": "Lobby engedélyezése"
+    },
    "localRecording": {
        "clientState": {
            "off": "Kikapcsolva",
@@ -449,11 +543,18 @@
        "focus": "Konferencia fókusza",
        "focusFail": "{{component}} nem elérhető – újrapróbálkozás {{ms}} másodperc múlva",
        "grantedTo": "Moderátori jogok biztosítva {{to}} számára!",
+        "hostAskedUnmute": "Kérlek hangosítsd vissza a mikrofonod.",
        "invitedOneMember": "{{name}} meg lett hívva",
        "invitedThreePlusMembers": "{{name}} és {{count}} másik felhasználó meg lett hívva",
        "invitedTwoMembers": "{{first}} és {{second}} lett meghívva",
        "kickParticipant": "{{kicked}} résztvevőt kirúgta {{kicker}}",
+        "leftOneMember": "{{name}} elhagyta az értekezletet",
+        "leftThreePlusMembers": "{{name}} és mások elhagyták az értekezletet",
+        "leftTwoMembers": "{{first}} és {{second}} elhagyták az értekezletet",
+        "localRecordingStarted": "{{name}} elkezdte rögzíteni az értekezletet.",
+        "localRecordingStopped": "{{name}} leállította a rögzítést.",
        "me": "Én",
+        "moderationInEffectTitle": "A moderátor elnémította a mikrofonját",
        "moderator": "Moderátori jogok biztosítva!",
        "muted": "A beszélgetést elnémítva kezdte meg.",
        "mutedRemotelyDescription": "Bármikor visszahangosíthatja magát, ha készen áll a beszédre. Némítsa le magát ismét, ha a felesleges zajoktól meg kívánja védeni az értekezletet.",
@@ -462,6 +563,10 @@
        "newDeviceAction": "Alkalmaz",
        "newDeviceAudioTitle": "Új hangeszköz észlelve",
        "newDeviceCameraTitle": "Új kamera észlelve",
+        "noiseSuppressionFailedTitle": "Nem sikerült elindítani a zajcsökkentést",
+        "noiseSuppressionNoTrackDescription": "Kérjük, először kapcsolja ki a mikrofon némítását.",
+        "noiseSuppressionStereoDescription": "A sztereó zajcsökkentés jelenleg nem támogatott.",
+        "participantWantsToJoin": "Csatlakozni szeretne az értekezlethez",
        "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) egy másik résztvevő által eltávolítva",
        "passwordSetRemotely": "$t(lockRoomPasswordUppercase) egy másik résztvevő által beállítva",
        "raisedHand": "{{name}} beszélni szeretne.",
@@ -472,9 +577,115 @@
        "suboptimalExperienceTitle": "Böngészőhiba",
        "unmute": "Visszahangosítás"
    },
+    "participantsPane": {
+        "actions": {
+            "allow": "Engedélyezés a résztvevőknek, hogy:",
+            "allowVideo": "Videó engedélyezése",
+            "askUnmute": "Kérje a némítás feloldását",
+            "audioModeration": "A némítást feloldhassák",
+            "blockEveryoneMicCamera": "Block everyone's mic and camera",
+            "invite": "Meghívás",
+            "moreModerationActions": "További moderálási opciók",
+            "moreModerationControls": "További moderálási vezérlők",
+            "moreParticipantOptions": "Résztvevő további beállításai",
+            "mute": "Némítás",
+            "muteAll": "Mindenkit elnémít",
+            "muteEveryoneElse": "Mute everyone else",
+            "stopEveryonesVideo": "Mindenki videójának leállítása",
+            "stopVideo": "Videó leállítása",
+            "unblockEveryoneMicCamera": "Unblock everyone's mic and camera",
+            "videoModeration": "Elindíthassák a videójukat"
+        },
+        "close": "Bezár",
+        "header": "Résztvevők",
+        "headings": {
+            "lobby": "Lobby ({{count}})",
+            "participantsList": "Résztvevők ({{count}})",
+            "waitingLobby": "Lobby-ban várakozók ({{count}})"
+        },
+        "search": "Résztvevők keresése"
+    },
    "passwordDigitsOnly": "Legfeljebb {{number}} szám",
    "passwordSetRemotely": "egy másik résztvevő által beállítva",
+    "polls": {
+        "answer": {
+            "skip": "Kihagyás",
+            "submit": "Küldés"
+        },
+        "by": "Létrehozta: {{ name }}",
+        "create": {
+            "addOption": "Opció hozzáadása",
+            "answerPlaceholder": "Opció {{index}}",
+            "cancel": "Mégsem",
+            "create": "Szavazás létrehozása",
+            "pollOption": "Opció {{index}}",
+            "pollQuestion": "Szavazás kérdése",
+            "questionPlaceholder": "Írja le a kérdést",
+            "removeOption": "Opció eltávolítása",
+            "send": "Küldés"
+        },
+        "notification": {
+            "description": "Szavazás megnyitása",
+            "title": "Új szavazás létrehozva"
+        },
+        "results": {
+            "changeVote": "Módosítás",
+            "empty": "Még nincsenek szavazások. Indítson szavazást itt!",
+            "hideDetailedResults": "Részletek elrejtése",
+            "showDetailedResults": "Részletek",
+            "vote": "Szavazás"
+        }
+    },
    "poweredby": "Működteti a",
+    "prejoin": {
+        "audioAndVideoError": "Hang és videó hiba:",
+        "audioDeviceProblem": "Hiba lépett fel az hangeszközzel",
+        "audioOnlyError": "Hang hiba:",
+        "audioTrackError": "Nem lehet a hangot rögzíteni.",
+        "callMe": "Hívj fel",
+        "callMeAtNumber": "Hívj fel ezen a számon:",
+        "calling": "Hívás",
+        "configuringDevices": "Eszköz beállítás...",
+        "connectedWithAudioQ": "Csak hanggal szeretne csatlakozni?",
+        "connection": {
+            "good": "Az internet kapcsolat jónak tűnik!",
+            "nonOptimal": "Az internet kapcsolat nem optimális",
+            "poor": "Az internet kapcsolat nagyon gyenge!"
+        },
+        "connectionDetails": {
+            "goodQuality": "Fantasztikus! A média minősége kiváló lesz."
+        },
+        "copyAndShare": "Másolom és megosztom az értekezlet linkjét",
+        "dialInMeeting": "Behívás az értekezletbe",
+        "dialInPin": "Behívás az értkezeletbe és megadom a PIN kódot:",
+        "dialing": "Tárcsázás",
+        "doNotShow": "Ne mutassa mégegyszer ezt a képernyőt",
+        "errorDialOut": "Nem sikerült a behívás",
+        "errorDialOutDisconnected": "Nem sikerült a behívás. Kapcsolat bontása",
+        "errorDialOutFailed": "Nem sikerült a behívás. Hiba a hívásban",
+        "errorDialOutStatus": "Hiba a hívás státusz megadásában",
+        "errorMissingName": "Kérlet add meg a neved, hogy csatlakozhass a megbeszéléshez",
+        "errorNoPermissions": "Engedélyeznie kell a mikrofonhoz és a kamerához való hozzáférést",
+        "errorStatusCode": "Hiba a hiváskor, hiba kód: {{status}}",
+        "errorValidation": "Hívószám validációs hiba",
+        "iWantToDialIn": "Hívni szeretném",
+        "initiated": "Hívás felépítés",
+        "joinAudioByPhone": "Csatlakozás telefon beszélgetéssel",
+        "joinMeeting": "Csatlakozás",
+        "joinMeetingInLowBandwidthMode": "Csatlakozás alacsony sávszélességi módban",
+        "joinWithoutAudio": "Csatlakozás hang nélkül",
+        "keyboardShortcuts": "Gyorsbillentyűk engedélyezése",
+        "linkCopied": "A link a vágólapra másolva",
+        "lookGood": "A mikrofon megfelelően működik",
+        "or": "vagy",
+        "premeeting": "Csatlakozás előtt",
+        "screenSharingError": "Képernyő megosztás hiba:",
+        "showScreen": "Csatlakozás előtti kamerakép",
+        "startWithPhone": "Kezdés telefonhanggal",
+        "videoOnlyError": "Videó hiba:",
+        "videoTrackError": "Nem sikerült a videó megjelenítés.",
+        "viewAllNumbers": "Összes szám megjelenítése"
+    },
    "presenceStatus": {
        "busy": "Foglalt",
        "calling": "Hívás…",
@@ -509,13 +720,19 @@
        "failedToStart": "A felvétel indítása meghiúsult",
        "fileSharingdescription": "Felvétel megosztása az értekezlet résztvevőivel",
        "live": "ÉLŐ",
+        "localRecordingNoNotificationWarning": "A felvételt nem közöljük más résztvevőkkel. Értesítenie kell velük, hogy a találkozót rögzítették.",
+        "localRecordingStartWarning": "A megbeszélésből való kilépés előtt feltétlenül állítsa le a felvételt, hogy elmentse azt.",
+        "localRecordingStartWarningTitle": "Állítsa le a felvételt a mentéshez",
+        "localRecordingWarning": "Győződjön meg arról, hogy az aktuális lapot választotta a megfelelő videó és hang használatához. A felvétel jelenleg 1 GB-ra van korlátozva, ami körülbelül 100 perc.",
        "loggedIn": "Belépve mint {{userName}}",
        "off": "Felvétel leállítva",
        "offBy": "{{name}} leállította a felvételt",
        "on": "Felvétel",
        "onBy": "{{name}} elindította a felvételt",
+        "onlyRecordSelf": "Csak az én hang- és videófolyamomat rögzítse",
        "pending": "Értekezlet rögzítésének előkészítése…",
        "rec": "REC",
+        "saveLocalRecording": "Felvétel mentése helyileg (béta)",
        "serviceDescription": "A felvételt a rögzítési szolgáltatás veszi fel",
        "serviceName": "Felvétel szolgáltatás",
        "signIn": "Belépés",
@@ -527,6 +744,12 @@
    "sectionList": {
        "pullToRefresh": "Húzás a frissítéshez"
    },
+    "security": {
+        "about": "Hozzáadhat jelszót az értekezlethez. A résztvevőknek meg kell adniuk a jelszót, mielőtt csatlakozhatnak az értekezlethez.",
+        "aboutReadOnly": "A moderátor résztvevői hozzáadhatnak egy jelszót az értekezlethez. A résztvevőknek meg kell adniuk a jelszót, mielőtt csatlakozhatnak az értekezlethez.",
+        "header": "Biztonsági beállítások",
+        "insecureRoomNameWarning": "The room name is unsafe. Unwanted participants may join your conference. Consider securing your meeting using the security button."
+    },
    "settings": {
        "calendar": {
            "about": "A {{appName}} naptárintegráció a naptár biztonságos elérésére szolgál, így olvasni tudja a soron következő eseményeket.",
@@ -535,8 +758,13 @@
            "signedIn": "Jelenleg ehhez az címhez tartozó naptár eseményei érhetőek el: {{email}}. Alább a „szétkapcsolás” gombra kattintva lehet leállítani a naptár eseményeinek elérését.",
            "title": "Naptár"
        },
+        "desktopShareFramerate": "Képernyőmegosztás sebessége (FPS)",
+        "desktopShareHighFpsWarning": "A nagyobb képkockasebesség az asztali megosztásnál hatással lehet a sávszélességre. Az új beállítások érvénybe léptetéséhez újra kell indítania a képernyőmegosztást.",
+        "desktopShareWarning": "Az új beállítások érvénybe léptetéséhez újra kell indítania a képernyőmegosztást.",
        "devices": "Eszközök",
        "followMe": "Mindenki engem kövessen",
+        "framesPerSecond": "képkocka / másodperc",
+        "incomingMessage": "Bejövő üzenet",
        "language": "Nyelv",
        "loggedIn": "Belépve mint {{name}}",
        "microphones": "Mikrofonok",
@@ -544,12 +772,22 @@
        "more": "Továbbiak",
        "name": "Név",
        "noDevice": "Nincs",
+        "participantJoined": "Résztvevő csatlakozott",
+        "participantKnocking": "Résztvevő belépett a lobby-ba",
+        "participantLeft": "Résztvevő kilépett",
+        "playSounds": "Hangok lejátszása a következőkhöz:",
+        "reactions": "Meeting reakciók",
+        "sameAsSystem": "Rendszerhang ({{label}})",
        "selectAudioOutput": "Hangkimenet",
        "selectCamera": "Kamera",
        "selectMic": "Mikrofon",
+        "selfView": "Saját kép",
+        "sounds": "Hangok",
        "speakers": "Hangszórók",
        "startAudioMuted": "Mindenki elnémítva kezd",
+        "startReactionsMuted": "Reakció hangok némítása mindenki számára",
        "startVideoMuted": "Mindenki videó nélkül kezd",
+        "talkWhileMuted": "Lenémított beszéd",
        "title": "Beállítások"
    },
    "settingsView": {
@@ -577,14 +815,23 @@
    },
    "speaker": "Hangszóró",
    "speakerStats": {
+        "angry": "Mérges",
+        "disgusted": "Felháborodott",
+        "fearful": "Félelmetes",
+        "happy": "Boldog",
        "hours": "{{count}} h",
        "minutes": "{{count}} perc",
        "name": "Név",
+        "neutral": "Semleges",
+        "sad": "Szomorú",
+        "search": "Keresés",
        "seconds": "{{count}} mp",
        "speakerStats": "Beszélő statisztika",
-        "speakerTime": "Beszélő ideje"
+        "speakerTime": "Beszélő ideje",
+        "surprised": "Meglepett"
    },
    "startupoverlay": {
+        "genericTitle": "Az értekezlethez engedélyezni kell a mikrofont és kamerát.",
        "policyText": " ",
        "title": "A {{app}} használni szeretné a mikrofont és a kamerát."
    },
@@ -599,36 +846,49 @@
            "Settings": "Beállítások átváltása",
            "audioOnly": "Csak a hang átváltása",
            "audioRoute": "Hangeszköz kijelölése",
+            "boo": "Szomorú",
            "callQuality": "Videóminőség kezelése",
            "cc": "Feliratok átváltása",
            "chat": "Csevegés ablak átváltása",
+            "clap": "Taps",
            "document": "Megosztott dokumentum átváltása",
            "download": "Alkalmazás letöltése",
+            "embedMeeting": "Meeting beágyazása",
            "feedback": "Visszajelzés küldése",
            "fullScreen": "Teljes képernyő átváltása",
+            "grantModerator": "Moderátori jogok megadása",
            "hangup": "Beszélgetés elhagyása",
            "help": "Súgó",
            "invite": "Személyek meghívása",
            "kick": "Résztvevő kirúgása",
+            "laugh": "Nevetés",
+            "like": "Hüvelykujj fel",
            "localRecording": "Helyi felvétel vezérlőelemeinek átváltása",
            "lockRoom": "Értekezlet jelszavának átváltása",
-            "moreActions": "További műveltek menü átváltása",
-            "moreActionsMenu": "További műveltek menü",
+            "moreActions": "További műveletek menü átváltása",
+            "moreActionsMenu": "További műveletek menü",
            "moreOptions": "További beállítások megjelenítése",
            "mute": "Hang némításának átváltása",
            "muteEveryone": "Mindenki elnémítása",
+            "muteEveryonesVideoStream": "Mindenki videójának leállítása",
+            "noiseSuppression": "Zajcsökkentés",
+            "participants": "Résztvevők",
            "pip": "Kép és képben mód átváltása",
            "privateMessage": "Privát üzenet küldése",
            "profile": "Adja meg a profilját",
            "raiseHand": "Kéz felemelésének átváltása",
            "recording": "Felvétel átváltása",
            "remoteMute": "Résztvevők némítása",
+            "security": "Biztonsági Beállítások",
            "shareRoom": "Valaki meghívása",
            "shareYourScreen": "Képernyőmegosztás átváltása",
+            "shareaudio": "Hang megosztása",
            "sharedvideo": "Videó megosztásának átváltása",
            "shortcuts": "Gyorsbillentyűk átváltása",
            "show": "Megjelenítés a színpadon",
+            "silence": "Néma",
            "speakerStats": "Beszélő statisztika átváltása",
+            "surprised": "Meglepett",
            "tileView": "Mozaikos nézet átváltása",
            "toggleCamera": "Kamera átváltása",
            "toggleFilmstrip": "Filmszalag átváltása",
@@ -639,13 +899,18 @@
        "audioOnlyOff": "Alacsony sávszélességű mód letiltása",
        "audioOnlyOn": "Alacsony sávszélességű mód engedélyezése",
        "audioRoute": "Hangeszköz kijelölése",
+        "audioSettings": "Hangbeállítások",
        "authenticate": "Hitelesítés",
+        "boo": "Szomorú",
        "callQuality": "Videominőség kezelése",
        "chat": "Csevegés megnyitása / bezárása",
+        "clap": "Taps",
        "closeChat": "Csevegés bezárása",
+        "disableReactionSounds": "Kikapcsolhatja a reakcióhangokat a Meeting-en",
        "documentClose": "Megosztott dokumentum bezárása",
        "documentOpen": "Megosztott dokumentum megnyitása",
        "download": "Alkalmazás letöltése",
+        "embedMeeting": "Meeting beágyazása",
        "enterFullScreen": "Teljes képernyős megtekintés",
        "enterTileView": "Mozaikos nézet indítása",
        "exitFullScreen": "Kilépés a teljes képernyőből",
@@ -654,6 +919,10 @@
        "hangup": "Kilépés",
        "help": "Súgó",
        "invite": "Személyek meghívása",
+        "joinBreakoutRoom": "Csatlakozás a pihenőszobához",
+        "laugh": "Nevetés",
+        "leaveBreakoutRoom": "Pihenőszoba elhagyása",
+        "like": "Hüvelykujj fel",
        "login": "Bejelentkezés",
        "logout": "Kijelentkezés",
        "lowerYourHand": "Kéz leengedése",
@@ -666,28 +935,42 @@
        "noAudioSignalDialInDesc": "Be is tárcsázhat:",
        "noAudioSignalDialInLinkDesc": "Betárcsázási számok",
        "noAudioSignalTitle": "Nincs bemenet a mikrofonjáról!",
+        "noiseSuppression": "Zajcsökkentés",
        "noisyAudioInputDesc": "Úgy tűnik, hogy ez a mikrofon zajos. Le kellene némítani vagy cserélni az eszközt.",
        "noisyAudioInputTitle": "Zajosnak tűnik a mikrofonja!",
        "openChat": "Csevegés megnyitása",
+        "participants": "Résztvevők",
        "pip": "Belépés kép a képben módba",
        "privateMessage": "Privát üzenet küldése",
        "profile": "Adja meg a profilját",
        "raiseHand": "Kéz felemelése / leengedése",
        "raiseYourHand": "Kéz felemelése",
+        "reactionBoo": "Boo reakció küldése",
+        "reactionClap": "Tapsolás reakció küldése",
+        "reactionLaugh": "Nevetés reakció küldése",
+        "reactionLike": "Hüvelykujj fel reakció küldése",
+        "reactionSilence": "Néma arc reakció küldése",
+        "reactionSurprised": "Meglepett reakció küldése",
+        "security": "Biztonsági Beállítások",
+        "selectBackground": "Háttér beállítása",
        "shareRoom": "Valaki meghívása",
+        "shareaudio": "Hang megosztása",
        "sharedvideo": "Videó megosztása",
        "shortcuts": "Gyorsbillentyűk megtekintése",
+        "silence": "Néma",
        "speakerStats": "Beszélő statisztika",
        "startScreenSharing": "Képernyőmegosztás kezdése",
        "startSubtitles": "Feliratok kezdése",
        "startvideoblur": "Háttér elhomályosítása",
        "stopScreenSharing": "Képernyőmegosztás leállítása",
-        "stopSharedVideo": "Videó leállítása",
+        "stopSharedVideo": "Kamera leállítása",
        "stopSubtitles": "Felirat leállítása",
        "stopvideoblur": "Háttér elhomályosításának letiltása",
+        "surprised": "Meglepett",
        "talkWhileMutedPopup": "Úgy tűnik beszélni szeretne, de le van némítva.",
        "tileViewToggle": "Mozaikos nézet átváltása",
        "toggleCamera": "Kamera átváltása",
+        "videoSettings": "Videóbeállítások",
        "videomute": "Kamera indítása / leállítása"
    },
    "transcribing": {
@@ -725,12 +1008,15 @@
        "pending": "{{displayName}} -t meghívta"
    },
    "videoStatus": {
+        "adjustFor": "Igazítsa a legjobb:",
        "audioOnly": "CsH",
        "audioOnlyExpanded": "Jelenleg az alacsony sávszélességű mód az aktív, vagyis csak hangot lehet fogadni és képernyőmegosztást.",
+        "bestPerformance": "Teljesítményhez",
        "callQuality": "Videominőség",
        "hd": "MF",
        "hdTooltip": "Magas felbontású videó megtekintése",
        "highDefinition": "Magas felbontású",
+        "highestQuality": "Minőséghez",
        "labelTooiltipNoVideo": "Nincs videó",
        "labelTooltipAudioOnly": "Alacsony sávszélességű mód aktiválva",
        "ld": "AF",
@@ -738,6 +1024,7 @@
        "lowDefinition": "Alacsony felbontású",
        "onlyAudioAvailable": "„Csak hang” mód elérhető",
        "onlyAudioSupported": "Csak a hang támogatott ebben a böngészőben.",
+        "performanceSettings": "Teljesítménybeállítások",
        "sd": "SF",
        "sdTooltip": "Szabványos felbontású videó megtekintése",
        "standardDefinition": "Szabványos felbontású"
@@ -745,7 +1032,10 @@
    "videothumbnail": {
        "domute": "Némítás",
        "domuteOthers": "Mindenki más elnémítása",
+        "domuteVideoOfOthers": "Mindenki más kamerájának letiltása",
        "flip": "Tükrözés",
+        "grantModerator": "Moderátori jogok megadása",
+        "hideSelfView": "Saját kép elrejtése",
        "kick": "Kirúgás",
        "moderator": "Moderátor",
        "mute": "A résztvevő le van némítva",
@@ -754,6 +1044,29 @@
        "show": "Megjelenítés a színpadon",
        "videomute": "A résztvevő leállította a kameráját"
    },
+    "virtualBackground": {
+        "addBackground": "Háttér hozzáadása",
+        "apply": "Alkalmaz",
+        "backgroundEffectError": "Hiba a háttér effekt hozzáadásnál.",
+        "blur": "Elmosódott",
+        "deleteImage": "Delete image",
+        "desktopShare": "Asztal megosztása",
+        "desktopShareError": "Nem lehet asztalt megosztani",
+        "image1": "Tengerpart",
+        "image2": "Fehér semleges fal",
+        "image3": "Fehér üres szoba",
+        "image4": "Fekete állólámpa",
+        "image5": "Hegy",
+        "image6": "Erdő",
+        "image7": "Napfelkelte",
+        "none": "Nincs",
+        "pleaseWait": "Kérjük várjon...",
+        "removeBackground": "Háttér eltávolítása",
+        "slightBlur": "Enyhén elmosódott",
+        "title": "Virtuális háttérképek",
+        "uploadedImage": "Feltöltött kép {{index}}"
+    },
+    "volumeSlider": "Hangerő szabályzó",
    "welcomepage": {
        "accessibilityLabel": {
            "join": "Koppintson a csatlakozáshoz",
@@ -771,17 +1084,20 @@
        "getHelp": "Segítség kérése",
        "go": "Indítás",
        "goSmall": "Indítás",
+        "headerSubtitle": "Biztonságos és magas színvonalú konferenciák",
        "info": "Információ",
+        "jitsiOnMobile": "Jitsi Mobil – töltse le az app-ot, és indítson megbeszélést bárhonnan",
        "join": "LÉTREHOZ /HOZZÁAD",
        "privacy": "Adatvédelem",
        "recentList": "Legutóbbi",
-        "recentListDelete": "Törlés",
+        "recentListDelete": "Lista törlés",
        "recentListEmpty": "A legutóbbi lista jelenleg üres. Csevegjen a csapattal és minden előző értekezlet itt lesz megtalálható.",
        "reducedUIText": "Üdvözlet a {{app}} programban!",
        "roomNameAllowedChars": "Az értekezlet neve nem tartalmazhatja a következő karaktereket: ?, &, :, ', \", %, #.",
        "roomname": "Adja meg a szoba nevét",
        "roomnameHint": "Adja meg a kívánt nevet vagy URL-t, amelyhez csatlakozni szeretne. Bármiképp elnevezheti, csak ossza meg az értekezlet résztvevőivel, hogy ők ugyanezt a nevet tudják majd megadni.",
        "sendFeedback": "Visszajelzés küldése",
+        "startMeeting": "Csatlakozás",
        "terms": "Feltételek",
        "title": "Biztonságos, maradéktalanul felszerelt és teljesen ingyenes videokonferencia"
    }
--- a/lang/main.json
+++ b/lang/main.json
@@ -511,7 +511,7 @@
        "mute": "Mute or unmute your microphone",
        "pushToTalk": "Push to talk",
        "raiseHand": "Raise or lower your hand",
-        "showSpeakerStats": "Show speaker stats",
+        "showSpeakerStats": "Show participants stats",
        "toggleChat": "Open or close the chat",
        "toggleFilmstrip": "Show or hide video thumbnails",
        "toggleParticipantsPane": "Show or hide the participants pane",
@@ -563,7 +563,6 @@
    "lobby": {
        "admit": "Admit",
        "admitAll": "Admit all",
-        "allow": "Allow",
        "backToKnockModeButton": "Ask to join",
        "chat": "Chat",
        "dialogTitle": "Lobby mode",
@@ -1038,7 +1037,7 @@
        "sad": "Sad",
        "search": "Search",
        "seconds": "{{count}}s",
-        "speakerStats": "Speaker Stats",
+        "speakerStats": "Participants Stats",
        "speakerTime": "Speaker Time",
        "surprised": "Surprised"
    },
@@ -1119,7 +1118,7 @@
            "shortcuts": "Toggle shortcuts",
            "show": "Show on stage",
            "silence": "Silence",
-            "speakerStats": "Toggle speaker statistics",
+            "speakerStats": "Toggle participants statistics",
            "surprised": "Surprised",
            "tileView": "Toggle tile view",
            "toggleCamera": "Toggle camera",
@@ -1206,7 +1205,7 @@
        "shortcuts": "View shortcuts",
        "showWhiteboard": "Show whiteboard",
        "silence": "Silence",
-        "speakerStats": "Speaker stats",
+        "speakerStats": "Participants stats",
        "startScreenSharing": "Start screen sharing",
        "startSubtitles": "Subtitles • {{language}}",
        "stopAudioSharing": "Stop audio sharing",
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
        "@giphy/react-components": "5.6.0",
        "@giphy/react-native-sdk": "1.7.0",
        "@hapi/bourne": "2.0.0",
-        "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
+        "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
        "@jitsi/js-utils": "2.0.4",
        "@jitsi/logger": "2.0.0",
        "@jitsi/rnnoise-wasm": "0.1.0",
@@ -55,7 +55,7 @@
        "@types/w3c-image-capture": "1.0.6",
        "@vladmandic/human": "2.6.5",
        "@vladmandic/human-models": "2.5.9",
-        "@xmldom/xmldom": "0.7.6",
+        "@xmldom/xmldom": "0.7.9",
        "amplitude-js": "8.2.1",
        "base64-js": "1.3.1",
        "bc-css-flags": "3.0.0",
@@ -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/v1538.0.0+871968af/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1541.0.0+9b34e0f7/lib-jitsi-meet.tgz",
        "lodash": "4.17.21",
        "moment": "2.29.4",
        "moment-duration-format": "2.2.2",
@@ -3746,9 +3746,9 @@
      }
    },
    "node_modules/@jitsi/excalidraw": {
-      "version": "0.0.11",
-      "resolved": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
-      "integrity": "sha512-R0om5mYmjjozmJ6i5PXPSQy8/kiMTCqk/QVxOVryEUlHps4UeLNx+Gb/tjzNBN/C6db6ea+Vxt/l27nh9frphg==",
+      "version": "0.0.12",
+      "resolved": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
+      "integrity": "sha512-WFzaH5GCZLA5DTSZ6ReqAz9g53mSgi+211zTC7AFZUYZme5tzKpPg55AKkJZA3ZIRikkbKaEfP/dC4QOH5NMmA==",
      "license": "MIT",
      "peerDependencies": {
        "react": "^17.0.2",
@@ -7349,9 +7349,9 @@
      }
    },
    "node_modules/@xmldom/xmldom": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz",
-      "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ==",
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.9.tgz",
+      "integrity": "sha512-yceMpm/xd4W2a85iqZyO09gTnHvXF6pyiWjD2jcOJs7hRoZtNNOO1eJlhHj1ixA+xip2hOyGn+LgcvLCMo5zXA==",
      "engines": {
        "node": ">=10.0.0"
      }
@@ -13497,8 +13497,8 @@
    },
    "node_modules/lib-jitsi-meet": {
      "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1538.0.0+871968af/lib-jitsi-meet.tgz",
-      "integrity": "sha512-Nd6r6BWQXUE46lnXCtIa/kZoROBQN1Cbn5FEswrFBxhZ0/+JFpsMAwrNa/HThaNsGYkgN7fPoP4Xlq5r/M2o4Q==",
+      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1541.0.0+9b34e0f7/lib-jitsi-meet.tgz",
+      "integrity": "sha512-A+QkH3v0XzLSxumHC7LHWXLmFHTqrJ/1YCbWFd/eHjDGXVyFCPeazYBpsNdGZMHfEBzG9FLdQCEOxyzBY7yIAA==",
      "license": "Apache-2.0",
      "dependencies": {
        "@jitsi/js-utils": "2.0.0",
@@ -23178,8 +23178,8 @@
      "dev": true
    },
    "@jitsi/excalidraw": {
-      "version": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
-      "integrity": "sha512-R0om5mYmjjozmJ6i5PXPSQy8/kiMTCqk/QVxOVryEUlHps4UeLNx+Gb/tjzNBN/C6db6ea+Vxt/l27nh9frphg=="
+      "version": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
+      "integrity": "sha512-WFzaH5GCZLA5DTSZ6ReqAz9g53mSgi+211zTC7AFZUYZme5tzKpPg55AKkJZA3ZIRikkbKaEfP/dC4QOH5NMmA=="
    },
    "@jitsi/js-utils": {
      "version": "2.0.4",
@@ -25794,9 +25794,9 @@
      "dev": true
    },
    "@xmldom/xmldom": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz",
-      "integrity": "sha512-HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ=="
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.9.tgz",
+      "integrity": "sha512-yceMpm/xd4W2a85iqZyO09gTnHvXF6pyiWjD2jcOJs7hRoZtNNOO1eJlhHj1ixA+xip2hOyGn+LgcvLCMo5zXA=="
    },
    "@xobotyi/scrollbar-width": {
      "version": "1.9.5",
@@ -30510,8 +30510,8 @@
      }
    },
    "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1538.0.0+871968af/lib-jitsi-meet.tgz",
-      "integrity": "sha512-Nd6r6BWQXUE46lnXCtIa/kZoROBQN1Cbn5FEswrFBxhZ0/+JFpsMAwrNa/HThaNsGYkgN7fPoP4Xlq5r/M2o4Q==",
+      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1541.0.0+9b34e0f7/lib-jitsi-meet.tgz",
+      "integrity": "sha512-A+QkH3v0XzLSxumHC7LHWXLmFHTqrJ/1YCbWFd/eHjDGXVyFCPeazYBpsNdGZMHfEBzG9FLdQCEOxyzBY7yIAA==",
      "requires": {
        "@jitsi/js-utils": "2.0.0",
        "@jitsi/logger": "2.0.0",
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
    "@giphy/react-components": "5.6.0",
    "@giphy/react-native-sdk": "1.7.0",
    "@hapi/bourne": "2.0.0",
-    "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.11/jitsi-excalidraw-0.0.11.tgz",
+    "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.12/jitsi-excalidraw-0.0.12.tgz",
    "@jitsi/js-utils": "2.0.4",
    "@jitsi/logger": "2.0.0",
    "@jitsi/rnnoise-wasm": "0.1.0",
@@ -60,7 +60,7 @@
    "@types/w3c-image-capture": "1.0.6",
    "@vladmandic/human": "2.6.5",
    "@vladmandic/human-models": "2.5.9",
-    "@xmldom/xmldom": "0.7.6",
+    "@xmldom/xmldom": "0.7.9",
    "amplitude-js": "8.2.1",
    "base64-js": "1.3.1",
    "bc-css-flags": "3.0.0",
@@ -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/v1538.0.0+871968af/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1541.0.0+9b34e0f7/lib-jitsi-meet.tgz",
    "lodash": "4.17.21",
    "moment": "2.29.4",
    "moment-duration-format": "2.2.2",
--- a/react/features/analytics/handlers/AmplitudeHandler.ts
+++ b/react/features/analytics/handlers/AmplitudeHandler.ts
@@ -1,5 +1,3 @@
-/* eslint-disable lines-around-comment */
-
 import logger from '../logger';

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

        return {
            sessionId: amplitude.getInstance().getSessionId(),
+
            // @ts-ignore
            deviceId: amplitude.getInstance().options.deviceId,
+
            // @ts-ignore
            userId: amplitude.getInstance().options.userId
        };
--- a/react/features/base/conference/actions.ts
+++ b/react/features/base/conference/actions.ts
@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import { createStartMutedConfigurationEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { appNavigate } from '../../app/actions';
@@ -111,6 +110,7 @@ function _addConferenceListeners(conference: IJitsiConference, dispatch: IStore[
        JitsiConferenceEvents.CONFERENCE_LEFT,
        (...args: any[]) => {
            dispatch(conferenceTimestampChanged(0));
+
            // @ts-ignore
            dispatch(conferenceLeft(conference, ...args));
        });
--- a/react/features/base/conference/functions.ts
+++ b/react/features/base/conference/functions.ts
@@ -454,18 +454,18 @@ export function sendLocalParticipant(
        name
    } = getLocalParticipant(stateful) ?? {};

-    avatarURL && conference.sendCommand(AVATAR_URL_COMMAND, {
+    avatarURL && conference?.sendCommand(AVATAR_URL_COMMAND, {
        value: avatarURL
    });
-    email && conference.sendCommand(EMAIL_COMMAND, {
+    email && conference?.sendCommand(EMAIL_COMMAND, {
        value: email
    });

    if (features && features['screen-sharing'] === 'true') {
-        conference.setLocalParticipantProperty('features_screen-sharing', true);
+        conference?.setLocalParticipantProperty('features_screen-sharing', true);
    }

-    conference.setDisplayName(name);
+    conference?.setDisplayName(name);
 }

 /**
--- a/react/features/base/conference/reducer.ts
+++ b/react/features/base/conference/reducer.ts
@@ -1,4 +1,6 @@
+import { FaceLandmarks } from '../../face-landmarks/types';
 import { LOCKED_LOCALLY, LOCKED_REMOTELY } from '../../room-lock/constants';
+import { ISpeakerStats } from '../../speaker-stats/reducer';
 import { CONNECTION_WILL_CONNECT, SET_LOCATION_URL } from '../connection/actionTypes';
 import { JitsiConferenceErrors } from '../lib-jitsi-meet';
 import ReducerRegistry from '../redux/ReducerRegistry';
@@ -53,6 +55,7 @@ export interface IJitsiConference {
    getMeetingUniqueId: Function;
    getParticipantById: Function;
    getParticipants: Function;
+    getSpeakerStats: () => ISpeakerStats;
    grantOwner: Function;
    isAVModerationSupported: Function;
    isCallstatsEnabled: Function;
@@ -62,11 +65,13 @@ export interface IJitsiConference {
    isStartAudioMuted: Function;
    isStartVideoMuted: Function;
    join: Function;
+    joinLobby: Function;
    kickParticipant: Function;
    lock: Function;
    muteParticipant: Function;
    myLobbyUserId: Function;
    myUserId: Function;
+    off: Function;
    on: Function;
    removeTrack: Function;
    replaceTrack: Function;
@@ -74,6 +79,7 @@ export interface IJitsiConference {
    sendCommand: Function;
    sendCommandOnce: Function;
    sendEndpointMessage: Function;
+    sendFaceLandmarks: (faceLandmarks: FaceLandmarks) => void;
    sendFeedback: Function;
    sendLobbyMessage: Function;
    sessionId: string;
@@ -100,7 +106,7 @@ export interface IConferenceState {
    leaving?: Object;
    localSubject?: string;
    locked?: string;
-    membersOnly?: Object;
+    membersOnly?: IJitsiConference;
    obfuscatedRoom?: string;
    obfuscatedRoomSource?: string;
    p2p?: Object;
@@ -223,7 +229,8 @@ function _authStatusChanged(state: IConferenceState,
 * @returns {Object} The new state of the feature base/conference after the
 * reduction of the specified action.
 */
-function _conferenceFailed(state: IConferenceState, { conference, error }: { conference: Object; error: Error; }) {
+function _conferenceFailed(state: IConferenceState, { conference, error }: {
+    conference: IJitsiConference; error: Error; }) {
    // The current (similar to getCurrentConference in
    // base/conference/functions.any.js) conference which is joining or joined:
    const conference_ = state.conference || state.joining;
--- a/react/features/base/config/configType.ts
+++ b/react/features/base/config/configType.ts
@@ -316,6 +316,7 @@ export interface IConfig {
        sdkKey?: string;
        tileTime?: number;
    };
+    googleApiApplicationClientID?: string;
    gravatar?: {
        baseUrl?: string;
        disabled?: boolean;
@@ -366,6 +367,7 @@ export interface IConfig {
    localSubject?: string;
    locationURL?: URL;
    maxFullResolutionParticipants?: number;
+    microsoftApiApplicationClientID?: string;
    moderatedRoomServiceUrl?: string;
    mouseMoveCallbackInterval?: number;
    noticeMessage?: string;
--- a/react/features/base/config/functions.any.ts
+++ b/react/features/base/config/functions.any.ts
@@ -1,6 +1,6 @@
-/* eslint-disable lines-around-comment */
 // @ts-ignore
 import Bourne from '@hapi/bourne';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { jitsiLocalStorage } from '@jitsi/js-utils';
 import _ from 'lodash';
--- a/react/features/base/config/middleware.ts
+++ b/react/features/base/config/middleware.ts
@@ -2,6 +2,7 @@ import { AnyAction } from 'redux';

 import { IStore } from '../../app/types';
 import { getFeatureFlag } from '../flags/functions';
+import Platform from '../react/Platform';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import { updateSettings } from '../settings/actions';

@@ -52,7 +53,7 @@ function _setConfig({ dispatch, getState }: IStore, next: Function, action: AnyA
    const settings = state['features/base/settings'];
    const config: IConfig = {};

-    if (typeof settings.disableP2P !== 'undefined') {
+    if (Platform.OS !== 'android' && typeof settings.disableP2P !== 'undefined') {
        config.p2p = { enabled: !settings.disableP2P };
    }

--- a/react/features/base/config/reducer.ts
+++ b/react/features/base/config/reducer.ts
@@ -1,6 +1,7 @@
 import _ from 'lodash';

 import { CONFERENCE_INFO } from '../../conference/components/constants';
+import Platform from '../react/Platform';
 import ReducerRegistry from '../redux/ReducerRegistry';
 import { equals } from '../redux/functions';

@@ -48,6 +49,8 @@ const INITIAL_RN_STATE: IConfig = {
    disableAudioLevels: true,

    p2p: {
+        // Temporarily disable P2P on Android while we sort out some (codec?) issues.
+        ...(Platform.OS === 'android' ? { enabled: false } : {}), // eslint-disable-line no-extra-parens
        preferredCodec: 'h264'
    },

@@ -74,6 +77,7 @@ export interface IConfigState extends IConfig {
    analysis?: {
        obfuscateRoomName?: boolean;
    };
+    disableRemoteControl?: boolean;
    error?: Error;
 }

--- a/react/features/base/connection/reducer.ts
+++ b/react/features/base/connection/reducer.ts
@@ -16,6 +16,7 @@ import { ConnectionFailedError } from './actions.any';
 export interface IConnectionState {
    connecting?: any;
    connection?: {
+        addFeature: Function;
        disconnect: Function;
        getJid: () => string;
        getLogs: () => Object;
--- a/react/features/base/icons/components/Icon.tsx
+++ b/react/features/base/icons/components/Icon.tsx
@@ -1,8 +1,8 @@
-/* eslint-disable lines-around-comment */
 import React, { useCallback } from 'react';

 // @ts-ignore
 import { Container } from '../../react/base';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { styleTypeToObject } from '../../styles';

--- a/react/features/base/icons/svg/emotions-angry.svg
+++ b/react/features/base/icons/svg/emotions-angry.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1897)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M5.46845 5.14411C5.08781 4.88541 4.56951 4.98428 4.31081 5.36492C4.05212 5.74557 4.15098 6.26387 4.53163 6.52257L5.47766 7.16551C5.18224 7.46624 5.00002 7.87855 5.00002 8.33341C5.00002 9.25388 5.74622 10.0001 6.66669 10.0001C7.58716 10.0001 8.33336 9.25388 8.33336 8.33341C8.33336 8.23415 8.32468 8.13691 8.30804 8.04242C8.54426 7.66462 8.44124 7.16449 8.06956 6.91188L5.46845 5.14411ZM6.66305 14.7842C6.30373 14.5781 6.1795 14.1198 6.38556 13.7605C6.75032 13.1244 7.27645 12.5959 7.91081 12.2283C8.54518 11.8607 9.26532 11.6669 9.99852 11.6667C10.7317 11.6664 11.452 11.8596 12.0866 12.2268C12.7213 12.5939 13.2478 13.1221 13.613 13.7578C13.8193 14.117 13.6954 14.5754 13.3362 14.7818C12.9771 14.9881 12.5186 14.8642 12.3123 14.505C12.0786 14.0981 11.7416 13.7601 11.3354 13.5251C10.9293 13.2901 10.4683 13.1665 9.99906 13.1667C9.52981 13.1668 9.06892 13.2908 8.66293 13.5261C8.25693 13.7614 7.92021 14.0996 7.68677 14.5067C7.4807 14.866 7.02237 14.9902 6.66305 14.7842ZM15.7903 5.36492C15.5316 4.98428 15.0134 4.88541 14.6327 5.14411L12.0316 6.91188C11.7043 7.13434 11.5853 7.54876 11.7229 7.90254C11.6862 8.03998 11.6667 8.18441 11.6667 8.33341C11.6667 9.25388 12.4129 10.0001 13.3334 10.0001C14.2538 10.0001 15 9.25388 15 8.33341C15 7.89926 14.834 7.50388 14.562 7.20728L15.5695 6.52257C15.9502 6.26387 16.049 5.74557 15.7903 5.36492Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1897" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#F26325"/>
+<stop offset="1" stop-color="#F24A25"/>
+</radialGradient>
+</defs>
+</svg>
--- a/react/features/base/icons/svg/emotions-disgusted.svg
+++ b/react/features/base/icons/svg/emotions-disgusted.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_351_6183)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M4.16669 7.50001C4.16669 7.03977 4.53978 6.66667 5.00002 6.66667H7.50002C7.96026 6.66667 8.33335 7.03977 8.33335 7.50001C8.33335 7.96024 7.96026 8.33334 7.50002 8.33334H5.00002C4.53978 8.33334 4.16669 7.96024 4.16669 7.50001ZM6.66669 15C6.66669 13.1591 8.15907 11.6667 10 11.6667C11.841 11.6667 13.3334 13.1591 13.3334 15H6.66669ZM12.5 6.66667C12.0398 6.66667 11.6667 7.03977 11.6667 7.50001C11.6667 7.96024 12.0398 8.33334 12.5 8.33334H15C15.4603 8.33334 15.8334 7.96024 15.8334 7.50001C15.8334 7.03977 15.4603 6.66667 15 6.66667H12.5Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_351_6183" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#98E791"/>
+<stop offset="1" stop-color="#3C9845"/>
+</radialGradient>
+</defs>
+</svg>
--- a/react/features/base/icons/svg/emotions-fearful.svg
+++ b/react/features/base/icons/svg/emotions-fearful.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1884)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM10 11.6667C8.15905 11.6667 6.66667 13.159 6.66667 15H13.3333C13.3333 13.159 11.8409 11.6667 10 11.6667Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1884" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#6BEBD4"/>
+<stop offset="1" stop-color="#077EA4"/>
+</radialGradient>
+</defs>
+</svg>
--- a/react/features/base/icons/svg/emotions-happy.svg
+++ b/react/features/base/icons/svg/emotions-happy.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1844)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM7.53238 12.6776C7.37535 12.2943 6.93734 12.1109 6.55404 12.2679C6.17075 12.4249 5.98732 12.8629 6.14435 13.2462C6.45676 14.0088 6.98828 14.6616 7.6717 15.1221C8.35513 15.5826 9.15976 15.8301 9.98384 15.8333C10.8079 15.8365 11.6144 15.5953 12.3014 15.1401C12.9884 14.6849 13.525 14.0362 13.8433 13.2761C14.0033 12.894 13.8233 12.4546 13.4412 12.2946C13.0591 12.1346 12.6197 12.3146 12.4597 12.6967C12.256 13.1832 11.9126 13.5983 11.4729 13.8896C11.0332 14.181 10.5171 14.3354 9.98966 14.3333C9.46224 14.3313 8.94728 14.1729 8.50989 13.8782C8.0725 13.5834 7.73232 13.1656 7.53238 12.6776Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1844" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#F2AD25"/>
+<stop offset="1" stop-color="#F27B25"/>
+</radialGradient>
+</defs>
+</svg>
--- a/react/features/base/icons/svg/emotions-neutral.svg
+++ b/react/features/base/icons/svg/emotions-neutral.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1850)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM7.5 13.3333C7.03976 13.3333 6.66667 13.7064 6.66667 14.1667C6.66667 14.6269 7.03976 15 7.5 15H12.5C12.9602 15 13.3333 14.6269 13.3333 14.1667C13.3333 13.7064 12.9602 13.3333 12.5 13.3333H7.5Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1850" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#AAAAAA"/>
+<stop offset="1" stop-color="#5E5E5E"/>
+</radialGradient>
+</defs>
+</svg>
--- a/react/features/base/icons/svg/emotions-sad.svg
+++ b/react/features/base/icons/svg/emotions-sad.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1862)"/>
+<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM6.38554 13.7605C6.17948 14.1198 6.30371 14.5781 6.66303 14.7842C7.02235 14.9902 7.48068 14.866 7.68675 14.5067C7.92019 14.0996 8.25691 13.7614 8.66291 13.5261C9.0689 13.2908 9.52979 13.1668 9.99904 13.1667C10.4683 13.1665 10.9293 13.2901 11.3354 13.5251C11.7416 13.7601 12.0786 14.0981 12.3123 14.505C12.5186 14.8642 12.977 14.9881 13.3362 14.7818C13.6954 14.5754 13.8193 14.117 13.613 13.7578C13.2477 13.1221 12.7212 12.5939 12.0866 12.2268C11.452 11.8596 10.7317 11.6664 9.9985 11.6667C9.2653 11.6669 8.54516 11.8607 7.91079 12.2283C7.27643 12.5959 6.7503 13.1244 6.38554 13.7605Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1862" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#65B3FB"/>
+<stop offset="1" stop-color="#256BF2"/>
+</radialGradient>
+</defs>
+</svg>
--- a/react/features/base/icons/svg/emotions-surprised.svg
+++ b/react/features/base/icons/svg/emotions-surprised.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="10" fill="url(#paint0_radial_72_1873)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.33333 7.49999C8.33333 8.42047 7.58714 9.16666 6.66667 9.16666C5.74619 9.16666 5 8.42047 5 7.49999C5 6.57952 5.74619 5.83333 6.66667 5.83333C7.58714 5.83333 8.33333 6.57952 8.33333 7.49999ZM15 7.49999C15 8.42047 14.2538 9.16666 13.3333 9.16666C12.4129 9.16666 11.6667 8.42047 11.6667 7.49999C11.6667 6.57952 12.4129 5.83333 13.3333 5.83333C14.2538 5.83333 15 6.57952 15 7.49999ZM10 15C11.3807 15 12.5 14.403 12.5 13.6667C12.5 12.9303 11.3807 11.6667 10 11.6667C8.61929 11.6667 7.5 12.9303 7.5 13.6667C7.5 14.403 8.61929 15 10 15Z" fill="black"/>
+<defs>
+<radialGradient id="paint0_radial_72_1873" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10 4.58333) rotate(90) scale(15.4167)">
+<stop offset="0.359375" stop-color="#CC86E4"/>
+<stop offset="1" stop-color="#933CD8"/>
+</radialGradient>
+</defs>
+</svg>
--- a/react/features/base/icons/svg/index.ts
+++ b/react/features/base/icons/svg/index.ts
@@ -29,6 +29,13 @@ export { default as IconE2EE } from './e2ee.svg';
 export { default as IconEnlarge } from './enlarge.svg';
 export { default as IconEnterFullscreen } from './enter-fullscreen.svg';
 export { default as IconEnvelope } from './envelope.svg';
+export { default as IconEmotionsAngry } from './emotions-angry.svg';
+export { default as IconEmotionsDisgusted } from './emotions-disgusted.svg';
+export { default as IconEmotionsFearful } from './emotions-fearful.svg';
+export { default as IconEmotionsHappy } from './emotions-happy.svg';
+export { default as IconEmotionsNeutral } from './emotions-neutral.svg';
+export { default as IconEmotionsSad } from './emotions-sad.svg';
+export { default as IconEmotionsSurprised } from './emotions-surprised.svg';
 export { default as IconExclamationSolid } from './exclamation-solid.svg';
 export { default as IconExclamationTriangle } from './exclamation-triangle.svg';
 export { default as IconExitFullscreen } from './exit-fullscreen.svg';
--- a/react/features/base/modal/components/JitsiKeyboardAvoidingView.js
+++ b/react/features/base/modal/components/JitsiKeyboardAvoidingView.js
@@ -53,9 +53,9 @@ const JitsiKeyboardAvoidingView = (
            addBottomPadding = true,
            children,
            contentContainerStyle,
+            disableForcedKeyboardDismiss,
            hasTabNavigator,
            hasBottomTextInput,
-            disableForcedKeyboardDismiss,
            style
        }: Props) => {
    const headerHeight = useHeaderHeight();
--- a/react/features/base/modal/components/JitsiScreen.js
+++ b/react/features/base/modal/components/JitsiScreen.js
@@ -60,10 +60,10 @@ const JitsiScreen = ({
    addBottomPadding,
    contentContainerStyle,
    children,
+    disableForcedKeyboardDismiss = false,
    footerComponent,
    hasTabNavigator = false,
    hasBottomTextInput = false,
-    disableForcedKeyboardDismiss = false,
    safeAreaInsets = [ 'left', 'right' ],
    style
 }: Props) => {
--- a/react/features/base/participants/actions.ts
+++ b/react/features/base/participants/actions.ts
@@ -477,18 +477,19 @@ export function participantMutedUs(participant: any, track: any) {
 /**
 * Action to create a virtual screenshare participant.
 *
- * @param {(string)} sourceName - JitsiTrack instance.
- * @param {(boolean)} local - JitsiTrack instance.
+ * @param {(string)} sourceName - The source name of the JitsiTrack instance.
+ * @param {(boolean)} local - Whether it's a local or remote participant.
+ * @param {JitsiConference} conference - The conference instance for which the participant is to be created.
 * @returns {Function}
 */
-export function createVirtualScreenshareParticipant(sourceName: string, local: boolean) {
+export function createVirtualScreenshareParticipant(sourceName: string, local: boolean, conference: any) {
    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();
        const ownerId = getVirtualScreenshareParticipantOwnerId(sourceName);
        const ownerName = getParticipantDisplayName(state, ownerId);

        dispatch(participantJoined({
-            conference: state['features/base/conference'].conference,
+            conference,
            fakeParticipant: local ? FakeParticipant.LocalScreenShare : FakeParticipant.RemoteScreenShare,
            id: sourceName,
            name: ownerName
--- a/react/features/base/participants/functions.ts
+++ b/react/features/base/participants/functions.ts
@@ -1,9 +1,7 @@
-/* eslint-disable lines-around-comment */
 // @ts-ignore
 import { getGravatarURL } from '@jitsi/js-utils/avatar';

 import { IReduxState, IStore } from '../../app/types';
-// @ts-ignore
 import { isStageFilmstripAvailable } from '../../filmstrip/functions';
 import { IStateful } from '../app/types';
 import { GRAVATAR_BASE_URL } from '../avatar/constants';
@@ -20,6 +18,7 @@ import {
    PARTICIPANT_ROLE,
    WHITEBOARD_PARTICIPANT_ICON
 } from './constants';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { preloadImage } from './preloadImage';
 import { FakeParticipant, IParticipant } from './types';
--- a/react/features/base/participants/subscriber.ts
+++ b/react/features/base/participants/subscriber.ts
@@ -46,7 +46,7 @@ function _updateScreenshareParticipants({ getState, dispatch }: IStore) {

    if (getMultipleVideoSendingSupportFeatureFlag(state)) {
        if (!localScreenShare && newLocalSceenshareSourceName) {
-            dispatch(createVirtualScreenshareParticipant(newLocalSceenshareSourceName, true));
+            dispatch(createVirtualScreenshareParticipant(newLocalSceenshareSourceName, true, conference));
        }

        if (localScreenShare && !newLocalSceenshareSourceName) {
@@ -68,7 +68,7 @@ function _updateScreenshareParticipants({ getState, dispatch }: IStore) {
    }

    if (addedScreenshareSourceNames.length) {
-        addedScreenshareSourceNames.forEach(id => dispatch(createVirtualScreenshareParticipant(id, false)));
-
+        addedScreenshareSourceNames.forEach(id => dispatch(
+            createVirtualScreenshareParticipant(id, false, conference)));
    }
 }
--- a/react/features/base/settings/components/native/SettingsButton.tsx
+++ b/react/features/base/settings/components/native/SettingsButton.tsx
@@ -10,8 +10,8 @@ import { navigate }
    from '../../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 // @ts-ignore
 import { screen } from '../../../../mobile/navigation/routes';
-// @ts-ignore
-import { SETTINGS_ENABLED, getFeatureFlag } from '../../../flags';
+import { SETTINGS_ENABLED } from '../../../flags/constants';
+import { getFeatureFlag } from '../../../flags/functions';
 import { connect } from '../../../redux/functions';

 /**
--- a/react/features/base/settings/middleware.any.ts
+++ b/react/features/base/settings/middleware.any.ts
@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import _ from 'lodash';
 import { AnyAction } from 'redux';

--- a/react/features/base/tracks/actions.native.ts
+++ b/react/features/base/tracks/actions.native.ts
@@ -1,6 +1,5 @@
-/* eslint-disable lines-around-comment */
-
 import { IReduxState, IStore } from '../../app/types';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { setPictureInPictureEnabled } from '../../mobile/picture-in-picture/functions';
 import { setAudioOnly } from '../audio-only/actions';
@@ -8,7 +7,6 @@ import JitsiMeetJS from '../lib-jitsi-meet';

 import { destroyLocalDesktopTrackIfExists, replaceLocalTrack } from './actions.any';
 import { getLocalVideoTrack, isLocalVideoTrackDesktop } from './functions';
-/* eslint-enable lines-around-comment */

 export * from './actions.any';

--- a/react/features/base/tracks/actions.web.ts
+++ b/react/features/base/tracks/actions.web.ts
@@ -8,7 +8,6 @@ import { showNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
 // @ts-ignore
 import { stopReceiver } from '../../remote-control/actions';
-// @ts-ignore
 import { setScreenAudioShareState, setScreenshareAudioTrack } from '../../screen-share/actions';
 import { isAudioOnlySharing, isScreenVideoShared } from '../../screen-share/functions';
 // @ts-ignore
--- a/react/features/base/tracks/functions.any.ts
+++ b/react/features/base/tracks/functions.any.ts
@@ -214,7 +214,7 @@ export function getVideoTrackByParticipant(
 export function getTrackByMediaTypeAndParticipant(
        tracks: ITrack[],
        mediaType: MediaType,
-        participantId: string) {
+        participantId?: string) {
    return tracks.find(
        t => Boolean(t.jitsiTrack) && t.participantId === participantId && t.mediaType === mediaType
    );
--- a/react/features/base/ui/components/native/Button.tsx
+++ b/react/features/base/ui/components/native/Button.tsx
@@ -1,4 +1,3 @@
-// @ts-ignore
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import {
@@ -74,7 +73,7 @@ const Button: React.FC<IProps> = ({
                accessibilityLabel = { accessibilityLabel }
                disabled = { disabled }
                onPress = { onPress }
-                rippleColor = 'transparent'
+                rippleColor = { BaseTheme.palette.action03Active }
                style = { [
                    buttonStyles,
                    style
--- a/react/features/base/ui/components/native/IconButton.tsx
+++ b/react/features/base/ui/components/native/IconButton.tsx
@@ -1,8 +1,8 @@
-/* eslint-disable lines-around-comment */
 import React from 'react';
 import { TouchableRipple } from 'react-native-paper';

 import Icon from '../../../icons/components/Icon';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import styles from '../../../react/components/native/styles';
 import { IIconButtonProps } from '../../../react/types';
--- a/react/features/calendar-sync/actions.any.ts
+++ b/react/features/calendar-sync/actions.any.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import {
    REFRESH_CALENDAR,
    SET_CALENDAR_AUTHORIZATION,
@@ -19,8 +17,7 @@ import {
 *     isInteractive: boolean
 * }}
 */
-export function refreshCalendar(
-        forcePermission: boolean = false, isInteractive: boolean = true) {
+export function refreshCalendar(forcePermission = false, isInteractive = true) {
    return {
        type: REFRESH_CALENDAR,
        forcePermission,
@@ -39,7 +36,7 @@ export function refreshCalendar(
 *     authorization: ?string
 * }}
 */
-export function setCalendarAuthorization(authorization: ?string) {
+export function setCalendarAuthorization(authorization?: string) {
    return {
        type: SET_CALENDAR_AUTHORIZATION,
        authorization
--- a/react/features/calendar-sync/actions.native.ts
+++ b/react/features/calendar-sync/actions.native.ts
@@ -1,13 +1,15 @@
-// @flow
+// @ts-expect-error
 import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random';
-import type { Dispatch } from 'redux';

 import { getDefaultURL } from '../app/functions';
-import { openDialog } from '../base/dialog';
+import { IStore } from '../app/types';
+import { openDialog } from '../base/dialog/actions';

 import { refreshCalendar } from './actions';
 import {
    UpdateCalendarEventDialog
+
+    // @ts-ignore
 } from './components';
 import { addLinkToCalendarEntry } from './functions.native';

@@ -35,11 +37,13 @@ export function openUpdateCalendarEventDialog(eventId: string) {
 * @returns {Function}
 */
 export function updateCalendarEvent(eventId: string) {
-    return (dispatch: Dispatch<any>, getState: Function) => {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const defaultUrl = getDefaultURL(getState);
        const roomName = generateRoomWithoutSeparator();

        addLinkToCalendarEntry(getState(), eventId, `${defaultUrl}/${roomName}`)
+
+        // @ts-ignore
        .finally(() => {
            dispatch(refreshCalendar(false, false));
        });
--- a/react/features/calendar-sync/actions.web.ts
+++ b/react/features/calendar-sync/actions.web.ts
@@ -1,9 +1,11 @@
-// @flow
-
+// @ts-expect-error
 import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random';
-import type { Dispatch } from 'redux';

-import { createCalendarConnectedEvent, sendAnalytics } from '../analytics';
+import { createCalendarConnectedEvent } from '../analytics/AnalyticsEvents';
+import { sendAnalytics } from '../analytics/functions';
+import { IStore } from '../app/types';
+// eslint-disable-next-line lines-around-comment
+// @ts-ignore
 import { loadGoogleAPI } from '../google-api';

 import {
@@ -14,8 +16,8 @@ import {
    SET_CALENDAR_PROFILE_EMAIL,
    SET_LOADING_CALENDAR_EVENTS
 } from './actionTypes';
-import { refreshCalendar, setCalendarEvents } from './actions';
-import { _getCalendarIntegration, isCalendarEnabled } from './functions';
+import { refreshCalendar, setCalendarEvents } from './actions.web';
+import { _getCalendarIntegration, isCalendarEnabled } from './functions.web';
 import logger from './logger';

 export * from './actions.any';
@@ -26,8 +28,8 @@ export * from './actions.any';
 *
 * @returns {Function}
 */
-export function bootstrapCalendarIntegration(): Function {
-    return (dispatch, getState) => {
+export function bootstrapCalendarIntegration() {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();

        if (!isCalendarEnabled(state)) {
@@ -63,7 +65,7 @@ export function bootstrapCalendarIntegration(): Function {
                }

                return dispatch(integrationToLoad._isSignedIn())
-                    .then(signedIn => {
+                    .then((signedIn: boolean) => {
                        if (signedIn) {
                            dispatch(setIntegrationReady(integrationType));
                            dispatch(updateProfile(integrationType));
@@ -114,7 +116,7 @@ export function openUpdateCalendarEventDialog(
 *     msAuthState: Object
 * }}
 */
-export function setCalendarAPIAuthState(newState: ?Object) {
+export function setCalendarAPIAuthState(newState?: Object) {
    return {
        type: SET_CALENDAR_AUTH_STATE,
        msAuthState: newState
@@ -130,7 +132,7 @@ export function setCalendarAPIAuthState(newState: ?Object) {
 *     error: Object
 * }}
 */
-export function setCalendarError(error: ?Object) {
+export function setCalendarError(error?: Object) {
    return {
        type: SET_CALENDAR_ERROR,
        error
@@ -146,7 +148,7 @@ export function setCalendarError(error: ?Object) {
 *     email: string
 * }}
 */
-export function setCalendarProfileEmail(newEmail: ?string) {
+export function setCalendarProfileEmail(newEmail?: string) {
    return {
        type: SET_CALENDAR_PROFILE_EMAIL,
        email: newEmail
@@ -196,8 +198,8 @@ export function setIntegrationReady(integrationType: string) {
 * signed into.
 * @returns {Function}
 */
-export function signIn(calendarType: string): Function {
-    return (dispatch: Dispatch<any>) => {
+export function signIn(calendarType: string) {
+    return (dispatch: IStore['dispatch']) => {
        const integration = _getCalendarIntegration(calendarType);

        if (!integration) {
@@ -210,7 +212,7 @@ export function signIn(calendarType: string): Function {
            .then(() => dispatch(updateProfile(calendarType)))
            .then(() => dispatch(refreshCalendar()))
            .then(() => sendAnalytics(createCalendarConnectedEvent()))
-            .catch(error => {
+            .catch((error: any) => {
                logger.error(
                    'Error occurred while signing into calendar integration',
                    error);
@@ -228,10 +230,10 @@ export function signIn(calendarType: string): Function {
 * @param {string} calendarId - The id of the calendar to use.
 * @returns {Function}
 */
-export function updateCalendarEvent(id: string, calendarId: string): Function {
-    return (dispatch: Dispatch<any>, getState: Function) => {
+export function updateCalendarEvent(id: string, calendarId: string) {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {

-        const { integrationType } = getState()['features/calendar-sync'];
+        const { integrationType = '' } = getState()['features/calendar-sync'];
        const integration = _getCalendarIntegration(integrationType);

        if (!integration) {
@@ -240,7 +242,7 @@ export function updateCalendarEvent(id: string, calendarId: string): Function {

        const { locationURL } = getState()['features/base/connection'];
        const newRoomName = generateRoomWithoutSeparator();
-        let href = locationURL.href;
+        let href = locationURL?.href ?? '';

        href.endsWith('/') || (href += '/');

@@ -275,8 +277,8 @@ export function updateCalendarEvent(id: string, calendarId: string): Function {
 * should be updated.
 * @returns {Function}
 */
-export function updateProfile(calendarType: string): Function {
-    return (dispatch: Dispatch<any>) => {
+export function updateProfile(calendarType: string) {
+    return (dispatch: IStore['dispatch']) => {
        const integration = _getCalendarIntegration(calendarType);

        if (!integration) {
@@ -284,7 +286,7 @@ export function updateProfile(calendarType: string): Function {
        }

        return dispatch(integration.getCurrentEmail())
-            .then(email => {
+            .then((email: string) => {
                dispatch(setCalendarProfileEmail(email));
            });
    };
--- a/react/features/calendar-sync/functions.any.ts
+++ b/react/features/calendar-sync/functions.any.ts
@@ -1,8 +1,6 @@
-// @flow
-
 import md5 from 'js-md5';

-import { APP_LINK_SCHEME, parseURIString } from '../base/util';
+import { APP_LINK_SCHEME, parseURIString } from '../base/util/uri';

 import { setCalendarEvents } from './actions';
 import { MAX_LIST_LENGTH } from './constants';
@@ -16,7 +14,8 @@ const ALLDAY_EVENT_LENGTH = 23 * 60 * 60 * 1000;
 * @param {Object} entry - The calendar entry.
 * @returns {boolean}
 */
-function _isDisplayableCalendarEntry(entry) {
+function _isDisplayableCalendarEntry(entry: { allDay: boolean; attendees: Object[];
+    endDate: number; startDate: number; }) {
    // Entries are displayable if:
    //   - Ends in the future (future or ongoing events)
    //   - Is not an all day event and there is only one attendee (these events
@@ -45,7 +44,8 @@ export function _updateCalendarEntries(events: Array<Object>) {
        return;
    }

-    // eslint-disable-next-line no-invalid-this
+    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/no-invalid-this
    const { dispatch, getState } = this;
    const knownDomains = getState()['features/base/known-domains'];
    const entryMap = new Map();
@@ -106,7 +106,7 @@ export function _updateCalendarEntries(events: Array<Object>) {
 * @param {string} negativePattern - The negative pattern.
 * @returns {string}
 */
-function _checkPattern(str, positivePattern, negativePattern) {
+function _checkPattern(str: string, positivePattern: string, negativePattern: string) {
    const positiveRegExp = new RegExp(positivePattern, 'gi');
    let positiveMatch = positiveRegExp.exec(str);

@@ -129,7 +129,7 @@ function _checkPattern(str, positivePattern, negativePattern) {
 * @private
 * @returns {CalendarEntry}
 */
-function _parseCalendarEntry(event, knownDomains) {
+function _parseCalendarEntry(event: any, knownDomains: string[]) {
    if (event) {
        const url = _getURLFromEvent(event, knownDomains);
        const startDate = Date.parse(event.startDate);
@@ -170,7 +170,8 @@ function _parseCalendarEntry(event, knownDomains) {
 * @private
 * @returns {string}
 */
-function _getURLFromEvent(event, knownDomains) {
+function _getURLFromEvent(event: { description: string; location: string; notes: string; title: string;
+    url: string; }, knownDomains: string[]) {
    const linkTerminatorPattern = '[^\\s<>$]';
    const urlRegExp
        = `http(s)?://(${knownDomains.join('|')})/${linkTerminatorPattern}+`;
--- a/react/features/calendar-sync/functions.native.ts
+++ b/react/features/calendar-sync/functions.native.ts
@@ -1,15 +1,17 @@
-// @flow
-
 import { NativeModules, Platform } from 'react-native';
 import RNCalendarEvents from 'react-native-calendar-events';
-import type { Store } from 'redux';

-import { CALENDAR_ENABLED, getFeatureFlag } from '../base/flags';
+import { IReduxState, IStore } from '../app/types';
+import { IStateful } from '../base/app/types';
+import { CALENDAR_ENABLED } from '../base/flags/constants';
+import { getFeatureFlag } from '../base/flags/functions';
+// eslint-disable-next-line lines-around-comment
+// @ts-ignore
 import { getShareInfoText } from '../invite';

-import { setCalendarAuthorization } from './actions';
+import { setCalendarAuthorization } from './actions.native';
 import { FETCH_END_DAYS, FETCH_START_DAYS } from './constants';
-import { _updateCalendarEntries } from './functions';
+import { _updateCalendarEntries } from './functions.native';
 import logger from './logger';

 export * from './functions.any';
@@ -23,10 +25,10 @@ export * from './functions.any';
 * @returns {Promise<*>}
 */
 export function addLinkToCalendarEntry(
-        state: Object, id: string, link: string): Promise<any> {
+        state: IReduxState, id: string, link: string): Promise<any> {
    return new Promise((resolve, reject) => {
-        getShareInfoText(state, link, true).then(shareInfoText => {
-            RNCalendarEvents.findEventById(id).then(event => {
+        getShareInfoText(state, link, true).then((shareInfoText: string) => {
+            RNCalendarEvents.findEventById(id).then((event: any) => {
                const updateText
                    = event.description
                        ? `${event.description}\n\n${shareInfoText}`
@@ -43,6 +45,7 @@ export function addLinkToCalendarEntry(
                    })
                };

+                // @ts-ignore
                RNCalendarEvents.saveEvent(event.title, updateObject)
                .then(resolve, reject);
            }, reject);
@@ -61,7 +64,7 @@ export function addLinkToCalendarEntry(
 * @returns {boolean} If the app has enabled the calendar feature, {@code true};
 * otherwise, {@code false}.
 */
-export function isCalendarEnabled(stateful: Function | Object) {
+export function isCalendarEnabled(stateful: IStateful) {
    const flag = getFeatureFlag(stateful, CALENDAR_ENABLED);

    if (typeof flag !== 'undefined') {
@@ -85,9 +88,9 @@ export function isCalendarEnabled(stateful: Function | Object) {
 * @returns {void}
 */
 export function _fetchCalendarEntries(
-        store: Store<*, *>,
+        store: IStore,
        maybePromptForPermission: boolean,
-        forcePermission: ?boolean) {
+        forcePermission?: boolean) {
    const { dispatch, getState } = store;
    const promptForPermission
        = (maybePromptForPermission
@@ -104,6 +107,8 @@ export function _fetchCalendarEntries(
                endDate.setDate(endDate.getDate() + FETCH_END_DAYS);

                RNCalendarEvents.fetchAllEvents(
+
+                    // @ts-ignore
                    startDate.getTime(),
                    endDate.getTime(),
                    [])
@@ -126,7 +131,7 @@ export function _fetchCalendarEntries(
 * @private
 * @returns {Promise}
 */
-function _ensureCalendarAccess(promptForPermission, dispatch) {
+function _ensureCalendarAccess(promptForPermission: boolean | undefined, dispatch: IStore['dispatch']) {
    return new Promise((resolve, reject) => {
        RNCalendarEvents.checkPermissions()
            .then(status => {
--- a/react/features/calendar-sync/functions.web.ts
+++ b/react/features/calendar-sync/functions.web.ts
@@ -1,12 +1,13 @@
-// @flow
-
-import { toState } from '../base/redux';
+/* eslint-disable lines-around-comment */
+import { IStore } from '../app/types';
+import { IStateful } from '../base/app/types';
+import { toState } from '../base/redux/functions';

 import {
    clearCalendarIntegration,
    setCalendarError,
    setLoadingCalendarEvents
-} from './actions';
+} from './actions.web';
 export * from './functions.any';
 import {
    CALENDAR_TYPE,
@@ -14,10 +15,13 @@ import {
    FETCH_END_DAYS,
    FETCH_START_DAYS
 } from './constants';
-import { _updateCalendarEntries } from './functions';
+import { _updateCalendarEntries } from './functions.web';
 import logger from './logger';
+// @ts-ignore
 import { googleCalendarApi } from './web/googleCalendar';
+// @ts-ignore
 import { microsoftCalendarApi } from './web/microsoftCalendar';
+/* eslint-enable lines-around-comment */

 /**
 * Determines whether the calendar feature is enabled by the web.
@@ -27,7 +31,7 @@ import { microsoftCalendarApi } from './web/microsoftCalendar';
 * @returns {boolean} If the app has enabled the calendar feature, {@code true};
 * otherwise, {@code false}.
 */
-export function isCalendarEnabled(stateful: Function | Object) {
+export function isCalendarEnabled(stateful: IStateful) {
    const {
        enableCalendarIntegration,
        googleApiApplicationClientID,
@@ -37,26 +41,24 @@ export function isCalendarEnabled(stateful: Function | Object) {
    return Boolean(enableCalendarIntegration && (googleApiApplicationClientID || microsoftApiApplicationClientID));
 }

-/* eslint-disable no-unused-vars */
 /**
 * Reads the user's calendar and updates the stored entries if need be.
 *
 * @param {Object} store - The redux store.
- * @param {boolean} maybePromptForPermission - Flag to tell the app if it should
+ * @param {boolean} _maybePromptForPermission - Flag to tell the app if it should
 * prompt for a calendar permission if it wasn't granted yet.
- * @param {boolean|undefined} forcePermission - Whether to force to re-ask for
+ * @param {boolean|undefined} _forcePermission - Whether to force to re-ask for
 * the permission or not.
 * @private
 * @returns {void}
 */
 export function _fetchCalendarEntries(
-        store: Object,
-        maybePromptForPermission: boolean,
-        forcePermission: ?boolean) {
-    /* eslint-enable no-unused-vars */
+        store: IStore,
+        _maybePromptForPermission: boolean,
+        _forcePermission?: boolean) {
    const { dispatch, getState } = store;

-    const { integrationType } = getState()['features/calendar-sync'];
+    const { integrationType = '' } = getState()['features/calendar-sync'];
    const integration = _getCalendarIntegration(integrationType);

    if (!integration) {
@@ -69,7 +71,7 @@ export function _fetchCalendarEntries(

    dispatch(integration.load())
        .then(() => dispatch(integration._isSignedIn()))
-        .then(signedIn => {
+        .then((signedIn: boolean) => {
            if (signedIn) {
                return Promise.resolve();
            }
@@ -80,13 +82,13 @@ export function _fetchCalendarEntries(
        })
        .then(() => dispatch(integration.getCalendarEntries(
            FETCH_START_DAYS, FETCH_END_DAYS)))
-        .then(events => _updateCalendarEntries.call({
+        .then((events: Object[]) => _updateCalendarEntries.call({
            dispatch,
            getState
        }, events))
        .then(() => {
            dispatch(setCalendarError());
-        }, error => {
+        }, (error: any) => {
            logger.error('Error fetching calendar.', error);

            if (error.error === ERRORS.AUTH_FAILED) {
--- a/react/features/calendar-sync/logger.ts
+++ b/react/features/calendar-sync/logger.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { getLogger } from '../base/logging/functions';

 export default getLogger('features/calendar-sync');
--- a/react/features/calendar-sync/middleware.ts
+++ b/react/features/calendar-sync/middleware.ts
@@ -1,8 +1,8 @@
-// @flow
-
-import { SET_CONFIG } from '../base/config';
-import { ADD_KNOWN_DOMAINS } from '../base/known-domains';
-import { MiddlewareRegistry, equals } from '../base/redux';
+import { IStore } from '../app/types';
+import { SET_CONFIG } from '../base/config/actionTypes';
+import { ADD_KNOWN_DOMAINS } from '../base/known-domains/actionTypes';
+import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
+import { equals } from '../base/redux/functions';
 import { APP_STATE_CHANGED } from '../mobile/background/actionTypes';

 import { REFRESH_CALENDAR } from './actionTypes';
@@ -70,7 +70,7 @@ MiddlewareRegistry.register(store => next => action => {
 * @private
 * @returns {void}
 */
-function _maybeClearAccessStatus(store, { appState }) {
+function _maybeClearAccessStatus(store: IStore, { appState }: { appState: string; }) {
    appState === 'background'
        && store.dispatch(setCalendarAuthorization(undefined));
 }
--- a/react/features/calendar-sync/reducer.tsx
+++ b/react/features/calendar-sync/reducer.tsx
@@ -29,7 +29,11 @@ const DEFAULT_STATE = {
 export interface ICalendarSyncState {
    authorization?: string;
    error?: Object;
-    events: Array<Object>;
+    events: Array<{
+        calendarId: string;
+        id: string;
+        url: string;
+    }>;
    integrationReady: boolean;
    integrationType?: string;
    isLoadingEvents?: boolean;
--- a/react/features/chat/middleware.ts
+++ b/react/features/chat/middleware.ts
@@ -47,6 +47,7 @@ import {
 } from './constants';
 import { getUnreadCount } from './functions';
 import { INCOMING_MSG_SOUND_FILE } from './sounds';
+/* eslint-enable lines-around-comment */

 /**
 * Timeout for when to show the privacy notice after a private message was received.
--- a/react/features/conference/components/native/Conference.js
+++ b/react/features/conference/components/native/Conference.js
@@ -462,7 +462,7 @@ class Conference extends AbstractConference<Props, State> {
                        {/* eslint-disable-next-line react/jsx-no-bind */}
                        <AlwaysOnLabels createOnPress = { this._createOnPress } />
                    </View>
-                    {this._renderNotificationsContainer()}
+                    { this._renderNotificationsContainer() }
                    <KnockingParticipantList />
                </SafeAreaView>

--- a/react/features/conference/components/native/RaisedHandsCountLabel.js
+++ b/react/features/conference/components/native/RaisedHandsCountLabel.js
@@ -1,11 +1,9 @@
-// @flow
-
 import React from 'react';
 import { useSelector } from 'react-redux';

 import { IconRaiseHand } from '../../../base/icons';
 import { Label } from '../../../base/label';
-import BaseTheme from '../../../base/ui/components/BaseTheme';
+import BaseTheme from '../../../base/ui/components/BaseTheme.native';

 import styles from './styles';

--- a/react/features/conference/components/native/carmode/EndMeetingButton.tsx
+++ b/react/features/conference/components/native/carmode/EndMeetingButton.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import React, { useCallback } from 'react';
 import { useDispatch } from 'react-redux';

@@ -9,6 +8,7 @@ import Button from '../../../../base/ui/components/native/Button';
 import { BUTTON_TYPES } from '../../../../base/ui/constants.native';

 import EndMeetingIcon from './EndMeetingIcon';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import styles from './styles';

--- a/react/features/conference/components/native/carmode/MicrophoneButton.tsx
+++ b/react/features/conference/components/native/carmode/MicrophoneButton.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import React, { useCallback, useState } from 'react';
 import { TouchableOpacity, View } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
@@ -17,7 +16,6 @@ import { IconMic, IconMicSlash } from '../../../../base/icons/svg';
 import { MEDIA_TYPE } from '../../../../base/media/constants';
 import { isLocalTrackMuted } from '../../../../base/tracks/functions';
 import { isAudioMuteButtonDisabled } from '../../../../toolbox/functions.any';
-// @ts-ignore
 import { muteLocal } from '../../../../video-menu/actions';

 // @ts-ignore
--- a/react/features/conference/components/native/styles.js
+++ b/react/features/conference/components/native/styles.js
@@ -4,7 +4,6 @@ import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 export const INSECURE_ROOM_NAME_LABEL_COLOR = BaseTheme.palette.actionDanger;

 const TITLE_BAR_BUTTON_SIZE = 24;
-const HEADER_ACTION_BUTTON_SIZE = 17;


 /**
@@ -35,29 +34,6 @@ export default {
        margin: 10
    },

-    headerNavigationButton: {
-        height: BaseTheme.spacing[6],
-        marginTop: 20,
-        width: BaseTheme.spacing[6]
-    },
-
-    headerNavigationIcon: {
-        marginLeft: 12
-    },
-
-    headerNavigationText: {
-        color: BaseTheme.palette.text01,
-        marginLeft: BaseTheme.spacing[3],
-        fontSize: HEADER_ACTION_BUTTON_SIZE
-    },
-
-    headerNavigationTextBold: {
-        ...BaseTheme.typography.labelButton,
-        color: BaseTheme.palette.text01,
-        marginRight: BaseTheme.spacing[3],
-        fontSize: HEADER_ACTION_BUTTON_SIZE
-    },
-
    /**
     * View that contains the indicators.
     */
@@ -153,17 +129,18 @@ export default {
    },

    roomTimer: {
-        color: BaseTheme.palette.text01,
        ...BaseTheme.typography.bodyShortBold,
-        paddingHorizontal: 8,
-        paddingVertical: 6,
+        color: BaseTheme.palette.text01,
        textAlign: 'center'
    },

    roomTimerView: {
        backgroundColor: BaseTheme.palette.ui03,
-        borderRadius: 3,
+        borderRadius: BaseTheme.shape.borderRadius,
+        height: 32,
        justifyContent: 'center',
+        paddingHorizontal: BaseTheme.spacing[2],
+        paddingVertical: BaseTheme.spacing[1],
        minWidth: 50
    },

@@ -212,12 +189,12 @@ export default {
    },

    raisedHandsCountLabel: {
-        backgroundColor: BaseTheme.palette.warning02,
-        flexDirection: 'row',
        alignItems: 'center',
+        backgroundColor: BaseTheme.palette.warning02,
+        borderRadius: BaseTheme.shape.borderRadius,
+        flexDirection: 'row',
        marginLeft: BaseTheme.spacing[0],
-        marginBottom: BaseTheme.spacing[0],
-        marginRight: BaseTheme.spacing[1]
+        marginBottom: BaseTheme.spacing[0]
    },

    raisedHandsCountLabelText: {
--- a/react/features/conference/components/web/ToggleTopPanelLabel.tsx
+++ b/react/features/conference/components/web/ToggleTopPanelLabel.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
@@ -6,9 +5,9 @@ import { useDispatch, useSelector } from 'react-redux';
 import { IReduxState } from '../../../app/types';
 import { IconArrowDown } from '../../../base/icons/svg/index';
 import Label from '../../../base/label/components/web/Label';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { Tooltip } from '../../../base/tooltip';
-// @ts-ignore
 import { setTopPanelVisible } from '../../../filmstrip/actions.web';

 const ToggleTopPanelLabel = () => {
--- a/react/features/connection-indicator/components/native/styles.ts
+++ b/react/features/connection-indicator/components/native/styles.ts
@@ -1,6 +1,5 @@
-/* eslint-disable lines-around-comment */
-
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { INDICATOR_DISPLAY_THRESHOLD } from '../AbstractConnectionIndicator';

--- a/react/features/connection-indicator/components/web/ConnectionIndicator.tsx
+++ b/react/features/connection-indicator/components/web/ConnectionIndicator.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable lines-around-comment */
-
 import { Theme } from '@mui/material';
 import { withStyles } from '@mui/styles';
 import clsx from 'clsx';
@@ -29,11 +27,13 @@ import AbstractConnectionIndicator, {
    type State as AbstractState,
    INDICATOR_DISPLAY_THRESHOLD,
    mapStateToProps as _abstractMapStateToProps
+
    // @ts-ignore
 } from '../AbstractConnectionIndicator';

 // @ts-ignore
 import ConnectionIndicatorContent from './ConnectionIndicatorContent';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { ConnectionIndicatorIcon } from './ConnectionIndicatorIcon';

@@ -228,6 +228,7 @@ class ConnectionIndicator extends AbstractConnectionIndicator<Props, IState> {
            <Popover
                className = { clsx(classes.container, visibilityClass) }
                content = { <ConnectionIndicatorContent
+
                    // @ts-ignore
                    inheritedStats = { this.state.stats }
                    participantId = { participantId } /> }
@@ -236,6 +237,7 @@ class ConnectionIndicator extends AbstractConnectionIndicator<Props, IState> {
                onPopoverClose = { this._onHidePopover }
                onPopoverOpen = { this._onShowPopover }
                position = { statsPopoverPosition }
+
                // @ts-ignore
                visible = { this.state.popoverVisible }>
                { this._renderIndicator() }
@@ -259,6 +261,7 @@ class ConnectionIndicator extends AbstractConnectionIndicator<Props, IState> {
            _isConnectionStatusInactive,
            _isConnectionStatusInterrupted,
            _connectionIndicatorInactiveDisabled
+
            // @ts-ignore
        } = this.props;

@@ -305,6 +308,7 @@ class ConnectionIndicator extends AbstractConnectionIndicator<Props, IState> {

        // @ts-ignore
        return this.state.showIndicator
+
            // @ts-ignore
            || this.props.alwaysVisible
            || _isConnectionStatusInterrupted
@@ -348,6 +352,7 @@ class ConnectionIndicator extends AbstractConnectionIndicator<Props, IState> {
            _videoTrack,
            classes,
            iconSize
+
            // @ts-ignore
        } = this.props;

@@ -399,5 +404,6 @@ export function _mapStateToProps(state: IReduxState, ownProps: Props) {
 }

 export default translate(connect(_mapStateToProps)(
+
    // @ts-ignore
    withStyles(styles)(ConnectionIndicator)));
--- a/react/features/desktop-picker/components/DesktopPicker.tsx
+++ b/react/features/desktop-picker/components/DesktopPicker.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import Tabs from '@atlaskit/tabs';
 import React, { PureComponent } from 'react';
 import { WithTranslation } from 'react-i18next';
@@ -8,6 +7,7 @@ import { hideDialog } from '../../base/dialog/actions';
 import { translate } from '../../base/i18n/functions';
 import { connect } from '../../base/redux/functions';
 import Dialog from '../../base/ui/components/web/Dialog';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { obtainDesktopSources } from '../functions';

--- a/react/features/display-name/components/web/DisplayName.tsx
+++ b/react/features/display-name/components/web/DisplayName.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
@@ -11,9 +10,9 @@ import {
 } from '../../../base/participants/functions';
 import { updateSettings } from '../../../base/settings/actions';
 import { withPixelLineHeight } from '../../../base/styles/functions.web';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { Tooltip } from '../../../base/tooltip';
-// @ts-ignore
 import { getIndicatorsTooltipPosition } from '../../../filmstrip/functions.web';
 import { appendSuffix } from '../../functions';

--- a/react/features/display-name/components/web/StageParticipantNameLabel.tsx
+++ b/react/features/display-name/components/web/StageParticipantNameLabel.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable lines-around-comment */
-
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { makeStyles } from 'tss-react/mui';
@@ -11,13 +9,10 @@ import {
    getParticipantDisplayName,
    isWhiteboardParticipant
 } from '../../../base/participants/functions';
-import { IParticipant } from '../../../base/participants/types';
 import { withPixelLineHeight } from '../../../base/styles/functions.web';
-// @ts-ignore
 import { getLargeVideoParticipant } from '../../../large-video/functions';
 import { isToolboxVisible } from '../../../toolbox/functions.web';
-// @ts-ignore
-import { isLayoutTileView } from '../../../video-layout';
+import { isLayoutTileView } from '../../../video-layout/functions.web';

 import DisplayNameBadge from './DisplayNameBadge';

@@ -50,9 +45,9 @@ const useStyles = makeStyles()(theme => {
 */
 const StageParticipantNameLabel = () => {
    const { classes, cx } = useStyles();
-    const largeVideoParticipant: IParticipant = useSelector(getLargeVideoParticipant);
+    const largeVideoParticipant = useSelector(getLargeVideoParticipant);
    const selectedId = largeVideoParticipant?.id;
-    const nameToDisplay = useSelector((state: IReduxState) => getParticipantDisplayName(state, selectedId));
+    const nameToDisplay = useSelector((state: IReduxState) => getParticipantDisplayName(state, selectedId ?? ''));

    const localParticipant = useSelector(getLocalParticipant);
    const localId = localParticipant?.id;
--- a/react/features/dropbox/actions.ts
+++ b/react/features/dropbox/actions.ts
@@ -43,7 +43,7 @@ export function authorizeDropbox() {
 *     expireDate: number
 * }}
 */
-export function updateDropboxToken(token: string, rToken: string, expireDate: number) {
+export function updateDropboxToken(token?: string, rToken?: string, expireDate?: number) {
    return {
        type: UPDATE_DROPBOX_TOKEN,
        token,
--- a/react/features/face-landmarks/FaceLandmarksDetector.ts
+++ b/react/features/face-landmarks/FaceLandmarksDetector.ts
@@ -5,20 +5,21 @@ import { getLocalVideoTrack } from '../base/tracks/functions';
 import { getBaseUrl } from '../base/util/helpers';

 import {
-    addFaceExpression,
+    addFaceLandmarks,
    clearFaceExpressionBuffer,
    newFaceBox
 } from './actions';
 import {
    DETECTION_TYPES,
    DETECT_FACE,
-    FACE_LANDMARK_DETECTION_ERROR_THRESHOLD,
+    FACE_LANDMARKS_DETECTION_ERROR_THRESHOLD,
    INIT_WORKER,
+    NO_DETECTION,
+    NO_FACE_DETECTION_THRESHOLD,
    WEBHOOK_SEND_TIME_INTERVAL
 } from './constants';
 import {
    getDetectionInterval,
-    getFaceExpressionDuration,
    sendFaceExpressionsWebhook
 } from './functions';
 import logger from './logger';
@@ -33,13 +34,14 @@ class FaceLandmarksDetector {
    private worker: Worker | null = null;
    private lastFaceExpression: string | null = null;
    private lastFaceExpressionTimestamp: number | null = null;
-    private duplicateConsecutiveExpressions = 0;
    private webhookSendInterval: number | null = null;
    private detectionInterval: number | null = null;
    private recognitionActive = false;
    private canvas?: HTMLCanvasElement;
    private context?: CanvasRenderingContext2D | null;
    private errorCount = 0;
+    private noDetectionCount = 0;
+    private noDetectionStartTimestamp: number | null = null;

    /**
     * Constructor for class, checks if the environment supports OffscreenCanvas.
@@ -97,27 +99,48 @@ class FaceLandmarksDetector {

        // @ts-ignore
        const workerBlob = new Blob([ `importScripts("${workerUrl}");` ], { type: 'application/javascript' });
+        const state = getState();
+        const addToBuffer = Boolean(state['features/base/config'].webhookProxyUrl);

        // @ts-ignore
        workerUrl = window.URL.createObjectURL(workerBlob);
-        this.worker = new Worker(workerUrl, { name: 'Face Recognition Worker' });
+        this.worker = new Worker(workerUrl, { name: 'Face Landmarks Worker' });
        this.worker.onmessage = ({ data }: MessageEvent<any>) => {
-            const { faceExpression, faceBox } = data;
+            const { faceExpression, faceBox, faceCount } = data;
+            const messageTimestamp = Date.now();

-            if (faceExpression) {
-                if (faceExpression === this.lastFaceExpression) {
-                    this.duplicateConsecutiveExpressions++;
-                } else {
-                    if (this.lastFaceExpression && this.lastFaceExpressionTimestamp) {
-                        dispatch(addFaceExpression(
-                            this.lastFaceExpression,
-                            getFaceExpressionDuration(getState(), this.duplicateConsecutiveExpressions + 1),
-                            this.lastFaceExpressionTimestamp
-                        ));
-                    }
-                    this.lastFaceExpression = faceExpression;
-                    this.lastFaceExpressionTimestamp = Date.now();
-                    this.duplicateConsecutiveExpressions = 0;
+            // if the number of faces detected is different from 1 we do not take into consideration that detection
+            if (faceCount !== 1) {
+                if (this.noDetectionCount === 0) {
+                    this.noDetectionStartTimestamp = messageTimestamp;
+                }
+                this.noDetectionCount++;
+
+                if (this.noDetectionCount === NO_FACE_DETECTION_THRESHOLD && this.noDetectionStartTimestamp) {
+                    this.addFaceLandmarks(
+                            dispatch,
+                            this.noDetectionStartTimestamp,
+                            NO_DETECTION,
+                            addToBuffer
+                    );
+                }
+
+                return;
+            } else if (this.noDetectionCount > 0) {
+                this.noDetectionCount = 0;
+                this.noDetectionStartTimestamp = null;
+            }
+
+            if (faceExpression?.expression) {
+                const { expression } = faceExpression;
+
+                if (expression !== this.lastFaceExpression) {
+                    this.addFaceLandmarks(
+                        dispatch,
+                        messageTimestamp,
+                        expression,
+                        addToBuffer
+                    );
                }
            }

@@ -128,7 +151,7 @@ class FaceLandmarksDetector {
            APP.API.notifyFaceLandmarkDetected(faceBox, faceExpression);
        };

-        const { faceLandmarks } = getState()['features/base/config'];
+        const { faceLandmarks } = state['features/base/config'];
        const detectionTypes = [
            faceLandmarks?.enableFaceCentering && DETECTION_TYPES.FACE_BOX,
            faceLandmarks?.enableFaceExpressionsDetection && DETECTION_TYPES.FACE_EXPRESSIONS
@@ -162,7 +185,7 @@ class FaceLandmarksDetector {
        }

        if (this.recognitionActive) {
-            logger.log('Face detection already active.');
+            logger.log('Face landmarks detection already active.');

            return;
        }
@@ -179,7 +202,7 @@ class FaceLandmarksDetector {

        this.imageCapture = new ImageCapture(firstVideoTrack);
        this.recognitionActive = true;
-        logger.log('Start face detection');
+        logger.log('Start face landmarks detection');

        const { faceLandmarks } = state['features/base/config'];

@@ -191,7 +214,7 @@ class FaceLandmarksDetector {
                ).then(status => {
                    if (status) {
                        this.errorCount = 0;
-                    } else if (++this.errorCount > FACE_LANDMARK_DETECTION_ERROR_THRESHOLD) {
+                    } else if (++this.errorCount > FACE_LANDMARKS_DETECTION_ERROR_THRESHOLD) {
                        /* this prevents the detection from stopping immediately after occurring an error
                         * sometimes due to the small detection interval when starting the detection some errors
                         * might occur due to the track not being ready
@@ -228,18 +251,11 @@ class FaceLandmarksDetector {
        if (!this.recognitionActive || !this.isInitialized()) {
            return;
        }
+        const stopTimestamp = Date.now();
+        const addToBuffer = Boolean(getState()['features/base/config'].webhookProxyUrl);

        if (this.lastFaceExpression && this.lastFaceExpressionTimestamp) {
-            dispatch(
-                addFaceExpression(
-                    this.lastFaceExpression,
-                    getFaceExpressionDuration(getState(), this.duplicateConsecutiveExpressions + 1),
-                    this.lastFaceExpressionTimestamp
-                )
-            );
-            this.duplicateConsecutiveExpressions = 0;
-            this.lastFaceExpression = null;
-            this.lastFaceExpressionTimestamp = null;
+            this.addFaceLandmarks(dispatch, stopTimestamp, null, addToBuffer);
        }

        this.webhookSendInterval && window.clearInterval(this.webhookSendInterval);
@@ -248,7 +264,36 @@ class FaceLandmarksDetector {
        this.detectionInterval = null;
        this.imageCapture = null;
        this.recognitionActive = false;
-        logger.log('Stop face detection');
+        logger.log('Stop face landmarks detection');
+    }
+
+    /**
+     * Dispatches the action for adding new face landmarks and changes the state of the class.
+     *
+     * @param {IStore.dispatch} dispatch - The redux dispatch function.
+     * @param {number} endTimestamp - The timestamp when the face landmarks ended.
+     * @param {string} newFaceExpression - The new face expression.
+     * @param {boolean} addToBuffer - Flag for adding the face landmarks to the buffer.
+     * @returns {void}
+     */
+    private addFaceLandmarks(
+            dispatch: IStore['dispatch'],
+            endTimestamp: number,
+            newFaceExpression: string | null,
+            addToBuffer = false) {
+        if (this.lastFaceExpression && this.lastFaceExpressionTimestamp) {
+            dispatch(addFaceLandmarks(
+                {
+                    duration: endTimestamp - this.lastFaceExpressionTimestamp,
+                    faceExpression: this.lastFaceExpression,
+                    timestamp: this.lastFaceExpressionTimestamp
+                },
+                addToBuffer
+            ));
+        }
+
+        this.lastFaceExpression = newFaceExpression;
+        this.lastFaceExpressionTimestamp = endTimestamp;
    }

    /**
--- a/react/features/face-landmarks/FaceLandmarksHelper.ts
+++ b/react/features/face-landmarks/FaceLandmarksHelper.ts
@@ -2,7 +2,7 @@ import { setWasmPaths } from '@tensorflow/tfjs-backend-wasm';
 import { Config, FaceResult, Human } from '@vladmandic/human';

 import { DETECTION_TYPES, FACE_DETECTION_SCORE_THRESHOLD, FACE_EXPRESSIONS_NAMING_MAPPING } from './constants';
-import { DetectInput, DetectOutput, FaceBox, InitInput } from './types';
+import { DetectInput, DetectOutput, FaceBox, FaceExpression, InitInput } from './types';

 export interface IFaceLandmarksHelper {
    detect: ({ image, threshold }: DetectInput) => Promise<DetectOutput>;
@@ -10,7 +10,7 @@ export interface IFaceLandmarksHelper {
    getDetections: (image: ImageBitmap | ImageData) => Promise<Array<FaceResult>>;
    getFaceBox: (detections: Array<FaceResult>, threshold: number) => FaceBox | undefined;
    getFaceCount: (detections: Array<FaceResult>) => number;
-    getFaceExpression: (detections: Array<FaceResult>) => string | undefined;
+    getFaceExpression: (detections: Array<FaceResult>) => FaceExpression | undefined;
    init: () => Promise<void>;
 }

@@ -144,13 +144,18 @@ export class HumanHelper implements IFaceLandmarksHelper {
     * @param {Array<FaceResult>} detections - The array with the detections.
     * @returns {string | undefined}
     */
-    getFaceExpression(detections: Array<FaceResult>): string | undefined {
+    getFaceExpression(detections: Array<FaceResult>): FaceExpression | undefined {
        if (this.getFaceCount(detections) !== 1) {
            return;
        }

-        if (detections[0].emotion) {
-            return FACE_EXPRESSIONS_NAMING_MAPPING[detections[0].emotion[0].emotion];
+        const detection = detections[0];
+
+        if (detection.emotion) {
+            return {
+                expression: FACE_EXPRESSIONS_NAMING_MAPPING[detection.emotion[0].emotion],
+                score: detection.emotion[0].score
+            };
        }
    }

--- a/react/features/face-landmarks/actionTypes.ts
+++ b/react/features/face-landmarks/actionTypes.ts
@@ -1,32 +1,21 @@
 /**
- * Redux action type dispatched in order to add a face expression.
+ * Redux action type dispatched in order to add real-time faceLandmarks to timeline.
 *
 * {
- *      type: ADD_FACE_EXPRESSION,
- *      faceExpression: string,
- *      duration: number
+ *      type: ADD_FACE_LANDMARKS,
+ *      faceLandmarks: FaceLandmarks
 * }
 */
-export const ADD_FACE_EXPRESSION = 'ADD_FACE_EXPRESSION';
+export const ADD_FACE_LANDMARKS = 'ADD_FACE_LANDMARKS';

 /**
- * Redux action type dispatched in order to add a expression to the face expressions buffer.
+ * Redux action type dispatched in order to clear the faceLandmarks buffer for webhook in the state.
 *
 * {
- *      type: ADD_TO_FACE_EXPRESSIONS_BUFFER,
- *      faceExpression: string
+ *      type: CLEAR_FACE_LANDMARKS_BUFFER
 * }
 */
-export const ADD_TO_FACE_EXPRESSIONS_BUFFER = 'ADD_TO_FACE_EXPRESSIONS_BUFFER';
-
-/**
- * Redux action type dispatched in order to clear the face expressions buffer in the state.
- *
- * {
- *      type: CLEAR_FACE_EXPRESSIONS_BUFFER
- * }
-*/
-export const CLEAR_FACE_EXPRESSIONS_BUFFER = 'CLEAR_FACE_EXPRESSIONS_BUFFER';
+export const CLEAR_FACE_LANDMARKS_BUFFER = 'CLEAR_FACE_LANDMARKS_BUFFER';

 /**
 * Redux action type dispatched in order to update coordinates of a detected face.
--- a/react/features/face-landmarks/actions.ts
+++ b/react/features/face-landmarks/actions.ts
@@ -3,56 +3,35 @@ import './createImageBitmap';
 import { AnyAction } from 'redux';

 import {
-    ADD_FACE_EXPRESSION,
-    ADD_TO_FACE_EXPRESSIONS_BUFFER,
-    CLEAR_FACE_EXPRESSIONS_BUFFER,
+    ADD_FACE_LANDMARKS,
+    CLEAR_FACE_LANDMARKS_BUFFER,
    NEW_FACE_COORDINATES
 } from './actionTypes';
-import { FaceBox } from './types';
+import { FaceBox, FaceLandmarks } from './types';

 /**
- * Adds a new face expression and its duration.
+ * Adds new face landmarks to the timeline.
 *
- * @param  {string} faceExpression - Face expression to be added.
- * @param  {number} duration - Duration in seconds of the face expression.
- * @param  {number} timestamp - Duration in seconds of the face expression.
+ * @param {FaceLandmarks} faceLandmarks - The new face landmarks to timeline.
+ * @param {boolean} addToBuffer - If true adds the face landmarks to a buffer in the reducer for webhook.
 * @returns {AnyAction}
 */
-export function addFaceExpression(faceExpression: string, duration: number, timestamp: number): AnyAction {
+export function addFaceLandmarks(faceLandmarks: FaceLandmarks, addToBuffer: boolean): AnyAction {
    return {
-        type: ADD_FACE_EXPRESSION,
-        faceExpression,
-        duration,
-        timestamp
+        type: ADD_FACE_LANDMARKS,
+        faceLandmarks,
+        addToBuffer
    };
 }

 /**
- * Adds a face expression with its timestamp to the face expression buffer.
+ * Clears the face landmarks array in the state.
 *
- * @param {Object} faceExpression - Object containing face expression string and its timestamp.
 * @returns {AnyAction}
 */
-export function addToFaceExpressionsBuffer(
-        faceExpression: {
-            emotion: string;
-            timestamp: number;
-        }
-): AnyAction {
+export function clearFaceExpressionBuffer(): AnyAction {
    return {
-        type: ADD_TO_FACE_EXPRESSIONS_BUFFER,
-        faceExpression
-    };
-}
-
-/**
- * Clears the face expressions array in the state.
- *
- * @returns {Object}
- */
-export function clearFaceExpressionBuffer() {
-    return {
-        type: CLEAR_FACE_EXPRESSIONS_BUFFER
+        type: CLEAR_FACE_LANDMARKS_BUFFER
    };
 }

--- a/react/features/face-landmarks/constants.ts
+++ b/react/features/face-landmarks/constants.ts
@@ -37,6 +37,11 @@ export const INIT_WORKER = 'INIT_WORKER';
 */
 export const FACE_BOX_EVENT_TYPE = 'face-box';

+/**
+ * Type of event sent on the data channel.
+ */
+export const FACE_LANDMARKS_EVENT_TYPE = 'face-landmarks';
+
 /**
 * Milliseconds interval value for sending new image data to the worker.
 */
@@ -64,4 +69,15 @@ export const FACE_DETECTION_SCORE_THRESHOLD = 0.75;
 /**
 * Threshold for stopping detection after a certain number of consecutive errors have occurred.
 */
-export const FACE_LANDMARK_DETECTION_ERROR_THRESHOLD = 4;
+export const FACE_LANDMARKS_DETECTION_ERROR_THRESHOLD = 4;
+
+/**
+ * Threshold for number of consecutive detections with no face,
+ * so that when achieved there will be dispatched an action.
+ */
+export const NO_FACE_DETECTION_THRESHOLD = 5;
+
+/**
+ * Constant type used for signaling that no valid face detection is found.
+ */
+export const NO_DETECTION = 'no-detection';
--- a/react/features/face-landmarks/faceLandmarksWorker.ts
+++ b/react/features/face-landmarks/faceLandmarksWorker.ts
@@ -12,10 +12,9 @@ onmessage = async function({ data }: MessageEvent<any>) {

        const detections = await helper.detect(data);

-        if (detections && (detections.faceBox || detections.faceExpression || detections.faceCount)) {
+        if (detections) {
            self.postMessage(detections);
        }
-
        break;
    }

--- a/react/features/face-landmarks/functions.ts
+++ b/react/features/face-landmarks/functions.ts
@@ -1,40 +1,27 @@
 import { IReduxState } from '../app/types';
+import { IJitsiConference } from '../base/conference/reducer';
 import { getLocalParticipant } from '../base/participants/functions';
 import { extractFqnFromPath } from '../dynamic-branding/functions.any';

-import { DETECT_FACE, FACE_BOX_EVENT_TYPE, SEND_IMAGE_INTERVAL_MS } from './constants';
+import { FACE_BOX_EVENT_TYPE, FACE_LANDMARKS_EVENT_TYPE, SEND_IMAGE_INTERVAL_MS } from './constants';
 import logger from './logger';
-import { FaceBox } from './types';
-
-let canvas: HTMLCanvasElement;
-let context: CanvasRenderingContext2D | null;
-
-if (typeof OffscreenCanvas === 'undefined') {
-    canvas = document.createElement('canvas');
-    context = canvas.getContext('2d');
-}
+import { FaceBox, FaceLandmarks } from './types';

 /**
- * Sends the face expression with its duration to all the other participants.
+ * Sends the face landmarks to other participants via the data channel.
 *
 * @param {any} conference - The current conference.
- * @param  {string} faceExpression - Face expression to be sent.
- * @param {number} duration - The duration of the face expression in seconds.
+ * @param  {FaceLandmarks} faceLandmarks - Face landmarks to be sent.
 * @returns {void}
 */
-export function sendFaceExpressionToParticipants(
-        conference: any,
-        faceExpression: string,
-        duration: number
-): void {
+export function sendFaceExpressionToParticipants(conference: any, faceLandmarks: FaceLandmarks): void {
    try {
        conference.sendEndpointMessage('', {
-            type: 'face_landmark',
-            faceExpression,
-            duration
+            type: FACE_LANDMARKS_EVENT_TYPE,
+            faceLandmarks
        });
    } catch (err) {
-        logger.warn('Could not broadcast the face expression to the other participants', err);
+        logger.warn('Could not broadcast the face landmarks to the other participants', err);
    }

 }
@@ -61,30 +48,22 @@ export function sendFaceBoxToParticipants(
 }

 /**
- * Sends the face expression with its duration to xmpp server.
+ * Sends the face landmarks to prosody.
 *
 * @param {any} conference - The current conference.
- * @param  {string} faceExpression - Face expression to be sent.
- * @param {number} duration - The duration of the face expression in seconds.
+ * @param  {FaceLandmarks} faceLandmarks - Face landmarks to be sent.
 * @returns {void}
 */
-export function sendFaceExpressionToServer(
-        conference: any,
-        faceExpression: string,
-        duration: number
-): void {
+export function sendFaceExpressionToServer(conference: IJitsiConference, faceLandmarks: FaceLandmarks): void {
    try {
-        conference.sendFaceLandmarks({
-            faceExpression,
-            duration
-        });
+        conference.sendFaceLandmarks(faceLandmarks);
    } catch (err) {
-        logger.warn('Could not send the face expression to xmpp server', err);
+        logger.warn('Could not send the face landmarks to prosody', err);
    }
 }

 /**
- * Sends face expression to backend.
+ * Sends face landmarks to backend.
 *
 * @param  {Object} state - Redux state.
 * @returns {boolean} - True if sent, false otherwise.
@@ -96,9 +75,9 @@ export async function sendFaceExpressionsWebhook(state: IReduxState) {
    const { connection } = state['features/base/connection'];
    const jid = connection?.getJid();
    const localParticipant = getLocalParticipant(state);
-    const { faceExpressionsBuffer } = state['features/face-landmarks'];
+    const { faceLandmarksBuffer } = state['features/face-landmarks'];

-    if (faceExpressionsBuffer.length === 0) {
+    if (faceLandmarksBuffer.length === 0) {
        return false;
    }

@@ -111,7 +90,7 @@ export async function sendFaceExpressionsWebhook(state: IReduxState) {
        meetingFqn: extractFqnFromPath(),
        sessionId: conference?.sessionId,
        submitted: Date.now(),
-        emotions: faceExpressionsBuffer,
+        emotions: faceLandmarksBuffer,
        participantId: localParticipant?.jwtId,
        participantName: localParticipant?.name,
        participantJid: jid
@@ -138,55 +117,6 @@ export async function sendFaceExpressionsWebhook(state: IReduxState) {
 }


-/**
- * Sends the image data a canvas from the track in the image capture to the face recognition worker.
- *
- * @param {Worker} worker - Face recognition worker.
- * @param {Object} imageCapture - Image capture that contains the current track.
- * @param {number} threshold - Movement threshold as percentage for sharing face coordinates.
- * @returns {Promise<boolean>} - True if sent, false otherwise.
- */
-export async function sendDataToWorker(
-        worker: Worker,
-        imageCapture: ImageCapture,
-        threshold = 10
-): Promise<boolean> {
-    if (imageCapture === null || imageCapture === undefined) {
-        return false;
-    }
-
-    let imageBitmap;
-    let image;
-
-    try {
-        imageBitmap = await imageCapture.grabFrame();
-    } catch (err) {
-        logger.warn(err);
-
-        return false;
-    }
-
-    if (typeof OffscreenCanvas === 'undefined') {
-        canvas.width = imageBitmap.width;
-        canvas.height = imageBitmap.height;
-        context?.drawImage(imageBitmap, 0, 0);
-
-        image = context?.getImageData(0, 0, imageBitmap.width, imageBitmap.height);
-    } else {
-        image = imageBitmap;
-    }
-
-    worker.postMessage({
-        type: DETECT_FACE,
-        image,
-        threshold
-    });
-
-    imageBitmap.close();
-
-    return true;
-}
-
 /**
 * Gets face box for a participant id.
 *
@@ -230,14 +160,3 @@ export function getDetectionInterval(state: IReduxState) {

    return Math.max(faceLandmarks?.captureInterval || SEND_IMAGE_INTERVAL_MS);
 }
-
-/**
- * Returns the duration in seconds of a face expression.
- *
- * @param {IReduxState} state - The redux state.
- * @param {number} faceExpressionCount - The number of consecutive face expressions.
- * @returns {number} - Duration of face expression in seconds.
- */
-export function getFaceExpressionDuration(state: IReduxState, faceExpressionCount: number) {
-    return faceExpressionCount * (getDetectionInterval(state) / 1000);
-}
--- a/react/features/face-landmarks/middleware.ts
+++ b/react/features/face-landmarks/middleware.ts
@@ -11,18 +11,15 @@ import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 import { TRACK_ADDED, TRACK_REMOVED, TRACK_UPDATED } from '../base/tracks/actionTypes';

 import FaceLandmarksDetector from './FaceLandmarksDetector';
-import { ADD_FACE_EXPRESSION, NEW_FACE_COORDINATES, UPDATE_FACE_COORDINATES } from './actionTypes';
-import {
-    addToFaceExpressionsBuffer
-} from './actions';
+import { ADD_FACE_LANDMARKS, NEW_FACE_COORDINATES, UPDATE_FACE_COORDINATES } from './actionTypes';
 import { FACE_BOX_EVENT_TYPE } from './constants';
 import { sendFaceBoxToParticipants, sendFaceExpressionToParticipants, sendFaceExpressionToServer } from './functions';


 MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: any) => {
    const { dispatch, getState } = store;
-    const { faceLandmarks } = getState()['features/base/config'];
-    const isEnabled = faceLandmarks?.enableFaceCentering || faceLandmarks?.enableFaceExpressionsDetection;
+    const { faceLandmarks: faceLandmarksConfig } = getState()['features/base/config'];
+    const isEnabled = faceLandmarksConfig?.enableFaceCentering || faceLandmarksConfig?.enableFaceExpressionsDetection;

    if (action.type === CONFERENCE_JOINED) {
        if (isEnabled) {
@@ -99,19 +96,16 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: any)

        return next(action);
    }
-    case ADD_FACE_EXPRESSION: {
+    case ADD_FACE_LANDMARKS: {
        const state = getState();
-        const { faceExpression, duration, timestamp } = action;
+        const { faceLandmarks } = action;
        const conference = getCurrentConference(state);

        if (getParticipantCount(state) > 1) {
-            sendFaceExpressionToParticipants(conference, faceExpression, duration);
+            sendFaceExpressionToParticipants(conference, faceLandmarks);
        }
-        sendFaceExpressionToServer(conference, faceExpression, duration);
-        dispatch(addToFaceExpressionsBuffer({
-            emotion: faceExpression,
-            timestamp
-        }));
+
+        sendFaceExpressionToServer(conference, faceLandmarks);

        return next(action);
    }
--- a/react/features/face-landmarks/reducer.ts
+++ b/react/features/face-landmarks/reducer.ts
@@ -1,42 +1,25 @@
 import ReducerRegistry from '../base/redux/ReducerRegistry';

 import {
-    ADD_FACE_EXPRESSION,
-    ADD_TO_FACE_EXPRESSIONS_BUFFER,
-    CLEAR_FACE_EXPRESSIONS_BUFFER,
+    ADD_FACE_LANDMARKS,
+    CLEAR_FACE_LANDMARKS_BUFFER,
    UPDATE_FACE_COORDINATES
 } from './actionTypes';
-import { FaceBox } from './types';
+import { FaceBox, FaceLandmarks } from './types';

 const defaultState = {
    faceBoxes: {},
-    faceExpressions: {
-        happy: 0,
-        neutral: 0,
-        surprised: 0,
-        angry: 0,
-        fearful: 0,
-        disgusted: 0,
-        sad: 0
-    },
-    faceExpressionsBuffer: [],
+    faceLandmarks: [],
+    faceLandmarksBuffer: [],
    recognitionActive: false
 };

 export interface IFaceLandmarksState {
    faceBoxes: { [key: string]: FaceBox; };
-    faceExpressions: {
-        angry: number;
-        disgusted: number;
-        fearful: number;
-        happy: number;
-        neutral: number;
-        sad: number;
-        surprised: number;
-    };
-    faceExpressionsBuffer: Array<{
+    faceLandmarks: Array<FaceLandmarks>;
+    faceLandmarksBuffer: Array<{
        emotion: string;
-        timestamp: string;
+        timestamp: number;
    }>;
    recognitionActive: boolean;
 }
@@ -44,26 +27,23 @@ export interface IFaceLandmarksState {
 ReducerRegistry.register<IFaceLandmarksState>('features/face-landmarks',
 (state = defaultState, action): IFaceLandmarksState => {
    switch (action.type) {
-    case ADD_FACE_EXPRESSION: {
+    case ADD_FACE_LANDMARKS: {
+        const { addToBuffer, faceLandmarks }: { addToBuffer: boolean; faceLandmarks: FaceLandmarks; } = action;
+
        return {
            ...state,
-            faceExpressions: {
-                ...state.faceExpressions,
-                [action.faceExpression]: state.faceExpressions[
-                    action.faceExpression as keyof typeof state.faceExpressions] + action.duration
-            }
+            faceLandmarks: [ ...state.faceLandmarks, faceLandmarks ],
+            faceLandmarksBuffer: addToBuffer ? [ ...state.faceLandmarksBuffer,
+                {
+                    emotion: faceLandmarks.faceExpression,
+                    timestamp: faceLandmarks.timestamp
+                } ] : state.faceLandmarksBuffer
        };
    }
-    case ADD_TO_FACE_EXPRESSIONS_BUFFER: {
+    case CLEAR_FACE_LANDMARKS_BUFFER: {
        return {
            ...state,
-            faceExpressionsBuffer: [ ...state.faceExpressionsBuffer, action.faceExpression ]
-        };
-    }
-    case CLEAR_FACE_EXPRESSIONS_BUFFER: {
-        return {
-            ...state,
-            faceExpressionsBuffer: []
+            faceLandmarksBuffer: []
        };
    }
    case UPDATE_FACE_COORDINATES: {
--- a/react/features/face-landmarks/types.ts
+++ b/react/features/face-landmarks/types.ts
@@ -19,5 +19,21 @@ export type InitInput = {
 export type DetectOutput = {
    faceBox?: FaceBox;
    faceCount: number;
-    faceExpression?: string;
+    faceExpression?: FaceExpression;
+};
+
+export type FaceExpression = {
+    expression: string;
+    score: number;
+};
+
+export type FaceLandmarks = {
+
+    // duration in milliseconds of the face landmarks
+    duration: number;
+    faceExpression: string;
+    score?: number;
+
+    // the start timestamp of the expression
+    timestamp: number;
 };
--- a/react/features/filmstrip/components/native/Thumbnail.js
+++ b/react/features/filmstrip/components/native/Thumbnail.js
@@ -1,5 +1,3 @@
-// @flow
-
 import React, { PureComponent } from 'react';
 import { Image, View } from 'react-native';
 import type { Dispatch } from 'redux';
@@ -226,11 +224,11 @@ class Thumbnail extends PureComponent<Props> {
                ] }>
                { !_isVirtualScreenshare && <ConnectionIndicator participantId = { participantId } /> }
                { !_isVirtualScreenshare && <RaisedHandIndicator participantId = { participantId } /> }
-                {tileView && isScreenShare && (
+                { tileView && isScreenShare && (
                    <View style = { styles.indicatorContainer }>
                        <ScreenShareIndicator />
                    </View>
-                )}
+                ) }
            </View>);
            indicators.push(<Container
                key = 'bottom-indicators'
@@ -369,7 +367,7 @@ class Thumbnail extends PureComponent<Props> {
                    _renderDominantSpeakerIndicator && !_isVirtualScreenshare ? styles.thumbnailDominantSpeaker : null
                ] }
                touchFeedback = { false }>
-                {_gifSrc ? <Image
+                { _gifSrc ? <Image
                    source = {{ uri: _gifSrc }}
                    style = { styles.thumbnailGif } />
                    : <>
--- a/react/features/filmstrip/components/web/Filmstrip.tsx
+++ b/react/features/filmstrip/components/web/Filmstrip.tsx
@@ -17,12 +17,10 @@ import { IconArrowDown, IconArrowUp } from '../../../base/icons/svg';
 import { IParticipant } from '../../../base/participants/types';
 import { connect } from '../../../base/redux/functions';
 import { shouldHideSelfView } from '../../../base/settings/functions.web';
-// @ts-ignore
 import { showToolbox } from '../../../toolbox/actions.web';
 import { isButtonEnabled, isToolboxVisible } from '../../../toolbox/functions.web';
-// @ts-ignore
-import { getCurrentLayout } from '../../../video-layout';
 import { LAYOUTS } from '../../../video-layout/constants';
+import { getCurrentLayout } from '../../../video-layout/functions.web';
 import {
    setFilmstripVisible,
    setTopPanelVisible,
@@ -30,7 +28,6 @@ import {
    setUserFilmstripWidth,
    setUserIsResizing,
    setVisibleRemoteParticipants
-    // @ts-ignore
 } from '../../actions';
 import {
    ASPECT_RATIO_BREAKPOINT,
@@ -46,7 +43,6 @@ import {
    getVerticalViewMaxWidth,
    isStageFilmstripTopPanel,
    shouldRemoteVideosBeVisible
-    // @ts-ignore
 } from '../../functions';

 // @ts-ignore
--- a/react/features/filmstrip/components/web/PinnedIndicator.tsx
+++ b/react/features/filmstrip/components/web/PinnedIndicator.tsx
@@ -6,8 +6,6 @@ import { IReduxState } from '../../../app/types';
 import { IconPin } from '../../../base/icons/svg';
 import { getParticipantById } from '../../../base/participants/functions';
 import BaseIndicator from '../../../base/react/components/web/BaseIndicator';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { getPinnedActiveParticipants, isStageFilmstripAvailable } from '../../functions.web';

 /**
--- a/react/features/filmstrip/components/web/Thumbnail.tsx
+++ b/react/features/filmstrip/components/web/Thumbnail.tsx
@@ -39,10 +39,8 @@ import { hideGif, showGif } from '../../../gifs/actions';
 import { getGifDisplayMode, getGifForParticipant } from '../../../gifs/functions';
 // @ts-ignore
 import { PresenceLabel } from '../../../presence-status';
-// @ts-ignore
-import { getCurrentLayout } from '../../../video-layout';
 import { LAYOUTS } from '../../../video-layout/constants';
-// @ts-ignore
+import { getCurrentLayout } from '../../../video-layout/functions.web';
 import { togglePinStageParticipant } from '../../actions';
 import {
    DISPLAY_MODE_TO_CLASS_NAME,
@@ -60,7 +58,6 @@ import {
    isStageFilmstripAvailable,
    isVideoPlayable,
    showGridInVerticalView
-    // @ts-ignore
 } from '../../functions';

 // @ts-ignore
@@ -1188,7 +1185,7 @@ function _mapStateToProps(state: IReduxState, ownProps: any): Object {
    const _audioTrack = isLocal
        ? getLocalAudioTrack(tracks)
        : getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.AUDIO, id);
-    const _currentLayout = getCurrentLayout(state);
+    const _currentLayout = getCurrentLayout(state) ?? '';
    let size: any = {};
    let _isMobilePortrait = false;
    const {
--- a/react/features/filmstrip/components/web/ThumbnailBottomIndicators.tsx
+++ b/react/features/filmstrip/components/web/ThumbnailBottomIndicators.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable lines-around-comment */
-
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { makeStyles } from 'tss-react/mui';
--- a/react/features/filmstrip/components/web/ThumbnailTopIndicators.tsx
+++ b/react/features/filmstrip/components/web/ThumbnailTopIndicators.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable lines-around-comment */
-
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { makeStyles } from 'tss-react/mui';
@@ -9,11 +7,11 @@ import { isMobileBrowser } from '../../../base/environment/utils';
 import { isScreenShareParticipantById } from '../../../base/participants/functions';
 import ConnectionIndicator from '../../../connection-indicator/components/web/ConnectionIndicator';
 import { STATS_POPOVER_POSITION, THUMBNAIL_TYPE } from '../../constants';
-// @ts-ignore
 import { getIndicatorsTooltipPosition } from '../../functions.web';

 import PinnedIndicator from './PinnedIndicator';
 import RaisedHandIndicator from './RaisedHandIndicator';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import StatusIndicators from './StatusIndicators';
 import VideoMenuTriggerButton from './VideoMenuTriggerButton';
--- a/react/features/filmstrip/subscriber.web.ts
+++ b/react/features/filmstrip/subscriber.web.ts
@@ -4,8 +4,6 @@ import { getParticipantCountWithFake } from '../base/participants/functions';
 import StateListenerRegistry from '../base/redux/StateListenerRegistry';
 import { clientResized } from '../base/responsive-ui/actions';
 import { shouldHideSelfView } from '../base/settings/functions.web';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { selectParticipantInLargeVideo } from '../large-video/actions.any';
 import { getParticipantsPaneOpen } from '../participants-pane/functions';
 import { setOverflowDrawer } from '../toolbox/actions.web';
--- a/react/features/gifs/components/web/GifsMenu.tsx
+++ b/react/features/gifs/components/web/GifsMenu.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import { GiphyFetch, TrendingOptions } from '@giphy/js-fetch-api';
 import { Grid } from '@giphy/react-components';
 import React, { useCallback, useEffect, useState } from 'react';
@@ -13,8 +12,8 @@ import Input from '../../../base/ui/components/web/Input';
 import { sendMessage } from '../../../chat/actions.any';
 import { SCROLL_SIZE } from '../../../filmstrip/constants';
 import { toggleReactionsMenuVisibility } from '../../../reactions/actions.web';
-// @ts-ignore
 import { setOverflowMenuVisible } from '../../../toolbox/actions.web';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { Drawer, JitsiPortal } from '../../../toolbox/components/web';
 import { showOverflowDrawer } from '../../../toolbox/functions.web';
--- a/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.tsx
+++ b/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.tsx
@@ -12,8 +12,7 @@ import { connect } from '../../../../base/redux/functions';
 import Dialog from '../../../../base/ui/components/web/Dialog';
 import { isDynamicBrandingDataLoaded } from '../../../../dynamic-branding/functions.any';
 import { isVpaasMeeting } from '../../../../jaas/functions';
-// @ts-ignore
-import { getActiveSession } from '../../../../recording';
+import { getActiveSession } from '../../../../recording/functions';
 // @ts-ignore
 import { updateDialInNumbers } from '../../../actions';
 import {
--- a/react/features/keyboard-shortcuts/actions.ts
+++ b/react/features/keyboard-shortcuts/actions.ts
--- a/react/features/keyboard-shortcuts/middleware.ts
+++ b/react/features/keyboard-shortcuts/middleware.ts
@@ -1,19 +1,14 @@
-// @flow
-
-import { MiddlewareRegistry } from '../base/redux';
+import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';

 import { OPEN_KEYBOARD_SHORTCUTS_DIALOG } from './actionTypes';

-declare var APP: Object;
-
 /**
 * Implements the middleware of the feature keyboard-shortcuts.
 *
 * @param {Store} store - The redux store.
 * @returns {Function}
 */
-// eslint-disable-next-line no-unused-vars
-MiddlewareRegistry.register(store => next => action => {
+MiddlewareRegistry.register(_store => next => action => {
    switch (action.type) {
    case OPEN_KEYBOARD_SHORTCUTS_DIALOG:
        if (typeof APP === 'object') {
--- a/react/features/large-video/actions.any.ts
+++ b/react/features/large-video/actions.any.ts
@@ -1,8 +1,5 @@
-// @flow
-
-import type { Dispatch } from 'redux';
-
-import { MEDIA_TYPE } from '../base/media';
+import { IReduxState, IStore } from '../app/types';
+import { MEDIA_TYPE } from '../base/media/constants';
 import {
    getDominantSpeakerParticipant,
    getLocalParticipant,
@@ -10,9 +7,10 @@ import {
    getPinnedParticipant,
    getRemoteParticipants,
    getVirtualScreenshareParticipantByOwnerId
-} from '../base/participants';
+} from '../base/participants/functions';
+import { ITrack } from '../base/tracks/types';
 import { isStageFilmstripAvailable } from '../filmstrip/functions';
-import { getAutoPinSetting } from '../video-layout';
+import { getAutoPinSetting } from '../video-layout/functions';

 import {
    SELECT_LARGE_VIDEO_PARTICIPANT,
@@ -30,8 +28,8 @@ import {
 * displayed on the large video.
 * @returns {Function}
 */
-export function selectParticipantInLargeVideo(participant: ?string) {
-    return (dispatch: Dispatch<any>, getState: Function) => {
+export function selectParticipantInLargeVideo(participant?: string) {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();

        if (isStageFilmstripAvailable(state, 2)) {
@@ -48,7 +46,7 @@ export function selectParticipantInLargeVideo(participant: ?string) {
        const remoteScreenShares = state['features/video-layout'].remoteScreenShares;
        let latestScreenshareParticipantId;

-        if (remoteScreenShares && remoteScreenShares.length) {
+        if (remoteScreenShares?.length) {
            latestScreenshareParticipantId = remoteScreenShares[remoteScreenShares.length - 1];
        }

@@ -94,7 +92,7 @@ export function updateKnownLargeVideoResolution(resolution: number) {
 *     width: number
 * }}
 */
-export function setLargeVideoDimensions(height, width) {
+export function setLargeVideoDimensions(height: number, width: number) {
    return {
        type: SET_LARGE_VIDEO_DIMENSIONS,
        height,
@@ -109,7 +107,7 @@ export function setLargeVideoDimensions(height, width) {
 * @private
 * @returns {(Track|undefined)}
 */
-function _electLastVisibleRemoteVideo(tracks) {
+function _electLastVisibleRemoteVideo(tracks: ITrack[]) {
    // First we try to get most recent remote video track.
    for (let i = tracks.length - 1; i >= 0; --i) {
        const track = tracks[i];
@@ -129,7 +127,7 @@ function _electLastVisibleRemoteVideo(tracks) {
 * @private
 * @returns {(string|undefined)}
 */
-function _electParticipantInLargeVideo(state) {
+function _electParticipantInLargeVideo(state: IReduxState) {
    // If a participant is pinned, they will be shown in the LargeVideo (regardless of whether they are local or
    // remote) when the filmstrip on stage is disabled.
    let participant = getPinnedParticipant(state);
--- a/react/features/large-video/actions.native.ts
+++ b/react/features/large-video/actions.native.ts
@@ -1,3 +1 @@
-// @flow
-
 export * from './actions.any';
--- a/react/features/large-video/actions.web.ts
+++ b/react/features/large-video/actions.web.ts
@@ -1,10 +1,8 @@
-// @flow
-
-import type { Dispatch } from 'redux';
-
+// @ts-expect-error
 import VideoLayout from '../../../modules/UI/videolayout/VideoLayout';
-import { MEDIA_TYPE } from '../base/media';
-import { getTrackByMediaTypeAndParticipant } from '../base/tracks';
+import { IStore } from '../app/types';
+import { MEDIA_TYPE } from '../base/media/constants';
+import { getTrackByMediaTypeAndParticipant } from '../base/tracks/functions.web';

 import { SET_SEE_WHAT_IS_BEING_SHARED, UPDATE_LAST_LARGE_VIDEO_MEDIA_EVENT } from './actionTypes';

@@ -16,7 +14,7 @@ export * from './actions.any';
 * @returns {Function}
 */
 export function captureLargeVideoScreenshot() {
-    return (dispatch: Dispatch<any>, getState: Function): Promise<string> => {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();
        const largeVideo = state['features/large-video'];
        const promise = Promise.resolve();
@@ -28,7 +26,7 @@ export function captureLargeVideoScreenshot() {
        const participantTrack = getTrackByMediaTypeAndParticipant(tracks, MEDIA_TYPE.VIDEO, largeVideo.participantId);

        // Participants that join the call video muted do not have a jitsiTrack attached.
-        if (!(participantTrack && participantTrack.jitsiTrack)) {
+        if (!participantTrack?.jitsiTrack) {
            return promise;
        }
        const videoStream = participantTrack.jitsiTrack.getOriginalStream();
@@ -39,7 +37,7 @@ export function captureLargeVideoScreenshot() {

        // Get the video element for the large video, cast HTMLElement to HTMLVideoElement to make flow happy.
        /* eslint-disable-next-line no-extra-parens*/
-        const videoElement = ((document.getElementById('largeVideo'): any): HTMLVideoElement);
+        const videoElement = (document.getElementById('largeVideo') as any);

        if (!videoElement) {
            return promise;
@@ -54,11 +52,11 @@ export function captureLargeVideoScreenshot() {
        canvasElement.style.display = 'none';
        canvasElement.height = parseInt(height, 10);
        canvasElement.width = parseInt(width, 10);
-        ctx.drawImage(videoElement, 0, 0);
+        ctx?.drawImage(videoElement, 0, 0);
        const dataURL = canvasElement.toDataURL('image/png', 1.0);

        // Cleanup.
-        ctx.clearRect(0, 0, canvasElement.width, canvasElement.height);
+        ctx?.clearRect(0, 0, canvasElement.width, canvasElement.height);
        canvasElement.remove();

        return Promise.resolve(dataURL);
@@ -73,7 +71,7 @@ export function captureLargeVideoScreenshot() {
 * @returns {Function}
 */
 export function resizeLargeVideo(width: number, height: number) {
-    return (dispatch: Dispatch<any>, getState: Function) => {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();
        const largeVideo = state['features/large-video'];

--- a/react/features/large-video/components/ScreenSharePlaceholder.web.tsx
+++ b/react/features/large-video/components/ScreenSharePlaceholder.web.tsx
@@ -4,8 +4,6 @@ import { useStore } from 'react-redux';
 import { makeStyles } from 'tss-react/mui';

 import { translate } from '../../base/i18n/functions';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { setSeeWhatIsBeingShared } from '../actions.web';

 const useStyles = makeStyles()(theme => {
--- a/react/features/large-video/functions.js
+++ b/react/features/large-video/functions.js
@@ -1,15 +0,0 @@
-// @flow
-
-import { getParticipantById } from '../base/participants';
-
-/**
- * Selector for the participant currently displaying on the large video.
- *
- * @param {Object} state - The redux state.
- * @returns {Object}
- */
-export function getLargeVideoParticipant(state: Object) {
-    const { participantId } = state['features/large-video'];
-
-    return getParticipantById(state, participantId);
-}
--- a/react/features/large-video/functions.ts
+++ b/react/features/large-video/functions.ts
@@ -0,0 +1,14 @@
+import { IReduxState } from '../app/types';
+import { getParticipantById } from '../base/participants/functions';
+
+/**
+ * Selector for the participant currently displaying on the large video.
+ *
+ * @param {Object} state - The redux state.
+ * @returns {Object}
+ */
+export function getLargeVideoParticipant(state: IReduxState) {
+    const { participantId } = state['features/large-video'];
+
+    return getParticipantById(state, participantId ?? '');
+}
--- a/react/features/large-video/logger.ts
+++ b/react/features/large-video/logger.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { getLogger } from '../base/logging/functions';

 export default getLogger('features/large-video');
--- a/react/features/large-video/middleware.ts
+++ b/react/features/large-video/middleware.ts
@@ -1,19 +1,16 @@
-// @flow
-
 import {
    DOMINANT_SPEAKER_CHANGED,
    PARTICIPANT_JOINED,
    PARTICIPANT_LEFT,
-    PIN_PARTICIPANT,
-    getDominantSpeakerParticipant,
-    getLocalParticipant
-} from '../base/participants';
-import { MiddlewareRegistry } from '../base/redux';
-import { isTestModeEnabled } from '../base/testing';
+    PIN_PARTICIPANT
+} from '../base/participants/actionTypes';
+import { getDominantSpeakerParticipant, getLocalParticipant } from '../base/participants/functions';
+import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
+import { isTestModeEnabled } from '../base/testing/functions';
 import {
    TRACK_ADDED,
    TRACK_REMOVED
-} from '../base/tracks';
+} from '../base/tracks/actionTypes';
 import { TOGGLE_DOCUMENT_EDITING } from '../etherpad/actionTypes';

 import { selectParticipantInLargeVideo } from './actions';
--- a/react/features/large-video/subscriber.native.ts
+++ b/react/features/large-video/subscriber.native.ts
--- a/react/features/large-video/subscriber.web.ts
+++ b/react/features/large-video/subscriber.web.ts
@@ -1,8 +1,7 @@
-// @flow
-
+// @ts-expect-error
 import VideoLayout from '../../../modules/UI/videolayout/VideoLayout';
-import { StateListenerRegistry } from '../base/redux';
-import { getVideoTrackByParticipant } from '../base/tracks';
+import StateListenerRegistry from '../base/redux/StateListenerRegistry';
+import { getVideoTrackByParticipant } from '../base/tracks/functions.web';

 import { getLargeVideoParticipant } from './functions';

@@ -29,7 +28,7 @@ StateListenerRegistry.register(
            streamingStatus: videoTrack?.streamingStatus
        };
    },
-    /* listener */ ({ participantId, streamingStatus }, previousState = {}) => {
+    /* listener */ ({ participantId, streamingStatus }, previousState: any = {}) => {
        if (streamingStatus !== previousState.streamingStatus) {
            VideoLayout.updateLargeVideo(participantId, true);
        }
--- a/react/features/lobby/actions.any.ts
+++ b/react/features/lobby/actions.any.ts
@@ -1,19 +1,13 @@
-// @flow
-
-import { type Dispatch } from 'redux';
-
-import {
-    conferenceWillJoin,
-    getCurrentConference,
-    sendLocalParticipant,
-    setPassword
-} from '../base/conference';
-import { getLocalParticipant } from '../base/participants';
+import { IStore } from '../app/types';
+import { conferenceWillJoin, setPassword } from '../base/conference/actions';
+import { getCurrentConference, sendLocalParticipant } from '../base/conference/functions';
+import { getLocalParticipant } from '../base/participants/functions';
+import { IParticipant } from '../base/participants/types';
 import { onLobbyChatInitialized, removeLobbyChatParticipant, sendMessage } from '../chat/actions.any';
 import { LOBBY_CHAT_MESSAGE } from '../chat/constants';
 import { handleLobbyMessageReceived } from '../chat/middleware';
-import { LOBBY_NOTIFICATION_ID, hideNotification } from '../notifications';
-import { showNotification } from '../notifications/actions';
+import { hideNotification, showNotification } from '../notifications/actions';
+import { LOBBY_NOTIFICATION_ID } from '../notifications/constants';

 import {
    KNOCKING_PARTICIPANT_ARRIVED_OR_UPDATED,
@@ -27,6 +21,7 @@ import {
 } from './actionTypes';
 import { LOBBY_CHAT_INITIALIZED, MODERATOR_IN_CHAT_WITH_LEFT } from './constants';
 import { getKnockingParticipants, getLobbyEnabled } from './functions';
+import { IKnockingParticipant } from './types';

 /**
 * Tries to join with a preset password.
@@ -35,7 +30,7 @@ import { getKnockingParticipants, getLobbyEnabled } from './functions';
 * @returns {Function}
 */
 export function joinWithPassword(password: string) {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const conference = getCurrentConference(getState);

        dispatch(setPassword(conference, conference.join, password));
@@ -67,7 +62,7 @@ export function knockingParticipantLeft(id: string) {
 *     type: KNOCKING_PARTICIPANT_ARRIVED_OR_UPDATED
 * }}
 */
-export function participantIsKnockingOrUpdated(participant: Object) {
+export function participantIsKnockingOrUpdated(participant: IKnockingParticipant | Object) {
    return {
        participant,
        type: KNOCKING_PARTICIPANT_ARRIVED_OR_UPDATED
@@ -82,7 +77,7 @@ export function participantIsKnockingOrUpdated(participant: Object) {
 * @returns {Function}
 */
 export function answerKnockingParticipant(id: string, approved: boolean) {
-    return async (dispatch: Dispatch<any>) => {
+    return async (dispatch: IStore['dispatch']) => {
        dispatch(setKnockingParticipantApproval(id, approved));
        dispatch(hideNotification(LOBBY_NOTIFICATION_ID));
    };
@@ -96,7 +91,7 @@ export function answerKnockingParticipant(id: string, approved: boolean) {
 * @returns {Function}
 */
 export function setKnockingParticipantApproval(id: string, approved: boolean) {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const conference = getCurrentConference(getState);

        if (conference) {
@@ -115,8 +110,8 @@ export function setKnockingParticipantApproval(id: string, approved: boolean) {
 * @param {Array<Object>} participants - A list of knocking participants.
 * @returns {void}
 */
-export function admitMultiple(participants: Array<Object>) {
-    return (dispatch: Function, getState: Function) => {
+export function admitMultiple(participants: Array<IKnockingParticipant>) {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const conference = getCurrentConference(getState);

        participants.forEach(p => {
@@ -132,10 +127,10 @@ export function admitMultiple(participants: Array<Object>) {
 * @returns {Function}
 */
 export function approveKnockingParticipant(id: string) {
-    return (dispatch: Dispatch<any>, getState: Function) => {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const conference = getCurrentConference(getState);

-        conference && conference.lobbyApproveAccess(id);
+        conference?.lobbyApproveAccess(id);
    };
 }

@@ -146,10 +141,10 @@ export function approveKnockingParticipant(id: string) {
 * @returns {Function}
 */
 export function rejectKnockingParticipant(id: string) {
-    return (dispatch: Dispatch<any>, getState: Function) => {
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const conference = getCurrentConference(getState);

-        conference && conference.lobbyDenyAccess(id);
+        conference?.lobbyDenyAccess(id);
    };
 }

@@ -207,18 +202,20 @@ export function setPasswordJoinFailed(failed: boolean) {
 * @returns {Function}
 */
 export function startKnocking() {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();
        const { membersOnly } = state['features/base/conference'];
        const localParticipant = getLocalParticipant(state);

+        // @ts-ignore
        dispatch(conferenceWillJoin(membersOnly));

        // We need to update the conference object with the current display name, if approved
        // we want to send that display name, it was not updated in case when pre-join is disabled
+        // @ts-ignore
        sendLocalParticipant(state, membersOnly);

-        membersOnly.joinLobby(localParticipant.name, localParticipant.email);
+        membersOnly?.joinLobby(localParticipant?.name, localParticipant?.email);
        dispatch(setLobbyMessageListener());
        dispatch(setKnockingState(true));
    };
@@ -231,7 +228,7 @@ export function startKnocking() {
 * @returns {Function}
 */
 export function toggleLobbyMode(enabled: boolean) {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const conference = getCurrentConference(getState);

        if (enabled) {
@@ -275,8 +272,8 @@ export function hideLobbyScreen() {
 *
 * @returns {Promise<void>}
 */
-export function handleLobbyChatInitialized(payload: Object) {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+export function handleLobbyChatInitialized(payload: { attendee: IParticipant; moderator: IParticipant; }) {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();
        const conference = getCurrentConference(state);

@@ -296,8 +293,8 @@ export function handleLobbyChatInitialized(payload: Object) {
            dispatch(showNotification({
                titleKey: 'lobby.lobbyChatStartedNotification',
                titleArguments: {
-                    moderator: payload.moderator.name,
-                    attendee: payload.attendee.name
+                    moderator: payload.moderator.name ?? '',
+                    attendee: payload.attendee.name ?? ''
                }
            }));
        }
@@ -312,7 +309,7 @@ export function handleLobbyChatInitialized(payload: Object) {
 * @returns {Promise<void>}
 */
 export function onSendMessage(message: string) {
-    return async (dispatch: Dispatch<any>) => {
+    return async (dispatch: IStore['dispatch']) => {
        dispatch(sendMessage(message));
    };
 }
@@ -325,7 +322,7 @@ export function onSendMessage(message: string) {
 * @returns {Promise<void>}
 */
 export function sendLobbyChatMessage(message: Object) {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const conference = getCurrentConference(getState);

        conference.sendLobbyMessage(message);
@@ -338,7 +335,7 @@ export function sendLobbyChatMessage(message: Object) {
 * @returns {Function}
 */
 export function maybeSetLobbyChatMessageListener() {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();
        const lobbyEnabled = getLobbyEnabled(state);

@@ -355,7 +352,7 @@ export function maybeSetLobbyChatMessageListener() {
 * @returns {Function}
 */
 export function updateLobbyParticipantOnLeave(participantId: string) {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();
        const { knocking, knockingParticipants } = state['features/lobby'];
        const { lobbyMessageRecipient } = state['features/chat'];
@@ -370,7 +367,7 @@ export function updateLobbyParticipantOnLeave(participantId: string) {
            const participantToNotify = knockingParticipants.find(p => p.chattingWithModerator === participantId);

            if (participantToNotify) {
-                conference.sendLobbyMessage({
+                conference?.sendLobbyMessage({
                    type: MODERATOR_IN_CHAT_WITH_LEFT,
                    moderatorId: participantToNotify.chattingWithModerator
                }, participantToNotify.id);
@@ -389,7 +386,7 @@ export function updateLobbyParticipantOnLeave(participantId: string) {
 * @returns {Function}
 */
 export function setLobbyMessageListener() {
-    return async (dispatch: Dispatch<any>, getState: Function) => {
+    return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const state = getState();
        const conference = getCurrentConference(state);
        const { enableLobbyChat = true } = state['features/base/config'];
@@ -398,7 +395,7 @@ export function setLobbyMessageListener() {
            return;
        }

-        conference.addLobbyMessageListener((message: Object, participantId: string) => {
+        conference.addLobbyMessageListener((message: any, participantId: string) => {
            if (message.type === LOBBY_CHAT_MESSAGE) {
                return dispatch(handleLobbyMessageReceived(message.message, participantId));
            }
--- a/react/features/lobby/actions.native.ts
+++ b/react/features/lobby/actions.native.ts
@@ -1,6 +1,7 @@
 import { batch } from 'react-redux';

-import { appNavigate } from '../app/actions';
+import { appNavigate } from '../app/actions.native';
+import { IStore } from '../app/types';

 import { hideLobbyScreen, setKnockingState } from './actions.any';

@@ -12,7 +13,7 @@ export * from './actions.any';
 * @returns {Function}
 */
 export function cancelKnocking() {
-    return dispatch => {
+    return (dispatch: IStore['dispatch']) => {
        batch(() => {
            dispatch(setKnockingState(false));
            dispatch(hideLobbyScreen());
--- a/react/features/lobby/actions.web.ts
+++ b/react/features/lobby/actions.web.ts
@@ -1,20 +1,15 @@
-// @flow
-
-import { type Dispatch } from 'redux';
-
-import { maybeRedirectToWelcomePage } from '../app/actions';
+import { maybeRedirectToWelcomePage } from '../app/actions.web';
+import { IStore } from '../app/types';

 export * from './actions.any';

-declare var APP: Object;
-
 /**
 * Cancels the ongoing knocking and abandons the join flow.
 *
 * @returns {Function}
 */
 export function cancelKnocking() {
-    return async (dispatch: Dispatch<any>) => {
+    return async (dispatch: IStore['dispatch']) => {
        // when we are redirecting the library should handle any
        // unload and clean of the connection.
        APP.API.notifyReadyToClose();
--- a/react/features/lobby/components/native/KnockingParticipantList.js
+++ b/react/features/lobby/components/native/KnockingParticipantList.js
@@ -1,21 +1,22 @@
-// @flow
-
 import React, { PureComponent } from 'react';
-import { ScrollView, Text, TouchableOpacity, View } from 'react-native';
+import { View } from 'react-native';

-import { Avatar } from '../../../base/avatar';
-import { translate } from '../../../base/i18n';
-import { isLocalParticipantModerator } from '../../../base/participants';
+import { translate } from '../../../base/i18n/functions';
+import { isLocalParticipantModerator } from '../../../base/participants/functions';
 import { connect } from '../../../base/redux';
-import { handleLobbyChatInitialized } from '../../../chat/actions.any';
+import Button from '../../../base/ui/components/native/Button';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
+import { handleLobbyChatInitialized } from '../../../chat/actions.native';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
-import { setKnockingParticipantApproval } from '../../actions';
-import { HIDDEN_EMAILS } from '../../constants';
+import ParticipantItem
+    from '../../../participants-pane/components/native/ParticipantItem';
+import { setKnockingParticipantApproval } from '../../actions.native';
 import { getKnockingParticipants, getLobbyEnabled, showLobbyChatButton } from '../../functions';

 import styles from './styles';

+
 /**
 * Props type of the component.
 */
@@ -44,12 +45,7 @@ export type Props = {
    /**
     * The Redux Dispatch function.
     */
-    dispatch: Function,
-
-    /**
-     * Function to be used to translate i18n labels.
-     */
-    t: Function
+    dispatch: Function
 };

 /**
@@ -74,68 +70,47 @@ class KnockingParticipantList extends PureComponent<Props> {
     * @inheritdoc
     */
    render() {
-        const { _participants, _visible, _showChatButton, t } = this.props;
+        const { _participants, _visible, _showChatButton } = this.props;

        if (!_visible) {
            return null;
        }

        return (
-            <ScrollView
-                style = { styles.knockingParticipantList }>
+            <>
                { _participants.map(p => (
                    <View
                        key = { p.id }
                        style = { styles.knockingParticipantListEntry }>
-                        <Avatar
+                        <ParticipantItem
                            displayName = { p.name }
-                            size = { 48 }
-                            url = { p.loadableAvatarUrl } />
-                        <View style = { styles.knockingParticipantListDetails }>
-                            <Text style = { styles.knockingParticipantListText }>
-                                { p.name }
-                            </Text>
-                            { p.email && !HIDDEN_EMAILS.includes(p.email) && (
-                                <Text style = { styles.knockingParticipantListText }>
-                                    { p.email }
-                                </Text>
-                            ) }
-                        </View>
-                        <TouchableOpacity
-                            onPress = { this._onRespondToParticipant(p.id, true) }
-                            style = { [
-                                styles.knockingParticipantListButton,
-                                styles.knockingParticipantListPrimaryButton
-                            ] }>
-                            <Text style = { styles.knockingParticipantListText }>
-                                { t('lobby.allow') }
-                            </Text>
-                        </TouchableOpacity>
-                        <TouchableOpacity
-                            onPress = { this._onRespondToParticipant(p.id, false) }
-                            style = { [
-                                styles.knockingParticipantListButton,
-                                styles.knockingParticipantListSecondaryButton
-                            ] }>
-                            <Text style = { styles.knockingParticipantListText }>
-                                { t('lobby.reject') }
-                            </Text>
-                        </TouchableOpacity>
-                        {_showChatButton(p) ? (
-                            <TouchableOpacity
-                                onPress = { this._onInitializeLobbyChat(p.id) }
-                                style = { [
-                                    styles.knockingParticipantListButton,
-                                    styles.knockingParticipantListSecondaryButton
-                                ] }>
-                                <Text style = { styles.knockingParticipantListText }>
-                                    { t('lobby.chat') }
-                                </Text>
-                            </TouchableOpacity>
-                        ) : null}
+                            isKnockingParticipant = { true }
+                            key = { p.id }
+                            participantID = { p.id }>
+                            <Button
+                                labelKey = { 'lobby.admit' }
+                                onClick = { this._onRespondToParticipant(p.id, true) }
+                                style = { styles.lobbyButtonAdmit }
+                                type = { BUTTON_TYPES.PRIMARY } />
+                            {
+                                _showChatButton(p)
+                                    ? (
+                                        <Button
+                                            labelKey = { 'lobby.chat' }
+                                            onClick = { this._onInitializeLobbyChat(p.id) }
+                                            style = { styles.lobbyButtonChat }
+                                            type = { BUTTON_TYPES.SECONDARY } />
+                                    ) : null
+                            }
+                            <Button
+                                labelKey = { 'lobby.reject' }
+                                onClick = { this._onRespondToParticipant(p.id, false) }
+                                style = { styles.lobbyButtonReject }
+                                type = { BUTTON_TYPES.DESTRUCTIVE } />
+                        </ParticipantItem>
                    </View>
                )) }
-            </ScrollView>
+            </>
        );
    }

@@ -168,6 +143,7 @@ class KnockingParticipantList extends PureComponent<Props> {
            if (this.props._isPollsDisabled) {
                return navigate(screen.conference.chat);
            }
+
            navigate(screen.conference.chatandpolls.main);
        };
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Saúl Ibarra Corretgé	e95f2f7341	fixup!	2022-12-02 15:58:52 +00:00
Saúl Ibarra Corretgé	c56db8af77	fixup devcontainer	2022-12-02 15:55:22 +00:00
Saúl Ibarra Corretgé	a66c770053	fix(build) use http for GitHub codespaces	2022-12-02 15:15:56 +00:00
Saúl Ibarra Corretgé	2eaa87a719	Create devcontainer.json	2022-12-02 15:50:01 +01:00
Saúl Ibarra Corretgé	a2e8a7f28f	fix(toolbox) hide drawer after toggling camera Fixes: https://github.com/jitsi/jitsi-meet/issues/12628	2022-12-02 15:31:44 +01:00
Pawel Domas	af072c3070	fix: get the current conference state['features/base/conference'].conference is not the right way to get the current conference. See getCurrentConference selector - it accounts for joining and other states.	2022-12-01 16:02:35 -05:00
Jaya Allamsetty	f42772ec5b	chore(deps) lib-jitsi-meet@latest https://github.com/jitsi/lib-jitsi-meet/compare/v1539.0.0+eb4873d2...v1541.0.0+9b34e0f7	2022-11-29 15:28:51 -05:00
Gabriel Borlea	2556a7ab77	fix(face-landmarks): assign empty array to facelandmarks in speakerstats if undefined	2022-11-29 19:12:43 +01:00
Charles Zablit	3cbf160f2b	fix: always display transcription (#12325 ) * feat: always display transcription * fix: unused import	2022-11-29 09:50:19 -06:00
Дамян Минков	744960bb1a	feat: Several module optimizations to avoid constant parsing of jids. (#12594 ) * feat: Several module optimizations to avoid constant parsing of jids. Caches the parsed values in a rotating table with limited size. Skips constant creating of a stanza with never changing values - create it once and then just clone it. * squash: Fixes extract_subdomain multiple values. * squash: Fix table values when there is a nil element. * squash: Fix skipping the roomless IQs. * squash: Fix comments.	2022-11-28 14:18:59 -06:00
Дамян Минков	76471a0ea9	feat: Modules for implementing visitor nodes. (#12593 ) * feat: Modules for implementing visitor nodes. Still WIP, uses visitor nodes prosodies where we create the main participants and forward the visitors to watch. Used for huge conferences. * squash: Fix comments.	2022-11-28 14:18:33 -06:00
Robert Pintilii	0ba033e07d	ref(TS) Improve TS (#12612 ) Remove unnecessary @ts-ignores Remove unnecessary eslint-disable	2022-11-28 12:52:45 +02:00
Robert Pintilii	cb3fb3ada9	ref(TS) Convert some features to TS (#12611 )	2022-11-28 12:52:24 +02:00
Calinteodor	48a6472b3b	feat(lobby/prejoin/native): style updates (#12615 ) feat(lobby/prejoin/native): style updates (#12615)	2022-11-25 13:59:45 +02:00
Roberto Vieira	691e92b7ec	fix(ios) make initialPositionInSuperView a variable Fixes: https://github.com/jitsi/jitsi-meet/issues/12446	2022-11-25 10:44:27 +01:00
Calin-Teodor	6e36340a83	feat(conference): fixed padding	2022-11-24 19:41:56 +02:00
Mihaela Dumitru	ae424c95de	chore(whiteboard): bump excalidraw version (#12614 )	2022-11-24 17:43:08 +02:00
Mihaela Dumitru	95b2979eb3	feat(whiteboard): use jitsi room name for socket io connection (#12610 )	2022-11-24 14:20:40 +02:00
_norbert	a0c130568b	fix(lang) update Hungarian translation	2022-11-23 19:33:13 +01:00
Robert Pintilii	643cc2db81	ref(TS) Convert some features to TS (#12591 )	2022-11-23 11:12:26 +02:00
Calinteodor	6bce0bc917	fix: Native styles fixes (#12606 ) * feat(conference/native): update indicator styles * feat(prejoin/native): removed unnecessary styles * feat(mobile/navigation): fixed header buttons style * feat(mobile/navigation): fixed linter	2022-11-22 21:50:16 +02:00
Calinteodor	93566e313e	feat(native): Last mobile release UI fixes (#12603 ) * feat(base/modal): order props alphabetically * feat(base/ui): added ripple color for tertiary button * feat(prejoin): removed autoFocus from input and adjusted content * feat(conference): adjusted RaisedHandCountLabel and added extra code spaces * feat(prejoin): fixed content to fit tablets * feat(conference): moved header button styles to navigation styles * feat(mobile/navigation): updated header navigation button styles * feat(prejoin): updated elements width, removed left inset	2022-11-22 18:13:36 +02:00
Gabriel Borlea	a7c653bc30	chore(deps) lib-jitsi-meet@latest (#12604 ) https://github.com/jitsi/lib-jitsi-meet/compare/v1538.0.0+871968af...v1539.0.0+eb4873d2	2022-11-22 16:19:34 +02:00
Gabriel Borlea	4b969cf4ab	feat(face-landmarks): add face landmarks timeline (#12561 ) * feat(face-landmarks): add face landmarks timeline fixes after rebase * fixes after rebase compiling and linting * fix: change keyboard shorcut for participants stats * fix: label for emotions switch * fix: linting issues * code review changes * fix linting issues * code review changes 2 * fix typo	2022-11-22 15:56:37 +02:00
Saúl Ibarra Corretgé	3081b41d0d	fix(android) temporarily disable P2P For some reason one of the users gets a black screen when doing Android to Android calls. If iOS is involved things Just Work (TM). It seems to be related to the use of H.264, but since it works with iOS there must be something else to it.	2022-11-22 14:00:47 +01:00
Saúl Ibarra Corretgé	30e5d213cb	fix(android) sort codecs in the same order as iOS	2022-11-22 14:00:47 +01:00
Saúl Ibarra Corretgé	752da71387	feat(android) set compile and target SDKs to 32	2022-11-22 11:37:08 +01:00
Saúl Ibarra Corretgé	645609974a	deps(android) update native dependencies	2022-11-22 11:37:08 +01:00
Saúl Ibarra Corretgé	4f2f6df2bb	chore(deps) update xmldom to version 0.79	2022-11-22 11:37:08 +01:00