fix(ui): improve tab badge styling (#16507)

* feat(lang): Complete French and Canadian French translations

- Added 91 missing French translation keys to main-fr.json
- Updated Canadian French (main-fr-CA.json) with complete translation coverage
- Applied authentic Canadian French terminology (réunion vs conférence, É.-U. vs États-Unis)
- Removed 44 legacy keys from Canadian French to match English/French structure
- All files now have identical key coverage (1,469 keys each)
- Maintains regional linguistic preferences while ensuring 100% feature coverage

.github/workflows/ci.yml

@@ -103,7 +103,7 @@ jobs:
   android-sdk-build:
     name: Build mobile SDK (Android)
     runs-on: ubuntu-latest
-    container: reactnativecommunity/react-native-android:v13.0
+    container: reactnativecommunity/react-native-android:v18.0
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4

android/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 // Crashlytics integration is done as part of Firebase now, so it gets
 // automagically activated with google-services.json
@@ -66,9 +67,18 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility rootProject.ext.javaVersion
+        targetCompatibility rootProject.ext.javaVersion
     }
+
+    kotlinOptions {
+        jvmTarget = rootProject.ext.jvmTargetVersion
+    }
+
+    kotlin {
+        jvmToolchain(rootProject.ext.jvmToolchainVersion)
+    }
+
     namespace 'org.jitsi.meet'
 }
 

android/app/proguard-rules-release.pro

@@ -4,3 +4,8 @@
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
 -keep public class * extends java.lang.Exception
+
+# R8 missing classes - suppress warnings
+-dontwarn com.facebook.fresco.ui.common.LoggingListener
+-dontwarn com.facebook.memory.config.MemorySpikeConfig
+-dontwarn kotlinx.parcelize.Parcelize

android/build.gradle

@@ -5,46 +5,52 @@ import org.gradle.util.VersionNumber
 // sub-projects/modules.
 
 buildscript {
+    ext {
+        kotlinVersion = "2.0.21"
+        gradlePluginVersion = "8.4.2"
+        buildToolsVersion = "34.0.0"
+        compileSdkVersion = 34
+        minSdkVersion    = 26
+        targetSdkVersion = 34
+        supportLibVersion = "28.0.0"
+        ndkVersion = "27.1.12297006"
+
+        // The Maven artifact groupId of the third-party react-native modules which
+        // Jitsi Meet SDK for Android depends on and which are not available in
+        // third-party Maven repositories so we have to deploy to a Maven repository
+        // of ours.
+        moduleGroupId = 'com.facebook.react'
+
+        // Maven repo where artifacts will be published
+        mavenRepo = System.env.MVN_REPO ?: ""
+        mavenUser = System.env.MVN_USER ?: ""
+        mavenPassword = System.env.MVN_PASSWORD ?: ""
+
+        // Libre build
+        libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
+
+        googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
+
+        //React Native and Hermes Version
+        rnVersion = "0.77.2"
+
+        // Java dependencies
+        javaVersion = JavaVersion.VERSION_17
+        jvmToolchainVersion = 17
+        jvmTargetVersion = '17'
+    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
+        classpath "com.android.tools.build:gradle:$rootProject.ext.gradlePluginVersion"
         classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
     }
 }
 
