fix(recording) fix recording suggestion not being shown in some cases

Initial implementation did not account for cases where participants become moderators

.github/workflows/ci.yml

@@ -73,10 +73,6 @@ jobs:
         node-version: 16
         cache: 'npm'
     - run: npm install
-    - name: setup-cocoapods
-      uses: maxim-lobanov/setup-cocoapods@v1
-      with:
-        podfile-path: ios/Podfile.lock
     - name: Install Pods
       run: |
         pod --version

android/build.gradle

@@ -19,9 +19,9 @@ buildscript {
 ext {
     kotlinVersion = "1.7.0"
     buildToolsVersion = "33.0.2"
-    compileSdkVersion = 33
+    compileSdkVersion = 34
     minSdkVersion    = 24
-    targetSdkVersion = 33
+    targetSdkVersion = 34
     supportLibVersion = "28.0.0"
 
     // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.

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

@@ -87,7 +87,6 @@ class AudioDeviceHandlerGeneric implements
                         devices.add(AudioModeModule.DEVICE_EARPIECE);
                         break;
                     case AudioDeviceInfo.TYPE_BUILTIN_SPEAKER:
-                    case AudioDeviceInfo.TYPE_HDMI:
                         devices.add(AudioModeModule.DEVICE_SPEAKER);
                         break;
                     case AudioDeviceInfo.TYPE_WIRED_HEADPHONES:

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

@@ -1,6 +1,5 @@
 package org.jitsi.meet.sdk;
 
-import android.app.Activity;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
@@ -24,9 +23,8 @@ class JitsiMeetMediaProjectionModule
     @ReactMethod
     public void launch() {
         Context context = getReactApplicationContext();
-        Activity currentActivity = getCurrentActivity();
 
-        JitsiMeetMediaProjectionService.launch(context, currentActivity);
+        JitsiMeetMediaProjectionService.launch(context);
     }
 
     @ReactMethod

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

@@ -17,7 +17,6 @@
 package org.jitsi.meet.sdk;
 
 
-import android.app.Activity;
 import android.app.Notification;
 import android.app.Service;
 import android.content.ComponentName;
@@ -29,7 +28,6 @@ import android.os.IBinder;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
-import java.util.Random;
 
 /**
  * This class implements an Android {@link Service}, a foreground one specifically, and it's
@@ -41,11 +39,8 @@ import java.util.Random;
 public class JitsiMeetMediaProjectionService extends Service {
     private static final String TAG = JitsiMeetMediaProjectionService.class.getSimpleName();
 
-    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-
-    public static void launch(Context context, Activity currentActivity) {
-
-        NotificationUtils.createNotificationChannel(currentActivity);
+    public static void launch(Context context) {
+        OngoingNotification.createOngoingConferenceNotificationChannel();
 
         Intent intent = new Intent(context, JitsiMeetMediaProjectionService.class);
 
@@ -60,12 +55,12 @@ public class JitsiMeetMediaProjectionService extends Service {
         } catch (RuntimeException e) {
             // Avoid crashing due to ForegroundServiceStartNotAllowedException (API level 31).
             // See: https://developer.android.com/guide/components/foreground-services#background-start-restrictions
-            JitsiMeetLogger.w(TAG + "Media projection service not started", e);
+            JitsiMeetLogger.w(TAG + " Ongoing conference service not started", e);
             return;
         }
 
         if (componentName == null) {
-            JitsiMeetLogger.w(TAG + "Media projection service not started");
+            JitsiMeetLogger.w(TAG + " Ongoing conference service not started");
         }
     }
 
@@ -74,6 +69,24 @@ public class JitsiMeetMediaProjectionService extends Service {
         context.stopService(intent);
     }
 
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        Notification notification = OngoingNotification.buildOngoingConferenceNotification(null);
+
+        if (notification == null) {
+            stopSelf();
+            JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            startForeground(OngoingNotification.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION);
+        } else {
+            startForeground(OngoingNotification.NOTIFICATION_ID, notification);
+        }
+    }
+
     @Override
     public IBinder onBind(Intent intent) {
         return null;
@@ -82,21 +95,6 @@ public class JitsiMeetMediaProjectionService extends Service {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
 
-        Notification notification = MediaProjectionNotification.buildMediaProjectionNotification(this);
-
-        if (notification == null) {
-            stopSelf();
-            JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
-
-            return START_NOT_STICKY;
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PROJECTION);
-        } else {
-            startForeground(NOTIFICATION_ID, notification);
-        }
-
         return START_NOT_STICKY;
     }
 }

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

@@ -16,7 +16,6 @@
 
 package org.jitsi.meet.sdk;
 
-import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.Service;
@@ -34,7 +33,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
 import java.util.HashMap;
-import java.util.Random;
 
 /**
  * This class implements an Android {@link Service}, a foreground one specifically, and it's
@@ -54,12 +52,8 @@ public class JitsiMeetOngoingConferenceService extends Service
 
     private boolean isAudioMuted;
 
-    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
-
-
     public static void launch(Context context, HashMap<String, Object> extraData) {
-        
-        NotificationUtils.createNotificationChannel((Activity) context);
+        OngoingNotification.createOngoingConferenceNotificationChannel();
 
         Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);
 
@@ -96,15 +90,15 @@ public class JitsiMeetOngoingConferenceService extends Service
     public void onCreate() {
         super.onCreate();
 
-        Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, this);
+        Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
         if (notification == null) {
             stopSelf();
             JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
         } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
+                startForeground(OngoingNotification.NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
             } else {
-                startForeground(NOTIFICATION_ID, notification);
+                startForeground(OngoingNotification.NOTIFICATION_ID, notification);
             }
         }
 
@@ -136,13 +130,13 @@ public class JitsiMeetOngoingConferenceService extends Service
         if (isAudioMuted != null) {
             this.isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
 
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, this);
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
             if (notification == null) {
                 stopSelf();
                 JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
             } else {
                 NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+                notificationManager.notify(OngoingNotification.NOTIFICATION_ID, notification);
             }
         }
 
@@ -222,13 +216,13 @@ public class JitsiMeetOngoingConferenceService extends Service
         @Override
         public void onReceive(Context context, Intent intent) {
             isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, context);
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted);
             if (notification == null) {
                 stopSelf();
                 JitsiMeetLogger.w(TAG + " Couldn't update service, notification is null");
             } else {
                 NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+                notificationManager.notify(OngoingNotification.NOTIFICATION_ID, notification);
 
                 JitsiMeetLogger.i(TAG + " audio muted changed");
             }

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

@@ -1,58 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import static org.jitsi.meet.sdk.NotificationUtils.ONGOING_CONFERENCE_CHANNEL_ID;
-
-import android.app.Notification;
-import android.content.Context;
-
-import androidx.core.app.NotificationCompat;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-/**
- * Helper class for creating the media projection notification which is used with
- * {@link JitsiMeetMediaProjectionService}.
- */
-class MediaProjectionNotification {
-    private static final String TAG = MediaProjectionNotification.class.getSimpleName();
-
-    static Notification buildMediaProjectionNotification(Context context) {
-
-        if (context == null) {
-            JitsiMeetLogger.d(TAG, " Cannot create notification: no current context");
-            return null;
-        }
-
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, ONGOING_CONFERENCE_CHANNEL_ID);
-
-        builder
-            .setCategory(NotificationCompat.CATEGORY_CALL)
-            .setContentTitle(context.getString(R.string.media_projection_notification_title))
-            .setContentText(context.getString(R.string.media_projection_notification_text))
-            .setPriority(NotificationCompat.PRIORITY_LOW)
-            .setOngoing(false)
-            .setUsesChronometer(false)
-            .setAutoCancel(true)
-            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-            .setOnlyAlertOnce(true)
-            .setSmallIcon(context.getResources().getIdentifier("ic_notification", "drawable", context.getPackageName()));
-
-        return builder.build();
-    }
-}

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

@@ -0,0 +1,10 @@
+package org.jitsi.meet.sdk;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NotificationChannels {
+    static final String ONGOING_CONFERENCE_CHANNEL_ID = "JitsiOngoingConferenceChannel";
+
+    public static List<String> allIds = new ArrayList<String>() {{ add(ONGOING_CONFERENCE_CHANNEL_ID); }};
+}

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

@@ -1,50 +0,0 @@
-package org.jitsi.meet.sdk;
-
-import android.app.Activity;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.os.Build;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class NotificationUtils {
-
-    static final String ONGOING_CONFERENCE_CHANNEL_ID = "JitsiOngoingConferenceChannel";
-
-    public static List<String> allIds = new ArrayList<String>() {{ add(ONGOING_CONFERENCE_CHANNEL_ID); }};
-
-    private static final String TAG = NotificationUtils.class.getSimpleName();
-
-    static void createNotificationChannel(Activity context) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
-        if (context == null) {
-            JitsiMeetLogger.w(TAG + " Cannot create notification channel: no current context");
-            return;
-        }
-
-        NotificationManager notificationManager
-            = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        NotificationChannel channel
-            = notificationManager.getNotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID);
-
-        if (channel != null) {
-            // The channel was already created, no need to do it again.
-            return;
-        }
-
-        channel = new NotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID, context.getString(R.string.ongoing_notification_channel_name), NotificationManager.IMPORTANCE_DEFAULT);
-        channel.enableLights(false);
-        channel.enableVibration(false);
-        channel.setShowBadge(false);
-
-        notificationManager.createNotificationChannel(channel);
-    }
-}

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

@@ -16,18 +16,23 @@
 
 package org.jitsi.meet.sdk;
 
