chore(rn, versions): bump app and SDK versions

2026-01-10 08:40:18 +00:00 · 2024-07-31 18:12:33 +03:00
238 changed files with 1297 additions and 3582 deletions
--- a/.github/ISSUE_TEMPLATE/1-bug.yml
+++ b/.github/ISSUE_TEMPLATE/1-bug.yml
@@ -30,10 +30,12 @@ body:
        - label: Android mobile app
        - label: iOS mobile app
        - label: Custom app using a mobile SDK
+    validations:
+      required: true
  - type: input
    attributes:
      label: Browser / app / sdk version
-      description: Please provide the version of the browser / app / sdk where the problem manifests.
+      description: Please provice the version of the browser / app / sdk where the problem manifests.
    validations:
      required: true
  - type: textarea
--- a/4
+++ b/4
@@ -24,9 +24,9 @@ else
 	WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack serve --mode development
 endif

-all: compile deploy
+all: compile deploy clean

-compile: clean
+compile:
 	NODE_OPTIONS=--max-old-space-size=8192 \
 	$(WEBPACK)

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,6 +4,6 @@

 We take security very seriously and develop all Jitsi projects to be secure and safe.

-If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8-bounty) or send us an email to security@jitsi.org. 
+If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8) or send us an email to security@jitsi.org. 

 **We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.**
--- a/android/app/src/main/java/org/jitsi/meet/MainActivity.java
+++ b/android/app/src/main/java/org/jitsi/meet/MainActivity.java
@@ -211,6 +211,11 @@ public class MainActivity extends JitsiMeetActivity {
        super.onPictureInPictureModeChanged(isInPictureInPictureMode);

        Log.d(TAG, "Is in picture-in-picture mode: " + isInPictureInPictureMode);
+
+        if (!isInPictureInPictureMode) {
+            this.startActivity(new Intent(this, getClass())
+                .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT));
+        }
    }

    // Helper methods
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -26,5 +26,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false

-appVersion=99.0.0
-sdkVersion=99.0.0
+appVersion=24.3.0
+sdkVersion=9.3.0
--- a/android/scripts/release-sdk.sh
+++ b/android/scripts/release-sdk.sh
@@ -10,6 +10,7 @@ MVN_HTTP=0
 DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
 JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1 | cut -c 2-)
+DO_GIT_TAG=${GIT_TAG:-0}

 if [[ $THE_MVN_REPO == http* ]]; then
    MVN_HTTP=1
@@ -66,12 +67,15 @@ pushd ${THIS_DIR}/../
 ./gradlew publish
 popd

-# The artifacts are now on the Maven repo, commit them
-if [[ $MVN_HTTP == 0 ]]; then
+if [[ $DO_GIT_TAG == 1 ]]; then
+    # The artifacts are now on the Maven repo, commit them
    pushd ${MVN_REPO_PATH}
    git add -A .
    git commit -m "Jitsi Meet SDK + dependencies: ${SDK_VERSION}"
    popd
+
+    # Tag the release
+    git tag android-sdk-${SDK_VERSION}
 fi

 # Done!
--- a/android/scripts/run-packager-helper.command
+++ b/android/scripts/run-packager-helper.command
@@ -2,4 +2,4 @@

 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)