-ext {
-    kotlinVersion = "1.9.24"
-    buildToolsVersion = "34.0.0"
-    compileSdkVersion = 34
-    minSdkVersion    = 26
-    targetSdkVersion = 34
-    supportLibVersion = "28.0.0"
-    ndkVersion = "26.1.10909125"
-
-    // The Maven artifact groupId of the third-party react-native modules which
-    // Jitsi Meet SDK for Android depends on and which are not available in
-    // third-party Maven repositories so we have to deploy to a Maven repository
-    // of ours.
-    moduleGroupId = 'com.facebook.react'
-
-    // Maven repo where artifacts will be published
-    mavenRepo = System.env.MVN_REPO ?: ""
-    mavenUser = System.env.MVN_USER ?: ""
-    mavenPassword = System.env.MVN_PASSWORD ?: ""
-
-    // Libre build
-    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
-
-    googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
-
-    //React Native and Hermes Version
-    rnVersion = "0.75.5"
-}
-
 allprojects {
     repositories {
         mavenCentral()
@@ -134,7 +140,7 @@ allprojects {
             project.version = "${json.version}-jitsi-${versionQualifierNumber}"
 
             task jitsiAndroidSourcesJar(type: Jar) {
-                classifier = 'sources'
+                archiveClassifier = 'sources'
                 from android.sourceSets.main.java.source
             }
 
@@ -185,16 +191,46 @@ allprojects {
     }
 }
 
-// Force the version of the Android build tools we have chosen on all
-// subprojects. The forcing was introduced for react-native and the third-party
-// modules that we utilize such as react-native-background-timer.
+// Force the version of the Android build tools we have chosen on all subprojects.
 subprojects { subproject ->
     afterEvaluate{
         if ((subproject.plugins.hasPlugin('android')
                     || subproject.plugins.hasPlugin('android-library'))
                 && rootProject.ext.has('buildToolsVersion')) {
+
             android {
                 buildToolsVersion rootProject.ext.buildToolsVersion
+
+                buildFeatures {
+                    buildConfig true
+                }
+
+                // Set JVM target across all subprojects
+                compileOptions {
+                    sourceCompatibility rootProject.ext.javaVersion
+                    targetCompatibility rootProject.ext.javaVersion
+                }
+
+                // Disable lint errors for problematic third-party modules
+                // react-native-background-timer
+                // react-native-calendar-events
+                lint {
+                    abortOnError = false
+                }
+            }
+        }
+
+        // Add Kotlin configuration for subprojects that use Kotlin
+        if (subproject.plugins.hasPlugin('kotlin-android')) {
+            subproject.kotlin {
+                jvmToolchain(rootProject.ext.jvmToolchainVersion)
+            }
+
+            // Set Kotlin JVM target
+            subproject.android {
+                kotlinOptions {
+                    jvmTarget = rootProject.ext.jvmTargetVersion
+                }
             }
         }
     }

android/gradle.properties

@@ -11,20 +11,26 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m
 
-org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-# This one fixes a weird WebRTC runtime problem on some devices.
-# https://github.com/jitsi/jitsi-meet/issues/7911#issuecomment-714323255
-android.enableDexingArtifactTransform.desugaring=false
-
 android.useAndroidX=true
+
 android.enableJetifier=true
-android.bundle.enableUncompressedNativeLibs=false
+
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=false
+
+# Use this property to enable or disable the Hermes JS engine.
+hermesEnabled=true
 
 appVersion=99.0.0
 sdkVersion=0.0.0

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/sdk/build.gradle

@@ -83,7 +83,7 @@ dependencies {
     implementation project(':react-native-screens')
     implementation project(':react-native-slider')
     implementation project(':react-native-sound')
-    implementation project(':react-native-splash-screen')
+    implementation project(':react-native-splash-view')
     implementation project(':react-native-svg')
     implementation project(':react-native-video')
     implementation project(':react-native-webview')
@@ -137,8 +137,16 @@ android.libraryVariants.all { def variant ->
         def devEnabled = !targetName.toLowerCase().contains("release")
 
         // Run the bundler
+        // Use full path to node to avoid PATH issues in Gradle
+        def nodePath = System.getenv('NVM_BIN') ? "${System.getenv('NVM_BIN')}/node" : "node"
+
+        // Debug: Print the node path and environment
+        println "Using node path: ${nodePath}"
+        println "NVM_BIN: ${System.getenv('NVM_BIN')}"
+        println "Working directory: ${reactRoot}"
+
         commandLine(
-                "node",
+                nodePath,
                 "node_modules/react-native/scripts/bundle.js",
                 "--platform", "android",
                 "--dev", "${devEnabled}",
@@ -151,6 +159,70 @@ android.libraryVariants.all { def variant ->
         enabled !devEnabled
     }
 
+    // GRADLE REQUIREMENTS (Gradle 8.7+ / AGP 8.5.0+):
+    
+    // This task requires explicit dependencies on resource tasks from all React Native modules
+    // due to Gradle's strict validation of task dependencies.
+
+    // Without these dependencies,
+    // builds will fail with errors like:
+    // "Task ':sdk:bundleReleaseJsAndAssets' uses the output of task ':react-native-amplitude:packageReleaseResources'
+    // without declaring a dependency on it."
+
+    // The automatic dependency resolution below ensures all required resource tasks are properly
+    // declared as dependencies before this task executes.
+
+    if (variant.name.toLowerCase().contains("release")) {
+        rootProject.subprojects.each { subproject ->
+            if (
+                subproject.name.startsWith("react-native-") ||
+                subproject.name.startsWith("@react-native-") ||
+                subproject.name.startsWith("@giphy/")
+            ) {
+                [
+                    "packageReleaseResources",
+                    "generateReleaseResValues",
+                    "generateReleaseResources",
+                    "generateReleaseBuildConfig",
+                    "processReleaseManifest",
+                    "writeReleaseAarMetadata",
+                    "generateReleaseRFile",
+                    "compileReleaseLibraryResources",
+                    "compileReleaseJavaWithJavac",
+                    "javaPreCompileRelease",
+                    "bundleLibCompileToJarRelease",
+                    "exportReleaseConsumerProguardFiles",
+                    "mergeReleaseGeneratedProguardFiles",
+                    "mergeReleaseJniLibFolders",
+                    "mergeReleaseShaders",
+                    "packageReleaseAssets",
+                    "processReleaseJavaRes",
+                    "prepareReleaseArtProfile",
+                    "copyReleaseJniLibsProjectOnly",
+                    "extractDeepLinksRelease",
+                    "createFullJarRelease",
+                    "generateReleaseLintModel",
+                    "writeReleaseLintModelMetadata",
+                    "generateReleaseLintVitalModel",
+                    "lintVitalAnalyzeRelease",
+                    "lintReportRelease",
+                    "lintAnalyzeRelease",
+                    "lintReportDebug",
+                    "lintAnalyzeDebug"
+                ].each { taskName ->
+                    if (subproject.tasks.findByName(taskName)) {
+                        currentBundleTask.dependsOn(subproject.tasks.named(taskName))
+                    }
+                }
+
+                // Also depend on the main build task to ensure all sub-tasks are completed
+                if (subproject.tasks.findByName("build")) {
+                    currentBundleTask.dependsOn(subproject.tasks.named("build"))
+                }
+            }
+        }
+    }
+
     currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
     currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
     variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)

android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiInitializer.java

@@ -23,8 +23,10 @@ import androidx.annotation.NonNull;
 import androidx.startup.Initializer;
 
 import com.facebook.soloader.SoLoader;
+import com.facebook.react.soloader.OpenSourceMergedSoMapping;
 import org.wonday.orientation.OrientationActivityLifecycle;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
@@ -35,7 +37,11 @@ public class JitsiInitializer implements Initializer<Boolean> {
     public Boolean create(@NonNull Context context) {
         Log.d(this.getClass().getCanonicalName(), "create");
 
-        SoLoader.init(context, /* native exopackage */ false);
+        try {
+            SoLoader.init(context, OpenSourceMergedSoMapping.INSTANCE);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         // Register our uncaught exception handler.
         JitsiMeetUncaughtExceptionHandler.register();

android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeet.java

@@ -22,7 +22,7 @@ import android.os.Bundle;
 
 import com.facebook.react.ReactInstanceManager;
 
-import org.devio.rn.splashscreen.SplashScreen;
+import com.splashview.SplashView;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
 public class JitsiMeet {
@@ -92,7 +92,7 @@ public class JitsiMeet {
      */
     public static void showSplashScreen(Activity activity) {
         try {
-            SplashScreen.show(activity);
+            SplashView.INSTANCE.showSplashView(activity);
         } catch (Exception e) {
             JitsiMeetLogger.e(e, "Failed to show splash screen");
         }

android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java

@@ -33,7 +33,6 @@ import com.facebook.react.uimanager.ViewManager;
 import com.oney.WebRTCModule.EglUtils;
 import com.oney.WebRTCModule.WebRTCModuleOptions;
 
-import org.devio.rn.splashscreen.SplashScreenModule;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.webrtc.EglBase;
 
@@ -68,7 +67,6 @@ class ReactInstanceManagerHolder {
                 new JavaScriptSandboxModule(reactContext),
                 new LocaleDetector(reactContext),
                 new LogBridgeModule(reactContext),
-                new SplashScreenModule(reactContext),
                 new PictureInPictureModule(reactContext),
                 new ProximityModule(reactContext),
                 new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)));
@@ -90,7 +88,7 @@ class ReactInstanceManagerHolder {
             new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
             new com.ocetnik.timer.BackgroundTimerPackage(),
             new com.calendarevents.RNCalendarEventsPackage(),
-            new com.corbt.keepawake.KCKeepAwakePackage(),
+            new com.sayem.keepawake.KCKeepAwakePackage(),
             new com.facebook.react.shell.MainReactPackage(),
             new com.reactnativecommunity.clipboard.ClipboardPackage(),
             new com.reactnativecommunity.netinfo.NetInfoPackage(),
@@ -110,6 +108,7 @@ class ReactInstanceManagerHolder {
             new com.th3rdwave.safeareacontext.SafeAreaContextPackage(),
             new com.horcrux.svg.SvgPackage(),
             new org.wonday.orientation.OrientationPackage(),
+            new com.splashview.SplashViewPackage(),
             new ReactPackageAdapter() {
                 @Override
                 public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
@@ -133,7 +132,7 @@ class ReactInstanceManagerHolder {
 
         // GiphyReactNativeSdkPackage
         try {
-            Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.GiphyReactNativeSdkPackage");
+            Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.RTNGiphySdkPackage");
             Constructor<?> constructor = giphyPackageClass.getConstructor();
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {

android/settings.gradle

@@ -1,5 +1,3 @@
-rootProject.name = 'jitsi-meet'
-
 include ':app', ':sdk'
 
 include ':react-native-amplitude'
@@ -29,7 +27,7 @@ project(':react-native-google-signin').projectDir = new File(rootProject.project
 include ':react-native-immersive-mode'
 project(':react-native-immersive-mode').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive-mode/android')
 include ':react-native-keep-awake'
-project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
+project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/@sayem314/react-native-keep-awake/android')
 include ':react-native-orientation-locker'
 project(':react-native-orientation-locker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation-locker/android')
 include ':react-native-pager-view'
@@ -44,8 +42,8 @@ include ':react-native-slider'
 project(':react-native-slider').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/slider/android')
 include ':react-native-sound'
 project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
-include ':react-native-splash-screen'
-project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
+include ':react-native-splash-view'
+project(':react-native-splash-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-view/android')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-svg/android')
 include ':react-native-video'

babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    presets: [ 'module:metro-react-native-babel-preset' ],
+    presets: [ 'module:@react-native/babel-preset' ],
     env: {
         production: {
             plugins: [ 'react-native-paper/babel' ]

conference.js

@@ -18,8 +18,6 @@ import {
     maybeRedirectToWelcomePage,
     reloadWithStoredParams
 } from './react/features/app/actions';
-import { showModeratedNotification } from './react/features/av-moderation/actions';
-import { shouldShowModeratedNotification } from './react/features/av-moderation/functions';
 import {
     _conferenceWillJoin,
     authStatusChanged,
@@ -52,7 +50,8 @@ import {
     commonUserJoinedHandling,
     commonUserLeftHandling,
     getConferenceOptions,
-    sendLocalParticipant
+    sendLocalParticipant,
+    updateTrackMuteState
 } from './react/features/base/conference/functions';
 import { getReplaceParticipant, getSsrcRewritingFeatureFlag } from './react/features/base/config/functions';
 import { connect } from './react/features/base/connection/actions.web';
@@ -153,7 +152,6 @@ import {
     DATA_CHANNEL_CLOSED_NOTIFICATION_ID,
     NOTIFICATION_TIMEOUT_TYPE
 } from './react/features/notifications/constants';
-import { isModerationNotificationDisplayed } from './react/features/notifications/functions';
 import { suspendDetected } from './react/features/power-monitor/actions';
 import { initPrejoin, isPrejoinPageVisible } from './react/features/prejoin/functions';
 import { disableReceiver, stopReceiver } from './react/features/remote-control/actions';
@@ -704,15 +702,6 @@ export default {
             return;
         }
 
-        // check for A/V Moderation when trying to unmute
-        if (!mute && shouldShowModeratedNotification(MEDIA_TYPE.AUDIO, state)) {
-            if (!isModerationNotificationDisplayed(MEDIA_TYPE.AUDIO, state)) {
-                APP.store.dispatch(showModeratedNotification(MEDIA_TYPE.AUDIO));
-            }
-
-            return;
-        }
-
         await APP.store.dispatch(setAudioMuted(mute, true));
     },
 
@@ -746,12 +735,6 @@ export default {
      * dialogs in case of media permissions error.
      */
     muteVideo(mute) {
-        if (this.videoSwitchInProgress) {
-            logger.warn('muteVideo - unable to perform operations while video switch is in progress');
-
-            return;
-        }
-
         const state = APP.store.getState();
 
         if (!mute
@@ -761,11 +744,6 @@ export default {
             return;
         }
 
-        // check for A/V Moderation when trying to unmute and return early
-        if (!mute && shouldShowModeratedNotification(MEDIA_TYPE.VIDEO, state)) {
-            return;
-        }
-
         APP.store.dispatch(setVideoMuted(mute, VIDEO_MUTISM_AUTHORITY.USER, true));
     },
 
@@ -1019,7 +997,6 @@ export default {
 
         // Restore initial state.
         this._localTracksInitialized = false;
-        this.isSharingScreen = false;
         this.roomName = roomName;
 
         const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(options);
@@ -1198,8 +1175,6 @@ export default {
         return Boolean(APP.store.getState()['features/base/audio-only'].enabled);
     },
 
-    videoSwitchInProgress: false,
-
     /**
      * This fields stores a handler which will create a Promise which turns off
      * the screen sharing and restores the previous video state (was there
@@ -1228,7 +1203,6 @@ export default {
      */
     async _turnScreenSharingOff(didHaveVideo, ignoreDidHaveVideo) {
         this._untoggleScreenSharing = null;
-        this.videoSwitchInProgress = true;
 
         APP.store.dispatch(stopReceiver());
 
@@ -1280,13 +1254,11 @@ export default {
 
         return promise.then(
             () => {
-                this.videoSwitchInProgress = false;
                 sendAnalytics(createScreenSharingEvent('stopped',
                     duration === 0 ? null : duration));
                 logger.info('Screen sharing stopped.');
             },
             error => {
-                this.videoSwitchInProgress = false;
                 logger.error(`_turnScreenSharingOff failed: ${error}`);
 
                 throw error;
@@ -1316,14 +1288,13 @@ export default {
             this._untoggleScreenSharing
                 = this._turnScreenSharingOff.bind(this, didHaveVideo);
 
-            const desktopVideoStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
             const desktopAudioStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);
 
             if (desktopAudioStream) {
                 desktopAudioStream.on(
                     JitsiTrackEvents.LOCAL_TRACK_STOPPED,
                     () => {
-                        logger.debug(`Local screensharing audio track stopped. ${this.isSharingScreen}`);
+                        logger.debug('Local screensharing audio track stopped.');
 
                         // Handle case where screen share was stopped from  the browsers 'screen share in progress'
                         // window. If audio screen sharing is stopped via the normal UX flow this point shouldn't
@@ -1335,21 +1306,6 @@ export default {
                 );
             }
 
-            if (desktopVideoStream) {
-                desktopVideoStream.on(
-                    JitsiTrackEvents.LOCAL_TRACK_STOPPED,
-                    () => {
-                        logger.debug(`Local screensharing track stopped. ${this.isSharingScreen}`);
-
-                        // If the stream was stopped during screen sharing
-                        // session then we should switch back to video.
-                        this.isSharingScreen
-                            && this._untoggleScreenSharing
-                            && this._untoggleScreenSharing();
-                    }
-                );
-            }
-
             return desktopStreams;
         }, error => {
             throw error;
@@ -1497,10 +1453,6 @@ export default {
         room.on(JitsiConferenceEvents.TRACK_MUTE_CHANGED, (track, participantThatMutedUs) => {
             if (participantThatMutedUs) {
                 APP.store.dispatch(participantMutedUs(participantThatMutedUs, track));
-                if (this.isSharingScreen && track.isVideoTrack()) {
-                    logger.debug('TRACK_MUTE_CHANGED while screen sharing');
-                    this._turnScreenSharingOff(false);
-                }
             }
         });
 
@@ -1712,8 +1664,12 @@ export default {
         room.on(
             JitsiConferenceEvents.START_MUTED_POLICY_CHANGED,
             ({ audio, video }) => {
-                APP.store.dispatch(
-                    onStartMutedPolicyChanged(audio, video));
+                APP.store.dispatch(onStartMutedPolicyChanged(audio, video));
+
+                const state = APP.store.getState();
+
+                updateTrackMuteState(state, APP.store.dispatch, true);
+                updateTrackMuteState(state, APP.store.dispatch, false);
             }
         );
 

config.js

@@ -117,6 +117,11 @@ var config = {
 
         // Will replace ice candidates IPs with invalid ones in order to fail ice.
         // failICE: true,
+
+        // When running on Spot TV, this controls whether to show the recording consent dialog.
+        // If false (default), Spot instances will not show the recording consent dialog.
+        // If true, Spot instances will show the recording consent dialog like regular clients.
+        // showSpotConsentDialog: false,
     },
 
     // Disables moderator indicators.
@@ -1126,10 +1131,6 @@ var config = {
         // The Amplitude APP Key:
         // amplitudeAPPKey: '<APP_KEY>',
 
-        // Enables Amplitude UTM tracking:
-        // Default value is false.
-        // amplitudeIncludeUTM: false,
-
         // Obfuscates room name sent to analytics (amplitude, rtcstats)
         // Default value is false.
         // obfuscateRoomName: false,
@@ -1779,6 +1780,13 @@ var config = {
     //     // The minimum number of participants that must be in the call for
     //     // the top panel layout to be used.
     //     minParticipantCountForTopPanel: 50,
+
+    //     // The width of the filmstrip on joining meeting. Can be resized afterwards.
+    //     initialWidth: 400,
+
+    //     // Whether the draggable resize bar of the filmstrip is always visible. Setting this to true will make
+    //     // the filmstrip always visible in case `disableResizable` is false.
+    //     alwaysShowResizeBar: true,
     // },
 
     // Tile view related config options.

ios/Podfile

@@ -33,6 +33,7 @@ target 'JitsiMeetSDK' do
     :path => config[:reactNativePath],
     :hermes_enabled => true,
     :fabric_enabled => false,
+    :new_arch_enabled => false,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
@@ -66,6 +67,7 @@ target 'JitsiMeetSDKLite' do
       :path => config[:reactNativePath],
       :hermes_enabled => true,
       :fabric_enabled => false,
+      :new_arch_enabled => false,
       # An absolute path to your application root.
       :app_path => "#{Pod::Config.instance.installation_root}/.."
     )
@@ -77,10 +79,12 @@ target 'JitsiMeetSDKLite' do
 end
 
 post_install do |installer|
+
   react_native_post_install(
     installer,
     use_native_modules![:reactNativePath],
-    :mac_catalyst_enabled => false
+    :mac_catalyst_enabled => false,
+    # :ccache_enabled => true
   )
   installer.pods_project.targets.each do |target|
     # https://github.com/CocoaPods/CocoaPods/issues/11402
@@ -99,4 +103,5 @@ post_install do |installer|
 
   # Patch SocketRocket to support TLS 1.3
   %x(patch Pods/SocketRocket/SocketRocket/SRSecurityPolicy.m -N < patches/ws-tls13.diff)
+
 end

ios/app/app.xcodeproj/project.pbxproj

@@ -17,7 +17,7 @@
 		0BEA5C3B1F7B8F73000D0AB4 /* ComplicationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */; };
 		0BEA5C3D1F7B8F73000D0AB4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */; };
 		0BEA5C411F7B8F73000D0AB4 /* JitsiMeetCompanion.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */; };
-		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
+		13B07FBD1A68108700A75B9A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */; };
 		361974E2A13624D7735D619D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 5C1BE20ECD5DEEB48FED90B5 /* PrivacyInfo.xcprivacy */; };
@@ -132,7 +132,7 @@
 		0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		0BEA5C3E1F7B8F73000D0AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* jitsi-meet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "jitsi-meet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
+		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = src/Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
@@ -250,7 +250,6 @@
 				DEA0B7132D7EF7590062A9F6 /* AppDelegate.swift */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
-				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
 				DEA0B7112D7EF16E0062A9F6 /* ViewController.swift */,
 			);
 			path = src;
@@ -475,7 +474,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
+				13B07FBD1A68108700A75B9A /* LaunchScreen.storyboard in Resources */,
 				361974E2A13624D7735D619D /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -687,12 +686,12 @@
 			name = Interface.storyboard;
 			sourceTree = "<group>";
 		};
-		13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = {
+		13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
 				13B07FB21A68108700A75B9A /* Base */,
 			);
-			name = LaunchScreen.xib;
+			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */

ios/app/src/AppDelegate.swift

@@ -37,7 +37,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         let vc = ViewController()
         self.window?.rootViewController = vc
-        jitsiMeet.showSplashScreen(vc.view)
+        jitsiMeet.showSplashScreen()
 
         self.window?.makeKeyAndVisible()
 

ios/app/src/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="iN0-l3-epB">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView opaque="NO" userInteractionEnabled="NO" contentMode="center" image="LaunchScreen" translatesAutoresizingMaskIntoConstraints="NO" id="4B8-Xf-NDE">
+                                <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.090196078431372548" green="0.62745098039215685" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="4B8-Xf-NDE" secondAttribute="bottom" id="aFF-BR-glX"/>
+                            <constraint firstItem="4B8-Xf-NDE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="glR-YN-1GF"/>
+                            <constraint firstAttribute="trailing" secondItem="4B8-Xf-NDE" secondAttribute="trailing" id="tva-gl-jRX"/>
+                            <constraint firstItem="4B8-Xf-NDE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="yaV-1V-oEh"/>
+                        </constraints>
+                        <nil key="simulatedStatusBarMetrics"/>
+                        <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                        <point key="canvasLocation" x="548" y="455"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <resources>
+                <image name="LaunchScreen" width="480" height="480"/>
+            </resources>
+        </scene>
+    </scenes>
+</document>

ios/app/src/Base.lproj/LaunchScreen.xib

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <imageView opaque="NO" userInteractionEnabled="NO" contentMode="center" image="LaunchScreen" translatesAutoresizingMaskIntoConstraints="NO" id="4B8-Xf-NDE">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-                </imageView>
-            </subviews>
-            <color key="backgroundColor" red="0.090196078431372548" green="0.62745098039215685" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstAttribute="bottom" secondItem="4B8-Xf-NDE" secondAttribute="bottom" id="aFF-BR-glX"/>
-                <constraint firstItem="4B8-Xf-NDE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="glR-YN-1GF"/>
-                <constraint firstAttribute="trailing" secondItem="4B8-Xf-NDE" secondAttribute="trailing" id="tva-gl-jRX"/>
-                <constraint firstItem="4B8-Xf-NDE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="yaV-1V-oEh"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="LaunchScreen" width="480" height="480"/>
-    </resources>
-</document>

ios/app/src/Info.plist

@@ -90,7 +90,7 @@
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>armv7</string>
+		<string>arm64</string>
 	</array>
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleLightContent</string>

ios/sdk/src/JitsiMeet.h

@@ -100,6 +100,9 @@ typedef NS_ENUM(NSInteger, WebRTCLoggingSeverity) {
 
 - (BOOL)isCrashReportingDisabled;
 
-- (void)showSplashScreen:(UIView * _Nonnull) rootView;
+/**
+ * Shows the splash screen.
+ */
+- (void)showSplashScreen;
 
 @end

ios/sdk/src/JitsiMeet.m

@@ -23,7 +23,6 @@
 #import "JitsiMeetView+Private.h"
 #import "RCTBridgeWrapper.h"
 #import "ReactUtils.h"
-#import "RNSplashScreen.h"
 #import "ScheenshareEventEmiter.h"
 
 #import <react-native-webrtc/WebRTCModuleOptions.h>
@@ -221,8 +220,17 @@
     return nil;
 }
 
-- (void)showSplashScreen:(UIView*)rootView {
-    [RNSplashScreen showSplash:@"LaunchScreen" inRootView:rootView];
+- (void)showSplashScreen {
+    Class splashClass = NSClassFromString(@"SplashView");
+    if (splashClass && [splashClass respondsToSelector:@selector(sharedInstance)]) {
+        id splashInstance = [splashClass performSelector:@selector(sharedInstance)];
+        if (splashInstance && [splashInstance respondsToSelector:@selector(showSplash)]) {
+            [splashInstance performSelector:@selector(showSplash)];
+            NSLog(@"✅ Splash Screen Shown Successfully");
+        }
+    } else {
+        NSLog(@"⚠️ SplashView module not found");
+    }
 }
 
 #pragma mark - Property getter / setters

lang/main-fr.json

@@ -109,9 +109,12 @@
         }
     },
     "chat": {
+        "disabled": "L'envoi de messages de chat est désactivé.",
         "enter": "Entrez dans le salon",
         "error": "Erreur : votre message n'a pas été envoyé. Raison : {{error}}",
+        "everyone": "Tout le monde",
         "fieldPlaceHolder": "Tapez votre message ici",
+        "guestsChatIndicator": "(invité)",
         "lobbyChatMessageTo": "Message de salle d'attente à {{recipient}}",
         "message": "Message",
         "messageAccessibleTitle": "{{user}} dit: ",
@@ -122,7 +125,10 @@
         "nickname": {
             "popover": "Choisissez un pseudonyme",
             "title": "Entrez un pseudonyme pour utiliser le chat",
-            "titleWithPolls": "Entrez un pseudonyme pour utiliser le chat et les sondages"
+            "titleWithCC": "Entrez un pseudonyme pour utiliser le chat et les sous-titres",
+            "titleWithPolls": "Entrez un pseudonyme pour utiliser le chat et les sondages",
+            "titleWithPollsAndCC": "Entrez un pseudonyme pour utiliser le chat, les sondages et les sous-titres",
+            "titleWithPollsAndCCAndFileSharing": "Entrez un pseudonyme pour utiliser le chat, les sondages, les sous-titres et les fichiers"
         },
         "noMessagesMessage": "Il n'y a pas encore de messages dans cette réunion. Démarrez une conversation ici !",
         "privateNotice": "Message privé à {{recipient}}",
@@ -131,9 +137,14 @@
         "systemDisplayName": "Système",
         "tabs": {
             "chat": "Chat",
+            "closedCaptions": "ST",
+            "fileSharing": "Fichiers",
             "polls": "Sondages"
         },
         "title": "Chat",
+        "titleWithCC": "ST",
+        "titleWithFeatures": "Chat et",
+        "titleWithFileSharing": "Fichiers",
         "titleWithPolls": "Chat et Sondages",
         "you": "vous"
     },
@@ -144,6 +155,10 @@
         "dontShowAgain": "Ne plus m'afficher ceci",
         "installExtensionText": "Installer l'extension pour l'intégration de Google Calendar et Office 365"
     },
+    "closedCaptionsTab": {
+        "emptyState": "Le contenu des sous-titres sera disponible une fois qu'un modérateur l'aura démarré",
+        "startClosedCaptionsButton": "Démarrer les sous-titres"
+    },
     "connectingOverlay": {
         "joiningRoom": "Connexion à la réunion…"
     },
@@ -263,7 +278,8 @@
         "Remove": "Supprimer",
         "Share": "Partager",
         "Submit": "Soumettre",
-        "WaitForHostMsg": "La conférence n'a pas encore commencé. Si vous en êtes l'hôte, veuillez vous authentifier. Sinon, veuillez attendre son arrivée.",
+        "Understand": "Je comprends, gardez-moi en sourdine pour l'instant",
+        "UnderstandAndUnmute": "Je comprends, veuillez me réactiver s'il vous plaît",
         "WaitForHostNoAuthMsg": "La conférence n'a pas encore commencé car aucun modérateur n'est encore arrivé. Veuillez patienter.",
         "WaitingForHostButton": "Attendre l'hôte",
         "WaitingForHostTitle": "En attente de l'hôte…",
@@ -285,6 +301,12 @@
         "alreadySharedVideoTitle": "Une seule vidéo partagée est autorisée à la fois",
         "applicationWindow": "Fenêtre d'application",
         "authenticationRequired": "Authentification requise",
+        "cameraCaptureDialog": {
+            "description": "Prendre et envoyer une photo en utilisant votre caméra mobile",
+            "ok": "Ouvrir la caméra",
+            "reject": "Pas maintenant",
+            "title": "Prendre une photo"
+        },
         "cameraConstraintFailedError": "Votre caméra ne satisfait pas certaines des contraintes nécessaires.",
         "cameraNotFoundError": "La caméra n'a pas été trouvée.",
         "cameraNotSendingData": "Impossible d'accéder à votre caméra. Veuillez sélectionner un autre périphérique dans les paramètres ou rafraîchir la page.",
@@ -299,6 +321,7 @@
         "conferenceReloadMsg": "On essaie d'arranger ça. Reconnexion dans {{seconds}} secondes…",
         "conferenceReloadTitle": "Malheureusement, un problème est survenu",
         "confirm": "Confirmer",
+        "confirmBack": "Retour",
         "confirmNo": "Non",
         "confirmYes": "Oui",
         "connectError": "Oups ! Un problème est survenu et la connexion à la conférence est impossible.",
@@ -336,6 +359,7 @@
         "kickParticipantTitle": "Expulser ce participant ?",
         "kickSystemTitle": "Oups ! Vous avez été expulsé de la réunion",
         "kickTitle": "Oups ! vous avez été expulsé(e) par {{participantDisplayName}}",
+        "learnMore": "en savoir plus",
         "linkMeeting": "Relier la conférence",
         "linkMeetingTitle": "Relier la conférence à Salesforce",
         "liveStreaming": "Direct",
@@ -358,22 +382,34 @@
         "micTimeoutError": "Impossible de démarrer la source audio. Délai dépassé!",
         "micUnknownError": "Vous ne pouvez pas utiliser le microphone pour une raison inconnue.",
         "moderationAudioLabel": "Autoriser les participants à réactiver leur micro",
+        "moderationDesktopLabel": "Autoriser les non-modérateurs à partager leur écran",
         "moderationVideoLabel": "Autoriser les participants à démarrer leur vidéo",
         "muteEveryoneDialog": "Êtes-vous sûr de vouloir couper les micros de tout le monde ? Vous ne pourrez plus réactiver leur micro, mais ils pourront l'activer par eux-mêmes à tout moment.",
         "muteEveryoneDialogModerationOn": "Les participants peuvent demander à parler n'importe quand",
         "muteEveryoneElseDialog": "Une fois leur micro coupé, vous ne pourrez plus le réactiver, mais ils pourront l'activer par eux-mêmes à tout moment.",
         "muteEveryoneElseTitle": "Couper le micro de tout le monde sauf de {{whom}} ?",
+        "muteEveryoneElsesDesktopDialog": "Une fois le partage arrêté, vous ne pourrez pas le redémarrer, mais ils peuvent le faire à tout moment.",
+        "muteEveryoneElsesDesktopTitle": "Arrêter le partage d'écran de tout le monde sauf {{whom}} ?",
         "muteEveryoneElsesVideoDialog": "Une fois la caméra coupée, vous ne pourrez plus la rallumer, mais ils peuvent la rallumer à tout moment.",
         "muteEveryoneElsesVideoTitle": "Couper la vidéo de tout le monde sauf {{whom}}?",
         "muteEveryoneSelf": "vous",
         "muteEveryoneStartMuted": "Tout le monde démarre avec le micro coupé",
         "muteEveryoneTitle": "Couper le micro de tout le monde ?",
+        "muteEveryonesDesktopDialog": "Les participants peuvent partager leur écran à tout moment.",
+        "muteEveryonesDesktopDialogModerationOn": "Les participants peuvent envoyer une demande pour partager leur écran à tout moment.",
+        "muteEveryonesDesktopTitle": "Arrêter le partage d'écran de tout le monde ?",
         "muteEveryonesVideoDialog": "Êtes-vous sûr de vouloir couper la caméra de tout le monde? Vous ne pourrez pas la réactiver, mais ils peuvent la remettre à tout moment.",
         "muteEveryonesVideoDialogModerationOn": "Les participants peuvent demander à activer leur caméra n'importe quand.",
         "muteEveryonesVideoDialogOk": "Désactiver",
         "muteEveryonesVideoTitle": "Couper la caméra de tout le monde?",
         "muteParticipantBody": "Vous ne pourrez plus réactiver son micro, mais il pourra l'activer par lui-même à tout moment.",
         "muteParticipantButton": "Couper le micro",
+        "muteParticipantsDesktopBody": "Vous ne pourrez pas démarrer leur partage d'écran, mais ils peuvent le faire à tout moment.",
+        "muteParticipantsDesktopBodyModerationOn": "Vous ne pourrez pas démarrer leur partage d'écran et eux non plus.",
+        "muteParticipantsDesktopButton": "Arrêter le partage d'écran",
+        "muteParticipantsDesktopDialog": "Êtes-vous sûr de vouloir désactiver le partage d'écran de ce participant ? Vous ne pourrez pas le redémarrer, mais ils peuvent le faire à tout moment.",
+        "muteParticipantsDesktopDialogModerationOn": "Êtes-vous sûr de vouloir désactiver le partage d'écran de ce participant ? Vous ne pourrez pas réactiver l'écran et eux non plus.",
+        "muteParticipantsDesktopTitle": "Désactiver le partage d'écran de ce participant ?",
         "muteParticipantsVideoBody": "Vous ne pourrez pas rallumer la caméra, mais ils peuvent la rallumer à tout moment.",
         "muteParticipantsVideoBodyModerationOn": "Ni vous ni le participant ne pourront rallumer la caméra.",
         "muteParticipantsVideoButton": "Couper la caméra",
@@ -393,6 +429,10 @@
         "recentlyUsedObjects": "Vos objets récemment utilisés",
         "recording": "Enregistrement",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Impossible durant le direct",
+        "recordingInProgressDescription": "Cette réunion est en cours d'enregistrement et d'analyse par IA{{learnMore}}. Votre audio et vidéo ont été coupés. Si vous choisissez de vous réactiver, vous consentez à être enregistré.",
+        "recordingInProgressDescriptionFirstHalf": "Cette réunion est en cours d'enregistrement et d'analyse par IA",
+        "recordingInProgressDescriptionSecondHalf": ". Votre audio et vidéo ont été coupés. Si vous choisissez de vous réactiver, vous consentez à être enregistré.",
+        "recordingInProgressTitle": "Enregistrement en cours",
         "rejoinNow": "Rejoindre maintenant",
         "remoteControlAllowedMessage": "{{user}} a accepté votre demande de prise en main à distance !",
         "remoteControlDeniedMessage": "{{user}} a refusé votre demande de prise en main à distance !",
@@ -522,6 +562,23 @@
         "veryBad": "Très mauvais",
         "veryGood": "Très bon"
     },
+    "fileSharing": {
+        "downloadFailedDescription": "Veuillez réessayer.",
+        "downloadFailedTitle": "Échec du téléchargement",
+        "downloadFile": "Télécharger",
+        "downloadStarted": "Téléchargement de fichier démarré",
+        "dragAndDrop": "Glissez et déposez des fichiers ici ou n'importe où sur l'écran",
+        "fileAlreadyUploaded": "Le fichier a déjà été téléchargé vers cette réunion.",
+        "fileTooLargeDescription": "Veuillez vous assurer que le fichier ne dépasse pas {{ maxFileSize }}.",
+        "fileTooLargeTitle": "Le fichier sélectionné est trop volumineux",
+        "fileUploadProgress": "Progression du téléchargement de fichier",
+        "fileUploadedSuccessfully": "Fichier téléchargé avec succès",
+        "removeFile": "Supprimer",
+        "removeFileSuccess": "Fichier supprimé avec succès",
+        "uploadFailedDescription": "Veuillez réessayer.",
+        "uploadFailedTitle": "Échec du téléchargement",
+        "uploadFile": "Partager un fichier"
+    },
     "filmstrip": {
         "accessibilityLabel": {
             "heading": "Vignettes vidéos"
@@ -690,7 +747,8 @@
         "notificationTitle": "Salle d'attente",
         "passwordJoinButton": "Rejoindre",
         "title": "Salle d'attente",
-        "toggleLabel": "Activer la salle d'attente"
+        "toggleLabel": "Activer la salle d'attente",
+        "waitForModerator": "La conférence n'a pas encore commencé car aucun modérateur n'est encore arrivé. Si vous souhaitez devenir modérateur, veuillez vous connecter. Sinon, veuillez attendre."
     },
     "localRecording": {
         "clientState": {
@@ -733,7 +791,10 @@
     "me": "moi",
     "notify": {
         "OldElectronAPPTitle": "Faille de sécurité !",
-        "allowAction": "Permettre",
+        "allowAll": "Tout autoriser",
+        "allowAudio": "Autoriser l'audio",
+        "allowDesktop": "Autoriser le partage d'écran",
+        "allowVideo": "Autoriser la vidéo",
         "allowedUnmute": "Vous pouvez réactiver votre écran, votre caméra ou partager votre écran.",
         "audioUnmuteBlockedDescription": "Le rétablissement du son a été bloqué temporairement en raison de limites système.",
         "audioUnmuteBlockedTitle": "Rétablissement du son bloqué !",
@@ -746,8 +807,10 @@
         "dataChannelClosedDescription": "Le canal de communication avec le Bridge a été interrompu, la qualité vidéo se trouve limitée à sa valeur la plus faible.",
         "dataChannelClosedDescriptionWithAudio": "Le canal de pont est fermé, ce qui peut entraîner des perturbations de l'audio et de la vidéo.",
         "dataChannelClosedWithAudio": "La qualité de l'audio et de la vidéo peut être altérée",
+        "desktopMutedRemotelyTitle": "Votre partage d'écran a été arrêté par {{participantDisplayName}}",
         "disabledIframe": "L'intégration Iframe est uniquement destinée à des démos, cet appel se terminera dans {{timeout}} minutes.",
-        "disabledIframeSecondary": "L'intégration Iframe de {{domaine}} est uniquement destinée à des démos, cet appel se terminera dans {{timeout}} minutes.",
+        "disabledIframeSecondaryNative": "L'intégration de {{domain}} est uniquement destinée aux fins de démonstration, cet appel se terminera dans {{timeout}} minutes.",
+        "disabledIframeSecondaryWeb": "L'intégration de {{domain}} est uniquement destinée aux fins de démonstration, cet appel se terminera dans {{timeout}} minutes. Veuillez utiliser <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Jitsi as a Service</a> pour l'intégration en production !",
         "disconnected": "déconnecté",
         "displayNotifications": "Afficher les notifications pour",
         "dontRemindMe": "Ne pas me le rappeler",
@@ -802,6 +865,7 @@
         "oldElectronClientDescription1": "Vous semblez utiliser une ancienne version du client Jitsi Meet qui présente des failles de sécurité connues. Veuillez vous assurer de mettre à jour vers notre ",
         "oldElectronClientDescription2": "dernière build",
         "oldElectronClientDescription3": " rapidement !",
+        "openChat": "Ouvrir le chat",
         "participantWantsToJoin": "souhaite rejoindre la réunion",
         "participantsWantToJoin": "souhaitent rejoindre la réunion",
         "passwordRemovedRemotely": "Le $t(lockRoomPassword) a été supprimé par un autre participant",
@@ -825,6 +889,8 @@
         "suggestRecordingDescription": "Souhaitez-vous démarrer un enregistrement ?",
         "suggestRecordingTitle": "Enregistrer cette réunion",
         "unmute": "Rétablir le son",
+        "unmuteScreen": "Démarrer le partage d'écran",
+        "unmuteVideo": "Réactiver la vidéo",
         "videoMutedRemotelyDescription": "Vous pouvez toujours la réactiver.",
         "videoMutedRemotelyTitle": "Votre caméra a été coupée par {{participantDisplayName}}!",
         "videoUnmuteBlockedDescription": "Le rétablissement de la vidéo a été bloqué temporairement en raison de limites système.",
@@ -843,11 +909,14 @@
             "admit": "Accepter",
             "admitAll": "Tout accepter",
             "allow": "Autoriser les participants à:",
+            "allowDesktop": "Autoriser le partage d'écran",
             "allowVideo": "permettre la vidéo",
+            "askDesktop": "Demander de partager l'écran",
             "askUnmute": "Demander de réactiver le micro",
             "audioModeration": "Rouvrir leur micro",
             "blockEveryoneMicCamera": "Bloquer tous les micros et caméras",
             "breakoutRooms": "Salles annexes",
+            "desktopModeration": "Démarrer le partage d'écran",
             "goLive": "Passer en direct",
             "invite": "Inviter quelqu'un",
             "lowerAllHands": "Abaisser toutes les mains",
@@ -859,6 +928,8 @@
             "muteAll": "Couper le micro de tout le monde",
             "muteEveryoneElse": "Couper le micro de tous les autres",
             "reject": "Refuser",
+            "stopDesktop": "Arrêter le partage d'écran",
+            "stopEveryonesDesktop": "Arrêter le partage d'écran de tout le monde",
             "stopEveryonesVideo": "Couper toutes les caméras",
             "stopVideo": "Couper la vidéo",
             "unblockEveryoneMicCamera": "Débloquer tous les micros et caméras",
@@ -868,12 +939,15 @@
         "headings": {
             "lobby": "Salle d'attente ({{count}})",
             "participantsList": "Participants de la réunion ({{count}})",
+            "viewerRequests": "Demandes des spectateurs {{count}}",
             "visitorInQueue": " (en attente {{count}})",
             "visitorRequests": "(Demande {{count}} )",
             "visitors": "Visiteurs {{count}}",
+            "visitorsList": "Spectateurs ({{count}})",
             "waitingLobby": "Dans la salle d'attente ({{count}})"
         },
         "search": "Rechercher des participants",
+        "searchDescription": "Commencez à taper pour filtrer les participants",
         "title": "Participants"
     },
     "passwordDigitsOnly": "Jusqu'à {{number}} chiffres",
@@ -1100,6 +1174,7 @@
             "signedIn": "Accès aux événements du calendrier {{email}}. Cliquez sur le bouton se déconnecter ci-dessous pour arrêter l'accès aux événements du calendrier.",
             "title": "Calendrier"
         },
+        "chatWithPermissions": "Le chat nécessite une autorisation",
         "desktopShareFramerate": "Images par seconde pour le Partage d'écran",
         "desktopShareHighFpsWarning": "Augmenter le nombre d'images par seconde pour le partage d'écran peut impacter votre bande passante. Vous devez repartager l'écran pour que ces paramètres soient utilisés.",
         "desktopShareWarning": "Vous devez repartager l'écran pour que ces paramètres soient utilisés.",
@@ -1129,6 +1204,7 @@
         "selectMic": "Microphone",
         "selfView": "Affichage de votre propre vidéo",
         "shortcuts": "Raccourcis",
+        "showSubtitlesOnStage": "Afficher les sous-titres sur l'écran",
         "speakers": "Haut-parleurs",
         "startAudioMuted": "Tout le monde commence en muet",
         "startReactionsMuted": "Tout le monde commence avec les réactions sonores bloquées",
@@ -1182,11 +1258,13 @@
         "fearful": "Effrayé",
         "happy": "Content",
         "hours": "{{count}}h",
+        "labelTooltip": "Nombre de participants : {{count}}",
         "minutes": "{{count}}m",
         "name": "Nom",
         "neutral": "Indifférent",
         "sad": "Triste",
         "search": "Recherche",
+        "searchDescription": "Commencez à taper pour filtrer les participants",
         "searchHint": "Recherche des participants",
         "seconds": "{{count}}s",
         "speakerStats": "Statistiques de l'interlocuteur",
@@ -1223,6 +1301,7 @@
             "closeChat": "Fermer la discussion instantanée",
             "closeMoreActions": "Fermer le menu plus d'actions",
             "closeParticipantsPane": "Fermer le panneau des participants",
+            "closedCaptions": "Sous-titres",
             "collapse": "Plier",
             "document": "Activer / Désactiver le document partagé",
             "documentClose": "Fermer le document partagé",
@@ -1301,6 +1380,20 @@
             "videounmute": "Activer votre vidéo"
         },
         "addPeople": "Ajouter des personnes à votre appel",
+        "advancedAudioSettings": {
+            "aec": {
+                "label": "Suppression d'écho acoustique"
+            },
+            "agc": {
+                "label": "Contrôle automatique du gain"
+            },
+            "ns": {
+                "label": "Suppression de bruit"
+            },
+            "stereo": {
+                "label": "Stéréo"
+            }
+        },
         "audioOnlyOff": "Désactiver le mode bande passante réduite",
         "audioOnlyOn": "Activer le mode bande passante réduite",
         "audioRoute": "Sélectionner la source audio",
@@ -1313,6 +1406,7 @@
         "closeChat": "Fermer le chat",
         "closeParticipantsPane": "Fermer le panneau des participants",
         "closeReactionsMenu": "Fermer le menu réactions",
+        "closedCaptions": "Sous-titres",
         "disableNoiseSuppression": "Arrêter la suppression du bruit",
         "disableReactionSounds": "Vous pouvez interdire les réactions sonores à cette réunion",
         "documentClose": "Fermer le document partagé",
@@ -1371,6 +1465,7 @@
         "reactionHeart": "Envoyer une réaction en forme de cœur",
         "reactionLaugh": "Envoyer réaction rire",
         "reactionLike": "Envoyer réaction approuver",
+        "reactionLove": "Envoyer une réaction d'amour",
         "reactionSilence": "Envoyer réaction silence",
         "reactionSurprised": "Envoyer réaction surprise",
         "reactions": "Reactions",
@@ -1403,14 +1498,18 @@
         "ccButtonTooltip": "Activer / Désactiver les sous-titres",
         "expandedLabel": "La transcription est actuellement activée",
         "failed": "La transcription a échoué",
-        "labelToolTip": "La transcription de la réunion est en cours",
+        "labelTooltip": "La transcription de la réunion est en cours",
+        "labelTooltipExtra": "Une transcription sera disponible plus tard.",
+        "openClosedCaptions": "Ouvrir les sous-titres",
+        "original": "Original",
         "sourceLanguageDesc": "Actuellement, la langue de la réunion est sélectionnée à <b>{{sourceLanguage}}</b>. <br/> Vous pouvez la changer à partir de ",
         "sourceLanguageHere": "ici",
         "start": "Activer les sous-titres",
         "stop": "Désactiver les sous-titres",
         "subtitles": "sous-titres",
         "subtitlesOff": "off",
-        "tr": "TR"
+        "tr": "TR",
+        "translateTo": "Traduire vers"
     },
     "unpinParticipant": "Désépingler - {{participantName}}",
     "userMedia": {
@@ -1452,6 +1551,8 @@
         "connectionInfo": "Informations de la connexion",
         "demote": "Déplacer en visiteur",
         "domute": "Couper le micro",
+        "domuteDesktop": "Arrêter le partage d'écran",
+        "domuteDesktopOfOthers": "Arrêter le partage d'écran de tous les autres",
         "domuteOthers": "Couper le micro de tous les autres",
         "domuteVideo": "Couper la caméra",
         "domuteVideoOfOthers": "Couper la caméra des autres",
@@ -1516,6 +1617,8 @@
             "noMainParticipantsTitle": "Cette réunion n'a pas encore commencé.",
             "noVisitorLobby": "Vous ne pouvez pas rejoindre tant qu'une salle d'attente est activée pour la réunion.",
             "notAllowedPromotion": "Un participant doit d'abord autoriser votre demande.",
+            "requestToJoin": "Main levée",
+            "requestToJoinDescription": "Votre demande a été envoyée aux modérateurs.",
             "title": "Vous êtes visiteur dans cette réunion"
         },
         "waitingMessage": "Vous rejoindrez la réunion dès qu'elle sera en direct !"

lang/main-frCA.json

@@ -11,24 +11,17 @@
         "copyStream": "Copier le lien de diffusion en direct",
         "countryNotSupported": "Nous ne prenons pas encore cette destination en charge.",
         "countryReminder": "Vous appelez en dehors des É.-U.? Veuillez vous assurer de commencer par le code de pays!",
+        "defaultEmail": "Votre email par défaut",
         "disabled": "Vous ne pouvez pas inviter d'autres personnes.",
         "failedToAdd": "L'ajout de membres a échoué",
-        "footerText": "Les appels sont désactivés.",
         "googleEmail": "Gmail",
         "inviteMoreHeader": "Vous êtes seul(e) dans la réunion",
         "inviteMoreMailSubject": "Rejoindre une réunion {{appName}}",
         "inviteMorePrompt": "Inviter d'autres personnes",
         "linkCopied": "Lien copié dans le presse-papiers",
-        "loading": "Rechercher des personnes et des numéros de téléphone",
-        "loadingNumber": "Validation du numéro de téléphone",
-        "loadingPeople": "Rechercher des personnes à inviter",
         "noResults": "Aucun résultat de recherche correspondant",
-        "noValidNumbers": "Veuillez entrer un numéro de téléphone",
         "outlookEmail": "Outlook",
         "phoneNumbers": "Numéros de téléphone",
-        "searchNumbers": "Ajouter des numéros de téléphone",
-        "searchPeople": "Rechercher des personnes",
-        "searchPeopleAndNumbers": "Rechercher des personnes ou ajouter des numéros de téléphone",
         "searching": "Recherche…",
         "shareInvite": "Partager l'invitation à la réunion",
         "shareLink": "Partager le lien de la réunion pour inviter d'autres personnes",
@@ -116,9 +109,12 @@
         }
     },
     "chat": {
+        "disabled": "L'envoi de messages de chat est désactivé.",
         "enter": "Entrez dans le salon",
         "error": "Erreur : votre message n'a pas été envoyé. Raison : {{error}}",
+        "everyone": "Tout le monde",
         "fieldPlaceHolder": "Tapez votre message ici",
+        "guestsChatIndicator": "(invité)",
         "lobbyChatMessageTo": "Message de salle d'attente à {{recipient}}",
         "message": "Message",
         "messageAccessibleTitle": "{{user}} dit: ",
@@ -129,12 +125,26 @@
         "nickname": {
             "popover": "Choisissez un nom d'affichage",
             "title": "Entrer un nom d'affichage pour utiliser le clavardage",
-            "titleWithPolls": "Entrer un nom d'affichage pour utiliser le clavardage"
+            "titleWithCC": "Entrez un pseudonyme pour utiliser le chat et les sous-titres",
+            "titleWithPolls": "Entrer un nom d'affichage pour utiliser le clavardage",
+            "titleWithPollsAndCC": "Entrez un pseudonyme pour utiliser le chat, les sondages et les sous-titres",
+            "titleWithPollsAndCCAndFileSharing": "Entrez un pseudonyme pour utiliser le chat, les sondages, les sous-titres et les fichiers"
         },
-        "noMessagesMessage": "Il n'y a pas encore de messages dans cette réunion. Démarrez une conversation ici !",
+        "noMessagesMessage": "Il n'y a pas encore de messages dans cette réunion. Démarrez une conversation ici!",
         "privateNotice": "Message privé à {{recipient}}",
         "sendButton": "Envoyer",
+        "smileysPanel": "Panneaux des Émojis",
+        "systemDisplayName": "Système",
+        "tabs": {
+            "chat": "Chat",
+            "closedCaptions": "ST",
+            "fileSharing": "Fichiers",
+            "polls": "Sondages"
+        },
         "title": "Clavardage",
+        "titleWithCC": "ST",
+        "titleWithFeatures": "Chat et",
+        "titleWithFileSharing": "Fichiers",
         "titleWithPolls": "Clavardage",
         "you": "vous"
     },
@@ -145,6 +155,10 @@
         "dontShowAgain": "Ne plus m'afficher ceci",
         "installExtensionText": "Installer l'extension pour l'intégration de Google Calendar et Office 365"
     },
+    "closedCaptionsTab": {
+        "emptyState": "Le contenu des sous-titres sera disponible quand un modérateur les aura démarrés",
+        "startClosedCaptionsButton": "Démarrer les sous-titres"
+    },
     "connectingOverlay": {
         "joiningRoom": "Connexion à la réunion en cours…"
     },
@@ -161,8 +175,7 @@
         "FETCH_SESSION_ID": "Obtention d'un identifiant de session…",
         "GET_SESSION_ID_ERROR": "Obtenir une erreur d'identifiant de session: {{code}}",
         "GOT_SESSION_ID": "Obtention d'un identifiant de session… Terminée",
-        "LOW_BANDWIDTH": "La vidéo de {{displayName}} a été coupée pour économiser de la bande passante",
-        "RECONNECTING": "Un problème de réseau est survenu. Reconnexion en cours…"
+        "LOW_BANDWIDTH": "La vidéo de {{displayName}} a été coupée pour économiser de la bande passante"
     },
     "connectionindicator": {
         "address": "Adresse :",
@@ -183,6 +196,7 @@
         "more": "Afficher plus",
         "no": "non",
         "packetloss": "Perte de paquet :",
+        "participant_id": "ID du participant:",
         "quality": {
             "good": "Bonne",
             "inactive": "Inactive",
@@ -221,8 +235,9 @@
         "joinInBrowser": "Rejoindre depuis le navigateur",
         "launchMeetingLabel": "Comment voulez-vous rejoindre la réunion ?",
         "launchWebButton": "Démarrer dans l'application Web",
+        "noDesktopApp": "Vous n'avez pas l'application ?",
         "noMobileApp": "Vous n'avez pas l'application ?",
-        "openApp": "Continuer vers l'application",
+        "or": "OU",
         "termsAndConditions": "En continuant, vous acceptez nos  <a href='{{termsAndConditionsLink}}' rel='noopener noreferrer' target='_blank'>conditions générales d’utilisation.</a>",
         "title": "Démarrage de votre réunion dans {{app}} en cours…",
         "titleNew": "Démarrage de votre réunion…",
@@ -263,8 +278,9 @@
         "Remove": "Supprimer",
         "Share": "Partager",
         "Submit": "Envoyer",
-        "WaitForHostMsg": "La conférence n'a pas encore démarré. Si vous êtes l'hôte, veuillez vous authentifier. Sinon, veuillez attendre que l'hôte arrive.",
-        "WaitingForHost": "En attente de l'hôte…",
+        "Understand": "Je comprends, gardez-moi en sourdine pour l'instant",
+        "UnderstandAndUnmute": "Je comprends, veuillez me réactiver s'il vous plaît",
+        "WaitForHostNoAuthMsg": "La réunion n'a pas encore commencé car aucun modérateur n'est encore arrivé. Veuillez patienter.",
         "WaitingForHostButton": "Attendre l'hôte",
         "WaitingForHostTitle": "En attente de l'hôte…",
         "Yes": "Oui",
@@ -276,19 +292,27 @@
             "sharingTabs": "Options de partage"
         },
         "add": "Ajouter",
-        "addMeetingNote": "Ajouter une note à cette conférence",
+        "addMeetingNote": "Ajouter une note à cette réunion",
         "addOptionalNote": "Ajouter une note (optionnel):",
         "allow": "Autoriser",
         "allowToggleCameraDialog": "Autorisez-vous {{initiatorName}} à changer votre mode de caméra?",
         "allowToggleCameraTitle": "Autoriser-vous le changement de mode de caméra?",
-        "alreadySharedVideoMsg": "Un autre membre partage déjà une vidéo. Cette conférence permet le partage d'une seule vidéo à la fois.",
+        "alreadySharedVideoMsg": "Un autre membre partage déjà une vidéo. Cette réunion permet le partage d'une seule vidéo à la fois.",
         "alreadySharedVideoTitle": "Seulement une vidéo à la fois peut être partagée",
         "applicationWindow": "Fenêtre d'application",
+        "authenticationRequired": "Authentification requise",
+        "cameraCaptureDialog": {
+            "description": "Prendre et envoyer une photo en utilisant votre caméra mobile",
+            "ok": "Ouvrir la caméra",
+            "reject": "Pas maintenant",
+            "title": "Prendre une photo"
+        },
         "cameraConstraintFailedError": "Votre caméra ne répond pas à certaines exigences.",
         "cameraNotFoundError": "Impossible de trouver la caméra.",
         "cameraNotSendingData": "Il est impossible d'accéder à la caméra. Veuillez vérifier si une autre application utilise actuellement ce dispositif, sélectionner un autre dispositif à partir du menu des paramètres ou essayer de recharger l'application.",
         "cameraNotSendingDataTitle": "Impossible d'accéder à la caméra",
-        "cameraPermissionDeniedError": "Vous n'avez pas reçu l'autorisation d'utiliser votre caméra. Vous pouvez toujours rejoindre la conférence, mais les autres membres ne pourront pas vous voir. Utilisez le bouton de caméra dans la barre d'adresse pour corriger cela.",
+        "cameraPermissionDeniedError": "Vous n'avez pas reçu l'autorisation d'utiliser votre caméra. Vous pouvez toujours rejoindre la réunion, mais les autres membres ne pourront pas vous voir. Utilisez le bouton de caméra dans la barre d'adresse pour corriger cela.",
+        "cameraTimeoutError": "Impossible de démarrer la source vidéo. Délai dépassé!",
         "cameraUnknownError": "Impossible d'utiliser la caméra pour une raison inconnue.",
         "cameraUnsupportedResolutionError": "Votre caméra ne prend pas en charge la résolution vidéo nécessaire.",
         "close": "Fermer",
@@ -297,28 +321,29 @@
         "conferenceReloadMsg": "Nous tentons de résoudre le problème. Reconnexion dans {{seconds}} sec…",
         "conferenceReloadTitle": "Malheureusement, une erreur s'est produite.",
         "confirm": "Confirmer",
+        "confirmBack": "Retour",
         "confirmNo": "Non",
         "confirmYes": "Oui",
-        "connectError": "Oups! Une erreur s'est produite. La connexion à la conférence a échouée.",
-        "connectErrorWithMsg": "Oups! Une erreur s'est produite. La connexion à la conférence a échoué : {{msg}}",
+        "connectError": "Oups! Une erreur s'est produite. La connexion à la réunion a échouée.",
+        "connectErrorWithMsg": "Oups! Une erreur s'est produite. La connexion à la réunion a échoué : {{msg}}",
         "connecting": "Connexion en cours",
         "contactSupport": "Communiquez avec le service de soutien",
         "copied": "Copié",
         "copy": "Copier",
+        "demoteParticipantDialog": "Êtes-vous sûr de vouloir déplacer ce participant en visiteur ?",
+        "demoteParticipantTitle": "Déplacer en visiteur",
         "dismiss": "Rejeter",
         "displayNameRequired": "Un nom d'affichage est requis",
         "done": "Terminé",
         "e2eeDescription": "Le chiffrement de bout en bout est actuellement expérimental. Veuillez garder en tête que l'activation du chiffrement de bout en bout désactivera les services fournis côté serveur tels que : l'enregistrement, la diffusion en direct et la participation par téléphone. Gardez également en tête que la réunion ne fonctionnera que pour les personnes qui se connectent à partir de navigateurs prenant en charge les flux insérables.",
-        "e2eeDisabledDueToMaxModeDescription": "Impossible d'activer le chiffrement de bout en bout en raison du trop grand nombre de participants à la conférence.",
+        "e2eeDisabledDueToMaxModeDescription": "Impossible d'activer le chiffrement de bout en bout en raison du trop grand nombre de participants à la réunion.",
         "e2eeLabel": "Activer le chiffrement de Bout-en-Bout",
         "e2eeWarning": "ATTENTION : Tous les participants de cette réunion ne semblent pas prendre en charge le chiffrement de bout en bout. Si vous activez le chiffrement, ils ne pourront ni vous voir, ni vous entendre.",
-        "e2eeWillDisableDueToMaxModeDescription": "ATTENTION: le chiffrement de bout en bout sera automatiquement arrêté si plus de participants joignent la conférence.",
+        "e2eeWillDisableDueToMaxModeDescription": "ATTENTION: le chiffrement de bout en bout sera automatiquement arrêté si plus de participants joignent la réunion.",
         "embedMeeting": "Intégrer la réunion",
         "enterDisplayName": "Veuillez saisir votre nom d'affichage",
         "error": "Erreur",
-        "externalInstallationMsg": "Vous devez installer notre extension de partage de bureau.",
-        "externalInstallationTitle": "Extension requise",
-        "goToStore": "Rendez-vous sur notre boutique en ligne",
+        "errorRoomCreationRestriction": "Vous avez essayé de rejoindre trop rapidement, veuillez revenir dans un moment.",
         "gracefulShutdown": "Notre service est actuellement hors service pour l'entretien. Veuillez réessayer plus tard.",
         "grantModeratorDialog": "Êtes-vous sûr de vouloir rendre ce participant modérateur ?",
         "grantModeratorTitle": "Nommer modérateur",
@@ -326,57 +351,65 @@
         "hideShareAudioHelper": "Ne plus afficher ce dialogue",
         "incorrectPassword": "Nom d'utilisateur ou mot de passe incorrect",
         "incorrectRoomLockPassword": "Mot de passe incorrect",
-        "inlineInstallExtension": "Installer maintenant",
-        "inlineInstallationMsg": "Vous devez installer notre extension de partage de bureau.",
         "internalError": "Oups! Une erreur s'est produite. L'erreur suivante est survenue : {{error}}",
         "internalErrorTitle": "Erreur interne.",
         "kickMessage": "Aïe! Vous avez été expulsé de la réunion!",
         "kickParticipantButton": "Expulser",
         "kickParticipantDialog": "Êtes-vous certain de vouloir expulser ce participant?",
         "kickParticipantTitle": "Expulser ce membre?",
+        "kickSystemTitle": "Oups ! Vous avez été expulsé de la réunion",
         "kickTitle": "Expulsé de la réunion",
-        "linkMeeting": "Relier la conférence",
-        "linkMeetingTitle": "Relier la conférence à Salesforce",
+        "learnMore": "en savoir plus",
+        "linkMeeting": "Relier la réunion",
+        "linkMeetingTitle": "Relier la réunion à Salesforce",
         "liveStreaming": "Diffusion en direct",
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Impossible durant l'enregistrement",
-        "liveStreamingDisabledForGuestTooltip": "Les invités ne peuvent pas démarrer la diffusion en direct.",
-        "liveStreamingDisabledTooltip": "Démarrage de la diffusion en direct désactivé.",
         "localUserControls": "Contrôles de l'utilisateur local",
-        "lockMessage": "Échec du verrouillage de la conférence.",
+        "lockMessage": "Échec du verrouillage de la réunion.",
         "lockRoom": "Ajouter un mot de passe à la réunion",
         "lockTitle": "Échec du verrouillage",
         "login": "Connexion",
-        "loginQuestion": "Voulez-vous vraiment vous connecter et quitter la conférence?",
-        "logoutQuestion": "Êtes-vous certain de vouloir vous déconnecter et arrêter la conférence?",
+        "loginQuestion": "Voulez-vous vraiment vous connecter et quitter la réunion?",
+        "logoutQuestion": "Êtes-vous certain de vouloir vous déconnecter et arrêter la réunion?",
         "logoutTitle": "Déconnexion",
-        "maxUsersLimitReached": "La limite du nombre maximum de membres a été atteinte. La conférence est pleine. Veuillez communiquer avec l'hôte de la réunion ou réessayer plus tard.",
+        "maxUsersLimitReached": "La limite du nombre maximum de membres a été atteinte. La réunion est pleine. Veuillez communiquer avec l'hôte de la réunion ou réessayer plus tard.",
         "maxUsersLimitReachedTitle": "Limite du nombre de membres maximum atteinte",
         "micConstraintFailedError": "Votre micro ne répond pas à certaines exigences",
         "micNotFoundError": "Impossible de trouver le micro.",
         "micNotSendingData": "Impossible d'accéder à votre micro. Veuillez sélectionner un autre dispositif à partir du menu des paramètres ou essayer de recharger l'application.",
         "micNotSendingDataTitle": "Impossible d'accéder à votre micro",
-        "micPermissionDeniedError": "Vous n'avez pas accordé l'autorisation d'utilisation de votre micro. Vous pouvez toujours rejoindre la conférence, mais les autres membres ne pourront pas vous entendre. Utilisez le bouton de caméra dans la barre d'adresse pour remédier à cela.",
+        "micPermissionDeniedError": "Vous n'avez pas accordé l'autorisation d'utilisation de votre micro. Vous pouvez toujours rejoindre la réunion, mais les autres membres ne pourront pas vous entendre. Utilisez le bouton de caméra dans la barre d'adresse pour remédier à cela.",
         "micTimeoutError": "Impossible de démarrer la source audio. Délai dépassé!",
         "micUnknownError": "Impossible d'utiliser le micro pour une raison inconnue.",
         "moderationAudioLabel": "Autoriser les participants à réactiver leur micro",
+        "moderationDesktopLabel": "Autoriser les non-modérateurs à partager leur écran",
         "moderationVideoLabel": "Autoriser les participants à démarrer leur vidéo",
         "muteEveryoneDialog": "Êtes-vous sûr de vouloir couper les micros de tout le monde? Vous ne pourrez plus réactiver leur micro, mais ils pourront l'activer par eux-mêmes à tout moment.",
         "muteEveryoneDialogModerationOn": "Les participants peuvent demander à parler n'importe quand",
         "muteEveryoneElseDialog": "Une fois leur micro coupé, vous ne pourrez plus le réactiver, mais ils pourront l'activer par eux-mêmes à tout moment.",
         "muteEveryoneElseTitle": "Couper le micro de tout le monde sauf de {{whom}}?",
+        "muteEveryoneElsesDesktopDialog": "Une fois le partage arrêté, vous ne pourrez pas le redémarrer, mais ils peuvent le faire à tout moment.",
+        "muteEveryoneElsesDesktopTitle": "Arrêter le partage d'écran de tout le monde sauf {{whom}} ?",
         "muteEveryoneElsesVideoDialog": "Une fois la caméra coupée, vous ne pourrez plus la rallumer, mais ils peuvent la rallumer à tout moment.",
         "muteEveryoneElsesVideoTitle": "Couper la vidéo de tout le monde sauf {{whom}}?",
         "muteEveryoneSelf": "vous",
         "muteEveryoneStartMuted": "Tout le monde démarre avec le micro coupé",
         "muteEveryoneTitle": "Couper le micro de tout le monde ?",
+        "muteEveryonesDesktopDialog": "Les participants peuvent partager leur écran à tout moment.",
+        "muteEveryonesDesktopDialogModerationOn": "Les participants peuvent envoyer une demande pour partager leur écran à tout moment.",
+        "muteEveryonesDesktopTitle": "Arrêter le partage d'écran de tout le monde ?",
         "muteEveryonesVideoDialog": "Êtes-vous sûr de vouloir couper la caméra de tout le monde? Vous ne pourrez pas la réactiver, mais ils peuvent la remettre à tout moment.",
         "muteEveryonesVideoDialogModerationOn": "Les participants peuvent demander à activer leur caméra n'importe quand.",
         "muteEveryonesVideoDialogOk": "Désactiver",
         "muteEveryonesVideoTitle": "Couper la caméra de tout le monde?",
         "muteParticipantBody": "Vous ne pourrez pas réactiver leur micro, mais ils peuvent le réactiver eux-mêmes à tout moment.",
         "muteParticipantButton": "Discrétion",
-        "muteParticipantDialog": "Êtes-vous certain de vouloir désactiver le micro de ce participant? Vous ne pourrez pas le réactiver, mais il peut le réactiver lui-même à tout moment.",
-        "muteParticipantTitle": "Désactiver le micro de ce membre?",
+        "muteParticipantsDesktopBody": "Vous ne pourrez pas démarrer leur partage d'écran, mais ils peuvent le faire à tout moment.",
+        "muteParticipantsDesktopBodyModerationOn": "Vous ne pourrez pas démarrer leur partage d'écran et eux non plus.",
+        "muteParticipantsDesktopButton": "Arrêter le partage d'écran",
+        "muteParticipantsDesktopDialog": "Êtes-vous sûr de vouloir désactiver le partage d'écran de ce participant ? Vous ne pourrez pas le redémarrer, mais ils peuvent le faire à tout moment.",
+        "muteParticipantsDesktopDialogModerationOn": "Êtes-vous sûr de vouloir désactiver le partage d'écran de ce participant ? Vous ne pourrez pas réactiver l'écran et eux non plus.",
+        "muteParticipantsDesktopTitle": "Désactiver le partage d'écran de ce participant ?",
         "muteParticipantsVideoBody": "Vous ne pourrez pas rallumer la caméra, mais ils peuvent la rallumer à tout moment.",
         "muteParticipantsVideoBodyModerationOn": "Ni vous ni le participant ne pourront rallumer la caméra.",
         "muteParticipantsVideoButton": "Couper la caméra",
@@ -392,14 +425,14 @@
         "permissionCameraRequiredError": "L'autorisation caméra est nécessaire pour participer aux réunions avec vidéo. Merci de l'accorder dans les paramètres",
         "permissionErrorTitle": "Permission nécessaire",
         "permissionMicRequiredError": "L'autorisation microphone est nécessaire pour participer aux réunions avec son. Merci de l'accorder dans les paramètres",
-        "popupError": "Votre navigateur bloque les fenêtres surgissantes provenant de ce site. Veuillez activer les fenêtres surgissantes dans les paramètres de sécurité de votre navigateur et réessayer.",
-        "popupErrorTitle": "Fenêtre surgissante bloquée",
         "readMore": "plus",
         "recentlyUsedObjects": "Vos objets récemment utilisés",
         "recording": "Enregistrement",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Impossible durant le direct",
-        "recordingDisabledForGuestTooltip": "Les invités ne peuvent pas démarrer l'enregistrement.",
-        "recordingDisabledTooltip": "Démarrage de l'enregistrement désactivé.",
+        "recordingInProgressDescription": "Cette réunion est en cours d'enregistrement et d'analyse par IA{{learnMore}}. Votre audio et vidéo ont été coupés. Si vous choisissez de vous réactiver, vous consentez à être enregistré.",
+        "recordingInProgressDescriptionFirstHalf": "Cette réunion est en cours d'enregistrement et d'analyse par IA",
+        "recordingInProgressDescriptionSecondHalf": ". Votre audio et vidéo ont été coupés. Si vous choisissez de vous réactiver, vous consentez à être enregistré.",
+        "recordingInProgressTitle": "Enregistrement en cours",
         "rejoinNow": "Rejoindre maintenant",
         "remoteControlAllowedMessage": "{{user}} a accepté votre demande de contrôle à distance!",
         "remoteControlDeniedMessage": "{{user}} a refusé votre demande de contrôle à distance!",
@@ -408,6 +441,7 @@
         "remoteControlShareScreenWarning": "Notez que si vous appuyez sur « Permettre », vous partagerez votre écran!",
         "remoteControlStopMessage": "La séance de contrôle à distance est terminée!",
         "remoteControlTitle": "Contrôle du bureau à distance",
+        "remoteUserControls": "Contrôles de l'utilisateur distant {{username}}",
         "removePassword": "Supprimer un mot de passe",
         "removeSharedVideoMsg": "Êtes-vous certain de vouloir supprimer votre vidéo partagée?",
         "removeSharedVideoTitle": "Supprimer la vidéo partagée",
@@ -419,10 +453,6 @@
         "screenSharingAudio": "Partager l'audio",
         "screenSharingFailed": "Oups! Quelque chose s'est mal passé, nous n'avons pas pu démarrer le partage d'écran!",
         "screenSharingFailedTitle": "Echec du partage d'écran!",
-        "screenSharingFailedToInstall": "Oups! L'installation de votre extension de partage d'écran a échouée.",
-        "screenSharingFailedToInstallTitle": "L'installation de l'extension de partage d'écran a échouée",
-        "screenSharingFirefoxPermissionDeniedError": "Une erreur s'est produite lors de la tentative de partage d'écran. Veuillez vous assurer d'avoir donné votre autorisation.",
-        "screenSharingFirefoxPermissionDeniedTitle": "Oups! Il est impossible de démarrer le partage d'écran!",
         "screenSharingPermissionDeniedError": "Oups! Une erreur s'est produite avec les autorisations de l'extension de partage d'écran. Veuillez recharger et réessayer.",
         "searchInSalesforce": "Rechercher dans Salesforce",
         "searchResults": "Résultats de recherche ({{count}})",
@@ -450,11 +480,13 @@
         "shareScreenWarningD2": "vous devez arrêter le partage d'audio, démarrer le partage d'écran et cocher l'option  \"Partager l'audio\".",
         "shareScreenWarningH1": "Si vous voulez partager uniquement votre écran:",
         "shareScreenWarningTitle": "Vous devez cesser de partager votre audio avant de partager votre écran",
+        "shareVideoConfirmPlay": "Vous êtes sur le point d'ouvrir un site web externe. Voulez-vous continuer ?",
+        "shareVideoConfirmPlayTitle": "{{name}} a partagé une vidéo avec vous.",
         "shareVideoLinkError": "Veuillez fournir un lien correct.",
+        "shareVideoLinkStopped": "La vidéo de {{name}} a été arrêtée.",
         "shareVideoTitle": "Partager une vidéo",
         "shareYourScreen": "Partager votre écran",
         "shareYourScreenDisabled": "Le partage d'écran est désactivé.",
-        "shareYourScreenDisabledForGuest": "Les invités ne peuvent pas partager leur écran.",
         "sharedVideoDialogError": "Erreur: URL invalide",
         "sharedVideoLinkPlaceholder": "lien YouTube ou lien vidéo direct",
         "show": "Afficher",
@@ -512,7 +544,7 @@
         "title": "Document partagé"
     },
     "e2ee": {
-        "labelToolTip": "Le son et la vidéo de cette conférence sont chiffrés de bout en bout"
+        "labelToolTip": "Le son et la vidéo de cette réunion sont chiffrés de bout en bout"
     },
     "embedMeeting": {
         "title": "Intégrer cette réunion"
@@ -525,10 +557,28 @@
         "bad": "Mauvaise",
         "detailsLabel": "Dites-nous en plus.",
         "good": "Bonne",
-        "rateExperience": "Évaluez votre expérience de cette conférence",
+        "rateExperience": "Évaluez votre expérience de cette réunion",
+        "star": "Étoile",
         "veryBad": "Très mauvaise",
         "veryGood": "Très bonne"
     },
+    "fileSharing": {
+        "downloadFailedDescription": "Veuillez réessayer.",
+        "downloadFailedTitle": "Échec du téléchargement",
+        "downloadFile": "Télécharger",
+        "downloadStarted": "Téléchargement de fichier démarré",
+        "dragAndDrop": "Glisser-déposer des fichiers ici ou n'importe où à l'écran",
+        "fileAlreadyUploaded": "Ce fichier a déjà été téléversé dans cette réunion.",
+        "fileTooLargeDescription": "Veuillez vous assurer que le fichier ne dépasse pas {{ maxFileSize }}.",
+        "fileTooLargeTitle": "Le fichier choisi est trop volumineux",
+        "fileUploadProgress": "Progression du téléchargement de fichier",
+        "fileUploadedSuccessfully": "Fichier téléversé avec succès",
+        "removeFile": "Supprimer",
+        "removeFileSuccess": "Fichier supprimé avec succès",
+        "uploadFailedDescription": "Veuillez réessayer.",
+        "uploadFailedTitle": "Échec du téléchargement",
+        "uploadFile": "Partager un fichier"
+    },
     "filmstrip": {
         "accessibilityLabel": {
             "heading": "Vignettes vidéos"
@@ -576,6 +626,7 @@
         "noNumbers": "Aucun numéro d'appel trouvé",
         "noPassword": "Aucun",
         "noRoom": "Vous n'avez pas précisé de salle pour l'appel interne.",
+        "noWhiteboard": "Impossible de charger le tableau blanc.",
         "numbers": "Numéros d'appel",
         "password": "Mot de passe:",
         "reachedLimit": "Vous avez atteint la limite de votre abonnement.",
@@ -583,7 +634,8 @@
         "sipAudioOnly": "Adresse SIP en audio uniquement",
         "title": "Partager",
         "tooltip": "Lien de partage et informations d'appel interne pour cette réunion",
-        "upgradeOptions": "Veuillez vérifier les options de mise à niveau"
+        "upgradeOptions": "Veuillez vérifier les options de mise à niveau",
+        "whiteboardError": "Erreur de chargement du tableau blanc. Veuillez réessayer plus tard."
     },
     "inlineDialogFailure": {
         "msg": "Nous avons rencontré un obstacle.",
@@ -613,10 +665,10 @@
         "showSpeakerStats": "Afficher les statistiques d'intervenant",
         "toggleChat": "Ouvrir ou fermer le clavardage",
         "toggleFilmstrip": "Afficher ou masquer les icônes vidéos",
+        "toggleParticipantsPane": "Afficher ou masquer le volet des participants",
         "toggleScreensharing": "Basculer entre la caméra et le partage d'écran",
         "toggleShortcuts": "Afficher ou masquer les raccourcis clavier",
-        "videoMute": "Démarrer ou arrêter votre caméra",
-        "videoQuality": "Gérer la qualité d'appel"
+        "videoMute": "Démarrer ou arrêter votre caméra"
     },
     "largeVideo": {
         "screenIsShared": "Vous êtes en train de partager votre écran",
@@ -647,6 +699,7 @@
         "on": "Diffusion en direct",
         "onBy": "{{name}} démarré la diffusion en continu",
         "pending": "Démarrage de la diffusion en direct…",
+        "policyError": "Vous avez essayé de démarrer une diffusion en direct trop rapidement. Veuillez réessayer plus tard !",
         "serviceName": "Service de diffusion en direct",
         "sessionAlreadyActive": "Cette session est déjà en cours d'enregistrement ou de diffusion.",
         "signIn": "Se connecter avec Google",
@@ -694,7 +747,8 @@
         "notificationTitle": "Salle d'attente",
         "passwordJoinButton": "Rejoindre",
         "title": "Salle d'attente",
-        "toggleLabel": "Activer la salle d'attente"
+        "toggleLabel": "Activer la salle d'attente",
+        "waitForModerator": "La réunion n'a pas encore commencé car aucun modérateur n'est encore arrivé. Si vous souhaitez devenir modérateur, veuillez vous connecter. Sinon, veuillez attendre."
     },
     "localRecording": {
         "clientState": {
@@ -737,27 +791,37 @@
     "me": "moi",
     "notify": {
         "OldElectronAPPTitle": "Faille de sécurité !",
-        "allowAction": "Permettre",
+        "allowAll": "Tout autoriser",
+        "allowAudio": "Autoriser l'audio",
+        "allowDesktop": "Autoriser le partage d'écran",
+        "allowVideo": "Autoriser la vidéo",
         "allowedUnmute": "Vous pouvez réactiver votre écran, votre caméra ou partager votre écran.",
         "audioUnmuteBlockedDescription": "Le rétablissement du son a été bloqué temporairement en raison de limites système.",
         "audioUnmuteBlockedTitle": "Rétablissement du son bloqué!",
         "chatMessages": "Messages de chat",
-        "connectedOneMember": "{{name}} a rejoint la réunion",
-        "connectedThreePlusMembers": "{{name}} et {{count}} autres ont rejoint la réunion",
-        "connectedTwoMembers": "{{first}} et {{second}} ont rejoint la réunion",
+        "connectedOneMember": "{{name}} a rerejoint la réunion",
+        "connectedThreePlusMembers": "{{name}} et {{count}} autres ont rerejoint la réunion",
+        "connectedTwoMembers": "{{first}} et {{second}} ont rerejoint la réunion",
+        "connectionFailed": "Connexion échouée. Veuillez réessayer plus tard !",
         "dataChannelClosed": "Qualité vidéo dégradée",
         "dataChannelClosedDescription": "Le canal de communication avec le Bridge a été interrompu, la qualité vidéo se trouve limitée à sa valeur la plus faible.",
+        "dataChannelClosedDescriptionWithAudio": "Le canal de pont est fermé, ce qui peut entraîner des perturbations de l'audio et de la vidéo.",
+        "dataChannelClosedWithAudio": "La qualité de l'audio et de la vidéo peut être altérée",
+        "desktopMutedRemotelyTitle": "Votre partage d'écran a été arrêté par {{participantDisplayName}}",
         "disabledIframe": "L'intégration Iframe est uniquement destinée à des démos, cet appel se terminera dans {{timeout}} minutes.",
-        "disabledIframeSecondary": "L'intégration Iframe de {{domaine}} est uniquement destinée à des démos, cet appel se terminera dans {{timeout}} minutes.",
+        "disabledIframeSecondaryNative": "L'intégration de {{domain}} est uniquement destinée aux fins de démonstration, cet appel se terminera dans {{timeout}} minutes.",
+        "disabledIframeSecondaryWeb": "L'intégration de {{domain}} est uniquement destinée aux fins de démonstration, cet appel se terminera dans {{timeout}} minutes. Veuillez utiliser <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Jitsi as a Service</a> pour l'intégration en production !",
         "disconnected": "déconnecté",
         "displayNotifications": "Afficher les notifications pour",
         "dontRemindMe": "Ne pas me le rappeler",
-        "focus": "Sujet de la conférence",
+        "focus": "Sujet de la réunion",
         "focusFail": "{{component}} non disponible; réessayez dans {{ms}} sec",
         "gifsMenu": "GIPHY",
-        "grantedTo": "Droits de modérateur accordés à {{to}}!",
         "groupTitle": "Notifications",
         "hostAskedUnmute": "Le modérateur souhaite vous donner la parole",
+        "invalidTenant": "Tenant invalide",
+        "invalidTenantHyphenDescription": "Le tenant que vous utilisez est invalide (commence ou se termine par '-').",
+        "invalidTenantLengthDescription": "Le tenant que vous utilisez est trop long.",
         "invitedOneMember": "{{displayName}} a été invité",
         "invitedThreePlusMembers": "{{name}} et {{count}} autres ont été invités",
         "invitedTwoMembers": "{{first}} et {{second}} ont été invités",
@@ -767,11 +831,11 @@
         "leftThreePlusMembers": "{{name}} et beaucoup d'autres ont quitté la réunion",
         "leftTwoMembers": "{{first}} et {{second}} ont quitté la réunion",
         "linkToSalesforce": "Lien à Salesforce",
-        "linkToSalesforceDescription": "Vous pouvez lier le résumé de la conférence à un objet Salesforce.",
-        "linkToSalesforceError": "Impossible de relier la conférence à Salesforce",
-        "linkToSalesforceKey": "Relier cette conférence",
-        "linkToSalesforceProgress": "Liaison de la conférence à Salesforce…",
-        "linkToSalesforceSuccess": "La conférence a été reliée à Salesforce",
+        "linkToSalesforceDescription": "Vous pouvez lier le résumé de la réunion à un objet Salesforce.",
+        "linkToSalesforceError": "Impossible de relier la réunion à Salesforce",
+        "linkToSalesforceKey": "Relier cette réunion",
+        "linkToSalesforceProgress": "Liaison de la réunion à Salesforce…",
+        "linkToSalesforceSuccess": "La réunion a été reliée à Salesforce",
         "localRecordingStarted": "{{name}} a commencé un enregistrement local.",
         "localRecordingStopped": "{{name}} a arrêté un enregistrement local.",
         "me": "Moi",
@@ -794,18 +858,21 @@
         "newDeviceAction": "Utiliser",
         "newDeviceAudioTitle": "Nouveau dispositif audio détecté",
         "newDeviceCameraTitle": "Nouvelle caméra détectée",
+        "nextToSpeak": "Vous êtes le prochain à prendre la parole",
         "noiseSuppressionDesktopAudioDescription": "La suppression de bruit ne peut pas être activée en même temps que la partage audio du système, veuillez le désactiver et réessayer.",
         "noiseSuppressionFailedTitle": "Échec du démarrage de la suppression de bruit",
         "noiseSuppressionStereoDescription": "La suppression de bruit d'une source stéréo n'est pas encore supportée.",
         "oldElectronClientDescription1": "Vous semblez utiliser une ancienne version du client Jitsi Meet qui présente des failles de sécurité connues. Veuillez vous assurer de mettre à jour vers notre ",
         "oldElectronClientDescription2": "dernière build",
         "oldElectronClientDescription3": " rapidement !",
+        "openChat": "Ouvrir le chat",
         "participantWantsToJoin": "souhaite rejoindre la réunion",
         "participantsWantToJoin": "souhaitent rejoindre la réunion",
         "passwordRemovedRemotely": "$t(lockRoomPasswordUppercase) supprimé par un autre participant",
         "passwordSetRemotely": "$t(lockRoomPasswordUppercase) défini par un autre participant",
         "raiseHandAction": "Lever la main",
         "raisedHand": "{{name}} voudrait parler.",
+        "raisedHands": "{{participantName}} et {{raisedHands}} autres personnes",
         "reactionSounds": "Bloquer les réactions sonores",
         "reactionSoundsForAll": "Bloquer les réactions sonores pour tous",
         "screenShareNoAudio": " La case Partager l'audio n'a pas été cochée dans l'écran de sélection de la fenêtre.",
@@ -818,13 +885,22 @@
         "startSilentTitle": "Vous avez rejoint sans sortie audio!",
         "suboptimalBrowserWarning": "Nous craignons que votre expérience de réunion en ligne ne soit bonne ici. Nous cherchons des moyens d'améliorer cela, mais d'ici-là, essayez d'utiliser l'un des <a href='{{recommendedBrowserPageLink}}' target='_blank'>navigateurs supportés</a>.",
         "suboptimalExperienceTitle": "Avertissement de navigateur",
+        "suggestRecordingAction": "Démarrer",
+        "suggestRecordingDescription": "Souhaitez-vous démarrer un enregistrement ?",
+        "suggestRecordingTitle": "Enregistrer cette réunion",
         "unmute": "Rétablir le son",
+        "unmuteScreen": "Démarrer le partage d'écran",
+        "unmuteVideo": "Réactiver la vidéo",
         "videoMutedRemotelyDescription": "Vous pouvez toujours la réactiver.",
         "videoMutedRemotelyTitle": "Votre caméra a été coupée par {{participantDisplayName}}!",
         "videoUnmuteBlockedDescription": "Le rétablissement de la vidéo a été bloqué temporairement en raison de limites système.",
         "videoUnmuteBlockedTitle": "Rétablissement de la caméra bloqué !",
         "viewLobby": "Voir la salle d'attente",
+        "viewParticipants": "Voir les participants",
+        "viewVisitors": "Voir les visiteurs",
         "waitingParticipants": "{{waitingParticipants}} personnes",
+        "waitingVisitors": "Visiteurs en attente dans la file : {{waitingVisitors}}",
+        "waitingVisitorsTitle": "La réunion n'est pas encore en direct !",
         "whiteboardLimitDescription": "Veuillez sauvegarder votre progression, car la limite d'utilisation du tableau blanc sera bientôt atteinte et celui-ci sera fermé.",
         "whiteboardLimitTitle": "Utiilisation du tableau blanc"
     },
@@ -833,12 +909,18 @@
             "admit": "Accepter",
             "admitAll": "Tout accepter",
             "allow": "Autoriser les participants à:",
+            "allowDesktop": "Autoriser le partage d'écran",
             "allowVideo": "permettre la vidéo",
+            "askDesktop": "Demander de partager l'écran",
             "askUnmute": "Demander de réactiver le micro",
             "audioModeration": "Rouvrir leur micro",
             "blockEveryoneMicCamera": "Bloquer tous les micros et caméras",
             "breakoutRooms": "Salles annexes",
+            "desktopModeration": "Démarrer le partage d'écran",
+            "goLive": "Passer en direct",
             "invite": "Inviter quelqu'un",
+            "lowerAllHands": "Abaisser toutes les mains",
+            "lowerHand": "Abaisser la main",
             "moreModerationActions": "Options de modération supplémentaires",
             "moreModerationControls": "Options de modération supplémentaires",
             "moreParticipantOptions": "Options supplémentaires pour les participants",
@@ -846,6 +928,8 @@
             "muteAll": "Couper le micro de tout le monde",
             "muteEveryoneElse": "Couper le micro de tous les autres",
             "reject": "Refuser",
+            "stopDesktop": "Arrêter le partage d'écran",
+            "stopEveryonesDesktop": "Arrêter le partage d'écran de tout le monde",
             "stopEveryonesVideo": "Couper toutes les caméras",
             "stopVideo": "Couper la vidéo",
             "unblockEveryoneMicCamera": "Débloquer tous les micros et caméras",
@@ -855,11 +939,15 @@
         "headings": {
             "lobby": "Salle d'attente ({{count}})",
             "participantsList": "Participants de la réunion ({{count}})",
+            "viewerRequests": "Demandes des spectateurs {{count}}",
+            "visitorInQueue": " (en attente {{count}})",
             "visitorRequests": "(Demande {{count}} )",
             "visitors": "Visiteurs {{count}}",
+            "visitorsList": "Spectateurs ({{count}})",
             "waitingLobby": "Dans la salle d'attente ({{count}})"
         },
         "search": "Rechercher des participants",
+        "searchDescription": "Commencez à taper pour filtrer les participants",
         "title": "Participants"
     },
     "passwordDigitsOnly": "Jusqu'à {{number}} chiffres",
@@ -868,10 +956,13 @@
     "pinnedParticipant": "Participant toujours affiché",
     "polls": {
         "answer": {
+            "edit": "Modifier",
+            "send": "Envoyer",
             "skip": "Passer",
             "submit": "Envoyer"
         },
         "by": "Par {{ name }}",
+        "closeButton": "Fermer le sondage",
         "create": {
             "addOption": "Ajouter une option",
             "answerPlaceholder": "Option {{index}}",
@@ -881,6 +972,7 @@
             "pollQuestion": "Question du sondage",
             "questionPlaceholder": "Poser une question",
             "removeOption": "Supprimer l'option",
+            "save": "Enregistrer",
             "send": "Envoyer"
         },
         "errors": {
@@ -910,9 +1002,11 @@
         "configuringDevices": "Configuration des appareils…",
         "connectedWithAudioQ": "Êtes-vous connecté avec le microphone ?",
         "connection": {
+            "failed": "Le test de connexion a échoué !",
             "good": "Votre connexion Internet est bonne !",
             "nonOptimal": "Votre connexion n'est pas optimale",
-            "poor": "Vous avez une mauvaise connexion"
+            "poor": "Vous avez une mauvaise connexion",
+            "running": "Exécution du test de connexion…"
         },
         "connectionDetails": {
             "audioClipping": "Attendez vous à ce que votre son soit coupé.",
@@ -921,6 +1015,7 @@
             "goodQuality": "Impressionnant ! La qualité de vos médias sera excellente",
             "noMediaConnectivity": "Nous n'avons pas pu trouver un moyen d'établir une connectivité multimédia pour ce test. Cela est généralement causé par un pare-feu ou un NAT.",
             "noVideo": "Attendez vous à ce que votre qualité vidéo soit très mauvaise.",
+            "testFailed": "Le test de connexion a rencontré des problèmes inattendus, mais cela pourrait ne pas affecter votre expérience.",
             "undetectable": "Si vous ne parvenez toujours pas à passer des appels dans le navigateur, nous vous recommandons de vous assurer que vos haut-parleurs, microphone et caméra sont correctement configurés, que vous avez accordé à votre navigateur les droits d'utiliser votre microphone et votre caméra et que la version de votre navigateur est à jour. Si vous rencontrez toujours des difficultés pour appeler, vous devez contacter le développeur de l'application Web.",
             "veryPoorConnection": "Attendez vous à ce que la qualité de votre appel soit très mauvaise",
             "videoFreezing": "Attendez vous à ce que votre vidéo saute, soit noire, et pixelisée.",
@@ -937,7 +1032,7 @@
         "errorDialOutDisconnected": "Impossible de composer le numéro. Déconnecté",
         "errorDialOutFailed": "Impossible de composer le numéro. L'appel a échoué",
         "errorDialOutStatus": "Erreur lors de l'obtention de l'état d'appel sortant",
-        "errorMissingName": "Veuillez entrer votre nom pour entrer en conférence",
+        "errorMissingName": "Veuillez entrer votre nom pour entrer en réunion",
         "errorNoPermissions": "Vous devez permettre l'accès microphone et caméra",
         "errorStatusCode": "Erreur de numérotation, code d'état: {{status}}",
         "errorValidation": "La validation du numéro a échoué",
@@ -953,6 +1048,7 @@
         "or": "ou",
         "premeeting": "Pré-séance",
         "proceedAnyway": "Continuer quand même",
+        "recordingWarning": "D'autres participants peuvent enregistrer cet appel",
         "screenSharingError": "Erreur de partage d'écran:",
         "startWithPhone": "Commencez avec l'audio du téléphone",
         "unsafeRoomConsent": "Je comprends les risques et je veux quand même rejoindre cette réunion",
@@ -1018,7 +1114,6 @@
         "limitNotificationDescriptionNative": "En raison d'une forte demande, votre enregistrement sera limité à {{limit}} min. Pour des enregistrements illimités, essayez <3> {{app}} </3>.",
         "limitNotificationDescriptionWeb": "En raison d'une forte demande, votre enregistrement sera limité à {{limit}} min. Pour des enregistrements illimités, essayez <a href={{url}} rel='noopener noreferrer' target='_blank'> {{app}} </a>.",
         "linkGenerated": "Nous avons généré un lien à votre enregistrement.",
-        "live": "EN DIRECT",
         "localRecordingNoNotificationWarning": "Le démarrage de l’enregistrement ne sera pas annoncé aux autres participants. Vous devrez les informer par vous-même que la réunion sera enregistrée.",
         "localRecordingNoVideo": "La vidéo n'est pas en cours d’enregistrement",
         "localRecordingStartWarning": "Assurez-vous d’arrêter l’enregistrement vidéo avant de quitter la réunion afin de pouvoir le sauvegarder.",
@@ -1035,13 +1130,13 @@
         "onBy": "{{name}} a démarré l'enregistrement",
         "onlyRecordSelf": "Enregistrer seulement mon audio et ma vidéo.",
         "pending": "Enregistrement de la réunion en préparation…",
-        "rec": "REC",
+        "policyError": "Vous avez essayé de démarrer un enregistrement trop rapidement. Veuillez réessayer plus tard !",
         "recordAudioAndVideo": "Enregistrer l'audio et la vidéo",
         "recordTranscription": "Enregistrer la transcription",
         "saveLocalRecording": "Sauvegarder l’enregistrement local (Beta)",
         "serviceDescription": "Votre enregistrement sera sauvegardé par le service d'enregistrement",
         "serviceDescriptionCloud": "Enregistrement Cloud",
-        "serviceDescriptionCloudInfo": "Les conférences enregistrées sont automatiquement supprimées 24h après leur heure d'enregistrement.",
+        "serviceDescriptionCloudInfo": "Les réunions enregistrées sont automatiquement supprimées 24h après leur heure d'enregistrement.",
         "serviceName": "Service d'enregistrement",
         "sessionAlreadyActive": "Cette session est déjà en cours d'enregistrement ou de diffusion.",
         "showAdvancedOptions": "Afficher les options avancées",
@@ -1057,6 +1152,18 @@
     "sectionList": {
         "pullToRefresh": "Tirer pour rafraîchir"
     },
+    "security": {
+        "about": "Vous pouvez ajouter un mot de passe à votre réunion. Les participants devront fournir le mot de passe avant de pouvoir rejoindre la réunion.",
+        "aboutReadOnly": "Les modérateurs peuvent ajouter un mot de passe à la réunion. Les participants devront fournir le mot de passe avant de pouvoir rejoindre la réunion.",
+        "insecureRoomNameWarningNative": "Le nom de la réunion n’est pas sûr. Des participants non voulus pourraient rejoindre cette réunion. {{recommendAction}} En apprendre plus sur la sécurisation des réunions.",
+        "insecureRoomNameWarningWeb": "Le nom de la réunion n’est pas sûr. Des participants non voulus pourraient rejoindre cette réunion. {{recommendAction}} En apprendre plus sur la sécurisation des réunions <a href=\"{{securityUrl}}\" rel=\"security\" target=\"_blank\">here</a>.",
+        "title": "Options de sécurité",
+        "unsafeRoomActions": {
+            "meeting": "Envisagez de sécuriser votre réunion en utilisant le bouton options de sécurité.",
+            "prejoin": "Envisagez d'utiliser un nom plus unique",
+            "welcome": "Envisagez d'utiliser un nom plus unique ou choisissez en un parmi ceux suggérés"
+        }
+    },
     "settings": {
         "audio": "Audio",
         "buttonLabel": "Paramètres",
@@ -1067,11 +1174,13 @@
             "signedIn": "Accès aux événements de votre agenda en cours pour {{email}}. Cliquez sur le bouton de déconnexion ci-dessous pour terminer l'accès aux événements d'agenda.",
             "title": "Calendrier"
         },
+        "chatWithPermissions": "Le chat nécessite une autorisation",
         "desktopShareFramerate": "Images par seconde pour le Partage d'écran",
         "desktopShareHighFpsWarning": "Augmenter le nombre d'images par seconde pour le partage d'écran peut impacter votre bande passante. Vous devez repartager l'écran pour que ces paramètres soient utilisés.",
         "desktopShareWarning": "Vous devez repartager l'écran pour que ces paramètres soient utilisés.",
         "devices": "Dispositifs",
         "followMe": "Tous les participants me suivent",
+        "followMeRecorder": "L'enregistreur me suit",
         "framesPerSecond": "images par seconde",
         "incomingMessage": "un message arrive",
         "language": "Langue",
@@ -1095,6 +1204,7 @@
         "selectMic": "Micro",
         "selfView": "Affichage de votre propre vidéo",
         "shortcuts": "Raccourcis",
+        "showSubtitlesOnStage": "Afficher les sous-titres sur scène",
         "speakers": "Haut-parleurs",
         "startAudioMuted": "Tous les participants débutent en sourdine",
         "startReactionsMuted": "Tout le monde commence avec les réactions sonores bloquées",
@@ -1111,7 +1221,7 @@
         "alertURLText": "L'URL de serveur saisi n'est pas valide",
         "apply": "Appliquer",
         "buildInfoSection": "Information de version",
-        "conferenceSection": "Conférence",
+        "conferenceSection": "Réunion",
         "disableCallIntegration": "Désactiver l'intégration d'appels native",
         "disableCrashReporting": "Désactiver les rapports de plantage",
         "disableCrashReportingWarning": "Etes-vous certain de vouloir désactiver les rapports de plantage ? Le paramètre sera effectif après le redémarrage de l'application.",
@@ -1148,11 +1258,13 @@
         "fearful": "Effrayé",
         "happy": "Content",
         "hours": "{{count}} h",
+        "labelTooltip": "Nombre de participants : {{count}}",
         "minutes": "{{count}} min",
         "name": "Nom",
         "neutral": "Neutre",
         "sad": "Triste",
         "search": "Recherche",
+        "searchDescription": "Commencez à taper pour filtrer les participants",
         "searchHint": "Recherche des participants",
         "seconds": "{{count}} s",
         "speakerStats": "Statistiques d'intervenant",
@@ -1160,7 +1272,7 @@
         "surprised": "Surpris"
     },
     "startupoverlay": {
-        "genericTitle": "La conférence a besoin d'utiliser votre microphone et votre caméra.",
+        "genericTitle": "La réunion a besoin d'utiliser votre microphone et votre caméra.",
         "policyText": " ",
         "title": "{{app}} doit utiliser votre micro et votre caméra."
     },
@@ -1189,6 +1301,7 @@
             "closeChat": "Fermer la discussion instantanée",
             "closeMoreActions": "Fermer le menu plus d'actions",
             "closeParticipantsPane": "Fermer le panneau des participants",
+            "closedCaptions": "Sous-titres",
             "collapse": "Plier",
             "document": "Basculement du document partagé",
             "documentClose": "Fermer le document partagé",
@@ -1218,6 +1331,7 @@
             "lobbyButton": "Activer / Désactiver le mode salle d'attente",
             "localRecording": "Basculement des commandes d'enregistrement local",
             "lockRoom": "Basculement du mot de passe de la réunion",
+            "love": "Cœur",
             "lowerHand": "Baisser la main",
             "moreActions": "Basculement du menu d'actions supplémentaires",
             "moreActionsMenu": "Menu d'actions supplémentaires",
@@ -1235,6 +1349,7 @@
             "privateMessage": "",
             "profile": "Modifier votre profil",
             "raiseHand": "Basculement de la main levée",
+            "react": "Réactions aux messages",
             "reactions": "Réactions",
             "reactionsMenu": "Ouvrir / fermer le menu réactions",
             "recording": "Basculement de l'enregistrement",
@@ -1265,6 +1380,20 @@
             "videounmute": "Démarrer la vidéo"
         },
         "addPeople": "Ajouter des personnes à votre appel",
+        "advancedAudioSettings": {
+            "aec": {
+                "label": "Suppression d'écho acoustique"
+            },
+            "agc": {
+                "label": "Contrôle automatique du gain"
+            },
+            "ns": {
+                "label": "Suppression de bruit"
+            },
+            "stereo": {
+                "label": "Stéréo"
+            }
+        },
         "audioOnlyOff": "Désactiver le mode bande passante faible",
         "audioOnlyOn": "Activer le mode bande passante faible",
         "audioRoute": "Sélectionner le dispositif audio",
@@ -1277,6 +1406,7 @@
         "closeChat": "Fermer le clavardage",
         "closeParticipantsPane": "Fermer le panneau des participants",
         "closeReactionsMenu": "Fermer le menu réactions",
+        "closedCaptions": "Sous-titres",
         "disableNoiseSuppression": "Arrêter la suppression du bruit",
         "disableReactionSounds": "Vous pouvez interdire les réactions sonores à cette réunion",
         "documentClose": "Fermer le document partagé",
@@ -1294,6 +1424,7 @@
         "giphy": "Activer/désactiver le menu GIPHY",
         "hangup": "Quitter",
         "help": "Aide",
+        "hideWhiteboard": "Masquer le tableau blanc",
         "invite": "Inviter des personnes",
         "joinBreakoutRoom": "Rejoindre salle annexe",
         "laugh": "Rire",
@@ -1305,6 +1436,7 @@
         "lobbyButtonEnable": "Activer le mode salle d'attente / contrôle des participant(e)s",
         "login": "Connexion",
         "logout": "Déconnexion",
+        "love": "Cœur",
         "lowerYourHand": "Abaisser votre main",
         "moreActions": "Plus d'actions",
         "moreOptions": "Plus d'options",
@@ -1330,14 +1462,17 @@
         "raiseYourHand": "Lever votre main",
         "reactionBoo": "Envoyer réaction huer",
         "reactionClap": "Envoyer réaction applaudir",
+        "reactionHeart": "Envoyer une réaction en forme de cœur",
         "reactionLaugh": "Envoyer réaction rire",
         "reactionLike": "Envoyer réaction approuver",
+        "reactionLove": "Envoyer une réaction d'amour",
         "reactionSilence": "Envoyer réaction silence",
         "reactionSurprised": "Envoyer réaction surprise",
         "reactions": "Reactions",
         "security": "Options de sécurité",
         "selectBackground": "Sélectionner un arrière-plan",
         "shareRoom": "Inviter quelqu'un",
+        "shareaudio": "Partager l'audio",
         "sharedvideo": "Partager une vidéo",
         "shortcuts": "Voir les raccourcis",
         "showWhiteboard": "Afficher le tableau blanc",
@@ -1345,12 +1480,10 @@
         "speakerStats": "Statistiques d'intervenant",
         "startScreenSharing": "Démarrer le partage d'écran",
         "startSubtitles": "Activer les sous-titres",
-        "startvideoblur": "Brouiller mon arrière plan",
         "stopAudioSharing": "Arrêter le partage son",
         "stopScreenSharing": "Arrêter le partage d'écran",
         "stopSharedVideo": "Arrêter la vidéo",
         "stopSubtitles": "Désactiver les sous-titres",
-        "stopvideoblur": "Désactiver le brouillage d'arrière-plan",
         "surprised": "Surpris",
         "talkWhileMutedPopup": "Vous essayez de parler? Vous êtes en sourdine.",
         "tileViewToggle": "Basculement de l'affichage mosaïque",
@@ -1363,20 +1496,20 @@
     },
     "transcribing": {
         "ccButtonTooltip": "Activer / Désactiver les sous-titres",
-        "error": "Échec de la transcription. Veuillez réessayer.",
         "expandedLabel": "La transcription est actuellement activée",
-        "failedToStart": "Échec du démarrage de la transcription",
-        "labelToolTip": "La réunion est transcrite",
-        "off": "La transcription est arrêtée",
-        "on": "La transcription est activée",
-        "pending": "Préparation de la transcription de la réunion en cours…",
+        "failed": "La transcription a échoué",
+        "labelTooltip": "La transcription de la réunion est en cours",
+        "labelTooltipExtra": "De plus, une transcription sera disponible plus tard.",
+        "openClosedCaptions": "Ouvrir les sous-titres",
+        "original": "Original",
         "sourceLanguageDesc": "Actuellement, la langue de la réunion est sélectionnée à <b>{{sourceLanguage}}</b>. <br/> Vous pouvez la changer à partir de ",
         "sourceLanguageHere": "ici",
         "start": "Activer l'affichage des sous-titres",
         "stop": "Désactiver l'affichage des sous-titres",
         "subtitles": "sous-titres",
         "subtitlesOff": "off",
-        "tr": "PI"
+        "tr": "PI",
+        "translateTo": "Traduire vers"
     },
     "unpinParticipant": "Désépingler - {{participantName}}",
     "userMedia": {
@@ -1386,7 +1519,7 @@
         "busy": "Libération des ressources en cours. Veuillez réessayer dans quelques minutes.",
         "busyTitle": "Le service de Salle est actuellement occupé.",
         "errorAlreadyInvited": "{{displayName}} a déjà été invité",
-        "errorInvite": "La conférence n'est pas encore configurée. Veuillez réessayer plus tard.",
+        "errorInvite": "La réunion n'est pas encore configurée. Veuillez réessayer plus tard.",
         "errorInviteFailed": "Nous nous efforçons de régler ce problème. Veuillez réessayer plus tard.",
         "errorInviteFailedTitle": "L'invitation de {{displayName}} a échoué",
         "errorInviteTitle": "Erreur lors de l'invitation de la salle",
@@ -1407,8 +1540,6 @@
         "ld": "LD",
         "ldTooltip": "Visionnement de vidéo en basse définition",
         "lowDefinition": "Basse définition",
-        "onlyAudioAvailable": "Seulement l'audio est disponible",
-        "onlyAudioSupported": "Ce navigateur prend seulement l'audio en charge.",
         "performanceSettings": "Paramètres de performance",
         "recording": "Enregistrement en cours",
         "sd": "SD",
@@ -1418,7 +1549,10 @@
     },
     "videothumbnail": {
         "connectionInfo": "Informations de la connexion",
+        "demote": "Déplacer en visiteur",
         "domute": "Discrétion",
+        "domuteDesktop": "Arrêter le partage d'écran",
+        "domuteDesktopOfOthers": "Arrêter le partage d'écran de tous les autres",
         "domuteOthers": "Couper le micro de tous les autres",
         "domuteVideo": "Couper la caméra",
         "domuteVideoOfOthers": "Couper la caméra des autres",
@@ -1470,11 +1604,24 @@
     },
     "visitors": {
         "chatIndicator": "(visiteur)",
+        "joinMeeting": {
+            "description": "Vous êtes actuellement un observateur dans cette réunion.",
+            "raiseHand": "Levez la main",
+            "title": "Rejoindre la réunion",
+            "wishToSpeak": "Si vous souhaitez prendre la parole, veuillez lever la main ci-dessous et attendre l'approbation du modérateur."
+        },
         "labelTooltip": "Nombre de Visiteurs",
         "notification": {
-            "description": "Pour participer lever la main.",
+            "demoteDescription": "Envoyé ici par {{actor}}, levez la main pour participer",
+            "noMainParticipantsDescription": "Un participant doit démarrer la réunion. Veuillez réessayer dans un moment.",
+            "noMainParticipantsTitle": "Cette réunion n'a pas encore commencé.",
+            "noVisitorLobby": "Vous ne pouvez pas rejoindre tant qu'une salle d'attente est activée pour la réunion.",
+            "notAllowedPromotion": "Un participant doit d'abord autoriser votre demande.",
+            "requestToJoin": "Main levée",
+            "requestToJoinDescription": "Votre demande a été envoyée aux modérateurs. Patientez !",
             "title": "Vous êtes visiteur dans cette réunion"
-        }
+        },
+        "waitingMessage": "Vous rejoindrez la réunion dès qu'elle sera en direct !"
     },
     "volumeSlider": "Curseur de volume",
     "welcomepage": {
@@ -1483,7 +1630,7 @@
             "roomname": "Entrer le nom de la salle"
         },
         "addMeetingName": "Ajouter un nom de réunion",
-        "appDescription": "Profitez de la conversation vidéo avec toute votre équipe. Allez-y, invitez tous ceux que vous connaissez. {{app}} est une solution 100 % libre de conférence vidéo entièrement chiffrée que vous pouvez utiliser en tout temps et gratuitement, sans avoir besoin de compte.",
+        "appDescription": "Profitez de la conversation vidéo avec toute votre équipe. Allez-y, invitez tous ceux que vous connaissez. {{app}} est une solution 100 % libre de réunion vidéo entièrement chiffrée que vous pouvez utiliser en tout temps et gratuitement, sans avoir besoin de compte.",
         "audioVideoSwitch": {
             "audio": "Voix",
             "video": "Vidéo"
@@ -1492,12 +1639,13 @@
         "connectCalendarButton": "Connecter votre agenda",
         "connectCalendarText": "Connectez-vous à votre calendrier pour afficher toutes les réunions {{app}}. Ajoutez également les réunions de {{provider}} à votre calendrier et démarrez-les d'un simple clic.",
         "enterRoomTitle": "Démarrer une nouvelle réunion",
+        "getHelp": "Obtenir de l'aide",
         "go": "Aller",
         "goSmall": "Aller",
-        "headerSubtitle": "Conférences sécurisées et de haute qualité",
+        "headerSubtitle": "Réunions sécurisées et de haute qualité",
         "headerTitle": "Jitsi Meet",
         "info": "Ret. arr.",
-        "jitsiOnMobile": "Jitsi sur mobile – télécharger notre application et démarrez des conférences de n'import où",
+        "jitsiOnMobile": "Jitsi sur mobile – télécharger notre application et démarrez des réunions de n'import où",
         "join": "CRÉER / REJOINDRE",
         "logo": {
             "calendar": "Logo Calendar",
@@ -1523,14 +1671,15 @@
         "roomnameHint": "Entrez le nom ou l'URL de la salle que vous voulez rejoindre. Vous pouvez inventer un nom, mais assurez-vous de le partager avec les participants de la réunion pour qu'ils utilisent le même nom.",
         "sendFeedback": "Envoyer un commentaire",
         "settings": "Paramètres",
-        "startMeeting": "Démarrer la conférence",
+        "startMeeting": "Démarrer la réunion",
         "terms": "Termes",
-        "title": "Conférence vidéo sécurisée, riche en fonctionnalités et entièrement gratuite",
+        "title": "Réunion vidéo sécurisée, riche en fonctionnalités et entièrement gratuite",
         "upcomingMeetings": "Vos réunions à venir"
     },
     "whiteboard": {
         "accessibilityLabel": {
             "heading": "Tableau blanc"
-        }
+        },
+        "screenTitle": "Tableau blanc"
     }
 }

lang/main-it.json

@@ -109,6 +109,7 @@
         }
     },
     "chat": {
+        "disabled": "L'invio di messaggi in chat è disabilitato.",
         "enter": "Entra nella conversazione",
         "error": "Errore: il tuo messaggio non è stato inviato. Motivo: {{error}}",
         "fieldPlaceHolder": "Scrivi qui il tuo messaggio",
@@ -546,8 +547,10 @@
         "downloadFailedDescription": "Si prega di riprovare.",
         "downloadFailedTitle": "Download non riuscito",
         "downloadFile": "Download",
-        "dragAndDrop": "Trascina e rilascia i file qui",
-        "fileAlreadyUploaded": "Questo file è già stato caricato nella riunione",
+        "dragAndDrop": "Trascina e rilascia i file qui o da qualsiasi altra parte nella schermata",
+        "fileAlreadyUploaded": "Questo file è già stato caricato nella riunione.",
+        "fileTooLargeDescription": "Assicurati che il file non superi {{ maxFileSize }}.",
+        "fileTooLargeTitle": "Il file selezionato è troppo grande",
         "removeFile": "Rimuovi",
         "uploadFailedDescription": "Si prega di riprovare.",
         "uploadFailedTitle": "Caricamento non riuscito",
@@ -906,6 +909,7 @@
             "visitorInQueue": " ({{count}} in attesa)",
             "visitorRequests": " ({{count}} richiesta/e)",
             "visitors": "Spettatori {{count}}",
+            "visitorsList": "Spettatori ({{count}})",
             "waitingLobby": "({{count}}) in attesa"
         },
         "search": "Cerca partecipanti",
@@ -946,7 +950,7 @@
         },
         "results": {
             "changeVote": "Cambia voto",
-            "empty": "Non ci sono ancora sondaggi in questa riunione. Crea un sondaggio qui!",
+            "empty": "Non ci sono ancora sondaggi in questa riunione.",
             "hideDetailedResults": "Nascondi dettagli",
             "showDetailedResults": "Mostra dettagli",
             "vote": "Voti"

lang/main.json

@@ -375,22 +375,34 @@
         "micTimeoutError": "Could not start audio source. Timeout occurred!",
         "micUnknownError": "Cannot use microphone for an unknown reason.",
         "moderationAudioLabel": "Allow attendees to unmute themselves",
+        "moderationDesktopLabel": "Allow non-moderators to share their screen",
         "moderationVideoLabel": "Allow non-moderators to start their video",
         "muteEveryoneDialog": "The participants can unmute themselves at any time.",
         "muteEveryoneDialogModerationOn": "The participants can send a request to speak at any time.",
         "muteEveryoneElseDialog": "Once muted, you won't be able to unmute them, but they can unmute themselves at any time.",
         "muteEveryoneElseTitle": "Mute everyone except {{whom}}?",
+        "muteEveryoneElsesDesktopDialog": "Once the share is stopped, you won't be able to restart it, but they can do so at any time.",
+        "muteEveryoneElsesDesktopTitle": "Stop everyone's screen-share except {{whom}}?",
         "muteEveryoneElsesVideoDialog": "Once the camera is disabled, you won't be able to turn it back on, but they can turn it back on at any time.",
         "muteEveryoneElsesVideoTitle": "Stop everyone's video except {{whom}}?",
         "muteEveryoneSelf": "yourself",
         "muteEveryoneStartMuted": "Everyone starts muted from now on",
         "muteEveryoneTitle": "Mute everyone?",
+        "muteEveryonesDesktopDialog": "The participants can share their screen at any time.",
+        "muteEveryonesDesktopDialogModerationOn": "The participants can send a request to share their screen at any time.",
+        "muteEveryonesDesktopTitle": "Stop everyone's screen share?",
         "muteEveryonesVideoDialog": "The participants can turn on their video at any time.",
         "muteEveryonesVideoDialogModerationOn": "The participants can send a request to turn on their video at any time.",
         "muteEveryonesVideoDialogOk": "Disable",
         "muteEveryonesVideoTitle": "Stop everyone's video?",
         "muteParticipantBody": "You won't be able to unmute them, but they can unmute themselves at any time.",
         "muteParticipantButton": "Mute",
+        "muteParticipantsDesktopBody": "You won't be able to start their screen-share, but they can do so at any time.",
+        "muteParticipantsDesktopBodyModerationOn": "You won't be able to start their screen-share and neither will they.",
+        "muteParticipantsDesktopButton": "Stop screen sharing",
+        "muteParticipantsDesktopDialog": "Are you sure you want to turn off this participant's screen-share? You won't be able to restart it, but they can do so at any time.",
+        "muteParticipantsDesktopDialogModerationOn": "Are you sure you want to turn off this participant's screen-share? You won't be able to turn the screen back on and neither will they.",
+        "muteParticipantsDesktopTitle": "Disable screen-share of this participant?",
         "muteParticipantsVideoBody": "You won't be able to turn the camera back on, but they can turn it back on at any time.",
         "muteParticipantsVideoBodyModerationOn": "You won't be able to turn the camera back on and neither will they.",
         "muteParticipantsVideoButton": "Stop video",
@@ -549,8 +561,12 @@
         "downloadFile": "Download",
         "dragAndDrop": "Drag and drop files here or anywhere on screen",
         "fileAlreadyUploaded": "File has already been uploaded to this meeting.",
+        "fileRemovedByOther": "Your file '{{ fileName }}' was removed",
         "fileTooLargeDescription": "Please make sure the file does not exceed {{ maxFileSize }}.",
         "fileTooLargeTitle": "The selected file is too large",
+        "fileUploadProgress": "File upload progress",
+        "fileUploadedSuccessfully": "File uploaded successfully",
+        "newFileNotification": "{{ participantName }} shared '{{ fileName }}'",
         "removeFile": "Remove",
         "uploadFailedDescription": "Please try again.",
         "uploadFailedTitle": "Upload failed",
@@ -767,8 +783,9 @@
     "me": "me",
     "notify": {
         "OldElectronAPPTitle": "Security vulnerability!",
+        "allowAll": "Allow All",
         "allowAudio": "Allow Audio",
-        "allowBoth": "Both",
+        "allowDesktop": "Allow screen sharing",
         "allowVideo": "Allow Video",
         "allowedUnmute": "You can unmute your microphone, start your camera or share your screen.",
         "audioUnmuteBlockedDescription": "Mic unmute operation has been temporarily blocked because of system limits.",
@@ -782,6 +799,7 @@
         "dataChannelClosedDescription": "The bridge channel is down and thus video quality may be limited to its lowest setting.",
         "dataChannelClosedDescriptionWithAudio": "The bridge channel is down and thus disruptions to audio and video may occur.",
         "dataChannelClosedWithAudio": "Audio and video quality may be impaired",
+        "desktopMutedRemotelyTitle": "Your screen sharing has been stopped by {{participantDisplayName}}",
         "disabledIframe": "Embedding is only meant for demo purposes, so this call will disconnect in {{timeout}} minutes.",
         "disabledIframeSecondaryNative": "Embedding {{domain}} is only meant for demo purposes, so this call will disconnect in {{timeout}} minutes.",
         "disabledIframeSecondaryWeb": "Embedding {{domain}} is only meant for demo purposes, so this call will disconnect in {{timeout}} minutes. Please use <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Jitsi as a Service</a> for production embedding!",
@@ -862,6 +880,7 @@
         "suggestRecordingDescription": "Would you like to start a recording?",
         "suggestRecordingTitle": "Record this meeting",
         "unmute": "Unmute Audio",
+        "unmuteScreen": "Start screen sharing",
         "unmuteVideo": "Unmute Video",
         "videoMutedRemotelyDescription": "You can always turn it on again.",
         "videoMutedRemotelyTitle": "Your video has been turned off by {{participantDisplayName}}",
@@ -881,11 +900,14 @@
             "admit": "Admit",
             "admitAll": "Admit all",
             "allow": "Allow non-moderators to:",
+            "allowDesktop": "Allow screen sharing",
             "allowVideo": "Allow video",
+            "askDesktop": "Ask to share screen",
             "askUnmute": "Ask to unmute",
             "audioModeration": "Unmute themselves",
             "blockEveryoneMicCamera": "Block everyone's mic and camera",
             "breakoutRooms": "Breakout rooms",
+            "desktopModeration": "Start screen sharing",
             "goLive": "Go live",
             "invite": "Invite someone",
             "lowerAllHands": "Lower all hands",
@@ -897,6 +919,8 @@
             "muteAll": "Mute all",
             "muteEveryoneElse": "Mute everyone else",
             "reject": "Reject",
+            "stopDesktop": "Stop screen sharing",
+            "stopEveryonesDesktop": "Stop everyone's screen-share",
             "stopEveryonesVideo": "Stop everyone's video",
             "stopVideo": "Stop video",
             "unblockEveryoneMicCamera": "Unblock everyone's mic and camera",
@@ -906,9 +930,11 @@
         "headings": {
             "lobby": "Lobby ({{count}})",
             "participantsList": "Meeting participants ({{count}})",
+            "viewerRequests": "Viewers requests {{count}}",
             "visitorInQueue": " (waiting {{count}})",
             "visitorRequests": " (requests {{count}})",
             "visitors": "Viewers {{count}}",
+            "visitorsList": "Viewers ({{count}})",
             "waitingLobby": "Waiting in lobby ({{count}})"
         },
         "search": "Search participants",
@@ -1501,6 +1527,8 @@
         "connectionInfo": "Connection Info",
         "demote": "Move to viewer",
         "domute": "Mute",
+        "domuteDesktop": "Stop screen-sharing",
+        "domuteDesktopOfOthers": "Stop screen-sharing for everyone else",
         "domuteOthers": "Mute everyone else",
         "domuteVideo": "Disable camera",
         "domuteVideoOfOthers": "Disable camera of everyone else",

modules/API/API.js

@@ -13,7 +13,7 @@ import {
     requestEnableAudioModeration,
     requestEnableVideoModeration
 } from '../../react/features/av-moderation/actions';
-import { isEnabledFromState } from '../../react/features/av-moderation/functions';
+import { isEnabledFromState, isForceMuted } from '../../react/features/av-moderation/functions';
 import { setAudioOnly } from '../../react/features/base/audio-only/actions';
 import {
     endConference,
@@ -106,7 +106,7 @@ import {
     close as closeParticipantsPane,
     open as openParticipantsPane
 } from '../../react/features/participants-pane/actions';
-import { getParticipantsPaneOpen, isForceMuted } from '../../react/features/participants-pane/functions';
+import { getParticipantsPaneOpen } from '../../react/features/participants-pane/functions';
 import { startLocalVideoRecording, stopLocalVideoRecording } from '../../react/features/recording/actions.any';
 import { grantRecordingConsent, grantRecordingConsentAndUnmute } from '../../react/features/recording/actions.web';
 import { RECORDING_METADATA_ID, RECORDING_TYPES } from '../../react/features/recording/constants';

package.json

@@ -23,7 +23,7 @@
     "@emotion/styled": "11.10.6",
     "@giphy/js-fetch-api": "4.9.3",
     "@giphy/react-components": "6.9.4",
-    "@giphy/react-native-sdk": "2.3.0",
+    "@giphy/react-native-sdk": "3.3.1",
     "@jitsi/excalidraw": "https://github.com/jitsi/excalidraw/releases/download/v0.0.19/jitsi-excalidraw-0.0.19.tgz",
     "@jitsi/js-utils": "2.2.1",
     "@jitsi/logger": "2.0.2",
@@ -34,13 +34,14 @@
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-clipboard/clipboard": "1.14.3",
     "@react-native-community/netinfo": "11.1.0",
-    "@react-native-community/slider": "4.4.3",
+    "@react-native-community/slider": "4.5.6",
     "@react-native-google-signin/google-signin": "10.1.0",
     "@react-navigation/bottom-tabs": "6.6.0",
     "@react-navigation/elements": "1.3.30",
     "@react-navigation/material-top-tabs": "6.6.13",
     "@react-navigation/native": "6.1.17",
     "@react-navigation/stack": "6.4.0",
+    "@sayem314/react-native-keep-awake": "1.3.1",
     "@stomp/stompjs": "7.0.0",
     "@svgr/webpack": "6.3.1",
     "@tensorflow/tfjs-backend-wasm": "3.13.0",
@@ -69,7 +70,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/v2018.0.0+1773bcff/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#release-8717",
     "lodash-es": "4.17.21",
     "null-loader": "4.0.1",
     "optional-require": "1.0.3",
@@ -82,35 +83,35 @@
     "react-focus-on": "3.8.1",
     "react-i18next": "10.11.4",
     "react-linkify": "1.0.0-alpha",
-    "react-native": "0.75.5",
-    "react-native-background-timer": "2.4.1",
-    "react-native-calendar-events": "2.2.0",
-    "react-native-default-preference": "1.4.4",
+    "react-native": "0.77.2",
+    "react-native-background-timer": "https://github.com/jitsi/react-native-background-timer.git#d180dfaa4486ae3ee17d01242db92cb3195f4718",
+    "react-native-calendar-events": "https://github.com/jitsi/react-native-calendar-events.git#47f068dedfed7c0f72042e093f688eb11624eb7b",
+    "react-native-default-preference": "https://github.com/jitsi/react-native-default-preference.git#c9bf63bdc058e3fa2aa0b87b1ee1af240f44ed02",
     "react-native-device-info": "10.9.0",
     "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
-    "react-native-gesture-handler": "2.18.1",
-    "react-native-get-random-values": "1.9.0",
-    "react-native-immersive-mode": "2.0.2",
-    "react-native-keep-awake": "4.0.0",
+    "react-native-gesture-handler": "2.24.0",
+    "react-native-get-random-values": "1.11.0",
+    "react-native-immersive-mode": "https://github.com/jitsi/react-native-immersive-mode.git#38cc9001db24618bc0c61800f81e889bcfb6ff2c",
     "react-native-orientation-locker": "1.6.0",
     "react-native-pager-view": "6.4.1",
     "react-native-paper": "5.10.3",
-    "react-native-performance": "5.0.0",
-    "react-native-safe-area-context": "4.12.0",
-    "react-native-screens": "3.35.0",
-    "react-native-sound": "0.11.2",
-    "react-native-splash-screen": "3.3.0",
-    "react-native-svg": "13.13.0",
+    "react-native-performance": "5.1.2",
+    "react-native-safe-area-context": "5.4.0",
+    "react-native-screens": "4.11.1",
+    "react-native-sound": "https://github.com/jitsi/react-native-sound.git#ea13c97b5c2a4ff5e0d9bacbd9ff5e4457fe2c3c",
+    "react-native-splash-view": "0.0.18",
+    "react-native-svg": "15.11.2",
     "react-native-svg-transformer": "1.2.0",
     "react-native-tab-view": "3.5.2",
     "react-native-url-polyfill": "2.0.0",
-    "react-native-video": "6.0.0-alpha.11",
+    "react-native-video": "6.13.0",
     "react-native-watch-connectivity": "1.1.0",
     "react-native-webrtc": "124.0.4",
-    "react-native-webview": "13.8.7",
+    "react-native-webview": "13.13.5",
     "react-native-youtube-iframe": "2.3.0",
     "react-redux": "7.2.9",
     "react-textarea-autosize": "8.3.0",
+    "react-virtualized-auto-sizer": "^1.0.26",
     "react-window": "1.8.6",
     "react-youtube": "10.1.0",
     "redux": "4.0.4",
@@ -132,7 +133,11 @@
     "@babel/preset-env": "7.25.9",
     "@babel/preset-react": "7.25.9",
     "@jitsi/eslint-config": "6.0.4",
-    "@react-native/metro-config": "0.75.5",
+    "@react-native-community/cli": "15.0.1",
+    "@react-native-community/cli-platform-android": "15.0.1",
+    "@react-native-community/cli-platform-ios": "15.0.1",
+    "@react-native/babel-preset": "0.77.2",
+    "@react-native/metro-config": "0.77.2",
     "@types/amplitude-js": "8.16.5",
     "@types/audioworklet": "0.0.29",
     "@types/dom-screen-wake-lock": "1.0.1",
@@ -176,7 +181,6 @@
     "eslint-plugin-typescript-sort-keys": "3.3.0",
     "jetifier": "1.6.4",
     "jsonwebtoken": "9.0.2",
-    "metro-react-native-babel-preset": "0.77.0",
     "patch-package": "6.4.7",
     "pretty": "2.0.0",
     "process": "0.11.10",

patches/@giphy+react-native-sdk+2.3.0.patch

@@ -1,11 +0,0 @@
-diff --git a/node_modules/@giphy/react-native-sdk/giphy-react-native-sdk.podspec b/node_modules/@giphy/react-native-sdk/giphy-react-native-sdk.podspec
-index ddd41ac..a7b143e 100644
---- a/node_modules/@giphy/react-native-sdk/giphy-react-native-sdk.podspec
-+++ b/node_modules/@giphy/react-native-sdk/giphy-react-native-sdk.podspec
-@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
-   s.source_files = "ios/**/*.{h,m,mm,swift}"
- 
-   s.dependency "React-Core"
--  s.dependency "Giphy", "2.2.4"
-+  s.dependency "Giphy", "2.2.12"
- end

react-native-sdk/android/build.gradle

@@ -5,8 +5,9 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.3'
+    classpath "com.android.tools.build:gradle:$rootProject.ext.gradlePluginVersion"
   }
+  namespace 'org.jitsi.meet.reactnativesdk'
 }
 
 def isNewArchitectureEnabled() {
@@ -46,8 +47,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 }
 

react-native-sdk/android/gradle.properties

@@ -1,5 +1,5 @@
-JitsiMeetReactNative_kotlinVersion=1.7.0
-JitsiMeetReactNative_minSdkVersion=21
-JitsiMeetReactNative_targetSdkVersion=31
-JitsiMeetReactNative_compileSdkVersion=31
-JitsiMeetReactNative_ndkversion=21.4.7075529
+JitsiMeetReactNative_kotlinVersion=2.0.21
+JitsiMeetReactNative_minSdkVersion=26
+JitsiMeetReactNative_targetSdkVersion=34
+JitsiMeetReactNative_compileSdkVersion=34
+JitsiMeetReactNative_ndkversion=27.1.12297006

react-native-sdk/package.json

@@ -64,7 +64,8 @@
         "@react-native-community/netinfo": "0.0.0",
         "@react-native-community/slider": "0.0.0",
         "@react-native-google-signin/google-signin": "0.0.0",
-        "react-native": "*",
+        "@sayem314/react-native-keep-awake": "0.0.0",
+        "react-native": "0.0.0",
         "react": "*",
         "react-native-background-timer": "0.0.0",
         "react-native-calendar-events": "0.0.0",
@@ -73,14 +74,13 @@
         "react-native-get-random-values": "0.0.0",
         "react-native-gesture-handler": "0.0.0",
         "react-native-immersive-mode": "0.0.0",
-        "react-native-keep-awake": "0.0.0",
         "react-native-pager-view": "0.0.0",
         "react-native-performance": "0.0.0",
         "react-native-orientation-locker": "0.0.0",
         "react-native-safe-area-context": "0.0.0",
         "react-native-screens": "0.0.0",
         "react-native-sound": "0.0.0",
-        "react-native-splash-screen": "0.0.0",
+        "react-native-splash-view": "0.0.0",
         "react-native-svg": "0.0.0",
         "react-native-video": "0.0.0",
         "react-native-watch-connectivity": "0.0.0",

react/features/analytics/AnalyticsEvents.ts

@@ -63,6 +63,11 @@ export const ACTION_SHORTCUT_TRIGGERED = 'triggered';
  */
 export const AUDIO_MUTE = 'audio.mute';
 
+/**
+ * The name of the keyboard shortcut or toolbar button for muting desktop sharing.
+ */
+export const DESKTOP_MUTE = 'desktop.mute';
+
 /**
  * The name of the keyboard shortcut or toolbar button for muting video.
  */

react/features/analytics/functions.ts

@@ -84,7 +84,6 @@ export async function createHandlers({ getState }: IStore) {
     } = config;
     const {
         amplitudeAPPKey,
-        amplitudeIncludeUTM,
         blackListedEvents,
         scriptURLs,
         matomoEndpoint,
@@ -94,7 +93,6 @@ export async function createHandlers({ getState }: IStore) {
     const { group, user } = state['features/base/jwt'];
     const handlerConstructorOptions = {
         amplitudeAPPKey,
-        amplitudeIncludeUTM,
         blackListedEvents,
         envType: deploymentInfo?.envType || 'dev',
         matomoEndpoint,

react/features/analytics/handlers/AbstractHandler.ts

@@ -11,7 +11,6 @@ export interface IEvent {
 
 interface IOptions {
     amplitudeAPPKey?: string;
-    amplitudeIncludeUTM?: boolean;
     blackListedEvents?: string[];
     envType?: string;
     group?: string;

react/features/analytics/handlers/AmplitudeHandler.ts

@@ -4,21 +4,18 @@ import logger from '../logger';
 
 import AbstractHandler, { IEvent } from './AbstractHandler';
 import { fixDeviceID } from './amplitude/fixDeviceID';
-import amplitude from './amplitude/lib';
+import amplitude, { initAmplitude } from './amplitude/lib';
 
 /**
  * Analytics handler for Amplitude.
  */
 export default class AmplitudeHandler extends AbstractHandler {
-    _deviceId: string;
-    _userId: Object;
 
     /**
      * Creates new instance of the Amplitude analytics handler.
      *
      * @param {Object} options - The amplitude options.
-     * @param {string} options.amplitudeAPPKey - The Amplitude app key required by the Amplitude API.
-     * @param {boolean} options.amplitudeIncludeUTM - Whether to include UTM parameters
+     * @param {string} options.amplitudeAPPKey - The Amplitude app key required by the Amplitude API
      * in the Amplitude events.
      */
     constructor(options: any) {
@@ -26,54 +23,26 @@ export default class AmplitudeHandler extends AbstractHandler {
 
         const {
             amplitudeAPPKey,
-            amplitudeIncludeUTM: includeUtm = true,
             user
         } = options;
 
         this._enabled = true;
 
-        const onError = (e: Error) => {
-            logger.error('Error initializing Amplitude', e);
-            this._enabled = false;
-        };
-
-        // Forces sending all events on exit (flushing) via sendBeacon
-        const onExitPage = () => {
-            amplitude.flush();
-        };
-
-        if (navigator.product === 'ReactNative') {
-            amplitude.init(amplitudeAPPKey);
-            fixDeviceID(amplitude).then(() => {
-                const deviceId = amplitude.getDeviceId();
-
-                if (deviceId) {
-                    this._deviceId = deviceId;
-                }
+        initAmplitude(amplitudeAPPKey, user)
+            .then(() => {
+                logger.info('Amplitude initialized');
+                fixDeviceID(amplitude);
+            })
+            .catch(e => {
+                logger.error('Error initializing Amplitude', e);
+                this._enabled = false;
             });
-        } else {
-            const amplitudeOptions: any = {
-                includeReferrer: true,
-                includeUtm,
-                saveParamsReferrerOncePerSession: false,
-                onError,
-                onExitPage
-            };
-
-            amplitude.init(amplitudeAPPKey, undefined, amplitudeOptions);
-            fixDeviceID(amplitude);
-        }
-
-        if (user) {
-            this._userId = user;
-            amplitude.setUserId(user);
-        }
     }
 
     /**
      * Sets the Amplitude user properties.
      *
-     * @param {Object} userProps - The user portperties.
+     * @param {Object} userProps - The user properties.
      * @returns {void}
      */
     setUserProperties(userProps: any) {
@@ -104,7 +73,7 @@ export default class AmplitudeHandler extends AbstractHandler {
 
         const eventName = this._extractName(event) ?? '';
 
-        amplitude.logEvent(eventName, event);
+        amplitude.track(eventName, event);
     }
 
     /**
@@ -113,13 +82,6 @@ export default class AmplitudeHandler extends AbstractHandler {
      * @returns {Object}
      */
     getIdentityProps() {
-        if (navigator.product === 'ReactNative') {
-            return {
-                deviceId: this._deviceId,
-                userId: this._userId
-            };
-        }
-
         return {
             sessionId: amplitude.getSessionId(),
             deviceId: amplitude.getDeviceId(),

react/features/analytics/handlers/amplitude/fixDeviceID.native.ts

@@ -17,7 +17,7 @@ export async function fixDeviceID(amplitude: Types.ReactNativeClient) {
     const current = await DefaultPreference.get('amplitudeDeviceId');
 
     if (current) {
-        await amplitude.setDeviceId(current);
+        amplitude.setDeviceId(current);
     } else {
         const uid = await getUniqueId();
 
@@ -27,7 +27,7 @@ export async function fixDeviceID(amplitude: Types.ReactNativeClient) {
             return;
         }
 
-        await amplitude.setDeviceId(uid as string);
+        amplitude.setDeviceId(uid as string);
         await DefaultPreference.set('amplitudeDeviceId', uid as string);
     }
 }

react/features/analytics/handlers/amplitude/fixDeviceID.web.ts

@@ -1,11 +1,46 @@
 import { Types } from '@amplitude/analytics-browser';
+// @ts-ignore
+import { jitsiLocalStorage } from '@jitsi/js-utils';
+
+import logger from '../../logger';
+
+/**
+ * Key used to store the device id in local storage.
+ */
+const DEVICE_ID_KEY = '__AMDID';
 
 /**
  * Custom logic for setting the correct device id.
  *
- * @param {Types.BrowserClient} _amplitude - The amplitude instance.
+ * @param {Types.BrowserClient} amplitude - The amplitude instance.
  * @returns {void}
  */
-export function fixDeviceID(_amplitude: Types.BrowserClient): Promise<any> {
-    return new Promise(resolve => resolve(true));
+export function fixDeviceID(amplitude: Types.BrowserClient) {
+    const deviceId = jitsiLocalStorage.getItem(DEVICE_ID_KEY);
+
+    if (deviceId) {
+        // Set the device id in Amplitude.
+        try {
+            amplitude.setDeviceId(JSON.parse(deviceId));
+        } catch (error) {
+            logger.error('Failed to set device ID in Amplitude', error);
+
+            return Promise.resolve(false);
+        }
+    } else {
+        const newDeviceId = amplitude.getDeviceId();
+
+        if (newDeviceId) {
+            jitsiLocalStorage.setItem(DEVICE_ID_KEY, JSON.stringify(newDeviceId));
+        }
+    }
+}
+
+/**
+ * Returns the amplitude shared deviceId.
+ *
+ * @returns {string} - The amplitude deviceId.
+ */
+export function getDeviceID() {
+    return jitsiLocalStorage.getItem(DEVICE_ID_KEY);
 }

react/features/analytics/handlers/amplitude/lib.native.ts

@@ -1,3 +1,15 @@
-import { createInstance } from '@amplitude/analytics-react-native';
+import amplitude from '@amplitude/analytics-react-native';
 
-export default createInstance();
+export default amplitude;
+
+/**
+ * Initializes the Amplitude instance.
+ *
+ * @param {string} amplitudeAPPKey - The Amplitude app key.
+ * @param {string | undefined} user - The user ID.
+ * @returns {Promise} The initialized Amplitude instance.
+ */
+export function initAmplitude(
+        amplitudeAPPKey: string, user: string | undefined): Promise<unknown> {
+    return amplitude.init(amplitudeAPPKey, user, {}).promise;
+}

react/features/analytics/handlers/amplitude/lib.web.ts

@@ -1,3 +1,38 @@
 import { createInstance } from '@amplitude/analytics-browser';
 
-export default createInstance();
+const amplitude = createInstance();
+
+export default amplitude;
+
+/**
+ * Initializes the Amplitude instance.
+ *
+ * @param {string} amplitudeAPPKey - The Amplitude app key.
+ * @param {string | undefined} user - The user ID.
+ * @returns {Promise} The initialized Amplitude instance.
+ */
+export function initAmplitude(
+        amplitudeAPPKey: string, user: string | undefined): Promise<unknown> {
+
+    // Forces sending all events on exit (flushing) via sendBeacon.
+    window.addEventListener('pagehide', () => {
+        // Set https transport to use sendBeacon API.
+        amplitude.setTransport('beacon');
+        // Send all pending events to server.
+        amplitude.flush();
+    });
+
+    const options = {
+        autocapture: {
+            attribution: true,
+            pageViews: true,
+            sessions: false,
+            fileDownloads: false,
+            formInteractions: false,
+            elementInteractions: false
+        },
+        defaultTracking: false
+    };
+
+    return amplitude.init(amplitudeAPPKey, user, options).promise;
+}

react/features/app/components/App.native.tsx

@@ -2,7 +2,8 @@ import React, { ComponentType } from 'react';
 import { NativeModules, Platform, StyleSheet, View } from 'react-native';
 import DeviceInfo from 'react-native-device-info';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
-import SplashScreen from 'react-native-splash-screen';
+// @ts-ignore
+import { hideSplash } from 'react-native-splash-view';
 
 import BottomSheetContainer from '../../base/dialog/components/native/BottomSheetContainer';
 import DialogContainer from '../../base/dialog/components/native/DialogContainer';
@@ -84,7 +85,7 @@ export class App extends AbstractApp<IProps> {
     override async componentDidMount() {
         await super.componentDidMount();
 
-        SplashScreen.hide();
+        hideSplash();
 
         const liteTxt = AppInfo.isLiteSDK ? ' (lite)' : '';
 

react/features/app/functions.web.ts

@@ -1,8 +1,10 @@
 import { IStateful } from '../base/app/types';
 import { toState } from '../base/redux/functions';
 import { getServerURL } from '../base/settings/functions.web';
+import { getJitsiMeetGlobalNS } from '../base/util/helpers';
 
 export * from './functions.any';
+import logger from './logger';
 
 /**
  * Retrieves the default URL for the app. This can either come from a prop to
@@ -31,3 +33,27 @@ export function getDefaultURL(stateful: IStateful) {
 export function getName() {
     return interfaceConfig.APP_NAME;
 }
+
+/**
+ * Executes a handler function after the window load event has been received.
+ * If the app has already loaded, the handler is executed immediately.
+ * Otherwise, the handler is registered as a 'load' event listener.
+ *
+ * @param {Function} handler - The callback function to execute.
+ * @returns {void}
+ */
+export function executeAfterLoad(handler: () => void) {
+    const safeHandler = () => {
+        try {
+            handler();
+        } catch (error) {
+            logger.error('Error executing handler after load:', error);
+        }
+    };
+
+    if (getJitsiMeetGlobalNS()?.hasLoaded) {
+        safeHandler();
+    } else {
+        window.addEventListener('load', safeHandler);
+    }
+}

react/features/app/middlewares.any.ts

@@ -24,7 +24,6 @@ import '../calendar-sync/middleware';
 import '../chat/middleware';
 import '../conference/middleware';
 import '../connection-indicator/middleware';
-import '../deep-linking/middleware';
 import '../device-selection/middleware';
 import '../display-name/middleware';
 import '../dynamic-branding/middleware';

react/features/app/middlewares.web.ts

@@ -2,6 +2,7 @@ import '../base/app/middleware';
 import '../base/connection/middleware';
 import '../base/devices/middleware';
 import '../base/media/middleware';
+import '../deep-linking/middleware.web';
 import '../dynamic-branding/middleware';
 import '../e2ee/middleware';
 import '../external-api/middleware';

react/features/av-moderation/actionTypes.ts

@@ -37,6 +37,15 @@ export const ENABLE_MODERATION = 'ENABLE_MODERATION';
  */
 export const REQUEST_DISABLE_AUDIO_MODERATION = 'REQUEST_DISABLE_AUDIO_MODERATION';
 
+/**
+ * The type of (redux) action which signals that Desktop Moderation disable has been requested.
+ *
+ * {
+ *     type: REQUEST_DISABLE_DESKTOP_MODERATION
+ * }
+ */
+export const REQUEST_DISABLE_DESKTOP_MODERATION = 'REQUEST_DISABLE_DESKTOP_MODERATION';
+
 /**
  * The type of (redux) action which signals that Video Moderation disable has been requested.
  *
@@ -55,6 +64,15 @@ export const REQUEST_DISABLE_VIDEO_MODERATION = 'REQUEST_DISABLE_VIDEO_MODERATIO
  */
 export const REQUEST_ENABLE_AUDIO_MODERATION = 'REQUEST_ENABLE_AUDIO_MODERATION';
 
+/**
+ * The type of (redux) action which signals that Desktop Moderation enable has been requested.
+ *
+ * {
+ *     type: REQUEST_ENABLE_DESKTOP_MODERATION
+ * }
+ */
+export const REQUEST_ENABLE_DESKTOP_MODERATION = 'REQUEST_ENABLE_DESKTOP_MODERATION';
+
 /**
  * The type of (redux) action which signals that Video Moderation enable has been requested.
  *
@@ -117,7 +135,7 @@ export const PARTICIPANT_REJECTED = 'PARTICIPANT_REJECTED';
 
 
 /**
- * The type of (redux) action which signals that a participant asked to have its audio umuted.
+ * The type of (redux) action which signals that a participant asked to have its audio unmuted.
  *
  * {
  *     type: PARTICIPANT_PENDING_AUDIO

react/features/av-moderation/actions.ts

@@ -1,9 +1,9 @@
+import { batch } from 'react-redux';
+
 import { IStore } from '../app/types';
 import { getConferenceState } from '../base/conference/functions';
-import { MEDIA_TYPE, type MediaType } from '../base/media/constants';
 import { getParticipantById, isParticipantModerator } from '../base/participants/functions';
 import { IParticipant } from '../base/participants/types';
-import { isForceMuted } from '../participants-pane/functions';
 
 import {
     DISABLE_MODERATION,
@@ -16,11 +16,14 @@ import {
     PARTICIPANT_PENDING_AUDIO,
     PARTICIPANT_REJECTED,
     REQUEST_DISABLE_AUDIO_MODERATION,
+    REQUEST_DISABLE_DESKTOP_MODERATION,
     REQUEST_DISABLE_VIDEO_MODERATION,
     REQUEST_ENABLE_AUDIO_MODERATION,
+    REQUEST_ENABLE_DESKTOP_MODERATION,
     REQUEST_ENABLE_VIDEO_MODERATION
 } from './actionTypes';
-import { isEnabledFromState } from './functions';
+import { MEDIA_TYPE, type MediaType } from './constants';
+import { isEnabledFromState, isForceMuted } from './functions';
 
 /**
  * Action used by moderator to approve audio for a participant.
@@ -42,6 +45,25 @@ export const approveParticipantAudio = (id: string) => (dispatch: IStore['dispat
     }
 };
 
+/**
+ * Action used by moderator to approve desktop for a participant.
+ *
+ * @param {staring} id - The id of the participant to be approved.
+ * @returns {void}
+ */
+export const approveParticipantDesktop = (id: string) => (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+    const state = getState();
+    const { conference } = getConferenceState(state);
+    const participant = getParticipantById(state, id);
+
+    const isDesktopForceMuted = isForceMuted(participant, MEDIA_TYPE.DESKTOP, state);
+    const isDesktopModerationOn = isEnabledFromState(MEDIA_TYPE.DESKTOP, state);
+
+    if (isDesktopModerationOn && isDesktopForceMuted) {
+        conference?.avModerationApprove(MEDIA_TYPE.DESKTOP, id);
+    }
+};
+
 /**
  * Action used by moderator to approve video for a participant.
  *
@@ -68,8 +90,11 @@ export const approveParticipantVideo = (id: string) => (dispatch: IStore['dispat
  * @returns {void}
  */
 export const approveParticipant = (id: string) => (dispatch: IStore['dispatch']) => {
-    dispatch(approveParticipantAudio(id));
-    dispatch(approveParticipantVideo(id));
+    batch(() => {
+        dispatch(approveParticipantAudio(id));
+        dispatch(approveParticipantDesktop(id));
+        dispatch(approveParticipantVideo(id));
+    });
 };
 
 /**
@@ -92,6 +117,26 @@ export const rejectParticipantAudio = (id: string) => (dispatch: IStore['dispatc
     }
 };
 
+/**
+ * Action used by moderator to reject desktop for a participant.
+ *
+ * @param {staring} id - The id of the participant to be rejected.
+ * @returns {void}
+ */
+export const rejectParticipantDesktop = (id: string) => (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+    const state = getState();
+    const { conference } = getConferenceState(state);
+    const desktopModeration = isEnabledFromState(MEDIA_TYPE.DESKTOP, state);
+
+    const participant = getParticipantById(state, id);
+    const isDesktopForceMuted = isForceMuted(participant, MEDIA_TYPE.DESKTOP, state);
+    const isModerator = isParticipantModerator(participant);
+
+    if (desktopModeration && !isDesktopForceMuted && !isModerator) {
+        conference?.avModerationReject(MEDIA_TYPE.DESKTOP, id);
+    }
+};
+
 /**
  * Action used by moderator to reject video for a participant.
  *
@@ -185,6 +230,19 @@ export const requestDisableAudioModeration = () => {
     };
 };
 
+/**
+ * Requests disable of video moderation.
+ *
+ * @returns {{
+ *     type: REQUEST_DISABLE_DESKTOP_MODERATION
+ * }}
+ */
+export const requestDisableDesktopModeration = () => {
+    return {
+        type: REQUEST_DISABLE_DESKTOP_MODERATION
+    };
+};
+
 /**
  * Requests disable of video moderation.
  *
@@ -211,6 +269,19 @@ export const requestEnableAudioModeration = () => {
     };
 };
 
+/**
+ * Requests enable of video moderation.
+ *
+ * @returns {{
+ *     type: REQUEST_ENABLE_DESKTOP_MODERATION
+ * }}
+ */
+export const requestEnableDesktopModeration = () => {
+    return {
+        type: REQUEST_ENABLE_DESKTOP_MODERATION
+    };
+};
+
 /**
  * Requests enable of video moderation.
  *
@@ -313,4 +384,3 @@ export function participantRejected(id: string, mediaType: MediaType) {
         mediaType
     };
 }
-

react/features/av-moderation/constants.ts

@@ -1,18 +1,35 @@
-import { MEDIA_TYPE } from '../base/media/constants';
+export type MediaType = 'audio' | 'video' | 'desktop';
 
 /**
- * Mapping between a media type and the witelist reducer key.
+ * The set of media types for AV moderation.
+ *
+ * @enum {string}
+ */
+export const MEDIA_TYPE: {
+    AUDIO: MediaType;
+    DESKTOP: MediaType;
+    VIDEO: MediaType;
+} = {
+    AUDIO: 'audio',
+    DESKTOP: 'desktop',
+    VIDEO: 'video'
+};
+
+/**
+ * Mapping between a media type and the whitelist reducer key.
  */
 export const MEDIA_TYPE_TO_WHITELIST_STORE_KEY: { [key: string]: string; } = {
     [MEDIA_TYPE.AUDIO]: 'audioWhitelist',
+    [MEDIA_TYPE.DESKTOP]: 'desktopWhitelist',
     [MEDIA_TYPE.VIDEO]: 'videoWhitelist'
 };
 
 /**
  * Mapping between a media type and the pending reducer key.
  */
-export const MEDIA_TYPE_TO_PENDING_STORE_KEY: { [key: string]: 'pendingAudio' | 'pendingVideo'; } = {
+export const MEDIA_TYPE_TO_PENDING_STORE_KEY: { [key: string]: 'pendingAudio' | 'pendingDesktop' | 'pendingVideo'; } = {
     [MEDIA_TYPE.AUDIO]: 'pendingAudio',
+    [MEDIA_TYPE.DESKTOP]: 'pendingDesktop',
     [MEDIA_TYPE.VIDEO]: 'pendingVideo'
 };
 
@@ -20,11 +37,15 @@ export const ASKED_TO_UNMUTE_NOTIFICATION_ID = 'asked-to-unmute';
 export const ASKED_TO_UNMUTE_SOUND_ID = 'ASKED_TO_UNMUTE_SOUND';
 
 export const AUDIO_MODERATION_NOTIFICATION_ID = 'audio-moderation';
+export const DESKTOP_MODERATION_NOTIFICATION_ID = 'desktop-moderation';
 export const VIDEO_MODERATION_NOTIFICATION_ID = 'video-moderation';
-export const CS_MODERATION_NOTIFICATION_ID = 'screensharing-moderation';
+
+export const AUDIO_RAISED_HAND_NOTIFICATION_ID = 'raise-hand-audio';
+export const DESKTOP_RAISED_HAND_NOTIFICATION_ID = 'raise-hand-desktop';
+export const VIDEO_RAISED_HAND_NOTIFICATION_ID = 'raise-hand-video';
 
 export const MODERATION_NOTIFICATIONS = {
     [MEDIA_TYPE.AUDIO]: AUDIO_MODERATION_NOTIFICATION_ID,
-    [MEDIA_TYPE.SCREENSHARE]: CS_MODERATION_NOTIFICATION_ID,
+    [MEDIA_TYPE.DESKTOP]: DESKTOP_MODERATION_NOTIFICATION_ID,
     [MEDIA_TYPE.VIDEO]: VIDEO_MODERATION_NOTIFICATION_ID
 };

react/features/av-moderation/functions.ts

@@ -1,10 +1,14 @@
 import { IReduxState } from '../app/types';
-import { MEDIA_TYPE, type MediaType } from '../base/media/constants';
-import { isLocalParticipantModerator } from '../base/participants/functions';
+import { isLocalParticipantModerator, isParticipantModerator } from '../base/participants/functions';
 import { IParticipant } from '../base/participants/types';
 import { isInBreakoutRoom } from '../breakout-rooms/functions';
 
-import { MEDIA_TYPE_TO_PENDING_STORE_KEY, MEDIA_TYPE_TO_WHITELIST_STORE_KEY } from './constants';
+import {
+    MEDIA_TYPE,
+    MEDIA_TYPE_TO_PENDING_STORE_KEY,
+    MEDIA_TYPE_TO_WHITELIST_STORE_KEY,
+    MediaType
+} from './constants';
 
 /**
  * Returns this feature's root state.
@@ -29,10 +33,18 @@ const EMPTY_ARRAY: any[] = [];
  * @param {IReduxState} state - Global state.
  * @returns {boolean}
  */
-export const isEnabledFromState = (mediaType: MediaType, state: IReduxState) =>
-    (mediaType === MEDIA_TYPE.AUDIO
-        ? getState(state)?.audioModerationEnabled
-        : getState(state)?.videoModerationEnabled) === true;
+export const isEnabledFromState = (mediaType: MediaType, state: IReduxState) => {
+    switch (mediaType) {
+    case MEDIA_TYPE.AUDIO:
+        return getState(state)?.audioModerationEnabled === true;
+    case MEDIA_TYPE.DESKTOP:
+        return getState(state)?.desktopModerationEnabled === true;
+    case MEDIA_TYPE.VIDEO:
+        return getState(state)?.videoModerationEnabled === true;
+    default:
+        throw new Error(`Unknown media type: ${mediaType}`);
+    }
+};
 
 /**
  * Returns whether moderation is enabled per media type.
@@ -61,11 +73,20 @@ export const isSupported = () => (state: IReduxState) => {
  * @returns {boolean}
  */
 export const isLocalParticipantApprovedFromState = (mediaType: MediaType, state: IReduxState) => {
-    const approved = (mediaType === MEDIA_TYPE.AUDIO
-        ? getState(state).audioUnmuteApproved
-        : getState(state).videoUnmuteApproved) === true;
+    if (isLocalParticipantModerator(state)) {
+        return true;
+    }
 
-    return approved || isLocalParticipantModerator(state);
+    switch (mediaType) {
+    case MEDIA_TYPE.AUDIO:
+        return getState(state).audioUnmuteApproved === true;
+    case MEDIA_TYPE.DESKTOP:
+        return getState(state).desktopUnmuteApproved === true;
+    case MEDIA_TYPE.VIDEO:
+        return getState(state).videoUnmuteApproved === true;
+    default:
+        throw new Error(`Unknown media type: ${mediaType}`);
+    }
 };
 
 /**
@@ -134,3 +155,28 @@ export const getParticipantsAskingToAudioUnmute = (state: IReduxState) => {
 export const shouldShowModeratedNotification = (mediaType: MediaType, state: IReduxState) =>
     isEnabledFromState(mediaType, state)
     && !isLocalParticipantApprovedFromState(mediaType, state);
+
+/**
+ * Checks if a participant is force muted.
+ *
+ * @param {IParticipant|undefined} participant - The participant.
+ * @param {MediaType} mediaType - The media type.
+ * @param {IReduxState} state - The redux state.
+ * @returns {MediaState}
+ */
+export function isForceMuted(participant: IParticipant | undefined, mediaType: MediaType, state: IReduxState) {
+    if (isEnabledFromState(mediaType, state)) {
+        if (participant?.local) {
+            return !isLocalParticipantApprovedFromState(mediaType, state);
+        }
+
+        // moderators cannot be force muted
+        if (isParticipantModerator(participant)) {
+            return false;
+        }
+
+        return !isParticipantApproved(participant?.id ?? '', mediaType)(state);
+    }
+
+    return false;
+}

react/features/av-moderation/middleware.ts

@@ -3,8 +3,12 @@ import { batch } from 'react-redux';
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app/actionTypes';
 import { getConferenceState } from '../base/conference/functions';
 import { JitsiConferenceEvents } from '../base/lib-jitsi-meet';
-import { MEDIA_TYPE, MediaType } from '../base/media/constants';
-import { isAudioMuted, isVideoMuted } from '../base/media/functions';
+import { MEDIA_TYPE as TRACK_MEDIA_TYPE } from '../base/media/constants';
+import {
+    isAudioMuted,
+    isScreenshareMuted,
+    isVideoMuted
+} from '../base/media/functions';
 import { PARTICIPANT_UPDATED } from '../base/participants/actionTypes';
 import { raiseHand } from '../base/participants/actions';
 import {
@@ -30,8 +34,10 @@ import {
     PARTICIPANT_APPROVED,
     PARTICIPANT_REJECTED,
     REQUEST_DISABLE_AUDIO_MODERATION,
+    REQUEST_DISABLE_DESKTOP_MODERATION,
     REQUEST_DISABLE_VIDEO_MODERATION,
     REQUEST_ENABLE_AUDIO_MODERATION,
+    REQUEST_ENABLE_DESKTOP_MODERATION,
     REQUEST_ENABLE_VIDEO_MODERATION
 } from './actionTypes';
 import {
@@ -49,8 +55,10 @@ import {
     ASKED_TO_UNMUTE_NOTIFICATION_ID,
     ASKED_TO_UNMUTE_SOUND_ID,
     AUDIO_MODERATION_NOTIFICATION_ID,
-    CS_MODERATION_NOTIFICATION_ID,
-    VIDEO_MODERATION_NOTIFICATION_ID
+    DESKTOP_MODERATION_NOTIFICATION_ID,
+    MEDIA_TYPE,
+    MediaType,
+    VIDEO_MODERATION_NOTIFICATION_ID,
 } from './constants';
 import {
     isEnabledFromState,
@@ -90,9 +98,9 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
             uid = VIDEO_MODERATION_NOTIFICATION_ID;
             break;
         }
-        case MEDIA_TYPE.SCREENSHARE: {
+        case MEDIA_TYPE.DESKTOP: {
             titleKey = 'notify.moderationInEffectCSTitle';
-            uid = CS_MODERATION_NOTIFICATION_ID;
+            uid = DESKTOP_MODERATION_NOTIFICATION_ID;
             break;
         }
         }
@@ -115,6 +123,10 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
         conference?.disableAVModeration(MEDIA_TYPE.AUDIO);
         break;
     }
+    case REQUEST_DISABLE_DESKTOP_MODERATION: {
+        conference?.disableAVModeration(MEDIA_TYPE.DESKTOP);
+        break;
+    }
     case REQUEST_DISABLE_VIDEO_MODERATION: {
         conference?.disableAVModeration(MEDIA_TYPE.VIDEO);
         break;
@@ -123,6 +135,10 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
         conference?.enableAVModeration(MEDIA_TYPE.AUDIO);
         break;
     }
+    case REQUEST_ENABLE_DESKTOP_MODERATION: {
+        conference?.enableAVModeration(MEDIA_TYPE.DESKTOP);
+        break;
+    }
     case REQUEST_ENABLE_VIDEO_MODERATION: {
         conference?.enableAVModeration(MEDIA_TYPE.VIDEO);
         break;
@@ -219,24 +235,37 @@ StateListenerRegistry.register(
                 const customActionHandler = [];
 
                 if ((mediaType === MEDIA_TYPE.AUDIO || getState()['features/av-moderation'].audioUnmuteApproved)
-                    && isAudioMuted(getState())) {
+                        && isAudioMuted(getState())) {
                     customActionNameKey.push('notify.unmute');
                     customActionHandler.push(() => {
-                        dispatch(muteLocal(false, MEDIA_TYPE.AUDIO));
+                        dispatch(muteLocal(false, TRACK_MEDIA_TYPE.AUDIO));
                         dispatch(hideNotification(ASKED_TO_UNMUTE_NOTIFICATION_ID));
                     });
                 }
 
-                if ((mediaType === MEDIA_TYPE.VIDEO || getState()['features/av-moderation'].videoUnmuteApproved)
-                    && isVideoMuted(getState())) {
-                    customActionNameKey.push('notify.unmuteVideo');
+                if ((mediaType === MEDIA_TYPE.DESKTOP || getState()['features/av-moderation'].desktopUnmuteApproved)
+                        && isScreenshareMuted(getState())) {
+                    customActionNameKey.push('notify.unmuteScreen');
                     customActionHandler.push(() => {
-                        dispatch(muteLocal(false, MEDIA_TYPE.VIDEO));
+                        dispatch(muteLocal(false, TRACK_MEDIA_TYPE.SCREENSHARE));
                         dispatch(hideNotification(ASKED_TO_UNMUTE_NOTIFICATION_ID));
 
-                        // lower hand as there will be no audio and change in dominant speaker to clear it
+                        // Since permission is requested by raising the hand, lower it not to rely on dominant speaker detection
+                        // to clear the hand.
                         dispatch(raiseHand(false));
+                    });
+                }
 
+                if ((mediaType === MEDIA_TYPE.VIDEO || getState()['features/av-moderation'].videoUnmuteApproved)
+                        && isVideoMuted(getState())) {
+                    customActionNameKey.push('notify.unmuteVideo');
+                    customActionHandler.push(() => {
+                        dispatch(muteLocal(false, TRACK_MEDIA_TYPE.VIDEO));
+                        dispatch(hideNotification(ASKED_TO_UNMUTE_NOTIFICATION_ID));
+
+                        // Since permission is requested by raising the hand, lower it not to rely on dominant speaker detection
+                        // to clear the hand.
+                        dispatch(raiseHand(false));
                     });
                 }
 

react/features/av-moderation/reducer.ts

@@ -1,4 +1,3 @@
-import { MEDIA_TYPE, type MediaType } from '../base/media/constants';
 import {
     PARTICIPANT_LEFT,
     PARTICIPANT_UPDATED
@@ -16,14 +15,21 @@ import {
     PARTICIPANT_PENDING_AUDIO,
     PARTICIPANT_REJECTED
 } from './actionTypes';
-import { MEDIA_TYPE_TO_PENDING_STORE_KEY } from './constants';
+import {
+    MEDIA_TYPE,
+    MEDIA_TYPE_TO_PENDING_STORE_KEY,
+    type MediaType
+} from './constants';
 
 const initialState = {
     audioModerationEnabled: false,
+    desktopModerationEnabled: false,
     videoModerationEnabled: false,
     audioWhitelist: {},
+    desktopWhitelist: {},
     videoWhitelist: {},
     pendingAudio: [],
+    pendingDesktop: [],
     pendingVideo: []
 };
 
@@ -31,7 +37,11 @@ export interface IAVModerationState {
     audioModerationEnabled: boolean;
     audioUnmuteApproved?: boolean | undefined;
     audioWhitelist: { [id: string]: boolean; };
+    desktopModerationEnabled: boolean;
+    desktopUnmuteApproved?: boolean | undefined;
+    desktopWhitelist: { [id: string]: boolean; };
     pendingAudio: Array<{ id: string; }>;
+    pendingDesktop: Array<{ id: string; }>;
     pendingVideo: Array<{ id: string; }>;
     videoModerationEnabled: boolean;
     videoUnmuteApproved?: boolean | undefined;
@@ -77,28 +87,61 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
 (state = initialState, action): IAVModerationState => {
     switch (action.type) {
     case DISABLE_MODERATION: {
-        const newState = action.mediaType === MEDIA_TYPE.AUDIO
-            ? {
+        let newState = {};
+
+        switch (action.mediaType) {
+        case MEDIA_TYPE.AUDIO:
+            newState = {
                 audioModerationEnabled: false,
                 audioUnmuteApproved: undefined
-            } : {
+            };
+            break;
+        case MEDIA_TYPE.DESKTOP:
+            newState = {
+                desktopModerationEnabled: false,
+                desktopUnmuteApproved: undefined
+            };
+            break;
+        case MEDIA_TYPE.VIDEO:
+            newState = {
                 videoModerationEnabled: false,
                 videoUnmuteApproved: undefined
             };
+            break;
+        }
 
         return {
             ...state,
             ...newState,
             audioWhitelist: {},
+            desktopWhitelist: {},
             videoWhitelist: {},
             pendingAudio: [],
+            pendingDesktop: [],
             pendingVideo: []
         };
     }
 
     case ENABLE_MODERATION: {
-        const newState = action.mediaType === MEDIA_TYPE.AUDIO
-            ? { audioModerationEnabled: true } : { videoModerationEnabled: true };
+        let newState = {};
+
+        switch (action.mediaType) {
+        case MEDIA_TYPE.AUDIO:
+            newState = {
+                audioModerationEnabled: true,
+            };
+            break;
+        case MEDIA_TYPE.DESKTOP:
+            newState = {
+                desktopModerationEnabled: true,
+            };
+            break;
+        case MEDIA_TYPE.VIDEO:
+            newState = {
+                videoModerationEnabled: true,
+            };
+            break;
+        }
 
         return {
             ...state,
@@ -107,8 +150,25 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
     }
 
     case LOCAL_PARTICIPANT_APPROVED: {
-        const newState = action.mediaType === MEDIA_TYPE.AUDIO
-            ? { audioUnmuteApproved: true } : { videoUnmuteApproved: true };
+        let newState = {};
+
+        switch (action.mediaType) {
+        case MEDIA_TYPE.AUDIO:
+            newState = {
+                audioUnmuteApproved: true
+            };
+            break;
+        case MEDIA_TYPE.DESKTOP:
+            newState = {
+                desktopUnmuteApproved: true
+            };
+            break;
+        case MEDIA_TYPE.VIDEO:
+            newState = {
+                videoUnmuteApproved: true
+            };
+            break;
+        }
 
         return {
             ...state,
@@ -117,8 +177,25 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
     }
 
     case LOCAL_PARTICIPANT_REJECTED: {
-        const newState = action.mediaType === MEDIA_TYPE.AUDIO
-            ? { audioUnmuteApproved: false } : { videoUnmuteApproved: false };
+        let newState = {};
+
+        switch (action.mediaType) {
+        case MEDIA_TYPE.AUDIO:
+            newState = {
+                audioUnmuteApproved: false
+            };
+            break;
+        case MEDIA_TYPE.DESKTOP:
+            newState = {
+                desktopUnmuteApproved: false
+            };
+            break;
+        case MEDIA_TYPE.VIDEO:
+            newState = {
+                videoUnmuteApproved: false
+            };
+            break;
+        }
 
         return {
             ...state,
@@ -146,7 +223,7 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
 
     case PARTICIPANT_UPDATED: {
         const participant = action.participant;
-        const { audioModerationEnabled, videoModerationEnabled } = state;
+        const { audioModerationEnabled, desktopModerationEnabled, videoModerationEnabled } = state;
         let hasStateChanged = false;
 
         // skips changing the reference of pendingAudio or pendingVideo,
@@ -155,6 +232,10 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
             hasStateChanged = _updatePendingParticipant(MEDIA_TYPE.AUDIO, participant, state);
         }
 
+        if (desktopModerationEnabled) {
+            hasStateChanged = hasStateChanged || _updatePendingParticipant(MEDIA_TYPE.DESKTOP, participant, state);
+        }
+
         if (videoModerationEnabled) {
             hasStateChanged = hasStateChanged || _updatePendingParticipant(MEDIA_TYPE.VIDEO, participant, state);
         }
@@ -168,9 +249,10 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
 
         return state;
     }
+
     case PARTICIPANT_LEFT: {
         const participant = action.participant;
-        const { audioModerationEnabled, videoModerationEnabled } = state;
+        const { audioModerationEnabled, desktopModerationEnabled, videoModerationEnabled } = state;
         let hasStateChanged = false;
 
         // skips changing the reference of pendingAudio or pendingVideo,
@@ -184,6 +266,15 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
             }
         }
 
+        if (desktopModerationEnabled) {
+            const newPendingDesktop = state.pendingDesktop.filter(pending => pending.id !== participant.id);
+
+            if (state.pendingDesktop.length !== newPendingDesktop.length) {
+                state.pendingDesktop = newPendingDesktop;
+                hasStateChanged = true;
+            }
+        }
+
         if (videoModerationEnabled) {
             const newPendingVideo = state.pendingVideo.filter(pending => pending.id !== participant.id);
 
@@ -213,6 +304,13 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
             };
         }
 
+        if (mediaType === MEDIA_TYPE.DESKTOP) {
+            return {
+                ...state,
+                pendingDesktop: state.pendingDesktop.filter(pending => pending.id !== id)
+            };
+        }
+
         if (mediaType === MEDIA_TYPE.VIDEO) {
             return {
                 ...state,
@@ -236,6 +334,16 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
             };
         }
 
+        if (mediaType === MEDIA_TYPE.DESKTOP) {
+            return {
+                ...state,
+                desktopWhitelist: {
+                    ...state.desktopWhitelist,
+                    [id]: true
+                }
+            };
+        }
+
         if (mediaType === MEDIA_TYPE.VIDEO) {
             return {
                 ...state,
@@ -262,6 +370,16 @@ ReducerRegistry.register<IAVModerationState>('features/av-moderation',
             };
         }
 
+        if (mediaType === MEDIA_TYPE.DESKTOP) {
+            return {
+                ...state,
+                desktopWhitelist: {
+                    ...state.desktopWhitelist,
+                    [id]: false
+                }
+            };
+        }
+
         if (mediaType === MEDIA_TYPE.VIDEO) {
             return {
                 ...state,

react/features/base/app/middleware.web.ts

@@ -24,20 +24,17 @@ MiddlewareRegistry.register(() => (next: Function) => (action: AnyAction) => {
     case APP_WILL_MOUNT: {
         // Disable it inside an iframe until Google fixes the origin trial for 3rd party sources:
         // https://bugs.chromium.org/p/chromium/issues/detail?id=1504167
-        if (!isEmbedded() && 'PressureObserver' in globalThis) {
+        if (!isEmbedded() && 'PressureObserver' in window) {
             pressureObserver = new window.PressureObserver(
                     (records: typeof window.PressureRecord) => {
                         logger.info('Compute pressure state changed:', JSON.stringify(records));
-                        if (typeof APP !== 'undefined') {
-                            APP.API.notifyComputePressureChanged(records);
-                        }
-                    },
-                    { sampleRate: 1 }
+                        APP.API.notifyComputePressureChanged(records);
+                    }
             );
 
             try {
                 pressureObserver
-                    .observe('cpu')
+                    .observe('cpu', { sampleInterval: 30_000 })
                     .catch((e: any) => logger.error('CPU pressure observer failed to start', e));
             } catch (e: any) {
                 logger.error('CPU pressure observer failed to start', e);

react/features/base/conference/actions.any.ts

@@ -83,7 +83,8 @@ import {
     getConferenceState,
     getCurrentConference,
     getVisitorOptions,
-    sendLocalParticipant
+    sendLocalParticipant,
+    updateTrackMuteState
 } from './functions';
 import logger from './logger';
 import { IConferenceMetadata, IJitsiConference } from './reducer';
@@ -186,6 +187,15 @@ function _addConferenceListeners(conference: IJitsiConference, dispatch: IStore[
         (disableVideoMuteChange: boolean) => {
             dispatch(setVideoUnmutePermissions(disableVideoMuteChange));
         });
+    conference.on(
+        JitsiConferenceEvents.START_MUTED_POLICY_CHANGED,
+        ({ audio, video }: { audio: boolean; video: boolean; }) => {
+            dispatch(onStartMutedPolicyChanged(audio, video));
+
+            updateTrackMuteState(state, dispatch, true);
+            updateTrackMuteState(state, dispatch, false);
+        }
+    );
 
     // Dispatches into features/base/tracks follow:
 
@@ -1013,6 +1023,8 @@ export function setStartMutedPolicy(
             audio: startAudioMuted,
             video: startVideoMuted
         });
+
+        dispatch(onStartMutedPolicyChanged(startAudioMuted, startVideoMuted));
     };
 }
 

react/features/base/conference/constants.ts

@@ -40,3 +40,8 @@ export const CONFERENCE_LEAVE_REASONS = {
     SWITCH_ROOM: 'switch_room',
     UNRECOVERABLE_ERROR: 'unrecoverable_error'
 };
+
+/**
+ * The ID of the notification that is shown when the user is muted by focus.
+ */
+export const START_MUTED_NOTIFICATION_ID = 'start-muted';

react/features/base/conference/functions.ts

@@ -3,9 +3,13 @@ import { upperFirst, words } from 'lodash-es';
 
 import { getName } from '../../app/functions';
 import { IReduxState, IStore } from '../../app/types';
+import { showNotification } from '../../notifications/actions';
+import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
 import { determineTranscriptionLanguage } from '../../transcribing/functions';
 import { IStateful } from '../app/types';
 import { JitsiTrackErrors } from '../lib-jitsi-meet';
+import { setAudioMuted, setVideoMuted } from '../media/actions';
+import { VIDEO_MUTISM_AUTHORITY } from '../media/constants';
 import {
     participantJoined,
     participantLeft
@@ -22,7 +26,8 @@ import { setObfuscatedRoom } from './actions';
 import {
     AVATAR_URL_COMMAND,
     EMAIL_COMMAND,
-    JITSI_CONFERENCE_URL_KEY
+    JITSI_CONFERENCE_URL_KEY,
+    START_MUTED_NOTIFICATION_ID
 } from './constants';
 import logger from './logger';
 import { IJitsiConference } from './reducer';
@@ -574,3 +579,42 @@ function safeStartCase(s = '') {
         (result, word, index) => result + (index ? ' ' : '') + upperFirst(word)
         , '');
 }
+
+/**
+ * Updates the mute state of the track based on the start muted policy.
+ *
+ * @param {Object|Function} stateful - Either the whole Redux state object or the Redux store's {@code getState} method.
+ * @param {Function} dispatch - Redux dispatch function.
+ * @param {boolean} isAudio - Whether the track is audio or video.
+ * @returns {void}
+ */
+export function updateTrackMuteState(stateful: IStateful, dispatch: IStore['dispatch'], isAudio: boolean) {
+    const state = toState(stateful);
+    const mutedPolicyKey = isAudio ? 'startAudioMutedPolicy' : 'startVideoMutedPolicy';
+    const mutedPolicyValue = state['features/base/conference'][mutedPolicyKey];
+
+    // Currently, the policy only supports force muting others, not unmuting them.
+    if (!mutedPolicyValue) {
+        return;
+    }
+
+    let muteStateUpdated = false;
+    const { muted } = isAudio ? state['features/base/media'].audio : state['features/base/media'].video;
+
+    if (isAudio && !Boolean(muted)) {
+        dispatch(setAudioMuted(mutedPolicyValue, true));
+        muteStateUpdated = true;
+    } else if (!isAudio && !Boolean(muted)) {
+        // TODO: Add a new authority for video mutism for the moderator case.
+        dispatch(setVideoMuted(mutedPolicyValue, VIDEO_MUTISM_AUTHORITY.USER, true));
+        muteStateUpdated = true;
+    }
+
+    if (muteStateUpdated) {
+        dispatch(showNotification({
+            titleKey: 'notify.mutedTitle',
+            descriptionKey: 'notify.muted',
+            uid: START_MUTED_NOTIFICATION_ID // use the same id, to make sure we show one notification
+        }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
+    }
+}

react/features/base/conference/middleware.any.ts

@@ -16,7 +16,7 @@ import { IStore } from '../../app/types';
 import { removeLobbyChatParticipant } from '../../chat/actions.any';
 import { openDisplayNamePrompt } from '../../display-name/actions';
 import { isVpaasMeeting } from '../../jaas/functions';
-import { showErrorNotification, showNotification } from '../../notifications/actions';
+import { clearNotifications, showErrorNotification, showNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
 import { INotificationProps } from '../../notifications/types';
 import { hasDisplayName } from '../../prejoin/utils';
@@ -25,8 +25,8 @@ import LocalRecordingManager from '../../recording/components/Recording/LocalRec
 import { AudioMixerEffect } from '../../stream-effects/audio-mixer/AudioMixerEffect';
 import { iAmVisitor } from '../../visitors/functions';
 import { overwriteConfig } from '../config/actions';
-import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../connection/actionTypes';
-import { connectionDisconnected, disconnect } from '../connection/actions';
+import { CONNECTION_ESTABLISHED, CONNECTION_FAILED, CONNECTION_WILL_CONNECT } from '../connection/actionTypes';
+import { connect, connectionDisconnected, disconnect, setPreferVisitor } from '../connection/actions';
 import { validateJwt } from '../jwt/functions';
 import { JitsiConferenceErrors, JitsiConferenceEvents, JitsiConnectionErrors } from '../lib-jitsi-meet';
 import { MEDIA_TYPE } from '../media/constants';
@@ -72,13 +72,17 @@ import {
 } from './functions';
 import logger from './logger';
 import { IConferenceMetadata } from './reducer';
-import './subscriber';
 
 /**
  * Handler for before unload event.
  */
 let beforeUnloadHandler: ((e?: any) => void) | undefined;
 
+/**
+ * A simple flag to avoid retrying more than once to join as a visitor when hitting max occupants reached.
+ */
+let retryAsVisitorOnMaxError = true;
+
 /**
  * Implements the middleware of the feature base/conference.
  *
@@ -99,6 +103,11 @@ MiddlewareRegistry.register(store => next => action => {
     case CONNECTION_FAILED:
         return _connectionFailed(store, next, action);
 
+    case CONNECTION_WILL_CONNECT:
+        // we are starting a new join process, let's clear the error notifications if any from any previous attempt
+        store.dispatch(clearNotifications());
+        break;
+
     case CONFERENCE_SUBJECT_CHANGED:
         return _conferenceSubjectChanged(store, next, action);
 
@@ -198,11 +207,20 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
         break;
     }
     case JitsiConferenceErrors.CONFERENCE_MAX_USERS: {
-        dispatch(showErrorNotification({
-            hideErrorSupportLink: true,
-            descriptionKey: 'dialog.maxUsersLimitReached',
-            titleKey: 'dialog.maxUsersLimitReachedTitle'
-        }));
+        let retryAsVisitor = false;
+
+        if (error.params?.length && error.params[0]?.visitorsSupported === 'true') {
+            // visitors are supported, so let's try joining that way
+            retryAsVisitor = true;
+        }
+
+        if (!retryAsVisitor) {
+            dispatch(showErrorNotification({
+                hideErrorSupportLink: true,
+                descriptionKey: 'dialog.maxUsersLimitReached',
+                titleKey: 'dialog.maxUsersLimitReachedTitle'
+            }));
+        }
 
         // In case of max users(it can be from a visitor node), let's restore
         // oldConfig if any as we will be back to the main prosody.
@@ -216,6 +234,18 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
                 .then(() => dispatch(disconnect()));
         }
 
+        if (retryAsVisitor && !newConfig && retryAsVisitorOnMaxError) {
+            retryAsVisitorOnMaxError = false;
+
+            logger.info('On max user reached will retry joining as a visitor');
+
+            dispatch(disconnect(true)).then(() => {
+                dispatch(setPreferVisitor(true));
+
+                return dispatch(connect());
+            });
+        }
+
         break;
     }
     case JitsiConferenceErrors.NOT_ALLOWED_ERROR: {
@@ -296,6 +326,8 @@ function _conferenceJoined({ dispatch, getState }: IStore, next: Function, actio
         requireDisplayName
     } = getState()['features/base/config'];
 
+    retryAsVisitorOnMaxError = true;
+
     dispatch(removeLobbyChatParticipant(true));
 
     pendingSubjectChange && dispatch(setSubject(pendingSubjectChange));

react/features/base/conference/subscriber.ts

@@ -1,61 +0,0 @@
-import { IStore } from '../../app/types';
-import { showNotification } from '../../notifications/actions';
-import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
-import { setAudioMuted, setVideoMuted } from '../media/actions';
-import { VIDEO_MUTISM_AUTHORITY } from '../media/constants';
-import StateListenerRegistry from '../redux/StateListenerRegistry';
-
-let hasShownNotification = false;
-
-/**
- * Handles changes in the start muted policy for audio and video tracks in the meta data set for the conference.
- */
-StateListenerRegistry.register(
-    /* selector */ state => state['features/base/conference'].startAudioMutedPolicy,
-    /* listener */ (startAudioMutedPolicy, store) => {
-        _updateTrackMuteState(store, true);
-    });
-
-StateListenerRegistry.register(
-    /* selector */ state => state['features/base/conference'].startVideoMutedPolicy,
-    /* listener */(startVideoMutedPolicy, store) => {
-        _updateTrackMuteState(store, false);
-    });
-
-/**
- * Updates the mute state of the track based on the start muted policy.
- *
- * @param {IStore} store - The redux store.
- * @param {boolean} isAudio - Whether the track is audio or video.
- * @returns {void}
- */
-function _updateTrackMuteState(store: IStore, isAudio: boolean) {
-    const { dispatch, getState } = store;
-    const mutedPolicyKey = isAudio ? 'startAudioMutedPolicy' : 'startVideoMutedPolicy';
-    const mutedPolicyValue = getState()['features/base/conference'][mutedPolicyKey];
-
-    // Currently, the policy only supports force muting others, not unmuting them.
-    if (!mutedPolicyValue) {
-        return;
-    }
-
-    let muteStateUpdated = false;
-    const { muted } = isAudio ? getState()['features/base/media'].audio : getState()['features/base/media'].video;
-
-    if (isAudio && !Boolean(muted)) {
-        dispatch(setAudioMuted(mutedPolicyValue, true));
-        muteStateUpdated = true;
-    } else if (!isAudio && !Boolean(muted)) {
-        // TODO: Add a new authority for video mutism for the moderator case.
-        dispatch(setVideoMuted(mutedPolicyValue, VIDEO_MUTISM_AUTHORITY.USER, true));
-        muteStateUpdated = true;
-    }
-
-    if (!hasShownNotification && muteStateUpdated) {
-        hasShownNotification = true;
-        dispatch(showNotification({
-            titleKey: 'notify.mutedTitle',
-            descriptionKey: 'notify.muted'
-        }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
-    }
-}

react/features/base/config/configType.ts

@@ -172,7 +172,6 @@ export interface IConfig {
     _screenshotHistoryRegionUrl?: number;
     analytics?: {
         amplitudeAPPKey?: string;
-        amplitudeIncludeUTM?: boolean;
         blackListedEvents?: string[];
         disabled?: boolean;
         matomoEndpoint?: string;
@@ -384,10 +383,12 @@ export interface IConfig {
         maxFileSize?: number;
     };
     filmstrip?: {
+        alwaysShowResizeBar?: boolean;
         disableResizable?: boolean;
         disableStageFilmstrip?: boolean;
         disableTopPanel?: boolean;
         disabled?: boolean;
+        initialWidth?: number;
         minParticipantCountForTopPanel?: number;
     };
     flags?: {
@@ -552,7 +553,7 @@ export interface IConfig {
         disableDemote?: boolean;
         disableGrantModerator?: boolean;
         disableKick?: boolean;
-        disablePrivateChat?: 'all' | 'allow-moderator-chat';
+        disablePrivateChat?: 'all' | 'allow-moderator-chat' | 'disable-visitor-chat';
         disabled?: boolean;
     };
     replaceParticipant?: string;
@@ -594,6 +595,7 @@ export interface IConfig {
         failICE?: boolean;
         noAutoPlayVideo?: boolean;
         p2pTestMode?: boolean;
+        showSpotConsentDialog?: boolean;
         skipInterimTranscriptions?: boolean;
         testMode?: boolean;
     };

react/features/base/config/middleware.ts

@@ -2,6 +2,7 @@ import { AnyAction } from 'redux';
 
 import { IStore } from '../../app/types';
 import { SET_DYNAMIC_BRANDING_DATA } from '../../dynamic-branding/actionTypes';
+import { setUserFilmstripWidth } from '../../filmstrip/actions.web';
 import { getFeatureFlag } from '../flags/functions';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import { updateSettings } from '../settings/actions';
@@ -79,12 +80,18 @@ function _setConfig({ dispatch, getState }: IStore, next: Function, action: AnyA
         }));
     }
 
-    if (action.config.filmstrip?.stageFilmstripParticipants !== undefined) {
+    const { initialWidth, stageFilmstripParticipants } = action.config.filmstrip || {};
+
+    if (stageFilmstripParticipants !== undefined) {
         dispatch(updateSettings({
-            maxStageParticipants: action.config.filmstrip.stageFilmstripParticipants
+            maxStageParticipants: stageFilmstripParticipants
         }));
     }
 
+    if (initialWidth) {
+        dispatch(setUserFilmstripWidth(initialWidth));
+    }
+
     dispatch(updateConfig(config));
 
     // FIXME On Web we rely on the global 'config' variable which gets altered

react/features/base/config/reducer.ts

@@ -185,6 +185,15 @@ function _setConfig(state: IConfig, { config }: { config: IConfig; }) {
         });
     }
 
+    const { alwaysShowResizeBar, disableResizable } = config.filmstrip || {};
+
+    if (alwaysShowResizeBar && disableResizable) {
+        config.filmstrip = {
+            ...config.filmstrip,
+            alwaysShowResizeBar: false
+        };
+    }
+
     const newState = merge(
         {},
         config,

react/features/base/jwt/constants.ts

@@ -18,6 +18,7 @@ export const MEET_FEATURES: Record<string, ParticipantFeaturesKey> = {
     ROOM: 'room',
     SCREEN_SHARING: 'screen-sharing',
     SEND_GROUPCHAT: 'send-groupchat',
+    LIST_VISITORS: 'list-visitors',
     SIP_INBOUND_CALL: 'sip-inbound-call',
     SIP_OUTBOUND_CALL: 'sip-outbound-call',
     TRANSCRIPTION: 'transcription'

react/features/base/media/actions.ts

@@ -1,5 +1,6 @@
 import { IStore } from '../../app/types';
 import { showModeratedNotification } from '../../av-moderation/actions';
+import { MEDIA_TYPE as AVM_MEDIA_TYPE } from '../../av-moderation/constants';
 import { shouldShowModeratedNotification } from '../../av-moderation/functions';
 import { isModerationNotificationDisplayed } from '../../notifications/functions';
 
@@ -18,7 +19,6 @@ import {
     TOGGLE_CAMERA_FACING_MODE
 } from './actionTypes';
 import {
-    MEDIA_TYPE,
     MediaType,
     SCREENSHARE_MUTISM_AUTHORITY,
     VIDEO_MUTISM_AUTHORITY
@@ -56,10 +56,23 @@ export function setAudioAvailable(available: boolean) {
  * }}
  */
 export function setAudioMuted(muted: boolean, ensureTrack = false) {
-    return {
-        type: SET_AUDIO_MUTED,
-        ensureTrack,
-        muted
+    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
+        const state = getState();
+
+        // check for A/V Moderation when trying to unmute
+        if (!muted && shouldShowModeratedNotification(AVM_MEDIA_TYPE.AUDIO, state)) {
+            if (!isModerationNotificationDisplayed(AVM_MEDIA_TYPE.AUDIO, state)) {
+                ensureTrack && dispatch(showModeratedNotification(AVM_MEDIA_TYPE.AUDIO));
+            }
+
+            return;
+        }
+
+        dispatch({
+            type: SET_AUDIO_MUTED,
+            ensureTrack,
+            muted
+        });
     };
 }
 
@@ -126,9 +139,9 @@ export function setScreenshareMuted(
         const state = getState();
 
         // check for A/V Moderation when trying to unmute
-        if (!muted && shouldShowModeratedNotification(MEDIA_TYPE.SCREENSHARE, state)) {
-            if (!isModerationNotificationDisplayed(MEDIA_TYPE.SCREENSHARE, state)) {
-                ensureTrack && dispatch(showModeratedNotification(MEDIA_TYPE.SCREENSHARE));
+        if (!muted && shouldShowModeratedNotification(AVM_MEDIA_TYPE.DESKTOP, state)) {
+            if (!isModerationNotificationDisplayed(AVM_MEDIA_TYPE.DESKTOP, state)) {
+                ensureTrack && dispatch(showModeratedNotification(AVM_MEDIA_TYPE.DESKTOP));
             }
 
             return;
@@ -184,9 +197,9 @@ export function setVideoMuted(
         const state = getState();
 
         // check for A/V Moderation when trying to unmute
-        if (!muted && shouldShowModeratedNotification(MEDIA_TYPE.VIDEO, state)) {
-            if (!isModerationNotificationDisplayed(MEDIA_TYPE.VIDEO, state)) {
-                ensureTrack && dispatch(showModeratedNotification(MEDIA_TYPE.VIDEO));
+        if (!muted && shouldShowModeratedNotification(AVM_MEDIA_TYPE.VIDEO, state)) {
+            if (!isModerationNotificationDisplayed(AVM_MEDIA_TYPE.VIDEO, state)) {
+                ensureTrack && dispatch(showModeratedNotification(AVM_MEDIA_TYPE.VIDEO));
             }
 
             return;

react/features/base/media/functions.ts

@@ -88,6 +88,16 @@ export function getStartWithVideoMuted(stateful: IStateful) {
     return Boolean(getPropertyValue(stateful, 'startWithVideoMuted', START_WITH_AUDIO_VIDEO_MUTED_SOURCES));
 }
 
+/**
+ * Determines whether screen-share is currently muted.
+ *
+ * @param {Function|Object} stateful - The redux store, state, or {@code getState} function.
+ * @returns {boolean}
+ */
+export function isScreenshareMuted(stateful: IStateful) {
+    return Boolean(toState(stateful)['features/base/media'].screenshare.muted);
+}
+
 /**
  * Determines whether video is currently muted.
  *

react/features/base/media/middleware.any.ts

@@ -8,15 +8,17 @@ import {
 } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { IStore } from '../../app/types';
+import { MEDIA_TYPE as AVM_MEDIA_TYPE } from '../../av-moderation/constants';
+import { isForceMuted } from '../../av-moderation/functions';
 import { APP_STATE_CHANGED } from '../../mobile/background/actionTypes';
 import { showWarningNotification } from '../../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
-import { isForceMuted } from '../../participants-pane/functions';
 import { isScreenMediaShared } from '../../screen-share/functions';
 import { SET_AUDIO_ONLY } from '../audio-only/actionTypes';
 import { setAudioOnly } from '../audio-only/actions';
 import { SET_ROOM } from '../conference/actionTypes';
 import { isRoomValid } from '../conference/functions';
+import { PARTICIPANT_MUTED_US } from '../participants/actionTypes';
 import { getLocalParticipant } from '../participants/functions';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import { getPropertyValue } from '../settings/functions.any';
@@ -46,7 +48,8 @@ import {
 import {
     MEDIA_TYPE,
     SCREENSHARE_MUTISM_AUTHORITY,
-    VIDEO_MUTISM_AUTHORITY
+    VIDEO_MUTISM_AUTHORITY,
+    VIDEO_TYPE
 } from './constants';
 import { getStartWithAudioMuted, getStartWithVideoMuted } from './functions';
 import logger from './logger';
@@ -66,6 +69,24 @@ MiddlewareRegistry.register(store => next => action => {
     case APP_STATE_CHANGED:
         return _appStateChanged(store, next, action);
 
+    case PARTICIPANT_MUTED_US: {
+        const { dispatch } = store;
+        const { track } = action;
+
+        // Sync the media muted state with the track muted state.
+        if (track.isAudioTrack()) {
+            dispatch(setAudioMuted(true, /* ensureTrack */ false));
+        } else if (track.isVideoTrack()) {
+            if (track.getVideoType() === VIDEO_TYPE.DESKTOP) {
+                dispatch(setScreenshareMuted(true, SCREENSHARE_MUTISM_AUTHORITY.USER, /* ensureTrack */ false));
+            } else {
+                dispatch(setVideoMuted(true, VIDEO_MUTISM_AUTHORITY.USER, /* ensureTrack */ false));
+            }
+        }
+
+        break;
+    }
+
     case SET_AUDIO_ONLY:
         return _setAudioOnly(store, next, action);
 
@@ -88,7 +109,7 @@ MiddlewareRegistry.register(store => next => action => {
         const state = store.getState();
         const participant = getLocalParticipant(state);
 
-        if (!action.muted && isForceMuted(participant, MEDIA_TYPE.AUDIO, state)) {
+        if (!action.muted && isForceMuted(participant, AVM_MEDIA_TYPE.AUDIO, state)) {
             return;
         }
         break;
@@ -113,7 +134,7 @@ MiddlewareRegistry.register(store => next => action => {
         const state = store.getState();
         const participant = getLocalParticipant(state);
 
-        if (!action.muted && isForceMuted(participant, MEDIA_TYPE.SCREENSHARE, state)) {
+        if (!action.muted && isForceMuted(participant, AVM_MEDIA_TYPE.DESKTOP, state)) {
             return;
         }
         break;
@@ -122,7 +143,7 @@ MiddlewareRegistry.register(store => next => action => {
         const state = store.getState();
         const participant = getLocalParticipant(state);
 
-        if (!action.muted && isForceMuted(participant, MEDIA_TYPE.VIDEO, state)) {
+        if (!action.muted && isForceMuted(participant, AVM_MEDIA_TYPE.VIDEO, state)) {
             return;
         }
         break;

react/features/base/participants/actionTypes.ts

@@ -112,6 +112,17 @@ export const PARTICIPANT_KICKED = 'PARTICIPANT_KICKED';
  */
 export const PARTICIPANT_LEFT = 'PARTICIPANT_LEFT';
 
+/**
+ * Action to handle case when the remote participant mutes the local participant.
+ *
+ * {
+ *     type: PARTICIPANT_MUTED_US,
+ *     participant: Participant,
+ *     track: JitsiLocalTrack
+ * }
+ */
+export const PARTICIPANT_MUTED_US = 'PARTICIPANT_MUTED_US';
+
 /**
  * Action to handle case when the sources attached to a participant are updated.
  *

react/features/base/participants/actions.ts

@@ -17,6 +17,7 @@ import {
     PARTICIPANT_JOINED,
     PARTICIPANT_KICKED,
     PARTICIPANT_LEFT,
+    PARTICIPANT_MUTED_US,
     PARTICIPANT_ROLE_CHANGED,
     PARTICIPANT_SOURCES_UPDATED,
     PARTICIPANT_UPDATED,
@@ -467,19 +468,10 @@ export function participantUpdated(participant: IParticipant = { id: '' }) {
  * @returns {Promise}
  */
 export function participantMutedUs(participant: any, track: any) {
-    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
-        if (!participant) {
-            return;
-        }
-
-        const isAudio = track.isAudioTrack();
-
-        dispatch(showNotification({
-            titleKey: isAudio ? 'notify.mutedRemotelyTitle' : 'notify.videoMutedRemotelyTitle',
-            titleArguments: {
-                participantDisplayName: getParticipantDisplayName(getState, participant.getId())
-            }
-        }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
+    return {
+        type: PARTICIPANT_MUTED_US,
+        participant,
+        track
     };
 }
 

react/features/base/participants/functions.ts

@@ -2,10 +2,12 @@
 import { getGravatarURL } from '@jitsi/js-utils/avatar';
 
 import { IReduxState, IStore } from '../../app/types';
+import { isVisitorChatParticipant } from '../../chat/functions';
 import { isStageFilmstripAvailable } from '../../filmstrip/functions';
 import { isAddPeopleEnabled, isDialOutEnabled } from '../../invite/functions';
 import { toggleShareDialog } from '../../share-room/actions';
 import { iAmVisitor } from '../../visitors/functions';
+import { IVisitorChatParticipant } from '../../visitors/types';
 import { IStateful } from '../app/types';
 import { GRAVATAR_BASE_URL } from '../avatar/constants';
 import { isCORSAvatarURL } from '../avatar/functions';
@@ -392,7 +394,7 @@ export function getMutedStateByParticipantAndMediaType(
     if (mediaType === MEDIA_TYPE.AUDIO) {
         return Array.from(sources.values())[0].muted;
     }
-    const videoType = mediaType === MEDIA_TYPE.VIDEO ? VIDEO_TYPE.CAMERA : VIDEO_TYPE.SCREENSHARE;
+    const videoType = mediaType === MEDIA_TYPE.VIDEO ? VIDEO_TYPE.CAMERA : VIDEO_TYPE.DESKTOP;
     const source = Array.from(sources.values()).find(src => src.videoType === videoType);
 
     return source?.muted ?? true;
@@ -827,18 +829,28 @@ export const setShareDialogVisiblity = (addPeopleFeatureEnabled: boolean, dispat
 /**
  * Checks if private chat is enabled for the given participant.
  *
- * @param {IParticipant|undefined} participant - The participant to check.
+ * @param {IParticipant|IVisitorChatParticipant|undefined} participant - The participant to check.
  * @param {IReduxState} state - The Redux state.
  * @returns {boolean} - True if private chat is enabled, false otherwise.
  */
-export function isPrivateChatEnabled(participant: IParticipant | undefined, state: IReduxState) {
+export function isPrivateChatEnabled(participant: IParticipant | IVisitorChatParticipant | undefined, state: IReduxState) {
     const { remoteVideoMenu = {} } = state['features/base/config'];
     const { disablePrivateChat } = remoteVideoMenu;
 
-    if (participant?.local || state['features/visitors'].iAmVisitor || disablePrivateChat === 'all') {
+    if ((!isVisitorChatParticipant(participant) && participant?.local) || disablePrivateChat === 'all') {
         return false;
     }
 
+    if (disablePrivateChat === 'disable-visitor-chat') {
+        // Block if the participant we're trying to message is a visitor
+        // OR if the local user is a visitor
+        if (isVisitorChatParticipant(participant) || iAmVisitor(state)) {
+            return false;
+        }
+
+        return true; // should allow private chat for other participants
+    }
+
     if (disablePrivateChat === 'allow-moderator-chat') {
         return isLocalParticipantModerator(state) || isParticipantModerator(participant);
     }

react/features/base/participants/middleware.ts

@@ -3,7 +3,19 @@ import { batch } from 'react-redux';
 import { AnyAction } from 'redux';
 
 import { IStore } from '../../app/types';
-import { approveParticipant, approveParticipantAudio, approveParticipantVideo } from '../../av-moderation/actions';
+import {
+    approveParticipant,
+    approveParticipantAudio,
+    approveParticipantDesktop,
+    approveParticipantVideo
+} from '../../av-moderation/actions';
+import {
+    AUDIO_RAISED_HAND_NOTIFICATION_ID,
+    DESKTOP_RAISED_HAND_NOTIFICATION_ID,
+    MEDIA_TYPE,
+    VIDEO_RAISED_HAND_NOTIFICATION_ID
+} from '../../av-moderation/constants';
+import { isForceMuted } from '../../av-moderation/functions';
 import { UPDATE_BREAKOUT_ROOMS } from '../../breakout-rooms/actionTypes';
 import { getBreakoutRooms } from '../../breakout-rooms/functions';
 import { toggleE2EE } from '../../e2ee/actions';
@@ -15,7 +27,6 @@ import {
     RAISE_HAND_NOTIFICATION_ID
 } from '../../notifications/constants';
 import { open as openParticipantsPane } from '../../participants-pane/actions';
-import { isForceMuted } from '../../participants-pane/functions';
 import { CALLING, INVITED } from '../../presence-status/constants';
 import { RAISE_HAND_SOUND_ID } from '../../reactions/constants';
 import { RECORDING_OFF_SOUND_ID, RECORDING_ON_SOUND_ID } from '../../recording/constants';
@@ -26,7 +37,7 @@ import { IJitsiConference } from '../conference/reducer';
 import { SET_CONFIG } from '../config/actionTypes';
 import { getDisableRemoveRaisedHandOnFocus } from '../config/functions.any';
 import { JitsiConferenceEvents } from '../lib-jitsi-meet';
-import { MEDIA_TYPE } from '../media/constants';
+import { VIDEO_TYPE } from '../media/constants';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import StateListenerRegistry from '../redux/StateListenerRegistry';
 import { playSound, registerSound, unregisterSound } from '../sounds/actions';
@@ -43,6 +54,7 @@ import {
     OVERWRITE_PARTICIPANT_NAME,
     PARTICIPANT_JOINED,
     PARTICIPANT_LEFT,
+    PARTICIPANT_MUTED_US,
     PARTICIPANT_UPDATED,
     RAISE_HAND_UPDATED,
     SET_LOCAL_PARTICIPANT_RECORDING_STATUS
@@ -292,6 +304,31 @@ MiddlewareRegistry.register(store => next => action => {
         break;
     }
 
+    case PARTICIPANT_MUTED_US: {
+        const { dispatch, getState } = store;
+        const { participant, track } = action;
+        let titleKey;
+
+        if (track.isAudioTrack()) {
+            titleKey = 'notify.mutedRemotelyTitle';
+        } else if (track.isVideoTrack()) {
+            if (track.getVideoType() === VIDEO_TYPE.DESKTOP) {
+                titleKey = 'notify.desktopMutedRemotelyTitle';
+            } else {
+                titleKey = 'notify.videoMutedRemotelyTitle';
+            }
+        }
+
+        dispatch(showNotification({
+            titleKey,
+            titleArguments: {
+                participantDisplayName: getParticipantDisplayName(getState, participant.getId())
+            }
+        }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
+
+        break;
+    }
+
     case PARTICIPANT_UPDATED:
         return _participantJoinedOrUpdated(store, next, action);
 
@@ -786,77 +823,124 @@ function _raiseHandUpdated({ dispatch, getState }: IStore, conference: IJitsiCon
         APP.API.notifyRaiseHandUpdated(participantId, raisedHandTimestamp);
     }
 
+    if (!raisedHandTimestamp) {
+        return;
+    }
+
+    // Display notifications about raised hands.
+
     const isModerator = isLocalParticipantModerator(state);
     const participant = getParticipantById(state, participantId);
+    const participantName = getParticipantDisplayName(state, participantId);
+
     let shouldDisplayAllowAudio = false;
     let shouldDisplayAllowVideo = false;
+    let shouldDisplayAllowDesktop = false;
 
     if (isModerator) {
         shouldDisplayAllowAudio = isForceMuted(participant, MEDIA_TYPE.AUDIO, state);
         shouldDisplayAllowVideo = isForceMuted(participant, MEDIA_TYPE.VIDEO, state);
+        shouldDisplayAllowDesktop = isForceMuted(participant, MEDIA_TYPE.DESKTOP, state);
     }
 
-    let action;
-
-    if (shouldDisplayAllowAudio || shouldDisplayAllowVideo) {
-        action = {
-            customActionNameKey: [] as string[],
-            customActionHandler: [] as Function[]
+    if (shouldDisplayAllowAudio || shouldDisplayAllowVideo || shouldDisplayAllowDesktop) {
+        const action: {
+            customActionHandler: Array<() => void>;
+            customActionNameKey: string[];
+        } = {
+            customActionHandler: [],
+            customActionNameKey: [],
         };
 
+        // Always add a "allow all" at the end of the list.
+        action.customActionNameKey.push('notify.allowAll');
+        action.customActionHandler.push(() => {
+            dispatch(approveParticipant(participantId));
+            dispatch(hideNotification(AUDIO_RAISED_HAND_NOTIFICATION_ID));
+            dispatch(hideNotification(DESKTOP_RAISED_HAND_NOTIFICATION_ID));
+            dispatch(hideNotification(VIDEO_RAISED_HAND_NOTIFICATION_ID));
+        });
+
         if (shouldDisplayAllowAudio) {
-            action.customActionNameKey.push('notify.allowAudio');
-            action.customActionHandler.push(() => {
+            const customActionNameKey = action.customActionNameKey.slice();
+            const customActionHandler = action.customActionHandler.slice();
+
+            customActionNameKey.unshift('notify.allowAudio');
+            customActionHandler.unshift(() => {
                 dispatch(approveParticipantAudio(participantId));
-                dispatch(hideNotification(RAISE_HAND_NOTIFICATION_ID));
+                dispatch(hideNotification(AUDIO_RAISED_HAND_NOTIFICATION_ID));
             });
+
+            dispatch(showNotification({
+                title: participantName,
+                descriptionKey: 'notify.raisedHand',
+                uid: AUDIO_RAISED_HAND_NOTIFICATION_ID,
+                customActionNameKey,
+                customActionHandler,
+            }, NOTIFICATION_TIMEOUT_TYPE.EXTRA_LONG));
         }
         if (shouldDisplayAllowVideo) {
-            action.customActionNameKey.push('notify.allowVideo');
-            action.customActionHandler.push(() => {
+            const customActionNameKey = action.customActionNameKey.slice();
+            const customActionHandler = action.customActionHandler.slice();
+
+            customActionNameKey.unshift('notify.allowVideo');
+            customActionHandler.unshift(() => {
                 dispatch(approveParticipantVideo(participantId));
-                dispatch(hideNotification(RAISE_HAND_NOTIFICATION_ID));
+                dispatch(hideNotification(VIDEO_RAISED_HAND_NOTIFICATION_ID));
             });
+
+            dispatch(showNotification({
+                title: participantName,
+                descriptionKey: 'notify.raisedHand',
+                uid: VIDEO_RAISED_HAND_NOTIFICATION_ID,
+                customActionNameKey,
+                customActionHandler,
+            }, NOTIFICATION_TIMEOUT_TYPE.EXTRA_LONG));
         }
-        if (shouldDisplayAllowAudio && shouldDisplayAllowVideo) {
-            action.customActionNameKey.push('notify.allowBoth');
-            action.customActionHandler.push(() => {
-                dispatch(approveParticipant(participantId));
-                dispatch(hideNotification(RAISE_HAND_NOTIFICATION_ID));
+        if (shouldDisplayAllowDesktop) {
+            const customActionNameKey = action.customActionNameKey.slice();
+            const customActionHandler = action.customActionHandler.slice();
+
+            customActionNameKey.unshift('notify.allowDesktop');
+            customActionHandler.unshift(() => {
+                dispatch(approveParticipantDesktop(participantId));
+                dispatch(hideNotification(DESKTOP_RAISED_HAND_NOTIFICATION_ID));
             });
+
+            dispatch(showNotification({
+                title: participantName,
+                descriptionKey: 'notify.raisedHand',
+                uid: DESKTOP_RAISED_HAND_NOTIFICATION_ID,
+                customActionNameKey,
+                customActionHandler
+            }, NOTIFICATION_TIMEOUT_TYPE.EXTRA_LONG));
         }
     } else {
-        action = {
-            customActionNameKey: [ 'notify.viewParticipants' ],
-            customActionHandler: [ () => dispatch(openParticipantsPane()) ]
-        };
-    }
-
-    if (raisedHandTimestamp) {
         let notificationTitle;
-        const participantName = getParticipantDisplayName(state, participantId);
         const { raisedHandsQueue } = state['features/base/participants'];
 
         if (raisedHandsQueue.length > 1) {
-            const raisedHands = raisedHandsQueue.length - 1;
-
             notificationTitle = i18n.t('notify.raisedHands', {
                 participantName,
-                raisedHands
+                raisedHands: raisedHandsQueue.length - 1
             });
         } else {
             notificationTitle = participantName;
         }
+
         dispatch(showNotification({
             titleKey: 'notify.somebody',
             title: notificationTitle,
             descriptionKey: 'notify.raisedHand',
             concatText: true,
             uid: RAISE_HAND_NOTIFICATION_ID,
-            ...action
-        }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
-        dispatch(playSound(RAISE_HAND_SOUND_ID));
+            customActionNameKey: [ 'notify.viewParticipants' ],
+            customActionHandler: [ () => dispatch(openParticipantsPane()) ]
+        }, NOTIFICATION_TIMEOUT_TYPE.LONG));
     }
+
+    dispatch(playSound(RAISE_HAND_SOUND_ID));
+
 }
 
 /**

react/features/base/participants/types.ts

@@ -61,6 +61,7 @@ export interface IParticipantFeatures {
     'file-upload'?: boolean | string;
     'flip'?: boolean | string;
     'inbound-call'?: boolean | string;
+    'list-visitors'?: boolean | string;
     'livestreaming'?: boolean | string;
     'lobby'?: boolean | string;
     'moderation'?: boolean | string;

react/features/base/tracks/actions.web.ts

@@ -2,6 +2,7 @@
 import { AUDIO_ONLY_SCREEN_SHARE_NO_TRACK } from '../../../../modules/UI/UIErrors';
 import { IReduxState, IStore } from '../../app/types';
 import { showModeratedNotification } from '../../av-moderation/actions';
+import { MEDIA_TYPE as AVM_MEDIA_TYPE } from '../../av-moderation/constants';
 import { shouldShowModeratedNotification } from '../../av-moderation/functions';
 import { setNoiseSuppressionEnabled } from '../../noise-suppression/actions';
 import { showErrorNotification, showNotification } from '../../notifications/actions';
@@ -55,10 +56,10 @@ export function toggleScreensharing(
         shareOptions: IShareOptions = {}) {
     return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
         // check for A/V Moderation when trying to start screen sharing
-        if ((enabled || enabled === undefined) && shouldShowModeratedNotification(MEDIA_TYPE.VIDEO, getState())) {
-            dispatch(showModeratedNotification(MEDIA_TYPE.SCREENSHARE));
+        if ((enabled || enabled === undefined) && shouldShowModeratedNotification(AVM_MEDIA_TYPE.DESKTOP, getState())) {
+            dispatch(showModeratedNotification(AVM_MEDIA_TYPE.DESKTOP));
 
-            return Promise.reject();
+            return Promise.resolve();
         }
 
         return _toggleScreenSharing({

react/features/base/tracks/functions.any.ts

@@ -1,10 +1,12 @@
 import { IReduxState, IStore } from '../../app/types';
+import { getSsrcRewritingFeatureFlag } from '../config/functions.any';
 import { JitsiTrackErrors, browser } from '../lib-jitsi-meet';
 import { gumPending } from '../media/actions';
 import { CAMERA_FACING_MODE, MEDIA_TYPE, MediaType, VIDEO_TYPE } from '../media/constants';
 import { IMediaState } from '../media/reducer';
 import { IGUMPendingState } from '../media/types';
 import {
+    getMutedStateByParticipantAndMediaType,
     getVirtualScreenshareParticipantOwnerId,
     isScreenShareParticipant
 } from '../participants/functions';
@@ -35,6 +37,10 @@ export function isParticipantMediaMuted(participant: IParticipant | undefined,
         return false;
     }
 
+    if (getSsrcRewritingFeatureFlag(state)) {
+        return getMutedStateByParticipantAndMediaType(state, participant, mediaType);
+    }
+
     const tracks = getTrackState(state);
 
     if (participant?.local) {
@@ -53,10 +59,21 @@ export function isParticipantMediaMuted(participant: IParticipant | undefined,
  * @param {IReduxState} state - Global state.
  * @returns {boolean} - Is audio muted for the participant.
  */
-export function isParticipantAudioMuted(participant: IParticipant, state: IReduxState) {
+export function isParticipantAudioMuted(participant: IParticipant | undefined, state: IReduxState) {
     return isParticipantMediaMuted(participant, MEDIA_TYPE.AUDIO, state);
 }
 
+/**
+ * Checks if the participant is screen-share muted.
+ *
+ * @param {IParticipant} participant - Participant reference.
+ * @param {IReduxState} state - Global state.
+ * @returns {boolean} - Is screen-share muted for the participant.
+ */
+export function isParticipantScreenShareMuted(participant: IParticipant | undefined, state: IReduxState) {
+    return isParticipantMediaMuted(participant, MEDIA_TYPE.SCREENSHARE, state);
+}
+
 /**
  * Checks if the participant is video muted.
  *
@@ -118,6 +135,10 @@ export function getLocalJitsiDesktopTrack(state: IReduxState) {
  * @returns {(Track|undefined)}
  */
 export function getLocalTrack(tracks: ITrack[], mediaType: MediaType, includePending = false) {
+    if (mediaType === MEDIA_TYPE.SCREENSHARE) {
+        return getLocalDesktopTrack(tracks, includePending);
+    }
+
     return (
         getLocalTracks(tracks, includePending)
             .find(t => t.mediaType === mediaType));
@@ -216,6 +237,14 @@ export function getTrackByMediaTypeAndParticipant(
         tracks: ITrack[],
         mediaType: MediaType,
         participantId?: string) {
+    if (!participantId) {
+        return;
+    }
+
+    if (mediaType === MEDIA_TYPE.SCREENSHARE) {
+        return getScreenShareTrack(tracks, participantId);
+    }
+
     return tracks.find(
         t => Boolean(t.jitsiTrack) && t.participantId === participantId && t.mediaType === mediaType
     );

react/features/base/tracks/middleware.any.ts

@@ -188,10 +188,6 @@ function _setMuted(store: IStore, { ensureTrack, muted }: {
     const localTrack = _getLocalTrack(store, mediaType, /* includePending */ true);
     const state = getState();
 
-    if (mediaType === MEDIA_TYPE.SCREENSHARE && !muted) {
-        return;
-    }
-
     if (localTrack) {
         // The `jitsiTrack` property will have a value only for a localTrack for which `getUserMedia` has already
         // completed. If there's no `jitsiTrack`, then the `muted` state will be applied once the `jitsiTrack` is
@@ -203,8 +199,11 @@ function _setMuted(store: IStore, { ensureTrack, muted }: {
                 .catch(() => dispatch(trackMuteUnmuteFailed(localTrack, muted)));
         }
     } else if (!muted && ensureTrack) {
+        // TODO(saghul): reconcile these 2 types.
+        const createMediaType = mediaType === MEDIA_TYPE.SCREENSHARE ? 'desktop' : mediaType;
+
         typeof APP !== 'undefined' && dispatch(gumPending([ mediaType ], IGUMPendingState.PENDING_UNMUTE));
-        dispatch(createLocalTracksA({ devices: [ mediaType ] })).then(() => {
+        dispatch(createLocalTracksA({ devices: [ createMediaType ] })).then(() => {
             typeof APP !== 'undefined' && dispatch(gumPending([ mediaType ], IGUMPendingState.NONE));
         });
     }

react/features/base/ui/components/native/IconButton.tsx

@@ -58,7 +58,7 @@ const IconButton: React.FC<IIconButtonProps> = ({
             style = { [
                 iconButtonContainerStyles,
                 style
-            ] as ViewStyle }
+            ] as ViewStyle[] }
             underlayColor = { underlayColor }>
             <Icon
                 color = { color }

react/features/base/ui/components/web/Tabs.tsx

@@ -70,12 +70,17 @@ const useStyles = makeStyles()(theme => {
         },
 
         badge: {
-            ...withPixelLineHeight(theme.typography.labelBold),
-            color: theme.palette.text04,
-            padding: `0 ${theme.spacing(1)}`,
-            borderRadius: '100%',
+            ...theme.typography.labelBold,
+            alignItems: 'center',
             backgroundColor: theme.palette.warning01,
-            marginLeft: theme.spacing(2)
+            borderRadius: theme.spacing(2),
+            color: theme.palette.text04,
+            display: 'inline-flex',
+            height: theme.spacing(3),
+            justifyContent: 'center',
+            marginLeft: theme.spacing(2),
+            minWidth: theme.spacing(2),
+            padding: `0 ${theme.spacing(1)}`
         },
 
         icon: {

react/features/base/util/embedUtils.native.ts

@@ -12,13 +12,7 @@ const JITSI_MEET_APPS = [
     'org.jitsi.meet',
 
     // Android debug app.
-    'org.jitsi.meet.debug',
-
-    // 8x8 Work (Android).
-    'org.vom8x8.sipua',
-
-    // 8x8 Work (iOS).
-    'com.yourcompany.Virtual-Office'
+    'org.jitsi.meet.debug'
 ];
 
 /**

react/features/chat/components/AbstractChatPrivacyDialog.tsx

@@ -4,6 +4,7 @@ import { WithTranslation } from 'react-i18next';
 import { IReduxState, IStore } from '../../app/types';
 import { getParticipantById } from '../../base/participants/functions';
 import { IParticipant } from '../../base/participants/types';
+import { IVisitorChatParticipant } from '../../visitors/types';
 import { sendMessage, setPrivateMessageRecipient } from '../actions';
 
 interface IProps extends WithTranslation {
@@ -23,6 +24,16 @@ interface IProps extends WithTranslation {
      */
     _participant?: IParticipant;
 
+    /**
+     * The display name of the visitor (if applicable).
+     */
+    displayName?: string;
+
+    /**
+     * Whether the message is from a visitor.
+     */
+    isFromVisitor?: boolean;
+
     /**
      * The message that is about to be sent.
      */
@@ -67,9 +78,21 @@ export class AbstractChatPrivacyDialog extends PureComponent<IProps> {
      * @returns {void}
      */
     _onSendPrivateMessage() {
-        const { message, _onSendMessage, _onSetMessageRecipient, _participant } = this.props;
+        const { message, _onSendMessage, _onSetMessageRecipient, _participant, isFromVisitor, displayName, participantID } = this.props;
+
+        if (isFromVisitor) {
+            // For visitors, create a participant object since they don't exist in the main participant list
+            const visitorParticipant = {
+                id: participantID,
+                name: displayName,
+                isVisitor: true
+            };
+
+            _onSetMessageRecipient(visitorParticipant);
+        } else {
+            _onSetMessageRecipient(_participant);
+        }
 
-        _onSetMessageRecipient(_participant);
         _onSendMessage(message);
 
         return true;
@@ -88,7 +111,7 @@ export function _mapDispatchToProps(dispatch: IStore['dispatch']) {
             dispatch(sendMessage(message, true));
         },
 
-        _onSetMessageRecipient: (participant: IParticipant) => {
+        _onSetMessageRecipient: (participant: IParticipant | IVisitorChatParticipant) => {
             dispatch(setPrivateMessageRecipient(participant));
         }
     };
@@ -103,6 +126,6 @@ export function _mapDispatchToProps(dispatch: IStore['dispatch']) {
  */
 export function _mapStateToProps(state: IReduxState, ownProps: IProps) {
     return {
-        _participant: getParticipantById(state, ownProps.participantID)
+        _participant: ownProps.isFromVisitor ? undefined : getParticipantById(state, ownProps.participantID)
     };
 }

react/features/chat/components/AbstractMessageRecipient.ts

@@ -3,7 +3,9 @@ import { WithTranslation } from 'react-i18next';
 
 import { IReduxState, IStore } from '../../app/types';
 import { getParticipantDisplayName, isLocalParticipantModerator } from '../../base/participants/functions';
+import { getVisitorDisplayName } from '../../visitors/functions';
 import { setLobbyChatActiveState, setPrivateMessageRecipient } from '../actions.any';
+import { isVisitorChatParticipant } from '../functions';
 
 
 export interface IProps extends WithTranslation {
@@ -13,6 +15,11 @@ export interface IProps extends WithTranslation {
       */
     _isLobbyChatActive: boolean;
 
+    /**
+     * Whether the private message recipient is a visitor.
+     */
+    _isVisitor?: boolean;
+
     /**
       * The name of the lobby message recipient, if any.
       */
@@ -72,10 +79,18 @@ export function _mapDispatchToProps(dispatch: IStore['dispatch']) {
  */
 export function _mapStateToProps(state: IReduxState, _ownProps: any) {
     const { privateMessageRecipient, lobbyMessageRecipient, isLobbyChatActive } = state['features/chat'];
+    let _privateMessageRecipient;
+    const _isVisitor = isVisitorChatParticipant(privateMessageRecipient);
+
+    if (privateMessageRecipient) {
+        _privateMessageRecipient = _isVisitor
+            ? getVisitorDisplayName(state, privateMessageRecipient.name)
+            : getParticipantDisplayName(state, privateMessageRecipient.id);
+    }
 
     return {
-        _privateMessageRecipient:
-            privateMessageRecipient ? getParticipantDisplayName(state, privateMessageRecipient.id) : undefined,
+        _privateMessageRecipient,
+        _isVisitor,
         _isLobbyChatActive: isLobbyChatActive,
         _lobbyMessageRecipient:
                 isLobbyChatActive && lobbyMessageRecipient ? lobbyMessageRecipient.name : undefined,

react/features/chat/components/native/Chat.tsx

@@ -7,7 +7,9 @@ import { IReduxState } from '../../../app/types';
 import { translate } from '../../../base/i18n/functions';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import { TabBarLabelCounter } from '../../../mobile/navigation/components/TabBarLabelCounter';
+import { getUnreadPollCount } from '../../../polls/functions';
 import { closeChat, sendMessage } from '../../actions.native';
+import { getUnreadFilesCount } from '../../functions';
 import { IChatProps as AbstractProps } from '../../types';
 
 import ChatInputBar from './ChatInputBar';
@@ -17,6 +19,21 @@ import styles from './styles';
 
 interface IProps extends AbstractProps {
 
+    /**
+     * The number of unread file messages.
+     */
+    _nbUnreadFiles: number;
+
+    /**
+     * The number of unread messages.
+     */
+    _nbUnreadMessages: number;
+
+    /**
+     * The number of unread polls.
+     */
+    _nbUnreadPolls: number;
+
     /**
      * Default prop for navigating between screen components(React Navigation).
      */
@@ -96,7 +113,9 @@ class Chat extends Component<IProps> {
  * @private
  * @returns {{
  *     _messages: Array<Object>,
- *     _nbUnreadMessages: number
+ *     _nbUnreadMessages: number,
+ *     _nbUnreadPolls: number,
+ *     _nbUnreadFiles: number
  * }}
  */
 function _mapStateToProps(state: IReduxState, _ownProps: any) {
@@ -104,13 +123,16 @@ function _mapStateToProps(state: IReduxState, _ownProps: any) {
 
     return {
         _messages: messages,
-        _nbUnreadMessages: nbUnreadMessages
+        _nbUnreadMessages: nbUnreadMessages,
+        _nbUnreadPolls: getUnreadPollCount(state),
+        _nbUnreadFiles: getUnreadFilesCount(state)
     };
 }
 
 export default translate(connect(_mapStateToProps)((props: IProps) => {
-    const { _nbUnreadMessages, dispatch, navigation, t } = props;
-    const unreadMessagesNr = _nbUnreadMessages > 0;
+    const { _nbUnreadMessages, _nbUnreadPolls, _nbUnreadFiles, dispatch, navigation, t } = props;
+    const totalUnread = _nbUnreadMessages + _nbUnreadPolls + _nbUnreadFiles;
+    const unreadMessagesNr = totalUnread > 0;
 
     const isFocused = useIsFocused();
 
@@ -121,14 +143,14 @@ export default translate(connect(_mapStateToProps)((props: IProps) => {
                     activeUnreadNr = { unreadMessagesNr }
                     isFocused = { isFocused }
                     label = { t('chat.tabs.chat') }
-                    nbUnread = { _nbUnreadMessages } />
+                    nbUnread = { totalUnread } />
             )
         });
 
         return () => {
             isFocused && dispatch(closeChat());
         };
-    }, [ isFocused, _nbUnreadMessages ]);
+    }, [ isFocused, _nbUnreadMessages, _nbUnreadPolls, _nbUnreadFiles ]);
 
     return (
         <Chat { ...props } />

react/features/chat/components/native/ChatButton.ts

@@ -10,7 +10,7 @@ import { arePollsDisabled } from '../../../conference/functions.any';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
 import { getUnreadPollCount } from '../../../polls/functions';
-import { getUnreadCount } from '../../functions';
+import { getUnreadCount, getUnreadFilesCount } from '../../functions';
 
 interface IProps extends AbstractButtonProps {
 
@@ -70,9 +70,7 @@ function _mapStateToProps(state: IReduxState, ownProps: any) {
 
     return {
         _isPollsDisabled: arePollsDisabled(state),
-
-        // The toggled icon should also be available for new polls
-        _unreadMessageCount: getUnreadCount(state) || getUnreadPollCount(state),
+        _unreadMessageCount: getUnreadCount(state) || getUnreadPollCount(state) || getUnreadFilesCount(state),
         visible
     };
 }

react/features/chat/components/native/ChatMessage.tsx

@@ -122,15 +122,17 @@ class ChatMessage extends Component<IChatMessageProps> {
      * @returns {React.ReactElement<*> | null}
      */
     _renderDisplayName() {
-        const { message, showDisplayName } = this.props;
+        const { message, showDisplayName, t } = this.props;
 
         if (!showDisplayName) {
             return null;
         }
 
+        const { displayName, isFromVisitor } = message;
+
         return (
             <Text style = { styles.senderDisplayName }>
-                { message.displayName }
+                { `${displayName}${isFromVisitor ? ` ${t('visitors.chatIndicator')}` : ''}` }
             </Text>
         );
     }

react/features/chat/components/native/MessageRecipient.tsx

@@ -12,7 +12,8 @@ import {
 } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { setLobbyChatActiveState, setPrivateMessageRecipient } from '../../actions.any';
 import AbstractMessageRecipient, {
-    IProps as AbstractProps
+    IProps as AbstractProps,
+    _mapStateToProps as _mapStateToPropsAbstract
 } from '../AbstractMessageRecipient';
 
 import styles from './styles';
@@ -36,11 +37,6 @@ interface IProps extends AbstractProps {
         id: string;
         name: string;
     } | ILocalParticipant;
-
-    /**
-     * The participant object set for private messaging.
-     */
-    privateMessageRecipient: { name: string; };
 }
 
 /**
@@ -96,7 +92,8 @@ class MessageRecipient extends AbstractMessageRecipient<IProps> {
         const {
             isLobbyChatActive,
             lobbyMessageRecipient,
-            privateMessageRecipient,
+            _privateMessageRecipient,
+            _isVisitor,
             t
         } = this.props;
 
@@ -120,7 +117,7 @@ class MessageRecipient extends AbstractMessageRecipient<IProps> {
             );
         }
 
-        if (!privateMessageRecipient) {
+        if (!_privateMessageRecipient) {
             return null;
         }
 
@@ -130,7 +127,7 @@ class MessageRecipient extends AbstractMessageRecipient<IProps> {
                 style = { styles.messageRecipientContainer as ViewStyle }>
                 <Text style = { styles.messageRecipientText }>
                     { t('chat.messageTo', {
-                        recipient: privateMessageRecipient.name
+                        recipient: `${_privateMessageRecipient}${_isVisitor ? ` ${t('visitors.chatIndicator')}` : ''}`
                     }) }
                 </Text>
                 <TouchableHighlight
@@ -157,6 +154,7 @@ function _mapStateToProps(state: IReduxState, _ownProps: any) {
     const { lobbyMessageRecipient, isLobbyChatActive } = state['features/chat'];
 
     return {
+        ..._mapStateToPropsAbstract(state, _ownProps),
         isLobbyChatActive,
         lobbyMessageRecipient
     };

react/features/chat/components/web/Chat.tsx

@@ -64,6 +64,11 @@ interface IProps extends AbstractProps {
      */
     _isResizing: boolean;
 
+    /**
+     * Number of unread file sharing messages.
+     */
+    _nbUnreadFiles: number;
+
     /**
      * Number of unread poll messages.
      */
@@ -229,6 +234,7 @@ const Chat = ({
     _focusedTab,
     _isResizing,
     _messages,
+    _nbUnreadFiles,
     _nbUnreadMessages,
     _nbUnreadPolls,
     _onSendMessage,
@@ -481,7 +487,7 @@ const Chat = ({
         if (_isFileSharingTabEnabled) {
             tabs.push({
                 accessibilityLabel: t('chat.tabs.fileSharing'),
-                countBadge: undefined,
+                countBadge: _focusedTab !== ChatTabs.FILE_SHARING && _nbUnreadFiles > 0 ? _nbUnreadFiles : undefined,
                 id: ChatTabs.FILE_SHARING,
                 controlsId: `${ChatTabs.FILE_SHARING}-panel`,
                 icon: IconShareDoc
@@ -554,13 +560,14 @@ const Chat = ({
  *     _messages: Array<Object>,
  *     _nbUnreadMessages: number,
  *     _nbUnreadPolls: number,
+ *     _nbUnreadFiles: number,
  *     _showNamePrompt: boolean,
  *     _width: number,
  *     _isResizing: boolean
  * }}
  */
 function _mapStateToProps(state: IReduxState, _ownProps: any) {
-    const { isOpen, focusedTab, messages, nbUnreadMessages, width, isResizing } = state['features/chat'];
+    const { isOpen, focusedTab, messages, nbUnreadMessages, nbUnreadFiles, width, isResizing } = state['features/chat'];
     const { nbUnreadPolls } = state['features/polls'];
     const _localParticipant = getLocalParticipant(state);
 
@@ -574,6 +581,7 @@ function _mapStateToProps(state: IReduxState, _ownProps: any) {
         _messages: messages,
         _nbUnreadMessages: nbUnreadMessages,
         _nbUnreadPolls: nbUnreadPolls,
+        _nbUnreadFiles: nbUnreadFiles,
         _showNamePrompt: !_localParticipant?.name,
         _width: width?.current || CHAT_SIZE,
         _isResizing: isResizing

react/features/chat/components/web/ChatCounter.tsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 
 import { IReduxState } from '../../../app/types';
 import { getUnreadPollCount } from '../../../polls/functions';
-import { getUnreadCount } from '../../functions';
+import { getUnreadCount, getUnreadFilesCount } from '../../functions';
 
 /**
  * The type of the React {@code Component} props of {@link ChatCounter}.
@@ -65,7 +65,7 @@ function _mapStateToProps(state: IReduxState) {
 
     return {
 
-        _count: getUnreadCount(state) + getUnreadPollCount(state),
+        _count: getUnreadCount(state) + getUnreadPollCount(state) + getUnreadFilesCount(state),
         _isOpen: isOpen
 
     };

react/features/chat/components/web/ChatMessage.tsx

@@ -9,6 +9,7 @@ import { getParticipantById, getParticipantDisplayName, isPrivateChatEnabled } f
 import Popover from '../../../base/popover/components/Popover.web';
 import Message from '../../../base/react/components/web/Message';
 import { withPixelLineHeight } from '../../../base/styles/functions.web';
+import { MESSAGE_TYPE_LOCAL } from '../../constants';
 import { getFormattedTimestamp, getMessageText, getPrivateNoticeMessage } from '../../functions';
 import { IChatMessageProps } from '../../types';
 
@@ -16,9 +17,10 @@ import MessageMenu from './MessageMenu';
 import ReactButton from './ReactButton';
 
 interface IProps extends IChatMessageProps {
-    shouldDisplayChatMessageMenu: boolean;
+    className?: string;
+    enablePrivateChat?: boolean;
+    shouldDisplayMenuOnRight?: boolean;
     state?: IReduxState;
-    type: string;
 }
 
 const useStyles = makeStyles()((theme: Theme) => {
@@ -190,11 +192,12 @@ const useStyles = makeStyles()((theme: Theme) => {
 });
 
 const ChatMessage = ({
+    className = '',
     message,
     state,
     showDisplayName,
-    type,
-    shouldDisplayChatMessageMenu,
+    shouldDisplayMenuOnRight,
+    enablePrivateChat,
     knocking,
     t
 }: IProps) => {
@@ -224,11 +227,13 @@ const ChatMessage = ({
      * @returns {React$Element<*>}
      */
     function _renderDisplayName() {
+        const { displayName, isFromVisitor = false } = message;
+
         return (
             <div
                 aria-hidden = { true }
                 className = { cx('display-name', classes.displayName) }>
-                {message.displayName}
+                {`${displayName}${isFromVisitor ? ` ${t('visitors.chatIndicator')}` : ''}`}
             </div>
         );
     }
@@ -329,26 +334,28 @@ const ChatMessage = ({
 
     return (
         <div
-            className = { cx(classes.chatMessageWrapper, type) }
+            className = { cx(classes.chatMessageWrapper, className) }
             id = { message.messageId }
             onMouseEnter = { handleMouseEnter }
             onMouseLeave = { handleMouseLeave }
             tabIndex = { -1 }>
             <div className = { classes.sideBySideContainer }>
-                {!shouldDisplayChatMessageMenu && (
+                {!shouldDisplayMenuOnRight && (
                     <div className = { classes.optionsButtonContainer }>
                         {isHovered && <MessageMenu
+                            displayName = { message.displayName }
+                            enablePrivateChat = { Boolean(enablePrivateChat) }
+                            isFromVisitor = { message.isFromVisitor }
                             isLobbyMessage = { message.lobbyChat }
                             message = { message.message }
-                            participantId = { message.participantId }
-                            shouldDisplayChatMessageMenu = { shouldDisplayChatMessageMenu } />}
+                            participantId = { message.participantId } />}
                     </div>
                 )}
                 <div
                     className = { cx(
                         'chatmessage',
                         classes.chatMessage,
-                        type,
+                        className,
                         message.privateMessage && 'privatemessage',
                         message.lobbyChat && !knocking && 'lobbymessage'
                     ) }>
@@ -379,7 +386,7 @@ const ChatMessage = ({
                         </div>
                     </div>
                 </div>
-                {shouldDisplayChatMessageMenu && (
+                {shouldDisplayMenuOnRight && (
                     <div className = { classes.sideBySideContainer }>
                         {!message.privateMessage && !message.lobbyChat && <div>
                             <div className = { classes.optionsButtonContainer }>
@@ -391,10 +398,12 @@ const ChatMessage = ({
                         <div>
                             <div className = { classes.optionsButtonContainer }>
                                 {isHovered && <MessageMenu
+                                    displayName = { message.displayName }
+                                    enablePrivateChat = { Boolean(enablePrivateChat) }
+                                    isFromVisitor = { message.isFromVisitor }
                                     isLobbyMessage = { message.lobbyChat }
                                     message = { message.message }
-                                    participantId = { message.participantId }
-                                    shouldDisplayChatMessageMenu = { shouldDisplayChatMessageMenu } />}
+                                    participantId = { message.participantId } />}
                             </div>
                         </div>
                     </div>
@@ -414,10 +423,23 @@ function _mapStateToProps(state: IReduxState, { message }: IProps) {
     const { knocking } = state['features/lobby'];
 
     const participant = getParticipantById(state, message.participantId);
-    const enablePrivateChat = isPrivateChatEnabled(participant, state);
+
+    // For visitor private messages, participant will be undefined but we should still allow private chat
+    // Create a visitor participant object for visitor messages to pass to isPrivateChatEnabled
+    const participantForCheck = message.isFromVisitor
+        ? { id: message.participantId, name: message.displayName, isVisitor: true as const }
+        : participant;
+
+    const enablePrivateChat = (!message.isFromVisitor || message.privateMessage)
+        && isPrivateChatEnabled(participantForCheck, state);
+
+    // Only the local messages appear on the right side of the chat therefore only for them the menu has to be on the
+    // left side.
+    const shouldDisplayMenuOnRight = message.messageType !== MESSAGE_TYPE_LOCAL;
 
     return {
-        shouldDisplayChatMessageMenu: enablePrivateChat,
+        shouldDisplayMenuOnRight,
+        enablePrivateChat,
         knocking,
         state
     };

react/features/chat/components/web/ChatMessageGroup.tsx

@@ -71,12 +71,11 @@ const ChatMessageGroup = ({ className = '', messages }: IProps) => {
             <div className = { `${classes.messageGroup} chat-message-group ${className}` }>
                 {messages.map((message, i) => (
                     <ChatMessage
+                        className = { className }
                         key = { i }
                         message = { message }
-                        shouldDisplayChatMessageMenu = { false }
                         showDisplayName = { i === 0 }
-                        showTimestamp = { i === messages.length - 1 }
-                        type = { className } />
+                        showTimestamp = { i === messages.length - 1 } />
                 ))}
             </div>
         </div>

react/features/chat/components/web/MessageMenu.tsx

@@ -15,10 +15,12 @@ import { handleLobbyChatInitialized, openChat } from '../../actions.web';
 
 export interface IProps {
     className?: string;
+    displayName?: string;
+    enablePrivateChat: boolean;
+    isFromVisitor?: boolean;
     isLobbyMessage: boolean;
     message: string;
     participantId: string;
-    shouldDisplayChatMessageMenu: boolean;
 }
 
 const useStyles = makeStyles()(theme => {
@@ -58,7 +60,7 @@ const useStyles = makeStyles()(theme => {
     };
 });
 
-const MessageMenu = ({ message, participantId, isLobbyMessage, shouldDisplayChatMessageMenu }: IProps) => {
+const MessageMenu = ({ message, participantId, isFromVisitor, isLobbyMessage, enablePrivateChat, displayName }: IProps) => {
     const dispatch = useDispatch();
     const { classes, cx } = useStyles();
     const { t } = useTranslation();
@@ -82,10 +84,23 @@ const MessageMenu = ({ message, participantId, isLobbyMessage, shouldDisplayChat
         if (isLobbyMessage) {
             dispatch(handleLobbyChatInitialized(participantId));
         } else {
-            dispatch(openChat(participant));
+            // For visitor messages, participant will be undefined but we can still open chat
+            // using the participantId which contains the visitor's original JID
+            if (isFromVisitor) {
+                // Handle visitor participant that doesn't exist in main participant list
+                const visitorParticipant = {
+                    id: participantId,
+                    name: displayName,
+                    isVisitor: true
+                };
+
+                dispatch(openChat(visitorParticipant));
+            } else {
+                dispatch(openChat(participant));
+            }
         }
         handleClose();
-    }, [ dispatch, isLobbyMessage, participant, participantId ]);
+    }, [ dispatch, isLobbyMessage, participant, participantId, displayName ]);
 
     const handleCopyClick = useCallback(() => {
         copyText(message)
@@ -115,7 +130,7 @@ const MessageMenu = ({ message, participantId, isLobbyMessage, shouldDisplayChat
 
     const popoverContent = (
         <div className = { classes.menuPanel }>
-            {shouldDisplayChatMessageMenu && (
+            {enablePrivateChat && (
                 <div
                     className = { classes.menuItem }
                     onClick = { handlePrivateClick }>

react/features/chat/components/web/MessageRecipient.tsx

@@ -48,6 +48,7 @@ const useStyles = makeStyles()(theme => {
 const MessageRecipient = ({
     _privateMessageRecipient,
     _isLobbyChatActive,
+    _isVisitor,
     _lobbyMessageRecipient,
     _onRemovePrivateMessageRecipient,
     _onHideLobbyChatRecipient,
@@ -80,9 +81,9 @@ const MessageRecipient = ({
             id = 'chat-recipient'
             role = 'alert'>
             <span className = { classes.text }>
-                {t(_isLobbyChatActive ? 'chat.lobbyChatMessageTo' : 'chat.messageTo', {
-                    recipient: _isLobbyChatActive ? _lobbyMessageRecipient : _privateMessageRecipient
-                })}
+                { _isLobbyChatActive
+                    ? t('chat.lobbyChatMessageTo', { recipient: _lobbyMessageRecipient })
+                    : t('chat.messageTo', { recipient: `${_privateMessageRecipient}${_isVisitor ? ` ${t('visitors.chatIndicator')}` : ''}` }) }
             </span>
             <Button
                 accessibilityLabel = { t('dialog.close') }

react/features/chat/functions.ts

@@ -9,10 +9,12 @@ import { getLocalizedDateFormatter } from '../base/i18n/dateUtil';
 import i18next from '../base/i18n/i18next';
 import { MEET_FEATURES } from '../base/jwt/constants';
 import { isJwtFeatureEnabled } from '../base/jwt/functions';
-import { getParticipantById } from '../base/participants/functions';
+import { getParticipantById, isPrivateChatEnabled } from '../base/participants/functions';
+import { IParticipant } from '../base/participants/types';
 import { escapeRegexp } from '../base/util/helpers';
 import { getParticipantsPaneWidth } from '../participants-pane/functions';
 import { VIDEO_SPACE_MIN_SIZE } from '../video-layout/constants';
+import { IVisitorChatParticipant } from '../visitors/types';
 
 import { MESSAGE_TYPE_ERROR, MESSAGE_TYPE_LOCAL, TIMESTAMP_FORMAT } from './constants';
 import { IMessage } from './types';
@@ -129,6 +131,16 @@ export function getUnreadCount(state: IReduxState) {
     return messagesCount - (lastReadIndex + 1) - reactionMessages;
 }
 
+/**
+ * Gets the unread files count.
+ *
+ * @param {IReduxState} state - The redux state.
+ * @returns {number} The number of unread files.
+ */
+export function getUnreadFilesCount(state: IReduxState): number {
+    return state['features/chat']?.nbUnreadFiles || 0;
+}
+
 /**
  * Get whether the chat smileys are disabled or not.
  *
@@ -178,9 +190,24 @@ export function getCanReplyToMessage(state: IReduxState, message: IMessage) {
     const { knocking } = state['features/lobby'];
     const participant = getParticipantById(state, message.participantId);
 
-    return Boolean(participant)
+    // Check if basic reply conditions are met
+    const basicCanReply = (Boolean(participant) || message.isFromVisitor)
         && (message.privateMessage || (message.lobbyChat && !knocking))
         && message.messageType !== MESSAGE_TYPE_LOCAL;
+
+    if (!basicCanReply) {
+        return false;
+    }
+
+    // Check private chat configuration for visitor messages
+    if (message.isFromVisitor) {
+        const visitorParticipant = { id: message.participantId, name: message.displayName, isVisitor: true as const };
+
+        return isPrivateChatEnabled(visitorParticipant, state);
+    }
+
+    // For non-visitor messages, use the regular participant
+    return isPrivateChatEnabled(participant, state);
 }
 
 /**
@@ -190,8 +217,19 @@ export function getCanReplyToMessage(state: IReduxState, message: IMessage) {
  * @returns {string}
  */
 export function getPrivateNoticeMessage(message: IMessage) {
+    let recipient;
+
+    if (message.messageType === MESSAGE_TYPE_LOCAL) {
+        // For messages sent by local user, show the recipient name
+        // For visitor messages, use the visitor's display name with indicator
+        recipient = message.sentToVisitor ? `${message.recipient} ${i18next.t('visitors.chatIndicator')}` : message.recipient;
+    } else {
+        // For messages received from others, show "you"
+        recipient = i18next.t('chat.you');
+    }
+
     return i18next.t('chat.privateNotice', {
-        recipient: message.messageType === MESSAGE_TYPE_LOCAL ? message.recipient : i18next.t('chat.you')
+        recipient
     });
 }
 
@@ -225,3 +263,15 @@ export function getChatMaxSize(state: IReduxState) {
 
     return Math.max(clientWidth - getParticipantsPaneWidth(state) - VIDEO_SPACE_MIN_SIZE, 0);
 }
+
+/**
+ * Type guard to check if a participant is a visitor chat participant.
+ *
+ * @param {IParticipant | IVisitorChatParticipant | undefined} participant - The participant to check.
+ * @returns {boolean} - True if the participant is a visitor chat participant.
+ */
+export function isVisitorChatParticipant(
+        participant?: IParticipant | IVisitorChatParticipant
+): participant is IVisitorChatParticipant {
+    return Boolean(participant && 'isVisitor' in participant && participant.isVisitor === true);
+}

react/features/chat/middleware.ts

@@ -33,8 +33,7 @@ import { pushReactions } from '../reactions/actions.any';
 import { ENDPOINT_REACTION_NAME } from '../reactions/constants';
 import { getReactionMessageFromBuffer, isReactionsEnabled } from '../reactions/functions.any';
 import { showToolbox } from '../toolbox/actions';
-
-import './subscriber';
+import { getVisitorDisplayName } from '../visitors/functions';
 
 import {
     ADD_MESSAGE,
@@ -55,8 +54,9 @@ import {
     MESSAGE_TYPE_REMOTE,
     MESSAGE_TYPE_SYSTEM
 } from './constants';
-import { getUnreadCount, isSendGroupChatDisabled } from './functions';
+import { getUnreadCount, isSendGroupChatDisabled, isVisitorChatParticipant } from './functions';
 import { INCOMING_MSG_SOUND_FILE } from './sounds';
+import './subscriber';
 
 /**
  * Timeout for when to show the privacy notice after a private message was received.
@@ -186,6 +186,9 @@ MiddlewareRegistry.register(store => next => action => {
 
                 if (participant) {
                     action.participant = participant;
+                } else if (isVisitorChatParticipant(privateMessageRecipient)) {
+                    // Handle visitor participants that don't exist in the main participant list
+                    action.participant = privateMessageRecipient;
                 }
             }
         } else if (focusedTab === ChatTabs.POLLS) {
@@ -204,14 +207,17 @@ MiddlewareRegistry.register(store => next => action => {
             // recipient. This logic tries to mitigate this risk.
             const shouldSendPrivateMessageTo = _shouldSendPrivateMessageTo(state, action);
 
-            const participantExists = shouldSendPrivateMessageTo
-                && getParticipantById(state, shouldSendPrivateMessageTo);
+            if (shouldSendPrivateMessageTo) {
+                const participantExists = getParticipantById(state, shouldSendPrivateMessageTo.id);
 
-            if (shouldSendPrivateMessageTo && participantExists) {
-                dispatch(openDialog(ChatPrivacyDialog, {
-                    message: action.message,
-                    participantID: shouldSendPrivateMessageTo
-                }));
+                if (participantExists || shouldSendPrivateMessageTo.isFromVisitor) {
+                    dispatch(openDialog(ChatPrivacyDialog, {
+                        message: action.message,
+                        participantID: shouldSendPrivateMessageTo.id,
+                        isFromVisitor: shouldSendPrivateMessageTo.isFromVisitor,
+                        displayName: shouldSendPrivateMessageTo.name
+                    }));
+                }
             } else {
                 // Sending the message if privacy notice doesn't need to be shown.
 
@@ -227,10 +233,10 @@ MiddlewareRegistry.register(store => next => action => {
                         type: LOBBY_CHAT_MESSAGE,
                         message: action.message
                     }, lobbyMessageRecipient.id);
-                    _persistSentPrivateMessage(store, lobbyMessageRecipient.id, action.message, true);
+                    _persistSentPrivateMessage(store, lobbyMessageRecipient, action.message, true);
                 } else if (privateMessageRecipient) {
-                    conference.sendPrivateTextMessage(privateMessageRecipient.id, action.message);
-                    _persistSentPrivateMessage(store, privateMessageRecipient.id, action.message);
+                    conference.sendPrivateTextMessage(privateMessageRecipient.id, action.message, 'body', isVisitorChatParticipant(privateMessageRecipient));
+                    _persistSentPrivateMessage(store, privateMessageRecipient, action.message);
                 } else {
                     conference.sendTextMessage(action.message);
                 }
@@ -317,7 +323,7 @@ function _addChatMsgListener(conference: IJitsiConference, store: IStore) {
         JitsiConferenceEvents.MESSAGE_RECEIVED,
         /* eslint-disable max-params */
         (participantId: string, message: string, timestamp: number,
-                displayName: string, isGuest: boolean, messageId: string) => {
+                displayName: string, isFromVisitor: boolean, messageId: string) => {
         /* eslint-enable max-params */
             _onConferenceMessageReceived(store, {
                 // in case of messages coming from visitors we can have unknown id
@@ -325,7 +331,7 @@ function _addChatMsgListener(conference: IJitsiConference, store: IStore) {
                 message,
                 timestamp,
                 displayName,
-                isGuest,
+                isFromVisitor,
                 messageId,
                 privateMessage: false });
 
@@ -350,13 +356,15 @@ function _addChatMsgListener(conference: IJitsiConference, store: IStore) {
 
     conference.on(
         JitsiConferenceEvents.PRIVATE_MESSAGE_RECEIVED,
-        (participantId: string, message: string, timestamp: number, messageId: string) => {
+        (participantId: string, message: string, timestamp: number, messageId: string, displayName?: string, isFromVisitor?: boolean) => {
             _onConferenceMessageReceived(store, {
                 participantId,
                 message,
                 timestamp,
+                displayName,
                 messageId,
-                privateMessage: true
+                privateMessage: true,
+                isFromVisitor
             });
         }
     );
@@ -375,8 +383,8 @@ function _addChatMsgListener(conference: IJitsiConference, store: IStore) {
  * @returns {void}
  */
 function _onConferenceMessageReceived(store: IStore,
-        { displayName, isGuest, message, messageId, participantId, privateMessage, timestamp }: {
-            displayName?: string; isGuest?: boolean; message: string; messageId?: string;
+        { displayName, isFromVisitor, message, messageId, participantId, privateMessage, timestamp }: {
+            displayName?: string; isFromVisitor?: boolean; message: string; messageId?: string;
             participantId: string; privateMessage: boolean; timestamp: number; }
 ) {
 
@@ -390,7 +398,7 @@ function _onConferenceMessageReceived(store: IStore,
     }
     _handleReceivedMessage(store, {
         displayName,
-        isGuest,
+        isFromVisitor,
         participantId,
         message,
         privateMessage,
@@ -505,8 +513,8 @@ function getLobbyChatDisplayName(state: IReduxState, participantId: string) {
  * @returns {void}
  */
 function _handleReceivedMessage({ dispatch, getState }: IStore,
-        { displayName, isGuest, lobbyChat, message, messageId, participantId, privateMessage, timestamp }: {
-            displayName?: string; isGuest?: boolean; lobbyChat: boolean; message: string;
+        { displayName, isFromVisitor, lobbyChat, message, messageId, participantId, privateMessage, timestamp }: {
+            displayName?: string; isFromVisitor?: boolean; lobbyChat: boolean; message: string;
             messageId?: string; participantId: string; privateMessage: boolean; timestamp: number; },
         shouldPlaySound = true,
         isReaction = false
@@ -525,9 +533,17 @@ function _handleReceivedMessage({ dispatch, getState }: IStore,
     const participant = getParticipantById(state, participantId) || { local: undefined };
 
     const localParticipant = getLocalParticipant(getState);
-    let displayNameToShow = lobbyChat
-        ? getLobbyChatDisplayName(state, participantId)
-        : displayName || getParticipantDisplayName(state, participantId);
+    let _displayName, displayNameToShow;
+
+    if (lobbyChat) {
+        displayNameToShow = _displayName = getLobbyChatDisplayName(state, participantId);
+    } else if (isFromVisitor) {
+        _displayName = getVisitorDisplayName(state, displayName);
+        displayNameToShow = `${_displayName} ${i18next.t('visitors.chatIndicator')}`;
+    } else {
+        displayNameToShow = _displayName = getParticipantDisplayName(state, participantId);
+    }
+
     const hasRead = participant.local || isChatOpen;
     const timestampToDate = timestamp ? new Date(timestamp) : new Date();
     const millisecondsTimestamp = timestampToDate.getTime();
@@ -536,12 +552,8 @@ function _handleReceivedMessage({ dispatch, getState }: IStore,
     const shouldShowNotification = userSelectedNotifications?.['notify.chatMessages']
         && !hasRead && !isReaction && (!timestamp || lobbyChat);
 
-    if (isGuest) {
-        displayNameToShow = `${displayNameToShow} ${i18next.t('visitors.chatIndicator')}`;
-    }
-
     dispatch(addMessage({
-        displayName: displayNameToShow,
+        displayName: _displayName,
         hasRead,
         participantId,
         messageType: participant.local ? MESSAGE_TYPE_LOCAL : MESSAGE_TYPE_REMOTE,
@@ -551,7 +563,8 @@ function _handleReceivedMessage({ dispatch, getState }: IStore,
         recipient: getParticipantDisplayName(state, localParticipant?.id ?? ''),
         timestamp: millisecondsTimestamp,
         messageId,
-        isReaction
+        isReaction,
+        isFromVisitor
     }));
 
     if (shouldShowNotification) {
@@ -574,6 +587,15 @@ function _handleReceivedMessage({ dispatch, getState }: IStore,
     }
 }
 
+/**
+ * Interface for recipient objects used in private messaging.
+ */
+interface IRecipient {
+    id: string;
+    isVisitor?: boolean;
+    name?: string;
+}
+
 /**
  * Persists the sent private messages as if they were received over the muc.
  *
@@ -582,12 +604,12 @@ function _handleReceivedMessage({ dispatch, getState }: IStore,
  * But those messages should be in the store as well, otherwise they don't appear in the chat window.
  *
  * @param {Store} store - The Redux store.
- * @param {string} recipientID - The ID of the recipient the private message was sent to.
+ * @param {IRecipient} recipient - The recipient the private message was sent to.
  * @param {string} message - The sent message.
  * @param {boolean} isLobbyPrivateMessage - Is a lobby message.
  * @returns {void}
  */
-function _persistSentPrivateMessage({ dispatch, getState }: IStore, recipientID: string,
+function _persistSentPrivateMessage({ dispatch, getState }: IStore, recipient: IRecipient,
         message: string, isLobbyPrivateMessage = false) {
     const state = getState();
     const localParticipant = getLocalParticipant(state);
@@ -598,6 +620,13 @@ function _persistSentPrivateMessage({ dispatch, getState }: IStore, recipientID:
     const displayName = getParticipantDisplayName(state, localParticipant.id);
     const { lobbyMessageRecipient } = state['features/chat'];
 
+    const recipientName
+        = recipient.isVisitor
+            ? getVisitorDisplayName(state, recipient.name)
+            : (isLobbyPrivateMessage
+                ? lobbyMessageRecipient?.name
+                : getParticipantDisplayName(getState, recipient?.id));
+
     dispatch(addMessage({
         displayName,
         hasRead: true,
@@ -606,20 +635,19 @@ function _persistSentPrivateMessage({ dispatch, getState }: IStore, recipientID:
         message,
         privateMessage: !isLobbyPrivateMessage,
         lobbyChat: isLobbyPrivateMessage,
-        recipient: isLobbyPrivateMessage
-            ? lobbyMessageRecipient?.name
-            : getParticipantDisplayName(getState, recipientID),
+        recipient: recipientName,
+        sentToVisitor: recipient.isVisitor,
         timestamp: Date.now()
     }));
 }
 
 /**
- * Returns the ID of the participant who we may have wanted to send the message
+ * Returns the participant info for who we may have wanted to send the message
  * that we're about to send.
  *
  * @param {Object} state - The Redux state.
  * @param {Object} action - The action being dispatched now.
- * @returns {string?}
+ * @returns {IRecipient?} - The recipient info or undefined if no notice should be shown.
  */
 function _shouldSendPrivateMessageTo(state: IReduxState, action: AnyAction) {
     if (action.ignorePrivacy) {
@@ -650,8 +678,17 @@ function _shouldSendPrivateMessageTo(state: IReduxState, action: AnyAction) {
     }
 
     if (lastMessage.privateMessage) {
+        if (!lastMessage.participantId) {
+            // this is a system message we can ignore
+            return undefined;
+        }
+
         // We show the notice if the last received message was private.
-        return lastMessage.participantId;
+        return {
+            id: lastMessage.participantId,
+            isFromVisitor: Boolean(lastMessage.isFromVisitor),
+            name: lastMessage.displayName
+        };
     }
 
     // But messages may come rapidly, we want to protect our users from mis-sending a message
@@ -666,7 +703,11 @@ function _shouldSendPrivateMessageTo(state: IReduxState, action: AnyAction) {
         ? recentPrivateMessages[0] : recentPrivateMessages[recentPrivateMessages.length - 1];
 
     if (recentPrivateMessage) {
-        return recentPrivateMessage.participantId;
+        return {
+            id: recentPrivateMessage.participantId,
+            isFromVisitor: Boolean(recentPrivateMessage.isFromVisitor),
+            name: recentPrivateMessage.displayName
+        };
     }
 
     return undefined;

react/features/chat/reducer.ts

@@ -1,6 +1,8 @@
 import { UPDATE_CONFERENCE_METADATA } from '../base/conference/actionTypes';
 import { ILocalParticipant, IParticipant } from '../base/participants/types';
 import ReducerRegistry from '../base/redux/ReducerRegistry';
+import { ADD_FILE, _FILE_LIST_RECEIVED } from '../file-sharing/actionTypes';
+import { IVisitorChatParticipant } from '../visitors/types';
 
 import {
     ADD_MESSAGE,
@@ -27,6 +29,7 @@ const DEFAULT_STATE = {
     messages: [],
     reactions: {},
     nbUnreadMessages: 0,
+    nbUnreadFiles: 0,
     privateMessageRecipient: undefined,
     lobbyMessageRecipient: undefined,
     isLobbyChatActive: false,
@@ -50,8 +53,9 @@ export interface IChatState {
         name: string;
     } | ILocalParticipant;
     messages: IMessage[];
+    nbUnreadFiles: number;
     nbUnreadMessages: number;
-    privateMessageRecipient?: IParticipant;
+    privateMessageRecipient?: IParticipant | IVisitorChatParticipant;
     width: {
         current: number;
         userSet: number | null;
@@ -64,6 +68,7 @@ ReducerRegistry.register<IChatState>('features/chat', (state = DEFAULT_STATE, ac
         const newMessage: IMessage = {
             displayName: action.displayName,
             error: action.error,
+            isFromVisitor: Boolean(action.isFromVisitor),
             participantId: action.participantId,
             isReaction: action.isReaction,
             messageId: action.messageId,
@@ -73,6 +78,7 @@ ReducerRegistry.register<IChatState>('features/chat', (state = DEFAULT_STATE, ac
             privateMessage: action.privateMessage,
             lobbyChat: action.lobbyChat,
             recipient: action.recipient,
+            sentToVisitor: Boolean(action.sentToVisitor),
             timestamp: action.timestamp
         };
 
@@ -228,7 +234,8 @@ ReducerRegistry.register<IChatState>('features/chat', (state = DEFAULT_STATE, ac
         return {
             ...state,
             focusedTab: action.tabId,
-            nbUnreadMessages: action.tabId === ChatTabs.CHAT ? 0 : state.nbUnreadMessages
+            nbUnreadMessages: action.tabId === ChatTabs.CHAT ? 0 : state.nbUnreadMessages,
+            nbUnreadFiles: action.tabId === ChatTabs.FILE_SHARING ? 0 : state.nbUnreadFiles
         };
 
     case SET_CHAT_WIDTH: {
@@ -259,6 +266,23 @@ ReducerRegistry.register<IChatState>('features/chat', (state = DEFAULT_STATE, ac
             isResizing: action.resizing
         };
     }
+
+    case ADD_FILE:
+        return {
+            ...state,
+            nbUnreadFiles: action.shouldIncrementUnread ? state.nbUnreadFiles + 1 : state.nbUnreadFiles
+        };
+
+    case _FILE_LIST_RECEIVED: {
+        const remoteFilesCount = Object.values(action.files).filter(
+            (file: any) => file.authorParticipantId !== action.localParticipantId
+        ).length;
+
+        return {
+            ...state,
+            nbUnreadFiles: remoteFilesCount
+        };
+    }
     }
 
     return state;

react/features/chat/types.ts

@@ -5,6 +5,7 @@ import { IStore } from '../app/types';
 export interface IMessage {
     displayName: string;
     error?: Object;
+    isFromVisitor?: boolean;
     isReaction: boolean;
     lobbyChat: boolean;
     message: string;
@@ -14,6 +15,7 @@ export interface IMessage {
     privateMessage: boolean;
     reactions: Map<string, Set<string>>;
     recipient: string;
+    sentToVisitor?: boolean;
     timestamp: number;
 }
 
@@ -60,11 +62,6 @@ export interface IChatMessageProps extends WithTranslation {
      */
     message: IMessage;
 
-    /**
-     * Whether the chat message menu is visible or not.
-     */
-    shouldDisplayChatMessageMenu?: boolean;
-
     /**
      * Whether or not the avatar image of the participant which sent the message
      * should be displayed.

react/features/conference/middleware.any.ts

@@ -40,7 +40,6 @@ import {
     NOTIFICATION_TIMEOUT_TYPE
 } from '../notifications/constants';
 import { showStartRecordingNotification } from '../recording/actions';
-import { showSalesforceNotification } from '../salesforce/actions';
 import { setToolboxEnabled } from '../toolbox/actions.any';
 
 import { DISMISS_CALENDAR_NOTIFICATION } from './actionTypes';
@@ -164,7 +163,6 @@ function _conferenceJoined({ dispatch, getState }: IStore) {
             }), 10 * 1000);
     }
 
-    dispatch(showSalesforceNotification());
     dispatch(showStartRecordingNotification());
 
     _checkIframe(getState(), dispatch);

react/features/deep-linking/functions.web.ts

@@ -8,7 +8,7 @@ import { isVpaasMeeting } from '../jaas/functions';
 import DeepLinkingDesktopPage from './components/DeepLinkingDesktopPage';
 import DeepLinkingMobilePage from './components/DeepLinkingMobilePage';
 import NoMobileApp from './components/NoMobileApp';
-import { _openDesktopApp } from './openDesktopApp';
+import { _openDesktopApp } from './openDesktopApp.web';
 
 /**
  * Generates a deep linking URL based on the current window URL.

react/features/deep-linking/middleware.web.ts

@@ -1,7 +1,7 @@
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 
 import { OPEN_DESKTOP_APP } from './actionTypes';
-import { openDesktopApp } from './functions';
+import { openDesktopApp } from './functions.web';
 
 /**
  * Implements the middleware of the deep linking feature.

react/features/deep-linking/openDesktopApp.web.ts

@@ -1,3 +1,4 @@
+import { executeAfterLoad } from '../app/functions.web';
 import { IReduxState } from '../app/types';
 import { URI_PROTOCOL_PATTERN } from '../base/util/uri';
 
@@ -16,7 +17,10 @@ export function _openDesktopApp(_state: Object) {
         const { appScheme } = deeplinkingDesktop;
         const regex = new RegExp(URI_PROTOCOL_PATTERN, 'gi');
 
-        window.location.href = window.location.href.replace(regex, `${appScheme}:`);
+        // This is needed to workaround https://issues.chromium.org/issues/41398687
+        executeAfterLoad(() => {
+            window.location.href = window.location.href.replace(regex, `${appScheme}:`);
+        });
 
         return Promise.resolve(true);
     }

react/features/file-sharing/actions.ts

@@ -39,12 +39,14 @@ export function updateFileProgress(fileId: string, progress: number) {
  * Add a file.
  *
  * @param {IFileMetadata} file - The file to add to the state.
+ * @param {boolean} shouldIncrementUnread - Whether to increment the unread count.
  * @returns {Object}
  */
-export function addFile(file: IFileMetadata) {
+export function addFile(file: IFileMetadata, shouldIncrementUnread = false) {
     return {
         type: ADD_FILE,
-        file
+        file,
+        shouldIncrementUnread
     };
 }
 

react/features/file-sharing/components/web/FileSharing.tsx

@@ -234,6 +234,7 @@ const FileSharing = () => {
     const handleFileSelect = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
         if (e.target.files) {
             processFiles(e.target.files as FileList, store);
+            e.target.value = ''; // Reset the input value to allow re-uploading the same file
         }
     }, [ processFiles ]);
 

react/features/file-sharing/functions.any.ts

@@ -10,6 +10,7 @@ import { MEET_FEATURES } from '../base/jwt/constants';
 import { isJwtFeatureEnabled } from '../base/jwt/functions';
 import { showErrorNotification } from '../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE } from '../notifications/constants';
+import { iAmVisitor } from '../visitors/functions';
 
 import { uploadFiles } from './actions';
 import { MAX_FILE_SIZE } from './constants';
@@ -150,5 +151,7 @@ export const processFiles = (fileList: FileList | File[], store: IStore) => {
  * @returns {boolean} Indication of whether local user can upload files.
  */
 export function isFileUploadingEnabled(state: IReduxState): boolean {
-    return isJwtFeatureEnabled(state, MEET_FEATURES.FILE_UPLOAD, false) && isFileSharingEnabled(state);
+    return !iAmVisitor(state)
+        && isJwtFeatureEnabled(state, MEET_FEATURES.FILE_UPLOAD, false)
+        && isFileSharingEnabled(state);
 }

react/features/file-sharing/middleware.web.ts

@@ -6,14 +6,17 @@ import { JitsiConferenceEvents } from '../base/lib-jitsi-meet';
 import { getLocalParticipant, getParticipantDisplayName } from '../base/participants/functions';
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 import StateListenerRegistry from '../base/redux/StateListenerRegistry';
-import { showErrorNotification } from '../notifications/actions';
+import { ChatTabs } from '../chat/constants';
+import { showErrorNotification, showNotification } from '../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE } from '../notifications/constants';
+import { I_AM_VISITOR_MODE } from '../visitors/actionTypes';
 
 import { DOWNLOAD_FILE, REMOVE_FILE, UPLOAD_FILES, _FILE_LIST_RECEIVED, _FILE_REMOVED } from './actionTypes';
 import { addFile, removeFile, updateFileProgress } from './actions';
 import { getFileExtension } from './functions.any';
 import logger from './logger';
 import { IFileMetadata } from './types';
+import { downloadFile } from './utils';
 
 
 /**
@@ -22,12 +25,40 @@ import { IFileMetadata } from './types';
  */
 StateListenerRegistry.register(
     state => state['features/base/conference'].conference,
-    (conference, { dispatch }, previousConference) => {
+    (conference, { dispatch, getState }, previousConference) => {
         if (conference && !previousConference) {
             conference.on(JitsiConferenceEvents.FILE_SHARING_FILE_ADDED, (file: IFileMetadata) => {
-                dispatch(addFile(file));
+                const state = getState();
+                const localParticipant = getLocalParticipant(state);
+                const isRemoteFile = file.authorParticipantId !== localParticipant?.id;
+                const { isOpen, focusedTab } = state['features/chat'];
+                const isFileSharingTabVisible = isOpen && focusedTab === ChatTabs.FILE_SHARING;
+
+                dispatch(addFile(file, isRemoteFile && !isFileSharingTabVisible));
+
+                if (isRemoteFile && !isFileSharingTabVisible) {
+                    dispatch(showNotification({
+                        titleKey: 'fileSharing.newFileNotification',
+                        titleArguments: { participantName: file.authorParticipantName, fileName: file.fileName }
+                    }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
+                }
             });
             conference.on(JitsiConferenceEvents.FILE_SHARING_FILE_REMOVED, (fileId: string) => {
+                const state = getState();
+                const localParticipant = getLocalParticipant(state);
+                const { files } = state['features/file-sharing'];
+                const { isOpen, focusedTab } = state['features/chat'];
+                const removedFile = files.get(fileId);
+                const isFileSharingTabVisible = isOpen && focusedTab === ChatTabs.FILE_SHARING;
+
+                if (removedFile && removedFile.authorParticipantId === localParticipant?.id && !isFileSharingTabVisible) {
+                    dispatch(showNotification({
+                        titleKey: 'fileSharing.fileRemovedByOther',
+                        titleArguments: { fileName: removedFile.fileName },
+                        appearance: NOTIFICATION_TYPE.WARNING
+                    }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
+                }
+
                 dispatch({
                     type: _FILE_REMOVED,
                     fileId
@@ -35,9 +66,13 @@ StateListenerRegistry.register(
             });
 
             conference.on(JitsiConferenceEvents.FILE_SHARING_FILES_RECEIVED, (files: object) => {
+                const state = getState();
+                const localParticipant = getLocalParticipant(state);
+
                 dispatch({
                     type: _FILE_LIST_RECEIVED,
-                    files
+                    files,
+                    localParticipantId: localParticipant?.id
                 });
             });
         }
@@ -51,6 +86,17 @@ StateListenerRegistry.register(
  */
 MiddlewareRegistry.register(store => next => action => {
     switch (action.type) {
+    case I_AM_VISITOR_MODE: {
+        if (!action.iAmVisitor) {
+            const state = store.getState();
+            const conference = getCurrentConference(state);
+
+            conference?.getFileSharing()?.requestFileList?.();
+        }
+
+        return next(action);
+    }
+
     case UPLOAD_FILES: {
         const state = store.getState();
         const conference = getCurrentConference(state);
@@ -122,14 +168,14 @@ MiddlewareRegistry.register(store => next => action => {
             }
         }))
         .then((response: any) => response.json())
-        .then((data: { presignedUrl: any; }) => {
-            const url = data.presignedUrl;
+        .then((data: { fileName: string; presignedUrl: string; }) => {
+            const { presignedUrl, fileName } = data;
 
-            if (!url) {
+            if (!presignedUrl) {
                 throw new Error('No presigned URL found in the response.');
             }
 
-            window.open(url, '_blank', 'noreferrer,noopener');
+            return downloadFile(presignedUrl, fileName);
         })
         .catch((error: any) => {
             logger.warn('Could not download file:', error);