-import static org.jitsi.meet.sdk.NotificationUtils.ONGOING_CONFERENCE_CHANNEL_ID;
+import static org.jitsi.meet.sdk.NotificationChannels.ONGOING_CONFERENCE_CHANNEL_ID;
 
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
+import java.util.Random;
+
 /**
  * Helper class for creating the ongoing notification which is used with
  * {@link JitsiMeetOngoingConferenceService}. It allows the user to easily get back to the app
@@ -36,10 +41,40 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 class OngoingNotification {
     private static final String TAG = OngoingNotification.class.getSimpleName();
 
+    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;
     private static long startingTime = 0;
 
-    static Notification buildOngoingConferenceNotification(Boolean isMuted, Context context) {
+    static void createOngoingConferenceNotificationChannel() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
 
+        Context context = ReactInstanceManagerHolder.getCurrentActivity();
+        if (context == null) {
+            JitsiMeetLogger.w(TAG + " Cannot create notification channel: no current context");
+            return;
+        }
+
+        NotificationManager notificationManager
+            = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        NotificationChannel channel
+            = notificationManager.getNotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID);
+        if (channel != null) {
+            // The channel was already created, no need to do it again.
+            return;
+        }
+
+        channel = new NotificationChannel(ONGOING_CONFERENCE_CHANNEL_ID, context.getString(R.string.ongoing_notification_action_unmute), NotificationManager.IMPORTANCE_DEFAULT);
+        channel.enableLights(false);
+        channel.enableVibration(false);
+        channel.setShowBadge(false);
+
+        notificationManager.createNotificationChannel(channel);
+    }
+
+    static Notification buildOngoingConferenceNotification(Boolean isMuted) {
+        Context context = ReactInstanceManagerHolder.getCurrentActivity();
         if (context == null) {
             JitsiMeetLogger.w(TAG + " Cannot create notification: no current context");
             return null;
@@ -57,7 +92,7 @@ class OngoingNotification {
         builder
             .setCategory(NotificationCompat.CATEGORY_CALL)
             .setContentTitle(context.getString(R.string.ongoing_notification_title))
-            .setContentText(context.getString(R.string.ongoing_notification_text))
+            .setContentText(isMuted != null ? context.getString(R.string.ongoing_notification_text) : context.getString(R.string.ongoing_notification_action_screenshare))
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setContentIntent(pendingIntent)
             .setOngoing(true)
@@ -68,6 +103,10 @@ class OngoingNotification {
             .setOnlyAlertOnce(true)
             .setSmallIcon(context.getResources().getIdentifier("ic_notification", "drawable", context.getPackageName()));
 
+        if (isMuted == null) {
+            return builder.build();
+        }
+
         NotificationCompat.Action hangupAction = createAction(context, JitsiMeetOngoingConferenceService.Action.HANGUP, R.string.ongoing_notification_action_hang_up);
 
         JitsiMeetOngoingConferenceService.Action toggleAudioAction = isMuted

android/sdk/src/main/res/values/strings.xml

@@ -1,12 +1,11 @@
 <resources>
     <string name="app_name">Jitsi Meet SDK</string>
     <string name="dropbox_app_key"></string>
-    <string name="media_projection_notification_title">Media projection</string>
-    <string name="media_projection_notification_text">You are currently sharing your screen.</string>
     <string name="ongoing_notification_title">Ongoing meeting</string>
     <string name="ongoing_notification_text">You are currently in a meeting. Tap to return to it.</string>
     <string name="ongoing_notification_action_hang_up">Hang up</string>
     <string name="ongoing_notification_action_mute">Mute</string>
+    <string name="ongoing_notification_action_screenshare">You are currently screen-sharing. Tap to return to the meeting.</string>
     <string name="ongoing_notification_action_unmute">Unmute</string>
     <string name="ongoing_notification_channel_name">Ongoing Conference Notifications</string>
 </resources>

conference.js

@@ -38,7 +38,6 @@ import {
     dataChannelClosed,
     dataChannelOpened,
     e2eRttChanged,
-    endpointMessageReceived,
     kickedOut,
     lockStateChanged,
     nonParticipantMessageReceived,
@@ -163,6 +162,7 @@ import { isScreenAudioShared } from './react/features/screen-share/functions';
 import { toggleScreenshotCaptureSummary } from './react/features/screenshot-capture/actions';
 import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
 import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise';
+import { endpointMessageReceived } from './react/features/subtitles/actions.any';
 import { handleToggleVideoMuted } from './react/features/toolbox/actions.any';
 import { muteLocal } from './react/features/video-menu/actions.any';
 import { iAmVisitor } from './react/features/visitors/functions';
@@ -1824,24 +1824,28 @@ export default {
 
         room.on(
             JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
-            (participant, data) => {
-                APP.store.dispatch(endpointMessageReceived(participant, data));
-                if (data?.name === ENDPOINT_TEXT_MESSAGE_NAME) {
-                    APP.API.notifyEndpointTextMessageReceived({
-                        senderInfo: {
-                            jid: participant.getJid(),
-                            id: participant.getId()
-                        },
-                        eventData: data
-                    });
+            (...args) => {
+                APP.store.dispatch(endpointMessageReceived(...args));
+                if (args && args.length >= 2) {
+                    const [ sender, eventData ] = args;
+
+                    if (eventData.name === ENDPOINT_TEXT_MESSAGE_NAME) {
+                        APP.API.notifyEndpointTextMessageReceived({
+                            senderInfo: {
+                                jid: sender._jid,
+                                id: sender._id
+                            },
+                            eventData
+                        });
+                    }
                 }
             });
 
         room.on(
             JitsiConferenceEvents.NON_PARTICIPANT_MESSAGE_RECEIVED,
-            (id, data) => {
-                APP.store.dispatch(nonParticipantMessageReceived(id, data));
-                APP.API.notifyNonParticipantMessageReceived(id, data);
+            (...args) => {
+                APP.store.dispatch(nonParticipantMessageReceived(...args));
+                APP.API.notifyNonParticipantMessageReceived(...args);
             });
 
         room.on(

config.js

@@ -85,7 +85,7 @@ var config = {
         // disableE2EE: false,
 
         // Enables supports for AV1 codec.
-        // enableAv1Support: false,
+        // enableAv1: false,
 
         // Enables XMPP WebSocket (as opposed to BOSH) for the given amount of users.
         // mobileXmppWsThreshold: 10, // enable XMPP WebSockets on mobile for 10% of the users
@@ -103,9 +103,6 @@ var config = {
 
         // Experiment: Whether to skip interim transcriptions.
         // skipInterimTranscriptions: false,
-
-        // Dump transcripts to a <transcript> element for debugging.
-        // dumpTranscript: false,
     },
 
     // Disables moderator indicators.
@@ -332,9 +329,6 @@ var config = {
     //    // If true, shows a notification at the start of the meeting with a call to action button
     //    // to start recording (for users who can do so).
     //    // suggestRecording: true,
-    //    // If true, shows a warning label in the prejoin screen to point out the possibility that
-    //    // the call you're joining might be recorded.
-    //    // showPrejoinWarning: true,
     // },
 
     // recordingService: {
@@ -426,6 +420,9 @@ var config = {
     //     // ./src/react/features/transcribing/transcriber-langs.json.
     //     preferredLanguage: 'en-US',
 
+    //     // Disable start transcription for all participants.
+    //     disableStartForAll: false,
+
     //     // Enables automatic turning on transcribing when recording is started
     //     autoTranscribeOnRecord: false,
     // },
@@ -723,7 +720,7 @@ var config = {
     // Configs for prejoin page.
     // prejoinConfig: {
     //     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
-    //     // This replaces `prejoinPageEnabled`. Defaults to true.
+    //     // This replaces `prejoinPageEnabled`.
     //     enabled: true,
     //     // Hides the participant name editing field in the prejoin screen.
     //     // If requireDisplayName is also set as true, a name should still be provided through
@@ -1211,12 +1208,6 @@ var config = {
     //     desktop: {
     //         appName: 'Jitsi Meet',
     //         appScheme: 'jitsi-meet,
-    //         download: {
-    //             linux:
-    //               'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet-x86_64.AppImage',
-    //             macos: 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet.dmg',
-    //             windows: 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet.exe'
-    //         },
     //         enabled: false
     //     },
     //     // If true, any checks to handoff to another application will be prevented
@@ -1439,6 +1430,7 @@ var config = {
     //         'conference-timer',
     //         'participants-count',
     //         'e2ee',
+    //         'transcribing',
     //         'video-quality',
     //         'insecure-room',
     //         'highlight-moment',

css/_reactions-menu.scss

@@ -104,7 +104,7 @@
 	}
 }
 
-.reactions-animations-overflow-container {
+.reactions-animations-container {
 	position: absolute;
 	width: 20%;
 	bottom: 0;
@@ -117,13 +117,6 @@
 	position: relative;
 }
 
-.reactions-animations-container {
-	left: 50%;
-	bottom: 0px;
-	display: inline-block;
-	position: absolute;
-}
-
 $reactionCount: 20;
 
 @function random($min, $max) {

css/_subject.scss

@@ -41,6 +41,7 @@
     position: absolute;
     top: 0;
     height: 48px;
+    max-width: calc(100% - 24px);
 }
 
 @keyframes hideSubject {

css/main.scss

@@ -36,7 +36,6 @@ $flagsImagePath: "../images/";
 @import 'modals/invite/info';
 @import 'modals/screen-share/share-audio';
 @import 'modals/screen-share/share-screen-warning';
-@import 'modals/whiteboard';
 @import 'videolayout_default';
 @import 'subject';
 @import 'popup_menu';

css/modals/_whiteboard.scss

@@ -1,7 +0,0 @@
-.whiteboard {
-
-    .excalidraw-wrapper {
-        height: 100vh;
-        width: 100vw;
-    }
-}

doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

@@ -51,6 +51,7 @@ VirtualHost "jitmeet.example.com"
     }
     av_moderation_component = "avmoderation.jitmeet.example.com"
     speakerstats_component = "speakerstats.jitmeet.example.com"
+    conference_duration_component = "conferenceduration.jitmeet.example.com"
     end_conference_component = "endconference.jitmeet.example.com"
     -- we need bosh
     modules_enabled = {
@@ -129,6 +130,9 @@ Component "focus.jitmeet.example.com" "client_proxy"
 Component "speakerstats.jitmeet.example.com" "speakerstats_component"
     muc_component = "conference.jitmeet.example.com"
 
+Component "conferenceduration.jitmeet.example.com" "conference_duration_component"
+    muc_component = "conference.jitmeet.example.com"
+
 Component "endconference.jitmeet.example.com" "end_conference"
     muc_component = "conference.jitmeet.example.com"
 

globals.d.ts

@@ -21,7 +21,6 @@ declare global {
         JitsiMeetElectron?: any;
         PressureObserver?: any;
         PressureRecord?: any;
-        ReactNativeWebView?: any;
         // selenium tests handler
         _sharedVideoPlayer: any;
         alwaysOnTop: { api: any };

globals.native.d.ts

@@ -19,9 +19,6 @@ interface IWindow {
     location: ILocation;
     PressureObserver?: any;
     PressureRecord?: any;
-    ReactNativeWebView?: any;
-    TextDecoder?: any;
-    TextEncoder?: any;
     self: any;
     top: any;
 

ios/Podfile.lock

@@ -827,7 +827,7 @@ SPEC CHECKSUMS:
   Amplitude: 834c7332dfb9640a751e21c13efb22a07c0c12d4
   amplitude-react-native: 0ed8cab759aafaa94961b82122bf56297da607ad
   AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570
-  boost: 7dcd2de282d72e344012f7d6564d024930a6a440
+  boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: dc178b8748748c036ef9493a5d59d6d1f91a36ce
@@ -842,7 +842,7 @@ SPEC CHECKSUMS:
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   Giphy: 6b5f6986c8df4f71e01a8ef86595f426b3439fb5
   giphy-react-native-sdk: fcda9639f8ca2cc47e0517b6ef11c19359db5f5a
-  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
   GoogleAppMeasurement: 4c19f031220c72464d460c9daa1fb5d1acce958e
   GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
   GoogleSignIn: b232380cf495a429b8095d3178a8d5855b42e842
@@ -855,7 +855,7 @@ SPEC CHECKSUMS:
   ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
-  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
+  RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
   RCTRequired: f30c3213569b1dc43659ecc549a6536e1e11139e
   RCTTypeSafety: e1ed3137728804fa98bce30b70e3da0b8e23054e
   React: 54070abee263d5773486987f1cf3a3616710ed52
@@ -916,4 +916,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ec00682c7062a323dff24a3c3643ca0bbb420d01
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.12.1

ios/app/app.xcodeproj/project.pbxproj

@@ -1031,7 +1031,8 @@
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
-					" ",
+					"-Wl",
+					"-ld_classic",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -1094,7 +1095,8 @@
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
-					" ",
+					"-Wl",
+					"-ld_classic",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -781,7 +781,8 @@
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
-					" ",
+					"-Wl",
+					"-ld_classic",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -847,7 +848,8 @@
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
-					" ",
+					"-Wl",
+					"-ld_classic",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;

lang/main-de.json

@@ -209,7 +209,7 @@
         "appNotInstalled": "Sie benötigen die „{{app}}“-App, um der Konferenz auf dem Smartphone beizutreten.",
         "description": "Nichts passiert? Wir haben versucht, die Konferenz in {{app}} zu öffnen. Versuchen Sie es erneut oder treten Sie der Konferenz in {{app}} im Web bei.",
         "descriptionNew": "Nichts passiert? Wir haben versucht, die Konferenz in {{app}} zu öffnen. <br /><br /> Versuchen Sie es erneut oder treten Sie der Konferenz im Web bei.",
-        "descriptionWithoutWeb": "Ist nichts passiert? Wir haben versucht, Ihre Konferenz in der „{{app}}“-Desktop-App zu starten.",
+        "descriptionWithoutWeb": "Ist nichts passiert? Wir haben versucht, Ihre Besprechung in der „{{app}}“-Desktop-App zu starten.",
         "downloadApp": "App herunterladen",
         "downloadMobileApp": "Aus dem App Store herunterladen",
         "ifDoNotHaveApp": "Wenn Sie die App noch nicht haben:",
@@ -219,13 +219,11 @@
         "joinInBrowser": "Im Browser",
         "launchMeetingLabel": "Wie möchten Sie an der Konferenz teilnehmen?",
         "launchWebButton": "Im Web öffnen",
-        "noDesktopApp": "Sie haben die App noch nicht installiert?",
         "noMobileApp": "Sie haben die App noch nicht installiert?",
-        "or": "oder",
         "termsAndConditions": "Indem Sie fortfahren, stimmen Sie unseren <a href='{{termsAndConditionsLink}}' rel='noopener noreferrer' target='_blank'>Nutzungsbedingungen</a> zu.",
         "title": "Die Konferenz wird in {{app}} geöffnet …",
         "titleNew": "Konferenz starten ...",
-        "tryAgainButton": "Erneut versuchen",
+        "tryAgainButton": "Erneut mit der nativen Applikation versuchen",
         "unsupportedBrowser": "Sie verwenden einen Browser, der noch nicht unterstützt wird."
     },
     "defaultLink": "Bsp.: {{url}}",
@@ -536,7 +534,7 @@
         "conferenceURL": "Link:",
         "copyNumber": "Nummer kopieren",
         "country": "Land",
-        "dialANumber": "Um an der Konferenz teilzunehmen, müssen Sie eine dieser Nummern wählen und dann die PIN eingeben.",
+        "dialANumber": "Um am Meeting teilzunehmen, müssen Sie eine dieser Nummern wählen und dann die PIN eingeben.",
         "dialInConferenceID": "PIN:",
         "dialInNotSupported": "Entschuldigung, leider wird das Einwählen derzeit nicht unterstützt.",
         "dialInNumber": "Einwählen:",

lang/main-lv.json

@@ -219,9 +219,7 @@
         "joinInBrowser": "Pievienojieties pārlūkā",
         "launchMeetingLabel": "Kā vēlaties pievienoties šai sapulcei?",
         "launchWebButton": "Palaist tīmekļa pārlūkā",
-        "noDesktopApp": "Vai jums nav lietotnes?",
         "noMobileApp": "Vai jums nav lietotnes?",
-        "or": "vai",
         "termsAndConditions": "Turpinot jūs piekrītat mūsu <a href='{{termsAndConditionsLink}}' rel='noopener noreferrer' target='_blank'>pakalpojumu sniegšanas noteikumiem.</a>",
         "title": "Notiek jūsu sapulces palaišana lietotnē {{app}}...",
         "titleNew": "Notiek jūsu sapulces palaišana ...",
@@ -839,7 +837,6 @@
         "headings": {
             "lobby": "Vestibils ({{count}})",
             "participantsList": "Sapulces dalībnieki ({{count}})",
-            "visitorRequests": " (pieprasījumi {{count}})",
             "visitors": "Apmeklētāji ({{count}})",
             "waitingLobby": "Gaida vestibilā ({{count}})"
         },
@@ -1000,6 +997,7 @@
         "limitNotificationDescriptionNative": "Lielā pieprasījuma dēļ jūsu ieraksts tiks ierobežots līdz {{limit}} min. Lai iegūtu neierobežotu ierakstu skaitu, izmēģiniet <3>{{app}}</3>.",
         "limitNotificationDescriptionWeb": "Lielā pieprasījuma dēļ jūsu ieraksts tiks ierobežots līdz {{limit}} min. Lai iegūtu neierobežotu ierakstu skaitu, izmēģiniet <a href={{url}} rel='noopener noreferrer' target='_blank'>{{app}}</a>.",
         "linkGenerated": "Mēs esam izveidojuši saiti uz jūsu ierakstu.",
+        "live": "ĒTERĀ",
         "localRecordingNoNotificationWarning": "Ieraksts netiks izziņots citiem dalībniekiem. Jums būs jāpaziņo viņiem, ka sapulce tiek ierakstīta.",
         "localRecordingNoVideo": "Video netiek ierakstīts",
         "localRecordingStartWarning": "Pirms iziešanas no sapulces, lūdzu, apturiet ierakstīšanu, lai to saglabātu.",
@@ -1016,16 +1014,14 @@
         "onBy": "{{name}} ieslēdza ierakstu",
         "onlyRecordSelf": "Ierakstīt tikai manas audio un video straumes",
         "pending": "Gatavojas ierakstīt sapulci...",
-        "recordAudioAndVideo": "Ierakstīt audio un video",
-        "recordTranscription": "Ierakstīt transkripciju",
+        "rec": "Notiek ieraksts",
         "saveLocalRecording": "Ieraksta faila saglabāšana lokāli (beta)",
         "serviceDescription": "Jūsu ierakstu saglabās attiecīgais pakalpojums",
-        "serviceDescriptionCloud": "Ierakstīšana mākonī",
+        "serviceDescriptionCloud": "Mākoņa ierakstīšana",
         "serviceDescriptionCloudInfo": "Ierakstītās sapulces tiek automātiski dzēstas 24 stundas pēc to ierakstīšanas laika.",
         "serviceName": "Ieraksta pakalpojums",
         "sessionAlreadyActive": "Šī sesija jau tiek ierakstīta vai straumēta tiešraidē.",
-        "showAdvancedOptions": "Papildus iespējas",
-        "signIn": "Pierakstīties",
+        "signIn": "Ierakstīties",
         "signOut": "Izrakstīties",
         "surfaceError": "Lūdzu, izvēlieties pašreizējo cilni.",
         "title": "Ieraksts",
@@ -1355,9 +1351,12 @@
     },
     "transcribing": {
         "ccButtonTooltip": "Iesl./izsl. subtitrus",
-        "expandedLabel": "Transkripcija ir ieslēgta",
+        "error": "Transkripcijas kļūme. Lūdzu, mēģiniet vēlāk.",
+        "expandedLabel": "Transkripcija ieslēgta",
         "failedToStart": "Neizdevās sākt transkripciju",
-        "labelToolTip": "Notiek sapulces transkripcija",
+        "labelToolTip": "Notiek sapulces transkripcija.",
+        "off": "Transkripcija izslēgta",
+        "pending": "Gatavojas veikt sapulces transkripciju...",
         "sourceLanguageDesc": "Pašlaik sapulces valoda ir iestatīta uz <b>{{sourceLanguage}}</b>. <br/> Varat to mainīt no ",
         "sourceLanguageHere": "šeit",
         "start": "Iesl. subtitru rādīšanu",

lang/main-tr.json

@@ -222,7 +222,6 @@
         "Share": "Paylaş",
         "Submit": "Gönder",
         "WaitForHostMsg": "Toplantısı henüz başlamadı. Toplantı sahibi sizseniz, lütfen kimlik doğrulaması yapın. Değilseniz lütfen toplantı sahibinin gelmesini bekleyin.",
-        "WaitingForHostButton": "Toplantı sahibini bekle",
         "WaitingForHostTitle": "Toplantı sahibi bekleniyor ...",
         "Yes": "Evet",
         "accessibilityLabel": {

lang/main.json

@@ -219,9 +219,7 @@
         "joinInBrowser": "Join in browser",
         "launchMeetingLabel": "How do you want to join this meeting?",
         "launchWebButton": "Launch in web",
-        "noDesktopApp": "You don’t have the app?",
         "noMobileApp": "You don’t have the app?",
-        "or": "OR",
         "termsAndConditions": "By continuing you agree to our <a href='{{termsAndConditionsLink}}' rel='noopener noreferrer' target='_blank'>terms & conditions.</a>",
         "title": "Launching your meeting in {{app}}...",
         "titleNew": "Launching your meeting ...",
@@ -560,7 +558,6 @@
         "noNumbers": "No dial-in numbers.",
         "noPassword": "None",
         "noRoom": "No room was specified to dial-in into.",
-        "noWhiteboard": "Could not load the whiteboard.",
         "numbers": "Dial-in Numbers",
         "password": "$t(lockRoomPasswordUppercase): ",
         "reachedLimit": "You have reached the limit of your plan.",
@@ -568,8 +565,7 @@
         "sipAudioOnly": "SIP audio only address",
         "title": "Share",
         "tooltip": "Share link and dial-in info for this meeting",
-        "upgradeOptions": "Please check the upgrade options on",
-        "whiteboardError": "Error loading the whiteboard. Please try again later."
+        "upgradeOptions": "Please check the upgrade options on"
     },
     "inlineDialogFailure": {
         "msg": "We stumbled a bit.",
@@ -619,7 +615,7 @@
         "errorAPI": "An error occurred while accessing your YouTube broadcasts. Please try logging in again.",
         "errorLiveStreamNotEnabled": "Live Streaming is not enabled on {{email}}. Please enable live streaming or log into an account with live streaming enabled.",
         "expandedOff": "The live streaming has stopped",
-        "expandedOn": "The meeting is currently being live streamed",
+        "expandedOn": "The meeting is currently being streamed to YouTube.",
         "expandedPending": "The live streaming is being started...",
         "failedToStart": "Live Streaming failed to start",
         "getStreamKeyManually": "We weren’t able to fetch any live streams. Try getting your live stream key from YouTube.",
@@ -939,7 +935,6 @@
         "or": "or",
         "premeeting": "Pre meeting",
         "proceedAnyway": "Proceed anyway",
-        "recordingWarning": "Other participants may be recording this call",
         "screenSharingError": "Screen sharing error:",
         "showScreen": "Enable pre meeting screen",
         "startWithPhone": "Start with phone audio",
@@ -993,7 +988,7 @@
         "error": "Recording failed. Please try again.",
         "errorFetchingLink": "Error fetching recording link.",
         "expandedOff": "Recording has stopped",
-        "expandedOn": "The meeting is currently being recorded",
+        "expandedOn": "The meeting is currently being recorded.",
         "expandedPending": "Recording is being started...",
         "failedToStart": "Recording failed to start",
         "fileSharingdescription": "Share the recording link with the meeting participants",
@@ -1361,9 +1356,13 @@
     },
     "transcribing": {
         "ccButtonTooltip": "Start / Stop subtitles",
+        "error": "Transcribing failed. Please try again.",
         "expandedLabel": "Transcribing is currently on",
         "failedToStart": "Transcribing failed to start",
         "labelToolTip": "The meeting is being transcribed",
+        "off": "Transcribing stopped",
+        "on": "Transcribing started",
+        "pending": "Preparing to transcribe the meeting...",
         "sourceLanguageDesc": "Currently the meeting language is set to <b>{{sourceLanguage}}</b>. <br/> You can change it from ",
         "sourceLanguageHere": "here",
         "start": "Start showing subtitles",
@@ -1533,7 +1532,6 @@
     "whiteboard": {
         "accessibilityLabel": {
             "heading": "Whiteboard"
-        },
-        "screenTitle": "Whiteboard"
+        }
     }
 }

modules/API/API.js

@@ -113,7 +113,7 @@ import { isAudioMuteButtonDisabled } from '../../react/features/toolbox/function
 import { setTileView, toggleTileView } from '../../react/features/video-layout/actions.any';
 import { muteAllParticipants } from '../../react/features/video-menu/actions';
 import { setVideoQuality } from '../../react/features/video-quality/actions';
-import { toggleWhiteboard } from '../../react/features/whiteboard/actions.web';
+import { toggleWhiteboard } from '../../react/features/whiteboard/actions.any';
 import { getJitsiMeetTransport } from '../transport';
 
 import {

modules/UI/videolayout/LargeVideoManager.js

@@ -229,9 +229,6 @@ export default class LargeVideoManager {
 
         preUpdate.then(() => {
             const { id, stream, videoType, resolve } = this.newStreamData;
-
-            this.newStreamData = null;
-
             const state = APP.store.getState();
             const shouldHideSelfView = getHideSelfView(state);
             const localId = getLocalParticipant(state)?.id;
@@ -242,6 +239,8 @@ export default class LargeVideoManager {
             // the video container type (Etherpad, SharedVideo, VideoContainer).
             const isVideoContainer = LargeVideoManager.isVideoContainer(videoType);
 
+            this.newStreamData = null;
+
             logger.debug(`Scheduled large video update for ${id}`);
             this.state = videoType;
             // eslint-disable-next-line no-shadow
@@ -288,6 +287,10 @@ export default class LargeVideoManager {
                     || streamingStatusActive
                 );
 
+            this.videoTrack?.jitsiTrack?.getVideoType() === VIDEO_TYPE.DESKTOP
+                && logger.debug(`Remote track ${videoTrack?.jitsiTrack}, isVideoMuted=${isVideoMuted},`
+                + ` streamingStatusActive=${streamingStatusActive}, isVideoRenderable=${isVideoRenderable}`);
+
             const isAudioOnly = APP.conference.isAudioOnly();
 
             // Multi-stream is not supported on plan-b endpoints even if its is enabled via config.js. A virtual
@@ -300,10 +303,6 @@ export default class LargeVideoManager {
                 = isVideoContainer
                     && ((isAudioOnly && videoType !== VIDEO_TYPE.DESKTOP) || !isVideoRenderable || legacyScreenshare);
 
-            logger.debug(`scheduleLargeVideoUpdate: Remote track ${videoTrack?.jitsiTrack}, isVideoMuted=${
-                isVideoMuted}, streamingStatusActive=${streamingStatusActive}, isVideoRenderable=${
-                isVideoRenderable}, showAvatar=${showAvatar}`);
-
             let promise;
 
             // do not show stream if video is muted

modules/UI/videolayout/VideoContainer.js

@@ -26,13 +26,6 @@ const FADE_DURATION_MS = 300;
 
 const logger = Logger.getLogger(__filename);
 
-/**
- * List of container events that we are going to process for the large video.
- *
- * NOTE: Currently used only for logging for debug purposes.
- */
-const containerEvents = [ 'abort', 'canplaythrough', 'ended', 'error', 'stalled', 'suspend', 'waiting' ];
-
 /**
  * Returns an array of the video dimensions, so that it keeps it's aspect
  * ratio and fits available area with it's larger dimension. This method
@@ -249,18 +242,11 @@ export class VideoContainer extends LargeContainer {
         this.wrapperParent = document.getElementById('largeVideoElementsContainer');
         this.avatarHeight = document.getElementById('dominantSpeakerAvatarContainer').getBoundingClientRect().height;
         this.video.onplaying = function(event) {
-            logger.debug('Large video is playing!');
             if (typeof resizeContainer === 'function') {
                 resizeContainer(event);
             }
         };
 
-        containerEvents.forEach(event => {
-            this.video.addEventListener(event, () => {
-                logger.debug(`${event} handler was called for the large video.`);
-            });
-        });
-
         /**
          * A Set of functions to invoke when the video element resizes.
          *
@@ -269,7 +255,6 @@ export class VideoContainer extends LargeContainer {
         this._resizeListeners = new Set();
 
         this.video.onresize = this._onResize.bind(this);
-        this._play = this._play.bind(this);
     }
 
     /**
@@ -470,30 +455,6 @@ export class VideoContainer extends LargeContainer {
         this._resizeListeners.delete(callback);
     }
 
-    /**
-     * Plays the large video element.
-     *
-     * @param {number} retries - Number of retries to play the large video if play fails.
-     * @returns {void}
-     */
-    _play(retries = 0) {
-        this.video.play()
-            .then(() => {
-                logger.debug(`Successfully played large video after ${retries + 1} retries!`);
-            })
-            .catch(e => {
-                if (retries < 3) {
-                    logger.debug(`Error while trying to playing the large video. Will retry after 1s. Retries: ${
-                        retries}. Error: ${e}`);
-                    window.setTimeout(() => {
-                        this._play(retries + 1);
-                    }, 1000);
-                } else {
-                    logger.error(`Error while trying to playing the large video after 3 retries: ${e}`);
-                }
-            });
-    }
-
     /**
      * Update video stream.
      * @param {string} userID
@@ -503,8 +464,6 @@ export class VideoContainer extends LargeContainer {
     setStream(userID, stream, videoType) {
         this.userId = userID;
         if (this.stream === stream && !stream?.forceStreamToReattach) {
-            logger.debug(`SetStream on the large video for user ${userID} ignored: the stream is not changed!`);
-
             // Handles the use case for the remote participants when the
             // videoType is received with delay after turning on/off the
             // desktop sharing.
@@ -529,28 +488,22 @@ export class VideoContainer extends LargeContainer {
         this.videoType = videoType;
 
         if (!stream) {
-            logger.debug('SetStream on the large video is called without a stream argument!');
-
             return;
         }
 
         if (this.video) {
-            logger.debug(`Attaching a remote track to the large video for user ${userID}`);
             stream.attach(this.video).catch(error => {
-                logger.error(`Attaching the remote track ${stream} to large video has failed with `, error);
+                logger.error(`Attaching the remote track ${stream} has failed with `, error);
             });
 
             // Ensure large video gets play() called on it when a new stream is attached to it. This is necessary in the
             // case of Safari as autoplay doesn't kick-in automatically on Safari 15 and newer versions.
-            browser.isWebKitBased() && this._play();
+            browser.isWebKitBased() && this.video.play();
 
             const flipX = stream.isLocal() && this.localFlipX && !this.isScreenSharing();
 
             this.video.style.transform = flipX ? 'scaleX(-1)' : 'none';
             this._updateBackground();
-        } else {
-            logger.debug(`SetStream on the large video won't attach a track for ${
-                userID} because no large video element was found!`);
         }
     }
 

modules/UI/videolayout/VideoLayout.js

@@ -154,8 +154,6 @@ const VideoLayout = {
 
     updateLargeVideo(id, forceUpdate, forceStreamToReattach = false) {
         if (!largeVideo) {
-            logger.debug(`Ignoring large video update with user id ${id}: large video not initialized yet!`);
-
             return;
         }
         const currentContainer = largeVideo.getCurrentContainer();

package-lock.json

@@ -42,8 +42,7 @@
         "@vladmandic/human": "2.6.5",
         "@vladmandic/human-models": "2.5.9",
         "@xmldom/xmldom": "0.8.7",
-        "abab": "2.0.6",
-        "amplitude-js": "8.21.9",
+        "amplitude-js": "8.2.1",
         "base64-js": "1.5.1",
         "bc-css-flags": "3.0.0",
         "clipboard-copy": "4.0.1",
@@ -61,7 +60,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/v1777.0.0+3898d7aa/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#release-7762",
         "lodash": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -111,7 +110,6 @@
         "redux-thunk": "2.4.1",
         "seamless-scroll-polyfill": "2.1.8",
         "semver": "7.5.4",
-        "text-encoding": "0.7.0",
         "tss-react": "4.4.4",
         "util": "0.12.1",
         "uuid": "8.3.2",
@@ -127,7 +125,7 @@
         "@babel/preset-env": "7.21.5",
         "@babel/preset-react": "7.16.0",
         "@jitsi/eslint-config": "4.1.5",
-        "@types/amplitude-js": "8.16.5",
+        "@types/amplitude-js": "8.16.2",
         "@types/audioworklet": "0.0.29",
         "@types/dom-screen-wake-lock": "1.0.1",
         "@types/js-md5": "0.4.3",
@@ -238,11 +236,6 @@
       "extraneous": true,
       "devDependencies": {}
     },
-    "node_modules/@amplitude/analytics-connector": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.5.0.tgz",
-      "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
-    },
     "node_modules/@amplitude/react-native": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/@amplitude/react-native/-/react-native-2.7.0.tgz",
@@ -253,43 +246,38 @@
       }
     },
     "node_modules/@amplitude/types": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.10.2.tgz",
-      "integrity": "sha512-I8qenRI7uU6wKNb9LiZrAosSHVoNHziXouKY81CrqxH9xhVTEIJFXeuCV0hbtBr0Al/8ejnGjQRx+S2SvU/pPg==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.9.2.tgz",
+      "integrity": "sha512-s+Q/O8kNfocZiyGvVdtM5T4JGPwLRZ4Q26wtEF5xJhyCtJglGMe0ixe6u/6iW9s4JHIq+LlPlUu5095pVsdtNA==",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/@amplitude/ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-wKEtVR4vXuPT9cVEIJkYWnlF++Gx3BdLatPBM+SZ1ztVIvnhdGBZR/mn9x/PzyrMcRlZmyi6L56I2J3doVBnjA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        }
-      ],
+      "version": "0.7.24",
+      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.24.tgz",
+      "integrity": "sha512-VbQuJymJ20WEw0HtI2np7EdC3NJGUWi8+Xdbc7uk8WfMIF308T0howpzkQ3JFMN7ejnrcSM/OyNGveeE3TP3TA==",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/@amplitude/utils": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.10.2.tgz",
-      "integrity": "sha512-tVsHXu61jITEtRjB7NugQ5cVDd4QDzne8T3ifmZye7TiJeUfVRvqe44gDtf55A+7VqhDhyEIIXTA1iVcDGqlEw==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.9.2.tgz",
+      "integrity": "sha512-hGOIoIjmZ0pq/3b2gBrr17TaEarlR+qzFGu5npm76+scd/51F0eNvjd0vgV6WbJT1cxhyH/5Z8kihGWOU3vS3Q==",
       "dependencies": {
-        "@amplitude/types": "^1.10.2",
-        "tslib": "^2.0.0"
+        "@amplitude/types": "^1.9.2",
+        "tslib": "^1.9.3"
       },
       "engines": {
         "node": ">=10"
       }
     },
+    "node_modules/@amplitude/utils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
@@ -6509,9 +6497,9 @@
       }
     },
     "node_modules/@types/amplitude-js": {
-      "version": "8.16.5",
-      "resolved": "https://registry.npmjs.org/@types/amplitude-js/-/amplitude-js-8.16.5.tgz",
-      "integrity": "sha512-W73JfDpwDH4VijOGo+nVuQOqUCiqyEGGVdajU4ziWTLn27cn+QtFuFuBdlhCraIIrO52fDRO4NSOGkawtn77Jw==",
+      "version": "8.16.2",
+      "resolved": "https://registry.npmjs.org/@types/amplitude-js/-/amplitude-js-8.16.2.tgz",
+      "integrity": "sha512-a+tb/CEQOlrHRvEvAuYNOcoUy1POERANnAhfKgiTmsy0eACj3eukGP0ucA9t115QOPzVUhbnUfZqtyHp99IZyA==",
       "dev": true
     },
     "node_modules/@types/audioworklet": {
@@ -7528,8 +7516,7 @@
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "deprecated": "Use your platform's native atob() and btoa() methods instead"
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
     "node_modules/abort-controller": {
       "version": "3.0.0",
@@ -7668,62 +7655,36 @@
       }
     },
     "node_modules/amplitude-js": {
-      "version": "8.21.9",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.9.tgz",
-      "integrity": "sha512-d0jJH00wbXu7sxKtVwkdSXtVffjqdUrxuACKlnzP7jU5qt9wriXXMgHifdH5Oq+buKmyF8wKL9S02gAykysURA==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.2.1.tgz",
+      "integrity": "sha512-jp8lm/koTNRceO16RCTlQg9+gUbxip1esod+d0oApBCJYpxuABec2bLHXv/OkVYICvnUWoiz17AZLxiaX/aK4Q==",
+      "deprecated": "Excessive logging into console at default levels",
       "dependencies": {
-        "@amplitude/analytics-connector": "^1.4.6",
-        "@amplitude/ua-parser-js": "0.7.33",
-        "@amplitude/utils": "^1.10.2",
-        "@babel/runtime": "^7.21.0",
-        "blueimp-md5": "^2.19.0",
-        "query-string": "8.1.0"
-      }
-    },
-    "node_modules/amplitude-js/node_modules/decode-uri-component": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.4.1.tgz",
-      "integrity": "sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ==",
-      "engines": {
-        "node": ">=14.16"
-      }
-    },
-    "node_modules/amplitude-js/node_modules/filter-obj": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz",
-      "integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "@amplitude/ua-parser-js": "0.7.24",
+        "@amplitude/utils": "^1.0.5",
+        "blueimp-md5": "^2.10.0",
+        "query-string": "5"
       }
     },
     "node_modules/amplitude-js/node_modules/query-string": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-8.1.0.tgz",
-      "integrity": "sha512-BFQeWxJOZxZGix7y+SByG3F36dA0AbTy9o6pSmKFcFz7DAj0re9Frkty3saBn3nHo3D0oZJ/+rx3r8H8r8Jbpw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
       "dependencies": {
-        "decode-uri-component": "^0.4.1",
-        "filter-obj": "^5.1.0",
-        "split-on-first": "^3.0.0"
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
       },
       "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/amplitude-js/node_modules/split-on-first": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-3.0.0.tgz",
-      "integrity": "sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA==",
+    "node_modules/amplitude-js/node_modules/strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/anser": {
@@ -12943,8 +12904,7 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1777.0.0+3898d7aa/lib-jitsi-meet.tgz",
-      "integrity": "sha512-qs18nB89iQgiNR/UWTg/GCuEqUAIBdJRyFv9r0EaDThkQS8vHLNzYO9UQId8xZxiOGOR2kunJO84SbcivOTqbw==",
+      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#e4179d22a319df5c6e997849bcb62afcd478b595",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -18664,12 +18624,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/text-encoding": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.7.0.tgz",
-      "integrity": "sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==",
-      "deprecated": "no longer maintained"
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -20178,33 +20132,35 @@
     }
   },
   "dependencies": {
-    "@amplitude/analytics-connector": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@amplitude/analytics-connector/-/analytics-connector-1.5.0.tgz",
-      "integrity": "sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g=="
-    },
     "@amplitude/react-native": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/@amplitude/react-native/-/react-native-2.7.0.tgz",
       "integrity": "sha512-2dMxCVgRPwReHRDm9JKbL+sZGyozJlcdr5Jokv8TQR7idNxxGmm4YSYkjhGjSWkoEyGEyy+lh9kRJQL/DcUWJQ=="
     },
     "@amplitude/types": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.10.2.tgz",
-      "integrity": "sha512-I8qenRI7uU6wKNb9LiZrAosSHVoNHziXouKY81CrqxH9xhVTEIJFXeuCV0hbtBr0Al/8ejnGjQRx+S2SvU/pPg=="
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-1.9.2.tgz",
+      "integrity": "sha512-s+Q/O8kNfocZiyGvVdtM5T4JGPwLRZ4Q26wtEF5xJhyCtJglGMe0ixe6u/6iW9s4JHIq+LlPlUu5095pVsdtNA=="
     },
     "@amplitude/ua-parser-js": {
-      "version": "0.7.33",
-      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
-      "integrity": "sha512-wKEtVR4vXuPT9cVEIJkYWnlF++Gx3BdLatPBM+SZ1ztVIvnhdGBZR/mn9x/PzyrMcRlZmyi6L56I2J3doVBnjA=="
+      "version": "0.7.24",
+      "resolved": "https://registry.npmjs.org/@amplitude/ua-parser-js/-/ua-parser-js-0.7.24.tgz",
+      "integrity": "sha512-VbQuJymJ20WEw0HtI2np7EdC3NJGUWi8+Xdbc7uk8WfMIF308T0howpzkQ3JFMN7ejnrcSM/OyNGveeE3TP3TA=="
     },
     "@amplitude/utils": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.10.2.tgz",
-      "integrity": "sha512-tVsHXu61jITEtRjB7NugQ5cVDd4QDzne8T3ifmZye7TiJeUfVRvqe44gDtf55A+7VqhDhyEIIXTA1iVcDGqlEw==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@amplitude/utils/-/utils-1.9.2.tgz",
+      "integrity": "sha512-hGOIoIjmZ0pq/3b2gBrr17TaEarlR+qzFGu5npm76+scd/51F0eNvjd0vgV6WbJT1cxhyH/5Z8kihGWOU3vS3Q==",
       "requires": {
-        "@amplitude/types": "^1.10.2",
-        "tslib": "^2.0.0"
+        "@amplitude/types": "^1.9.2",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@ampproject/remapping": {
@@ -24645,9 +24601,9 @@
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
     },
     "@types/amplitude-js": {
-      "version": "8.16.5",
-      "resolved": "https://registry.npmjs.org/@types/amplitude-js/-/amplitude-js-8.16.5.tgz",
-      "integrity": "sha512-W73JfDpwDH4VijOGo+nVuQOqUCiqyEGGVdajU4ziWTLn27cn+QtFuFuBdlhCraIIrO52fDRO4NSOGkawtn77Jw==",
+      "version": "8.16.2",
+      "resolved": "https://registry.npmjs.org/@types/amplitude-js/-/amplitude-js-8.16.2.tgz",
+      "integrity": "sha512-a+tb/CEQOlrHRvEvAuYNOcoUy1POERANnAhfKgiTmsy0eACj3eukGP0ucA9t115QOPzVUhbnUfZqtyHp99IZyA==",
       "dev": true
     },
     "@types/audioworklet": {
@@ -25594,42 +25550,30 @@
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
     "amplitude-js": {
-      "version": "8.21.9",
-      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.21.9.tgz",
-      "integrity": "sha512-d0jJH00wbXu7sxKtVwkdSXtVffjqdUrxuACKlnzP7jU5qt9wriXXMgHifdH5Oq+buKmyF8wKL9S02gAykysURA==",
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/amplitude-js/-/amplitude-js-8.2.1.tgz",
+      "integrity": "sha512-jp8lm/koTNRceO16RCTlQg9+gUbxip1esod+d0oApBCJYpxuABec2bLHXv/OkVYICvnUWoiz17AZLxiaX/aK4Q==",
       "requires": {
-        "@amplitude/analytics-connector": "^1.4.6",
-        "@amplitude/ua-parser-js": "0.7.33",
-        "@amplitude/utils": "^1.10.2",
-        "@babel/runtime": "^7.21.0",
-        "blueimp-md5": "^2.19.0",
-        "query-string": "8.1.0"
+        "@amplitude/ua-parser-js": "0.7.24",
+        "@amplitude/utils": "^1.0.5",
+        "blueimp-md5": "^2.10.0",
+        "query-string": "5"
       },
       "dependencies": {
-        "decode-uri-component": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.4.1.tgz",
-          "integrity": "sha512-+8VxcR21HhTy8nOt6jf20w0c9CADrw1O8d+VZ/YzzCt4bJ3uBjw+D1q2osAB8RnpwwaeYBxy0HyKQxD5JBMuuQ=="
-        },
-        "filter-obj": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz",
-          "integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng=="
-        },
         "query-string": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/query-string/-/query-string-8.1.0.tgz",
-          "integrity": "sha512-BFQeWxJOZxZGix7y+SByG3F36dA0AbTy9o6pSmKFcFz7DAj0re9Frkty3saBn3nHo3D0oZJ/+rx3r8H8r8Jbpw==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+          "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
           "requires": {
-            "decode-uri-component": "^0.4.1",
-            "filter-obj": "^5.1.0",
-            "split-on-first": "^3.0.0"
+            "decode-uri-component": "^0.2.0",
+            "object-assign": "^4.1.0",
+            "strict-uri-encode": "^1.0.0"
           }
         },
-        "split-on-first": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-3.0.0.tgz",
-          "integrity": "sha512-qxQJTx2ryR0Dw0ITYyekNQWpz6f8dGd7vffGNflQQ3Iqj9NJ6qiZ7ELpZsJ/QBhIVAiDfXdag3+Gp8RvWa62AA=="
+        "strict-uri-encode": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+          "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
         }
       }
     },
@@ -29527,8 +29471,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1777.0.0+3898d7aa/lib-jitsi-meet.tgz",
-      "integrity": "sha512-qs18nB89iQgiNR/UWTg/GCuEqUAIBdJRyFv9r0EaDThkQS8vHLNzYO9UQId8xZxiOGOR2kunJO84SbcivOTqbw==",
+      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#e4179d22a319df5c6e997849bcb62afcd478b595",
+      "from": "lib-jitsi-meet@https://github.com/jitsi/lib-jitsi-meet#release-7762",
       "requires": {
         "@jitsi/js-utils": "2.2.1",
         "@jitsi/logger": "2.0.2",
@@ -33684,11 +33628,6 @@
         }
       }
     },
-    "text-encoding": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.7.0.tgz",
-      "integrity": "sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA=="
-    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",

package.json

@@ -48,8 +48,7 @@
     "@vladmandic/human": "2.6.5",
     "@vladmandic/human-models": "2.5.9",
     "@xmldom/xmldom": "0.8.7",
-    "abab": "2.0.6",
-    "amplitude-js": "8.21.9",
+    "amplitude-js": "8.2.1",
     "base64-js": "1.5.1",
     "bc-css-flags": "3.0.0",
     "clipboard-copy": "4.0.1",
@@ -67,7 +66,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/v1777.0.0+3898d7aa/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#release-7762",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",
@@ -117,7 +116,6 @@
     "redux-thunk": "2.4.1",
     "seamless-scroll-polyfill": "2.1.8",
     "semver": "7.5.4",
-    "text-encoding": "0.7.0",
     "tss-react": "4.4.4",
     "util": "0.12.1",
     "uuid": "8.3.2",
@@ -133,7 +131,7 @@
     "@babel/preset-env": "7.21.5",
     "@babel/preset-react": "7.16.0",
     "@jitsi/eslint-config": "4.1.5",
-    "@types/amplitude-js": "8.16.5",
+    "@types/amplitude-js": "8.16.2",
     "@types/audioworklet": "0.0.29",
     "@types/dom-screen-wake-lock": "1.0.1",
     "@types/js-md5": "0.4.3",

react/features/analytics/AnalyticsEvents.ts

@@ -328,22 +328,6 @@ export function createNetworkInfoEvent({ isOnline, networkType, details }:
     };
 }
 
-/**
- * Creates a "not allowed error" event.
- *
- * @param {string} reason - The reason for the error.
- * @returns {Object} The event in a format suitable for sending via
- * sendAnalytics.
- */
-export function createNotAllowedErrorEvent(reason: string) {
-    return {
-        action: 'not.allowed.error',
-        attributes: {
-            reason
-        }
-    };
-}
-
 /**
  * Creates an "offer/answer failure" event.
  *

react/features/analytics/handlers/AmplitudeHandler.ts

@@ -35,12 +35,6 @@ export default class AmplitudeHandler extends AbstractHandler {
             this._enabled = false;
         };
 
-        // Forces sending all events on exit (flushing) via sendBeacon
-        const onExitPage = () => {
-            // @ts-ignore
-            amplitude.getInstance().sendEvents();
-        };
-
         if (navigator.product === 'ReactNative') {
             amplitude.getInstance().init(amplitudeAPPKey);
             fixDeviceID(amplitude.getInstance()).then(() => {
@@ -56,8 +50,7 @@ export default class AmplitudeHandler extends AbstractHandler {
                 includeReferrer: true,
                 includeUtm,
                 saveParamsReferrerOncePerSession: false,
-                onError,
-                onExitPage
+                onError
             };
 
             // @ts-ignore

react/features/app/middlewares.any.ts

@@ -51,6 +51,5 @@ import '../video-layout/middleware';
 import '../video-quality/middleware';
 import '../videosipgw/middleware';
 import '../visitors/middleware';
-import '../whiteboard/middleware.any';
 
 import './middleware';

react/features/app/middlewares.native.ts

@@ -13,6 +13,5 @@ import '../mobile/react-native-sdk/middleware';
 import '../mobile/watchos/middleware';
 import '../share-room/middleware';
 import '../shared-video/middleware';
-import '../whiteboard/middleware.native';
 
 import './middlewares.any';

react/features/app/middlewares.web.ts

@@ -22,6 +22,6 @@ import '../talk-while-muted/middleware';
 import '../toolbox/middleware';
 import '../face-landmarks/middleware';
 import '../gifs/middleware';
-import '../whiteboard/middleware.web';
+import '../whiteboard/middleware';
 
 import './middlewares.any';

react/features/app/reducers.any.ts

@@ -55,4 +55,3 @@ import '../video-layout/reducer';
 import '../video-quality/reducer';
 import '../videosipgw/reducer';
 import '../visitors/reducer';
-import '../whiteboard/reducer';

react/features/app/reducers.web.ts

@@ -16,6 +16,7 @@ import '../noise-suppression/reducer';
 import '../screenshot-capture/reducer';
 import '../talk-while-muted/reducer';
 import '../virtual-background/reducer';
+import '../whiteboard/reducer';
 import '../web-hid/reducer';
 
 import './reducers.any';

react/features/base/conference/actionTypes.ts

@@ -178,18 +178,6 @@ export const DATA_CHANNEL_OPENED = 'DATA_CHANNEL_OPENED';
  */
 export const DATA_CHANNEL_CLOSED = 'DATA_CHANNEL_CLOSED';
 