-exec ${THIS_DIR}/../../node_modules/react-native/scripts/packager.sh --reset-cache
+exec ${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command --reset-cache
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
@@ -54,8 +54,6 @@ public class JitsiMeetActivity extends AppCompatActivity
    private static final String ACTION_JITSI_MEET_CONFERENCE = "org.jitsi.meet.CONFERENCE";
    private static final String JITSI_MEET_CONFERENCE_OPTIONS = "JitsiMeetConferenceOptions";

-    private boolean isReadyToClose;
-
    private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
@@ -126,8 +124,6 @@ public class JitsiMeetActivity extends AppCompatActivity

    @Override
    public void onDestroy() {
-        JitsiMeetLogger.i("onDestroy()");
-
        // Here we are trying to handle the following corner case: an application using the SDK
        // is using this Activity for displaying meetings, but there is another "main" Activity
        // with other content. If this Activity is "swiped out" from the recent list we will get
@@ -135,10 +131,7 @@ public class JitsiMeetActivity extends AppCompatActivity
        // current meeting, but when our view is detached from React the JS <-> Native bridge won't
        // be operational so the external API won't be able to notify the native side that the
        // conference terminated. Thus, try our best to clean up.
-        if (!isReadyToClose) {
-            JitsiMeetLogger.i("onDestroy(): leaving...");
-            leave();
-        }
+        leave();

        this.jitsiView = null;

@@ -156,12 +149,8 @@ public class JitsiMeetActivity extends AppCompatActivity

    @Override
    public void finish() {
-        if (!isReadyToClose) {
-            JitsiMeetLogger.i("finish(): leaving...");
-            leave();
-        }
+        leave();

-        JitsiMeetLogger.i("finish(): finishing...");
        super.finish();
    }

@@ -181,8 +170,8 @@ public class JitsiMeetActivity extends AppCompatActivity
    }

    public void join(JitsiMeetConferenceOptions options) {
-        if (this.jitsiView != null) {
-            this.jitsiView.join(options);
+        if (this.jitsiView  != null) {
+            this.jitsiView .join(options);
        } else {
            JitsiMeetLogger.w("Cannot join, view is null");
        }
@@ -263,7 +252,6 @@ public class JitsiMeetActivity extends AppCompatActivity

    protected void onReadyToClose() {
        JitsiMeetLogger.i("SDK is ready to close");
-        isReadyToClose = true;
        finish();
    }

--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java
@@ -270,6 +270,11 @@ public class JitsiMeetConferenceOptions implements Parcelable {
    Bundle asProps() {
        Bundle props = new Bundle();

+        // Android always has the PiP flag set by default.
+        if (!featureFlags.containsKey("pip.enabled")) {
+            featureFlags.putBoolean("pip.enabled", true);
+        }
+
        props.putBundle("flags", featureFlags);

        Bundle urlProps = new Bundle();
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
@@ -51,34 +51,30 @@ import java.util.Random;
 *
 * See: https://developer.android.com/guide/components/services
 */
-public class JitsiMeetOngoingConferenceService extends Service implements OngoingConferenceTracker.OngoingConferenceListener {
+public class JitsiMeetOngoingConferenceService extends Service
+    implements OngoingConferenceTracker.OngoingConferenceListener {
    private static final String TAG = JitsiMeetOngoingConferenceService.class.getSimpleName();
-    private static final String ACTIVITY_DATA_KEY = "activityDataKey";
    private static final String EXTRA_DATA_KEY = "extraDataKey";
    private static final String EXTRA_DATA_BUNDLE_KEY = "extraDataBundleKey";
    private static final String IS_AUDIO_MUTED_KEY = "isAudioMuted";

-    private static final int PERMISSIONS_REQUEST_CODE = (int) (Math.random() * Short.MAX_VALUE);
-
    private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver();

+    private static final int PERMISSIONS_REQUEST_CODE = (int) (Math.random() * Short.MAX_VALUE);
+
    private boolean isAudioMuted;
-    private Class tapBackActivity;

    static final int NOTIFICATION_ID = new Random().nextInt(99999) + 10000;

    private static void doLaunch(Context context, HashMap<String, Object> extraData) {
-        Activity activity = (Activity) context;

-        OngoingNotification.createNotificationChannel(activity);
+        OngoingNotification.createNotificationChannel((Activity) context);

        Intent intent = new Intent(context, JitsiMeetOngoingConferenceService.class);

        Bundle extraDataBundle = new Bundle();
        extraDataBundle.putSerializable(EXTRA_DATA_KEY, extraData);
-
        intent.putExtra(EXTRA_DATA_BUNDLE_KEY, extraDataBundle);
-        intent.putExtra(ACTIVITY_DATA_KEY, activity.getClass().getCanonicalName());

        ComponentName componentName;

@@ -158,7 +154,7 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin
    public void onCreate() {
        super.onCreate();

-        Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, this, tapBackActivity);
+        Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, this);
        if (notification == null) {
            stopSelf();
            JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
@@ -194,28 +190,13 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin

    @Override
    public int onStartCommand(Intent intent, int flags, int startId) {
-        final String actionName = intent.getAction();
-        final Action action = Action.fromName(actionName);

-        if (action != Action.HANGUP) {
-            Boolean isAudioMuted = tryParseIsAudioMuted(intent);
+        Boolean isAudioMuted = tryParseIsAudioMuted(intent);

-            if (isAudioMuted != null) {
-                this.isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
-            }
+        if (isAudioMuted != null) {
+            this.isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));

-            if (tapBackActivity == null) {
-                String targetActivityName = intent.getExtras().getString(ACTIVITY_DATA_KEY);
-                Class<? extends Activity> targetActivity = null;
-                try {
-                    targetActivity = Class.forName(targetActivityName).asSubclass(Activity.class);
-                    tapBackActivity = targetActivity;
-                } catch (ClassNotFoundException e) {
-                    JitsiMeetLogger.w(TAG + " Could not find target Activity: " + targetActivityName);
-                }
-            }
-
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(this.isAudioMuted, this, tapBackActivity);
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, this);
            if (notification == null) {
                stopSelf();
                JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
@@ -225,6 +206,9 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin
            }
        }

+        final String actionName = intent.getAction();
+        final Action action = Action.fromName(actionName);
+
        // When starting the service, there is no action passed in the intent
        if (action != null) {
            switch (action) {
@@ -297,9 +281,8 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin

        @Override
        public void onReceive(Context context, Intent intent) {
-            Class tapBackActivity = JitsiMeetOngoingConferenceService.this.tapBackActivity;
            isAudioMuted = Boolean.parseBoolean(intent.getStringExtra("muted"));
-            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, context, tapBackActivity);
+            Notification notification = OngoingNotification.buildOngoingConferenceNotification(isAudioMuted, context);
            if (notification == null) {
                stopSelf();
                JitsiMeetLogger.w(TAG + " Couldn't update service, notification is null");
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
@@ -73,13 +73,14 @@ class OngoingNotification {
        notificationManager.createNotificationChannel(channel);
    }

-    static Notification buildOngoingConferenceNotification(Boolean isMuted, Context context, Class tapBackActivity) {
+    static Notification buildOngoingConferenceNotification(Boolean isMuted, Context context) {
+
        if (context == null) {
            JitsiMeetLogger.w(TAG + " Cannot create notification: no current context");
            return null;
        }

-        Intent notificationIntent = new Intent(context, tapBackActivity == null ? context.getClass() : tapBackActivity);
+        Intent notificationIntent = new Intent(context, context.getClass());
        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);

        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, ONGOING_CONFERENCE_CHANNEL_ID);
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@@ -205,6 +205,18 @@ class ReactInstanceManagerHolder {
                ? reactContext.getNativeModule(nativeModuleClass) : null;
    }

+    /**
+     * Gets the current {@link Activity} linked to React Native.
+     *
+     * @return An activity attached to React Native.
+     */
+    static Activity getCurrentActivity() {
+        ReactContext reactContext
+            = reactInstanceManager != null
+            ? reactInstanceManager.getCurrentReactContext() : null;
+        return reactContext != null ? reactContext.getCurrentActivity() : null;
+    }
+
    static ReactInstanceManager getReactInstanceManager() {
        return reactInstanceManager;
    }
--- a/conference.js
+++ b/conference.js
@@ -111,7 +111,6 @@ import {
 import {
    getLocalParticipant,
    getNormalizedDisplayName,
-    getParticipantByIdOrUndefined,
    getVirtualScreenshareParticipantByOwnerId
 } from './react/features/base/participants/functions';
 import { updateSettings } from './react/features/base/settings/actions';
@@ -1776,17 +1775,12 @@ export default {
        room.addCommandListener(
            this.commands.defaults.AVATAR_URL,
            (data, from) => {
-                const participant = getParticipantByIdOrUndefined(APP.store, from);
-
-                // if already set from presence(jwt), skip the command processing
-                if (!participant?.avatarURL) {
-                    APP.store.dispatch(
-                        participantUpdated({
-                            conference: room,
-                            id: from,
-                            avatarURL: data.value
-                        }));
-                }
+                APP.store.dispatch(
+                    participantUpdated({
+                        conference: room,
+                        id: from,
+                        avatarURL: data.value
+                    }));
            });

        room.on(
--- a/config.js
+++ b/config.js
@@ -232,26 +232,9 @@ var config = {
    // Sets the preferred resolution (height) for local video. Defaults to 720.
    // resolution: 720,

-    // DEPRECATED. Please use raisedHands.disableRemoveRaisedHandOnFocus instead.
    // Specifies whether the raised hand will hide when someone becomes a dominant speaker or not
    // disableRemoveRaisedHandOnFocus: false,

-    // Specifies which raised hand related config should be set.
-    // raisedHands: {
-    //     // Specifies whether the raised hand can be lowered by moderator.
-    //     disableLowerHandByModerator: false,
-
-    //     // Specifies whether there is a notification before hiding the raised hand
-    //     // when someone becomes the dominant speaker.
-    //     disableLowerHandNotification: true,
-
-    //     // Specifies whether there is a notification when you are the next speaker in line.
-    //     disableNextSpeakerNotification: false,
-
-    //     // Specifies whether the raised hand will hide when someone becomes a dominant speaker or not.
-    //     disableRemoveRaisedHandOnFocus: false,
-    // },
-
    // speakerStats: {
    //     // Specifies whether the speaker stats is enable or not.
    //     disabled: false,
@@ -1443,13 +1426,6 @@ var config = {
    */
    // dynamicBrandingUrl: '',

-    // A list of allowed URL domains for shared video.
-    //
-    // NOTE:
-    // '*' is allowed value and it will allow any URL to be used for shared video. We do not recommend using '*',
-    // use it at your own risk!
-    // sharedVideoAllowedURLDomains: [ ],
-
    // Options related to the participants pane.
    // participantsPane: {
    //     // Enables feature
@@ -1573,17 +1549,6 @@ var config = {
    // and will automatically redirect to the token service to get the token for the meeting.
    // tokenAuthUrlAutoRedirect: false

-    // You can put an array of values to target different entity types in the invite dialog.
-    // Valid values are "phone", "room", "sip", "user", "videosipgw" and "email"
-    // peopleSearchQueryTypes: ["user", "email"],
-    // Directory endpoint which is called for invite dialog autocomplete
-    // peopleSearchUrl: "https://myservice.com/api/people",
-    // Endpoint which is called to send invitation requests
-    // inviteServiceUrl: "https://myservice.com/api/invite",
-
-    // For external entities (e. g. email), the localStorage key holding the token value for directory authentication
-    // peopleSearchTokenLocation: "mytoken",
-
    // List of undocumented settings used in jitsi-meet
    /**
     _immediateReloadThreshold
@@ -1600,6 +1565,8 @@ var config = {
     iAmRecorder
     iAmSipGateway
     microsoftApiApplicationClientID
+     peopleSearchQueryTypes
+     peopleSearchUrl
     requireDisplayName
     */

@@ -1780,6 +1747,8 @@ var config = {
    //     tileTime: 5000,
    //     // Limit results by rating: g, pg, pg-13, r. Default value: g.
    //     rating: 'pg',
+    //     // The proxy server url for giphy requests in the web app.
+    //     proxyUrl: 'https://giphy-proxy.example.com',
    // },

    // Logging
--- a/css/_transcription-subtitles.scss
+++ b/css/_transcription-subtitles.scss
@@ -0,0 +1,26 @@
+.transcription-subtitles {
+    bottom: $newToolbarSize + 40px;
+    font-size: 16px;
+    font-weight: 1000;
+    left: 50%;
+    max-width: 50vw;
+    opacity: 0.80;
+    overflow-wrap: break-word;
+    pointer-events: none;
+    position: absolute;
+    text-shadow: 0px 0px 1px rgba(0,0,0,0.3),
+    0px 1px 1px rgba(0,0,0,0.3),
+    1px 0px 1px rgba(0,0,0,0.3),
+    0px 0px 1px rgba(0,0,0,0.3);
+    transform: translateX(-50%);
+    z-index: 7;
+
+    &.lifted {
+        // Lift subtitle above toolbar+dominant speaker box.
+        bottom: $newToolbarSize + 36px + 40px;
+    }
+
+    span {
+        background: black;
+    }
+}
--- a/css/filmstrip/_tile_view_overrides.scss
+++ b/css/filmstrip/_tile_view_overrides.scss
@@ -18,7 +18,8 @@
     */
    #dominantSpeaker,
    #largeVideoElementsContainer,
-    #sharedVideo {
+    #sharedVideo,
+    .stage-participant-label {
        display: none;
    }

--- a/css/main.scss
+++ b/css/main.scss
@@ -61,6 +61,7 @@ $flagsImagePath: "../images/";
@import 'filmstrip/vertical_filmstrip_overrides';
@import 'unsupported-browser/main';
@import 'deep-linking/main';
+@import 'transcription-subtitles';
@import '_meetings_list.scss';
@import 'navigate_section_list';
@import 'third-party-branding/google';
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,7 @@ Description: WebRTC JavaScript video conferences

 Package: jitsi-meet-web-config
 Architecture: all
-Pre-Depends: nginx | nginx-full | nginx-extras | openresty | apache2
-Depends: openssl, curl
+Depends: openssl, nginx | nginx-full | nginx-extras | openresty | apache2, curl
 Description: Configuration for web serving of Jitsi Meet
 Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
 Videobridge to provide high quality, scalable video conferences.
--- a/debian/jitsi-meet-prosody.postinst
+++ b/debian/jitsi-meet-prosody.postinst
@@ -252,10 +252,9 @@ case "$1" in
        if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
            invoke-rc.d prosody restart || true

-            # In case we had updated the certificates and restarted prosody, let's restart and the bridge and jicofo if possible
+            # In case we had updated the certificates and restarted prosody, let's restart and the bridge if possible
            if [ -d /run/systemd/system ] && [ "$CERT_ADDED_TO_TRUST" = "true" ]; then
                systemctl restart jitsi-videobridge2.service >/dev/null || true
-                systemctl restart jicofo.service >/dev/null || true
            fi
        fi
    ;;
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@@ -154,8 +154,6 @@ server {
        proxy_pass http://127.0.0.1:8888/conference-request/v1$1;
        add_header "Cache-Control" "no-cache, no-store";
        add_header 'Access-Control-Allow-Origin' '*';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Content-Type';
    }
    location ~ ^/([^/?&:'"]+)/conference-request/v1(\/.*)?$ {
        rewrite ^/([^/?&:'"]+)/conference-request/v1(\/.*)?$ /conference-request/v1$2;
--- a/index.html
+++ b/index.html
@@ -69,11 +69,6 @@

        window.indexLoadedTime = window.performance.now();
        console.log("(TIME) index.html loaded:\t", indexLoadedTime);
-        window.addEventListener('load', function() {
-            window.loadedEventTime = window.performance.now();
-            console.log("(TIME) window loaded event:\t", loadedEventTime);
-        });
-
        // XXX the code below listeners for errors and displays an error message
        // in the document body when any of the required files fails to load.
        // The intention is to prevent from displaying broken page.
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -5,7 +5,7 @@ require Pod::Executable.execute_command('node', ['-p',
    {paths: [process.argv[1]]},
  )', __dir__]).strip

-platform :ios, '15.1'
+platform :ios, '13.4'
 workspace 'jitsi-meet'

 install! 'cocoapods', :deterministic_uuids => false
@@ -92,7 +92,7 @@ post_install do |installer|
    end
    target.build_configurations.each do |config|
      config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.1'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.4'
      config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -no-verify-emitted-module-interface'
    end
  end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1022,7 +1022,7 @@ PODS:
    - React-Core
  - react-native-performance (5.0.0):
    - React-Core
-  - react-native-safe-area-context (4.10.8):
+  - react-native-safe-area-context (4.7.1):
    - React-Core
  - react-native-slider (4.4.3):
    - React-Core
@@ -1034,7 +1034,7 @@ PODS:
  - react-native-video/Video (6.0.0-alpha.11):
    - PromisesSwift
    - React-Core
-  - react-native-webrtc (124.0.4):
+  - react-native-webrtc (124.0.3):
    - JitsiWebRTC (~> 124.0.0)
    - React-Core
  - react-native-webview (13.8.7):
@@ -1214,7 +1214,7 @@ PODS:
    - React-Core
  - RNDeviceInfo (10.9.0):
    - React-Core
-  - RNGestureHandler (2.18.1):
+  - RNGestureHandler (2.17.1):
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
@@ -1558,11 +1558,11 @@ SPEC CHECKSUMS:
  react-native-orientation-locker: 4409c5b12b65f942e75449872b4f078b6f27af81
  react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
  react-native-performance: 47ac22ebf2aa24f324a96a5825581f6ce18c09e8
-  react-native-safe-area-context: b7daa1a8df36095a032dff095a1ea8963cb48371
+  react-native-safe-area-context: 9697629f7b2cda43cf52169bb7e0767d330648c2
  react-native-slider: 1cdd6ba29675df21f30544253bf7351d3c2d68c4
  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
  react-native-video: 472b7c366eaaaa0207e546d9a50410df89790bcf
-  react-native-webrtc: 48295e7228279470c4f5acb38570e170723bd3b2
+  react-native-webrtc: 41f6602490c618e3ec0e2108e46b84e2c731c127
  react-native-webview: a9663e81c7acc865b88632e43a164838f00745f6
  React-nativeconfig: 2e44d0d2dd222b12a5183f4bcaa4a91881497acb
  React-NativeModulesApple: 464a9590389efd364d45d726a35ef7ade6b5c59a
@@ -1589,7 +1589,7 @@ SPEC CHECKSUMS:
  RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
  RNDefaultPreference: 08bdb06cfa9188d5da97d4642dac745218d7fb31
  RNDeviceInfo: 02ea8b23e2280fa18e00a06d7e62804d74028579
-  RNGestureHandler: 1155b1898ceddefeebf77792927360d44fe11e77
+  RNGestureHandler: 67d3f1f69d4d0c98d6e83f4229e3bbf997d1dc72
  RNGoogleSignin: a6a612cce56a45ab701c5c5c6e36f5390522d100
  RNScreens: e842cdccb23c0a084bd6307f6fa83fd1c1738029
  RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
@@ -1598,6 +1598,6 @@ SPEC CHECKSUMS:
  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
  Yoga: e5b887426cee15d2a326bdd34afc0282fc0486ad

-PODFILE CHECKSUM: 79119d2af4f01a2584749dc3926902e66572d896
+PODFILE CHECKSUM: 513caf6e662086d8bae95a064c18423f0c07fa01

 COCOAPODS: 1.15.2
--- a/ios/app/app.xcodeproj/project.pbxproj
+++ b/ios/app/app.xcodeproj/project.pbxproj
@@ -880,11 +880,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
 				PRODUCT_NAME = "jitsi-meet";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -914,11 +909,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
 				PRODUCT_NAME = "jitsi-meet";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -950,10 +940,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.broadcast.extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -989,10 +975,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.broadcast.extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
-				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1052,7 +1034,7 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
@@ -1114,7 +1096,7 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
--- a/ios/app/broadcast-extension/Info.plist
+++ b/ios/app/broadcast-extension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
--- a/ios/app/src/Info.plist
+++ b/ios/app/src/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
--- a/ios/app/watchos/app/Info.plist
+++ b/ios/app/watchos/app/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>
--- a/ios/app/watchos/extension/Info.plist
+++ b/ios/app/watchos/extension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>24.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>
--- a/ios/scripts/release-sdk-lite.sh
+++ b/ios/scripts/release-sdk-lite.sh
@@ -1,12 +1,14 @@
 #!/bin/bash

-set -e -u -x
+set -e -u

 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 PROJECT_REPO=$(realpath ${THIS_DIR}/../..)
 RELEASE_REPO=$(realpath ${THIS_DIR}/../../../jitsi-meet-ios-sdk-releases)
 DEFAULT_SDK_VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" ${THIS_DIR}/../sdk/src/Lite-Info.plist)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
+DO_GIT_TAG=${GIT_TAG:-0}
+

 echo "Releasing Jitsi Meet SDK Lite ${SDK_VERSION}"

@@ -48,6 +50,9 @@ xcodebuild -create-xcframework \
    -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
    -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
    -output ios/sdk/out/JitsiMeetSDK.xcframework
+if [[ $DO_GIT_TAG == 1 ]]; then
+    git tag ios-sdk-lite-${SDK_VERSION}
+fi
 popd

 pushd ${RELEASE_REPO}
@@ -56,9 +61,11 @@ pushd ${RELEASE_REPO}
 cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeetSDK.xcframework lite/Frameworks/

 # Add all files to git
-git add -A .
-git commit --allow-empty -m "${SDK_VERSION} lite"
-git tag "${SDK_VERSION}-lite"
+if [[ $DO_GIT_TAG == 1 ]]; then
+    git add -A .
+    git commit -m "${SDK_VERSION} lite"
+    git tag "${SDK_VERSION}-lite"
+fi

 popd

--- a/ios/scripts/release-sdk.sh
+++ b/ios/scripts/release-sdk.sh
@@ -1,12 +1,14 @@
 #!/bin/bash

-set -e -u -x
+set -e -u

 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 PROJECT_REPO=$(realpath ${THIS_DIR}/../..)
 RELEASE_REPO=$(realpath ${THIS_DIR}/../../../jitsi-meet-ios-sdk-releases)
 DEFAULT_SDK_VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" ${THIS_DIR}/../sdk/src/Info.plist)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
+DO_GIT_TAG=${GIT_TAG:-0}
+

 echo "Releasing Jitsi Meet SDK ${SDK_VERSION}"

@@ -48,6 +50,9 @@ xcodebuild -create-xcframework \
    -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
    -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
    -output ios/sdk/out/JitsiMeetSDK.xcframework
+if [[ $DO_GIT_TAG == 1 ]]; then
+    git tag ios-sdk-${SDK_VERSION}
+fi
 popd

 pushd ${RELEASE_REPO}
@@ -56,9 +61,11 @@ pushd ${RELEASE_REPO}
 cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeetSDK.xcframework Frameworks/

 # Add all files to git
-git add -A .
-git commit --allow-empty -m "${SDK_VERSION}"
-git tag "${SDK_VERSION}"
+if [[ $DO_GIT_TAG == 1 ]]; then
+    git add -A .
+    git commit -m "${SDK_VERSION}"
+    git tag ${SDK_VERSION}
+fi

 popd

--- a/ios/scripts/run-packager-helper.command
+++ b/ios/scripts/run-packager-helper.command
@@ -2,4 +2,4 @@

 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)

-exec ${THIS_DIR}/../../node_modules/react-native/scripts/packager.sh --reset-cache
+exec ${THIS_DIR}/../../node_modules/react-native/scripts/launchPackager.command --reset-cache
--- a/ios/sdk/sdk.xcodeproj/project.pbxproj
+++ b/ios/sdk/sdk.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 46;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -776,7 +776,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
@@ -841,7 +841,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
@@ -873,24 +873,16 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				INFOPLIST_FILE = src/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -910,23 +902,15 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				INFOPLIST_FILE = src/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -951,24 +935,16 @@
 					"JITSI_MEET_SDK_LITE=1",
 				);
 				INFOPLIST_FILE = "src/Lite-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
 				PRODUCT_NAME = JitsiMeetSDK;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -993,23 +969,15 @@
 					JITSI_MEET_SDK_LITE,
 				);
 				INFOPLIST_FILE = "src/Lite-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;
 				PRODUCT_NAME = JitsiMeetSDK;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
-				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
-				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
--- a/ios/sdk/src/Info.plist
+++ b/ios/sdk/src/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>9.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
--- a/ios/sdk/src/Lite-Info.plist
+++ b/ios/sdk/src/Lite-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>9.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
--- a/lang/main-de.json
+++ b/lang/main-de.json
@@ -439,10 +439,7 @@
        "shareScreenWarningD2": "müssen Sie Ihre Audiofreigabe stoppen und dann die Bildschirmfreigabe mit der Option \"Audio freigeben\" starten.",
        "shareScreenWarningH1": "Wenn Sie Ihren Bildschirm freigeben wollen:",
        "shareScreenWarningTitle": "Sie müssen die Audiofreigabe beenden, bevor Sie den Bildschirm freigeben können",
-        "shareVideoConfirmPlay": "Sie öffnen dazu eine externe Seite. Möchten Sie fortfahren?",
-        "shareVideoConfirmPlayTitle": "{{name}} hat mit Ihnen ein Video geteilt.",
        "shareVideoLinkError": "Bitte einen gültigen Link angeben.",
-        "shareVideoLinkStopped": "Das Video von {{name}} wurde gestoppt.",
        "shareVideoTitle": "Video teilen",
        "shareYourScreen": "Bildschirmfreigabe ein-/ausschalten",
        "shareYourScreenDisabled": "Bildschirmfreigabe deaktiviert.",
@@ -789,7 +786,6 @@
        "newDeviceAction": "Verwenden",
        "newDeviceAudioTitle": "Neues Audiogerät erkannt",
        "newDeviceCameraTitle": "Neue Kamera erkannt",
-        "nextToSpeak": "Sie sind als Nächstes an der Reihe zu sprechen",
        "noiseSuppressionDesktopAudioDescription": "Die Rauschunterdrückung kann nicht genutzt werden, wenn der Computersound geteilt wird, bitte zuerst deaktivieren und dann nochmals versuchen.",
        "noiseSuppressionFailedTitle": "Rauschunterdrückung konnte nicht gestartet werden",
        "noiseSuppressionStereoDescription": "Rauschunterdrückung unterstützt aktuell keinen Stereoton.",
@@ -824,11 +820,8 @@
        "videoUnmuteBlockedDescription": "Die Kamera und Bildschirmfreigabe kann aus Überlastungsschutzgründen temporär nicht eingeschaltet werden.",
        "videoUnmuteBlockedTitle": "Kamera und Bildschirmfreigabe kann nicht aktiviert werden!",
        "viewLobby": "Lobby ansehen",
-        "viewParticipants": "Personen anzeigen",
        "viewVisitors": "Gäste anzeigen",
        "waitingParticipants": "{{waitingParticipants}} Personen",
-        "waitingVisitors": "In der Lobby wartende Gäste: {{waitingVisitors}}",
-        "waitingVisitorsTitle": "Die Konferenz wurde noch nicht gestartet!",
        "whiteboardLimitDescription": "Bitte speichern Sie Ihre Inhalte, da das Nutzungslimit bald erreicht wird und dann Ihr Whiteboard geschlossen wird.",
        "whiteboardLimitTitle": "Whiteboard-Nutzung"
    },
@@ -842,10 +835,7 @@
            "audioModeration": "Für sich selbst die Stummschaltung aufzuheben",
            "blockEveryoneMicCamera": "Kamera und Mikrofon von allen sperren",
            "breakoutRooms": "Breakout-Räume",
-            "goLive": "Live gehen",
            "invite": "Person einladen",
-            "lowerAllHands": "Alle Hände senken",
-            "lowerHand": "Hand senken",
            "moreModerationActions": "Weitere Moderationsoptionen",
            "moreModerationControls": "Weitere Moderationsoptionen",
            "moreParticipantOptions": "Mehr Optionen für Anwesende",
@@ -862,7 +852,6 @@
        "headings": {
            "lobby": "Lobby ({{count}})",
            "participantsList": "Anwesende ({{count}})",
-            "visitorInQueue": " (Wartende Gäste {{count}})",
            "visitorRequests": " (Anfragen {{count}})",
            "visitors": "Gäste ({{count}})",
            "waitingLobby": "In der Lobby ({{count}})"
@@ -876,13 +865,10 @@
    "pinnedParticipant": "Die Person ist angeheftet",
    "polls": {
        "answer": {
-            "edit": "Bearbeiten",
-            "send": "Senden",
            "skip": "Überspringen",
            "submit": "Speichern"
        },
        "by": "Von {{ name }}",
-        "closeButton": "Umfrage schließen",
        "create": {
            "addOption": "Antwort hinzufügen",
            "answerPlaceholder": "Antwort {{index}}",
@@ -892,8 +878,7 @@
            "pollQuestion": "Frage",
            "questionPlaceholder": "Eine Frage stellen",
            "removeOption": "Antwort entfernen",
-            "save": "Erstellen",
-            "send": "Senden"
+            "send": "Erstellen"
        },
        "errors": {
            "notUniqueOption": "Optionen müssen einzigartig sein"
@@ -1498,22 +1483,16 @@
    },
    "visitors": {
        "chatIndicator": "(Gast)",
-        "joinMeeting": {
-            "description": "Sie beobachten derzeit diese Konferenz.",
-            "raiseHand": "Hand heben",
-            "title": "Konferenz wird beigetreten",
-            "wishToSpeak": "Wenn Sie sprechen möchten, heben Sie bitte unten Ihre Hand und warten Sie auf die Zustimmung der Moderation"
-        },
        "labelTooltip": "Anzahl Gäste: {{count}}",
        "notification": {
            "demoteDescription": "Hierhin verschoben von {{actor}}, bitte melden Sie sich um teilzunehmen",
+            "description": "Bitte melden Sie sich um teilzunehmen",
            "noMainParticipantsDescription": "Eine Person muss die Konferenz starten. Bitte versuchen Sie es gleich noch einmal.",
            "noMainParticipantsTitle": "Diese Konferenz wurde noch nicht gestartet.",
            "noVisitorLobby": "Sie können nicht teilnehmen, solange die Lobby für diese Konferenz aktiviert ist.",
            "notAllowedPromotion": "Eine Person muss Ihre Anfrage erst erlauben.",
            "title": "Sie sind Gast in der Konferenz"
-        },
-        "waitingMessage": "Sie werden der Konferenz beitreten, sobald sie gestartet ist!"
+        }
    },
    "volumeSlider": "Lautstärkeregler",
    "welcomepage": {
--- a/lang/main-lv.json
+++ b/lang/main-lv.json
@@ -341,7 +341,7 @@
        "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Nav iespējams, kamēr ir aktīva ierakstīšana",
        "localUserControls": "Lokālo lietotāju kontroles",
        "lockMessage": "Neizdevās aizslēgt sapulci.",
-        "lockRoom": "Iestatīt sapulces $t(lockRoomPasswordUppercase)",
+        "lockRoom": "Pievienot sapulci $t(lockRoomPasswordUppercase)",
        "lockTitle": "Aizslēgšāna neizdevās",
        "login": "Pierakstīties",
        "loginQuestion": "Vai tiešām vēlaties pierakstīties un pamest sapulci?",
@@ -382,9 +382,9 @@
        "noDropboxToken": "Nav derīga Dropbox tokena",
        "password": "Parole",
        "passwordLabel": "Dalībnieks ir aizslēdzis sapulci. Lūdzu, ievadiet $t(lockRoomPassword), lai pievienotos.",
-        "passwordNotSupported": "Sapulces slēgšana ar $t(lockRoomPassword) netiek atbalstīta.",
-        "passwordNotSupportedTitle": "Slēgšana ar $t(lockRoomPasswordUppercase) netiek atbalstīta",
-        "passwordRequired": "Nepieciešams ievadīt $t(lockRoomPasswordUppercase)",
+        "passwordNotSupported": "Sapulces $t(lockRoomPassword) iestatīšana netiek atbalstīta.",
+        "passwordNotSupportedTitle": "$t(lockRoomPasswordUppercase) netiek atbalstīts",
+        "passwordRequired": "Nepieciešams $t(lockRoomPasswordUppercase)",
        "permissionCameraRequiredError": "Lai piedalītos konferencēs ar video, ir nepieciešama kameras atļauja. Lūdzu, piešķiriet to Iestatījumos",
        "permissionErrorTitle": "Nepieciešama atļauja",
        "permissionMicRequiredError": "Lai piedalītos konferencēs ar audio, nepieciešama mikrofona atļauja. Lūdzu, piešķiriet to Iestatījumos",
@@ -567,7 +567,7 @@
        "noRoom": "Iezvana numuram nav piesaistīta neviena sapulces telpa.",
        "noWhiteboard": "Nevarēja ielādēt tāfeli.",
        "numbers": "Iezvana numuri",
-        "password": "Ievadiet $t(lockRoomPasswordUppercase):",
+        "password": "$t(lockRoomPasswordUppercase):",
        "reachedLimit": "Jūs esat sasniedzis sava plāna limitu.",
        "sip": "SIP adrese",
        "sipAudioOnly": "Tikai SIP audio adrese",
@@ -604,7 +604,7 @@
        "showSpeakerStats": "Rādīt prezentētāja statistiku",
        "toggleChat": "Tērzētava (čats) (atvērt/aizvērt)",
        "toggleFilmstrip": "Kinolente (rādīt/nerādīt)",
-        "toggleParticipantsPane": "Rādīt/paslēpt dalībnieku paneli",
+        "toggleParticipantsPane": "Rādīt vai paslēpt dalībnieku paneli",
        "toggleScreensharing": "Pārslēgties starp kameru un ekrāna rādīšanu",
        "toggleShortcuts": "Atrās piekļuves taustiņi (rādīt/nerādīt)",
        "videoMute": "Kamera (iesl./izsl.)"
@@ -659,7 +659,7 @@
        "emailField": "Ievadiet savu e-pasta adresi",
        "enableDialogPasswordField": "Iestatīt paroli (neobligāti)",
        "enableDialogSubmit": "Iespējot",
-        "enableDialogText": "Vestibila režīms ļauj aizsargāt sapulci, ļaujot cilvēkiem tajā iekļūt tikai pēc moderatora apstiprinājuma.",
+        "enableDialogText": "Vestibila režīms ļauj aizsargāt sapulci, ļaujot cilvēkiem tajā iekļūt tikai pēc oficiāla moderatora apstiprinājuma.",
        "enterPasswordButton": "Ievadiet sapulces paroli",
        "enterPasswordTitle": "Ievadiet paroli, lai pievienotos sapulcei",
        "errorMissingPassword": "Lūdzu, ievadiet sapulces paroli",
@@ -719,8 +719,8 @@
        "wait": "Lūdzu, uzgaidiet, kamēr jūsu ieraksts tiek saglabāts",
        "yes": "Jā"
    },
-    "lockRoomPassword": "paroli",
-    "lockRoomPasswordUppercase": "Paroli",
+    "lockRoomPassword": "parole",
+    "lockRoomPasswordUppercase": "Parole",
    "lonelyMeetingExperience": {
        "button": "Uzaiciniet citus",
        "youAreAlone": "Jūs esat vienīgais sapulcē"
@@ -786,7 +786,6 @@
        "newDeviceAction": "Izmantot",
        "newDeviceAudioTitle": "Atrasta jauna audio ierīce",
        "newDeviceCameraTitle": "Atrasta jauna kamera",
-        "nextToSpeak": "Jūs esat nākamais runātājs rindā",
        "noiseSuppressionDesktopAudioDescription": "Darbvirsmas audio koplietošanas laikā nevar iespējot trokšņu slāpēšanu. Lūdzu, atspējojiet to un mēģiniet vēlreiz.",
        "noiseSuppressionFailedTitle": "Neizdevās sākt trokšņu slāpēšanu",
        "noiseSuppressionStereoDescription": "Stereo audio trokšņu slāpēšana pašlaik netiek atbalstīta.",
@@ -821,11 +820,8 @@
        "videoUnmuteBlockedDescription": "Kameras ieslēgšanas un darbvirsmas koplietošanas darbība ir īslaicīgi bloķēta sistēmas ierobežojumu dēļ.",
        "videoUnmuteBlockedTitle": "Kameras ieslēgšana un darbvirsmas koplietošana ir bloķēta!",
        "viewLobby": "Skatīt vestibilu",
-        "viewParticipants": "Skatīt dalībniekus",
        "viewVisitors": "Skatīt apmeklētājus",
        "waitingParticipants": "{{waitingParticipants}} personas",
-        "waitingVisitors": "Apmeklētāji gaida rindā: {{waitingVisitors}}",
-        "waitingVisitorsTitle": "Sanāksme vēl nav sākusies!",
        "whiteboardLimitDescription": "Lūdzu, saglabājiet savu progresu, jo drīz tiks sasniegts lietotāju limits un tāfele tiks aizvērta.",
        "whiteboardLimitTitle": "Tāfeles lietošana"
    },
@@ -839,10 +835,7 @@
            "audioModeration": "Ieslēgt savu skaņu",
            "blockEveryoneMicCamera": "Bloķēt visiem mikrofonu un kameru",
            "breakoutRooms": "Grupu istabas",
-            "goLive": "Sākt",
            "invite": "Uzaicināt",
-            "lowerAllHands": "Nolaist visas paceltās rokas",
-            "lowerHand": "Nolaist roku",
            "moreModerationActions": "Vairāk moderēšanas iespēju",
            "moreModerationControls": "Vairāk moderēšanas iespēju",
            "moreParticipantOptions": "Vairāk dalībnieku iespēju",
@@ -859,7 +852,6 @@
        "headings": {
            "lobby": "Vestibils ({{count}})",
            "participantsList": "Sapulces dalībnieki ({{count}})",
-            "visitorInQueue": " (gaida {{count}})",
            "visitorRequests": " (pieprasījumi {{count}})",
            "visitors": "Apmeklētāji ({{count}})",
            "waitingLobby": "Gaida vestibilā ({{count}})"
@@ -879,7 +871,6 @@
            "submit": "Iesniegt"
        },
        "by": "Pēc {{ name }} iniciatīvas",
-        "closeButton": "Slēgt aptauju",
        "create": {
            "addOption": "Pievienot opciju",
            "answerPlaceholder": "Opcija {{index}}",
@@ -1035,7 +1026,7 @@
        "localRecordingStartWarningTitle": "Apturiet ierakstīšanu, lai to saglabātu",
        "localRecordingVideoStop": "Apturot vide, tiks apturēta arī lokālā ierakstīšana. Vai tiešām vēlaties turpināt?",
        "localRecordingVideoWarning": "Lai ierakstītu video, tas ir jāieslēdz, uzsākot ierakstīšanu",
-        "localRecordingWarning": "Noteikti izvēlieties pašreizējo cilni, lai izmantotu pareizo video un audio. Ieraksts pašlaik ir ierobežots līdz 1 GB, kas ir aptuveni 100 minūtes.",
+        "localRecordingWarning": "Noteikti atlasiet pašreizējo cilni, lai izmantotu pareizo video un audio. Ieraksts pašlaik ir ierobežots līdz 1 GB, kas ir aptuveni 100 minūtes.",
        "loggedIn": "Pierakstījies kā {{userName}}",
        "noMicPermission": "Mikrofona ierakstu nevarēja izveidot. Lūdzu, piešķiriet atļauju lietot mikrofonu.",
        "noStreams": "Nav konstatēta audio vai video straume.",
@@ -1067,8 +1058,8 @@
        "pullToRefresh": "Pavilkt, lai atsvaidzinātu"
    },
    "security": {
-        "about": "Iestatiet sapulcei $t(lockRoomPassword). Dalībniekiem būs jānorāda $t(lockRoomPassword), lai viņi varētu pievienoties sapulcei.",
-        "aboutReadOnly": "Moderatora dalībnieki sapulcei var iestatīt $t(lockRoomPassword). Dalībniekiem būs jānorāda $t(lockRoomPassword), lai viņi varētu pievienoties sapulcei.",
+        "about": "Savai sapulcei pievienojiet $t(lockRoomPassword). Dalībniekiem būs jānorāda $t(lockRoomPassword), lai viņi varētu pievienoties sapulcei.",
+        "aboutReadOnly": "Moderatora dalībnieki sapulcei var pievienot $t(lockRoomPassword). Dalībniekiem būs jānorāda $t(lockRoomPassword), lai viņi varētu pievienoties sapulcei.",
        "insecureRoomNameWarningNative": "Istabas nosaukums nav drošs. Nevēlami dalībnieki var pievienoties jūsu sapulcei. {{recommendAction}} Uzziniet vairāk par tikšanās nodrošināšanu",
        "insecureRoomNameWarningWeb": "Istabas nosaukums nav drošs. Nevēlami dalībnieki var pievienoties jūsu sapulcei. {{recommendAction}} Uzziniet vairāk par to, kā nodrošināt atbilstību prasībām <a href=\"{{securityUrl}}\" rel=\"security\" target=\"_blank\">šeit</a>.",
        "title": "Drošības iespējas",
@@ -1092,7 +1083,7 @@
        "desktopShareHighFpsWarning": "Lielāks kadru nomaiņas ātrums darbvirsmas koplietošanai var ietekmēt joslas platumu. Lai jaunie iestatījumi stātos spēkā, ir jārestartē ekrāna kopīgošana.",
        "desktopShareWarning": "Lai jaunie iestatījumi stātos spēkā, ir jārestartē ekrāna kopīgošana.",
        "devices": "Ierīces",
-        "followMe": "Visi seko man",
+        "followMe": "Visi man seko",
        "framesPerSecond": "kadri sekundē",
        "incomingMessage": "Ienākošā ziņa",
        "language": "Valoda",
@@ -1117,7 +1108,7 @@
        "selfView": "Pašskats",
        "shortcuts": "Īsceļi",
        "speakers": "Skaļruņi",
-        "startAudioMuted": "Dalībnieki pievienojas ar izslēgtu mikrofonu",
+        "startAudioMuted": "Dalībnieki pievienojas ar izslēgtu skaņu",
        "startReactionsMuted": "Izslēgt reakcijas skaņas visiem",
        "startVideoMuted": "Dalībnieki pievienojas ar izslēgtu kameru",
        "talkWhileMuted": "Runā, kad izslēgta skaņa",
@@ -1495,22 +1486,16 @@
    },
    "visitors": {
        "chatIndicator": "(apmeklētājs)",
-        "joinMeeting": {
-            "description": "Jūs pašlaik esat novērotājs šajā konferencē.",
-            "raiseHand": "Pacelt roku",
-            "title": "Pievienošanās sapulcei",
-            "wishToSpeak": "Ja vēlaties runāt, lūdzu, paceliet roku zemāk un gaidiet moderatora apstiprinājumu."
-        },
        "labelTooltip": "Apmeklētāju skaits: {{count}}",
        "notification": {
            "demoteDescription": "{{actor}} pārveidoja par apmeklētāju, paceliet roku, lai piedalītos",
+            "description": "Paceliet roku, lai piedalītos",
            "noMainParticipantsDescription": "Dalībniekam ir jāsāk sapulce. Lūdzu, pēc brīža mēģiniet vēlreiz.",
            "noMainParticipantsTitle": "Šī sapulce vēl nav sākusies.",
            "noVisitorLobby": "Jūs nevarat pievienoties, kamēr sapulcei ir iespējots vestibils.",
            "notAllowedPromotion": "Dalībniekam vispirms ir jāatļauj jūsu pieprasījums.",
            "title": "Jūs esat sapulces apmeklētājs"
-        },
-        "waitingMessage": "Jūs pievienosities sapulcei, tiklīdz tā sāksies!"
+        }
    },
    "volumeSlider": "Skaļuma slīdnis",
    "welcomepage": {
--- a/lang/main-pt.json
+++ b/lang/main-pt.json
@@ -128,7 +128,6 @@
        "privateNotice": "Mensagem privada para {{recipient}}",
        "sendButton": "Enviar",
        "smileysPanel": "Painel de Emojis",
-        "systemDisplayName": "Sistema",
        "tabs": {
            "chat": "Chat",
            "polls": "Sondagens"
@@ -264,7 +263,6 @@
        "Share": "Partilhar",
        "Submit": "Submeter",
        "WaitForHostMsg": "A conferência ainda não começou porque ainda não chegaram moderadores. Se quiser ser um moderador, inicie a sessão. Caso contrário, aguarde.",
-        "WaitForHostNoAuthMsg": "A conferência ainda não começou porque ainda não chegaram os moderadores. Por favor, aguarde.",
        "WaitingForHostButton": "Esperar pelo moderador",
        "WaitingForHostTitle": "À espera de um moderador...",
        "Yes": "Sim",
@@ -320,7 +318,6 @@
        "embedMeeting": "Embutir reunião",
        "enterDisplayName": "Digite o seu nome",
        "error": "Erro",
-        "errorRoomCreationRestriction": "Tentou juntar-se demasiado depressa, por favor volte mais tarde.",
        "gracefulShutdown": "O nosso serviço está atualmente em manutenção. Por favor, tente novamente mais tarde.",
        "grantModeratorDialog": "Tem a certeza que quer conceder direitos de moderador a {{participantName}}?",
        "grantModeratorTitle": "Conceder direitos de moderador",
@@ -736,10 +733,8 @@
        "connectedOneMember": "{{name}} entrou na reunião",
        "connectedThreePlusMembers": "{{name}} e muitos outros entraram na reunião",
        "connectedTwoMembers": "{{first}} e {{second}} entraram na reunião",
-        "dataChannelClosed": "A qualidade do vídeo pode ser afetada",
-        "dataChannelClosedDescription": "O canal de ponte está em baixo e, por isso, a qualidade de vídeo pode estar limitada à sua definição mais baixa.",
-        "dataChannelClosedDescriptionWithAudio": "O canal de ponte está em baixo, pelo que podem ocorrer interrupções no áudio e no vídeo.",
-        "dataChannelClosedWithAudio": "A qualidade do áudio e do vídeo pode ser afetada",
+        "dataChannelClosed": "Deficiência na qualidade do vídeo",
+        "dataChannelClosedDescription": "O canal de ponte foi desconectado e, portanto, a qualidade do vídeo está limitada à sua configuração mais baixa.",
        "disabledIframe": "A incorporação destina-se apenas a fins de demonstração, pelo que esta chamada será desligada em {{timeout}} minutos.",
        "disabledIframeSecondary": "A incorporação de {{domain}} destina-se apenas a fins de demonstração, pelo que esta chamada será desligada em {{timeout}} minutos. Por favor, use <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Jitsi as a Service</a> para incorporação em produção!",
        "disconnected": "desconectado",
@@ -786,7 +781,6 @@
        "newDeviceAction": "Usar",
        "newDeviceAudioTitle": "Novo dispositivo de áudio detetado",
        "newDeviceCameraTitle": "Nova câmara detetada",
-        "nextToSpeak": "É o próximo na fila para falar",
        "noiseSuppressionDesktopAudioDescription": "A supressão de ruído não pode ser ativada enquanto se partilha o áudio do ambiente de trabalho, por favor desative-o e tente novamente.",
        "noiseSuppressionFailedTitle": "Falha ao iniciar a supressão de ruído",
        "noiseSuppressionStereoDescription": "A supressão do ruído de áudio estéreo não é atualmente suportada.",
@@ -821,11 +815,8 @@
        "videoUnmuteBlockedDescription": "A operação de ligar a câmara e partilhar o ambiente de trabalho foi temporariamente bloqueada devido aos limites do sistema.",
        "videoUnmuteBlockedTitle": "Está bloqueado ligar a câmara e partilhar o ambiente de trabalho!",
        "viewLobby": "Ver sala de espera",
-        "viewParticipants": "Ver participantes",
        "viewVisitors": "Ver visitantes",
        "waitingParticipants": "{{waitingParticipants}} pessoas",
-        "waitingVisitors": "Visitantes em fila de espera: {{waitingVisitors}}",
-        "waitingVisitorsTitle": "A reunião ainda não está em direto!",
        "whiteboardLimitDescription": "Guarde o seu progresso, pois o limite de utilizadores será atingido em breve e o quadro branco será encerrado.",
        "whiteboardLimitTitle": "Utilização do quadro branco"
    },
@@ -839,10 +830,7 @@
            "audioModeration": "Ligar o microfone deles",
            "blockEveryoneMicCamera": "Bloquear o microfone e a câmara de todos",
            "breakoutRooms": "Salas simultâneas",
-            "goLive": "Aceder ao vivo",
            "invite": "Convidar alguém",
-            "lowerAllHands": "Baixar todas as mãos",
-            "lowerHand": "Baixar a mão",
            "moreModerationActions": "Mais opções de moderação",
            "moreModerationControls": "Mais controlos de moderação",
            "moreParticipantOptions": "Mais opções de participantes",
@@ -859,7 +847,6 @@
        "headings": {
            "lobby": "Sala de espera ({{count}})",
            "participantsList": "Participantes da reunião ({{count}})",
-            "visitorInQueue": " (à espera {{count}})",
            "visitorRequests": " (pedidos {{count}})",
            "visitors": "Visitantes ({{count}})",
            "waitingLobby": "Aguardam na sala de espera ({{count}})"
@@ -873,13 +860,10 @@
    "pinnedParticipant": "O participante está afixado",
    "polls": {
        "answer": {
-            "edit": "Editar",
-            "send": "Enviar",
            "skip": "Ignorar",
            "submit": "Submeter"
        },
        "by": "Por {{ name }}",
-        "closeButton": "Fechar sondagem",
        "create": {
            "addOption": "Adicionar opção",
            "answerPlaceholder": "Opção {{index}}",
@@ -889,7 +873,6 @@
            "pollQuestion": "Pergunta de Sondagem",
            "questionPlaceholder": "Faça uma pergunta",
            "removeOption": "Remover opção",
-            "save": "Guardar",
            "send": "Enviar"
        },
        "errors": {
@@ -1495,22 +1478,12 @@
    },
    "visitors": {
        "chatIndicator": "(visitante)",
-        "joinMeeting": {
-            "description": "Atualmente, é um observador nesta conferência.",
-            "raiseHand": "Levantar a mão",
-            "title": "Participar na reunião",
-            "wishToSpeak": "Se deseja intervir, levante a mão e aguarde a aprovação do moderador."
-        },
        "labelTooltip": "Número de visitantes: {{count}}",
        "notification": {
            "demoteDescription": "Enviado aqui pelo {{actor}}, levante a mão para participar",
-            "noMainParticipantsDescription": "Um participante precisa de iniciar a reunião. Tente novamente daqui a pouco.",
-            "noMainParticipantsTitle": "Esta reunião ainda não começou.",
-            "noVisitorLobby": "Não é possível aderir enquanto houver uma sala de espera activada para a reunião.",
-            "notAllowedPromotion": "É necessário que um participante autorize primeiro o seu pedido.",
+            "description": "Para participar levante a sua mão",
            "title": "É um visitante na reunião"
-        },
-        "waitingMessage": "Participará na reunião assim que esta estiver em direto!"
+        }
    },
    "volumeSlider": "Controlo de volume",
    "welcomepage": {
--- a/lang/main.json
+++ b/lang/main.json
@@ -439,14 +439,11 @@
        "shareScreenWarningD2": "you need to stop audio sharing, start screen sharing and check the \"share audio\" option.",
        "shareScreenWarningH1": "If you want to share just your screen:",
        "shareScreenWarningTitle": "You need to stop audio sharing before sharing your screen",
-        "shareVideoConfirmPlay": "You’re about to open an external website. Do you want to continue?",
-        "shareVideoConfirmPlayTitle": "{{name}} has shared a video with you.",
-        "shareVideoLinkError": "Oops, this video cannot be played.",
-        "shareVideoLinkStopped": "The video from {{name}} was stopped.",
+        "shareVideoLinkError": "Please provide a correct video link.",
        "shareVideoTitle": "Share video",
        "shareYourScreen": "Share your screen",
        "shareYourScreenDisabled": "Screen sharing disabled.",
-        "sharedVideoDialogError": "Error: Invalid or forbidden URL",
+        "sharedVideoDialogError": "Error: Invalid URL",
        "sharedVideoLinkPlaceholder": "YouTube link or direct video link",
        "show": "Show",
        "start": "Start ",
@@ -824,7 +821,6 @@
        "videoUnmuteBlockedDescription": "Camera unmute and desktop sharing operation have been temporarily blocked because of system limits.",
        "videoUnmuteBlockedTitle": "Camera unmute and desktop sharing blocked!",
        "viewLobby": "View lobby",
-        "viewParticipants": "View participants",
        "viewVisitors": "View visitors",
        "waitingParticipants": "{{waitingParticipants}} people",
        "waitingVisitors": "Visitors waiting in queue: {{waitingVisitors}}",
@@ -1096,7 +1092,6 @@
        "desktopShareWarning": "You need to restart the screen share for the new settings to take effect.",
        "devices": "Devices",
        "followMe": "Everyone follows me",
-        "followMeRecorder": "Recorder follows me",
        "framesPerSecond": "frames-per-second",
        "incomingMessage": "Incoming message",
        "language": "Language",
@@ -1260,7 +1255,6 @@
            "privateMessage": "Send private message",
            "profile": "Edit your profile",
            "raiseHand": "Raise your hand",
-            "react": "Message reactions",
            "reactions": "Reactions",
            "reactionsMenu": "Reactions menu",
            "recording": "Toggle recording",
@@ -1509,6 +1503,7 @@
        "labelTooltip": "Number of visitors: {{count}}",
        "notification": {
            "demoteDescription": "Sent here by {{actor}}, raise your hand to participate",
+            "description": "To participate raise your hand",
            "noMainParticipantsDescription": "A participant needs to start the meeting. Please try again in a bit.",
            "noMainParticipantsTitle": "This meeting hasn’t started yet.",
            "noVisitorLobby": "You cannot join while there is a lobby enabled for the meeting.",
--- a/modules/API/API.js
+++ b/modules/API/API.js
@@ -19,7 +19,6 @@ import {
    sendTones,
    setAssumedBandwidthBps,
    setFollowMe,
-    setFollowMeRecorder,
    setLocalSubject,
    setPassword,
    setSubject
@@ -323,18 +322,15 @@ function initCommands() {

            APP.store.dispatch(setAssumedBandwidthBps(value));
        },
-        'set-follow-me': (value, recorderOnly) => {
+        'set-follow-me': value => {
+
            if (value) {
-                sendAnalytics(createApiEvent('follow.me.set', {
-                    recorderOnly
-                }));
+                sendAnalytics(createApiEvent('follow.me.set'));
            } else {
-                sendAnalytics(createApiEvent('follow.me.unset', {
-                    recorderOnly
-                }));
+                sendAnalytics(createApiEvent('follow.me.unset'));
            }

-            APP.store.dispatch(recorderOnly ? setFollowMeRecorder(value) : setFollowMe(value));
+            APP.store.dispatch(setFollowMe(value));
        },
        'set-large-video-participant': (participantId, videoType) => {
            const { getState, dispatch } = APP.store;
@@ -493,9 +489,7 @@ function initCommands() {
            sendAnalytics(createApiEvent('email.changed'));
            APP.conference.changeLocalEmail(email);
        },
-        'avatar-url': avatarUrl => { // @deprecated
-            console.warn('Using command avatarUrl is deprecated. Use context.user.avatar in the jwt.');
-
+        'avatar-url': avatarUrl => {
            sendAnalytics(createApiEvent('avatar.url.changed'));
            APP.conference.changeLocalAvatarUrl(avatarUrl);
        },
@@ -1132,7 +1126,12 @@ class API {
        this.notifyBrowserSupport(isSupportedBrowser());

        // Let the embedder know we are ready.
-        this._sendEvent({ name: 'ready' });
+        this._sendEvent({
+            name: 'ready',
+
+            // XXX: Here we are using window.config since this is fired really early.
+            info: window.config.deploymentInfo
+        });
    }

    /**
@@ -1344,14 +1343,14 @@ class API {
     * @returns {void}
     */
    notifyReceivedChatMessage(
-            { body, from, nick, privateMessage, ts } = {}) {
-        if (APP.conference.isLocalId(from)) {
+            { body, id, nick, privateMessage, ts } = {}) {
+        if (APP.conference.isLocalId(id)) {
            return;
        }

        this._sendEvent({
            name: 'incoming-message',
-            from,
+            from: id,
            message: body,
            nick,
            privateMessage,
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,8 +61,8 @@
        "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/v1867.0.0+ef92c2a0/lib-jitsi-meet.tgz",
-        "lodash-es": "4.17.21",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1845.0.0+515a927c/lib-jitsi-meet.tgz",
+        "lodash": "4.17.21",
        "moment": "2.29.4",
        "moment-duration-format": "2.2.2",
        "null-loader": "4.0.1",
@@ -82,15 +82,15 @@
        "react-native-default-preference": "1.4.4",
        "react-native-device-info": "10.9.0",
        "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
-        "react-native-gesture-handler": "2.18.1",
+        "react-native-gesture-handler": "2.17.1",
        "react-native-get-random-values": "1.9.0",
-        "react-native-immersive-mode": "2.0.2",
+        "react-native-immersive-mode": "2.0.1",
        "react-native-keep-awake": "4.0.0",
        "react-native-orientation-locker": "1.6.0",
        "react-native-pager-view": "6.2.0",
        "react-native-paper": "5.10.3",
        "react-native-performance": "5.0.0",
-        "react-native-safe-area-context": "4.10.8",
+        "react-native-safe-area-context": "4.7.1",
        "react-native-screens": "3.32.0",
        "react-native-sound": "0.11.2",
        "react-native-splash-screen": "3.3.0",
@@ -100,7 +100,7 @@
        "react-native-url-polyfill": "2.0.0",
        "react-native-video": "6.0.0-alpha.11",
        "react-native-watch-connectivity": "1.1.0",
-        "react-native-webrtc": "124.0.4",
+        "react-native-webrtc": "124.0.3",
        "react-native-webview": "13.8.7",
        "react-native-youtube-iframe": "2.3.0",
        "react-redux": "7.2.9",
@@ -132,7 +132,7 @@
        "@types/audioworklet": "0.0.29",
        "@types/dom-screen-wake-lock": "1.0.1",
        "@types/js-md5": "0.4.3",
-        "@types/lodash-es": "4.17.12",
+        "@types/lodash": "4.14.182",
        "@types/moment-duration-format": "2.2.6",
        "@types/offscreencanvas": "2019.7.2",
        "@types/pixelmatch": "5.2.5",
@@ -6254,15 +6254,6 @@
      "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==",
      "dev": true
    },
-    "node_modules/@types/lodash-es": {
-      "version": "4.17.12",
-      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
-      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/lodash": "*"
-      }
-    },
    "node_modules/@types/long": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
@@ -10287,9 +10278,9 @@
      "dev": true
    },
    "node_modules/fast-loops": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.4.tgz",
-      "integrity": "sha512-8dbd3XWoKCTms18ize6JmQF1SFnnfj5s0B7rRry22EofgMu7B6LKHVh+XfFqFGsqnbH54xgeO83PzpKI+ODhlg=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.3.tgz",
+      "integrity": "sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g=="
    },
    "node_modules/fast-shallow-equal": {
      "version": "1.0.0",
@@ -12498,8 +12489,8 @@
    },
    "node_modules/lib-jitsi-meet": {
      "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1867.0.0+ef92c2a0/lib-jitsi-meet.tgz",
-      "integrity": "sha512-PxP/XINacOUPH8UT9INsVUPx9o1hC3tEKwlNnz1xuZuG6OJupgIBr/UDSgZwiQ+nf5RiKwx97MVfEFkmMNQURg==",
+      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1845.0.0+515a927c/lib-jitsi-meet.tgz",
+      "integrity": "sha512-UzT6skfD8wqs2695oMi3B8SxcImhG2SIYwc1xM+z9pVlJ4MAOWsLc7flCBXSnpnUTK3b5AjCOot3cRqeMibNcQ==",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -12512,8 +12503,11 @@
        "base64-js": "1.3.1",
        "current-executing-script": "0.1.3",
        "jquery": "3.6.1",
-        "lodash-es": "4.17.21",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.debounce": "4.0.8",
+        "lodash.isequal": "4.5.0",
        "patch-package": "6.5.1",
+        "promise.allsettled": "1.0.4",
        "sdp-transform": "2.3.0",
        "strophe.js": "1.5.0",
        "strophejs-plugin-disco": "0.0.2",
@@ -12830,13 +12824,7 @@
    "node_modules/lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
    "node_modules/lodash.clonedeep": {
      "version": "4.5.0",
@@ -12853,6 +12841,11 @@
      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+    },
    "node_modules/lodash.isstring": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
@@ -15083,9 +15076,9 @@
      }
    },
    "node_modules/react-devtools-core/node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
      "engines": {
        "node": ">=8.3.0"
      },
@@ -15314,9 +15307,9 @@
      }
    },
    "node_modules/react-native-gesture-handler": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.18.1.tgz",
-      "integrity": "sha512-WF2fxQ5kTaxHghlkBM4YxO86SyGWVwrSNgJ1E8z/ZtL2xD5B3bg5agvuVFfOzvceC114yq71s6E9vKPz94ZxRw==",
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.17.1.tgz",
+      "integrity": "sha512-pWfniN6NuVKUq40KACuD3NCMe+bWNQCpD3cmxL6aLSCTwPKYmf7l4Lp0/E/almpjvxhybJZtFLU0w4tmxnIKaA==",
      "license": "MIT",
      "dependencies": {
        "@egjs/hammerjs": "^2.0.17",
@@ -15341,10 +15334,9 @@
      }
    },
    "node_modules/react-native-immersive-mode": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/react-native-immersive-mode/-/react-native-immersive-mode-2.0.2.tgz",
-      "integrity": "sha512-W4YBpf/seURr6pdt91bKWtlQhwoZYgQN1nllj/y+EkwKs5xbu/IiRxlCs/8ML7dyA8wbOFaXR24AC4HOrvxapw==",
-      "license": "MIT",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/react-native-immersive-mode/-/react-native-immersive-mode-2.0.1.tgz",
+      "integrity": "sha512-2wlL7VIHl4rr4gwgnUp9K1UvsN7J5VCGqoAvBWQXvB4xn7XaoDEl6z9vqaqOiEdC6aAh2d/7zqcJz+dfcR2ELw==",
      "peerDependencies": {
        "react-native": ">=0.60.5"
      }
@@ -15358,7 +15350,6 @@
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/react-native-orientation-locker/-/react-native-orientation-locker-1.6.0.tgz",
      "integrity": "sha512-D3IOtAcaAi6S2w0Y1EUnr16I47isosQbE7F67fAu9A+gE67NkyKaJ9HL5EsZ+Uc7+7m+NsuBjx3dxuANNy8rVA==",
-      "license": "MIT",
      "peerDependencies": {
        "react": ">=16.13.1",
        "react-native": ">=0.63.2",
@@ -15374,7 +15365,6 @@
      "version": "6.2.0",
      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.2.0.tgz",
      "integrity": "sha512-pf9OnL/Tkr+5s4Gjmsn7xh91PtJLDa6qxYa/bmtUhd/+s4cQdWQ8DIFoOFghwZIHHHwVdWtoXkp6HtpjN+r20g==",
-      "license": "MIT",
      "peerDependencies": {
        "react": "*",
        "react-native": "*"
@@ -15405,10 +15395,9 @@
      }
    },
    "node_modules/react-native-safe-area-context": {
-      "version": "4.10.8",
-      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.10.8.tgz",
-      "integrity": "sha512-Jx1lovhvIdYygg0UsMCBUJN0Wvj9GlA5bbcBLzjZf93uJpNHzaiHC4hR280+sNVK1+/pMHEyEkXVHDZE5JWn0w==",
-      "license": "MIT",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.7.1.tgz",
+      "integrity": "sha512-X2pJG2ttmAbiGlItWedvDkZg1T1ikmEDiz+7HsiIwAIm2UbFqlhqn+B1JF53mSxPzdNaDcCQVHRNPvj8oFu6Yg==",
      "peerDependencies": {
        "react": "*",
        "react-native": "*"
@@ -16001,9 +15990,10 @@
      }
    },
    "node_modules/react-native-webrtc": {
-      "version": "124.0.4",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-124.0.4.tgz",
-      "integrity": "sha512-ZbhSz1f+kc1v5VE0B84+v6ujIWTHa2fIuocrYzGUIFab7E5izmct7PNHb9dzzs0xhBGqh4c2rUa49jbL+P/e2w==",
+      "version": "124.0.3",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-124.0.3.tgz",
+      "integrity": "sha512-uU+FxcAlBjLQ1EZnw3q+nje8xw+7hwZ7yDpSK4f1OJ25LrLA6fAjgxHCtMn9D20D9tR4+pRkBugBzkfqmboIFg==",
+      "license": "MIT",
      "dependencies": {
        "base64-js": "1.5.1",
        "debug": "4.3.4",
@@ -17589,9 +17579,9 @@
      }
    },
    "node_modules/strophe.js/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
      "optional": true,
      "engines": {
        "node": ">=10.0.0"
@@ -18722,9 +18712,9 @@
      }
    },
    "node_modules/webpack-bundle-analyzer/node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
      "dev": true,
      "engines": {
        "node": ">=8.3.0"
@@ -18913,9 +18903,9 @@
      }
    },
    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "version": "8.17.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+      "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
      "dev": true,
      "engines": {
        "node": ">=10.0.0"
@@ -19184,9 +19174,9 @@
      }
    },
    "node_modules/ws": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz",
-      "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
      "dependencies": {
        "async-limiter": "~1.0.0"
      }
@@ -23410,15 +23400,6 @@
      "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==",
      "dev": true
    },
-    "@types/lodash-es": {
-      "version": "4.17.12",
-      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
-      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
-      "dev": true,
-      "requires": {
-        "@types/lodash": "*"
-      }
-    },
    "@types/long": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
@@ -26430,9 +26411,9 @@
      "dev": true
    },
    "fast-loops": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.4.tgz",
-      "integrity": "sha512-8dbd3XWoKCTms18ize6JmQF1SFnnfj5s0B7rRry22EofgMu7B6LKHVh+XfFqFGsqnbH54xgeO83PzpKI+ODhlg=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.3.tgz",
+      "integrity": "sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g=="
    },
    "fast-shallow-equal": {
      "version": "1.0.0",
@@ -28005,8 +27986,8 @@
      }
    },
    "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1867.0.0+ef92c2a0/lib-jitsi-meet.tgz",
-      "integrity": "sha512-PxP/XINacOUPH8UT9INsVUPx9o1hC3tEKwlNnz1xuZuG6OJupgIBr/UDSgZwiQ+nf5RiKwx97MVfEFkmMNQURg==",
+      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1845.0.0+515a927c/lib-jitsi-meet.tgz",
+      "integrity": "sha512-UzT6skfD8wqs2695oMi3B8SxcImhG2SIYwc1xM+z9pVlJ4MAOWsLc7flCBXSnpnUTK3b5AjCOot3cRqeMibNcQ==",
      "requires": {
        "@jitsi/js-utils": "2.2.1",
        "@jitsi/logger": "2.0.2",
@@ -28017,8 +27998,11 @@
        "base64-js": "1.3.1",
        "current-executing-script": "0.1.3",
        "jquery": "3.6.1",
-        "lodash-es": "4.17.21",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.debounce": "4.0.8",
+        "lodash.isequal": "4.5.0",
        "patch-package": "6.5.1",
+        "promise.allsettled": "1.0.4",
        "sdp-transform": "2.3.0",
        "strophe.js": "1.5.0",
        "strophejs-plugin-disco": "0.0.2",
@@ -28266,13 +28250,7 @@
    "lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
    "lodash.clonedeep": {
      "version": "4.5.0",
@@ -28289,6 +28267,11 @@
      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
    },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+    },
    "lodash.isstring": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
@@ -29872,9 +29855,9 @@
      },
      "dependencies": {
        "ws": {
-          "version": "7.5.10",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-          "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="
        }
      }
    },
@@ -30122,9 +30105,9 @@
      "integrity": "sha512-MKbuBbovO8eGiAM9i6o0nrdBXivhRpzPQ+aVBXGJEPMH7RrCSNUKaCoEpkjfGHlTxjZimi6WjDCjjzCRSHlV1A=="
    },
    "react-native-gesture-handler": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.18.1.tgz",
-      "integrity": "sha512-WF2fxQ5kTaxHghlkBM4YxO86SyGWVwrSNgJ1E8z/ZtL2xD5B3bg5agvuVFfOzvceC114yq71s6E9vKPz94ZxRw==",
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.17.1.tgz",
+      "integrity": "sha512-pWfniN6NuVKUq40KACuD3NCMe+bWNQCpD3cmxL6aLSCTwPKYmf7l4Lp0/E/almpjvxhybJZtFLU0w4tmxnIKaA==",
      "requires": {
        "@egjs/hammerjs": "^2.0.17",
        "hoist-non-react-statics": "^3.3.0",
@@ -30141,9 +30124,9 @@
      }
    },
    "react-native-immersive-mode": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/react-native-immersive-mode/-/react-native-immersive-mode-2.0.2.tgz",
-      "integrity": "sha512-W4YBpf/seURr6pdt91bKWtlQhwoZYgQN1nllj/y+EkwKs5xbu/IiRxlCs/8ML7dyA8wbOFaXR24AC4HOrvxapw=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/react-native-immersive-mode/-/react-native-immersive-mode-2.0.1.tgz",
+      "integrity": "sha512-2wlL7VIHl4rr4gwgnUp9K1UvsN7J5VCGqoAvBWQXvB4xn7XaoDEl6z9vqaqOiEdC6aAh2d/7zqcJz+dfcR2ELw=="
    },
    "react-native-keep-awake": {
      "version": "4.0.0",
@@ -30176,9 +30159,9 @@
      "integrity": "sha512-nZJdliNFaA7vmu9PbYGSlwguRQVsuWX8CtchUUxZvjd/i9B3OYYveajIcuic3oQjWyTydLeDlhXRwpOUlj2Npw=="
    },
    "react-native-safe-area-context": {
-      "version": "4.10.8",
-      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.10.8.tgz",
-      "integrity": "sha512-Jx1lovhvIdYygg0UsMCBUJN0Wvj9GlA5bbcBLzjZf93uJpNHzaiHC4hR280+sNVK1+/pMHEyEkXVHDZE5JWn0w=="
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.7.1.tgz",
+      "integrity": "sha512-X2pJG2ttmAbiGlItWedvDkZg1T1ikmEDiz+7HsiIwAIm2UbFqlhqn+B1JF53mSxPzdNaDcCQVHRNPvj8oFu6Yg=="
    },
    "react-native-screens": {
      "version": "3.32.0",
@@ -30535,9 +30518,9 @@
      }
    },
    "react-native-webrtc": {
-      "version": "124.0.4",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-124.0.4.tgz",
-      "integrity": "sha512-ZbhSz1f+kc1v5VE0B84+v6ujIWTHa2fIuocrYzGUIFab7E5izmct7PNHb9dzzs0xhBGqh4c2rUa49jbL+P/e2w==",
+      "version": "124.0.3",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-124.0.3.tgz",
+      "integrity": "sha512-uU+FxcAlBjLQ1EZnw3q+nje8xw+7hwZ7yDpSK4f1OJ25LrLA6fAjgxHCtMn9D20D9tR4+pRkBugBzkfqmboIFg==",
      "requires": {
        "base64-js": "1.5.1",
        "debug": "4.3.4",
@@ -31620,9 +31603,9 @@
      },
      "dependencies": {
        "ws": {
-          "version": "8.18.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-          "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+          "version": "8.13.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+          "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
          "optional": true
        }
      }
@@ -32398,9 +32381,9 @@
          }
        },
        "ws": {
-          "version": "7.5.10",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-          "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+          "version": "7.5.7",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
+          "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
          "dev": true
        }
      }
@@ -32517,9 +32500,9 @@
          }
        },
        "ws": {
-          "version": "8.18.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-          "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+          "version": "8.17.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+          "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
          "dev": true
        }
      }
@@ -32700,9 +32683,9 @@
      }
    },
    "ws": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz",
-      "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
      "requires": {
        "async-limiter": "~1.0.0"
      }
--- a/package.json
+++ b/package.json
@@ -67,8 +67,8 @@
    "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/v1867.0.0+ef92c2a0/lib-jitsi-meet.tgz",
-    "lodash-es": "4.17.21",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1845.0.0+515a927c/lib-jitsi-meet.tgz",
+    "lodash": "4.17.21",
    "moment": "2.29.4",
    "moment-duration-format": "2.2.2",
    "null-loader": "4.0.1",
@@ -88,15 +88,15 @@
    "react-native-default-preference": "1.4.4",
    "react-native-device-info": "10.9.0",
    "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
-    "react-native-gesture-handler": "2.18.1",
+    "react-native-gesture-handler": "2.17.1",
    "react-native-get-random-values": "1.9.0",
-    "react-native-immersive-mode": "2.0.2",
+    "react-native-immersive-mode": "2.0.1",
    "react-native-keep-awake": "4.0.0",
    "react-native-orientation-locker": "1.6.0",
    "react-native-pager-view": "6.2.0",
    "react-native-paper": "5.10.3",
    "react-native-performance": "5.0.0",
-    "react-native-safe-area-context": "4.10.8",
+    "react-native-safe-area-context": "4.7.1",
    "react-native-screens": "3.32.0",
    "react-native-sound": "0.11.2",
    "react-native-splash-screen": "3.3.0",
@@ -106,7 +106,7 @@
    "react-native-url-polyfill": "2.0.0",
    "react-native-video": "6.0.0-alpha.11",
    "react-native-watch-connectivity": "1.1.0",
-    "react-native-webrtc": "124.0.4",
+    "react-native-webrtc": "124.0.3",
    "react-native-webview": "13.8.7",
    "react-native-youtube-iframe": "2.3.0",
    "react-redux": "7.2.9",
@@ -138,7 +138,7 @@
    "@types/audioworklet": "0.0.29",
    "@types/dom-screen-wake-lock": "1.0.1",
    "@types/js-md5": "0.4.3",
-    "@types/lodash-es": "4.17.12",
+    "@types/lodash": "4.14.182",
    "@types/moment-duration-format": "2.2.6",
    "@types/offscreencanvas": "2019.7.2",
    "@types/pixelmatch": "5.2.5",
--- a/react-native-sdk/jitsi-meet-rnsdk.podspec
+++ b/react-native-sdk/jitsi-meet-rnsdk.podspec
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
  s.source         = { :git => package['repository']['url'], :tag => s.version }

  s.requires_arc   = true
-  s.platform       = :ios, '15.1'
+  s.platform       = :ios, '12.4'

  s.preserve_paths = 'ios/**/*'
  s.source_files   =  'ios/**/*.{h,m}'
--- a/react-native-sdk/package.json
+++ b/react-native-sdk/package.json
@@ -11,7 +11,6 @@
        "url": "git+https://github.com/jitsi/jitsi-meet.git"
    },
    "dependencies": {
-        "@braintree/sanitize-url": "0.0.0",
        "@jitsi/js-utils": "0.0.0",
        "@jitsi/logger": "0.0.0",
        "@jitsi/rtcstats": "0.0.0",
@@ -20,7 +19,6 @@
        "@react-navigation/material-top-tabs": "0.0.0",
        "@react-navigation/native": "0.0.0",
        "@react-navigation/stack": "0.0.0",
-        "@stomp/stompjs": "0.0.0",
        "@xmldom/xmldom": "0.0.0",
        "base64-js": "0.0.0",
        "grapheme-splitter": "0.0.0",
@@ -31,7 +29,7 @@
        "js-sha512": "0.0.0",
        "jwt-decode": "0.0.0",
        "lib-jitsi-meet": "0.0.0",
-        "lodash-es": "0.0.0",
+        "lodash": "0.0.0",
        "moment": "0.0.0",
        "moment-duration-format": "0.0.0",
        "optional-require": "0.0.0",
@@ -41,7 +39,6 @@
        "react-i18next": "0.0.0",
        "react-linkify": "0.0.0",
        "react-native-dialog": "0.0.0",
-        "react-native-paper": "0.0.0",
        "react-native-svg-transformer": "0.0.0",
        "react-native-tab-view": "0.0.0",
        "react-native-url-polyfill": "0.0.0",
@@ -49,7 +46,6 @@
        "react-redux": "0.0.0",
        "redux": "0.0.0",
        "redux-thunk": "0.0.0",
-        "text-encoding": "0.0.0",
        "unorm": "0.0.0",
        "util": "0.0.0",
        "uuid": "0.0.0",
@@ -57,6 +53,7 @@
    },
    "peerDependencies": {
        "@amplitude/react-native": "0.0.0",
+        "@braintree/sanitize-url": "0.0.0",
        "@giphy/react-native-sdk": "0.0.0",
        "@react-native/metro-config": "*",
        "@react-native-async-storage/async-storage": "0.0.0",
@@ -64,6 +61,7 @@
        "@react-native-community/netinfo": "0.0.0",
        "@react-native-community/slider": "0.0.0",
        "@react-native-google-signin/google-signin": "0.0.0",
+        "@stomp/stompjs": "0.0.0",
        "react-native": "*",
        "react": "*",
        "react-native-background-timer": "0.0.0",
@@ -75,6 +73,7 @@
        "react-native-immersive-mode": "0.0.0",
        "react-native-keep-awake": "0.0.0",
        "react-native-pager-view": "0.0.0",
+        "react-native-paper": "0.0.0",
        "react-native-performance": "0.0.0",
        "react-native-orientation-locker": "0.0.0",
        "react-native-safe-area-context": "0.0.0",
@@ -85,7 +84,8 @@
        "react-native-video": "0.0.0",
        "react-native-watch-connectivity": "0.0.0",
        "react-native-webrtc": "0.0.0",
-        "react-native-webview": "0.0.0"
+        "react-native-webview": "0.0.0",
+        "text-encoding": "0.0.0"
    },
    "overrides": {
        "@xmldom/xmldom": "0.0.0"
--- a/react-native-sdk/prepare_sdk.js
+++ b/react-native-sdk/prepare_sdk.js
@@ -1,6 +1,10 @@
 const fs = require('fs');
 const path = require('path');

+const packageJSON = require('../package.json');
+
+const SDKPackageJSON = require('./package.json');
+
 const androidSourcePath = '../android/sdk/src/main/java/org/jitsi/meet/sdk';
 const androidMainSourcePath = '../android/sdk/src/main/res';
 const androidTargetPath = './android/src/main/java/org/jitsi/meet/sdk';
@@ -52,6 +56,44 @@ function copyFolderRecursiveSync(source, target) {
    }
 }

+/**
+ * Merges the dependency versions from the root package.json with the dependencies of the SDK package.json.
+ */
+function mergeDependencyVersions() {
+
+    // Updates SDK dependencies to match project dependencies.
+    for (const key in SDKPackageJSON.dependencies) {
+        if (SDKPackageJSON.dependencies.hasOwnProperty(key)) {
+            SDKPackageJSON.dependencies[key] = packageJSON.dependencies[key] || packageJSON.devDependencies[key];
+        }
+    }
+
+    // Updates SDK peer dependencies.
+    for (const key in packageJSON.dependencies) {
+        if (SDKPackageJSON.peerDependencies.hasOwnProperty(key)) {
+
+            // Updates all peer dependencies except react and react-native.
+            if (key !== 'react' && key !== 'react-native') {
+                SDKPackageJSON.peerDependencies[key] = packageJSON.dependencies[key];
+            }
+        }
+    }
+
+    // Updates SDK overrides dependencies.
+    for (const key in packageJSON.overrides) {
+        if (SDKPackageJSON.overrides.hasOwnProperty(key)) {
+            SDKPackageJSON.overrides[key] = packageJSON.overrides[key];
+        }
+    }
+
+    const data = JSON.stringify(SDKPackageJSON, null, 4);
+
+    fs.writeFileSync('package.json', data);
+}
+
+// TODO: put this in a seperate step
+mergeDependencyVersions();
+
 copyFolderRecursiveSync(
    '../images',
    '.'
--- a/react-native-sdk/update_sdk_dependencies.js
+++ b/react-native-sdk/update_sdk_dependencies.js
@@ -1,42 +0,0 @@
-const fs = require('fs');
-
-const packageJSON = require('../package.json');
-
-const SDKPackageJSON = require('./package.json');
-
-/**
- * Merges the dependency versions from the root package.json with the dependencies of the SDK package.json.
- */
-function mergeDependencyVersions() {
-
-    // Updates SDK dependencies to match project dependencies.
-    for (const key in SDKPackageJSON.dependencies) {
-        if (SDKPackageJSON.dependencies.hasOwnProperty(key)) {
-            SDKPackageJSON.dependencies[key] = packageJSON.dependencies[key] || packageJSON.devDependencies[key];
-        }
-    }
-
-    // Updates SDK peer dependencies.
-    for (const key in packageJSON.dependencies) {
-        if (SDKPackageJSON.peerDependencies.hasOwnProperty(key)) {
-
-            // Updates all peer dependencies except react and react-native.
-            if (key !== 'react' && key !== 'react-native') {
-                SDKPackageJSON.peerDependencies[key] = packageJSON.dependencies[key];
-            }
-        }
-    }
-
-    // Updates SDK overrides dependencies.
-    for (const key in packageJSON.overrides) {
-        if (SDKPackageJSON.overrides.hasOwnProperty(key)) {
-            SDKPackageJSON.overrides[key] = packageJSON.overrides[key];
-        }
-    }
-
-    const data = JSON.stringify(SDKPackageJSON, null, 4);
-
-    fs.writeFileSync('package.json', data);
-}
-
-mergeDependencyVersions();
--- a/react/features/authentication/functions.any.ts
+++ b/react/features/authentication/functions.any.ts
@@ -76,7 +76,7 @@ export const _getTokenAuthState = (

    for (const key of Object.keys(params)) {
        // we allow only config and interfaceConfig overrides in the state
-        if (key.startsWith('config.') || key.startsWith('interfaceConfig.') || key.startsWith('iceServers.')) {
+        if (key.startsWith('config.') || key.startsWith('interfaceConfig.')) {
            // @ts-ignore
            state[key] = params[key];
        }
--- a/react/features/base/app/components/BaseApp.tsx
+++ b/react/features/base/app/components/BaseApp.tsx
@@ -1,6 +1,6 @@
 // @ts-expect-error
 import { jitsiLocalStorage } from '@jitsi/js-utils';
-import { isEqual } from 'lodash-es';
+import _ from 'lodash';
 import React, { Component, ComponentType, Fragment } from 'react';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
@@ -254,7 +254,7 @@ export default class BaseApp<P> extends Component<P, IState> {
        href?: string;
        props?: Object;
    }): Promise<any> {
-        if (isEqual(route, this.state.route)) {
+        if (_.isEqual(route, this.state.route)) {
            return Promise.resolve();
        }

--- a/react/features/base/avatar/components/Avatar.tsx
+++ b/react/features/base/avatar/components/Avatar.tsx
@@ -48,11 +48,6 @@ export interface IProps {
     */
    colorBase?: string;

-    /**
-     * Indicates the default icon for the avatar.
-     */
-    defaultIcon?: string;
-
    /**
     * Display name of the entity to render an avatar for (if any). This is handy when we need
     * an avatar for a non-participant entity (e.g. A recent list item).
@@ -117,7 +112,6 @@ class Avatar<P extends IProps> extends PureComponent<P, IState> {
     * @static
     */
    static defaultProps = {
-        defaultIcon: IconUser,
        dynamicColor: true
    };

@@ -178,7 +172,6 @@ class Avatar<P extends IProps> extends PureComponent<P, IState> {
            _loadableAvatarUrlUseCORS,
            className,
            colorBase,
-            defaultIcon,
            dynamicColor,
            id,
            size,
@@ -236,7 +229,7 @@ class Avatar<P extends IProps> extends PureComponent<P, IState> {
        }

        if (navigator.product !== 'ReactNative') {
-            avatarProps.iconUser = defaultIcon;
+            avatarProps.iconUser = IconUser;
        }

        return (
--- a/react/features/base/avatar/functions.ts
+++ b/react/features/base/avatar/functions.ts
@@ -1,5 +1,5 @@
 import GraphemeSplitter from 'grapheme-splitter';
-import { split } from 'lodash-es';
+import _ from 'lodash';

 const AVATAR_COLORS = [
    '#6A50D3',
@@ -63,7 +63,7 @@ function getFirstGraphemeUpper(word: string) {
 */
 export function getInitials(s?: string) {
    // We don't want to use the domain part of an email address, if it is one
-    const initialsBasis = split(s, '@')[0];
+    const initialsBasis = _.split(s, '@')[0];
    const [ firstWord, secondWord ] = initialsBasis.split(wordSplitRegex).filter(Boolean);

    return getFirstGraphemeUpper(firstWord) + getFirstGraphemeUpper(secondWord);
--- a/react/features/base/conference/actionTypes.ts
+++ b/react/features/base/conference/actionTypes.ts
@@ -56,7 +56,7 @@ export const CONFERENCE_LEFT = 'CONFERENCE_LEFT';
 /**
 * The type of (redux) action which signals that the conference is out of focus.
 * For example, if the user navigates to the Chat screen.
- *
+ * 
 * {
 *      type: CONFERENCE_BLURRED,
 * }
@@ -65,7 +65,7 @@ export const CONFERENCE_BLURRED = 'CONFERENCE_BLURRED';

 /**
 * The type of (redux) action which signals that the conference is in focus.
- *
+ * 
 * {
 *      type: CONFERENCE_FOCUSED,
 * }
@@ -258,17 +258,6 @@ export const SEND_TONES = 'SEND_TONES';
 */
 export const SET_FOLLOW_ME = 'SET_FOLLOW_ME';

-/**
- * The type of (redux) action which updates the current known status of the
- * Follow Me feature that is used only by the recorder.
- *
- * {
- *     type: SET_FOLLOW_ME_RECORDER,
- *     enabled: boolean
- * }
- */
-export const SET_FOLLOW_ME_RECORDER = 'SET_FOLLOW_ME_RECORDER';
-
 /**
 * The type of (redux) action which sets the obfuscated room name.
 *
@@ -349,7 +338,7 @@ export const SET_START_MUTED_POLICY = 'SET_START_MUTED_POLICY';

 /**
 * The type of (redux) action which updates the assumed bandwidth bps.
- *
+ * 
 * {
 *      type: SET_ASSUMED_BANDWIDTH_BPS,
 *      assumedBandwidthBps: number
--- a/react/features/base/conference/actions.any.ts
+++ b/react/features/base/conference/actions.any.ts
@@ -25,7 +25,7 @@ import {
    participantSourcesUpdated,
    participantUpdated
 } from '../participants/actions';
-import { getNormalizedDisplayName, getParticipantByIdOrUndefined } from '../participants/functions';
+import { getNormalizedDisplayName } from '../participants/functions';
 import { IJitsiParticipant } from '../participants/types';
 import { toState } from '../redux/functions';
 import {
@@ -61,7 +61,6 @@ import {
    SEND_TONES,
    SET_ASSUMED_BANDWIDTH_BPS,
    SET_FOLLOW_ME,
-    SET_FOLLOW_ME_RECORDER,
    SET_OBFUSCATED_ROOM,
    SET_PASSWORD,
    SET_PASSWORD_FAILED,
@@ -278,18 +277,11 @@ function _addConferenceListeners(conference: IJitsiConference, dispatch: IStore[

    conference.addCommandListener(
        AVATAR_URL_COMMAND,
-        (data: { value: string; }, id: string) => {
-            const participant = getParticipantByIdOrUndefined(state, id);
-
-            // if already set from presence(jwt), skip the command processing
-            if (!participant?.avatarURL) {
-                return dispatch(participantUpdated({
-                    conference,
-                    id,
-                    avatarURL: data.value
-                }));
-            }
-        });
+        (data: { value: string; }, id: string) => dispatch(participantUpdated({
+            conference,
+            id,
+            avatarURL: data.value
+        })));
    conference.addCommandListener(
        EMAIL_COMMAND,
        (data: { value: string; }, id: string) => dispatch(participantUpdated({
@@ -848,22 +840,6 @@ export function setFollowMe(enabled: boolean) {
    };
 }

-/**
- * Enables or disables the Follow Me feature used only for the recorder.
- *
- * @param {boolean} enabled - Whether Follow Me should be enabled and used only by the recorder.
- * @returns {{
- *     type: SET_FOLLOW_ME_RECORDER,
- *     enabled: boolean
- * }}
- */
-export function setFollowMeRecorder(enabled: boolean) {
-    return {
-        type: SET_FOLLOW_ME_RECORDER,
-        enabled
-    };
-}
-
 /**
 * Enables or disables the Mute reaction sounds feature.
 *
--- a/react/features/base/conference/functions.ts
+++ b/react/features/base/conference/functions.ts
@@ -1,5 +1,5 @@
 import { sha512_256 as sha512 } from 'js-sha512';
-import { upperFirst, words } from 'lodash-es';
+import _ from 'lodash';

 import { getName } from '../../app/functions';
 import { IReduxState, IStore } from '../../app/types';
@@ -90,9 +90,7 @@ export function commonUserJoinedHandling(
    } else {
        const isReplacing = user?.isReplacing();

-        // the identity and avatar come from jwt and never change in the presence
        dispatch(participantJoined({
-            avatarURL: user.getIdentity()?.user?.avatar,
            botType: user.getBotType(),
            conference,
            id,
@@ -573,7 +571,7 @@ export function sendLocalParticipant(
 * @returns {string}
 */
 function safeStartCase(s = '') {
-    return words(`${s}`.replace(/['\u2019]/g, '')).reduce(
-        (result, word, index) => result + (index ? ' ' : '') + upperFirst(word)
+    return _.words(`${s}`.replace(/['\u2019]/g, '')).reduce(
+        (result, word, index) => result + (index ? ' ' : '') + _.upperFirst(word)
        , '');
 }
--- a/react/features/base/conference/reducer.ts
+++ b/react/features/base/conference/reducer.ts
@@ -26,7 +26,6 @@ import {
    P2P_STATUS_CHANGED,
    SET_ASSUMED_BANDWIDTH_BPS,
    SET_FOLLOW_ME,
-    SET_FOLLOW_ME_RECORDER,
    SET_OBFUSCATED_ROOM,
    SET_PASSWORD,
    SET_PENDING_SUBJECT_CHANGE,
@@ -94,7 +93,6 @@ export interface IJitsiConference {
    getRole: Function;
    getSpeakerStats: () => ISpeakerStats;
    getSsrcByTrack: Function;
-    getTranscriptionStatus: Function;
    grantOwner: Function;
    isAVModerationSupported: Function;
    isE2EEEnabled: Function;
@@ -131,7 +129,6 @@ export interface IJitsiConference {
    sendLobbyMessage: Function;
    sendMessage: Function;
    sendPrivateTextMessage: Function;
-    sendReaction: Function;
    sendTextMessage: Function;
    sendTones: Function;
    sessionId: string;
@@ -162,7 +159,6 @@ export interface IConferenceState {
    e2eeSupported?: boolean;
    error?: Error;
    followMeEnabled?: boolean;
-    followMeRecorderEnabled?: boolean;
    joining?: IJitsiConference;
    leaving?: IJitsiConference;
    lobbyWaitingForHost?: boolean;
@@ -255,12 +251,6 @@ ReducerRegistry.register<IConferenceState>('features/base/conference',
        case SET_FOLLOW_ME:
            return set(state, 'followMeEnabled', action.enabled);

-        case SET_FOLLOW_ME_RECORDER:
-            return { ...state,
-                followMeRecorderEnabled: action.enabled,
-                followMeEnabled: action.enabled
-            };
-
        case SET_START_REACTIONS_MUTED:
            return set(state, 'startReactionsMuted', action.muted);

--- a/react/features/base/config/configType.ts
+++ b/react/features/base/config/configType.ts
@@ -375,6 +375,7 @@ export interface IConfig {
    giphy?: {
        displayMode?: 'all' | 'tile' | 'chat';
        enabled?: boolean;
+        proxyUrl?: string;
        rating?: 'g' | 'pg' | 'pg-13' | 'r';
        sdkKey?: string;
        tileTime?: number;
@@ -476,7 +477,6 @@ export interface IConfig {
    };
    pcStatsInterval?: number;
    peopleSearchQueryTypes?: string[];
-    peopleSearchTokenLocation?: string;
    peopleSearchUrl?: string;
    preferBosh?: boolean;
    preferVisitor?: boolean;
@@ -487,12 +487,6 @@ export interface IConfig {
        hideExtraJoinButtons?: Array<string>;
    };
    prejoinPageEnabled?: boolean;
-    raisedHands?: {
-        disableLowerHandByModerator?: boolean;
-        disableLowerHandNotification?: boolean;
-        disableNextSpeakerNotification?: boolean;
-        disableRemoveRaisedHandOnFocus?: boolean;
-    };
    readOnlyName?: boolean;
    recordingLimit?: {
        appName?: string;
@@ -531,7 +525,6 @@ export interface IConfig {
        hideLobbyButton?: boolean;
    };
    serviceUrl?: string;
-    sharedVideoAllowedURLDomains?: Array<string>;
    sipInviteUrl?: string;
    speakerStats?: {
        disableSearch?: boolean;
--- a/react/features/base/config/configWhitelist.ts
+++ b/react/features/base/config/configWhitelist.ts
@@ -201,7 +201,6 @@ export default [
    'preferVisitor',
    'prejoinConfig',
    'prejoinPageEnabled',
-    'raisedHands',
    'recordingService',
    'requireDisplayName',
    'remoteVideoMenu',
--- a/react/features/base/config/functions.any.ts
+++ b/react/features/base/config/functions.any.ts
@@ -3,7 +3,7 @@ import { jitsiLocalStorage } from '@jitsi/js-utils';
 // eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { safeJsonParse } from '@jitsi/js-utils/json';
-import { isEmpty, mergeWith, pick } from 'lodash-es';
+import _ from 'lodash';

 import { IReduxState } from '../../app/types';
 import { getLocalParticipant } from '../participants/functions';
@@ -89,37 +89,7 @@ export function getFeatureFlag(state: IReduxState, featureFlag: string) {
 * @returns {boolean}
 */
 export function getDisableRemoveRaisedHandOnFocus(state: IReduxState) {
-    return state['features/base/config']?.raisedHands?.disableRemoveRaisedHandOnFocus || false;
-}
-
-/**
- * Selector used to get the disableLowerHandByModerator.
- *
- * @param {Object} state - The global state.
- * @returns {boolean}
- */
-export function getDisableLowerHandByModerator(state: IReduxState) {
-    return state['features/base/config']?.raisedHands?.disableLowerHandByModerator || false;
-}
-
-/**
- * Selector used to get the disableLowerHandNotification.
- *
- * @param {Object} state - The global state.
- * @returns {boolean}
- */
-export function getDisableLowerHandNotification(state: IReduxState) {
-    return state['features/base/config']?.raisedHands?.disableLowerHandNotification || true;
-}
-
-/**
- * Selector used to get the disableNextSpeakerNotification.
- *
- * @param {Object} state - The global state.
- * @returns {boolean}
- */
-export function getDisableNextSpeakerNotification(state: IReduxState) {
-    return state['features/base/config']?.raisedHands?.disableNextSpeakerNotification || false;
+    return state['features/base/config']?.disableRemoveRaisedHandOnFocus || false;
 }

 /**
@@ -166,11 +136,13 @@ export function overrideConfigJSON(config: IConfig, interfaceConfig: any, json:
            const configJSON
                = getWhitelistedJSON(configName as 'interfaceConfig' | 'config', json[configName]);

-            if (!isEmpty(configJSON)) {
-                logger.info(`Extending ${configName} with: ${JSON.stringify(configJSON)}`);
+            if (!_.isEmpty(configJSON)) {
+                logger.info(
+                    `Extending ${configName} with: ${
+                        JSON.stringify(configJSON)}`);

                // eslint-disable-next-line arrow-body-style
-                mergeWith(configObj, configJSON, (oldValue, newValue) => {
+                _.mergeWith(configObj, configJSON, (oldValue, newValue) => {

                    // XXX We don't want to merge the arrays, we want to
                    // overwrite them.
@@ -194,9 +166,9 @@ export function overrideConfigJSON(config: IConfig, interfaceConfig: any, json:
 */
 export function getWhitelistedJSON(configName: 'interfaceConfig' | 'config', configJSON: any): Object {
    if (configName === 'interfaceConfig') {
-        return pick(configJSON, INTERFACE_CONFIG_WHITELIST);
+        return _.pick(configJSON, INTERFACE_CONFIG_WHITELIST);
    } else if (configName === 'config') {
-        return pick(configJSON, CONFIG_WHITELIST);
+        return _.pick(configJSON, CONFIG_WHITELIST);
    }

    return configJSON;
@@ -381,21 +353,3 @@ export function getLegalUrls(state: IReduxState) {
        terms: configLegalUrls?.terms || DEFAULT_TERMS_URL
    };
 }
-
-/**
- * Utility function to debounce the execution of a callback function.
- *
- * @param {Function} callback - The callback to debounce.
- * @param {number} delay - The debounce delay in milliseconds.
- * @returns {Function} - A debounced function that delays the execution of the callback.
- */
-export function debounce(callback: (...args: any[]) => void, delay: number) {
-    let timerId: any;
-
-    return (...args: any[]) => {
-        if (timerId) {
-            clearTimeout(timerId);
-        }
-        timerId = setTimeout(() => callback(...args), delay);
-    };
-}
--- a/react/features/base/config/reducer.ts
+++ b/react/features/base/config/reducer.ts
@@ -1,4 +1,4 @@
-import { merge, union } from 'lodash-es';
+import _ from 'lodash';

 import { CONFERENCE_INFO } from '../../conference/components/constants';
 import { TOOLBAR_BUTTONS } from '../../toolbox/constants';
@@ -194,7 +194,7 @@ function _setConfig(state: IConfig, { config }: { config: IConfig; }) {
        });
    }

-    const newState = merge(
+    const newState = _.merge(
        {},
        config,
        hdAudioOptions,
@@ -397,7 +397,7 @@ function _translateLegacyConfig(oldValue: IConfig) {
                    = (newValue.conferenceInfo?.alwaysVisible ?? [])
                    .filter(c => !CONFERENCE_HEADER_MAPPING[key].includes(c));
                newValue.conferenceInfo.autoHide
-                    = union(newValue.conferenceInfo.autoHide, CONFERENCE_HEADER_MAPPING[key]);
+                    = _.union(newValue.conferenceInfo.autoHide, CONFERENCE_HEADER_MAPPING[key]);
            } else {
                newValue.conferenceInfo.alwaysVisible
                    = (newValue.conferenceInfo.alwaysVisible ?? [])
@@ -442,12 +442,6 @@ function _translateLegacyConfig(oldValue: IConfig) {
        newValue.disabledSounds.unshift('INCOMING_MSG_SOUND');
    }

-    newValue.raisedHands = newValue.raisedHands || {};
-
-    if (oldValue.disableRemoveRaisedHandOnFocus) {
-        newValue.raisedHands.disableRemoveRaisedHandOnFocus = oldValue.disableRemoveRaisedHandOnFocus;
-    }
-
    if (oldValue.stereo || oldValue.opusMaxAverageBitrate) {
        newValue.audioQuality = {
            opusMaxAverageBitrate: oldValue.audioQuality?.opusMaxAverageBitrate ?? oldValue.opusMaxAverageBitrate,
@@ -599,7 +593,7 @@ function _translateLegacyConfig(oldValue: IConfig) {
 * @returns {Object} The new state after the reduction of the specified action.
 */
 function _updateConfig(state: IConfig, { config }: { config: IConfig; }) {
-    const newState = merge({}, state, config);
+    const newState = _.merge({}, state, config);

    _cleanupConfig(newState);

--- a/react/features/base/connection/actions.any.ts
+++ b/react/features/base/connection/actions.any.ts
@@ -1,4 +1,4 @@
-import { cloneDeep } from 'lodash-es';
+import _ from 'lodash';

 import { IReduxState, IStore } from '../../app/types';
 import { conferenceLeft, conferenceWillLeave, redirect } from '../conference/actions';
@@ -113,7 +113,7 @@ export function connectionFailed(
 export function constructOptions(state: IReduxState) {
    // Deep clone the options to make sure we don't modify the object in the
    // redux store.
-    const options: IOptions = cloneDeep(state['features/base/config']);
+    const options: IOptions = _.cloneDeep(state['features/base/config']);

    const { locationURL, preferVisitor } = state['features/base/connection'];
    const params = parseURLParams(locationURL || '');
--- a/react/features/base/dialog/components/native/PageReloadDialog.tsx
+++ b/react/features/base/dialog/components/native/PageReloadDialog.tsx
@@ -18,10 +18,7 @@ import ConfirmDialog from './ConfirmDialog';
 * The type of the React {@code Component} props of
 * {@link PageReloadDialog}.
 */
-interface IProps extends WithTranslation {
-    conferenceError?: Error;
-    configError?: Error;
-    connectionError?: Error;
+interface IPageReloadDialogProps extends WithTranslation {
    dispatch: IStore['dispatch'];
    isNetworkFailure: boolean;
    reason?: string;
@@ -40,7 +37,7 @@ interface IPageReloadDialogState {
 * conference is reloaded.
 * Shows a warning message and counts down towards the re-load.
 */
-class PageReloadDialog extends Component<IProps, IPageReloadDialogState> {
+class PageReloadDialog extends Component<IPageReloadDialogProps, IPageReloadDialogState> {
    _interval?: number;
    _timeoutSeconds: number;

@@ -51,7 +48,7 @@ class PageReloadDialog extends Component<IProps, IPageReloadDialogState> {
     * instance is to be initialized.
     * @public
     */
-    constructor(props: IProps) {
+    constructor(props: IPageReloadDialogProps) {
        super(props);

        this._timeoutSeconds = 10 + randomInt(0, 20);
@@ -187,18 +184,23 @@ class PageReloadDialog extends Component<IProps, IPageReloadDialogState> {
 * Maps (parts of) the redux state to the associated component's props.
 *
 * @param {Object} state - The redux state.
- * @param {IProps} ownProps - The own props of the component.
 * @protected
 * @returns {{
 *     isNetworkFailure: boolean,
 *     reason: string
 * }}
 */
-function mapStateToProps(state: IReduxState, ownProps: IProps) {
-    const { conferenceError, configError, connectionError } = ownProps;
+function mapStateToProps(state: IReduxState) {
+    const { error: conferenceError } = state['features/base/conference'];
+    const { error: configError } = state['features/base/config'];
+    const { error: connectionError } = state['features/base/connection'];
+    const { fatalError } = state['features/overlay'];
+
    const fatalConnectionError
        = connectionError && isFatalJitsiConnectionError(connectionError);
-    const isNetworkFailure = Boolean(configError || fatalConnectionError);
+    const fatalConfigError = fatalError === configError;
+
+    const isNetworkFailure = Boolean(fatalConfigError || fatalConnectionError);

    let reason;

--- a/react/features/base/flags/reducer.ts
+++ b/react/features/base/flags/reducer.ts
@@ -1,4 +1,4 @@
-import { isEqual, merge } from 'lodash-es';
+import _ from 'lodash';

 import ReducerRegistry from '../redux/ReducerRegistry';

@@ -25,9 +25,9 @@ export interface IFlagsState {
 ReducerRegistry.register<IFlagsState>('features/base/flags', (state = DEFAULT_STATE, action): IFlagsState => {
    switch (action.type) {
    case UPDATE_FLAGS: {
-        const newState = merge({}, state, action.flags);
+        const newState = _.merge({}, state, action.flags);

-        return isEqual(state, newState) ? state : newState;
+        return _.isEqual(state, newState) ? state : newState;
    }
    }

--- a/react/features/base/i18n/customNavigatorDetector.ts
+++ b/react/features/base/i18n/customNavigatorDetector.ts
@@ -59,7 +59,7 @@ export default {
 function normalizeLanguage(language: string) {
    const [ lang, variant ] = language.replace('_', '-').split('-');

-    if (!variant || lang.toUpperCase() === variant.toUpperCase()) {
+    if (!variant || lang === variant) {
        return lang;
    }

--- a/react/features/base/i18n/i18next.ts
+++ b/react/features/base/i18n/i18next.ts
@@ -1,7 +1,7 @@
 import COUNTRIES_RESOURCES from 'i18n-iso-countries/langs/en.json';
 import i18next from 'i18next';
 import I18nextXHRBackend, { HttpBackendOptions } from 'i18next-http-backend';
-import { merge } from 'lodash-es';
+import _ from 'lodash';

 import LANGUAGES_RESOURCES from '../../../../lang/languages.json';
 import MAIN_RESOURCES from '../../../../lang/main.json';
@@ -22,7 +22,7 @@ const COUNTRIES_RESOURCES_OVERRIDES = {
 /**
 * Merged country names.
 */
-const COUNTRIES = merge({}, COUNTRIES_RESOURCES, COUNTRIES_RESOURCES_OVERRIDES);
+const COUNTRIES = _.merge({}, COUNTRIES_RESOURCES, COUNTRIES_RESOURCES_OVERRIDES);

 /**
 * The available/supported languages.
--- a/react/features/base/jwt/constants.ts
+++ b/react/features/base/jwt/constants.ts
@@ -18,6 +18,15 @@ export const MEET_FEATURES = {
    TRANSCRIPTION: 'transcription'
 };

+/**
+ * A mapping between jwt features and toolbar buttons keys.
+ */
+export const FEATURES_TO_BUTTONS_MAPPING = {
+    'livestreaming': 'livestreaming',
+    'recording': 'recording',
+    'transcription': 'closedcaptions'
+};
+
 /**
 * The JWT validation errors for JaaS.
 */
--- a/react/features/base/jwt/functions.ts
+++ b/react/features/base/jwt/functions.ts
@@ -46,7 +46,7 @@ export function getJwtName(state: IReduxState) {
 * @param {string} feature - The feature we want to check.
 * @param {boolean} ifNoToken - Default value if there is no token.
 * @param {boolean} ifNotInFeatures - Default value if features prop exists but does not have the {@code feature}.
- * @returns {boolean}
+ * @returns {bolean}
 */
 export function isJwtFeatureEnabled(state: IReduxState, feature: string, ifNoToken = false, ifNotInFeatures = false) {
    const { jwt } = state['features/base/jwt'];
--- a/react/features/base/lastn/middleware.ts
+++ b/react/features/base/lastn/middleware.ts
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash-es';
+import debounce from 'lodash/debounce';

 import { IStore } from '../../app/types';
 import { SET_FILMSTRIP_ENABLED } from '../../filmstrip/actionTypes';
@@ -11,6 +11,7 @@ import { SET_AUDIO_ONLY } from '../audio-only/actionTypes';
 import { CONFERENCE_JOINED } from '../conference/actionTypes';
 import { getParticipantById } from '../participants/functions';
 import MiddlewareRegistry from '../redux/MiddlewareRegistry';
+import { isLocalVideoTrackDesktop } from '../tracks/functions';

 import { setLastN } from './actions';
 import logger from './logger';
@@ -44,7 +45,9 @@ const _updateLastN = debounce(({ dispatch, getState }: IStore) => {
    // 3. -1 as the default value.
    let lastNSelected = config.startLastN ?? (config.channelLastN ?? -1);

-    if (appState === 'background' || carMode) {
+    if (typeof appState !== 'undefined' && appState !== 'active') {
+        lastNSelected = isLocalVideoTrackDesktop(state) ? 1 : 0;
+    } else if (carMode) {
        lastNSelected = 0;
    } else if (audioOnly) {
        const { remoteScreenShares, tileViewEnabled } = state['features/video-layout'];
--- a/react/features/base/logging/functions.ts
+++ b/react/features/base/logging/functions.ts
@@ -1,6 +1,6 @@
 // @ts-expect-error
 import Logger, { getLogger as _getLogger } from '@jitsi/logger';
-import { once } from 'lodash-es';
+import _ from 'lodash';

 import LogTransport from './LogTransport';

@@ -26,7 +26,7 @@ export function getLogger(id: string) {
 /**
 * Initializes native logging. This operations must be done as early as possible.
 */
-export const _initLogging = once(() => {
+export const _initLogging = _.once(() => {
    if (navigator.product !== 'ReactNative') {
        return;
    }
--- a/react/features/base/logging/reducer.ts
+++ b/react/features/base/logging/reducer.ts
@@ -1,4 +1,4 @@
-import { merge } from 'lodash-es';
+import _ from 'lodash';
 import { AnyAction } from 'redux';

 import ReducerRegistry from '../redux/ReducerRegistry';
@@ -95,7 +95,7 @@ ReducerRegistry.register<ILoggingState>(
 * reduction of the specified action.
 */
 function _setLoggingConfig(state: ILoggingState, action: AnyAction) {
-    const newConfig = merge({}, DEFAULT_STATE.config, action.config);
+    const newConfig = _.merge({}, DEFAULT_STATE.config, action.config);

    if (equals(state.config, newConfig)) {
        return state;
--- a/react/features/base/participants/actions.ts
+++ b/react/features/base/participants/actions.ts
@@ -547,7 +547,7 @@ export function participantKicked(kicker: any, kicked: any) {
        const state = getState();
        const localParticipant = getLocalParticipant(state);
        const kickedId = kicked.getId();
-        const kickerId = kicker?.getId();
+        const kickerId = kicker.getId();

        dispatch({
            type: PARTICIPANT_KICKED,
@@ -555,7 +555,7 @@ export function participantKicked(kicker: any, kicked: any) {
            kicker: kickerId
        });

-        if (kicked.isReplaced?.() || !kickerId || kickerId === localParticipant?.id) {
+        if (kicked.isReplaced?.() || kickerId === localParticipant?.id) {
            return;
        }

--- a/react/features/base/participants/components/ParticipantView.native.tsx
+++ b/react/features/base/participants/components/ParticipantView.native.tsx
@@ -8,7 +8,6 @@ import {
    isTrackStreamingStatusInactive
 } from '../../../connection-indicator/functions';
 import SharedVideo from '../../../shared-video/components/native/SharedVideo';
-import { isSharedVideoEnabled } from '../../../shared-video/functions';
 import { IStateful } from '../../app/types';
 import Avatar from '../../avatar/components/Avatar';
 import { translate } from '../../i18n/functions';
@@ -53,11 +52,6 @@ interface IProps {
     */
    _renderVideo: boolean;

-    /**
-     * Whether the shared video is enabled or not.
-     */
-    _sharedVideoEnabled: boolean;
-
    /**
     * The video Track of the participant with {@link #participantId}.
     */
@@ -173,7 +167,6 @@ class ParticipantView extends Component<IProps> {
            _isConnectionInactive,
            _isSharedVideoParticipant,
            _renderVideo: renderVideo,
-            _sharedVideoEnabled,
            _videoTrack: videoTrack,
            disableVideo,
            onPress
@@ -184,7 +177,7 @@ class ParticipantView extends Component<IProps> {
                ? this.props.testHintId
                : `org.jitsi.meet.Participant#${this.props.participantId}`;

-        const renderSharedVideo = _isSharedVideoParticipant && !disableVideo && _sharedVideoEnabled;
+        const renderSharedVideo = _isSharedVideoParticipant && !disableVideo;

        return (
            <Container
@@ -244,7 +237,6 @@ function _mapStateToProps(state: IReduxState, ownProps: any) {
        _isSharedVideoParticipant: isSharedVideoParticipant(participant),
        _participantName: getParticipantDisplayName(state, participantId),
        _renderVideo: shouldRenderParticipantVideo(state, participantId) && !disableVideo,
-        _sharedVideoEnabled: isSharedVideoEnabled(state),
        _videoTrack: videoTrack
    };
 }
--- a/react/features/base/participants/middleware.ts
+++ b/react/features/base/participants/middleware.ts
@@ -14,7 +14,6 @@ import {
    NOTIFICATION_TIMEOUT_TYPE,
    RAISE_HAND_NOTIFICATION_ID
 } from '../../notifications/constants';
-import { open as openParticipantsPane } from '../../participants-pane/actions';
 import { isForceMuted } from '../../participants-pane/functions';
 import { CALLING, INVITED } from '../../presence-status/constants';
 import { RAISE_HAND_SOUND_ID } from '../../reactions/constants';
@@ -784,19 +783,10 @@ function _raiseHandUpdated({ dispatch, getState }: IStore, conference: IJitsiCon
            || isForceMuted(participant, MEDIA_TYPE.VIDEO, state);
    }

-    let action;
-
-    if (shouldDisplayAllowAction) {
-        action = {
-            customActionNameKey: [ 'notify.allowAction' ],
-            customActionHandler: [ () => dispatch(approveParticipant(participantId)) ]
-        };
-    } else {
-        action = {
-            customActionNameKey: [ 'notify.viewParticipants' ],
-            customActionHandler: [ () => dispatch(openParticipantsPane()) ]
-        };
-    }
+    const action = shouldDisplayAllowAction ? {
+        customActionNameKey: [ 'notify.allowAction' ],
+        customActionHandler: [ () => dispatch(approveParticipant(participantId)) ]
+    } : {};

    if (raisedHandTimestamp) {
        let notificationTitle;
@@ -820,7 +810,7 @@ function _raiseHandUpdated({ dispatch, getState }: IStore, conference: IJitsiCon
            concatText: true,
            uid: RAISE_HAND_NOTIFICATION_ID,
            ...action
-        }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
+        }, shouldDisplayAllowAction ? NOTIFICATION_TIMEOUT_TYPE.MEDIUM : NOTIFICATION_TIMEOUT_TYPE.SHORT));
        dispatch(playSound(RAISE_HAND_SOUND_ID));
    }
 }
--- a/react/features/base/participants/reducer.ts
+++ b/react/features/base/participants/reducer.ts
@@ -118,17 +118,13 @@ ReducerRegistry.register<IParticipantsState>('features/base/participants',
    case NOTIFIED_TO_SPEAK: {
        return {
            ...state,
-            raisedHandsQueue: state.raisedHandsQueue.map((item, index) => {
-                if (index === 0) {
-
-                    return {
-                        ...item,
-                        hasBeenNotified: true
-                    };
-                }
-
-                return item;
-            })
+            raisedHandsQueue: [
+                {
+                    ...state.raisedHandsQueue[0],
+                    hasBeenNotified: true
+                },
+                ...state.raisedHandsQueue.slice(1)
+            ]
        };
    }

--- a/react/features/base/participants/subscriber.ts
+++ b/react/features/base/participants/subscriber.ts
@@ -1,16 +1,12 @@

-import { difference } from 'lodash-es';
+import _ from 'lodash';
 import { batch } from 'react-redux';

 import { IStore } from '../../app/types';
-import { hideNotification, showNotification } from '../../notifications/actions';
-import { NOTIFICATION_TIMEOUT_TYPE, RAISE_HAND_NOTIFICATION_ID } from '../../notifications/constants';
+import { showNotification } from '../../notifications/actions';
+import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants';
 import { getCurrentConference } from '../conference/functions';
-import {
-    getDisableNextSpeakerNotification,
-    getSsrcRewritingFeatureFlag,
-    hasBeenNotified,
-    isNextToSpeak } from '../config/functions.any';
+import { getSsrcRewritingFeatureFlag, hasBeenNotified, isNextToSpeak } from '../config/functions.any';
 import { VIDEO_TYPE } from '../media/constants';
 import StateListenerRegistry from '../redux/StateListenerRegistry';

@@ -37,16 +33,9 @@ StateListenerRegistry.register(
 StateListenerRegistry.register(
    /* selector */ state => state['features/base/participants'].raisedHandsQueue,
    /* listener */ (raisedHandsQueue, store) => {
-        if (raisedHandsQueue.length
-            && isNextToSpeak(store.getState())
-            && !hasBeenNotified(store.getState())
-            && !getDisableNextSpeakerNotification(store.getState())
-            && !store.getState()['features/visitors'].iAmVisitor) { // visitors raise hand to be promoted
+        if (isNextToSpeak(store.getState()) && !hasBeenNotified(store.getState())) {
            _notifyNextSpeakerInRaisedHandQueue(store);
        }
-        if (!raisedHandsQueue[0]) {
-            store.dispatch(hideNotification(RAISE_HAND_NOTIFICATION_ID));
-        }
    }
 );

@@ -65,8 +54,8 @@ function _createOrRemoveVirtualParticipants(
        store: IStore): void {
    const { dispatch, getState } = store;
    const conference = getCurrentConference(getState());
-    const removedScreenshareSourceNames = difference(oldScreenshareSourceNames, newScreenshareSourceNames);
-    const addedScreenshareSourceNames = difference(newScreenshareSourceNames, oldScreenshareSourceNames);
+    const removedScreenshareSourceNames = _.difference(oldScreenshareSourceNames, newScreenshareSourceNames);
+    const addedScreenshareSourceNames = _.difference(newScreenshareSourceNames, oldScreenshareSourceNames);

    if (removedScreenshareSourceNames.length) {
        removedScreenshareSourceNames.forEach(id => dispatch(participantLeft(id, conference, {
--- a/react/features/base/react/components/web/Message.tsx
+++ b/react/features/base/react/components/web/Message.tsx
@@ -1,20 +1,14 @@
 import React, { Component, ReactNode } from 'react';
 import { toArray } from 'react-emoji-render';
-import { connect } from 'react-redux';

-import { IReduxState } from '../../../../app/types';
 import GifMessage from '../../../../chat/components/web/GifMessage';
-import { extractGifURL, isGifEnabled, isGifMessage } from '../../../../gifs/functions.web';
+import { GIF_PREFIX } from '../../../../gifs/constants';
+import { isGifMessage } from '../../../../gifs/functions.web';

 import Linkify from './Linkify';

 interface IProps {

-    /**
-     * Whether the gifs are enabled or not.
-     */
-    gifEnabled: boolean;
-
    /**
     * The body of the message.
     */
@@ -49,12 +43,12 @@ class Message extends Component<IProps> {

        // Tokenize the text in order to avoid emoji substitution for URLs
        const tokens = text ? text.split(' ') : [];
+
        const content = [];
-        const { gifEnabled } = this.props;

        // check if the message is a GIF
-        if (gifEnabled && isGifMessage(text)) {
-            const url = extractGifURL(text);
+        if (isGifMessage(text)) {
+            const url = text.substring(GIF_PREFIX.length, text.length - 1);

            content.push(<GifMessage
                key = { url }
@@ -99,16 +93,4 @@ class Message extends Component<IProps> {
    }
 }

-/**
- * Maps part of the redux state to the props of this component.
- *
- * @param {IReduxState} state - The Redux state.
- * @returns {IProps}
- */
-function _mapStateToProps(state: IReduxState) {
-    return {
-        gifEnabled: isGifEnabled(state)
-    };
-}
-
-export default connect(_mapStateToProps)(Message);
+export default Message;
--- a/react/features/base/react/components/web/MultiSelectAutocomplete.tsx
+++ b/react/features/base/react/components/web/MultiSelectAutocomplete.tsx
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash-es';
+import _debounce from 'lodash/debounce';
 import React, { Component } from 'react';

 import { MultiSelectItem } from '../../../ui/components/types';
@@ -145,7 +145,7 @@ class MultiSelectAutocomplete extends Component<IProps, IState> {
        this._onFilterChange = this._onFilterChange.bind(this);
        this._onRetry = this._onRetry.bind(this);
        this._onSelectionChange = this._onSelectionChange.bind(this);
-        this._sendQuery = debounce(this._sendQuery.bind(this), 200);
+        this._sendQuery = _debounce(this._sendQuery.bind(this), 200);
    }

    /**
--- a/react/features/base/react/types.ts
+++ b/react/features/base/react/types.ts
@@ -5,7 +5,6 @@ export interface IIconButtonProps {
    accessibilityLabel?: string;
    color?: string;
    disabled?: boolean;
-    id?: string;
    onPress?: (e?: GestureResponderEvent) => void;
    size?: number | string;
    src: Function;
--- a/react/features/base/redux/functions.ts
+++ b/react/features/base/redux/functions.ts
@@ -1,4 +1,4 @@
-import { isEqual } from 'lodash-es';
+import _ from 'lodash';

 import { IReduxState, IStore } from '../../app/types';
 import { IStateful } from '../app/types';
@@ -36,7 +36,7 @@ export function assign<T extends Object>(target: T, source: Partial<T>): T {
 * comparison); false, otherwise.
 */
 export function equals(a: any, b: any) {
-    return isEqual(a, b);
+    return _.isEqual(a, b);
 }

 /**
--- a/react/features/base/redux/middleware.ts
+++ b/react/features/base/redux/middleware.ts
@@ -1,4 +1,4 @@
-import { throttle } from 'lodash-es';
+import _ from 'lodash';

 import MiddlewareRegistry from './MiddlewareRegistry';
 import PersistenceRegistry from './PersistenceRegistry';
@@ -13,7 +13,10 @@ const PERSIST_STATE_DELAY = 2000;
 /**
 * A throttled function to avoid repetitive state persisting.
 */
-const throttledPersistState = throttle(state => PersistenceRegistry.persistState(state), PERSIST_STATE_DELAY);
+const throttledPersistState
+    = _.throttle(
+        state => PersistenceRegistry.persistState(state),
+        PERSIST_STATE_DELAY);

 // Web only code.
 // We need the <tt>if</tt> because it appears that on mobile the polyfill is not
--- a/react/features/base/settings/functions.web.ts
+++ b/react/features/base/settings/functions.web.ts
@@ -178,20 +178,18 @@ function _getUserSelectedDeviceId(options: {
        replacement = ''
    } = options;

-    if (userSelectedDeviceId) {
-        const foundMatchingBasedonDeviceId = availableDevices?.find(
-            candidate => candidate.deviceId === userSelectedDeviceId);
-
-        // Prioritize matching the deviceId
-        if (foundMatchingBasedonDeviceId) {
-            return userSelectedDeviceId;
-        }
-    }
-
    // If there is no label at all, there is no need to fall back to checking
    // the label for a fuzzy match.
-    if (!userSelectedDeviceLabel) {
-        return;
+    if (!userSelectedDeviceLabel || !userSelectedDeviceId) {
+        return userSelectedDeviceId;
+    }
+
+    const foundMatchingBasedonDeviceId = availableDevices?.find(
+        candidate => candidate.deviceId === userSelectedDeviceId);
+
+    // Prioritize matching the deviceId
+    if (foundMatchingBasedonDeviceId) {
+        return userSelectedDeviceId;
    }

    const strippedDeviceLabel
--- a/react/features/base/settings/middleware.any.ts
+++ b/react/features/base/settings/middleware.any.ts
@@ -1,4 +1,4 @@
-import { escape } from 'lodash-es';
+import _ from 'lodash';
 import { AnyAction } from 'redux';

 import { IStore } from '../../app/types';
@@ -100,8 +100,8 @@ function _updateLocalParticipantFromUrl({ dispatch, getState }: IStore) {
    const localParticipant = getLocalParticipant(getState());

    if (localParticipant) {
-        const displayName = escape(urlDisplayName);
-        const email = escape(urlEmail);
+        const displayName = _.escape(urlDisplayName);
+        const email = _.escape(urlEmail);

        dispatch(participantUpdated({
            ...localParticipant,
--- a/react/features/base/settings/reducer.ts
+++ b/react/features/base/settings/reducer.ts
@@ -1,6 +1,6 @@
 // @ts-expect-error
 import { jitsiLocalStorage } from '@jitsi/js-utils';
-import { escape } from 'lodash-es';
+import _ from 'lodash';

 import { APP_WILL_MOUNT } from '../app/actionTypes';
 import PersistenceRegistry from '../redux/PersistenceRegistry';
@@ -154,8 +154,8 @@ function _initSettings(featureState: ISettingsState) {
    // is a defined value, it will override any value found in local storage.
    // The workaround is sidestepping _.escape when the value is not set in
    // local storage.
-    const displayName = savedDisplayName === null ? undefined : escape(savedDisplayName);
-    const email = savedEmail === null ? undefined : escape(savedEmail);
+    const displayName = savedDisplayName === null ? undefined : _.escape(savedDisplayName);
+    const email = savedEmail === null ? undefined : _.escape(savedEmail);

    settings = assignIfDefined({
        displayName,
--- a/react/features/base/tracks/actions.any.ts
+++ b/react/features/base/tracks/actions.any.ts
@@ -833,7 +833,6 @@ export function toggleCamera() {
        const tracks = state['features/base/tracks'];
        const localVideoTrack = getLocalVideoTrack(tracks)?.jitsiTrack;
        const currentFacingMode = localVideoTrack.getCameraFacingMode();
-        const { localFlipX } = state['features/base/settings'];

        /**
         * FIXME: Ideally, we should be dispatching {@code replaceLocalTrack} here,
@@ -849,7 +848,7 @@ export function toggleCamera() {
            : CAMERA_FACING_MODE.USER;

        // Update the flipX value so the environment facing camera is not flipped, before the new track is created.
-        dispatch(updateSettings({ localFlipX: targetFacingMode === CAMERA_FACING_MODE.USER ? localFlipX : false }));
+        dispatch(updateSettings({ localFlipX: targetFacingMode === CAMERA_FACING_MODE.USER }));

        const newVideoTrack = await createLocalTrack('video', null, null, { facingMode: targetFacingMode });

--- a/react/features/base/tracks/subscriber.ts
+++ b/react/features/base/tracks/subscriber.ts
@@ -1,4 +1,4 @@
-import { isEqual, sortBy } from 'lodash-es';
+import _ from 'lodash';

 import { MEDIA_TYPE } from '../media/constants';
 import { getScreenshareParticipantIds } from '../participants/functions';
@@ -16,7 +16,7 @@ StateListenerRegistry.register(
            return;
        }

-        if (!isEqual(sortBy(participantIDs), sortBy(previousParticipantIDs))) {
+        if (!_.isEqual(_.sortBy(participantIDs), _.sortBy(previousParticipantIDs))) {
            APP.API.notifySharingParticipantsChanged(participantIDs);
        }
    }
--- a/react/features/base/ui/Tokens.ts
+++ b/react/features/base/ui/Tokens.ts
@@ -189,13 +189,6 @@ export const typography = {
        letterSpacing: 0.16
    },

-    bodyShortRegularSmall: {
-        fontSize: 10,
-        lineHeight: 16,
-        fontWeight: font.weightRegular,
-        letterSpacing: 0
-    },
-
    bodyShortRegular: {
        fontSize: 14,
        lineHeight: 20,
--- a/react/features/base/ui/components/native/Button.tsx
+++ b/react/features/base/ui/components/native/Button.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { StyleProp, TouchableHighlight } from 'react-native';
+import { TouchableHighlight } from 'react-native';
 import { Button as NativePaperButton, Text } from 'react-native-paper';
-import { IconSource } from 'react-native-paper/lib/typescript/components/Icon';

 import { BUTTON_MODES, BUTTON_TYPES } from '../../constants.native';
 import BaseTheme from '../BaseTheme.native';
@@ -14,7 +13,6 @@ import styles from './buttonStyles';
 export interface IProps extends IButtonProps {
    color?: string | undefined;
    contentStyle?: Object | undefined;
-    id?: string;
    labelStyle?: Object | undefined;
    mode?: any;
    style?: Object | undefined;
@@ -26,7 +24,6 @@ const Button: React.FC<IProps> = ({
    contentStyle,
    disabled,
    icon,
-    id,
    labelKey,
    labelStyle,
    mode = BUTTON_MODES.CONTAINED,
@@ -77,17 +74,16 @@ const Button: React.FC<IProps> = ({
            <TouchableHighlight
                accessibilityLabel = { accessibilityLabel }
                disabled = { disabled }
-                id = { id }
                onPress = { onPress }
                style = { [
                    buttonStyles,
                    style
-                ] as StyleProp<object> }>
+                ] }>
                <Text
                    style = { [
                        buttonLabelStyles,
                        labelStyle
-                    ] as StyleProp<object> }>{ t(labelKey ?? '') }</Text>
+                    ] }>{ t(labelKey ?? '') }</Text>
            </TouchableHighlight>
        );
    }
@@ -100,20 +96,21 @@ const Button: React.FC<IProps> = ({
            contentStyle = { [
                styles.buttonContent,
                contentStyle
-            ] as StyleProp<object> }
+            ] }
            disabled = { disabled }
-            icon = { icon as IconSource | undefined }
-            id = { id }
+
+            // @ts-ignore
+            icon = { icon }
            labelStyle = { [
                buttonLabelStyles,
                labelStyle
-            ] as StyleProp<object> }
+            ] }
            mode = { mode }
            onPress = { onPress }
            style = { [
                buttonStyles,
                style
-            ] as StyleProp<object> } />
+            ] } />
    );
 };

--- a/react/features/base/ui/components/native/IconButton.tsx
+++ b/react/features/base/ui/components/native/IconButton.tsx
@@ -12,7 +12,6 @@ const IconButton: React.FC<IIconButtonProps> = ({
    accessibilityLabel,
    color: iconColor,
    disabled,
-    id,
    onPress,
    size,
    src,
@@ -53,7 +52,6 @@ const IconButton: React.FC<IIconButtonProps> = ({
        <TouchableHighlight
            accessibilityLabel = { accessibilityLabel }
            disabled = { disabled }
-            id = { id }
            onPress = { onPress }
            style = { [
                iconButtonContainerStyles,
--- a/react/features/base/ui/components/native/Switch.tsx
+++ b/react/features/base/ui/components/native/Switch.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ColorValue, StyleProp } from 'react-native';
+import { ColorValue } from 'react-native';
 import { Switch as NativeSwitch } from 'react-native-paper';

 import { ISwitchProps } from '../types';
@@ -12,12 +12,6 @@ import {

 interface IProps extends ISwitchProps {

-    /**
-     * Id for the switch.
-     */
-
-    id?: string;
-
    /**
     * Custom styles for the switch.
     */
@@ -37,7 +31,6 @@ interface IProps extends ISwitchProps {
 const Switch = ({
    checked,
    disabled,
-    id,
    onChange,
    thumbColor = THUMB_COLOR,
    trackColor = {
@@ -48,10 +41,9 @@ const Switch = ({
 }: IProps) => (
    <NativeSwitch
        disabled = { disabled }
-        id = { id }
        ios_backgroundColor = { DISABLED_TRACK_COLOR }
        onValueChange = { onChange }
-        style = { style as StyleProp<object> }
+        style = { style }
        thumbColor = { thumbColor }
        trackColor = { trackColor }
        value = { checked } />
--- a/react/features/base/ui/functions.web.ts
+++ b/react/features/base/ui/functions.web.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { Theme, adaptV4Theme, createTheme } from '@mui/material/styles';
+import { adaptV4Theme, createTheme } from '@mui/material/styles';

 import { ITypography, IPalette as Palette1 } from '../ui/types';

@@ -107,14 +107,3 @@ export function operatesWithEnterKey(element: Element): boolean {

    return false;
 }
-
-/**
- * Returns a common spacing from the bottom of the page for floating elements over the video space.
- *
- * @param {Theme} theme - The current theme.
- * @param {boolean} isToolbarVisible - Whether the toolbar is visible or not.
- * @returns {number}
- */
-export function getVideospaceFloatingElementsBottomSpacing(theme: Theme, isToolbarVisible: boolean) {
-    return parseInt(isToolbarVisible ? theme.spacing(12) : theme.spacing(6), 10);
-}
--- a/react/features/base/ui/types.ts
+++ b/react/features/base/ui/types.ts
@@ -69,7 +69,6 @@ export interface ITypography {
    bodyShortBoldLarge: ITypographyType;
    bodyShortRegular: ITypographyType;
    bodyShortRegularLarge: ITypographyType;
-    bodyShortRegularSmall: ITypographyType;
    heading1: ITypographyType;
    heading2: ITypographyType;
    heading3: ITypographyType;
--- a/react/features/base/util/isInsecureRoomName.ts
+++ b/react/features/base/util/isInsecureRoomName.ts
@@ -1,4 +1,4 @@
-import { isEqual } from 'lodash-es';
+import _ from 'lodash';
 import { NIL, parse as parseUUID } from 'uuid';
 import zxcvbn from 'zxcvbn';

@@ -22,7 +22,7 @@ function isValidUUID(str: string) {
        return false;
    }

-    return !isEqual(uuid, NIL_UUID);
+    return !_.isEqual(uuid, NIL_UUID);
 }

 /**
--- a/react/features/breakout-rooms/actions.ts
+++ b/react/features/breakout-rooms/actions.ts
@@ -1,5 +1,5 @@
 import i18next from 'i18next';
-import { chunk, filter, shuffle } from 'lodash-es';
+import _ from 'lodash';

 import { createBreakoutRoomsEvent } from '../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../analytics/functions';
@@ -129,14 +129,14 @@ export function removeBreakoutRoom(breakoutRoomJid: string) {
 export function autoAssignToBreakoutRooms() {
    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
        const rooms = getBreakoutRooms(getState);
-        const breakoutRooms = filter(rooms, room => !room.isMainRoom);
+        const breakoutRooms = _.filter(rooms, room => !room.isMainRoom);

        if (breakoutRooms) {
            sendAnalytics(createBreakoutRoomsEvent('auto.assign'));
            const participantIds = Array.from(getRemoteParticipants(getState).keys());
            const length = Math.ceil(participantIds.length / breakoutRooms.length);

-            chunk(shuffle(participantIds), length).forEach((group, index) =>
+            _.chunk(_.shuffle(participantIds), length).forEach((group, index) =>
                group.forEach(participantId => {
                    dispatch(sendParticipantToRoom(participantId, breakoutRooms[index].id));
                })
--- a/react/features/breakout-rooms/functions.ts
+++ b/react/features/breakout-rooms/functions.ts
@@ -1,4 +1,4 @@
-import { find } from 'lodash-es';
+import _ from 'lodash';

 import { IStateful } from '../base/app/types';
 import { getCurrentConference } from '../base/conference/functions';
@@ -33,7 +33,7 @@ export const getBreakoutRooms = (stateful: IStateful): IRooms => toState(statefu
 export const getMainRoom = (stateful: IStateful) => {
    const rooms = getBreakoutRooms(stateful);

-    return find(rooms, room => Boolean(room.isMainRoom));
+    return _.find(rooms, room => Boolean(room.isMainRoom));
 };

 /**
@@ -135,7 +135,7 @@ export const getRoomsInfo = (stateful: IStateful) => {
 export const getRoomByJid = (stateful: IStateful, roomJid: string) => {
    const rooms = getBreakoutRooms(stateful);

-    return find(rooms, (room: IRoom) => room.jid === roomJid);
+    return _.find(rooms, (room: IRoom) => room.jid === roomJid);
 };

 /**
--- a/react/features/breakout-rooms/middleware.ts
+++ b/react/features/breakout-rooms/middleware.ts
@@ -83,12 +83,12 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
        const { messages } = getState()['features/chat'];

        messages?.forEach(m => {
-            if (m.messageType === MESSAGE_TYPE_REMOTE && !getParticipantById(getState(), m.participantId)) {
+            if (m.messageType === MESSAGE_TYPE_REMOTE && !getParticipantById(getState(), m.id)) {
                const rooms: IRooms = action.rooms;

                for (const room of Object.values(rooms)) {
                    const participants = room.participants || {};
-                    const matchedJid = Object.keys(participants).find(jid => jid.endsWith(m.participantId));
+                    const matchedJid = Object.keys(participants).find(jid => jid.endsWith(m.id));

                    if (matchedJid) {
                        m.displayName = participants[matchedJid].displayName;
--- a/react/features/chat/actionTypes.ts
+++ b/react/features/chat/actionTypes.ts
@@ -13,18 +13,6 @@
 */
 export const ADD_MESSAGE = 'ADD_MESSAGE';

-/**
- * The type of the action that adds a reaction to a chat message.
- *
- * {
- *     type: ADD_MESSAGE_REACTION,
- *     reaction: string,
- *     messageID: string,
- *     receiverID: string,
- * }
- */
-export const ADD_MESSAGE_REACTION = 'ADD_MESSAGE_REACTION';
-
 /**
 * The type of the action which signals to clear messages in Redux.
 *
@@ -74,18 +62,6 @@ export const OPEN_CHAT = 'OPEN_CHAT';
 */
 export const SEND_MESSAGE = 'SEND_MESSAGE';

-/**
- * The type of the action which signals a reaction to a message.
- *
- * {
- *     type: SEND_REACTION,
- *     reaction: string,
- *     messageID: string,
- *     receiverID: string
- * }
- */
-export const SEND_REACTION = 'SEND_REACTION';
-
 /**
 * The type of action which signals the initiation of sending of as private message to the
 * supplied recipient.
--- a/react/features/chat/actions.any.ts
+++ b/react/features/chat/actions.any.ts
@@ -6,13 +6,11 @@ import { LOBBY_CHAT_INITIALIZED } from '../lobby/constants';

 import {
    ADD_MESSAGE,
-    ADD_MESSAGE_REACTION,
    CLEAR_MESSAGES,
    CLOSE_CHAT,
    EDIT_MESSAGE,
    REMOVE_LOBBY_CHAT_PARTICIPANT,
    SEND_MESSAGE,
-    SEND_REACTION,
    SET_IS_POLL_TAB_FOCUSED,
    SET_LOBBY_CHAT_ACTIVE_STATE,
    SET_LOBBY_CHAT_RECIPIENT,
@@ -51,27 +49,6 @@ export function addMessage(messageDetails: Object) {
    };
 }

-/**
- * Adds a reaction to a chat message.
- *
- * @param {Object} reactionDetails - The reaction to add.
- * @param {string} reactionDetails.participantId - The ID of the message to react to.
- * @param {string} reactionDetails.reactionList - The reaction to add.
- * @param {string} reactionDetails.messageId - The receiver ID of the reaction.
- * @returns {{
- *     type: ADD_MESSAGE_REACTION,
- *     participantId: string,
- *     reactionList: string[],
- *     messageId: string
- * }}
- */
-export function addMessageReaction(reactionDetails: Object) {
-    return {
-        type: ADD_MESSAGE_REACTION,
-        ...reactionDetails
-    };
-}
-
 /**
 * Edits an existing chat message.
 *
@@ -134,24 +111,6 @@ export function sendMessage(message: string, ignorePrivacy = false) {
    };
 }

-/**
- * Sends a reaction to a message.
- *
- * @param {string} reaction - The reaction to send.
- * @param {string} messageId - The message ID to react to.
- * @param {string} receiverId - The receiver ID of the reaction.
- * @returns {Function}
- */
-export function sendReaction(reaction: string, messageId: string, receiverId?: string) {
-
-    return {
-        type: SEND_REACTION,
-        reaction,
-        messageId,
-        receiverId
-    };
-}
-
 /**
 * Initiates the sending of a private message to the supplied participant.
 *
--- a/react/features/chat/components/AbstractMessageContainer.ts
+++ b/react/features/chat/components/AbstractMessageContainer.ts
@@ -36,13 +36,13 @@ export default class AbstractMessageContainer<P extends IProps, S> extends Compo
        for (let i = 0; i < messagesCount; i++) {
            const message = this.props.messages[i];

-            if (message.participantId === currentGroupParticipantId) {
+            if (message.id === currentGroupParticipantId) {
                currentGrouping.push(message);
            } else {
                currentGrouping.length && groups.push(currentGrouping);

                currentGrouping = [ message ];
-                currentGroupParticipantId = message.participantId;
+                currentGroupParticipantId = message.id;
            }
        }

--- a/react/features/chat/components/native/ChatInputBar.tsx
+++ b/react/features/chat/components/native/ChatInputBar.tsx
@@ -84,7 +84,6 @@ class ChatInputBar extends Component<IProps, IState> {

        return (
            <View
-                id = 'chat-input'
                style = { [
                    inputBarStyles,
                    this.state.addPadding ? styles.extraBarPadding : null
@@ -92,7 +91,6 @@ class ChatInputBar extends Component<IProps, IState> {
                <Input
                    blurOnSubmit = { false }
                    customStyles = {{ container: styles.customInputContainer }}
-                    id = 'chat-input-messagebox'
                    multiline = { false }
                    onBlur = { this._onFocused(false) }
                    onChange = { this._onChangeText }
@@ -103,7 +101,6 @@ class ChatInputBar extends Component<IProps, IState> {
                    value = { this.state.message } />
                <IconButton
                    disabled = { !this.state.message }
-                    id = { this.props.t('chat.sendButton') }
                    onPress = { this._onSubmit }
                    src = { IconSend }
                    type = { BUTTON_TYPES.PRIMARY } />
--- a/react/features/chat/components/native/ChatMessage.tsx
+++ b/react/features/chat/components/native/ChatMessage.tsx
@@ -6,8 +6,8 @@ import { IReduxState } from '../../../app/types';
 import Avatar from '../../../base/avatar/components/Avatar';
 import { translate } from '../../../base/i18n/functions';
 import Linkify from '../../../base/react/components/native/Linkify';
-import { isGifEnabled, isGifMessage } from '../../../gifs/functions.native';
-import { CHAR_LIMIT, MESSAGE_TYPE_ERROR, MESSAGE_TYPE_LOCAL } from '../../constants';
+import { isGifMessage } from '../../../gifs/functions.native';
+import { MESSAGE_TYPE_ERROR, MESSAGE_TYPE_LOCAL } from '../../constants';
 import {
    getCanReplyToMessage,
    getFormattedTimestamp,
@@ -32,7 +32,7 @@ class ChatMessage extends Component<IChatMessageProps> {
     * @inheritdoc
     */
    render() {
-        const { gifEnabled, message, knocking } = this.props;
+        const { message, knocking } = this.props;
        const localMessage = message.messageType === MESSAGE_TYPE_LOCAL;
        const { privateMessage, lobbyChat } = message;

@@ -73,20 +73,24 @@ class ChatMessage extends Component<IChatMessageProps> {
            messageBubbleStyle.push(styles.lobbyMessageBubble);
        }

-        const messageText = getMessageText(this.props.message);
+        const messageText = replaceNonUnicodeEmojis(getMessageText(this.props.message));

        return (
-            <View
-                id = { message.messageId }
-                style = { styles.messageWrapper as ViewStyle } >
+            <View style = { styles.messageWrapper as ViewStyle } >
                { this._renderAvatar() }
                <View style = { detailsWrapperStyle }>
                    <View style = { messageBubbleStyle }>
                        <View style = { styles.textWrapper as ViewStyle } >
                            { this._renderDisplayName() }
-                            { gifEnabled && isGifMessage(messageText)
+                            { isGifMessage(messageText)
                                ? <GifMessage message = { messageText } />
-                                : this._renderMessageTextComponent(messageText) }
+                                : (
+                                    <Linkify
+                                        linkStyle = { styles.chatLink }
+                                        style = { styles.chatMessage }>
+                                        { messageText }
+                                    </Linkify>
+                                )}
                            { this._renderPrivateNotice() }
                        </View>
                        { this._renderPrivateReplyButton() }
@@ -100,7 +104,7 @@ class ChatMessage extends Component<IChatMessageProps> {
    /**
     * Renders the avatar of the sender.
     *
-     * @returns {React.ReactElement<*>}
+     * @returns {React$Element<*>}
     */
    _renderAvatar() {
        const { message } = this.props;
@@ -109,7 +113,7 @@ class ChatMessage extends Component<IChatMessageProps> {
            <View style = { styles.avatarWrapper }>
                { this.props.showAvatar && <Avatar
                    displayName = { message.displayName }
-                    participantId = { message.participantId }
+                    participantId = { message.id }
                    size = { styles.avatarWrapper.width } />
                }
            </View>
@@ -119,7 +123,7 @@ class ChatMessage extends Component<IChatMessageProps> {
    /**
     * Renders the display name of the sender if necessary.
     *
-     * @returns {React.ReactElement<*> | null}
+     * @returns {React$Element<*> | null}
     */
    _renderDisplayName() {
        const { message, showDisplayName } = this.props;
@@ -135,37 +139,10 @@ class ChatMessage extends Component<IChatMessageProps> {
        );
    }

-    /**
-     * Renders the message text based on number of characters.
-     *
-     * @param {string} messageText - The message text.
-     * @returns {React.ReactElement<*>}
-     */
-    _renderMessageTextComponent(messageText: string) {
-
-        if (messageText.length >= CHAR_LIMIT) {
-            return (
-                <Text
-                    selectable = { true }
-                    style = { styles.chatMessage }>
-                    { messageText }
-                </Text>
-            );
-        }
-
-        return (
-            <Linkify
-                linkStyle = { styles.chatLink }
-                style = { styles.chatMessage }>
-                { replaceNonUnicodeEmojis(messageText) }
-            </Linkify>
-        );
-    }
-
    /**
     * Renders the message privacy notice, if necessary.
     *
-     * @returns {React.ReactElement<*> | null}
+     * @returns {React$Element<*> | null}
     */
    _renderPrivateNotice() {
        const { message, knocking } = this.props;
@@ -184,7 +161,7 @@ class ChatMessage extends Component<IChatMessageProps> {
    /**
     * Renders the private reply button, if necessary.
     *
-     * @returns {React.ReactElement<*> | null}
+     * @returns {React$Element<*> | null}
     */
    _renderPrivateReplyButton() {
        const { message, canReply } = this.props;
@@ -198,7 +175,7 @@ class ChatMessage extends Component<IChatMessageProps> {
            <View style = { styles.replyContainer as ViewStyle }>
                <PrivateMessageButton
                    isLobbyMessage = { lobbyChat }
-                    participantID = { message.participantId }
+                    participantID = { message.id }
                    reply = { true }
                    showLabel = { false }
                    toggledStyles = { styles.replyStyles } />
@@ -209,7 +186,7 @@ class ChatMessage extends Component<IChatMessageProps> {
    /**
     * Renders the time at which the message was sent, if necessary.
     *
-     * @returns {React.ReactElement<*> | null}
+     * @returns {React$Element<*> | null}
     */
    _renderTimestamp() {
        if (!this.props.showTimestamp) {
@@ -228,13 +205,11 @@ class ChatMessage extends Component<IChatMessageProps> {
 * Maps part of the redux state to the props of this component.
 *
 * @param {Object} state - The Redux state.
- * @param {IChatMessageProps} message - Message object.
 * @returns {IProps}
 */
 function _mapStateToProps(state: IReduxState, { message }: IChatMessageProps) {
    return {
        canReply: getCanReplyToMessage(state, message),
-        gifEnabled: isGifEnabled(state),
        knocking: state['features/lobby'].knocking
    };
 }
--- a/react/features/chat/components/native/GifMessage.tsx
+++ b/react/features/chat/components/native/GifMessage.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Image, ImageStyle, View } from 'react-native';

-import { extractGifURL } from '../../../gifs/function.any';
+import { GIF_PREFIX } from '../../../gifs/constants';

 import styles from './styles';

@@ -14,10 +14,9 @@ interface IProps {
 }

 const GifMessage = ({ message }: IProps) => {
-    const url = extractGifURL(message);
+    const url = message.substring(GIF_PREFIX.length, message.length - 1);

    return (<View
-        id = 'gif-message'
        style = { styles.gifContainer }>
        <Image
            source = {{ uri: url }}
--- a/react/features/chat/components/native/MessageContainer.tsx
+++ b/react/features/chat/components/native/MessageContainer.tsx
@@ -78,9 +78,7 @@ class MessageContainer extends AbstractMessageContainer<IProps, any> {
        const { t } = this.props;

        return (
-            <View
-                id = 'no-messages-message'
-                style = { styles.emptyComponentWrapper as ViewStyle }>
+            <View style = { styles.emptyComponentWrapper as ViewStyle }>
                <Text style = { styles.emptyComponentText as TextStyle }>
                    { t('chat.noMessagesMessage') }
                </Text>
--- a/react/features/chat/components/native/MessageRecipient.tsx
+++ b/react/features/chat/components/native/MessageRecipient.tsx
@@ -102,9 +102,7 @@ class MessageRecipient extends AbstractMessageRecipient<IProps> {

        if (isLobbyChatActive) {
            return (
-                <View
-                    id = 'chat-recipient'
-                    style = { styles.lobbyMessageRecipientContainer as ViewStyle }>
+                <View style = { styles.lobbyMessageRecipientContainer as ViewStyle }>
                    <Text style = { styles.messageRecipientText }>
                        { t('chat.lobbyChatMessageTo', {
                            recipient: lobbyMessageRecipient?.name
@@ -125,16 +123,13 @@ class MessageRecipient extends AbstractMessageRecipient<IProps> {
        }

        return (
-            <View
-                id = 'message-recipient'
-                style = { styles.messageRecipientContainer as ViewStyle }>
+            <View style = { styles.messageRecipientContainer as ViewStyle }>
                <Text style = { styles.messageRecipientText }>
                    { t('chat.messageTo', {
                        recipient: privateMessageRecipient.name
                    }) }
                </Text>
                <TouchableHighlight
-                    id = 'message-recipient-cancel-button'
                    onPress = { this._onResetPrivateMessageRecipient }
                    underlayColor = { 'transparent' }>
                    <Icon
--- a/Show More
+++ b/Show More