-/**
- * The type of (redux) action which indicates that an endpoint message
- * sent by another participant to the data channel is received.
- *
- * {
- *     type: ENDPOINT_MESSAGE_RECEIVED,
- *     participant: Object,
- *     data: Object
- * }
- */
-export const ENDPOINT_MESSAGE_RECEIVED = 'ENDPOINT_MESSAGE_RECEIVED';
-
 /**
  * The type of action which signals that the user has been kicked out from
  * the conference.
@@ -345,13 +333,3 @@ export const SET_START_MUTED_POLICY = 'SET_START_MUTED_POLICY';
  * }
  */
 export const SET_ASSUMED_BANDWIDTH_BPS = 'SET_ASSUMED_BANDWIDTH_BPS';
-
-/**
- * The type of (redux) action which updated the conference metadata.
- *
- * {
- *     type: UPDATE_CONFERENCE_METADATA,
- *     metadata: Object
- * }
- */
-export const UPDATE_CONFERENCE_METADATA = 'UPDATE_CONFERENCE_METADATA';

react/features/base/conference/actions.ts

@@ -1,6 +1,7 @@
 import { createStartMutedConfigurationEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
 import { IReduxState, IStore } from '../../app/types';
+import { endpointMessageReceived } from '../../subtitles/actions.any';
 import { setIAmVisitor } from '../../visitors/actions';
 import { iAmVisitor } from '../../visitors/functions';
 import { overwriteConfig } from '../config/actions';
@@ -47,7 +48,6 @@ import {
     DATA_CHANNEL_CLOSED,
     DATA_CHANNEL_OPENED,
     E2E_RTT_CHANGED,
-    ENDPOINT_MESSAGE_RECEIVED,
     KICKED_OUT,
     LOCK_STATE_CHANGED,
     NON_PARTICIPANT_MESSAGE_RECEIVED,
@@ -61,8 +61,7 @@ import {
     SET_PENDING_SUBJECT_CHANGE,
     SET_ROOM,
     SET_START_MUTED_POLICY,
-    SET_START_REACTIONS_MUTED,
-    UPDATE_CONFERENCE_METADATA
+    SET_START_REACTIONS_MUTED
 } from './actionTypes';
 import {
     AVATAR_URL_COMMAND,
@@ -80,7 +79,7 @@ import {
     sendLocalParticipant
 } from './functions';
 import logger from './logger';
-import { IConferenceMetadata, IJitsiConference } from './reducer';
+import { IJitsiConference } from './reducer';
 
 /**
  * Adds conference (event) listeners.
@@ -276,21 +275,6 @@ function _addConferenceListeners(conference: IJitsiConference, dispatch: IStore[
         })));
 }
 
-/**
- * Action for updating the conference metadata.
- *
- * @param {IConferenceMetadata} metadata - The metadata object.
- * @returns {{
- *    type: UPDATE_CONFERENCE_METADATA,
- *    metadata: IConferenceMetadata
- * }}
- */
-export function updateConferenceMetadata(metadata: IConferenceMetadata | null) {
-    return {
-        type: UPDATE_CONFERENCE_METADATA,
-        metadata
-    };
-}
 
 /**
  * Create an action for when the end-to-end RTT against a specific remote participant has changed.
@@ -646,25 +630,6 @@ export function dataChannelClosed(code: number, reason: string) {
     };
 }
 
-/**
- * Signals that a participant sent an endpoint message on the data channel.
- *
- * @param {Object} participant - The participant details sending the message.
- * @param {Object} data - The data carried by the endpoint message.
- * @returns {{
-*      type: ENDPOINT_MESSAGE_RECEIVED,
-*      participant: Object,
-*      data: Object
-* }}
-*/
-export function endpointMessageReceived(participant: Object, data: Object) {
-    return {
-        type: ENDPOINT_MESSAGE_RECEIVED,
-        participant,
-        data
-    };
-}
-
 /**
  * Action to end a conference for all participants.
  *

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

@@ -6,7 +6,6 @@ import { MIN_ASSUMED_BANDWIDTH_BPS } from '../../../../modules/API/constants';
 import {
     ACTION_PINNED,
     ACTION_UNPINNED,
-    createNotAllowedErrorEvent,
     createOfferAnswerFailedEvent,
     createPinnedEvent
 } from '../../analytics/AnalyticsEvents';
@@ -26,7 +25,7 @@ import { overwriteConfig } from '../config/actions';
 import { CONNECTION_ESTABLISHED, CONNECTION_FAILED } from '../connection/actionTypes';
 import { connect, connectionDisconnected, disconnect } from '../connection/actions';
 import { validateJwt } from '../jwt/functions';
-import { JitsiConferenceErrors, JitsiConferenceEvents, JitsiConnectionErrors } from '../lib-jitsi-meet';
+import { JitsiConferenceErrors, JitsiConnectionErrors } from '../lib-jitsi-meet';
 import { PARTICIPANT_UPDATED, PIN_PARTICIPANT } from '../participants/actionTypes';
 import { PARTICIPANT_ROLE } from '../participants/constants';
 import {
@@ -35,7 +34,6 @@ import {
     getPinnedParticipant
 } from '../participants/functions';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
-import StateListenerRegistry from '../redux/StateListenerRegistry';
 import { TRACK_ADDED, TRACK_REMOVED } from '../tracks/actionTypes';
 import { getLocalTracks } from '../tracks/functions.any';
 
@@ -56,8 +54,7 @@ import {
     conferenceWillLeave,
     createConference,
     setLocalSubject,
-    setSubject,
-    updateConferenceMetadata
+    setSubject
 } from './actions';
 import { CONFERENCE_LEAVE_REASONS } from './constants';
 import {
@@ -68,7 +65,6 @@ import {
     restoreConferenceOptions
 } from './functions';
 import logger from './logger';
-import { IConferenceMetadata } from './reducer';
 
 /**
  * Handler for before unload event.
@@ -128,24 +124,6 @@ MiddlewareRegistry.register(store => next => action => {
     return next(action);
 });
 
-/**
- * Set up state change listener to perform maintenance tasks when the conference
- * is left or failed.
- */
-StateListenerRegistry.register(
-    state => getCurrentConference(state),
-    (conference, { dispatch }, previousConference): void => {
-        if (conference && !previousConference) {
-            conference.on(JitsiConferenceEvents.METADATA_UPDATED, (metadata: IConferenceMetadata) => {
-                dispatch(updateConferenceMetadata(metadata));
-            });
-        }
-
-        if (conference !== previousConference) {
-            dispatch(updateConferenceMetadata(null));
-        }
-    });
-
 /**
  * Makes sure to leave a failed conference in order to release any allocated
  * resources like peer connections, emit participant left events, etc.
@@ -219,12 +197,6 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
 
         break;
     }
-    case JitsiConferenceErrors.NOT_ALLOWED_ERROR: {
-        const [ msg ] = error.params;
-
-        sendAnalytics(createNotAllowedErrorEvent(msg));
-        break;
-    }
     case JitsiConferenceErrors.OFFER_ANSWER_FAILED:
         sendAnalytics(createOfferAnswerFailedEvent());
         break;

react/features/base/conference/reducer.ts

@@ -27,8 +27,7 @@ import {
     SET_PENDING_SUBJECT_CHANGE,
     SET_ROOM,
     SET_START_MUTED_POLICY,
-    SET_START_REACTIONS_MUTED,
-    UPDATE_CONFERENCE_METADATA
+    SET_START_REACTIONS_MUTED
 } from './actionTypes';
 import { isRoomValid } from './functions';
 
@@ -40,23 +39,10 @@ const DEFAULT_STATE = {
     leaving: undefined,
     locked: undefined,
     membersOnly: undefined,
-    metadata: undefined,
     password: undefined,
     passwordRequired: undefined
 };
 
-export interface IConferenceMetadata {
-    recording?: {
-        isTranscribingEnabled: boolean;
-    };
-    whiteboard?: {
-        collabDetails: {
-            roomId: string;
-            roomKey: string;
-        };
-    };
-}
-
 export interface IJitsiConference {
     addCommandListener: Function;
     addLobbyMessageListener: Function;
@@ -155,7 +141,6 @@ export interface IConferenceState {
     localSubject?: string;
     locked?: string;
     membersOnly?: IJitsiConference;
-    metadata?: IConferenceMetadata;
     obfuscatedRoom?: string;
     obfuscatedRoomSource?: string;
     p2p?: Object;
@@ -262,12 +247,6 @@ ReducerRegistry.register<IConferenceState>('features/base/conference',
                 startAudioMutedPolicy: action.startAudioMutedPolicy,
                 startVideoMutedPolicy: action.startVideoMutedPolicy
             };
-
-        case UPDATE_CONFERENCE_METADATA:
-            return {
-                ...state,
-                metadata: action.metadata
-            };
         }
 
         return state;

react/features/base/config/configType.ts

@@ -141,14 +141,7 @@ export interface IDeeplinkingMobileConfig extends IDeeplinkingPlatformConfig {
     fDroidUrl?: string;
 }
 
-export interface IDesktopDownloadConfig {
-    linux?: string;
-    macos?: string;
-    windows?: string;
-}
-
 export interface IDeeplinkingDesktopConfig extends IDeeplinkingPlatformConfig {
-    download?: IDesktopDownloadConfig;
     enabled: boolean;
 }
 
@@ -531,7 +524,6 @@ export interface IConfig {
     };
     recordingSharingUrl?: string;
     recordings?: {
-        showPrejoinWarning?: boolean;
         suggestRecording?: boolean;
     };
     remoteVideoMenu?: {
@@ -574,7 +566,6 @@ export interface IConfig {
     testing?: {
         assumeBandwidth?: boolean;
         disableE2EE?: boolean;
-        dumpTranscript?: boolean;
         mobileXmppWsThreshold?: number;
         noAutoPlayVideo?: boolean;
         p2pTestMode?: boolean;
@@ -599,6 +590,7 @@ export interface IConfig {
     transcribingEnabled?: boolean;
     transcription?: {
         autoTranscribeOnRecord?: boolean;
+        disableStartForAll?: boolean;
         enabled?: boolean;
         preferredLanguage?: string;
         translationLanguages?: Array<string>;

react/features/base/config/functions.web.ts

@@ -94,21 +94,14 @@ export function areAudioLevelsEnabled(state: IReduxState): boolean {
  * @returns {void}
  */
 export function _setDeeplinkingDefaults(deeplinking: IDeeplinkingConfig) {
-    deeplinking.desktop = deeplinking.desktop || {} as IDeeplinkingDesktopConfig;
-    deeplinking.android = deeplinking.android || {} as IDeeplinkingMobileConfig;
-    deeplinking.ios = deeplinking.ios || {} as IDeeplinkingMobileConfig;
-
-    const { android, desktop, ios } = deeplinking;
+    const {
+        desktop = {} as IDeeplinkingDesktopConfig,
+        android = {} as IDeeplinkingMobileConfig,
+        ios = {} as IDeeplinkingMobileConfig
+    } = deeplinking;
 
     desktop.appName = desktop.appName || 'Jitsi Meet';
     desktop.appScheme = desktop.appScheme || 'jitsi-meet';
-    desktop.download = desktop.download || {};
-    desktop.download.windows = desktop.download.windows
-        || 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet.exe';
-    desktop.download.macos = desktop.download.macos
-        || 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet.dmg';
-    desktop.download.linux = desktop.download.linux
-        || 'https://github.com/jitsi/jitsi-meet-electron/releases/latest/download/jitsi-meet-x86_64.AppImage';
 
     ios.appName = ios.appName || 'Jitsi Meet';
     ios.appScheme = ios.appScheme || 'org.jitsi.meet';

react/features/base/participants/middleware.ts

@@ -683,7 +683,7 @@ function _participantJoinedOrUpdated(store: IStore, next: Function, action: AnyA
 
     // Only run this if the config is populated, otherwise we preload external resources
     // even if disableThirdPartyRequests is set to true in config
-    if (getState()['features/base/config']?.hosts) {
+    if (Object.keys(getState()['features/base/config']).length) {
         const { disableThirdPartyRequests } = getState()['features/base/config'];
 
         if (!disableThirdPartyRequests && (avatarURL || email || id || name)) {

react/features/base/premeeting/components/web/PreMeetingScreen.tsx

@@ -5,7 +5,6 @@ import { makeStyles } from 'tss-react/mui';
 
 import { IReduxState } from '../../../../app/types';
 import DeviceStatus from '../../../../prejoin/components/web/preview/DeviceStatus';
-import { isRoomNameEnabled } from '../../../../prejoin/functions';
 import Toolbox from '../../../../toolbox/components/web/Toolbox';
 import { getConferenceName } from '../../../conference/functions';
 import { PREMEETING_BUTTONS, THIRD_PARTY_PREJOIN_BUTTONS } from '../../../config/constants';
@@ -14,7 +13,6 @@ import { withPixelLineHeight } from '../../../styles/functions.web';
 
 import ConnectionStatus from './ConnectionStatus';
 import Preview from './Preview';
-import RecordingWarning from './RecordingWarning';
 import UnsafeRoomWarning from './UnsafeRoomWarning';
 
 interface IProps {
@@ -59,11 +57,6 @@ interface IProps {
      */
     showDeviceStatus: boolean;
 
-    /**
-     * Indicates whether to display the recording warning.
-     */
-    showRecordingWarning?: boolean;
-
     /**
      * If should show unsafe room warning when joining.
      */
@@ -174,7 +167,6 @@ const PreMeetingScreen = ({
     children,
     className,
     showDeviceStatus,
-    showRecordingWarning,
     showUnsafeRoomWarning,
     skipPrejoinButton,
     title,
@@ -208,7 +200,6 @@ const PreMeetingScreen = ({
                         {skipPrejoinButton}
                         {showUnsafeRoomWarning && <UnsafeRoomWarning />}
                         {showDeviceStatus && <DeviceStatus />}
-                        {showRecordingWarning && <RecordingWarning />}
                     </div>
                 </div>
             </div>
@@ -228,7 +219,7 @@ const PreMeetingScreen = ({
  * @returns {Object}
  */
 function mapStateToProps(state: IReduxState, ownProps: Partial<IProps>) {
-    const { hiddenPremeetingButtons } = state['features/base/config'];
+    const { hiddenPremeetingButtons, hideConferenceSubject } = state['features/base/config'];
     const toolbarButtons = getToolbarButtons(state);
     const premeetingButtons = (ownProps.thirdParty
         ? THIRD_PARTY_PREJOIN_BUTTONS
@@ -246,7 +237,7 @@ function mapStateToProps(state: IReduxState, ownProps: Partial<IProps>) {
             ? premeetingButtons
             : premeetingButtons.filter(b => isToolbarButtonEnabled(b, toolbarButtons)),
         _premeetingBackground: premeetingBackground,
-        _roomName: isRoomNameEnabled(state) ? getConferenceName(state) : ''
+        _roomName: (hideConferenceSubject ? undefined : getConferenceName(state)) ?? ''
     };
 }
 

react/features/base/premeeting/components/web/RecordingWarning.tsx

@@ -1,40 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { makeStyles } from 'tss-react/mui';
-
-import { withPixelLineHeight } from '../../../styles/functions.web';
-
-const useStyles = makeStyles()(theme => {
-    return {
-        warning: {
-            bottom: 0,
-            color: theme.palette.text03,
-            display: 'flex',
-            justifyContent: 'center',
-            ...withPixelLineHeight(theme.typography.bodyShortRegular),
-            marginBottom: theme.spacing(3),
-            marginTop: theme.spacing(2),
-            paddingLeft: theme.spacing(3),
-            paddingRight: theme.spacing(3),
-            position: 'absolute',
-            width: '100%',
-
-            '@media (max-width: 720px)': {
-                position: 'relative'
-            }
-        }
-    };
-});
-
-const RecordingWarning = () => {
-    const { t } = useTranslation();
-    const { classes } = useStyles();
-
-    return (
-        <div className = { classes.warning }>
-            {t('prejoin.recordingWarning')}
-        </div>
-    );
-};
-
-export default RecordingWarning;

react/features/base/react/Platform.web.ts

@@ -10,8 +10,6 @@ if (userAgent.match(/Android/i)) {
     OS = 'macos';
 } else if (userAgent.match(/Windows/i)) {
     OS = 'windows';
-} else if (userAgent.match(/Linux/i)) {
-    OS = 'linux';
 }
 
 /**

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

@@ -33,12 +33,12 @@ export function toggleScreensharing(enabled: boolean, _ignore1?: boolean, _ignor
         if (enabled) {
             const isSharing = isLocalVideoTrackDesktop(state);
 
-            if (isSharing) {
-                Platform.OS === 'android' && JitsiMeetMediaProjectionModule.abort();
-            } else {
-                Platform.OS === 'android' && JitsiMeetMediaProjectionModule.launch();
+            if (!isSharing) {
                 _startScreenSharing(dispatch, state);
+                Platform.OS === 'android' && JitsiMeetMediaProjectionModule.launch();
             }
+
+            Platform.OS === 'android' && JitsiMeetMediaProjectionModule.abort();
         } else {
             dispatch(setScreenshareMuted(true));
             dispatch(setVideoMuted(false, VIDEO_MUTISM_AUTHORITY.SCREEN_SHARE));

react/features/base/util/httpUtils.ts

@@ -1,5 +1,3 @@
-import base64js from 'base64-js';
-
 import { timeoutPromise } from './timeoutPromise';
 
 /**
@@ -45,37 +43,3 @@ export function doGetJSON(url: string, retry?: boolean, options?: Object) {
 
     return fetchPromise;
 }
-
-/**
- * Encodes strings to Base64URL.
- *
- * @param {any} data - The byte array to encode.
- * @returns {string}
- */
-export const encodeToBase64URL = (data: string): string => base64js
-    .fromByteArray(new window.TextEncoder().encode(data))
-    .replace(/=/g, '')
-    .replace(/\+/g, '-')
-    .replace(/\//g, '_');
-
-/**
- * Decodes strings from Base64URL.
- *
- * @param {string} data - The byte array to decode.
- * @returns {string}
- */
-export const decodeFromBase64URL = (data: string): string => {
-    let s = data;
-
-    // Convert from Base64URL to Base64.
-    if (s.length % 4 === 2) {
-        s += '==';
-    } else if (s.length % 4 === 3) {
-        s += '=';
-    }
-
-    s = s.replace(/-/g, '+').replace(/_/g, '/');
-
-    // Convert Base64 to a byte array.
-    return new window.TextDecoder().decode(base64js.toByteArray(s));
-};

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

@@ -6,7 +6,6 @@ import { getFeatureFlag } from '../../../base/flags/functions';
 import { translate } from '../../../base/i18n/functions';
 import { IconChatUnread, IconMessage } from '../../../base/icons/svg';
 import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
-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';
@@ -66,10 +65,11 @@ class ChatButton extends AbstractButton<IProps> {
  */
 function _mapStateToProps(state: IReduxState, ownProps: any) {
     const enabled = getFeatureFlag(state, CHAT_ENABLED, true);
+    const { disablePolls } = state['features/base/config'];
     const { visible = enabled } = ownProps;
 
     return {
-        _isPollsDisabled: arePollsDisabled(state),
+        _isPollsDisabled: disablePolls,
 
         // The toggled icon should also be available for new polls
         _unreadMessageCount: getUnreadCount(state) || getUnreadPollCount(state),

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

@@ -8,7 +8,6 @@ import { IconMessage, IconReply } from '../../../base/icons/svg';
 import { getParticipantById } from '../../../base/participants/functions';
 import { IParticipant } from '../../../base/participants/types';
 import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
-import { arePollsDisabled } from '../../../conference/functions.any';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
 import { handleLobbyChatInitialized, openChat } from '../../actions.native';
@@ -97,10 +96,11 @@ class PrivateMessageButton extends AbstractButton<IProps, any> {
  */
 export function _mapStateToProps(state: IReduxState, ownProps: any) {
     const enabled = getFeatureFlag(state, CHAT_ENABLED, true);
+    const { disablePolls } = state['features/base/config'];
     const { visible = enabled, isLobbyMessage, participantID } = ownProps;
 
     return {
-        _isPollsDisabled: arePollsDisabled(state),
+        _isPollsDisabled: disablePolls,
         _participant: getParticipantById(state, participantID),
         _isLobbyMessage: isLobbyMessage,
         visible

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

@@ -7,7 +7,6 @@ import { translate } from '../../../base/i18n/functions';
 import { getLocalParticipant } from '../../../base/participants/functions';
 import { withPixelLineHeight } from '../../../base/styles/functions.web';
 import Tabs from '../../../base/ui/components/web/Tabs';
-import { arePollsDisabled } from '../../../conference/functions.any';
 import PollsPane from '../../../polls/components/web/PollsPane';
 import { sendMessage, setIsPollsTabFocused, toggleChat } from '../../actions.web';
 import { CHAT_SIZE, CHAT_TABS, SMALL_WIDTH_THRESHOLD } from '../../constants';
@@ -317,11 +316,12 @@ function _mapStateToProps(state: IReduxState, _ownProps: any) {
     const { isOpen, isPollsTabFocused, messages, nbUnreadMessages } = state['features/chat'];
     const { nbUnreadPolls } = state['features/polls'];
     const _localParticipant = getLocalParticipant(state);
+    const { disablePolls } = state['features/base/config'];
 
     return {
         _isModal: window.innerWidth <= SMALL_WIDTH_THRESHOLD,
         _isOpen: isOpen,
-        _isPollsEnabled: !arePollsDisabled(state),
+        _isPollsEnabled: !disablePolls,
         _isPollsTabFocused: isPollsTabFocused,
         _messages: messages,
         _nbUnreadMessages: nbUnreadMessages,

react/features/chat/middleware.ts

@@ -2,7 +2,7 @@ import { AnyAction } from 'redux';
 
 import { IReduxState, IStore } from '../app/types';
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app/actionTypes';
-import { CONFERENCE_JOINED, ENDPOINT_MESSAGE_RECEIVED } from '../base/conference/actionTypes';
+import { CONFERENCE_JOINED } from '../base/conference/actionTypes';
 import { getCurrentConference } from '../base/conference/functions';
 import { IJitsiConference } from '../base/conference/reducer';
 import { openDialog } from '../base/dialog/actions';
@@ -29,6 +29,7 @@ import { ADD_REACTION_MESSAGE } from '../reactions/actionTypes';
 import { pushReactions } from '../reactions/actions.any';
 import { ENDPOINT_REACTION_NAME } from '../reactions/constants';
 import { getReactionMessageFromBuffer, isReactionsEnabled } from '../reactions/functions.any';
+import { endpointMessageReceived } from '../subtitles/actions.any';
 import { showToolbox } from '../toolbox/actions';
 
 
@@ -92,6 +93,14 @@ MiddlewareRegistry.register(store => next => action => {
         _addChatMsgListener(action.conference, store);
         break;
 
+    case OPEN_CHAT:
+        unreadCount = 0;
+
+        if (typeof APP !== 'undefined') {
+            APP.API.notifyChatUpdated(unreadCount, true);
+        }
+        break;
+
     case CLOSE_CHAT: {
         const isPollTabOpen = getState()['features/chat'].isPollsTabFocused;
 
@@ -107,38 +116,6 @@ MiddlewareRegistry.register(store => next => action => {
         break;
     }
 
-    case ENDPOINT_MESSAGE_RECEIVED: {
-        const state = store.getState();
-
-        if (!isReactionsEnabled(state)) {
-            return;
-        }
-
-        const { participant, data } = action;
-
-        if (data?.name === ENDPOINT_REACTION_NAME) {
-            store.dispatch(pushReactions(data.reactions));
-
-            _handleReceivedMessage(store, {
-                id: participant.getId(),
-                message: getReactionMessageFromBuffer(data.reactions),
-                privateMessage: false,
-                lobbyChat: false,
-                timestamp: data.timestamp
-            }, false, true);
-        }
-
-        break;
-    }
-
-    case OPEN_CHAT:
-        unreadCount = 0;
-
-        if (typeof APP !== 'undefined') {
-            APP.API.notifyChatUpdated(unreadCount, true);
-        }
-        break;
-
     case SET_IS_POLL_TAB_FOCUSED: {
         dispatch(resetNbUnreadPollsMessages());
         break;
@@ -276,6 +253,35 @@ function _addChatMsgListener(conference: IJitsiConference, store: IStore) {
         }
     );
 
+    conference.on(
+        JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
+        (...args: any) => {
+            const state = store.getState();
+
+            if (!isReactionsEnabled(state)) {
+                return;
+            }
+
+            // @ts-ignore
+            store.dispatch(endpointMessageReceived(...args));
+
+            if (args && args.length >= 2) {
+                const [ { _id }, eventData ] = args;
+
+                if (eventData.name === ENDPOINT_REACTION_NAME) {
+                    store.dispatch(pushReactions(eventData.reactions));
+
+                    _handleReceivedMessage(store, {
+                        id: _id,
+                        message: getReactionMessageFromBuffer(eventData.reactions),
+                        privateMessage: false,
+                        lobbyChat: false,
+                        timestamp: eventData.timestamp
+                    }, false, true);
+                }
+            }
+        });
+
     conference.on(
         JitsiConferenceEvents.CONFERENCE_ERROR, (errorType: string, error: Error) => {
             errorType === JitsiConferenceErrors.CHAT_ERROR && _handleChatError(store, error);

react/features/conference/components/native/AlwaysOnLabels.tsx

@@ -1,13 +1,11 @@
 import React, { useCallback } from 'react';
 import { TouchableOpacity } from 'react-native';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 
-import { IReduxState } from '../../../app/types';
 import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
 import { openHighlightDialog } from '../../../recording/actions.native';
 import HighlightButton from '../../../recording/components/Recording/native/HighlightButton';
 import RecordingLabel from '../../../recording/components/native/RecordingLabel';
-import { getActiveSession } from '../../../recording/functions';
 import VisitorsCountLabel from '../../../visitors/components/native/VisitorsCountLabel';
 
 import RaisedHandsCountLabel from './RaisedHandsCountLabel';
@@ -30,10 +28,7 @@ interface IProps {
 
 const AlwaysOnLabels = ({ createOnPress }: IProps) => {
     const dispatch = useDispatch();
-    const isStreaming = useSelector((state: IReduxState) =>
-        Boolean(getActiveSession(state, JitsiRecordingConstants.mode.STREAM)));
-    const openHighlightDialogCallback = useCallback(() =>
-        dispatch(openHighlightDialog()), [ dispatch ]);
+    const openHighlightDialogCallback = useCallback(() => dispatch(openHighlightDialog()), [ dispatch ]);
 
     return (<>
         <TouchableOpacity
@@ -41,14 +36,11 @@ const AlwaysOnLabels = ({ createOnPress }: IProps) => {
             onPress = { createOnPress(LABEL_ID_RECORDING) } >
             <RecordingLabel mode = { JitsiRecordingConstants.mode.FILE } />
         </TouchableOpacity>
-        {
-            isStreaming
-            && <TouchableOpacity
-                hitSlop = { LabelHitSlop }
-                onPress = { createOnPress(LABEL_ID_STREAMING) } >
-                <RecordingLabel mode = { JitsiRecordingConstants.mode.STREAM } />
-            </TouchableOpacity>
-        }
+        <TouchableOpacity
+            hitSlop = { LabelHitSlop }
+            onPress = { createOnPress(LABEL_ID_STREAMING) } >
+            <RecordingLabel mode = { JitsiRecordingConstants.mode.STREAM } />
+        </TouchableOpacity>
         <TouchableOpacity
             hitSlop = { LabelHitSlop }
             onPress = { openHighlightDialogCallback }>

react/features/conference/components/native/Conference.tsx

@@ -17,6 +17,7 @@ import { IReduxState, IStore } from '../../../app/types';
 import { CONFERENCE_BLURRED, CONFERENCE_FOCUSED } from '../../../base/conference/actionTypes';
 import { FULLSCREEN_ENABLED, PIP_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
+import { getParticipantCount } from '../../../base/participants/functions';
 import Container from '../../../base/react/components/native/Container';
 import LoadingIndicator from '../../../base/react/components/native/LoadingIndicator';
 import TintedView from '../../../base/react/components/native/TintedView';
@@ -100,6 +101,11 @@ interface IProps extends AbstractProps {
      */
     _fullscreenEnabled: boolean;
 
+    /**
+     * The indicator which determines if the conference type is one to one.
+     */
+    _isOneToOneConference: boolean;
+
     /**
      * The indicator which determines if the participants pane is open.
      */
@@ -364,6 +370,7 @@ class Conference extends AbstractConference<IProps, State> {
             _aspectRatio,
             _connecting,
             _filmstripVisible,
+            _isOneToOneConference,
             _largeVideoParticipantId,
             _reducedUI,
             _shouldDisplayTileView,
@@ -419,11 +426,13 @@ class Conference extends AbstractConference<IProps, State> {
                     <Captions onPress = { this._onClick } />
 
                     {
-                        _shouldDisplayTileView
-                        || <Container style = { styles.displayNameContainer }>
-                            <DisplayNameLabel
-                                participantId = { _largeVideoParticipantId } />
-                        </Container>
+                        _shouldDisplayTileView || (
+                            !_isOneToOneConference
+                            && <Container style = { styles.displayNameContainer }>
+                                <DisplayNameLabel
+                                    participantId = { _largeVideoParticipantId } />
+                            </Container>
+                        )
                     }
 
                     { !_shouldDisplayTileView && <LonelyMeetingExperience /> }
@@ -564,6 +573,7 @@ function _mapStateToProps(state: IReduxState, _ownProps: any) {
     const { backgroundColor } = state['features/dynamic-branding'];
     const { startCarMode } = state['features/base/settings'];
     const { enabled: audioOnlyEnabled } = state['features/base/audio-only'];
+    const participantCount = getParticipantCount(state);
     const brandingStyles = backgroundColor ? {
         backgroundColor
     } : undefined;
@@ -577,6 +587,7 @@ function _mapStateToProps(state: IReduxState, _ownProps: any) {
         _connecting: isConnecting(state),
         _filmstripVisible: isFilmstripVisible(state),
         _fullscreenEnabled: getFeatureFlag(state, FULLSCREEN_ENABLED, true),
+        _isOneToOneConference: Boolean(participantCount === 2),
         _isParticipantsPaneOpen: isOpen,
         _largeVideoParticipantId: state['features/large-video'].participantId,
         _pictureInPictureEnabled: getFeatureFlag(state, PIP_ENABLED),

react/features/conference/components/native/Labels.tsx

@@ -1,10 +1,11 @@
 import React, { Component } from 'react';
 import { TouchableOpacity, View, ViewStyle } from 'react-native';
 
+import TranscribingLabel from '../../../transcribing/components/TranscribingLabel.native';
 import VideoQualityLabel from '../../../video-quality/components/VideoQualityLabel.native';
 
 import InsecureRoomNameLabel from './InsecureRoomNameLabel';
-import { LABEL_ID_INSECURE_ROOM_NAME, LABEL_ID_QUALITY, LabelHitSlop } from './constants';
+import { LABEL_ID_INSECURE_ROOM_NAME, LABEL_ID_QUALITY, LABEL_ID_TRANSCRIBING, LabelHitSlop } from './constants';
 import styles from './styles';
 
 interface IProps {
@@ -32,6 +33,13 @@ class Labels extends Component<IProps> {
                 <View
                     pointerEvents = 'box-none'
                     style = { styles.indicatorContainer as ViewStyle }>
+                    <TouchableOpacity
+                        hitSlop = { LabelHitSlop }
+                        onPress = {
+                            this.props.createOnPress(LABEL_ID_TRANSCRIBING)
+                        } >
+                        <TranscribingLabel />
+                    </TouchableOpacity>
                     <TouchableOpacity
                         hitSlop = { LabelHitSlop }
                         onPress = {

react/features/conference/components/native/TitleBar.tsx

@@ -4,12 +4,11 @@ import { connect } from 'react-redux';
 
 import { IReduxState } from '../../../app/types';
 import { getConferenceName, getConferenceTimestamp } from '../../../base/conference/functions';
-import { CONFERENCE_TIMER_ENABLED } from '../../../base/flags/constants';
+import { CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED } from '../../../base/flags/constants';
 import { getFeatureFlag } from '../../../base/flags/functions';
 import AudioDeviceToggleButton from '../../../mobile/audio-mode/components/AudioDeviceToggleButton';
 import PictureInPictureButton from '../../../mobile/picture-in-picture/components/PictureInPictureButton';
 import ParticipantsPaneButton from '../../../participants-pane/components/native/ParticipantsPaneButton';
-import { isRoomNameEnabled } from '../../../prejoin/functions';
 import ToggleCameraButton from '../../../toolbox/components/native/ToggleCameraButton';
 import { isToolboxVisible } from '../../../toolbox/functions.native';
 import ConferenceTimer from '../ConferenceTimer';
@@ -17,7 +16,6 @@ import ConferenceTimer from '../ConferenceTimer';
 import Labels from './Labels';
 import styles from './styles';
 
-
 interface IProps {
 
     /**
@@ -37,9 +35,9 @@ interface IProps {
     _meetingName: string;
 
     /**
-     * Whether displaying the current room name is enabled or not.
+     * Whether displaying the current meeting name is enabled or not.
      */
-    _roomNameEnabled: boolean;
+    _meetingNameEnabled: boolean;
 
     /**
      * True if the navigation bar should be visible.
@@ -77,7 +75,7 @@ const TitleBar = (props: IProps) => {
                     </View>
                 }
                 {
-                    props._roomNameEnabled
+                    props._meetingNameEnabled
                     && <View style = { styles.roomNameView as ViewStyle }>
                         <Text
                             numberOfLines = { 1 }
@@ -109,14 +107,15 @@ const TitleBar = (props: IProps) => {
  * @returns {IProps}
  */
 function _mapStateToProps(state: IReduxState) {
-    const { hideConferenceTimer } = state['features/base/config'];
+    const { hideConferenceTimer, hideConferenceSubject } = state['features/base/config'];
     const startTimestamp = getConferenceTimestamp(state);
 
     return {
         _conferenceTimerEnabled:
             Boolean(getFeatureFlag(state, CONFERENCE_TIMER_ENABLED, true) && !hideConferenceTimer && startTimestamp),
         _meetingName: getConferenceName(state),
-        _roomNameEnabled: isRoomNameEnabled(state),
+        _meetingNameEnabled:
+            getFeatureFlag(state, MEETING_NAME_ENABLED, true) && !hideConferenceSubject,
         _visible: isToolboxVisible(state)
     };
 }

react/features/conference/components/native/constants.ts

@@ -2,6 +2,7 @@ import React from 'react';
 
 import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
 import RecordingExpandedLabel from '../../../recording/components/native/RecordingExpandedLabel';
+import TranscribingExpandedLabel from '../../../transcribing/components/TranscribingExpandedLabel.native';
 import VideoQualityExpandedLabel from '../../../video-quality/components/VideoQualityExpandedLabel.native';
 
 import InsecureRoomNameExpandedLabel from './InsecureRoomNameExpandedLabel';
@@ -22,6 +23,7 @@ export const EXPANDED_LABEL_TIMEOUT = 5000;
 export const LABEL_ID_QUALITY = 'quality';
 export const LABEL_ID_RECORDING = 'recording';
 export const LABEL_ID_STREAMING = 'streaming';
+export const LABEL_ID_TRANSCRIBING = 'transcribing';
 export const LABEL_ID_INSECURE_ROOM_NAME = 'insecure-room-name';
 export const LABEL_ID_RAISED_HANDS_COUNT = 'raised-hands-count';
 export const LABEL_ID_VISITORS_COUNT = 'visitors-count';
@@ -56,6 +58,9 @@ export const EXPANDED_LABELS: {
         },
         alwaysOn: true
     },
+    [LABEL_ID_TRANSCRIBING]: {
+        component: TranscribingExpandedLabel
+    },
     [LABEL_ID_INSECURE_ROOM_NAME]: {
         component: InsecureRoomNameExpandedLabel
     },

react/features/conference/components/web/Conference.tsx

@@ -23,7 +23,6 @@ import { getOverlayToRender } from '../../../overlay/functions.web';
 import ParticipantsPane from '../../../participants-pane/components/web/ParticipantsPane';
 import Prejoin from '../../../prejoin/components/web/Prejoin';
 import { isPrejoinPageVisible } from '../../../prejoin/functions';
-import ReactionAnimations from '../../../reactions/components/web/ReactionsAnimations';
 import { toggleToolboxVisible } from '../../../toolbox/actions.any';
 import { fullScreenChanged, showToolbox } from '../../../toolbox/actions.web';
 import JitsiPortal from '../../../toolbox/components/web/JitsiPortal';
@@ -261,7 +260,6 @@ class Conference extends AbstractConference<IProps, any> {
                     { _showLobby && <LobbyScreen />}
                 </div>
                 <ParticipantsPane />
-                <ReactionAnimations />
             </div>
         );
     }

react/features/conference/components/web/ConferenceInfo.tsx

@@ -9,6 +9,7 @@ import HighlightButton from '../../../recording/components/Recording/web/Highlig
 import RecordingLabel from '../../../recording/components/web/RecordingLabel';
 import { showToolbox } from '../../../toolbox/actions.web';
 import { isToolboxVisible } from '../../../toolbox/functions.web';
+import TranscribingLabel from '../../../transcribing/components/TranscribingLabel.web';
 import VideoQualityLabel from '../../../video-quality/components/VideoQualityLabel.web';
 import VisitorsCountLabel from '../../../visitors/components/web/VisitorsCountLabel';
 import ConferenceTimer from '../ConferenceTimer';
@@ -82,6 +83,10 @@ const COMPONENTS: Array<{
         Component: RaisedHandsCountLabel,
         id: 'raised-hands-count'
     },
+    {
+        Component: TranscribingLabel,
+        id: 'transcribing'
+    },
     {
         Component: VideoQualityLabel,
         id: 'video-quality'

react/features/conference/functions.any.ts

@@ -1,6 +1,5 @@
 import { IStateful } from '../base/app/types';
 import { toState } from '../base/redux/functions';
-import { iAmVisitor } from '../visitors/functions';
 
 
 /**
@@ -16,19 +15,3 @@ export function shouldDisplayNotifications(stateful: IStateful) {
 
     return !calleeInfoVisible;
 }
-
-
-/**
- *
- * Returns true if polls feature is disabled.
- *
- * @param {(Function|Object)} stateful - The (whole) redux state, or redux's
- * {@code getState} function to be used to retrieve the state
- * features/base/config.
- * @returns {boolean}.
- */
-export function arePollsDisabled(stateful: IStateful) {
-    const state = toState(stateful);
-
-    return state['features/base/config']?.disablePolls || iAmVisitor(state);
-}

react/features/conference/functions.native.ts

@@ -1 +1,21 @@
+import { IStateful } from '../base/app/types';
+import { toState } from '../base/redux/functions';
+
 export * from './functions.any';
+
+
+/**
+ *
+ * Returns true if polls feature is disabled.
+ *
+ * @param {(Function|Object)} stateful - The (whole) redux state, or redux's
+ * {@code getState} function to be used to retrieve the state
+ * features/base/config.
+ * @returns {boolean}.
+ */
+export function getDisablePolls(stateful: IStateful) {
+    const state = toState(stateful)['features/base/config'];
+
+    return state.disablePolls;
+}
+

react/features/conference/middleware.web.ts

@@ -1,7 +1,10 @@
+
 import i18next from 'i18next';
 
-import { ENDPOINT_MESSAGE_RECEIVED, KICKED_OUT } from '../base/conference/actionTypes';
+import { CONFERENCE_JOINED, KICKED_OUT } from '../base/conference/actionTypes';
+import { IJitsiConference } from '../base/conference/reducer';
 import { hangup } from '../base/connection/actions.web';
+import { JitsiConferenceEvents } from '../base/lib-jitsi-meet';
 import { getParticipantDisplayName } from '../base/participants/functions';
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 import { openAllowToggleCameraDialog, setCameraFacingMode } from '../base/tracks/actions.web';
@@ -11,15 +14,8 @@ import './middleware.any';
 
 MiddlewareRegistry.register(store => next => action => {
     switch (action.type) {
-    case ENDPOINT_MESSAGE_RECEIVED: {
-        const { participant, data } = action;
-
-        if (data?.name === CAMERA_FACING_MODE_MESSAGE) {
-            APP.store.dispatch(openAllowToggleCameraDialog(
-                /* onAllow */ () => APP.store.dispatch(setCameraFacingMode(data.facingMode)),
-                /* initiatorId */ participant.getId()
-            ));
-        }
+    case CONFERENCE_JOINED: {
+        _addSetCameraFacingModeListener(action.conference);
         break;
     }
 
@@ -38,3 +34,28 @@ MiddlewareRegistry.register(store => next => action => {
 
     return next(action);
 });
+
+/**
+ * Registers listener for {@link JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED} that
+ * will perform various chat related activities.
+ *
+ * @param {IJitsiConference} conference - The conference.
+ * @returns {void}
+ */
+function _addSetCameraFacingModeListener(conference: IJitsiConference) {
+    conference.on(
+        JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
+        (...args: any) => {
+            if (args && args.length >= 2) {
+                const [ sender, eventData ] = args;
+
+                if (eventData.name === CAMERA_FACING_MODE_MESSAGE) {
+                    APP.store.dispatch(openAllowToggleCameraDialog(
+                        /* onAllow */ () => APP.store.dispatch(setCameraFacingMode(eventData.facingMode)),
+                        /* initiatorId */ sender._id
+                    ));
+                }
+            }
+        }
+    );
+}

react/features/deep-linking/components/DeepLinkingDesktopPage.web.tsx

@@ -11,7 +11,6 @@ import { IDeeplinkingConfig } from '../../base/config/configType';
 import { getLegalUrls } from '../../base/config/functions.any';
 import { isSupportedBrowser } from '../../base/environment/environment';
 import { translate, translateToHTML } from '../../base/i18n/functions';
-import Platform from '../../base/react/Platform.web';
 import { withPixelLineHeight } from '../../base/styles/functions.web';
 import Button from '../../base/ui/components/web/Button';
 import { BUTTON_TYPES } from '../../base/ui/constants.any';
@@ -86,14 +85,6 @@ const DeepLinkingDesktopPage: React.FC<WithTranslation> = ({ t }) => {
     const deeplinkingCfg = useSelector((state: IReduxState) =>
         state['features/base/config']?.deeplinking || {} as IDeeplinkingConfig);
 
-    const generateDownloadURL = useCallback(() => {
-        const downloadCfg = deeplinkingCfg.desktop?.download;
-
-        if (downloadCfg) {
-            return downloadCfg[Platform.OS as keyof typeof downloadCfg];
-        }
-    }, [ deeplinkingCfg ]);
-
     const legalUrls = useSelector(getLegalUrls);
 
     const { hideLogo, desktop } = deeplinkingCfg;
@@ -143,16 +134,6 @@ const DeepLinkingDesktopPage: React.FC<WithTranslation> = ({ t }) => {
                             : t(`${_TNS}.descriptionWithoutWeb`, { app: desktop?.appName })
                     }
                 </div>
-                <div className = { styles.descriptionLabel }>
-                    {
-                        t(`${_TNS}.noDesktopApp`)
-                    } &nbsp;
-                    <a href = { generateDownloadURL() }>
-                        {
-                            t(`${_TNS}.downloadApp`)
-                        }
-                    </a>
-                </div>
                 <div className = { styles.buttonsContainer }>
                     <Button
                         label = { t(`${_TNS}.tryAgainButton`) }

react/features/deep-linking/components/DeepLinkingMobilePage.web.tsx

@@ -211,7 +211,7 @@ const DeepLinkingMobilePage: React.FC<WithTranslation> = ({ t }) => {
                 </a>
                 {isSupportedMobileBrowser() ? (
                     <div className = { styles.supportedBrowserContent }>
-                        <div className = { styles.labelOr }>{ t(`${_TNS}.or`) }</div>
+                        <div className = { styles.labelOr }>OR</div>
                         <a
                             className = { styles.linkWrapper }
                             onClick = { onLaunchWeb }

react/features/deep-linking/functions.ts

@@ -1,6 +1,5 @@
 import { IReduxState } from '../app/types';
 import { isMobileBrowser } from '../base/environment/utils';
-import { browser } from '../base/lib-jitsi-meet';
 import Platform from '../base/react/Platform';
 import { URI_PROTOCOL_PATTERN } from '../base/util/uri';
 import { isVpaasMeeting } from '../jaas/functions';
@@ -64,7 +63,6 @@ export function getDeepLinkingPage(state: IReduxState) {
     if (launchInWeb
             || !room
             || state['features/base/config'].deeplinking?.disabled
-            || browser.isElectron()
             || (isVpaasMeeting(state) && (!appScheme || appScheme === 'com.8x8.meet'))) {
         return Promise.resolve();
     }

react/features/etherpad/components/native/SharedDocument.tsx

@@ -56,7 +56,6 @@ class SharedDocument extends PureComponent<IProps> {
                 style = { styles.sharedDocContainer }>
                 <WebView
                     hideKeyboardAccessoryView = { true }
-                    incognito = { true }
                     renderLoading = { this._renderLoading }
                     source = {{ uri: _documentUrl ?? '' }}
                     startInLoadingState = { true }

react/features/face-landmarks/middleware.ts

@@ -3,11 +3,12 @@ import { AnyAction } from 'redux';
 import { IStore } from '../app/types';
 import {
     CONFERENCE_JOINED,
-    CONFERENCE_WILL_LEAVE,
-    ENDPOINT_MESSAGE_RECEIVED
+    CONFERENCE_WILL_LEAVE
 } from '../base/conference/actionTypes';
 import { getCurrentConference } from '../base/conference/functions';
+import { JitsiConferenceEvents } from '../base/lib-jitsi-meet';
 import { getLocalParticipant, getParticipantCount } from '../base/participants/functions';
+import { IParticipant } from '../base/participants/types';
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 import { TRACK_ADDED, TRACK_REMOVED, TRACK_UPDATED } from '../base/tracks/actionTypes';
 
@@ -27,22 +28,27 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: AnyA
             FaceLandmarksDetector.init(store);
         }
 
-        return next(action);
-    } else if (action.type === ENDPOINT_MESSAGE_RECEIVED) {
-        // Allow using remote face centering data when local face centering is not enabled.
-        const { participant, data } = action;
+        // allow using remote face centering data when local face centering is not enabled
+        action.conference.on(
+            JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
+            (participant: IParticipant | undefined, eventData: any) => {
+                if (!participant || !eventData || !participant.getId) {
+                    return;
+                }
 
-        if (data?.type === FACE_BOX_EVENT_TYPE) {
-            dispatch({
-                type: UPDATE_FACE_COORDINATES,
-                faceBox: data.faceBox,
-                id: participant.getId()
+                if (eventData.type === FACE_BOX_EVENT_TYPE) {
+                    dispatch({
+                        type: UPDATE_FACE_COORDINATES,
+                        faceBox: eventData.faceBox,
+                        id: participant.getId()
+                    });
+                }
             });
-        }
 
         return next(action);
     }
 
+
     if (!isEnabled) {
         return next(action);
     }
@@ -51,7 +57,7 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: AnyA
     case CONFERENCE_WILL_LEAVE : {
         FaceLandmarksDetector.stopDetection(store);
 
-        break;
+        return next(action);
     }
     case TRACK_ADDED: {
         const { jitsiTrack: { isLocal, videoType }, muted } = action.track;
@@ -61,18 +67,18 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: AnyA
             FaceLandmarksDetector.startDetection(store, action.track);
         }
 
-        break;
+        return next(action);
     }
     case TRACK_UPDATED: {
         const { jitsiTrack: { isLocal, videoType } } = action.track;
 
         if (videoType !== 'camera' || !isLocal()) {
-            break;
+            return next(action);
         }
 
         const { muted } = action.track;
 
-        if (typeof muted !== 'undefined') {
+        if (muted !== undefined) {
             // addresses video mute state changes
             if (muted) {
                 FaceLandmarksDetector.stopDetection(store);
@@ -81,7 +87,7 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: AnyA
             }
         }
 
-        break;
+        return next(action);
     }
     case TRACK_REMOVED: {
         const { jitsiTrack: { isLocal, videoType } } = action.track;
@@ -90,7 +96,7 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: AnyA
             FaceLandmarksDetector.stopDetection(store);
         }
 
-        break;
+        return next(action);
     }
     case ADD_FACE_LANDMARKS: {
         const state = getState();
@@ -104,7 +110,7 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: AnyA
         // Disabling for now as there is no value of having the data in speakerstats at the server
         // sendFaceExpressionToServer(conference, faceLandmarks);
 
-        break;
+        return next(action);
     }
     case NEW_FACE_COORDINATES: {
         const state = getState();
@@ -121,8 +127,6 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => (action: AnyA
             faceBox,
             id: localParticipant?.id
         });
-
-        break;
     }
     }
 

react/features/invite/components/dial-in-summary/native/DialInSummary.tsx

@@ -76,7 +76,6 @@ class DialInSummary extends PureComponent<IProps> {
             <JitsiScreen
                 style = { styles.backDrop }>
                 <WebView
-                    incognito = { true }
                     onError = { this._onError }
                     onShouldStartLoadWithRequest = { this._onNavigate }
                     renderLoading = { this._renderLoading }

react/features/invite/components/dial-in-summary/web/ConferenceID.tsx

@@ -66,7 +66,7 @@ const ConferenceID: React.FC<IProps> = ({ conferenceID, t }) => {
     return (
         <div className = { styles.container }>
             <div className = { styles.descriptionLabel }>
-                { t('info.dialANumber') }
+                To join the meeting via phone, dial one of these numbers and then enter the pin
             </div>
             <div className = { styles.separator } />
             <div className = { styles.pinLabel }>

react/features/keyboard-shortcuts/actions.any.ts

@@ -30,7 +30,7 @@ export const registerShortcut = (shortcut: IKeyboardShortcut): AnyAction => {
 */
 export const unregisterShortcut = (character: string, altKey = false): AnyAction => {
     return {
-        alt: altKey,
+        altKey,
         type: UNREGISTER_KEYBOARD_SHORTCUT,
         character
     };

react/features/lobby/actions.any.ts

@@ -21,8 +21,7 @@ import {
     SET_PASSWORD_JOIN_FAILED
 } from './actionTypes';
 import { LOBBY_CHAT_INITIALIZED, MODERATOR_IN_CHAT_WITH_LEFT } from './constants';
-import { getKnockingParticipants, getLobbyConfig, getLobbyEnabled, isEnablingLobbyAllowed } from './functions';
-import logger from './logger';
+import { getKnockingParticipants, getLobbyConfig, getLobbyEnabled } from './functions';
 import { IKnockingParticipant } from './types';
 
 /**
@@ -244,11 +243,7 @@ export function toggleLobbyMode(enabled: boolean) {
         const conference = getCurrentConference(getState);
 
         if (enabled) {
-            if (isEnablingLobbyAllowed(getState())) {
-                conference?.enableLobby();
-            } else {
-                logger.info('Ignoring enable lobby request because there are visitors in the call already.');
-            }
+            conference?.enableLobby();
         } else {
             conference?.disableLobby();
         }

react/features/lobby/functions.ts

@@ -1,6 +1,5 @@
 import { IReduxState } from '../app/types';
 import { getCurrentConference } from '../base/conference/functions';
-import { getVisitorsCount } from '../visitors/functions';
 
 import { IKnockingParticipant } from './types';
 
@@ -93,13 +92,3 @@ export function showLobbyChatButton(
         return false;
     };
 }
-
-/**
- * Returns true if enabling lobby is allowed and false otherwise.
- *
- * @param {IReduxState} state - State object.
- * @returns {boolean}
- */
-export function isEnablingLobbyAllowed(state: IReduxState) {
-    return getVisitorsCount(state) <= 0;
-}

react/features/lobby/middleware.ts

@@ -6,8 +6,7 @@ import { IStore } from '../app/types';
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app/actionTypes';
 import {
     CONFERENCE_FAILED,
-    CONFERENCE_JOINED,
-    ENDPOINT_MESSAGE_RECEIVED
+    CONFERENCE_JOINED
 } from '../base/conference/actionTypes';
 import { conferenceWillJoin } from '../base/conference/actions';
 import {
@@ -32,7 +31,6 @@ import {
     handleLobbyChatInitialized,
     removeLobbyChatParticipant
 } from '../chat/actions.any';
-import { arePollsDisabled } from '../conference/functions.any';
 import { hideNotification, showNotification } from '../notifications/actions';
 import {
     LOBBY_NOTIFICATION_ID,
@@ -43,11 +41,7 @@ import {
 import { INotificationProps } from '../notifications/types';
 import { open as openParticipantsPane } from '../participants-pane/actions';
 import { getParticipantsPaneOpen } from '../participants-pane/functions';
-import {
-    isPrejoinEnabledInConfig,
-    isPrejoinPageVisible,
-    shouldAutoKnock
-} from '../prejoin/functions';
+import { isPrejoinPageVisible, shouldAutoKnock } from '../prejoin/functions';
 
 import {
     KNOCKING_PARTICIPANT_ARRIVED_OR_UPDATED,
@@ -84,13 +78,6 @@ MiddlewareRegistry.register(store => next => action => {
         return _conferenceFailed(store, next, action);
     case CONFERENCE_JOINED:
         return _conferenceJoined(store, next, action);
-    case ENDPOINT_MESSAGE_RECEIVED: {
-        const { participant, data } = action;
-
-        _maybeSendLobbyNotification(participant, data, store);
-
-        break;
-    }
     case KNOCKING_PARTICIPANT_ARRIVED_OR_UPDATED: {
         // We need the full update result to be in the store already
         const result = next(action);
@@ -178,6 +165,13 @@ StateListenerRegistry.register(
                     dispatch(updateLobbyParticipantOnLeave(id));
                 });
             });
+
+            conference.on(JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED, (origin: any, sender: any) =>
+                _maybeSendLobbyNotification(origin, sender, {
+                    dispatch,
+                    getState
+                })
+            );
         }
     }
 );
@@ -207,6 +201,7 @@ function _handleLobbyNotification(store: IStore) {
 
     if (knockingParticipants.length === 1) {
         const firstParticipant = knockingParticipants[0];
+        const { disablePolls } = getState()['features/base/config'];
         const showChat = showLobbyChatButton(firstParticipant)(getState());
 
         descriptionKey = 'notify.participantWantsToJoin';
@@ -230,7 +225,7 @@ function _handleLobbyNotification(store: IStore) {
             customActionType.splice(1, 0, BUTTON_TYPES.SECONDARY);
             customActionHandler.splice(1, 0, () => batch(() => {
                 dispatch(handleLobbyChatInitialized(firstParticipant.id));
-                dispatch(openChat({}, arePollsDisabled(getState())));
+                dispatch(openChat({}, disablePolls));
             }));
         }
     } else {
@@ -273,6 +268,7 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
     const { membersOnly } = state['features/base/conference'];
     const nonFirstFailure = Boolean(membersOnly);
     const { isDisplayNameRequiredError } = state['features/lobby'];
+    const { prejoinConfig } = state['features/base/config'];
 
     if (error.name === JitsiConferenceErrors.MEMBERS_ONLY_ERROR) {
         if (typeof error.recoverable === 'undefined') {
@@ -287,9 +283,7 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
         dispatch(openLobbyScreen());
 
         // if there was an error about display name and pre-join is not enabled
-        if (shouldAutoKnock(state)
-                || (isDisplayNameRequiredError && !isPrejoinEnabledInConfig(state))
-                || lobbyWaitingForHost) {
+        if (shouldAutoKnock(state) || (isDisplayNameRequiredError && !prejoinConfig?.enabled) || lobbyWaitingForHost) {
             dispatch(startKnocking());
         }
 

react/features/mobile/external-api/middleware.ts

@@ -16,7 +16,6 @@ import {
     CONFERENCE_JOINED,
     CONFERENCE_LEFT,
     CONFERENCE_WILL_JOIN,
-    ENDPOINT_MESSAGE_RECEIVED,
     SET_ROOM
 } from '../../base/conference/actionTypes';
 import { JITSI_CONFERENCE_URL_KEY } from '../../base/conference/constants';
@@ -185,22 +184,6 @@ externalAPIEnabled && MiddlewareRegistry.register(store => next => action => {
         break;
     }
 
-    case ENDPOINT_MESSAGE_RECEIVED: {
-        const { participant, data } = action;
-
-        if (data?.name === ENDPOINT_TEXT_MESSAGE_NAME) {
-            sendEvent(
-                store,
-                ENDPOINT_TEXT_MESSAGE_RECEIVED,
-                /* data */ {
-                    message: data.text,
-                    senderId: participant.getId()
-                });
-        }
-
-        break;
-    }
-
     case ENTER_PICTURE_IN_PICTURE:
         sendEvent(store, type, /* data */ {});
         break;
@@ -436,6 +419,24 @@ function _unregisterForNativeEvents() {
 function _registerForEndpointTextMessages(store: IStore) {
     const conference = getCurrentConference(store.getState());
 
+    conference?.on(
+        JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
+        (...args: any[]) => {
+            if (args && args.length >= 2) {
+                const [ sender, eventData ] = args;
+
+                if (eventData.name === ENDPOINT_TEXT_MESSAGE_NAME) {
+                    sendEvent(
+                        store,
+                        ENDPOINT_TEXT_MESSAGE_RECEIVED,
+                        /* data */ {
+                            message: eventData.text,
+                            senderId: sender._id
+                        });
+                }
+            }
+        });
+
     conference?.on(
         JitsiConferenceEvents.MESSAGE_RECEIVED,
             (id: string, message: string, timestamp: number) => {

react/features/mobile/navigation/components/RootNavigationContainer.tsx

@@ -13,7 +13,6 @@ import { isUnsafeRoomWarningEnabled } from '../../../prejoin/functions';
 // @ts-ignore
 import WelcomePage from '../../../welcome/components/WelcomePage';
 import { isWelcomePageEnabled } from '../../../welcome/functions';
-import Whiteboard from '../../../whiteboard/components/native/Whiteboard';
 import { _ROOT_NAVIGATION_READY } from '../actionTypes';
 import { rootNavigationRef } from '../rootNavigationContainerRef';
 import { screen } from '../routes';
@@ -24,8 +23,7 @@ import {
     navigationContainerTheme,
     preJoinScreenOptions,
     unsafeMeetingScreenOptions,
-    welcomeScreenOptions,
-    whiteboardScreenOptions
+    welcomeScreenOptions
 } from '../screenOptions';
 
 import ConnectingPage from './ConnectingPage';
@@ -96,10 +94,6 @@ const RootNavigationContainer = ({ dispatch, isUnsafeRoomWarningAvailable, isWel
                     component = { ConnectingPage }
                     name = { screen.connecting }
                     options = { connectingScreenOptions } />
-                <RootStack.Screen // @ts-ignore
-                    component = { Whiteboard }
-                    name = { screen.conference.whiteboard }
-                    options = { whiteboardScreenOptions } />
                 <RootStack.Screen
                     component = { Prejoin }
                     name = { screen.preJoin }

react/features/mobile/navigation/components/conference/components/ConferenceNavigationContainer.tsx

@@ -16,7 +16,7 @@ import Conference from '../../../../../conference/components/native/Conference';
 // @ts-ignore
 import CarMode from '../../../../../conference/components/native/carmode/CarMode';
 // @ts-ignore
-import { arePollsDisabled } from '../../../../../conference/functions';
+import { getDisablePolls } from '../../../../../conference/functions';
 // @ts-ignore
 import SharedDocument from '../../../../../etherpad/components/native/SharedDocument';
 // @ts-ignore
@@ -81,7 +81,7 @@ const ConferenceStack = createStackNavigator();
 
 
 const ConferenceNavigationContainer = () => {
-    const isPollsDisabled = useSelector(arePollsDisabled);
+    const isPollsDisabled = useSelector(getDisablePolls);
     let ChatScreen;
     let chatScreenName;
     let chatTitleString;

react/features/mobile/navigation/functions.tsx

@@ -11,7 +11,6 @@ import { getFeatureFlag } from '../../base/flags/functions';
 import { IconCloseLarge } from '../../base/icons/svg';
 import { toState } from '../../base/redux/functions';
 import { cancelKnocking } from '../../lobby/actions.native';
-import { isPrejoinEnabledInConfig } from '../../prejoin/functions';
 
 import HeaderNavigationButton from './components/HeaderNavigationButton';
 
@@ -51,8 +50,10 @@ export function screenHeaderCloseButton(goBack: (e?: GestureResponderEvent | Rea
  */
 export function isPrejoinPageEnabled(stateful: IStateful) {
     const state = toState(stateful);
+    const { prejoinConfig } = state['features/base/config'];
+    const isPrejoinEnabledInConfig = prejoinConfig?.enabled;
 
-    return getFeatureFlag(state, PREJOIN_PAGE_ENABLED, isPrejoinEnabledInConfig(state));
+    return getFeatureFlag(state, PREJOIN_PAGE_ENABLED, isPrejoinEnabledInConfig ?? true);
 }
 
 /**

react/features/mobile/navigation/routes.ts

@@ -22,8 +22,7 @@ export const screen = {
         security: 'Security Options',
         sharedDocument: 'Shared document',
         speakerStats: 'Speaker Stats',
-        subtitles: 'Subtitles',
-        whiteboard: 'Whiteboard'
+        subtitles: 'Subtitles'
     },
     connecting: 'Connecting',
     dialInSummary: 'Dial-In Info',

react/features/mobile/navigation/screenOptions.ts

@@ -188,19 +188,6 @@ export const connectingScreenOptions = {
     headerShown: false
 };
 
-/**
- * Screen options for the whiteboard screen.
- */
-export const whiteboardScreenOptions = {
-    gestureEnabled: true,
-    headerStyle: {
-        backgroundColor: BaseTheme.palette.ui01
-    },
-    headerTitleStyle: {
-        color: BaseTheme.palette.text01
-    }
-};
-
 /**
  * Screen options for pre-join screen.
  */

react/features/mobile/polyfills/browser.js

@@ -1,8 +1,6 @@
 import { DOMParser } from '@xmldom/xmldom';
-import { atob, btoa } from 'abab';
 import { Platform } from 'react-native';
 import BackgroundTimer from 'react-native-background-timer';
-import { TextDecoder, TextEncoder } from 'text-encoding';
 
 import 'promise.allsettled/auto'; // Promise.allSettled.
 import 'react-native-url-polyfill/auto'; // Complete URL polyfill.
@@ -315,23 +313,4 @@ function _visitNode(node, callback) {
         global.sessionStorage = new Storage();
     }
 
-    global.TextDecoder = TextDecoder;
-    global.TextEncoder = TextEncoder;
-
-    // atob
-    //
-    // Required by:
-    // - Strophe
-    if (typeof global.atob === 'undefined') {
-        global.atob = atob;
-    }
-
-    // btoa
-    //
-    // Required by:
-    // - Strophe
-    if (typeof global.btoa === 'undefined') {
-        global.btoa = btoa;
-    }
-
 })(global || window || this); // eslint-disable-line no-invalid-this

react/features/notifications/constants.ts

@@ -103,13 +103,6 @@ export const RAISE_HAND_NOTIFICATION_ID = 'RAISE_HAND_NOTIFICATION';
  */
 export const SALESFORCE_LINK_NOTIFICATION_ID = 'SALESFORCE_LINK_NOTIFICATION';
 
-/**
- * The identifier of the lobby notification.
- *
- * @type {string}
- */
-export const VISITORS_PROMOTION_NOTIFICATION_ID = 'VISITORS_PROMOTION_NOTIFICATION';
-
 /**
  * Amount of participants beyond which no join notification will be emitted.
  */

react/features/polls/middleware.ts

@@ -1,11 +1,11 @@
 import { IStore } from '../app/types';
-import { ENDPOINT_MESSAGE_RECEIVED, NON_PARTICIPANT_MESSAGE_RECEIVED } from '../base/conference/actionTypes';
+import { CONFERENCE_JOIN_IN_PROGRESS } from '../base/conference/actionTypes';
 import { getCurrentConference } from '../base/conference/functions';
+import { JitsiConferenceEvents } from '../base/lib-jitsi-meet';
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
 import StateListenerRegistry from '../base/redux/StateListenerRegistry';
 import { playSound } from '../base/sounds/actions';
 import { INCOMING_MSG_SOUND_ID } from '../chat/constants';
-import { arePollsDisabled } from '../conference/functions.any';
 import { showNotification } from '../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE } from '../notifications/constants';
 
@@ -58,38 +58,37 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
     const result = next(action);
 
     switch (action.type) {
-    case ENDPOINT_MESSAGE_RECEIVED: {
-        const { participant, data } = action;
-        const isNewPoll = data.type === COMMAND_NEW_POLL;
+    case CONFERENCE_JOIN_IN_PROGRESS: {
+        const { conference } = action;
 
-        _handleReceivePollsMessage({
-            ...data,
-            senderId: isNewPoll ? participant.getId() : undefined,
-            voterId: isNewPoll ? undefined : participant.getId()
-        }, dispatch, getState);
+        conference.on(JitsiConferenceEvents.ENDPOINT_MESSAGE_RECEIVED,
+            (user: any, data: any) => {
+                const isNewPoll = data.type === COMMAND_NEW_POLL;
+
+                _handleReceivePollsMessage({
+                    ...data,
+                    senderId: isNewPoll ? user._id : undefined,
+                    voterId: isNewPoll ? undefined : user._id
+                }, dispatch);
+            });
+        conference.on(JitsiConferenceEvents.NON_PARTICIPANT_MESSAGE_RECEIVED,
+            (id: any, data: any) => {
+                const isNewPoll = data.type === COMMAND_NEW_POLL;
+
+                _handleReceivePollsMessage({
+                    ...data,
+                    senderId: isNewPoll ? id : undefined,
+                    voterId: isNewPoll ? undefined : id
+                }, dispatch);
+            });
 
         break;
     }
 
-    case NON_PARTICIPANT_MESSAGE_RECEIVED: {
-        const { id, json: data } = action;
-        const isNewPoll = data.type === COMMAND_NEW_POLL;
-
-        _handleReceivePollsMessage({
-            ...data,
-            senderId: isNewPoll ? id : undefined,
-            voterId: isNewPoll ? undefined : id
-        }, dispatch, getState);
-        break;
-    }
-
+    // Middleware triggered when a poll is received
     case RECEIVE_POLL: {
+
         const state = getState();
-
-        if (arePollsDisabled(state)) {
-            break;
-        }
-
         const isChatOpen: boolean = state['features/chat'].isOpen;
         const isPollsTabFocused: boolean = state['features/chat'].isPollsTabFocused;
 
@@ -110,15 +109,10 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
  *
  * @param {Object} data - The json data carried by the polls message.
  * @param {Function} dispatch - The dispatch function.
- * @param {Function} getState - The getState function.
  *
  * @returns {void}
  */
-function _handleReceivePollsMessage(data: any, dispatch: IStore['dispatch'], getState: IStore['getState']) {
-    if (arePollsDisabled(getState())) {
-        return;
-    }
-
+function _handleReceivePollsMessage(data: any, dispatch: IStore['dispatch']) {
     switch (data.type) {
     case COMMAND_NEW_POLL: {
         const { question, answers, pollId, senderId } = data;

react/features/prejoin/components/native/Prejoin.tsx

@@ -38,7 +38,7 @@ import { navigateRoot } from '../../../mobile/navigation/rootNavigationContainer
 import { screen } from '../../../mobile/navigation/routes';
 import AudioMuteButton from '../../../toolbox/components/native/AudioMuteButton';
 import VideoMuteButton from '../../../toolbox/components/native/VideoMuteButton';
-import { isDisplayNameRequired, isRoomNameEnabled } from '../../functions';
+import { isDisplayNameRequired } from '../../functions';
 import { IPrejoinProps } from '../../types';
 import { hasDisplayName } from '../../utils';
 
@@ -58,7 +58,6 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
         = useSelector((state: IReduxState) => !getFeatureFlag(state, PREJOIN_PAGE_HIDE_DISPLAY_NAME, false));
     const isDisplayNameReadonly = useSelector(isNameReadOnly);
     const roomName = useSelector((state: IReduxState) => getConferenceName(state));
-    const roomNameEnabled = useSelector((state: IReduxState) => isRoomNameEnabled(state));
     const participantName = localParticipant?.name;
     const [ displayName, setDisplayName ]
         = useState(participantName || '');
@@ -169,16 +168,12 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
             {
                 isFocused
                 && <View style = { largeVideoContainerStyles as StyleProp<ViewStyle> }>
-                    <View style = { styles.conferenceInfo as StyleProp<ViewStyle> }>
-                        {roomNameEnabled && (
-                            <View style = { styles.displayRoomNameBackdrop as StyleProp<TextStyle> }>
-                                <Text
-                                    numberOfLines = { 1 }
-                                    style = { styles.preJoinRoomName as StyleProp<TextStyle> }>
-                                    { roomName }
-                                </Text>
-                            </View>
-                        )}
+                    <View style = { styles.displayRoomNameBackdrop as StyleProp<TextStyle> }>
+                        <Text
+                            numberOfLines = { 1 }
+                            style = { styles.preJoinRoomName as StyleProp<TextStyle> }>
+                            { roomName }
+                        </Text>
                     </View>
                     <LargeVideo />
                 </View>
@@ -199,15 +194,10 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
                         placeholder = { t('dialog.enterDisplayName') }
                         value = { displayName } />
                 }
-                {
-                    showDisplayNameError && (
-                        <View style = { styles.errorContainer as StyleProp<TextStyle> }>
-                            <Text style = { styles.error as StyleProp<TextStyle> }>
-                                { t('prejoin.errorMissingName') }
-                            </Text>
-                        </View>
-                    )
-                }
+                {showDisplayNameError && (
+                    <View style = { styles.errorContainer as StyleProp<TextStyle> }>
+                        <Text style = { styles.error as StyleProp<TextStyle> }>{t('prejoin.errorMissingName')}</Text>
+                    </View>)}
                 <Button
                     accessibilityLabel = 'prejoin.joinMeeting'
                     disabled = { showDisplayNameError }

react/features/prejoin/components/native/RecordingWarning.tsx

@@ -1,28 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-    StyleProp,
-    Text,
-    TextStyle,
-    View,
-    ViewStyle
-} from 'react-native';
-
-import { preJoinStyles as styles } from './styles';
-
-
-const RecordingWarning = (): JSX.Element => {
-    const { t } = useTranslation();
-
-    return (
-        <View style = { styles.recordingWarning as StyleProp<ViewStyle> }>
-            <Text
-                numberOfLines = { 1 }
-                style = { styles.recordingWarningText as StyleProp<TextStyle> }>
-                { t('prejoin.recordingWarning') }
-            </Text>
-        </View>
-    );
-};
-
-export default RecordingWarning;

react/features/prejoin/components/native/styles.ts

@@ -106,33 +106,18 @@ export const preJoinStyles = {
         textAlign: 'center'
     },
 
-    conferenceInfo: {
+    displayRoomNameBackdrop: {
         alignSelf: 'center',
+        backgroundColor: BaseTheme.palette.uiBackground,
+        borderRadius: BaseTheme.shape.borderRadius,
         marginTop: BaseTheme.spacing[3],
+        opacity: 0.7,
         paddingHorizontal: BaseTheme.spacing[3],
         paddingVertical: BaseTheme.spacing[1],
         position: 'absolute',
-        maxWidth: 273,
+        maxWidth: 243,
         zIndex: 1
     },
-    displayRoomNameBackdrop: {
-        backgroundColor: BaseTheme.palette.uiBackground,
-        borderRadius: BaseTheme.shape.borderRadius,
-        opacity: 0.7,
-        paddingHorizontal: BaseTheme.spacing[3],
-        paddingVertical: BaseTheme.spacing[1]
-    },
-    recordingWarning: {
-        display: 'flex',
-        justifyContent: 'center',
-        lineHeight: 22,
-        marginBottom: BaseTheme.spacing[2],
-        marginTop: BaseTheme.spacing[1],
-        width: 'auto'
-    },
-    recordingWarningText: {
-        color: BaseTheme.palette.text03
-    },
     unsafeRoomWarningContainer: {
         height: '100%',
         width: '100%',

react/features/prejoin/components/web/Prejoin.tsx

@@ -111,11 +111,6 @@ interface IProps {
      */
     showErrorOnJoin: boolean;
 
-    /**
-     * If the recording warning is visible or not.
-     */
-    showRecordingWarning: boolean;
-
     /**
      * If should show unsafe room warning when joining.
      */
@@ -224,7 +219,6 @@ const Prejoin = ({
     showCameraPreview,
     showDialog,
     showErrorOnJoin,
-    showRecordingWarning,
     showUnsafeRoomWarning,
     unsafeRoomConsent,
     updateSettings: dispatchUpdateSettings,
@@ -396,7 +390,6 @@ const Prejoin = ({
     return (
         <PreMeetingScreen
             showDeviceStatus = { deviceStatusVisible }
-            showRecordingWarning = { showRecordingWarning }
             showUnsafeRoomWarning = { showUnsafeRoomWarning }
             title = { t('prejoin.joinMeeting') }
             videoMuted = { !showCameraPreview }
@@ -490,7 +483,6 @@ function mapStateToProps(state: IReduxState) {
     const { joiningInProgress } = state['features/prejoin'];
     const { room } = state['features/base/conference'];
     const { unsafeRoomConsent } = state['features/base/premeeting'];
-    const { showPrejoinWarning: showRecordingWarning } = state['features/base/config'].recordings ?? {};
 
     return {
         deviceStatusVisible: isDeviceStatusVisible(state),
@@ -504,7 +496,6 @@ function mapStateToProps(state: IReduxState) {
         showCameraPreview: !isVideoMutedByUser(state),
         showDialog: isJoinByPhoneDialogVisible(state),
         showErrorOnJoin,
-        showRecordingWarning: Boolean(showRecordingWarning),
         showUnsafeRoomWarning: isInsecureRoomName(room) && isUnsafeRoomWarningEnabled(state),
         unsafeRoomConsent,
         videoTrack: getLocalJitsiVideoTrack(state)

react/features/prejoin/functions.ts

@@ -1,10 +1,7 @@
 import { IReduxState } from '../app/types';
 import { getRoomName } from '../base/conference/functions';
 import { getDialOutStatusUrl, getDialOutUrl } from '../base/config/functions.any';
-import {
-    MEETING_NAME_ENABLED,
-    UNSAFE_ROOM_WARNING
-} from '../base/flags/constants';
+import { UNSAFE_ROOM_WARNING } from '../base/flags/constants';
 import { getFeatureFlag } from '../base/flags/functions';
 import { isAudioMuted, isVideoMutedByUser } from '../base/media/functions';
 import { getLobbyConfig } from '../lobby/functions';
@@ -42,16 +39,6 @@ export function isDisplayNameRequired(state: IReduxState): boolean {
         || state['features/base/config']?.requireDisplayName);
 }
 
-/**
- * Selector for determining if the prejoin page is enabled in config. Defaults to `true`.
- *
- * @param {IReduxState} state - The state of the app.
- * @returns {boolean}
- */
-export function isPrejoinEnabledInConfig(state: IReduxState): boolean {
-    return state['features/base/config'].prejoinConfig?.enabled ?? true;
-}
-
 /**
  * Selector for determining if the prejoin display name field is visible.
  *
@@ -164,7 +151,7 @@ export function isJoinByPhoneDialogVisible(state: IReduxState): boolean {
  */
 export function isPrejoinPageVisible(state: IReduxState): boolean {
     return Boolean(navigator.product !== 'ReactNative'
-        && isPrejoinEnabledInConfig(state)
+        && state['features/base/config'].prejoinConfig?.enabled
         && state['features/prejoin']?.showPrejoin
         && !(state['features/base/config'].enableForcedReload && state['features/prejoin'].skipPrejoinOnReload));
 }
@@ -176,11 +163,12 @@ export function isPrejoinPageVisible(state: IReduxState): boolean {
  * @returns {boolean}
  */
 export function shouldAutoKnock(state: IReduxState): boolean {
-    const { iAmRecorder, iAmSipGateway } = state['features/base/config'];
+    const { iAmRecorder, iAmSipGateway, prejoinConfig } = state['features/base/config'];
     const { userSelectedSkipPrejoin } = state['features/base/settings'];
     const { autoKnock } = getLobbyConfig(state);
+    const isPrejoinEnabled = prejoinConfig?.enabled;
 
-    return Boolean(((isPrejoinEnabledInConfig(state) && !userSelectedSkipPrejoin)
+    return Boolean(((isPrejoinEnabled && !userSelectedSkipPrejoin)
             || autoKnock || (iAmRecorder && iAmSipGateway))
         && !state['features/lobby'].knocking);
 }
@@ -196,14 +184,3 @@ export function isUnsafeRoomWarningEnabled(state: IReduxState): boolean {
 
     return getFeatureFlag(state, UNSAFE_ROOM_WARNING, enableInsecureRoomNameWarning);
 }
-
-/**
- * Returns true if the room name is enabled.
- *
- * @param {IReduxState} state - The state of the app.
- * @returns {boolean}
- */
-export function isRoomNameEnabled(state: IReduxState): boolean {
-    return getFeatureFlag(state, MEETING_NAME_ENABLED, true)
-        || !state['features/base/config'].hideConferenceSubject;
-}

react/features/reactions/components/web/RaiseHandContainerButtons.tsx

@@ -4,17 +4,17 @@ import { useSelector } from 'react-redux';
 import { IReduxState } from '../../../app/types';
 import { isMobileBrowser } from '../../../base/environment/utils';
 import { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
-import { isReactionsButtonEnabled, shouldDisplayReactionsButtons } from '../../functions.web';
+import { isReactionsButtonEnabled, isReactionsEnabled } from '../../functions.web';
 
 import RaiseHandButton from './RaiseHandButton';
 import ReactionsMenuButton from './ReactionsMenuButton';
 
 const RaiseHandContainerButton = (props: AbstractButtonProps) => {
     const reactionsButtonEnabled = useSelector(isReactionsButtonEnabled);
-    const _shouldDisplayReactionsButtons = useSelector(shouldDisplayReactionsButtons);
+    const reactionsEnabled = useSelector(isReactionsEnabled);
     const isNarrowLayout = useSelector((state: IReduxState) => state['features/base/responsive-ui'].isNarrowLayout);
     const showReactionsAsPartOfRaiseHand
-        = _shouldDisplayReactionsButtons && !reactionsButtonEnabled && !isNarrowLayout && !isMobileBrowser();
+        = !reactionsButtonEnabled && reactionsEnabled && !isNarrowLayout && !isMobileBrowser();
 
     return showReactionsAsPartOfRaiseHand
         ? <ReactionsMenuButton

react/features/reactions/components/web/ReactionsAnimations.tsx

@@ -1,29 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-
-import { getReactionsQueue, isReactionsEnabled, shouldDisplayReactionsButtons } from '../../functions.any';
-
-import ReactionEmoji from './ReactionEmoji';
-
-/**
- * Renders the reactions animations in the case when there is no buttons displayed.
- *
- * @returns {ReactNode}
- */
-export default function ReactionAnimations() {
-    const reactionsQueue = useSelector(getReactionsQueue);
-    const _shouldDisplayReactionsButtons = useSelector(shouldDisplayReactionsButtons);
-    const reactionsEnabled = useSelector(isReactionsEnabled);
-
-    if (reactionsEnabled && !_shouldDisplayReactionsButtons) {
-        return (<div className = 'reactions-animations-container'>
-            {reactionsQueue.map(({ reaction, uid }, index) => (<ReactionEmoji
-                index = { index }
-                key = { uid }
-                reaction = { reaction }
-                uid = { uid } />))}
-        </div>);
-    }
-
-    return null;
-}

react/features/reactions/components/web/ReactionsMenuButton.tsx

@@ -10,7 +10,7 @@ import AbstractButton, { type IProps as AbstractButtonProps } from '../../../bas
 import ToolboxButtonWithPopup from '../../../base/toolbox/components/web/ToolboxButtonWithPopup';
 import { toggleReactionsMenuVisibility } from '../../actions.web';
 import { IReactionEmojiProps } from '../../constants';
-import { getReactionsQueue } from '../../functions.any';
+import { getReactionsQueue, isReactionsEnabled } from '../../functions.any';
 import { getReactionsMenuVisibility, isReactionsButtonEnabled } from '../../functions.web';
 import { IReactionsMenuParent } from '../../types';
 
@@ -30,6 +30,11 @@ interface IProps extends WithTranslation {
      */
     _reactionsButtonEnabled: boolean;
 
+    /**
+     * Whether or not the reactions are enabled.
+     */
+    _reactionsEnabled: boolean;
+
     /**
      * The button's key.
      */
@@ -88,6 +93,7 @@ const ReactionsButton = translate(connect()(ReactionsButtonImpl));
  */
 function ReactionsMenuButton({
     _reactionsButtonEnabled,
+    _reactionsEnabled,
     _isMobile,
     buttonKey,
     dispatch,
@@ -110,7 +116,7 @@ function ReactionsMenuButton({
         isOpen && toggleReactionsMenu();
     }, [ isOpen, toggleReactionsMenu ]);
 
-    if (!showRaiseHand && !_reactionsButtonEnabled) {
+    if (!showRaiseHand && (!_reactionsButtonEnabled || !_reactionsEnabled)) {
         return null;
     }
 
@@ -178,6 +184,7 @@ function mapStateToProps(state: IReduxState) {
 
     return {
         _reactionsButtonEnabled: isReactionsButtonEnabled(state),
+        _reactionsEnabled: isReactionsEnabled(state),
         _isMobile: isMobileBrowser(),
         isOpen: getReactionsMenuVisibility(state),
         isNarrow: isNarrowLayout,

react/features/reactions/functions.any.ts

@@ -5,7 +5,6 @@ import { REACTIONS_ENABLED } from '../base/flags/constants';
 import { getFeatureFlag } from '../base/flags/functions';
 import { getLocalParticipant } from '../base/participants/functions';
 import { extractFqnFromPath } from '../dynamic-branding/functions.any';
-import { iAmVisitor } from '../visitors/functions';
 
 import { IReactionEmojiProps, REACTIONS, ReactionThreshold, SOUNDS_THRESHOLDS } from './constants';
 import logger from './logger';
@@ -162,13 +161,3 @@ export function isReactionsEnabled(state: IReduxState): boolean {
 
     return !disableReactions;
 }
-
-/**
- * Returns true if the reactions buttons should be displayed anywhere on the page and false otherwise.
- *
- * @param {IReduxState} state - The redux state.
- * @returns {boolean}
- */
-export function shouldDisplayReactionsButtons(state: IReduxState): boolean {
-    return isReactionsEnabled(state) && !iAmVisitor(state);
-}

react/features/reactions/functions.web.ts

@@ -1,7 +1,7 @@
 import { IReduxState } from '../app/types';
 import { getToolbarButtons } from '../base/config/functions.web';
 
-import { shouldDisplayReactionsButtons } from './functions.any';
+import { isReactionsEnabled } from './functions.any';
 
 export * from './functions.any';
 
@@ -22,5 +22,5 @@ export function getReactionsMenuVisibility(state: IReduxState): boolean {
  * @returns {boolean}
  */
 export function isReactionsButtonEnabled(state: IReduxState) {
-    return Boolean(getToolbarButtons(state).includes('reactions')) && shouldDisplayReactionsButtons(state);
+    return Boolean(getToolbarButtons(state).includes('reactions')) && isReactionsEnabled(state);
 }

react/features/recording/actions.any.ts

@@ -404,7 +404,7 @@ export function stopLocalVideoRecording() {
  */
 export function showStartRecordingNotificationWithCallback(openRecordingDialog: Function) {
     return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
-        let state = getState();
+        const state = getState();
         const { recordings } = state['features/base/config'];
         const { suggestRecording } = recordings || {};
         const recordButtonProps = getRecordButtonProps(state);
@@ -427,9 +427,9 @@ export function showStartRecordingNotificationWithCallback(openRecordingDialog:
             customActionType: [ BUTTON_TYPES.PRIMARY ],
             customActionNameKey: [ 'notify.suggestRecordingAction' ],
             customActionHandler: [ () => {
-                state = getState();
                 const isModerator = isLocalParticipantModerator(state);
                 const { recordingService } = state['features/base/config'];
+
                 const canBypassDialog = isModerator
                     && recordingService?.enabled
                     && isJwtFeatureEnabled(state, 'recording', true);
@@ -450,7 +450,7 @@ export function showStartRecordingNotificationWithCallback(openRecordingDialog:
                     });
 
                     if (autoTranscribeOnRecord) {
-                        dispatch(setRequestingSubtitles(true, false, null));
+                        dispatch(setRequestingSubtitles(true, false));
                     }
                 } else {
                     openRecordingDialog();

react/features/recording/components/AbstractRecordingLabel.ts

@@ -2,10 +2,17 @@ import React, { Component } from 'react';
 import { WithTranslation } from 'react-i18next';
 
 import { IReduxState } from '../../app/types';
-import { isTranscribing } from '../../transcribing/functions';
-import { getSessionStatusToShow, isRecordingRunning } from '../functions';
-
+import { JitsiRecordingConstants } from '../../base/lib-jitsi-meet';
+import { getSessionStatusToShow } from '../functions';
 
+/**
+ * NOTE: Web currently renders multiple indicators if multiple recording
+ * sessions are running. This is however may not be a good UX as it's not
+ * obvious why there are multiple similar 'REC' indicators rendered. Mobile
+ * only renders one indicator if there is at least one recording session
+ * running. These boolean are shared across the two components to make it
+ * easier to align web's behaviour to mobile's later if necessary.
+ */
 interface IProps extends WithTranslation {
 
     /**
@@ -13,16 +20,6 @@ interface IProps extends WithTranslation {
      */
     _iAmRecorder: boolean;
 
-    /**
-     * Whether the recording is currently running.
-     */
-    _isRecordingRunning: boolean;
-
-    /**
-     * Whether this meeting is being transcribed.
-     */
-    _isTranscribing: boolean;
-
     /**
      * The status of the higher priority session.
      */
@@ -50,17 +47,79 @@ interface IState {
     staleLabel: boolean;
 }
 
+/**
+ * The timeout after a label is considered stale. See {@code _updateStaleStatus}
+ * for more details.
+ */
+const STALE_TIMEOUT = 10 * 1000;
+
 /**
  * Abstract class for the {@code RecordingLabel} component.
  */
 export default class AbstractRecordingLabel extends Component<IProps, IState> {
+    _mounted: boolean;
+
+    /**
+     * Implements {@code Component#getDerivedStateFromProps}.
+     *
+     * @inheritdoc
+     */
+    static getDerivedStateFromProps(props: IProps, prevState: IState) {
+        return {
+            staleLabel: props._status !== JitsiRecordingConstants.status.OFF
+                && prevState.staleLabel ? false : prevState.staleLabel
+        };
+    }
+
+    /**
+     * Initializes a new {@code AbstractRecordingLabel} component.
+     *
+     * @inheritdoc
+     */
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            staleLabel: true
+        };
+
+        this._updateStaleStatus(undefined, props);
+    }
+
+    /**
+     * Implements React {@code Component}'s componentDidMount.
+     *
+     * @inheritdoc
+     */
+    componentDidMount() {
+        this._mounted = true;
+    }
+
+    /**
+     * Implements React {@code Component}'s componentWillUnmount.
+     *
+     * @inheritdoc
+     */
+    componentWillUnmount() {
+        this._mounted = false;
+    }
+
+    /**
+     * Implements {@code Component#componentDidUpdate}.
+     *
+     * @inheritdoc
+     */
+    componentDidUpdate(prevProps: IProps) {
+        this._updateStaleStatus(prevProps, this.props);
+    }
+
     /**
      * Implements React {@code Component}'s render.
      *
      * @inheritdoc
      */
     render() {
-        return this.props._isRecordingRunning && !this.props._iAmRecorder
+        return this.props._status && !this.state.staleLabel && !this.props._iAmRecorder
             ? this._renderLabel() : null;
     }
 
@@ -73,6 +132,33 @@ export default class AbstractRecordingLabel extends Component<IProps, IState> {
     _renderLabel(): React.ReactNode | null {
         return null;
     }
+
+    /**
+     * Updates the stale status of the label on a prop change. A label is stale
+     * if it's in a {@code _status} that doesn't need to be rendered anymore.
+     *
+     * @param {IProps} oldProps - The previous props of the component.
+     * @param {IProps} newProps - The new props of the component.
+     * @returns {void}
+     */
+    _updateStaleStatus(oldProps: IProps | undefined, newProps: IProps) {
+        if (newProps._status === JitsiRecordingConstants.status.OFF) {
+            if (oldProps?._status !== JitsiRecordingConstants.status.OFF) {
+                setTimeout(() => {
+                    if (!this._mounted) {
+                        return;
+                    }
+
+                    // Only if it's still OFF.
+                    if (this.props._status === JitsiRecordingConstants.status.OFF) {
+                        this.setState({
+                            staleLabel: true
+                        });
+                    }
+                }, STALE_TIMEOUT);
+            }
+        }
+    }
 }
 
 /**
@@ -90,9 +176,7 @@ export function _mapStateToProps(state: IReduxState, ownProps: any) {
     const { mode } = ownProps;
 
     return {
-        _isRecordingRunning: isRecordingRunning(state),
         _iAmRecorder: Boolean(state['features/base/config'].iAmRecorder),
-        _isTranscribing: isTranscribing(state),
         _status: getSessionStatusToShow(state, mode)
     };
 }

react/features/recording/components/LiveStream/AbstractLiveStreamButton.ts

@@ -7,7 +7,7 @@ import { isLocalParticipantModerator } from '../../../base/participants/function
 import AbstractButton, { IProps as AbstractButtonProps } from '../../../base/toolbox/components/AbstractButton';
 import { isInBreakoutRoom } from '../../../breakout-rooms/functions';
 import { maybeShowPremiumFeatureDialog } from '../../../jaas/actions';
-import { getActiveSession, isCloudRecordingRunning } from '../../functions';
+import { getActiveSession } from '../../functions';
 
 import { getLiveStreaming } from './functions';
 
@@ -140,7 +140,7 @@ export function _mapStateToProps(state: IReduxState, ownProps: IProps) {
     }
 
     // disable the button if the recording is running.
-    if (visible && isCloudRecordingRunning(state)) {
+    if (visible && getActiveSession(state, JitsiRecordingConstants.mode.FILE)) {
         _disabled = true;
         _tooltip = 'dialog.liveStreamingDisabledBecauseOfActiveRecordingTooltip';
     }