chore(deps) lib-jitsi-meet@latest

https://github.com/jitsi/lib-jitsi-meet/compare/v2087.0.0+8eccb59f...v2089.0.0+75c1c6ff
chore(deps) Update @jitsi/logger to 2.1.1
2025-12-30 19:32:27 +00:00 · 2025-09-17 14:55:51 -04:00 · 2025-09-16 22:45:59 -04:00 · 2025-09-16 22:45:59 -04:00 · 2025-09-16 13:05:49 -05:00 · 2025-09-16 12:32:19 -05:00
1176 changed files with 40788 additions and 17135 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -17,3 +17,8 @@ react/features/face-landmarks/resources/*

 # Not worth it.
 actionTypes.ts
+
+# It's not complete until all files are copied at build time.
+react-native-sdk/
+
+*.d.ts
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,6 +1,5 @@
 module.exports = {
-    'extends': [
+    extends: [
        '@jitsi/eslint-config'
-    ],
-    'ignorePatterns': [ '*.d.ts' ]
+    ]
 };
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
        npm -v
    - name: Get changed files
      id: changed-files
-      uses: tj-actions/changed-files@v41
+      uses: jitsi/changed-files@main
    - name: Get changed lang files
      id: lang-files
      run: echo "all=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | grep -oE 'lang\/\S+' | tr '\n' ' ')" >> "$GITHUB_OUTPUT"
@@ -88,22 +88,22 @@ jobs:
      run: |
        uname -a
        xcode-select -p
-        sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer
+        sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
        xcodebuild -version
    - name: setup-cocoapods
-      uses: maxim-lobanov/setup-cocoapods@v1
+      uses: ruby/setup-ruby@v1
      with:
-        podfile-path: ios/Podfile.lock
+        ruby-version: '3.4'
+        bundler-cache: true
+    - run: npx react-native info
    - name: Install Pods
-      run: |
-        pod --version
-        cd ios
-        pod install --repo-update --deployment
+      working-directory: ./ios
+      run: bundle exec pod install --repo-update --deployment
    - run: npx react-native bundle --entry-file react/index.native.js --platform ios --bundle-output /tmp/ios.bundle --reset-cache
  android-sdk-build:
    name: Build mobile SDK (Android)
    runs-on: ubuntu-latest
-    container: reactnativecommunity/react-native-android:v13.0
+    container: reactnativecommunity/react-native-android:v18.0
    steps:
    - uses: actions/checkout@v4
    - uses: actions/setup-node@v4
@@ -137,27 +137,28 @@ jobs:
      run: |
        uname -a
        xcode-select -p
-        sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer
+        sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
        xcodebuild -version
    - name: setup-cocoapods
-      uses: maxim-lobanov/setup-cocoapods@v1
+      uses: ruby/setup-ruby@v1
      with:
-        podfile-path: ios/Podfile.lock
+        ruby-version: '3.4'
+        bundler-cache: true
+    - run: npx react-native info
    - name: Install Pods
-      run: |
-        pod --version
-        cd ios
-        pod install --repo-update --deployment
+      working-directory: ./ios
+      run: bundle exec pod install --repo-update --deployment
    - run: |
        xcodebuild clean \
          -workspace ios/jitsi-meet.xcworkspace \
          -scheme JitsiMeetSDK
+        xcodebuild -downloadPlatform iOS -buildVersion 18.2
        xcodebuild archive \
          -workspace ios/jitsi-meet.xcworkspace \
          -scheme JitsiMeetSDK  \
          -configuration Release \
          -sdk iphoneos \
-          -destination='generic/platform=iOS' \
+          -destination 'generic/platform=iOS' \
          -archivePath ios/sdk/out/ios-device \
          SKIP_INSTALL=NO \
          BUILD_LIBRARY_FOR_DISTRIBUTION=YES
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ buck-out/

 # fastlane
 #
+.bundle/
 **/fastlane/report.xml
 **/fastlane/Preview.html
 **/fastlane/test_output
@@ -101,6 +102,9 @@ tsconfig.json
 react-native-sdk/*.tgz
 react-native-sdk/android/src
 !react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetReactNativePackage.java
+!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
+!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JMOngoingConferenceModule.java
+!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/RNOngoingNotification.java
 react-native-sdk/images
 react-native-sdk/ios
 react-native-sdk/lang
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,20 @@
 # Follow Our Updated Guide to See How You Can Contribute

-Hello there! 👋
+**Hello there! 👋**

-We're thrilled that you're eager to contribute to Jitsi Meet! ❤️ 
+We're thrilled that you're eager to contribute to **Jitsi Meet! ❤️** 

 Your interest in improving our platform means a lot to us. To ensure your contributions align seamlessly with our goals and processes, we've recently updated our guide. This guide will provide you with clear instructions on how to get involved effectively.

-Ready to get started? Head over to our [Jitsi Meet Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-contributing/) and let's make Jitsi Meet even better together!
+### 📖 Get Started
+
+Ready to get started? Head over to our [Jitsi Meet Handbook](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-contributing/) and let's make **Jitsi Meet** even better together!
+
+### 💬 Join the Discussion
+
+Have questions or need help? Join our community discussions on the [Jitsi Forum](https://community.jitsi.org/) where contributors and maintainers can assist you.

 ### ❗️Additional Note
 Before sending us your code, double-check that it meets our coding standards. You can do this by running a command: `npm run lint`. If there are any issues, don't worry! You can fix them by running: `npm run lint-fix`. Once your code passes these checks, feel free to submit your pull request.

-Happy coding!
+**Happy coding!**
--- a/16
+++ b/16
@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+ruby ">= 3.4.0"
+
+gem "cocoapods", "~> 1.16"
+
+# (Optional) Fastlane for automation
+gem "fastlane"
+gem "abbrev"
+gem "logger"
+gem "mutex_m"
+gem "csv"
+gem "bigdecimal"
+
+# (Optional) Bundler itself to ensure consistency
+gem "bundler"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -0,0 +1,331 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    abbrev (0.1.2)
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.1)
+    aws-partitions (1.1050.0)
+    aws-sdk-core (3.218.1)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.98.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.181.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.11.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    claide (1.1.0)
+    cocoapods (1.16.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.16.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
+    csv (3.3.2)
+    declarative (0.0.20)
+    digest-crc (0.7.0)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    drb (2.2.1)
+    emoji_regex (3.2.3)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    excon (0.112.0)
+    faraday (1.10.4)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.1)
+      faraday (~> 1.0)
+    fastimage (2.4.0)
+    fastlane (2.226.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.4.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
+    ffi (1.17.1)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm-linux-gnu)
+    ffi (1.17.1-arm-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86-linux-gnu)
+    ffi (1.17.1-x86-linux-musl)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.1)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.8)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.6.2)
+    json (2.10.1)
+    jwt (2.10.1)
+      base64
+    logger (1.6.6)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    minitest (5.25.4)
+    molinillo (0.8.0)
+    multi_json (1.15.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    nap (1.1.0)
+    naturally (2.2.1)
+    netrc (0.11.0)
+    nkf (0.2.0)
+    optparse (0.6.0)
+    os (1.1.4)
+    plist (3.7.2)
+    public_suffix (4.0.7)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.4.1)
+    rouge (3.28.0)
+    ruby-macho (2.5.1)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.4.1)
+    securerandom (0.4.1)
+    security (0.1.5)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    sysrandom (1.0.5)
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uber (0.1.0)
+    unicode-display_width (2.6.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.27.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
+
+DEPENDENCIES
+  abbrev
+  bigdecimal
+  bundler
+  cocoapods (~> 1.16)
+  csv
+  fastlane
+  logger
+  mutex_m
+
+RUBY VERSION
+   ruby 3.4.2p28
+
+BUNDLED WITH
+   2.6.3
--- a/10
+++ b/10
@@ -17,11 +17,11 @@ STYLES_BUNDLE = css/all.bundle.css
 STYLES_DESTINATION = css/all.css
 STYLES_MAIN = css/main.scss
 ifeq ($(OS),Windows_NT)
-	WEBPACK = .\node_modules\.bin\webpack
-	WEBPACK_DEV_SERVER = .\node_modules\.bin\webpack serve --mode development
+	WEBPACK = .\node_modules\.bin\webpack --progress
+	WEBPACK_DEV_SERVER = .\node_modules\.bin\webpack serve --mode development --progress
 else
-	WEBPACK = ./node_modules/.bin/webpack
-	WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack serve --mode development
+	WEBPACK = ./node_modules/.bin/webpack --progress
+	WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack serve --mode development --progress
 endif

 all: compile deploy
@@ -48,8 +48,6 @@ deploy-appbundle:
 		$(BUILD_DIR)/external_api.min.js.map \
 		$(BUILD_DIR)/alwaysontop.min.js \
 		$(BUILD_DIR)/alwaysontop.min.js.map \
-		$(BUILD_DIR)/analytics-ga.min.js \
-		$(BUILD_DIR)/analytics-ga.min.js.map \
 		$(BUILD_DIR)/face-landmarks-worker.min.js \
 		$(BUILD_DIR)/face-landmarks-worker.min.js.map \
 		$(BUILD_DIR)/noise-suppressor-worklet.min.js \
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ mobile apps:

 | Android | Android (F-Droid) | iOS |
 |:-:|:-:|:-:|
-| [<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/en/packages/org.jitsi.meet/) | [<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905) |
+| [<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/packages/org.jitsi.meet/) | [<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905) |

 If you are feeling adventurous and want to get an early scoop of the features as they are being
 developed you can also sign up for our open beta testing here:
--- a/1
+++ b/1
@@ -0,0 +1 @@
+OK
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'

 // Crashlytics integration is done as part of Firebase now, so it gets
 // automagically activated with google-services.json
@@ -27,6 +28,14 @@ android {
        ndk {
            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
        }
+
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON", "-DANDROID_STL=c++_shared"
+                cppFlags "-std=c++17"
+                cFlags "-DANDROID_PLATFORM=android-26"
+            }
+        }
    }

    signingConfigs {
@@ -42,10 +51,11 @@ android {
        debug {
            buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${googleServicesEnabled}"
            buildConfigField "boolean", "LIBRE_BUILD", "${rootProject.ext.libreBuild}"
+            applicationIdSuffix ".debug"
        }
        release {
-            // Uncomment the following line for singing a test release build.
-            //signingConfig signingConfigs.debug
+            // Uncomment the following line for signing a test release build.
+            // signingConfig signingConfigs.debug
            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-release.pro'
            buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${googleServicesEnabled}"
@@ -65,9 +75,18 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility rootProject.ext.javaVersion
+        targetCompatibility rootProject.ext.javaVersion
    }
+
+    kotlinOptions {
+        jvmTarget = rootProject.ext.jvmTargetVersion
+    }
+
+    kotlin {
+        jvmToolchain(rootProject.ext.jvmToolchainVersion)
+    }
+
    namespace 'org.jitsi.meet'
 }

@@ -82,10 +101,8 @@ dependencies {

        // Firebase
        //  - Crashlytics
-        //  - Dynamic Links
        implementation 'com.google.firebase:firebase-analytics:21.3.0'
        implementation 'com.google.firebase:firebase-crashlytics:18.4.3'
-        implementation 'com.google.firebase:firebase-dynamic-links:21.1.0'
    }

    implementation project(':sdk')
@@ -93,8 +110,6 @@ dependencies {

 gradle.projectsEvaluated {
    // Dropbox integration
-    //
-
    def dropboxAppKey
    if (project.file('dropbox.key').exists()) {
        dropboxAppKey = project.file('dropbox.key').text.trim() - 'db-'
@@ -165,7 +180,6 @@ gradle.projectsEvaluated {

        packageTask.dependsOn(currentRunPackagerTask)
    }
-
 }

 if (googleServicesEnabled) {
--- a/android/app/proguard-rules-release.pro
+++ b/android/app/proguard-rules-release.pro
@@ -4,3 +4,7 @@
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
 -keep public class * extends java.lang.Exception
+
+# R8 missing classes - suppress warnings
+-dontwarn com.facebook.memory.config.MemorySpikeConfig
+-dontwarn kotlinx.parcelize.Parcelize
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -96,8 +96,3 @@

 # Rule to avoid build errors related to SVGs.
 -keep public class com.horcrux.svg.** {*;}
-
-# https://github.com/facebook/fresco/issues/2638
-keep public class com.facebook.imageutils.** {
-   public *;
-}
--- a/android/app/src/main/java/org/jitsi/meet/GoogleServicesHelper.java
+++ b/android/app/src/main/java/org/jitsi/meet/GoogleServicesHelper.java
@@ -4,7 +4,6 @@ import android.net.Uri;
 import android.util.Log;

 import com.google.firebase.crashlytics.FirebaseCrashlytics;
-import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;

 import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
@@ -22,18 +21,6 @@ final class GoogleServicesHelper {
            Log.d(activity.getClass().getSimpleName(), "Initializing Google Services");

            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!JitsiMeet.isCrashReportingDisabled(activity));
-            FirebaseDynamicLinks.getInstance().getDynamicLink(activity.getIntent())
-                .addOnSuccessListener(activity, pendingDynamicLinkData -> {
-                    Uri dynamicLink = null;
-
-                    if (pendingDynamicLinkData != null) {
-                        dynamicLink = pendingDynamicLinkData.getLink();
-                    }
-
-                    if (dynamicLink != null) {
-                        activity.join(dynamicLink.toString());
-                    }
-                });
        }
    }
 }
--- a/android/app/src/main/java/org/jitsi/meet/MainActivity.java
+++ b/android/app/src/main/java/org/jitsi/meet/MainActivity.java
@@ -30,9 +30,12 @@ import android.view.KeyEvent;

 import androidx.annotation.Nullable;

+import com.oney.WebRTCModule.WebRTCModuleOptions;
+
 import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions;
+import org.webrtc.Logging;

 import java.lang.reflect.Method;
 import java.net.URL;
@@ -79,6 +82,10 @@ public class MainActivity extends JitsiMeetActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        JitsiMeet.showSplashScreen(this);
+
+        WebRTCModuleOptions options = WebRTCModuleOptions.getInstance();
+        options.loggingSeverity = Logging.Severity.LS_ERROR;
+
        super.onCreate(null);
    }

--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,46 +5,52 @@ import org.gradle.util.VersionNumber
 // sub-projects/modules.

 buildscript {
+    ext {
+        kotlinVersion = "2.0.21"
+        gradlePluginVersion = "8.6.0"
+        buildToolsVersion = "35.0.0"
+        compileSdkVersion = 35
+        minSdkVersion    = 26
+        targetSdkVersion = 35
+        supportLibVersion = "28.0.0"
+        ndkVersion = "27.1.12297006"
+
+        // The Maven artifact groupId of the third-party react-native modules which
+        // Jitsi Meet SDK for Android depends on and which are not available in
+        // third-party Maven repositories so we have to deploy to a Maven repository
+        // of ours.
+        moduleGroupId = 'com.facebook.react'
+
+        // Maven repo where artifacts will be published
+        mavenRepo = System.env.MVN_REPO ?: ""
+        mavenUser = System.env.MVN_USER ?: ""
+        mavenPassword = System.env.MVN_PASSWORD ?: ""
+
+        // Libre build
+        libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
+
+        googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
+
+        //React Native and Hermes Version
+        rnVersion = "0.77.2"
+
+        // Java dependencies
+        javaVersion = JavaVersion.VERSION_17
+        jvmToolchainVersion = 17
+        jvmTargetVersion = '17'
+    }
    repositories {
        google()
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
+        classpath "com.android.tools.build:gradle:$rootProject.ext.gradlePluginVersion"
        classpath 'com.google.gms:google-services:4.4.0'
        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
    }
 }

-ext {
-    kotlinVersion = "1.9.24"
-    buildToolsVersion = "34.0.0"
-    compileSdkVersion = 34
-    minSdkVersion    = 24
-    targetSdkVersion = 34
-    supportLibVersion = "28.0.0"
-    ndkVersion = "26.1.10909125"
-
-    // The Maven artifact groupId of the third-party react-native modules which
-    // Jitsi Meet SDK for Android depends on and which are not available in
-    // third-party Maven repositories so we have to deploy to a Maven repository
-    // of ours.
-    moduleGroupId = 'com.facebook.react'
-
-    // Maven repo where artifacts will be published
-    mavenRepo = System.env.MVN_REPO ?: ""
-    mavenUser = System.env.MVN_USER ?: ""
-    mavenPassword = System.env.MVN_PASSWORD ?: ""
-
-    // Libre build
-    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
-
-    googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
-
-    //React Native and Hermes Version
-    rnVersion = "0.75.4"
-}
-
 allprojects {
    repositories {
        mavenCentral()
@@ -72,7 +78,6 @@ allprojects {
    // Third-party react-native modules which Jitsi Meet SDK for Android depends
    // on and which are not available in third-party Maven repositories need to
    // be deployed in a Maven repository of ours.
-    //

    if (project.name.startsWith('react-native-')) {
        apply plugin: 'maven-publish'
@@ -115,7 +120,7 @@ allprojects {
            project.version = "${json.version}-jitsi-${versionQualifierNumber}"

            task jitsiAndroidSourcesJar(type: Jar) {
-                classifier = 'sources'
+                archiveClassifier = 'sources'
                from android.sourceSets.main.java.source
            }

@@ -166,16 +171,46 @@ allprojects {
    }
 }

-// Force the version of the Android build tools we have chosen on all
-// subprojects. The forcing was introduced for react-native and the third-party
-// modules that we utilize such as react-native-background-timer.
+// Force the version of the Android build tools we have chosen on all subprojects.
 subprojects { subproject ->
    afterEvaluate{
        if ((subproject.plugins.hasPlugin('android')
                    || subproject.plugins.hasPlugin('android-library'))
                && rootProject.ext.has('buildToolsVersion')) {
+
            android {
                buildToolsVersion rootProject.ext.buildToolsVersion
+
+                buildFeatures {
+                    buildConfig true
+                }
+
+                // Set JVM target across all subprojects
+                compileOptions {
+                    sourceCompatibility rootProject.ext.javaVersion
+                    targetCompatibility rootProject.ext.javaVersion
+                }
+
+                // Disable lint errors for problematic third-party modules
+                // react-native-background-timer
+                // react-native-calendar-events
+                lint {
+                    abortOnError = false
+                }
+            }
+        }
+
+        // Add Kotlin configuration for subprojects that use Kotlin
+        if (subproject.plugins.hasPlugin('kotlin-android')) {
+            subproject.kotlin {
+                jvmToolchain(rootProject.ext.jvmToolchainVersion)
+            }
+
+            // Set Kotlin JVM target
+            subproject.android {
+                kotlinOptions {
+                    jvmTarget = rootProject.ext.jvmTargetVersion
+                }
            }
        }
    }
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -11,20 +11,26 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m

-org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true

-# This one fixes a weird WebRTC runtime problem on some devices.
-# https://github.com/jitsi/jitsi-meet/issues/7911#issuecomment-714323255
-android.enableDexingArtifactTransform.desugaring=false
-
 android.useAndroidX=true
+
 android.enableJetifier=true
-android.bundle.enableUncompressedNativeLibs=false
+
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=false
+
+# Use this property to enable or disable the Hermes JS engine.
+hermesEnabled=true

 appVersion=99.0.0
 sdkVersion=0.0.0
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/android/scripts/check_elf_alignment.sh
+++ b/android/scripts/check_elf_alignment.sh
@@ -0,0 +1,113 @@
+#!/bin/bash
+progname="${0##*/}"
+progname="${progname%.sh}"
+
+# usage: check_elf_alignment.sh [path to *.so files|path to *.apk]
+
+cleanup_trap() {
+  if [ -n "${tmp}" -a -d "${tmp}" ]; then
+    rm -rf ${tmp}
+  fi
+  exit $1
+}
+
+usage() {
+  echo "Host side script to check the ELF alignment of shared libraries."
+  echo "Shared libraries are reported ALIGNED when their ELF regions are"
+  echo "16 KB or 64 KB aligned. Otherwise they are reported as UNALIGNED."
+  echo
+  echo "Usage: ${progname} [input-path|input-APK|input-APEX]"
+}
+
+if [ ${#} -ne 1 ]; then
+  usage
+  exit
+fi
+
+case ${1} in
+  --help | -h | -\?)
+    usage
+    exit
+    ;;
+
+  *)
+    dir="${1}"
+    ;;
+esac
+
+if ! [ -f "${dir}" -o -d "${dir}" ]; then
+  echo "Invalid file: ${dir}" >&2
+  exit 1
+fi
+
+if [[ "${dir}" == *.apk ]]; then
+  trap 'cleanup_trap' EXIT
+
+  echo
+  echo "Recursively analyzing $dir"
+  echo
+
+  if { zipalign --help 2>&1 | grep -q "\-P <pagesize_kb>"; }; then
+    echo "=== APK zip-alignment ==="
+    zipalign -v -c -P 16 4 "${dir}" | egrep 'lib/arm64-v8a|lib/x86_64|Verification'
+    echo "========================="
+  else
+    echo "NOTICE: Zip alignment check requires build-tools version 35.0.0-rc3 or higher."
+    echo "  You can install the latest build-tools by running the below command"
+    echo "  and updating your \$PATH:"
+    echo
+    echo "    sdkmanager \"build-tools;35.0.0-rc3\""
+  fi
+
+  dir_filename=$(basename "${dir}")
+  tmp=$(mktemp -d -t "${dir_filename%.apk}_out_XXXXX")
+  unzip "${dir}" lib/* -d "${tmp}" >/dev/null 2>&1
+  dir="${tmp}"
+fi
+
+if [[ "${dir}" == *.apex ]]; then
+  trap 'cleanup_trap' EXIT
+
+  echo
+  echo "Recursively analyzing $dir"
+  echo
+
+  dir_filename=$(basename "${dir}")
+  tmp=$(mktemp -d -t "${dir_filename%.apex}_out_XXXXX")
+  deapexer extract "${dir}" "${tmp}" || { echo "Failed to deapex." && exit 1; }
+  dir="${tmp}"
+fi
+
+RED="\e[31m"
+GREEN="\e[32m"
+ENDCOLOR="\e[0m"
+
+unaligned_libs=()
+
+echo
+echo "=== ELF alignment ==="
+
+matches="$(find "${dir}" -type f)"
+IFS=$'\n'
+for match in $matches; do
+  # We could recursively call this script or rewrite it to though.
+  [[ "${match}" == *".apk" ]] && echo "WARNING: doesn't recursively inspect .apk file: ${match}"
+  [[ "${match}" == *".apex" ]] && echo "WARNING: doesn't recursively inspect .apex file: ${match}"
+
+  [[ $(file "${match}") == *"ELF"* ]] || continue
+
+  res="$(objdump -p "${match}" | grep LOAD | awk '{ print $NF }' | head -1)"
+  if [[ $res =~ 2\*\*(1[4-9]|[2-9][0-9]|[1-9][0-9]{2,}) ]]; then
+    echo -e "${match}: ${GREEN}ALIGNED${ENDCOLOR} ($res)"
+  else
+    echo -e "${match}: ${RED}UNALIGNED${ENDCOLOR} ($res)"
+    unaligned_libs+=("${match}")
+  fi
+done
+
+if [ ${#unaligned_libs[@]} -gt 0 ]; then
+  echo -e "${RED}Found ${#unaligned_libs[@]} unaligned libs (only arm64-v8a/x86_64 libs need to be aligned).${ENDCOLOR}"
+elif [ -n "${dir_filename}" ]; then
+  echo -e "ELF Verification Successful"
+fi
+echo "====================="
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -44,15 +44,11 @@ dependencies {
    api "com.facebook.react:react-android:$rootProject.ext.rnVersion"
    api "com.facebook.react:hermes-android:$rootProject.ext.rnVersion"

-    //noinspection GradleDynamicVersion
-    implementation 'org.webkit:android-jsc:+'
-
-    implementation 'com.facebook.fresco:animated-gif:2.5.0'
    implementation 'com.dropbox.core:dropbox-core-sdk:4.0.1'
    implementation 'com.jakewharton.timber:timber:5.0.1'
-    implementation 'com.squareup.duktape:duktape-android:1.3.0'
    implementation 'com.google.code.gson:gson:2.8.6'
    implementation 'androidx.startup:startup-runtime:1.1.0'
+    implementation 'com.google.j2objc:j2objc-annotations:3.0.0'

    // Only add these packages if we are NOT doing a LIBRE_BUILD
    if (!rootProject.ext.libreBuild) {
@@ -86,11 +82,14 @@ dependencies {
    implementation project(':react-native-screens')
    implementation project(':react-native-slider')
    implementation project(':react-native-sound')
-    implementation project(':react-native-splash-screen')
+    implementation project(':react-native-splash-view')
    implementation project(':react-native-svg')
    implementation project(':react-native-video')
-    implementation project(':react-native-webrtc')
    implementation project(':react-native-webview')
+    implementation project(':react-native-worklets-core')
+
+    // Use `api` here so consumers can use WebRTCModuleOptions.
+    api project(':react-native-webrtc')

    testImplementation 'junit:junit:4.12'
 }
@@ -138,8 +137,16 @@ android.libraryVariants.all { def variant ->
        def devEnabled = !targetName.toLowerCase().contains("release")

        // Run the bundler
+        // Use full path to node to avoid PATH issues in Gradle
+        def nodePath = System.getenv('NVM_BIN') ? "${System.getenv('NVM_BIN')}/node" : "node"
+
+        // Debug: Print the node path and environment
+        println "Using node path: ${nodePath}"
+        println "NVM_BIN: ${System.getenv('NVM_BIN')}"
+        println "Working directory: ${reactRoot}"
+
        commandLine(
-                "node",
+                nodePath,
                "node_modules/react-native/scripts/bundle.js",
                "--platform", "android",
                "--dev", "${devEnabled}",
@@ -152,6 +159,70 @@ android.libraryVariants.all { def variant ->
        enabled !devEnabled
    }

+    // GRADLE REQUIREMENTS (Gradle 8.7+ / AGP 8.5.0+):
+    
+    // This task requires explicit dependencies on resource tasks from all React Native modules
+    // due to Gradle's strict validation of task dependencies.
+
+    // Without these dependencies,
+    // builds will fail with errors like:
+    // "Task ':sdk:bundleReleaseJsAndAssets' uses the output of task ':react-native-amplitude:packageReleaseResources'
+    // without declaring a dependency on it."
+
+    // The automatic dependency resolution below ensures all required resource tasks are properly
+    // declared as dependencies before this task executes.
+
+    if (variant.name.toLowerCase().contains("release")) {
+        rootProject.subprojects.each { subproject ->
+            if (
+                subproject.name.startsWith("react-native-") ||
+                subproject.name.startsWith("@react-native-") ||
+                subproject.name.startsWith("@giphy/")
+            ) {
+                [
+                    "packageReleaseResources",
+                    "generateReleaseResValues",
+                    "generateReleaseResources",
+                    "generateReleaseBuildConfig",
+                    "processReleaseManifest",
+                    "writeReleaseAarMetadata",
+                    "generateReleaseRFile",
+                    "compileReleaseLibraryResources",
+                    "compileReleaseJavaWithJavac",
+                    "javaPreCompileRelease",
+                    "bundleLibCompileToJarRelease",
+                    "exportReleaseConsumerProguardFiles",
+                    "mergeReleaseGeneratedProguardFiles",
+                    "mergeReleaseJniLibFolders",
+                    "mergeReleaseShaders",
+                    "packageReleaseAssets",
+                    "processReleaseJavaRes",
+                    "prepareReleaseArtProfile",
+                    "copyReleaseJniLibsProjectOnly",
+                    "extractDeepLinksRelease",
+                    "createFullJarRelease",
+                    "generateReleaseLintModel",
+                    "writeReleaseLintModelMetadata",
+                    "generateReleaseLintVitalModel",
+                    "lintVitalAnalyzeRelease",
+                    "lintReportRelease",
+                    "lintAnalyzeRelease",
+                    "lintReportDebug",
+                    "lintAnalyzeDebug"
+                ].each { taskName ->
+                    if (subproject.tasks.findByName(taskName)) {
+                        currentBundleTask.dependsOn(subproject.tasks.named(taskName))
+                    }
+                }
+
+                // Also depend on the main build task to ensure all sub-tasks are completed
+                if (subproject.tasks.findByName("build")) {
+                    currentBundleTask.dependsOn(subproject.tasks.named("build"))
+                }
+            }
+        }
+    }
+
    currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
    currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
    variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerConnectionService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerConnectionService.java
@@ -18,7 +18,6 @@ package org.jitsi.meet.sdk;

 import android.content.Context;
 import android.media.AudioManager;
-import android.os.Build;
 import android.telecom.CallAudioState;
 import androidx.annotation.RequiresApi;

@@ -34,7 +33,6 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 * {@link AudioModeModule.AudioDeviceHandlerInterface} module implementing device handling for
 * Android versions >= O when ConnectionService is enabled.
 */
-@RequiresApi(Build.VERSION_CODES.O)
 class AudioDeviceHandlerConnectionService implements
        AudioModeModule.AudioDeviceHandlerInterface,
        RNConnectionService.CallAudioStateListener {
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerGeneric.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerGeneric.java
@@ -20,7 +20,6 @@ import android.media.AudioAttributes;
 import android.media.AudioDeviceInfo;
 import android.media.AudioFocusRequest;
 import android.media.AudioManager;
-import android.os.Build;

 import java.util.HashSet;
 import java.util.Set;
@@ -227,22 +226,17 @@ class AudioDeviceHandlerGeneric implements
        audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
        audioManager.setMicrophoneMute(false);

-        int gotFocus;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            gotFocus = audioManager.requestAudioFocus(new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
-                .setAudioAttributes(
-                    new AudioAttributes.Builder()
-                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                        .build()
-                )
-                .setAcceptsDelayedFocusGain(true)
-                .setOnAudioFocusChangeListener(this)
-                .build()
-            );
-        } else {
-            gotFocus = audioManager.requestAudioFocus(this, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN);
-        }
+        int gotFocus = audioManager.requestAudioFocus(new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+            .setAudioAttributes(
+                new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+                    .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                    .build()
+            )
+            .setAcceptsDelayedFocusGain(true)
+            .setOnAudioFocusChangeListener(this)
+            .build()
+        );

        if (gotFocus == AudioManager.AUDIOFOCUS_REQUEST_FAILED) {
            JitsiMeetLogger.w(TAG + " Audio focus request failed");
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java
@@ -20,7 +20,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.media.AudioManager;
-import android.os.Build;

 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -58,7 +57,6 @@ import java.util.concurrent.Executors;
 * Before a call has started and after it has ended the
 * {@code AudioModeModule.DEFAULT} mode should be used.
 */
-@SuppressLint("AnnotateVersionCheck")
@ReactModule(name = AudioModeModule.NAME)
 class AudioModeModule extends ReactContextBaseJavaModule {
    public static final String NAME = "AudioMode";
@@ -84,11 +82,10 @@ class AudioModeModule extends ReactContextBaseJavaModule {
    /**
     * Whether or not the ConnectionService is used for selecting audio devices.
     */
-    private static final boolean supportsConnectionService = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    private static boolean useConnectionService_ = supportsConnectionService;
+    private static boolean useConnectionService_ = true;

    static boolean useConnectionService() {
-        return supportsConnectionService && useConnectionService_;
+        return useConnectionService_;
    }

    /**
@@ -139,6 +136,11 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     */
    private String userSelectedDevice;

+    /**
+     * Whether or not audio is disabled.
+     */
+    private boolean audioDisabled;
+
    /**
     * Initializes a new module instance. There shall be a single instance of
     * this module throughout the lifetime of the application.
@@ -239,6 +241,12 @@ class AudioModeModule extends ReactContextBaseJavaModule {
            audioDeviceHandler.stop();
        }

+        audioDeviceHandler = null;
+
+        if (audioDisabled) {
+            return;
+        }
+
        if (useConnectionService()) {
            audioDeviceHandler = new AudioDeviceHandlerConnectionService(audioManager);
        } else {
@@ -281,6 +289,27 @@ class AudioModeModule extends ReactContextBaseJavaModule {
        });
    }

+    @ReactMethod
+    public void setDisabled(final boolean disabled, final Promise promise) {
+        if (audioDisabled == disabled) {
+            promise.resolve(null);
+            return;
+        }
+
+        JitsiMeetLogger.i(TAG + "  audio disabled: " + disabled);
+
+        audioDisabled = disabled;
+        setAudioDeviceHandler();
+
+        if (disabled) {
+            mode = -1;
+            availableDevices.clear();
+            resetSelectedDevice();
+        }
+
+        promise.resolve(null);
+    }
+
    /**
     * Public method to set the current audio mode.
     *
@@ -290,7 +319,12 @@ class AudioModeModule extends ReactContextBaseJavaModule {
     */
    @ReactMethod
    public void setMode(final int mode, final Promise promise) {
-        if (mode != DEFAULT && mode != AUDIO_CALL && mode != VIDEO_CALL) {
+        if (audioDisabled) {
+            promise.resolve(null);
+            return;
+        }
+
+        if (mode < DEFAULT || mode > VIDEO_CALL) {
            promise.reject("setMode", "Invalid audio mode " + mode);
            return;
        }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastAction.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastAction.java
@@ -3,12 +3,6 @@ package org.jitsi.meet.sdk;
 import android.content.Intent;
 import android.os.Bundle;

-import com.facebook.react.bridge.WritableNativeMap;
-
-import org.jitsi.meet.sdk.log.JitsiMeetLogger;
-
-import java.util.HashMap;
-
 /**
 * Wraps the name and extra data for events that were broadcasted locally.
 */
@@ -16,57 +10,21 @@ public class BroadcastAction {
    private static final String TAG = BroadcastAction.class.getSimpleName();

    private final Type type;
-    private final HashMap<String, Object> data;
+    private final Bundle data;

    public BroadcastAction(Intent intent) {
        this.type = Type.buildTypeFromAction(intent.getAction());
-        this.data = buildDataFromBundle(intent.getExtras());
+        this.data = intent.getExtras();
    }

    public Type getType() {
        return this.type;
    }

-    public HashMap<String, Object> getData() {
+    public Bundle getData() {
        return this.data;
    }

-    public WritableNativeMap getDataAsWritableNativeMap() {
-        WritableNativeMap nativeMap = new WritableNativeMap();
-
-        for (String key : this.data.keySet()) {
-            try {
-                if (this.data.get(key) instanceof Boolean) {
-                    nativeMap.putBoolean(key, (Boolean) this.data.get(key));
-                } else if (this.data.get(key) instanceof Integer) {
-                    nativeMap.putInt(key, (Integer) this.data.get(key));
-                } else if (this.data.get(key) instanceof Double) {
-                    nativeMap.putDouble(key, (Double) this.data.get(key));
-                } else if (this.data.get(key) instanceof String) {
-                    nativeMap.putString(key, (String) this.data.get(key));
-                } else {
-                    throw new Exception("Unsupported extra data type");
-                }
-            } catch (Exception e) {
-                JitsiMeetLogger.w(TAG + " invalid extra data in event", e);
-            }
-        }
-
-        return nativeMap;
-    }
-
-    private static HashMap<String, Object> buildDataFromBundle(Bundle bundle) {
-        HashMap<String, Object> map = new HashMap<>();
-
-        if (bundle != null) {
-            for (String key : bundle.keySet()) {
-                map.put(key, bundle.get(key));
-            }
-        }
-
-        return map;
-    }
-
    enum Type {
        SET_AUDIO_MUTED("org.jitsi.meet.SET_AUDIO_MUTED"),
        HANG_UP("org.jitsi.meet.HANG_UP"),
@@ -78,7 +36,13 @@ public class BroadcastAction {
        SEND_CHAT_MESSAGE("org.jitsi.meet.SEND_CHAT_MESSAGE"),
        SET_VIDEO_MUTED("org.jitsi.meet.SET_VIDEO_MUTED"),
        SET_CLOSED_CAPTIONS_ENABLED("org.jitsi.meet.SET_CLOSED_CAPTIONS_ENABLED"),
-        TOGGLE_CAMERA("org.jitsi.meet.TOGGLE_CAMERA");
+        TOGGLE_CAMERA("org.jitsi.meet.TOGGLE_CAMERA"),
+        SHOW_NOTIFICATION("org.jitsi.meet.SHOW_NOTIFICATION"),
+        HIDE_NOTIFICATION("org.jitsi.meet.HIDE_NOTIFICATION"),
+        START_RECORDING("org.jitsi.meet.START_RECORDING"),
+        STOP_RECORDING("org.jitsi.meet.STOP_RECORDING"),
+        OVERWRITE_CONFIG("org.jitsi.meet.OVERWRITE_CONFIG"),
+        SEND_CAMERA_FACING_MODE_MESSAGE("org.jitsi.meet.SEND_CAMERA_FACING_MODE_MESSAGE");

        private final String action;

--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastEvent.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastEvent.java
@@ -91,7 +91,9 @@ public class BroadcastEvent {
        VIDEO_MUTED_CHANGED("org.jitsi.meet.VIDEO_MUTED_CHANGED"),
        READY_TO_CLOSE("org.jitsi.meet.READY_TO_CLOSE"),
        TRANSCRIPTION_CHUNK_RECEIVED("org.jitsi.meet.TRANSCRIPTION_CHUNK_RECEIVED"),
-        CUSTOM_OVERFLOW_MENU_BUTTON_PRESSED("org.jitsi.meet.CUSTOM_OVERFLOW_MENU_BUTTON_PRESSED");
+        CUSTOM_BUTTON_PRESSED("org.jitsi.meet.CUSTOM_BUTTON_PRESSED"),
+        CONFERENCE_UNIQUE_ID_SET("org.jitsi.meet.CONFERENCE_UNIQUE_ID_SET"),
+        RECORDING_STATUS_CHANGED("org.jitsi.meet.RECORDING_STATUS_CHANGED");

        private static final String CONFERENCE_BLURRED_NAME = "CONFERENCE_BLURRED";
        private static final String CONFERENCE_FOCUSED_NAME = "CONFERENCE_FOCUSED";
@@ -109,7 +111,9 @@ public class BroadcastEvent {
        private static final String VIDEO_MUTED_CHANGED_NAME = "VIDEO_MUTED_CHANGED";
        private static final String READY_TO_CLOSE_NAME = "READY_TO_CLOSE";
        private static final String TRANSCRIPTION_CHUNK_RECEIVED_NAME = "TRANSCRIPTION_CHUNK_RECEIVED";
-        private static final String CUSTOM_OVERFLOW_MENU_BUTTON_PRESSED_NAME = "CUSTOM_OVERFLOW_MENU_BUTTON_PRESSED";
+        private static final String CUSTOM_BUTTON_PRESSED_NAME = "CUSTOM_BUTTON_PRESSED";
+        private static final String CONFERENCE_UNIQUE_ID_SET_NAME = "CONFERENCE_UNIQUE_ID_SET";
+        private static final String RECORDING_STATUS_CHANGED_NAME = "RECORDING_STATUS_CHANGED";

        private final String action;

@@ -164,8 +168,12 @@ public class BroadcastEvent {
                    return READY_TO_CLOSE;
                case TRANSCRIPTION_CHUNK_RECEIVED_NAME:
                    return TRANSCRIPTION_CHUNK_RECEIVED;
-                case CUSTOM_OVERFLOW_MENU_BUTTON_PRESSED_NAME:
-                    return CUSTOM_OVERFLOW_MENU_BUTTON_PRESSED;
+                case CUSTOM_BUTTON_PRESSED_NAME:
+                    return CUSTOM_BUTTON_PRESSED;
+                case CONFERENCE_UNIQUE_ID_SET_NAME:
+                    return CONFERENCE_UNIQUE_ID_SET;
+                case RECORDING_STATUS_CHANGED_NAME:
+                    return RECORDING_STATUS_CHANGED;
            }

            return null;
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastIntentHelper.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastIntentHelper.java
@@ -1,11 +1,13 @@
 package org.jitsi.meet.sdk;

 import android.content.Intent;
+import android.os.Bundle;

 public class BroadcastIntentHelper {
    public static Intent buildSetAudioMutedIntent(boolean muted) {
        Intent intent = new Intent(BroadcastAction.Type.SET_AUDIO_MUTED.getAction());
        intent.putExtra("muted", muted);
+
        return intent;
    }

@@ -17,18 +19,21 @@ public class BroadcastIntentHelper {
        Intent intent = new Intent(BroadcastAction.Type.SEND_ENDPOINT_TEXT_MESSAGE.getAction());
        intent.putExtra("to", to);
        intent.putExtra("message", message);
+
        return intent;
    }

    public static Intent buildToggleScreenShareIntent(boolean enabled) {
        Intent intent = new Intent(BroadcastAction.Type.TOGGLE_SCREEN_SHARE.getAction());
        intent.putExtra("enabled", enabled);
+
        return intent;
    }

    public static Intent buildOpenChatIntent(String participantId) {
        Intent intent = new Intent(BroadcastAction.Type.OPEN_CHAT.getAction());
        intent.putExtra("to", participantId);
+
        return intent;
    }

@@ -40,28 +45,113 @@ public class BroadcastIntentHelper {
        Intent intent = new Intent(BroadcastAction.Type.SEND_CHAT_MESSAGE.getAction());
        intent.putExtra("to", participantId);
        intent.putExtra("message", message);
+
        return intent;
    }

    public static Intent buildSetVideoMutedIntent(boolean muted) {
        Intent intent = new Intent(BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
        intent.putExtra("muted", muted);
+
        return intent;
    }

    public static Intent buildSetClosedCaptionsEnabledIntent(boolean enabled) {
        Intent intent = new Intent(BroadcastAction.Type.SET_CLOSED_CAPTIONS_ENABLED.getAction());
        intent.putExtra("enabled", enabled);
+
        return intent;
    }
-    
+
    public static Intent buildRetrieveParticipantsInfo(String requestId) {
        Intent intent = new Intent(BroadcastAction.Type.RETRIEVE_PARTICIPANTS_INFO.getAction());
        intent.putExtra("requestId", requestId);
+
        return intent;
    }

    public static Intent buildToggleCameraIntent() {
        return new Intent(BroadcastAction.Type.TOGGLE_CAMERA.getAction());
    }
+
+    public static Intent buildShowNotificationIntent(
+        String appearance, String description, String timeout, String title, String uid) {
+        Intent intent = new Intent(BroadcastAction.Type.SHOW_NOTIFICATION.getAction());
+        intent.putExtra("appearance", appearance);
+        intent.putExtra("description", description);
+        intent.putExtra("timeout", timeout);
+        intent.putExtra("title", title);
+        intent.putExtra("uid", uid);
+
+        return intent;
+    }
+
+    public static Intent buildHideNotificationIntent(String uid) {
+        Intent intent = new Intent(BroadcastAction.Type.HIDE_NOTIFICATION.getAction());
+        intent.putExtra("uid", uid);
+
+        return intent;
+    }
+
+    public enum RecordingMode {
+        FILE("file"),
+        STREAM("stream");
+
+        private final String mode;
+
+        RecordingMode(String mode) {
+            this.mode = mode;
+        }
+
+        public String getMode() {
+            return mode;
+        }
+    }
+
+    public static Intent buildStartRecordingIntent(
+        RecordingMode mode,
+        String dropboxToken,
+        boolean shouldShare,
+        String rtmpStreamKey,
+        String rtmpBroadcastID,
+        String youtubeStreamKey,
+        String youtubeBroadcastID,
+        Bundle extraMetadata,
+        boolean transcription) {
+        Intent intent = new Intent(BroadcastAction.Type.START_RECORDING.getAction());
+        intent.putExtra("mode", mode.getMode());
+        intent.putExtra("dropboxToken", dropboxToken);
+        intent.putExtra("shouldShare", shouldShare);
+        intent.putExtra("rtmpStreamKey", rtmpStreamKey);
+        intent.putExtra("rtmpBroadcastID", rtmpBroadcastID);
+        intent.putExtra("youtubeStreamKey", youtubeStreamKey);
+        intent.putExtra("youtubeBroadcastID", youtubeBroadcastID);
+        intent.putExtra("extraMetadata", extraMetadata);
+        intent.putExtra("transcription", transcription);
+
+        return intent;
+    }
+
+    public static Intent buildStopRecordingIntent(RecordingMode mode, boolean transcription) {
+        Intent intent = new Intent(BroadcastAction.Type.STOP_RECORDING.getAction());
+        intent.putExtra("mode", mode.getMode());
+        intent.putExtra("transcription", transcription);
+
+        return intent;
+    }
+
+    public static Intent buildOverwriteConfigIntent(Bundle config) {
+        Intent intent = new Intent(BroadcastAction.Type.OVERWRITE_CONFIG.getAction());
+        intent.putExtra("config", config);
+
+        return intent;
+    }
+
+    public static Intent buildSendCameraFacingModeMessageIntent(String to, String facingMode) {
+        Intent intent = new Intent(BroadcastAction.Type.SEND_CAMERA_FACING_MODE_MESSAGE.getAction());
+        intent.putExtra("to", to);
+        intent.putExtra("facingMode", facingMode);
+
+        return intent;
+    }
 }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastReceiver.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/BroadcastReceiver.java
@@ -3,6 +3,9 @@ package org.jitsi.meet.sdk;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Bundle;
+
+import com.facebook.react.bridge.Arguments;

 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

@@ -28,7 +31,14 @@ public class BroadcastReceiver extends android.content.BroadcastReceiver {
    public void onReceive(Context context, Intent intent) {
        BroadcastAction action = new BroadcastAction(intent);
        String actionName = action.getType().getAction();
-
-        ReactInstanceManagerHolder.emitEvent(actionName, action.getDataAsWritableNativeMap());
+        Bundle data = action.getData();
+            
+        // For actions without data bundle (like hangup), we create an empty map
+        // instead of attempting to convert a null bundle to avoid crashes.
+        if (data != null) {
+            ReactInstanceManagerHolder.emitEvent(actionName, Arguments.fromBundle(data));
+        } else {
+            ReactInstanceManagerHolder.emitEvent(actionName, Arguments.createMap());
+        }
    }
 }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ConnectionService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ConnectionService.java
@@ -37,7 +37,6 @@ import java.util.Objects;
 *
 * @author Pawel Domas
 */
-@RequiresApi(api = Build.VERSION_CODES.O)
 public class ConnectionService extends android.telecom.ConnectionService {

    /**
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java
@@ -97,6 +97,12 @@ class ExternalAPIModule extends ReactContextBaseJavaModule {
        constants.put("SET_VIDEO_MUTED", BroadcastAction.Type.SET_VIDEO_MUTED.getAction());
        constants.put("SET_CLOSED_CAPTIONS_ENABLED", BroadcastAction.Type.SET_CLOSED_CAPTIONS_ENABLED.getAction());
        constants.put("TOGGLE_CAMERA", BroadcastAction.Type.TOGGLE_CAMERA.getAction());
+        constants.put("SHOW_NOTIFICATION", BroadcastAction.Type.SHOW_NOTIFICATION.getAction());
+        constants.put("HIDE_NOTIFICATION", BroadcastAction.Type.HIDE_NOTIFICATION.getAction());
+        constants.put("START_RECORDING", BroadcastAction.Type.START_RECORDING.getAction());
+        constants.put("STOP_RECORDING", BroadcastAction.Type.STOP_RECORDING.getAction());
+        constants.put("OVERWRITE_CONFIG", BroadcastAction.Type.OVERWRITE_CONFIG.getAction());
+        constants.put("SEND_CAMERA_FACING_MODE_MESSAGE", BroadcastAction.Type.SEND_CAMERA_FACING_MODE_MESSAGE.getAction());

        return constants;
    }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JavaScriptSandboxModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JavaScriptSandboxModule.java
@@ -1,57 +0,0 @@
-/*
- * Copyright @ 2019-present 8x8, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jitsi.meet.sdk;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.module.annotations.ReactModule;
-import com.squareup.duktape.Duktape;
-
-@ReactModule(name = JavaScriptSandboxModule.NAME)
-class JavaScriptSandboxModule extends ReactContextBaseJavaModule {
-    public static final String NAME = "JavaScriptSandbox";
-
-    public JavaScriptSandboxModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    /**
-     * Evaluates the given code in a Duktape VM.
-     * @param code - The code that needs to evaluated.
-     * @param promise - Resolved with the output in case of success or rejected with an exception
-     *                in case of failure.
-     */
-    @ReactMethod
-    public void evaluate(String code, Promise promise) {
-        Duktape vm = Duktape.create();
-        try {
-            Object res = vm.evaluate(code);
-            promise.resolve(res.toString());
-        } catch (Throwable tr) {
-            promise.reject(tr);
-        } finally {
-            vm.close();
-        }
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiInitializer.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiInitializer.java
@@ -23,8 +23,10 @@ import androidx.annotation.NonNull;
 import androidx.startup.Initializer;

 import com.facebook.soloader.SoLoader;
+import com.facebook.react.soloader.OpenSourceMergedSoMapping;
 import org.wonday.orientation.OrientationActivityLifecycle;

+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;

@@ -35,7 +37,11 @@ public class JitsiInitializer implements Initializer<Boolean> {
    public Boolean create(@NonNull Context context) {
        Log.d(this.getClass().getCanonicalName(), "create");

-        SoLoader.init(context, /* native exopackage */ false);
+        try {
+            SoLoader.init(context, OpenSourceMergedSoMapping.INSTANCE);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }

        // Register our uncaught exception handler.
        JitsiMeetUncaughtExceptionHandler.register();
@@ -43,6 +49,10 @@ public class JitsiInitializer implements Initializer<Boolean> {
        // Register activity lifecycle handler for the orientation locker module.
        ((Application) context).registerActivityLifecycleCallbacks(OrientationActivityLifecycle.getInstance());

+        // Initialize ReactInstanceManager during application startup
+        // This ensures it's ready before any Activity onCreate is called
+        ReactInstanceManagerHolder.initReactInstanceManager((Application) context);
+
        return true;
    }

--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeet.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeet.java
@@ -22,7 +22,7 @@ import android.os.Bundle;

 import com.facebook.react.ReactInstanceManager;

-import org.devio.rn.splashscreen.SplashScreen;
+import com.splashview.SplashView;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;

 public class JitsiMeet {
@@ -92,7 +92,7 @@ public class JitsiMeet {
     */
    public static void showSplashScreen(Activity activity) {
        try {
-            SplashScreen.show(activity);
+            SplashView.INSTANCE.showSplashView(activity);
        } catch (Exception e) {
            JitsiMeetLogger.e(e, "Failed to show splash screen");
        }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
@@ -25,9 +25,15 @@ import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;

+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

 import com.facebook.react.modules.core.PermissionListener;
@@ -87,6 +93,28 @@ public class JitsiMeetActivity extends AppCompatActivity
        launch(context, options);
    }

+    public static void addTopBottomInsets(@NonNull Window w, @NonNull View v) {
+        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM) return;
+
+        View decorView = w.getDecorView();
+
+        decorView.post(() -> {
+            WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(decorView);
+            if (insets != null) {
+                ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+                params.topMargin = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
+                params.bottomMargin = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
+                v.setLayoutParams(params);
+
+                decorView.setOnApplyWindowInsetsListener((view, windowInsets) -> {
+                    view.setBackgroundColor(JitsiMeetView.BACKGROUND_COLOR);
+
+                    return windowInsets;
+                });
+            }
+        });
+    }
+
    // Overrides
    //

@@ -102,7 +130,12 @@ public class JitsiMeetActivity extends AppCompatActivity
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

+        // ReactInstanceManager is now initialized by JitsiInitializer during application startup
+        // Just call onHostResume since the manager is already ready
+        JitsiMeetActivityDelegate.onHostResume(this);
+
        setContentView(R.layout.activity_jitsi_meet);
+        addTopBottomInsets(getWindow(),findViewById(android.R.id.content));
        this.jitsiView = findViewById(R.id.jitsiView);

        registerForBroadcastMessages();
@@ -271,9 +304,17 @@ public class JitsiMeetActivity extends AppCompatActivity
 //        JitsiMeetLogger.i("Transcription chunk received: " + extraData);
 //    }

-//    protected void onCustomOverflowMenuButtonPressed(HashMap<String, Object> extraData) {
-//        JitsiMeetLogger.i("Custom overflow menu button pressed: " + extraData);
-//    }
+//    protected void onCustomButtonPressed(HashMap<String, Object> extraData) {
+//         JitsiMeetLogger.i("Custom button pressed: " + extraData);
+//     }
+
+//     protected void onConferenceUniqueIdSet(HashMap<String, Object> extraData) {
+//         JitsiMeetLogger.i("Conference unique id set: " + extraData);
+//     }
+
+//     protected void onRecordingStatusChanged(HashMap<String, Object> extraData) {
+//       JitsiMeetLogger.i("Recording status changed: " + extraData);
+//     }

    // Activity lifecycle methods
    //
@@ -358,12 +399,18 @@ public class JitsiMeetActivity extends AppCompatActivity
                case READY_TO_CLOSE:
                    onReadyToClose();
                    break;
-//                case TRANSCRIPTION_CHUNK_RECEIVED:
-//                    onTranscriptionChunkReceived(event.getData());
-//                    break;
-//                case CUSTOM_OVERFLOW_MENU_BUTTON_PRESSED:
-//                    onCustomOverflowMenuButtonPressed(event.getData());
-//                    break;
+                // case TRANSCRIPTION_CHUNK_RECEIVED:
+                //    onTranscriptionChunkReceived(event.getData());
+                //    break;
+                // case CUSTOM_BUTTON_PRESSED:
+                //    onCustomButtonPressed(event.getData());
+                //    break;
+                // case CONFERENCE_UNIQUE_ID_SET:
+                //     onConferenceUniqueIdSet(event.getData());
+                //     break;
+                // case RECORDING_STATUS_CHANGED:
+                //     onRecordingStatusChanged(event.getData());
+                //     break;
            }
        }
    }
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
@@ -83,11 +83,7 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin
        ComponentName componentName;

        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                componentName = context.startForegroundService(intent);
-            } else {
-                componentName = context.startService(intent);
-            }
+            componentName = context.startForegroundService(intent);
        } catch (RuntimeException e) {
            // Avoid crashing due to ForegroundServiceStartNotAllowedException (API level 31).
            // See: https://developer.android.com/guide/components/foreground-services#background-start-restrictions
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetView.java
@@ -17,6 +17,7 @@
 package org.jitsi.meet.sdk;

 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.AttributeSet;
@@ -33,10 +34,9 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 public class JitsiMeetView extends FrameLayout {

    /**
-     * Background color used by {@code BaseReactView} and the React Native root
-     * view.
+     * Background color. Should match the background color set in JS.
     */
-    private static final int BACKGROUND_COLOR = 0xFF111111;
+    public static final int BACKGROUND_COLOR = 0xFF040404;

    /**
     * React Native root view.
@@ -197,8 +197,6 @@ public class JitsiMeetView extends FrameLayout {
        }

        setBackgroundColor(BACKGROUND_COLOR);
-
-        ReactInstanceManagerHolder.initReactInstanceManager((Activity) context);
    }

    /**
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiVideoDecoderFactory.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiVideoDecoderFactory.java
@@ -0,0 +1,84 @@
+package org.jitsi.meet.sdk;
+
+/*
+ *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+import android.media.MediaCodecInfo;
+import androidx.annotation.Nullable;
+
+import com.oney.WebRTCModule.webrtcutils.SoftwareVideoDecoderFactoryProxy;
+
+import org.webrtc.EglBase;
+import org.webrtc.HardwareVideoDecoderFactory;
+import org.webrtc.JitsiPlatformVideoDecoderFactory;
+import org.webrtc.Predicate;
+import org.webrtc.VideoCodecInfo;
+import org.webrtc.VideoDecoder;
+import org.webrtc.VideoDecoderFactory;
+import org.webrtc.VideoDecoderFallback;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+
+/**
+ * Custom decoder factory which uses HW decoders and falls back to SW.
+ */
+public class JitsiVideoDecoderFactory implements VideoDecoderFactory {
+    private final VideoDecoderFactory hardwareVideoDecoderFactory;
+    private final VideoDecoderFactory softwareVideoDecoderFactory = new SoftwareVideoDecoderFactoryProxy();
+    private final VideoDecoderFactory platformSoftwareVideoDecoderFactory;
+
+    /**
+     * Predicate to filter out the AV1 hardware decoder, as we've seen decoding issues with it.
+     */
+    private static final String GOOGLE_AV1_DECODER = "c2.google.av1";
+    private static final Predicate<MediaCodecInfo> hwCodecPredicate = arg -> {
+        // Filter out the Google AV1 codec.
+        return !arg.getName().startsWith(GOOGLE_AV1_DECODER);
+    };
+    private static final Predicate<MediaCodecInfo> swCodecPredicate = arg -> {
+        // Noop, just making sure we can customize it easily if needed.
+        return true;
+    };
+
+    /**
+     * Create decoder factory using default hardware decoder factory.
+     */
+    public JitsiVideoDecoderFactory(@Nullable EglBase.Context eglContext) {
+        this.hardwareVideoDecoderFactory = new HardwareVideoDecoderFactory(eglContext, hwCodecPredicate);
+        this.platformSoftwareVideoDecoderFactory = new JitsiPlatformVideoDecoderFactory(eglContext, swCodecPredicate);
+    }
+
+    @Override
+    public @Nullable VideoDecoder createDecoder(VideoCodecInfo codecType) {
+        VideoDecoder softwareDecoder = softwareVideoDecoderFactory.createDecoder(codecType);
+        final VideoDecoder hardwareDecoder = hardwareVideoDecoderFactory.createDecoder(codecType);
+        if (softwareDecoder == null) {
+            softwareDecoder = platformSoftwareVideoDecoderFactory.createDecoder(codecType);
+        }
+        if (hardwareDecoder != null && softwareDecoder != null) {
+            // Both hardware and software supported, wrap it in a software fallback
+            return new VideoDecoderFallback(
+                /* fallback= */ softwareDecoder, /* primary= */ hardwareDecoder);
+        }
+        return hardwareDecoder != null ? hardwareDecoder : softwareDecoder;
+    }
+
+    @Override
+    public VideoCodecInfo[] getSupportedCodecs() {
+        LinkedHashSet<VideoCodecInfo> supportedCodecInfos = new LinkedHashSet<>();
+
+        supportedCodecInfos.addAll(Arrays.asList(softwareVideoDecoderFactory.getSupportedCodecs()));
+        supportedCodecInfos.addAll(Arrays.asList(hardwareVideoDecoderFactory.getSupportedCodecs()));
+        supportedCodecInfos.addAll(Arrays.asList(platformSoftwareVideoDecoderFactory.getSupportedCodecs()));
+
+        return supportedCodecInfos.toArray(new VideoCodecInfo[supportedCodecInfos.size()]);
+    }
+}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiVideoEncoderFactory.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiVideoEncoderFactory.java
@@ -0,0 +1,16 @@
+package org.jitsi.meet.sdk;
+
+import androidx.annotation.Nullable;
+
+import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoEncoderFactory;
+
+import org.webrtc.EglBase;
+
+/**
+ * Custom encoder factory which uses HW for H.264 and SW for everything else.
+ */
+public class JitsiVideoEncoderFactory extends H264AndSoftwareVideoEncoderFactory {
+    public JitsiVideoEncoderFactory(@Nullable EglBase.Context eglContext) {
+        super(eglContext);
+    }
+}
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/OngoingNotification.java
@@ -29,8 +29,6 @@ import android.content.Intent;
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;

-import android.os.Build;
-

 /**
 * Helper class for creating the ongoing notification which is used with
@@ -45,10 +43,6 @@ class OngoingNotification {
    static final String ONGOING_CONFERENCE_CHANNEL_ID = "JitsiOngoingConferenceChannel";

    static void createNotificationChannel(Activity context) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-            return;
-        }
-
        if (context == null) {
            JitsiMeetLogger.w(TAG + " Cannot create notification channel: no current context");
            return;
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/PictureInPictureModule.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/PictureInPictureModule.java
@@ -20,7 +20,6 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.PictureInPictureParams;
-import android.os.Build;
 import android.util.Rational;

 import com.facebook.react.bridge.Promise;
@@ -53,7 +52,7 @@ class PictureInPictureModule extends ReactContextBaseJavaModule {
        // Android Go devices don't support PiP. There doesn't seem to be a better way to detect it than
        // to use ActivityManager.isLowRamDevice().
        // https://stackoverflow.com/questions/58340558/how-to-detect-android-go
-        isSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !am.isLowRamDevice();
+        isSupported = !am.isLowRamDevice();
    }

    /**
@@ -82,7 +81,6 @@ class PictureInPictureModule extends ReactContextBaseJavaModule {
     * including when the activity is not visible (paused or stopped), if the
     * screen is locked or if the user has an activity pinned.
     */
-    @TargetApi(Build.VERSION_CODES.O)
    public void enterPictureInPicture() {
        if (!isEnabled) {
            return;
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java
@@ -3,7 +3,6 @@ package org.jitsi.meet.sdk;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
@@ -32,7 +31,6 @@ import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 *
 * @author Pawel Domas
 */
-@RequiresApi(api = Build.VERSION_CODES.O)
@ReactModule(name = RNConnectionService.NAME)
 class RNConnectionService extends ReactContextBaseJavaModule {

@@ -53,7 +51,6 @@ class RNConnectionService extends ReactContextBaseJavaModule {
     * @param audioRoute the new audio route to be set. See
     * {@link android.telecom.CallAudioState} constants prefixed with "ROUTE_".
     */
-    @RequiresApi(api = Build.VERSION_CODES.O)
    static void setAudioRoute(int audioRoute) {
        for (ConnectionService.ConnectionImpl c
                : ConnectionService.getConnections()) {
--- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
+++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@@ -16,8 +16,8 @@

 package org.jitsi.meet.sdk;

-import android.app.Activity;
-import android.util.Log;
+import android.annotation.SuppressLint;
+import android.app.Application;

 import androidx.annotation.Nullable;

@@ -32,12 +32,9 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.oney.WebRTCModule.EglUtils;
 import com.oney.WebRTCModule.WebRTCModuleOptions;
-import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoDecoderFactory;
-import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoEncoderFactory;

-import org.devio.rn.splashscreen.SplashScreenModule;
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.webrtc.EglBase;
-import org.webrtc.Logging;

 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -67,10 +64,8 @@ class ReactInstanceManagerHolder {
                new AudioModeModule(reactContext),
                new DropboxModule(reactContext),
                new ExternalAPIModule(reactContext),
-                new JavaScriptSandboxModule(reactContext),
                new LocaleDetector(reactContext),
                new LogBridgeModule(reactContext),
-                new SplashScreenModule(reactContext),
                new PictureInPictureModule(reactContext),
                new ProximityModule(reactContext),
                new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)));
@@ -92,7 +87,7 @@ class ReactInstanceManagerHolder {
            new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
            new com.ocetnik.timer.BackgroundTimerPackage(),
            new com.calendarevents.RNCalendarEventsPackage(),
-            new com.corbt.keepawake.KCKeepAwakePackage(),
+            new com.sayem.keepawake.KCKeepAwakePackage(),
            new com.facebook.react.shell.MainReactPackage(),
            new com.reactnativecommunity.clipboard.ClipboardPackage(),
            new com.reactnativecommunity.netinfo.NetInfoPackage(),
@@ -112,6 +107,8 @@ class ReactInstanceManagerHolder {
            new com.th3rdwave.safeareacontext.SafeAreaContextPackage(),
            new com.horcrux.svg.SvgPackage(),
            new org.wonday.orientation.OrientationPackage(),
+            new com.splashview.SplashViewPackage(),
+            new com.worklets.WorkletsCorePackage(),
            new ReactPackageAdapter() {
                @Override
                public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
@@ -126,31 +123,31 @@ class ReactInstanceManagerHolder {
        // AmplitudeReactNativePackage
        try {
            Class<?> amplitudePackageClass = Class.forName("com.amplitude.reactnative.AmplitudeReactNativePackage");
-            Constructor constructor = amplitudePackageClass.getConstructor();
+            Constructor<?> constructor = amplitudePackageClass.getConstructor();
            packages.add((ReactPackage)constructor.newInstance());
        } catch (Exception e) {
            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            Log.d(TAG, "Not loading AmplitudeReactNativePackage");
+            JitsiMeetLogger.d(TAG, "Not loading AmplitudeReactNativePackage");
        }

        // GiphyReactNativeSdkPackage
        try {
-            Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.GiphyReactNativeSdkPackage");
-            Constructor constructor = giphyPackageClass.getConstructor();
+            Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.RTNGiphySdkPackage");
+            Constructor<?> constructor = giphyPackageClass.getConstructor();
            packages.add((ReactPackage)constructor.newInstance());
        } catch (Exception e) {
            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            Log.d(TAG, "Not loading GiphyReactNativeSdkPackage");
+            JitsiMeetLogger.d(TAG, "Not loading GiphyReactNativeSdkPackage");
        }

        // RNGoogleSignInPackage
        try {
            Class<?> googlePackageClass = Class.forName("com.reactnativegooglesignin.RNGoogleSigninPackage");
-            Constructor constructor = googlePackageClass.getConstructor();
+            Constructor<?> constructor = googlePackageClass.getConstructor();
            packages.add((ReactPackage)constructor.newInstance());
        } catch (Exception e) {
            // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
-            Log.d(TAG, "Not loading RNGoogleSignInPackage");
+            JitsiMeetLogger.d(TAG, "Not loading RNGoogleSignInPackage");
        }

        return packages;
@@ -169,7 +166,7 @@ class ReactInstanceManagerHolder {
            = ReactInstanceManagerHolder.getReactInstanceManager();

        if (reactInstanceManager != null) {
-            ReactContext reactContext
+            @SuppressLint("VisibleForTests") ReactContext reactContext
                = reactInstanceManager.getCurrentReactContext();

            if (reactContext != null) {
@@ -192,7 +189,7 @@ class ReactInstanceManagerHolder {
     */
    static <T extends NativeModule> T getNativeModule(
            Class<T> nativeModuleClass) {
-        ReactContext reactContext
+        @SuppressLint("VisibleForTests") ReactContext reactContext
            = reactInstanceManager != null
                ? reactInstanceManager.getCurrentReactContext() : null;

@@ -210,35 +207,38 @@ class ReactInstanceManagerHolder {
     * time. All {@code ReactRootView} instances will be tied to the one and
     * only {@code ReactInstanceManager}.
     *
-     * @param activity {@code Activity} current running Activity.
+     * @param app {@code Application}
     */
-    static void initReactInstanceManager(Activity activity) {
+    static void initReactInstanceManager(Application app) {
        if (reactInstanceManager != null) {
            return;
        }

        // Initialize the WebRTC module options.
        WebRTCModuleOptions options = WebRTCModuleOptions.getInstance();
-
-        EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
-
-        options.videoDecoderFactory = new H264AndSoftwareVideoDecoderFactory(eglContext);
-        options.videoEncoderFactory = new H264AndSoftwareVideoEncoderFactory(eglContext);
        options.enableMediaProjectionService = true;
-//      options.loggingSeverity = Logging.Severity.LS_INFO;
+        if (options.videoDecoderFactory == null || options.videoEncoderFactory == null) {
+            EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
+            if (options.videoDecoderFactory == null) {
+                options.videoDecoderFactory = new JitsiVideoDecoderFactory(eglContext);
+            }
+            if (options.videoEncoderFactory == null) {
+                options.videoEncoderFactory = new JitsiVideoEncoderFactory(eglContext);
+            }
+        }

-        Log.d(TAG, "initializing RN with Activity");
+        JitsiMeetLogger.d(TAG, "initializing RN");

        reactInstanceManager
            = ReactInstanceManager.builder()
-                .setApplication(activity.getApplication())
-                .setCurrentActivity(activity)
+                .setApplication(app)
+                .setCurrentActivity(null)
                .setBundleAssetName("index.android.bundle")
                .setJSMainModulePath("index.android")
                .setJavaScriptExecutorFactory(new HermesExecutorFactory())
                .addPackages(getReactNativePackages())
                .setUseDeveloperSupport(BuildConfig.DEBUG)
-                .setInitialLifecycleState(LifecycleState.RESUMED)
+                .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
                .build();
    }
 }
--- a/android/sdk/src/main/java/org/webrtc/JitsiPlatformVideoDecoderFactory.java
+++ b/android/sdk/src/main/java/org/webrtc/JitsiPlatformVideoDecoderFactory.java
@@ -0,0 +1,40 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+package org.webrtc;
+
+import android.media.MediaCodecInfo;
+import androidx.annotation.Nullable;
+
+/** Factory for Android platform software VideoDecoders. */
+public class JitsiPlatformVideoDecoderFactory extends MediaCodecVideoDecoderFactory {
+    /**
+     * Default allowed predicate.
+     */
+    private static final Predicate<MediaCodecInfo> defaultAllowedPredicate =
+        codecInfo -> {
+            // We only want to use the platform software codecs.
+            return MediaCodecUtils.isSoftwareOnly(codecInfo);
+        };
+
+    /**
+     * Creates a PlatformSoftwareVideoDecoderFactory that supports surface texture rendering.
+     *
+     * @param sharedContext The textures generated will be accessible from this context. May be null,
+     *                      this disables texture support.
+     */
+    public JitsiPlatformVideoDecoderFactory(@Nullable EglBase.Context sharedContext) {
+        super(sharedContext, defaultAllowedPredicate);
+    }
+
+    public JitsiPlatformVideoDecoderFactory(@Nullable EglBase.Context sharedContext, @Nullable Predicate<MediaCodecInfo> codecAllowedPredicate) {
+        super(sharedContext, codecAllowedPredicate == null ? defaultAllowedPredicate : codecAllowedPredicate.and(defaultAllowedPredicate));
+    }
+}
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,9 +1,7 @@
-rootProject.name = 'jitsi-meet'
-
 include ':app', ':sdk'

 include ':react-native-amplitude'
-project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native/android')
+project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/analytics-react-native/android')
 include ':react-native-async-storage'
 project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
 include ':react-native-background-timer'
@@ -29,7 +27,7 @@ project(':react-native-google-signin').projectDir = new File(rootProject.project
 include ':react-native-immersive-mode'
 project(':react-native-immersive-mode').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive-mode/android')
 include ':react-native-keep-awake'
-project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
+project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/@sayem314/react-native-keep-awake/android')
 include ':react-native-orientation-locker'
 project(':react-native-orientation-locker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation-locker/android')
 include ':react-native-pager-view'
@@ -44,8 +42,8 @@ include ':react-native-slider'
 project(':react-native-slider').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/slider/android')
 include ':react-native-sound'
 project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
-include ':react-native-splash-screen'
-project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
+include ':react-native-splash-view'
+project(':react-native-splash-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-view/android')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-svg/android')
 include ':react-native-video'
@@ -54,3 +52,5 @@ include ':react-native-webrtc'
 project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
 include ':react-native-webview'
 project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
+include ':react-native-worklets-core'
+project(':react-native-worklets-core').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-worklets-core/android')
--- a/app.js
+++ b/app.js
@@ -1,4 +1,4 @@
-/* application specific logic */
+/* Jitsi Meet app main entrypoint. */

 // Re-export jQuery
 // FIXME: Remove this requirement from torture tests.
@@ -10,6 +10,32 @@ import '@matrix-org/olm';

 import 'focus-visible';

+/*
+* Safari polyfill for createImageBitmap
+* https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/createImageBitmap
+*
+* Support source image types: Canvas.
+*/
+if (!('createImageBitmap' in window)) {
+    window.createImageBitmap = function(data) {
+        return new Promise((resolve, reject) => {
+            let dataURL;
+
+            if (data instanceof HTMLCanvasElement) {
+                dataURL = data.toDataURL();
+            } else {
+                reject(new Error('createImageBitmap does not handle the provided image source type'));
+            }
+            const img = document.createElement('img');
+
+            img.addEventListener('load', () => {
+                resolve(img);
+            });
+            img.src = dataURL;
+        });
+    };
+}
+
 // We need to setup the jitsi-local-storage as early as possible so that we can start using it.
 // NOTE: If jitsi-local-storage is used before the initial setup is performed this will break the use case when we use
 // the  local storage from the parent page when the localStorage is disabled. Also the setup is relying that
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-    presets: [ 'module:metro-react-native-babel-preset' ],
+    presets: [ 'module:@react-native/babel-preset' ],
    env: {
        production: {
            plugins: [ 'react-native-paper/babel' ]
@@ -8,9 +8,13 @@ module.exports = {

    // This happens because react native has conflict with @babel/plugin-transform-private-methods plugin
    // https://github.com/ethers-io/ethers.js/discussions/4309#discussioncomment-6694524
-    plugins: [ 'optional-require',
-        [ '@babel/plugin-transform-private-methods', {
-            'loose': true
-        } ]
+    plugins: [
+        'optional-require',
+        [
+            '@babel/plugin-transform-private-methods', {
+                'loose': true
+            }
+        ],
+        'react-native-worklets-core/plugin'
    ]
 };
--- a/conference.js
+++ b/conference.js
@@ -18,8 +18,6 @@ import {
    maybeRedirectToWelcomePage,
    reloadWithStoredParams
 } from './react/features/app/actions';
-import { showModeratedNotification } from './react/features/av-moderation/actions';
-import { shouldShowModeratedNotification } from './react/features/av-moderation/functions';
 import {
    _conferenceWillJoin,
    authStatusChanged,
@@ -52,7 +50,8 @@ import {
    commonUserJoinedHandling,
    commonUserLeftHandling,
    getConferenceOptions,
-    sendLocalParticipant
+    sendLocalParticipant,
+    updateTrackMuteState
 } from './react/features/base/conference/functions';
 import { getReplaceParticipant, getSsrcRewritingFeatureFlag } from './react/features/base/config/functions';
 import { connect } from './react/features/base/connection/actions.web';
@@ -89,7 +88,7 @@ import {
    setVideoMuted,
    setVideoUnmutePermissions
 } from './react/features/base/media/actions';
-import { MEDIA_TYPE, VIDEO_TYPE } from './react/features/base/media/constants';
+import { MEDIA_TYPE, VIDEO_MUTISM_AUTHORITY, VIDEO_TYPE } from './react/features/base/media/constants';
 import {
    getStartWithAudioMuted,
    getStartWithVideoMuted,
@@ -131,11 +130,11 @@ import {
    createLocalTracksF,
    getLocalJitsiAudioTrack,
    getLocalJitsiVideoTrack,
-    getLocalTracks,
    getLocalVideoTrack,
    isLocalTrackMuted,
    isUserInteractionRequiredForUnmute
 } from './react/features/base/tracks/functions';
+import { getLocalJitsiAudioTrackSettings } from './react/features/base/tracks/functions.web';
 import { downloadJSON } from './react/features/base/util/downloadJSON';
 import { getJitsiMeetGlobalNSConnectionTimes } from './react/features/base/util/helpers';
 import { openLeaveReasonDialog } from './react/features/conference/actions.web';
@@ -154,25 +153,27 @@ import {
    DATA_CHANNEL_CLOSED_NOTIFICATION_ID,
    NOTIFICATION_TIMEOUT_TYPE
 } from './react/features/notifications/constants';
-import { isModerationNotificationDisplayed } from './react/features/notifications/functions';
 import { suspendDetected } from './react/features/power-monitor/actions';
 import { initPrejoin, isPrejoinPageVisible } from './react/features/prejoin/functions';
 import { disableReceiver, stopReceiver } from './react/features/remote-control/actions';
 import { setScreenAudioShareState } from './react/features/screen-share/actions.web';
 import { isScreenAudioShared } from './react/features/screen-share/functions';
 import { toggleScreenshotCaptureSummary } from './react/features/screenshot-capture/actions';
+import { setAudioSettings } from './react/features/settings/actions.web';
 import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
 import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise';
 import { handleToggleVideoMuted } from './react/features/toolbox/actions.any';
 import { transcriberJoined, transcriberLeft } from './react/features/transcribing/actions';
 import { muteLocal } from './react/features/video-menu/actions.any';

-const logger = Logger.getLogger(__filename);
+const logger = Logger.getLogger('app:conference-web');
 let room;

 /*
 * Logic to open a desktop picker put on the window global for
- * lib-jitsi-meet to detect and invoke
+ * lib-jitsi-meet to detect and invoke.
+ *
+ * TODO: remove once the Electron SDK supporting gDM has been out for a while.
 */
 window.JitsiMeetScreenObtainer = {
    openDesktopPicker(options, onSourceChoose) {
@@ -204,23 +205,6 @@ function sendData(command, value) {
    room.sendCommand(command, { value });
 }

-/**
- * Mute or unmute local audio stream if it exists.
- * @param {boolean} muted - if audio stream should be muted or unmuted.
- */
-function muteLocalAudio(muted) {
-    APP.store.dispatch(setAudioMuted(muted));
-}
-
-/**
- * Mute or unmute local video stream if it exists.
- * @param {boolean} muted if video stream should be muted or unmuted.
- *
- */
-function muteLocalVideo(muted) {
-    APP.store.dispatch(setVideoMuted(muted));
-}
-
 /**
 * A queue for the async replaceLocalTrack action so that multiple audio
 * replacements cannot happen simultaneously. This solves the issue where
@@ -287,7 +271,7 @@ class ConferenceConnector {
                },
                descriptionKey: 'dialog.reservationErrorMsg',
                titleKey: 'dialog.reservationError'
-            }, NOTIFICATION_TIMEOUT_TYPE.LONG));
+            }));
            break;
        }

@@ -295,7 +279,7 @@ class ConferenceConnector {
            APP.store.dispatch(showErrorNotification({
                descriptionKey: 'dialog.gracefulShutdown',
                titleKey: 'dialog.serviceUnavailable'
-            }, NOTIFICATION_TIMEOUT_TYPE.LONG));
+            }));
            break;

        // FIXME FOCUS_DISCONNECTED is a confusing event name.
@@ -584,7 +568,15 @@ export default {
                if (browser.isWebKitBased()) {
                    this.muteAudio(true, true);
                } else {
-                    localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.AUDIO);
+                    localTracks = localTracks.filter(track => {
+                        if (track.getType() === MEDIA_TYPE.AUDIO) {
+                            track.stopStream();
+
+                            return false;
+                        }
+
+                        return true;
+                    });
                }
            }

@@ -599,7 +591,7 @@ export default {

        const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(initialOptions, true);

-        tryCreateLocalTracks.then(async tr => {
+        tryCreateLocalTracks.then(tr => {
            const createLocalTracksEnd = window.performance.now();

            connectionTimes['conference.init.createLocalTracks.end'] = createLocalTracksEnd;
@@ -707,11 +699,10 @@ export default {
     * Simulates toolbar button click for audio mute. Used by shortcuts and API.
     *
     * @param {boolean} mute true for mute and false for unmute.
-     * @param {boolean} [showUI] when set to false will not display any error
     * dialogs in case of media permissions error.
     * @returns {Promise}
     */
-    async muteAudio(mute, showUI = true) {
+    async muteAudio(mute) {
        const state = APP.store.getState();

        if (!mute
@@ -721,56 +712,7 @@ export default {
            return;
        }

-        // check for A/V Moderation when trying to unmute
-        if (!mute && shouldShowModeratedNotification(MEDIA_TYPE.AUDIO, state)) {
-            if (!isModerationNotificationDisplayed(MEDIA_TYPE.AUDIO, state)) {
-                APP.store.dispatch(showModeratedNotification(MEDIA_TYPE.AUDIO));
-            }
-
-            return;
-        }
-
-        // Not ready to modify track's state yet
-        if (!this._localTracksInitialized) {
-            // This will only modify base/media.audio.muted which is then synced
-            // up with the track at the end of local tracks initialization.
-            muteLocalAudio(mute);
-            this.updateAudioIconEnabled();
-
-            return;
-        } else if (this.isLocalAudioMuted() === mute) {
-            // NO-OP
-            return;
-        }
-
-        const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
-
-        if (!localAudio && !mute) {
-            const maybeShowErrorDialog = error => {
-                showUI && APP.store.dispatch(notifyMicError(error));
-            };
-
-            APP.store.dispatch(gumPending([ MEDIA_TYPE.AUDIO ], IGUMPendingState.PENDING_UNMUTE));
-
-            await createLocalTracksF({ devices: [ 'audio' ] })
-                .then(([ audioTrack ]) => audioTrack)
-                .catch(error => {
-                    maybeShowErrorDialog(error);
-
-                    // Rollback the audio muted status by using null track
-                    return null;
-                })
-                .then(async audioTrack => {
-                    await this._maybeApplyAudioMixerEffect(audioTrack);
-
-                    return this.useAudioStream(audioTrack);
-                })
-                .finally(() => {
-                    APP.store.dispatch(gumPending([ MEDIA_TYPE.AUDIO ], IGUMPendingState.NONE));
-                });
-        } else {
-            muteLocalAudio(mute);
-        }
+        await APP.store.dispatch(setAudioMuted(mute, true));
    },

    /**
@@ -800,16 +742,9 @@ export default {
    /**
     * Simulates toolbar button click for video mute. Used by shortcuts and API.
     * @param mute true for mute and false for unmute.
-     * @param {boolean} [showUI] when set to false will not display any error
     * dialogs in case of media permissions error.
     */
-    muteVideo(mute, showUI = true) {
-        if (this.videoSwitchInProgress) {
-            logger.warn('muteVideo - unable to perform operations while video switch is in progress');
-
-            return;
-        }
-
+    muteVideo(mute) {
        const state = APP.store.getState();

        if (!mute
@@ -819,65 +754,7 @@ export default {
            return;
        }

-        // check for A/V Moderation when trying to unmute and return early
-        if (!mute && shouldShowModeratedNotification(MEDIA_TYPE.VIDEO, state)) {
-            return;
-        }
-
-        // If not ready to modify track's state yet adjust the base/media
-        if (!this._localTracksInitialized) {
-            // This will only modify base/media.video.muted which is then synced
-            // up with the track at the end of local tracks initialization.
-            muteLocalVideo(mute);
-            this.setVideoMuteStatus();
-
-            return;
-        } else if (this.isLocalVideoMuted() === mute) {
-            // NO-OP
-            return;
-        }
-
-        const localVideo = getLocalJitsiVideoTrack(state);
-
-        if (!localVideo && !mute && !this.isCreatingLocalTrack) {
-            const maybeShowErrorDialog = error => {
-                showUI && APP.store.dispatch(notifyCameraError(error));
-            };
-
-            this.isCreatingLocalTrack = true;
-
-            APP.store.dispatch(gumPending([ MEDIA_TYPE.VIDEO ], IGUMPendingState.PENDING_UNMUTE));
-
-            // Try to create local video if there wasn't any.
-            // This handles the case when user joined with no video
-            // (dismissed screen sharing screen or in audio only mode), but
-            // decided to add it later on by clicking on muted video icon or
-            // turning off the audio only mode.
-            //
-            // FIXME when local track creation is moved to react/redux
-            // it should take care of the use case described above
-            createLocalTracksF({ devices: [ 'video' ] })
-                .then(([ videoTrack ]) => videoTrack)
-                .catch(error => {
-                    // FIXME should send some feedback to the API on error ?
-                    maybeShowErrorDialog(error);
-
-                    // Rollback the video muted status by using null track
-                    return null;
-                })
-                .then(videoTrack => {
-                    logger.debug(`muteVideo: calling useVideoStream for track: ${videoTrack}`);
-
-                    return this.useVideoStream(videoTrack);
-                })
-                .finally(() => {
-                    this.isCreatingLocalTrack = false;
-                    APP.store.dispatch(gumPending([ MEDIA_TYPE.VIDEO ], IGUMPendingState.NONE));
-                });
-        } else {
-            // FIXME show error dialog if it fails (should be handled by react)
-            muteLocalVideo(mute);
-        }
+        APP.store.dispatch(setVideoMuted(mute, VIDEO_MUTISM_AUTHORITY.USER, true));
    },

    /**
@@ -1012,7 +889,7 @@ export default {
    },

    /**
-     * Will be filled with values only when config.debug is enabled.
+     * Will be filled with values only when config.testing.testMode is true.
     * Its used by torture to check audio levels.
     */
    audioLevelsMap: {},
@@ -1058,6 +935,14 @@ export default {
        downloadJSON(logs, filename);
    },

+    /**
+     * Download app state, a function that can be called from console while debugging.
+     * @param filename (optional) specify target filename
+     */
+    saveState(filename = 'meet-state.json') {
+        downloadJSON(APP.store.getState(), filename);
+    },
+
    /**
     * Exposes a Command(s) API on this instance. It is necessitated by (1) the
     * desire to keep room private to this instance and (2) the need of other
@@ -1122,7 +1007,6 @@ export default {

        // Restore initial state.
        this._localTracksInitialized = false;
-        this.isSharingScreen = false;
        this.roomName = roomName;

        const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(options);
@@ -1301,8 +1185,6 @@ export default {
        return Boolean(APP.store.getState()['features/base/audio-only'].enabled);
    },

-    videoSwitchInProgress: false,
-
    /**
     * This fields stores a handler which will create a Promise which turns off
     * the screen sharing and restores the previous video state (was there
@@ -1331,7 +1213,6 @@ export default {
     */
    async _turnScreenSharingOff(didHaveVideo, ignoreDidHaveVideo) {
        this._untoggleScreenSharing = null;
-        this.videoSwitchInProgress = true;

        APP.store.dispatch(stopReceiver());

@@ -1383,13 +1264,11 @@ export default {

        return promise.then(
            () => {
-                this.videoSwitchInProgress = false;
                sendAnalytics(createScreenSharingEvent('stopped',
                    duration === 0 ? null : duration));
                logger.info('Screen sharing stopped.');
            },
            error => {
-                this.videoSwitchInProgress = false;
                logger.error(`_turnScreenSharingOff failed: ${error}`);

                throw error;
@@ -1399,28 +1278,19 @@ export default {
    /**
     * Creates desktop (screensharing) {@link JitsiLocalTrack}
     *
-     * @param {Object} [options] - Screen sharing options that will be passed to
-     * createLocalTracks.
-     * @param {Object} [options.desktopSharing]
-     * @param {Object} [options.desktopStream] - An existing desktop stream to
-     * use instead of creating a new desktop stream.
     * @return {Promise.<JitsiLocalTrack>} - A Promise resolved with
     * {@link JitsiLocalTrack} for the screensharing or rejected with
     * {@link JitsiTrackError}.
     *
     * @private
     */
-    _createDesktopTrack(options = {}) {
+    _createDesktopTrack() {
        const didHaveVideo = !this.isLocalVideoMuted();

-        const getDesktopStreamPromise = options.desktopStream
-            ? Promise.resolve([ options.desktopStream ])
-            : createLocalTracksF({
-                desktopSharingSourceDevice: options.desktopSharingSources
-                    ? null : config._desktopSharingSourceDevice,
-                desktopSharingSources: options.desktopSharingSources,
-                devices: [ 'desktop' ]
-            });
+        const getDesktopStreamPromise = createLocalTracksF({
+            desktopSharingSourceDevice: config._desktopSharingSourceDevice,
+            devices: [ 'desktop' ]
+        });

        return getDesktopStreamPromise.then(desktopStreams => {
            // Stores the "untoggle" handler which remembers whether was
@@ -1428,14 +1298,13 @@ export default {
            this._untoggleScreenSharing
                = this._turnScreenSharingOff.bind(this, didHaveVideo);

-            const desktopVideoStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
            const desktopAudioStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);

            if (desktopAudioStream) {
                desktopAudioStream.on(
                    JitsiTrackEvents.LOCAL_TRACK_STOPPED,
                    () => {
-                        logger.debug(`Local screensharing audio track stopped. ${this.isSharingScreen}`);
+                        logger.debug('Local screensharing audio track stopped.');

                        // Handle case where screen share was stopped from  the browsers 'screen share in progress'
                        // window. If audio screen sharing is stopped via the normal UX flow this point shouldn't
@@ -1447,21 +1316,6 @@ export default {
                );
            }

-            if (desktopVideoStream) {
-                desktopVideoStream.on(
-                    JitsiTrackEvents.LOCAL_TRACK_STOPPED,
-                    () => {
-                        logger.debug(`Local screensharing track stopped. ${this.isSharingScreen}`);
-
-                        // If the stream was stopped during screen sharing
-                        // session then we should switch back to video.
-                        this.isSharingScreen
-                            && this._untoggleScreenSharing
-                            && this._untoggleScreenSharing();
-                    }
-                );
-            }
-
            return desktopStreams;
        }, error => {
            throw error;
@@ -1555,7 +1409,6 @@ export default {
                }

                APP.store.dispatch(localParticipantRoleChanged(role));
-                APP.API.notifyUserRoleChanged(id, role);
            } else {
                APP.store.dispatch(participantRoleChanged(id, role));
            }
@@ -1597,9 +1450,9 @@ export default {
                newLvl = 0;
            }

-            if (config.debug) {
+            if (config.testing?.testMode) {
                this.audioLevelsMap[id] = newLvl;
-                if (config.debugAudioLevels) {
+                if (config.testing?.debugAudioLevels) {
                    logger.log(`AudioLevel:${id}/${newLvl}`);
                }
            }
@@ -1610,10 +1463,6 @@ export default {
        room.on(JitsiConferenceEvents.TRACK_MUTE_CHANGED, (track, participantThatMutedUs) => {
            if (participantThatMutedUs) {
                APP.store.dispatch(participantMutedUs(participantThatMutedUs, track));
-                if (this.isSharingScreen && track.isVideoTrack()) {
-                    logger.debug('TRACK_MUTE_CHANGED while screen sharing');
-                    this._turnScreenSharingOff(false);
-                }
            }
        });

@@ -1825,39 +1674,14 @@ export default {
        room.on(
            JitsiConferenceEvents.START_MUTED_POLICY_CHANGED,
            ({ audio, video }) => {
-                APP.store.dispatch(
-                    onStartMutedPolicyChanged(audio, video));
+                APP.store.dispatch(onStartMutedPolicyChanged(audio, video));
+
+                const state = APP.store.getState();
+
+                updateTrackMuteState(state, APP.store.dispatch, true);
+                updateTrackMuteState(state, APP.store.dispatch, false);
            }
        );
-        room.on(JitsiConferenceEvents.STARTED_MUTED, () => {
-            const audioMuted = room.isStartAudioMuted();
-            const videoMuted = room.isStartVideoMuted();
-            const localTracks = getLocalTracks(APP.store.getState()['features/base/tracks']);
-            const promises = [];
-
-            APP.store.dispatch(setAudioMuted(audioMuted));
-            APP.store.dispatch(setVideoMuted(videoMuted));
-
-            // Remove the tracks from the peerconnection.
-            for (const track of localTracks) {
-                // Always add the track on Safari because of a known issue where audio playout doesn't happen
-                // if the user joins audio and video muted, i.e., if there is no local media capture.
-                if (audioMuted && track.jitsiTrack?.getType() === MEDIA_TYPE.AUDIO && !browser.isWebKitBased()) {
-                    promises.push(this.useAudioStream(null));
-                }
-                if (videoMuted && track.jitsiTrack?.getType() === MEDIA_TYPE.VIDEO) {
-                    promises.push(this.useVideoStream(null));
-                }
-            }
-
-            Promise.allSettled(promises)
-                .then(() => {
-                    APP.store.dispatch(showNotification({
-                        titleKey: 'notify.mutedTitle',
-                        descriptionKey: 'notify.muted'
-                    }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
-                });
-        });

        room.on(
            JitsiConferenceEvents.DATA_CHANNEL_OPENED, () => {
@@ -1895,6 +1719,16 @@ export default {
                }, timeout);
            }
        );
+
+        room.on(JitsiConferenceEvents.PERMISSIONS_RECEIVED, p => {
+            const localParticipant = getLocalParticipant(APP.store.getState());
+
+            APP.store.dispatch(participantUpdated({
+                id: localParticipant.id,
+                local: true,
+                features: p
+            }));
+        });
    },

    /**
@@ -1939,7 +1773,11 @@ export default {
            return this.useAudioStream(stream);
        })
        .then(() => {
-            const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
+            const state = APP.store.getState();
+            const localAudio = getLocalJitsiAudioTrack(state);
+            const settings = getLocalJitsiAudioTrackSettings(state);
+
+            APP.store.dispatch(setAudioSettings(settings));

            if (localAudio && isDefaultMicSelected) {
                // workaround for the default device to be shown as selected in the
@@ -2059,8 +1897,7 @@ export default {
    _initDeviceList(setDeviceListChangeHandler = false) {
        const { mediaDevices } = JitsiMeetJS;

-        if (mediaDevices.isDeviceListAvailable()
-                && mediaDevices.isDeviceChangeAvailable()) {
+        if (mediaDevices.isDeviceChangeAvailable()) {
            if (setDeviceListChangeHandler) {
                this.deviceChangeListener = devices =>
                    window.setTimeout(() => this._onDeviceListChanged(devices), 0);
@@ -2285,8 +2122,10 @@ export default {
     * @param {boolean} [requestFeedback=false] if user feedback should be
     * @param {string} [hangupReason] the reason for leaving the meeting
     * requested
+     * @param {boolean} [notifyOnConferenceTermination] whether to notify
+     * the user on conference termination
     */
-    hangup(requestFeedback = false, hangupReason) {
+    hangup(requestFeedback = false, hangupReason, notifyOnConferenceTermination) {
        APP.store.dispatch(disableReceiver());

        this._stopProxyConnection();
@@ -2305,7 +2144,7 @@ export default {

        if (requestFeedback) {
            const feedbackDialogClosed = (feedbackResult = {}) => {
-                if (!feedbackResult.wasDialogShown && hangupReason) {
+                if (!feedbackResult.wasDialogShown && hangupReason && notifyOnConferenceTermination) {
                    return APP.store.dispatch(
                        openLeaveReasonDialog(hangupReason)).then(() => feedbackResult);
                }
--- a/config.js
+++ b/config.js
@@ -49,7 +49,9 @@ var config = {
    bosh: 'https://jitsi-meet.example.com/' + subdir + 'http-bind',

    // Websocket URL (XMPP)
-    // websocket: 'wss://jitsi-meet.example.com/' + subdir + 'xmpp-websocket',
+    websocket: 'wss://jitsi-meet.example.com/' + subdir + 'xmpp-websocket',
+
+    // websocketKeepAliveUrl: 'https://jitsi-meet.example.com/' + subdir + '_unlock',

    // Whether BOSH should be preferred over WebSocket if both are configured.
    // preferBosh: false,
@@ -84,6 +86,12 @@ var config = {
        // Allows the setting of a custom bandwidth value from the UI.
        // assumeBandwidth: true,

+        // Enables use of getDisplayMedia in electron
+        // electronUseGetDisplayMedia: false,
+
+        // Enables AV1 codec for FF. Note: By default it is disabled.
+        // enableAV1ForFF: false,
+
        // Enables the use of the codec selection API supported by the browsers .
        // enableCodecSelectionAPI: false,

@@ -103,6 +111,17 @@ var config = {

        // Dump transcripts to a <transcript> element for debugging.
        // dumpTranscript: false,
+
+        // Log the audio levels.
+        // debugAudioLevels: true,
+
+        // Will replace ice candidates IPs with invalid ones in order to fail ice.
+        // failICE: true,
+
+        // When running on Spot TV, this controls whether to show the recording consent dialog.
+        // If false (default), Spot instances will not show the recording consent dialog.
+        // If true, Spot instances will show the recording consent dialog like regular clients.
+        // showSpotConsentDialog: false,
    },

    // Disables moderator indicators.
@@ -114,6 +133,9 @@ var config = {
    // Disables the reactions moderation feature.
    // disableReactionsModeration: false,

+    // Disables the reactions in chat feature.
+    // disableReactionsInChat: false,
+
    // Disables polls feature.
    // disablePolls: false,

@@ -341,6 +363,7 @@ var config = {
    // Desktop sharing

    // Optional desktop sharing frame rate options. Default value: min:5, max:5.
+    // Setting higher min/max values will affect the resolution, it makes it worse.
    // desktopSharingFrameRate: {
    //     min: 5,
    //     max: 5,
@@ -362,9 +385,6 @@ var config = {

    // Recording

-    // DEPRECATED. Use recordingService.enabled instead.
-    // fileRecordingsEnabled: false,
-
    // Enable the dropbox integration.
    // dropbox: {
    //     appKey: '<APP_KEY>', // Specify your app key here.
@@ -387,6 +407,13 @@ var config = {
    //    // showPrejoinWarning: true,
    //    // If true, the notification for recording start will display a link to download the cloud recording.
    //    // showRecordingLink: true,
+    //    // If true, mutes audio and video when a recording begins and displays a dialog
+    //    // explaining the effect of unmuting.
+    //    // requireConsent: true,
+    //    // If true consent will be skipped for users who are already in the meeting.
+    //    // skipConsentInMeeting: true,
+    //    // Link for the recording consent dialog's "Learn more" link.
+    //    // consentLearnMoreLink: 'https://jitsi.org/meet/consent',
    // },

    // recordingService: {
@@ -484,6 +511,15 @@ var config = {
    //     // Enables automatic request of subtitles when transcriber is present in the meeting, uses the default
    //     // language that is set
    //     autoCaptionOnTranscribe: false,
+    //
+    //     // Disables everything related to closed captions - the tab in the chat area, the button in the menu,
+    //     // subtitles on stage and the "Show subtitles on stage" checkbox in the settings.
+    //     // Note: Starting transcriptions from the recording dialog will still work.
+    //     disableClosedCaptions: false,
+
+    //     // Whether to invite jigasi when backend transcriptions are enabled (asyncTranscription is true in metadata).
+    //     // By default, we invite it.
+    //     inviteJigasiOnBackendTranscribing: true,
    // },

    // Misc
@@ -509,7 +545,7 @@ var config = {
    // videoQuality: {
    //
    //    // Provides a way to set the codec preference on desktop based endpoints.
-    //    codecPreferenceOrder: [ 'VP9', 'VP8', 'H264', 'AV1' ],
+    //    codecPreferenceOrder: [ 'AV1', 'VP9', 'VP8', 'H264' ],
    //
    //    // Provides a way to set the codec for screenshare.
    //    screenshareCodec: 'AV1',
@@ -570,30 +606,6 @@ var config = {
    //      useKSVC: true
    //    },
    //
-    //    DEPRECATED! Use `codec specific settings` instead.
-    //    // Provides a way to configure the maximum bitrates that will be enforced on the simulcast streams for
-    //    // video tracks. The keys in the object represent the type of the stream (LD, SD or HD) and the values
-    //    // are the max.bitrates to be set on that particular type of stream. The actual send may vary based on
-    //    // the available bandwidth calculated by the browser, but it will be capped by the values specified here.
-    //    // This is currently not implemented on app based clients on mobile.
-    //    maxBitratesVideo: {
-    //          H264: {
-    //              low: 200000,
-    //              standard: 500000,
-    //              high: 1500000,
-    //          },
-    //          VP8 : {
-    //              low: 200000,
-    //              standard: 500000,
-    //              high: 1500000,
-    //          },
-    //          VP9: {
-    //              low: 100000,
-    //              standard: 300000,
-    //              high: 1200000,
-    //          },
-    //    },
-    //
    //    // The options can be used to override default thresholds of video thumbnail heights corresponding to
    //    // the video quality levels used in the application. At the time of this writing the allowed levels are:
    //    //     'low' - for the low quality level (180p at the time of this writing)
@@ -610,23 +622,7 @@ var config = {
    //    },
    //
    //    // Provides a way to set the codec preference on mobile devices, both on RN and mobile browser based endpoint
-    //    mobileCodecPreferenceOrder: [ 'VP8', 'VP9', 'H264' ],
-    //
-    //    // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
-    //    // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
-    //    // here will be removed from the list of codecs present in the SDP answer generated by the client. If the
-    //    // same codec is specified for both the disabled and preferred option, the disable settings will prevail.
-    //    // Note that 'VP8' cannot be disabled since it's a mandatory codec, the setting will be ignored in this case.
-    //    disabledCodec: 'H264',
-    //
-    //    // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
-    //    // Provides a way to set a preferred video codec for the JVB connection. If 'H264' is specified here,
-    //    // simulcast will be automatically disabled since JVB doesn't support H264 simulcast yet. This will only
-    //    // rearrange the the preference order of the codecs in the SDP answer generated by the browser only if the
-    //    // preferred codec specified here is present. Please ensure that the JVB offers the specified codec for this
-    //    // to take effect.
-    //    preferredCodec: 'VP8',
-    //
+    //    mobileCodecPreferenceOrder: [ 'VP8', 'VP9', 'H264', 'AV1' ],
    // },

    // Notification timeouts
@@ -634,6 +630,8 @@ var config = {
    //     short: 2500,
    //     medium: 5000,
    //     long: 10000,
+    //     extraLong: 60000,
+    //     sticky: 0,
    // },

    // // Options for the recording limit notification.
@@ -764,7 +762,7 @@ var config = {
    // hideDominantSpeakerBadge: false,

    // Default language for the user interface. Cannot be overwritten.
-    // DEPRECATED! Use the `lang` iframe option directly instead.
+    // For iframe integrations, use the `lang` option directly instead.
    // defaultLanguage: 'en',

    // Disables profile and the edit of all fields from the profile settings (display name and email)
@@ -785,10 +783,15 @@ var config = {
    // and microsoftApiApplicationClientID
    // enableCalendarIntegration: false,

+    // Whether to notify when the conference is terminated because it was destroyed.
+    // notifyOnConferenceDestruction: true,
+
+    // The client id for the google APIs used for the calendar integration, youtube livestreaming, etc.
+    // googleApiApplicationClientID: '<client_id>',
+
    // Configs for prejoin page.
    // prejoinConfig: {
    //     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
-    //     // This replaces `prejoinPageEnabled`. Defaults to true.
    //     enabled: true,
    //     // Hides the participant name editing field in the prejoin screen.
    //     // If requireDisplayName is also set as true, a name should still be provided through
@@ -819,10 +822,6 @@ var config = {
    // set or the lobby is not enabled.
    // enableInsecureRoomNameWarning: false,

-    // Whether to automatically copy invitation URL after creating a room.
-    // Document should be focused for this option to work
-    // enableAutomaticUrlCopy: false,
-
    // Array with avatar URL prefixes that need to use CORS.
    // corsAvatarURLs: [ 'https://www.gravatar.com/avatar/' ],

@@ -849,8 +848,7 @@ var config = {
    // some other values in config.js to be enabled. Also, the "profile" button will
    // not display for users with a JWT.
    // Notes:
-    // - it's impossible to choose which buttons go in the "More actions" menu
-    // - it's impossible to control the placement of buttons
+    // - it's possible to reorder the buttons in the maintoolbar by changing the order of the mainToolbarButtons
    // - 'desktop' controls the "Share your screen" button
    // - if `toolbarButtons` is undefined, we fallback to enabling all buttons on the UI
    // toolbarButtons: [
@@ -1101,10 +1099,10 @@ var config = {

        // Provides a way to set the codec preference on mobile devices, both on RN and mobile browser based
        // endpoints.
-        // mobileCodecPreferenceOrder: [ 'H264', 'VP8', 'VP9' ],
+        // mobileCodecPreferenceOrder: [ 'H264', 'VP8', 'VP9', 'AV1' ],
        //
        // Provides a way to set the codec preference on desktop based endpoints.
-        // codecPreferenceOrder: [ 'VP9', 'VP8', 'H264 ],
+        // codecPreferenceOrder: [ 'AV1', 'VP9', 'VP8', 'H264 ],

        // Provides a way to set the codec for screenshare.
        // screenshareCodec: 'AV1',
@@ -1120,24 +1118,12 @@ var config = {
            // { urls: 'stun:jitsi-meet.example.com:3478' },
            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' },
        ],
-
-        // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
-        // Provides a way to set the video codec preference on the p2p connection. Acceptable
-        // codec values are 'VP8', 'VP9' and 'H264'.
-        // preferredCodec: 'H264',
-
-        // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
-        // Provides a way to prevent a video codec from being negotiated on the p2p connection.
-        // disabledCodec: '',
    },

    analytics: {
        // True if the analytics should be disabled
        // disabled: false,

-        // The Google Analytics Tracking ID:
-        // googleAnalyticsTrackingId: 'your-tracking-id-UA-123456-1',
-
        // Matomo configuration:
        // matomoEndpoint: 'https://your-matomo-endpoint/',
        // matomoSiteID: '42',
@@ -1145,10 +1131,6 @@ var config = {
        // The Amplitude APP Key:
        // amplitudeAPPKey: '<APP_KEY>',

-        // Enables Amplitude UTM tracking:
-        // Default value is false.
-        // amplitudeIncludeUTM: false,
-
        // Obfuscates room name sent to analytics (amplitude, rtcstats)
        // Default value is false.
        // obfuscateRoomName: false,
@@ -1175,7 +1157,6 @@ var config = {

        // Array of script URLs to load as lib-jitsi-meet "analytics handlers".
        // scriptURLs: [
-        //      "libs/analytics-ga.min.js", // google-analytics
        //      "https://example.com/my-custom-analytics.js",
        // ],

@@ -1293,9 +1274,6 @@ var config = {
    // disableDeepLinking: false,

    // The deeplinking config.
-    // For information about the properties of
-    // deeplinking.[ios/android].dynamicLink check:
-    // https://firebase.google.com/docs/dynamic-links/create-manually
    // deeplinking: {
    //
    //     // The desktop deeplinking config, disabled by default.
@@ -1324,13 +1302,6 @@ var config = {
    //         appScheme: 'org.jitsi.meet',
    //         // Custom URL for downloading ios mobile app.
    //         downloadLink: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905',
-    //         dynamicLink: {
-    //             apn: 'org.jitsi.meet',
-    //             appCode: 'w2atb',
-    //             customDomain: undefined,
-    //             ibi: 'com.atlassian.JitsiMeet.ios',
-    //             isi: '1165103905'
-    //         }
    //     },

    //     // The android deeplinking config.
@@ -1343,13 +1314,6 @@ var config = {
    //         // Android app package name.
    //         appPackage: 'org.jitsi.meet',
    //         fDroidUrl: 'https://f-droid.org/en/packages/org.jitsi.meet/',
-    //         dynamicLink: {
-    //             apn: 'org.jitsi.meet',
-    //             appCode: 'w2atb',
-    //             customDomain: undefined,
-    //             ibi: 'com.atlassian.JitsiMeet.ios',
-    //             isi: '1165103905'
-    //         }
    //     }
    // },

@@ -1397,18 +1361,13 @@ var config = {
    //     disableKick: true,
    //     // If set to true the 'Grant moderator' button will be disabled.
    //     disableGrantModerator: true,
-    //     // If set to true the 'Send private message' button will be disabled.
-    //     disablePrivateChat: true,
+    //     // If set to 'all' the 'Private chat' button will be disabled for all participants.
+    //     // If set to 'allow-moderator-chat' the 'Private chat' button will be available for chats with moderators.
+    //     // If set to 'disable-visitor-chat' the 'Private chat' button will be disabled for visitor-main participant
+    //     // conversations.
+    //     disablePrivateChat: 'all' | 'allow-moderator-chat' | 'disable-visitor-chat',
    // },

-    // Endpoint that enables support for salesforce integration with in-meeting resource linking
-    // This is required for:
-    // listing the most recent records - salesforceUrl/records/recents
-    // searching records - salesforceUrl/records?text=${text}
-    // retrieving record details - salesforceUrl/records/${id}?type=${type}
-    // and linking the meeting - salesforceUrl/sessions/${sessionId}/records/${id}
-    //
-    // salesforceUrl: 'https://api.example.com/',

    // If set to true all muting operations of remote participants will be disabled.
    // disableRemoteMute: true,
@@ -1419,8 +1378,12 @@ var config = {
     The config file should be in JSON.
     None of the fields are mandatory and the response must have the shape:
    {
+        // Whether participant can only send group chat message if `send-groupchat` feature is enabled in jwt.
+        groupChatRequiresPermission: false,
+        // Whether participant can only create polls if `create-polls` feature is enabled in jwt.
+        pollCreationRequiresPermission: false,
        // The domain url to apply (will replace the domain in the sharing conference link/embed section)
-        inviteDomain: 'example-company.org,
+        inviteDomain: 'example-company.org',
        // The hex value for the colour used as background
        backgroundColor: '#fff',
        // The url for the image used as background
@@ -1429,6 +1392,13 @@ var config = {
        logoClickUrl: 'https://example-company.org',
        // The url used for the image used as logo
        logoImageUrl: 'https://example.com/logo-img.png',
+        // Endpoint that enables support for salesforce integration with in-meeting resource linking
+        // This is required for:
+        // listing the most recent records - salesforceUrl/records/recents
+        // searching records - salesforceUrl/records?text=${text}
+        // retrieving record details - salesforceUrl/records/${id}?type=${type}
+        // and linking the meeting - salesforceUrl/sessions/${sessionId}/records/${id}
+        // salesforceUrl: 'https://api.example.com/',
        // Overwrite for pool of background images for avatars
        avatarBackgrounds: ['url(https://example.com/avatar-background-1.png)', '#FFF'],
        // The lobby/prejoin screen background
@@ -1608,6 +1578,11 @@ var config = {
    // You can enable tokenAuthUrlAutoRedirect which will detect that you have logged in successfully before
    // and will automatically redirect to the token service to get the token for the meeting.
    // tokenAuthUrlAutoRedirect: false
+    // An option to respect the context.tenant jwt field compared to the current tenant from the url
+    // tokenRespectTenant: false,
+    // An option to get for user info (name, picture, email) in the token outside the user context.
+    // Can be used with Firebase tokens.
+    // tokenGetUserInfoOutOfContext: 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"
@@ -1620,19 +1595,47 @@ var config = {
    // For external entities (e. g. email), the localStorage key holding the token value for directory authentication
    // peopleSearchTokenLocation: "mytoken",

+
+    // Options related to visitors.
+    // visitors: {
+    //     // Starts audio/video when the participant is promoted from visitor.
+    //     enableMediaOnPromote: {
+    //         audio: true,
+    //         video: true
+    //     },
+    // },
+    // The default type of desktop sharing sources that will be used in the electron app.
+    // desktopSharingSources: ['screen', 'window'],
+
+    // Disables the echo cancelation for local audio tracks.
+    // disableAEC: true,
+
+    // Disables the auto gain control for local audio tracks.
+    // disableAGC: true,
+
+    // Disables the audio processing (echo cancelation, auto gain control and noise suppression) for local audio tracks.
+    // disableAP: true,
+
+    // Disables the anoise suppression for local audio tracks.
+    // disableNS: true,
+
+    // Replaces the display name with the JID of the participants.
+    // displayJids: true,
+
+    // Enables disables talk while muted detection.
+    // enableTalkWhileMuted: true,
+
+    // Sets the peer connection ICE transport policy to "relay".
+    // forceTurnRelay: true,
+
    // List of undocumented settings used in jitsi-meet
    /**
     _immediateReloadThreshold
-     debug
-     debugAudioLevels
     deploymentInfo
     dialOutAuthUrl
     dialOutCodesUrl
     dialOutRegionUrl
     disableRemoteControl
-     displayJids
-     firefox_fake_device
-     googleApiApplicationClientID
     iAmRecorder
     iAmSipGateway
     microsoftApiApplicationClientID
@@ -1651,14 +1654,7 @@ var config = {
     _peerConnStatusRtcMuteTimeout
     avgRtpStatsN
     desktopSharingSources
-     disableAEC
-     disableAGC
-     disableAP
-     disableHPF
     disableLocalStats
-     disableNS
-     enableTalkWhileMuted
-     forceTurnRelay
     hiddenDomain
     hiddenFromRecorderFeatureEnabled
     ignoreStartMuted
@@ -1786,6 +1782,13 @@ var config = {
    //     // The minimum number of participants that must be in the call for
    //     // the top panel layout to be used.
    //     minParticipantCountForTopPanel: 50,
+
+    //     // The width of the filmstrip on joining meeting. Can be resized afterwards.
+    //     initialWidth: 400,
+
+    //     // Whether the draggable resize bar of the filmstrip is always visible. Setting this to true will make
+    //     // the filmstrip always visible in case `disableResizable` is false.
+    //     alwaysShowResizeBar: true,
    // },

    // Tile view related config options.
@@ -1825,9 +1828,10 @@ var config = {
    //      //disableLogCollector: true,
    //      // Individual loggers are customizable.
    //      loggers: {
-    //      // The following are too verbose in their logging with the default level.
-    //      'modules/RTC/TraceablePeerConnection.js': 'info',
-    //      'modules/xmpp/strophe.util.js': 'log',
+    //          // The following are too verbose in their logging with the default level.
+    //          'modules/RTC/TraceablePeerConnection.js': 'info',
+    //          'modules/xmpp/strophe.util.js': 'log',
+    //      },
    // },

    // Application logo url
@@ -1883,13 +1887,20 @@ var config = {

    // Hide login button on auth dialog, you may want to enable this if you are using JWT tokens to authenticate users
    // hideLoginButton: true,
-};

-// Temporary backwards compatibility with old mobile clients.
-config.flags = config.flags || {};
-config.flags.sourceNameSignaling = true;
-config.flags.sendMultipleVideoStreams = true;
-config.flags.receiveMultipleVideoStreams = true;
+    // If true remove the tint foreground on focused user camera in filmstrip
+    // disableCameraTintForeground: false,
+
+    // File sharign service.
+    // fileSharing: {
+    //     // The URL of the file sharing service API. See resources/file-sharing.yaml for more details.
+    //     apiUrl: 'https://example.com',
+    //     // Whether the file sharing service is enabled or not.
+    //     enabled: true,
+    //     // Maximum file size limit (-1 value disables any file size limit check)
+    //     maxFileSize: 50,
+    // },
+};

 // Set the default values for JaaS customers
 if (enableJaaS) {
--- a/css/404.scss
+++ b/css/404.scss
@@ -4,12 +4,12 @@
    text-align: center;

    h2 {
-        font-size: 48px;
+        font-size: 3rem;
        color : #f2f2f2;
    }

    &__message {
-        font-size: 24px;
+        font-size: 1.5rem;
        margin-top: 20px;
    }
 }
--- a/css/_base.scss
+++ b/css/_base.scss
@@ -28,7 +28,7 @@ body {
    margin: 0px;
    width: 100%;
    height: 100%;
-    font-size: 12px;
+    font-size: 0.75rem;
    font-weight: 400;
    overflow: hidden;
    color: #F1F1F1;
@@ -111,7 +111,7 @@ form {
    height: $watermarkHeight;
    background-size: contain;
    background-repeat: no-repeat;
-    z-index: $zindex2;
+    z-index: $watermarkZ;
 }

 .leftwatermark {
@@ -139,10 +139,10 @@ form {
    position: absolute;
    left: 25;
    bottom: 7;
-    font-size: 11pt;
+    font-size: 0.875rem;
    color: rgba(255,255,255,.50);
    text-decoration: none;
-    z-index: 100;
+    z-index: $watermarkZ;
 }

 /**
--- a/css/_chat.scss
+++ b/css/_chat.scss
@@ -11,9 +11,9 @@
 #chatconversation {
    box-sizing: border-box;
    flex: 1;
-    font-size: 10pt;
+    font-size: 0.75rem;
    height: calc(100% - 10px);
-    line-height: 20px;
+    line-height: 1.25rem;
    overflow: auto;
    padding: 16px;
    text-align: left;
@@ -72,7 +72,7 @@
 #nickname {
    text-align: center;
    color: #9d9d9d;
-    font-size: 16px;
+    font-size: 1rem;
    margin: auto 0;
    padding: 0 16px;

@@ -86,7 +86,7 @@
    }

    label {
-        line-height: 24px;
+        line-height: 1.5rem;
    }
 }

@@ -98,7 +98,7 @@
    }

    .chatmessage .usermessage {
-        font-size: 16px;
+        font-size: 1rem;
    }
 }

@@ -124,7 +124,7 @@
 }

 #smileys {
-    font-size: 20pt;
+    font-size: 1.625rem;
    margin: auto;
    cursor: pointer;
 }
@@ -141,34 +141,8 @@
    left: 0;
 }

-.smileys-panel {
-    bottom: 100%;
-    box-sizing: border-box;
-    background-color: rgba(0, 0, 0, .6) !important;
-    height: auto;
-    display: flex;
-    overflow: hidden;
-    position: absolute;
-    width: calc(#{$sidebarWidth} - 32px);
-    margin-bottom: 5px;
-    margin-left: -5px;
-
-    /**
-     * CSS transitions do not apply for auto dimensions. So to produce the css
-     * accordion effect for showing and hiding the smiley-panel, while allowing
-     * for variable panel, height, use a very large max-height and animate off
-     * of that.
-     */
-    transition: max-height 0.3s;
-
-    #smileysContainer {
-        background-color: $chatBackgroundColor;
-        border-top: 1px solid #A4B8D1;
-    }
-}
-
 #smileysContainer .smiley {
-    font-size: 20pt;
+    font-size: 1.625rem;
 }

 .smileyContainer {
@@ -219,8 +193,8 @@
        box-sizing: border-box;
        color: #fff;
        font-weight: 600;
-        font-size: 24px;
-        line-height: 32px;
+        font-size: 1.5rem;
+        line-height: 2rem;

        .jitsi-icon {
            cursor: pointer;
--- a/css/_chrome-extension-banner.scss
+++ b/css/_chrome-extension-banner.scss
@@ -34,8 +34,8 @@
    }

    &__checkbox-label {
-        font-size: 14px;
-        line-height: 18px;
+        font-size: 0.875rem;
+        line-height: 1.125rem;
        display: flex;
        align-items: center;
        letter-spacing: -0.006em;
@@ -51,8 +51,8 @@
    }

    &__text-container {
-      font-size: 14px;
-      line-height: 18px;
+      font-size: 0.875rem;
+      line-height: 1.125rem;
      display: flex;
      align-items: center;
      letter-spacing: -0.006em;
@@ -84,8 +84,8 @@

    &__button-text {
      font-weight: 600;
-      font-size: 14px;
-      line-height: 40px;
+      font-size: 0.875rem;
+      line-height: 2.5rem;
      text-align: center;
      letter-spacing: -0.006em;
      color: #FFFFFF;
--- a/css/_inlay.scss
+++ b/css/_inlay.scss
@@ -10,7 +10,7 @@
        margin: 17px 0;
        padding-bottom: 17px;
        color: #ffffff;
-        font-size: 21px;
+        font-size: 1.25rem;
        letter-spacing: 0.3px;
        border-bottom: 1px solid lighten(#FFFFFF, 10%);
    }
@@ -19,12 +19,12 @@
        color: #ffffff;
        display: block;
        margin-top: 22px;
-        font-size: 16px;
+        font-size: 1rem;
    }

    &__icon {
        margin: 0 10px;
-        font-size: 50px;
+        font-size: 3.125rem;
    }

 }
--- a/css/_meetings_list.scss
+++ b/css/_meetings_list.scss
@@ -1,14 +1,14 @@
 .meetings-list {
-    font-size: 14px;
+    font-size: 0.875rem;
    color: #253858;
-    line-height: 20px;
+    line-height: 1.25rem;
    text-align: left;
    text-overflow: ellipsis;
    display: flex;
    flex-direction: column;
    position: relative;
-    overflow: auto;
-    width: 100%;
+    overflow-y: auto;
+    flex-grow: 1;

    .meetings-list-empty {
        text-align: center;
@@ -20,8 +20,8 @@

        .description {
            color: #2f3237;
-            font-size: 14px;
-            line-height: 18px;
+            font-size: 0.875rem;
+            line-height: 1.125rem;
            margin-bottom: 16px;
            max-width: 436px;
        }
@@ -37,8 +37,8 @@
        color: #0163FF;
        cursor: pointer;
        display: flex;
-        font-size: 14px;
-        line-height: 18px;
+        font-size: 0.875rem;
+        line-height: 1.125rem;
        margin: 24px 0 32px 0;
    }

@@ -101,17 +101,17 @@
        }

        .title {
-            font-size: 12px;
+            font-size: 0.75rem;
            font-weight: 600;
-            line-height: 16px;
+            line-height: 1rem;
            margin-bottom: 4px;
        }

        .subtitle {
            color: #5E6D7A;
            font-weight: normal;
-            font-size: 12px;
-            line-height: 16px;
+            font-size: 0.75rem;
+            line-height: 1rem;
        }


@@ -174,4 +174,12 @@
            }
        }
    }
+
+    @media (max-width: 1024px) {  /* Targets iPads and smaller devices */
+        .item {
+            .delete-meeting {
+                display: block !important;
+            }
+        }
+    }
 }
--- a/css/_navigate_section_list.scss
+++ b/css/_navigate_section_list.scss
@@ -1,7 +1,7 @@
 %navigate-section-list-text {
    width: 100%;
-    font-size: 14px;
-    line-height: 20px;
+    font-size: 0.875rem;
+    line-height: 1.25rem;
    color: $welcomePageTitleColor;
    text-align: left;
    font-family: 'open_sanslight', Helvetica, sans-serif;
@@ -52,7 +52,7 @@
 .navigate-section-tile-body {
    @extend %navigate-section-list-tile-text;
    font-weight: normal;
-    line-height: 24px;
+    line-height: 1.5rem;
 }
 .navigate-section-list-tile-info {
    flex: 1;
@@ -61,7 +61,7 @@
 .navigate-section-tile-title {
    @extend %navigate-section-list-tile-text;
    font-weight: bold;
-    line-height: 24px;
+    line-height: 1.5rem;
 }
 .navigate-section-section-header {
    @extend %navigate-section-list-text;
--- a/css/_participants-pane.scss
+++ b/css/_participants-pane.scss
@@ -4,9 +4,3 @@
        border-radius: 3px;
    }
 }
-
-.mobile-browser.shift-right {
-    .participants_pane {
-        z-index: -1;
-    }
-}
--- a/css/_policy.scss
+++ b/css/_policy.scss
@@ -8,8 +8,8 @@

    &__text {
        text-align: center;
-        font-size: 14px;
-        line-height: 21px;
+        font-size: 0.875rem;
+        line-height: 1.25rem;
        font-weight: 300;
    }
 }
--- a/css/_reactions-menu.scss
+++ b/css/_reactions-menu.scss
@@ -55,7 +55,7 @@
 		span.emoji {
 			width: 40px;
 			height: 40px;
-			font-size: 22px;
+			font-size: 1.375rem;
 			display: flex;
 			align-items: center;
 			justify-content: center;
@@ -63,7 +63,7 @@

 			@for $i from 1 through 12 {
 				&.increase-#{$i}{
-					font-size: calc(20px + #{$i}px);
+					font-size: calc(1.25rem + #{$i}px);
 				}
 			}
 		}
@@ -96,8 +96,8 @@
 			span.text {
 				font-style: normal;
 				font-weight: 600;
-				font-size: 14px;
-				line-height: 24px;
+				font-size: 0.875rem;
+				line-height: 1.5rem;
 				margin-left: 8px;
 			}
 		}
@@ -132,8 +132,8 @@ $reactionCount: 20;

 .reaction-emoji {
 	position: absolute;
-	font-size: 24px;
-	line-height: 32px;
+	font-size: 1.5rem;
+	line-height: 2rem;
 	width: 32px;
 	height: 32px;
 	top: 0;
--- a/css/_recording.scss
+++ b/css/_recording.scss
@@ -12,7 +12,7 @@
        .recording-title {
            display: inline-flex;
            align-items: center;
-            font-size: 14px;
+            font-size: 0.875rem;
            margin-left: 16px;
            max-width: 70%;

@@ -35,8 +35,8 @@
    .local-recording-warning {
        margin-top: 8px;
        display: block;
-        font-size: 14px;
-        line-height: 20px;
+        font-size: 0.875rem;
+        line-height: 1.25rem;
        padding: 8px 16px;

        &.text {
@@ -126,7 +126,7 @@

    .recording-info-title {
        display: inline-flex;
-        font-size: 14px;
+        font-size: 0.875rem;
        width: 290px
    }

@@ -150,7 +150,7 @@
    /**
     * Set font-size to be consistent with Atlaskit FieldText.
     */
-    font-size: 14px;
+    font-size: 0.875rem;

    .broadcast-dropdown {
        text-align: left;
@@ -194,6 +194,6 @@

    .warning-text {
        color:#FFD740;
-        font-size: 12px;
+        font-size: 0.75rem;
    }
 }
--- a/css/_redirect_page.scss
+++ b/css/_redirect_page.scss
@@ -2,7 +2,7 @@
    width: 30%;
    margin: 20% auto;
    text-align: center;
-    font-size: 24px;
+    font-size: 1.5rem;

    .thanks-msg {
        border-bottom: 1px solid #FFFFFF;
@@ -10,16 +10,16 @@
        padding-right: 30px;
        p {
            margin: 30px auto;
-            font-size: 24px;
-            line-height: 24px;
+            font-size: 1.5rem;
+            line-height: 1.5rem;
        }
    }
    .hint-msg {
        p {
            margin: 26px auto;
            font-weight: 600;
-            font-size: 16px;
-            line-height: 18px;
+            font-size: 1rem;
+            line-height: 1.125rem;
            .hint-msg__holder{
                font-weight: 200;
            }
@@ -33,7 +33,7 @@
    }
    .forbidden-msg {
        p {
-            font-size: 16px;
+            font-size: 1rem;
            margin-top: 15px;
        }
    }
--- a/css/_reset.scss
+++ b/css/_reset.scss
@@ -70,7 +70,7 @@ input[type="reset"] {
 body {
  color: #333;
  font-family: Arial, sans-serif;
-  font-size: 14px;
+  font-size: 0.875rem;
  line-height: 1.42857142857143;
 }
 /* International Font Stacks*/
@@ -113,7 +113,7 @@ pre:first-child {
 /* Headings: desired line height in px / font size = unitless line height */
 h1 {
  color: #333;
-  font-size: 32px;
+  font-size: 2rem;
  font-weight: normal;
  line-height: 1.25;
  text-transform: none;
@@ -121,7 +121,7 @@ h1 {
 }
 h2 {
  color: #333;
-  font-size: 24px;
+  font-size: 1.5rem;
  font-weight: normal;
  line-height: 1.25;
  text-transform: none;
@@ -129,14 +129,14 @@ h2 {
 }
 h3 {
  color: #333;
-  font-size: 20px;
+  font-size: 1.25rem;
  font-weight: normal;
  line-height: 1.5;
  text-transform: none;
  margin: 30px 0 0 0;
 }
 h4 {
-  font-size: 16px;
+  font-size: 1rem;
  font-weight: bold;
  line-height: 1.25;
  text-transform: none;
@@ -144,7 +144,7 @@ h4 {
 }
 h5 {
  color: #333;
-  font-size: 14px;
+  font-size: 0.875rem;
  font-weight: bold;
  line-height: 1.42857143;
  text-transform: none;
@@ -152,7 +152,7 @@ h5 {
 }
 h6 {
  color: #707070;
-  font-size: 12px;
+  font-size: 0.75rem;
  font-weight: bold;
  line-height: 1.66666667;
  text-transform: uppercase;
@@ -179,7 +179,7 @@ h5 + h6 {
 /* Other typographical elements */
 small {
  color: #707070;
-  font-size: 12px;
+  font-size: 0.75rem;
  line-height: 1.33333333333333;
 }
 code,
--- a/css/_responsive.scss
+++ b/css/_responsive.scss
@@ -4,7 +4,7 @@

        #enter_room {
            .welcome-page-button {
-                font-size: 16px;
+                font-size: 1rem;
                left: 0;
                text-align: center;
                width: 100%;
@@ -53,25 +53,10 @@
        }

        .welcome-footer-row-block {
-            display: block;
-        }
-    }
-}
-
-.desktop-browser {
-    &.shift-right {
-
-        @media only screen and (max-width: $verySmallScreen + $sidebarWidth) {
-
-            #videoResolutionLabel {
-                display: none;
-            }
-            .vertical-filmstrip .filmstrip {
-                display: none;
-            }
-            .chrome-extension-banner {
-                display: none;
-            }
+            display: flex;
+            flex-direction: column;
+            gap:12px;
+            align-items: center;
        }
    }
 }
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -9,9 +9,9 @@
    // Do not inherit the font-family from the toolbar button, because it's an
    // icon style.
    font-family: $baseFontFamily;
-    font-size: 9px;
+    font-size: 0.5rem;
    font-weight: 700;
-    line-height: 13px;
+    line-height: 0.75rem;
    min-width: 13px;
    overflow: hidden;
    text-align: center;
@@ -69,8 +69,8 @@

    .badge-round {
        bottom: -5px;
-        font-size: 12px;
-        line-height: 20px;
+        font-size: 0.75rem;
+        line-height: 1.25rem;
        min-width: 20px;
        pointer-events: none;
        position: absolute;
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -22,7 +22,6 @@ $newToolbarSizeWithPadding: calc(#{$newToolbarSize} + 24px);
 * Chat
 */
 $chatBackgroundColor: #131519;
-$sidebarWidth: 315px;

 /**
 * Misc.
@@ -38,6 +37,8 @@ $zindex1: 1;
 $zindex2: 2;
 $zindex3: 3;
 $toolbarZ: 250;
+$watermarkZ: 253;
+
 // Place filmstrip videos over toolbar in order
 // to make connection info visible.
 $filmstripVideosZ: $toolbarZ + 1;
@@ -48,11 +49,11 @@ $filmstripVideosZ: $toolbarZ + 1;
 $primaryUnsupportedBrowserButtonBgColor: #0052CC;
 $unsupportedBrowserButtonBgColor: rgba(9, 30, 66, 0.04);
 $unsupportedBrowserTextColor: #4a4a4a;
-$unsupportedBrowserTextSmallFontSize: 17px;
+$unsupportedBrowserTextSmallFontSize: 1rem;
 $unsupportedBrowserTitleColor: #fff;
-$unsupportedBrowserTitleFontSize: 24px;
+$unsupportedBrowserTitleFontSize: 1.5rem;
 $unsupportedDesktopBrowserTextColor: rgba(255, 255, 255, 0.7);
-$unsupportedDesktopBrowserTextFontSize: 21px;
+$unsupportedDesktopBrowserTextFontSize: 1.25rem;

 /**
 * The size of the default watermark.
@@ -75,18 +76,21 @@ $welcomePageHeaderBackground: linear-gradient(0deg, rgba(0, 0, 0, 0.2), rgba(0,
 $welcomePageHeaderBackgroundPosition: center;
 $welcomePageHeaderBackgroundRepeat: none;
 $welcomePageHeaderBackgroundSize: cover;
-$welcomePageHeaderPaddingBottom: 15px;
+$welcomePageHeaderPadding: 1rem;
 $welcomePageHeaderTitleMaxWidth: initial;
 $welcomePageHeaderTextAlign: center;
+$welcomePageButtonBg: #0074E0;
+$welcomePageButtonHoverBg: #4687ED;
+$welcomePageButtonFocusOutline: #00225A;

 $welcomePageHeaderContainerMarginTop: 104px;
 $welcomePageHeaderContainerDisplay: flex;
 $welcomePageHeaderContainerMargin: $welcomePageHeaderContainerMarginTop auto 0;

 $welcomePageHeaderTextTitleMarginBottom: 0;
-$welcomePageHeaderTextTitleFontSize: 42px;
+$welcomePageHeaderTextTitleFontSize: 2.625rem;
 $welcomePageHeaderTextTitleFontWeight: normal;
-$welcomePageHeaderTextTitleLineHeight: 50px;
+$welcomePageHeaderTextTitleLineHeight: 3.125rem;
 $welcomePageHeaderTextTitleOpacity: 1;

 $welcomePageEnterRoomDisplay: flex;
--- a/css/_videolayout_default.scss
+++ b/css/_videolayout_default.scss
@@ -160,7 +160,7 @@
 }

 #alwaysOnTop .displayname {
-    font-size: 15px;
+    font-size: 0.875rem;
    position: inherit;
    width: 100%;
    left: 0px;
@@ -294,7 +294,7 @@
    width: auto;
    z-index: $zindex2;
    font-weight: 600;
-    font-size: 14px;
+    font-size: 0.875rem;
    text-align: center;
    color: #FFF;
    left: 50%;
@@ -340,7 +340,7 @@

 .presence-label {
    color: #fff;
-    font-size: 12px;
+    font-size: 0.75rem;
    font-weight: 100;
    left: 0;
    margin: 0 auto;
--- a/css/_welcome_page.scss
+++ b/css/_welcome_page.scss
@@ -18,7 +18,7 @@ body.welcome-page {
        background-position: $welcomePageHeaderBackgroundPosition;
        background-repeat: $welcomePageHeaderBackgroundRepeat;
        background-size: $welcomePageHeaderBackgroundSize;
-        padding-bottom: $welcomePageHeaderPaddingBottom;
+        padding: $welcomePageHeaderPadding;
        background-color: #131519;
        overflow: hidden;
        position: relative;
@@ -53,9 +53,9 @@ body.welcome-page {

        .header-text-subtitle {
            color: #fff;
-            font-size: 20px;
+            font-size: 1.25rem;
            font-weight: 600;
-            line-height: 26px;
+            line-height: 1.625rem;
            margin: 16px 0 32px 0;
            text-align: $welcomePageHeaderTextAlign;

@@ -64,7 +64,7 @@ body.welcome-page {
        .not-allow-title-character-div {
            color: #f03e3e;
            background-color: #fff;
-            font-size: 12px;
+            font-size: 0.75rem;
            font-weight: 600;
            margin: 10px 0px 5px 0px;
            text-align: $welcomePageHeaderTextAlign;
@@ -147,7 +147,7 @@ body.welcome-page {
                    display: inline-block;
                    height: 50px;
                    width: 100%;
-                    font-size: 14px;
+                    font-size: 0.875rem;
                    padding-left: 10px;

                    &.focus-visible {
@@ -172,7 +172,7 @@ body.welcome-page {
    }

    .tab-container {
-        font-size: 16px;
+        font-size: 1rem;
        position: relative;
        text-align: left;
        display: $welcomePageTabContainerDisplay;
@@ -191,8 +191,8 @@ body.welcome-page {
            background-color: #c7ddff;
            border-radius: 6px;
            color: #0163FF;
-            font-size: 14px;
-            line-height: 18px;
+            font-size: 0.875rem;
+            line-height: 1.125rem;
            margin: 4px;
            display: $welcomePageTabButtonsDisplay;

@@ -218,15 +218,19 @@ body.welcome-page {

    .welcome-page-button {
        border: 0;
-        font-size: 14px;
-        background: #0074E0;
+        font-size: 0.875rem;
+        background: $welcomePageButtonBg;
        border-radius: 3px;
        color: #FFFFFF;
        cursor: pointer;
        padding: 16px 20px;
-
+        transition: all 0.2s;
        &:focus-within {
-            outline: auto 2px #022e61;
+            outline: auto 2px $welcomePageButtonFocusOutline;
+        }
+
+        &:hover {
+            background-color: $welcomePageButtonHoverBg;
        }
    }

@@ -242,7 +246,7 @@ body.welcome-page {

        * {
            cursor: pointer;
-            font-size: 32px;
+            font-size: 2rem;
        }

        .toolbox-icon {
@@ -264,8 +268,7 @@ body.welcome-page {

    &.without-content {
        .welcome-card {
-            min-width: 500px;
-            max-width: 580px;
+            max-width: 100dvw;
        }
    }

@@ -346,6 +349,6 @@ body.welcome-page {

    .welcome-footer-row-1-text {
        max-width: 200px;
-        margin-right: 16px;
+        text-align: center;
    }
 }
--- a/css/filmstrip/_tile_view.scss
+++ b/css/filmstrip/_tile_view.scss
@@ -91,15 +91,3 @@
        }
    }
 }
-
-.shift-right .remote-videos > div {
-    /**
-     * Max-width corresponding to the ASPECT_RATIO_BREAKPOINT from features/filmstrip/constants,
-     * from which we subtract the chat size.
-     */
-    @media only screen and (max-width: calc(500px + #{$sidebarWidth})) {
-        video {
-            object-fit: cover;
-        }
-    }
-}
--- a/css/modals/invite/_add-people.scss
+++ b/css/modals/invite/_add-people.scss
@@ -20,7 +20,7 @@
            width: 28px;

            i {
-                line-height: 28px;
+                line-height: 1.75rem;
                margin: auto;
            }
        }
@@ -35,7 +35,7 @@
            padding-left: 10px;

            i {
-                line-height: 20px;
+                line-height: 1.25rem;
                margin: auto;
            }
        }
--- a/css/modals/invite/_info.scss
+++ b/css/modals/invite/_info.scss
@@ -1,7 +1,7 @@
 .info-dialog {
    cursor: default;
    display: flex;
-    font-size: 14px;
+    font-size: 0.875rem;

    .info-dialog-column {
        margin-right: 10px;
@@ -53,8 +53,8 @@
    max-width: 334px;
    width: 100%;
    margin-top: 20px;
-    font-size: 12px;
-    line-height: 24px;
+    font-size: 0.75rem;
+    line-height: 1.5rem;
    border-collapse: collapse;

    * {
@@ -107,7 +107,7 @@
    box-sizing: border-box;
    display: flex;
    flex-direction: column;
-    font-size: 12px;
+    font-size: 0.75rem;
    max-height: 100%;
    overflow: auto;
    padding: 15pt;
--- a/css/modals/invite/_invite_more.scss
+++ b/css/modals/invite/_invite_more.scss
@@ -1,8 +1,8 @@
 .invite-more {
    &-dialog {
        color: #fff;
-        font-size: 15px;
-        line-height: 24px;
+        font-size: 0.875rem;
+        line-height: 1.5rem;

        &.separator {
            margin: 24px 0 24px -20px;
--- a/css/modals/screen-share/_share-screen-warning.scss
+++ b/css/modals/screen-share/_share-screen-warning.scss
@@ -1,5 +1,5 @@
 .share-screen-warn-dialog {
-    font-size: 14px;
+    font-size: 0.875rem;

    .separator-line {
        margin: 24px 0 24px -20px;
--- a/css/modals/security/_security.scss
+++ b/css/modals/security/_security.scss
@@ -1,15 +1,15 @@
 .security {
    &-dialog {
        color: #fff;
-        font-size: 15px;
-        line-height: 24px;
+        font-size: 0.875rem;
+        line-height: 1.5rem;

        &.password-section {
            display: flex;
            flex-direction: column;

            .description {
-                font-size: 13px;
+                font-size: 0.75rem;
            }

            .password {
@@ -24,7 +24,7 @@
                    button {
                        cursor: pointer;
                        text-decoration: none;
-                        font-size: 14px;
+                        font-size: 0.875rem;
                        color: #6FB1EA;
                    }

--- a/css/premeeting/_lobby.scss
+++ b/css/premeeting/_lobby.scss
@@ -1,7 +1,7 @@
 .lobby-screen {
-    font-size: 16px;
+    font-size: 1rem;
    font-weight: 400;
-    line-height: 26px;
+    line-height: 1.625rem;

    &-content {
        align-items: center;
@@ -43,7 +43,7 @@
    flex-direction: column;

    .description {
-        font-size: 13px;
+        font-size: 0.75rem;
    }

    .control-row {
@@ -53,7 +53,7 @@
        margin-top: 15px;

        label {
-            font-size: 14px;
+            font-size: 0.875rem;
            font-weight: bold;
        }
    }
@@ -191,9 +191,9 @@
                .title {
                    flex: 1;
                    color: #fff;
-                    font-size: 20px;
+                    font-size: 1.25rem;
                    font-weight: 600;
-                    line-height: 28px;
+                    line-height: 1.75rem;
                    letter-spacing: -1.2%;
                }
            }
@@ -214,8 +214,8 @@
    border-radius: 6px;
    box-sizing: border-box;
    color: white;
-    font-size: 12px;
-    line-height: 16px;
+    font-size: 0.75rem;
+    line-height: 1rem;
    margin-bottom: 16px;
    margin-top: -8px;
    padding: 4px;
--- a/css/premeeting/_premeeting-screens.scss
+++ b/css/premeeting/_premeeting-screens.scss
@@ -5,9 +5,9 @@
        color: #fff;
        cursor: pointer;
        display: inline-block;
-        font-size: 14px;
+        font-size: 0.875rem;
        font-weight: 600;
-        line-height: 24px;
+        line-height: 1.5rem;
        margin-bottom: 16px;
        padding: 7px 16px;
        position: relative;
@@ -26,7 +26,7 @@

        &.text {
            width: auto;
-            font-size: 13px;
+            font-size: 0.75rem;
            margin: 0;
            padding: 0;
        }
@@ -98,7 +98,7 @@
        }

        .action-btn {
-            font-size: 16px;
+            font-size: 1rem;
            margin-bottom: 8px;
            padding: 11px 16px;
        }
--- a/css/reload_overlay/_reload_overlay.scss
+++ b/css/reload_overlay/_reload_overlay.scss
@@ -1,13 +1,13 @@
 .reload_overlay_title {
    display: block;
-    font-size: 16px;
-    line-height: 20px;
+    font-size: 1rem;
+    line-height: 1.25rem;
 }

 .reload_overlay_text {
    display: block;
-    font-size: 12px;
-    line-height: 30px;
+    font-size: 0.75rem;
+    line-height: 1.875rem;
 }

 #reloadProgressBar {
--- a/css/ringing/_ringing.scss
+++ b/css/ringing/_ringing.scss
@@ -34,12 +34,12 @@

    &__status{
        margin-top: 15px;
-        font-size: 14px;
-        line-height: 20px;
+        font-size: 0.875rem;
+        line-height: 1.25rem;
    }

    &__name {
-        font-size: 24px;
-        line-height: 32px;
+        font-size: 1.5rem;
+        line-height: 2rem;
    }
 }
--- a/css/third-party-branding/google.scss
+++ b/css/third-party-branding/google.scss
@@ -8,7 +8,7 @@
    cursor: pointer;
    display: inline-flex;
    font-family: Roboto, arial, sans-serif;
-    font-size: 14px;
+    font-size: 0.875rem;
    padding: 1px;

    .google-cta {
@@ -17,7 +17,7 @@
        /**
         * Hack the line height for vertical centering of text.
         */
-        line-height: 32px;
+        line-height: 2rem;
        margin: 0 15px;
    }

--- a/css/third-party-branding/microsoft.scss
+++ b/css/third-party-branding/microsoft.scss
@@ -17,8 +17,8 @@
    .microsoft-cta {
        display: inline-block;
        color: #5E5E5E;
-        font-size: 15px;
-        line-height: 41px;
+        font-size: 0.875rem;
+        line-height: 2.5rem;
    }

    .microsoft-logo {
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Description: Configuration for web serving of Jitsi Meet

 Package: jitsi-meet-prosody
 Architecture: all
-Depends: openssl, prosody (>= 0.11.7) | prosody-trunk | prosody-0.12 | prosody-0.11, lua-sec, lua-basexx, lua-luaossl, lua-cjson, lua-inspect
+Depends: openssl, prosody (>= 0.12.0) | prosody-trunk | prosody-0.12 | prosody-13.0, lua-sec, lua-basexx, lua-luaossl, lua-cjson, lua-inspect
 Replaces: jitsi-meet-tokens
 Description: Prosody configuration for Jitsi Meet
 Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
@@ -48,7 +48,7 @@ Description: Prosody configuration for Jitsi Meet

 Package: jitsi-meet-tokens
 Architecture: all
-Depends: ${misc:Depends}, prosody-trunk | prosody-0.11 | prosody-0.12 | prosody (>= 0.11.7), jitsi-meet-prosody
+Depends: ${misc:Depends}, prosody-trunk | prosody-0.12 | prosody-13.0 | prosody (>= 0.12.0), jitsi-meet-prosody
 Description: Prosody token authentication plugin for Jitsi Meet

 Package: jitsi-meet-turnserver
--- a/debian/jitsi-meet-prosody.postinst
+++ b/debian/jitsi-meet-prosody.postinst
@@ -131,16 +131,6 @@ case "$1" in
            fi
        fi

-        if [ "$PROSODY_CREATE_JICOFO_USER" = "true" ]; then
-            # create 'focus@auth.domain' prosody user
-            prosodyctl register $JICOFO_AUTH_USER $JICOFO_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD
-            # trigger a restart
-            PROSODY_CONFIG_PRESENT="false"
-        fi
-
-        # creates the user if it does not exist
-        echo -e "$JVB_SECRET\n$JVB_SECRET" | prosodyctl adduser jvb@$JICOFO_AUTH_DOMAIN > /dev/null || true
-
        # Check whether prosody config has the internal muc, if not add it,
        # as we are migrating configs
        if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "internal.$JICOFO_AUTH_DOMAIN" $PROSODY_HOST_CONFIG; then
@@ -184,6 +174,12 @@ case "$1" in
            PROSODY_CONFIG_PRESENT="false"
        fi

+        # Since prosody 13 admins are not automatically room owners and we expect that for jicofo
+        if ! grep -q -- 'component_admins_as_room_owners = ' $PROSODY_HOST_CONFIG ;then
+            sed -i "1s/^/component_admins_as_room_owners = true\n/" $PROSODY_HOST_CONFIG
+            PROSODY_CONFIG_PRESENT="false"
+        fi
+
        JAAS_HOST_CONFIG="/etc/prosody/conf.avail/jaas.cfg.lua"
        if [ "${JAAS_INPUT}" = "true" ] && [ ! -f $JAAS_HOST_CONFIG ]; then
            sed -i "s/enabled = false -- Jitsi meet components/enabled = true -- Jitsi meet components/g" $PROSODY_HOST_CONFIG
@@ -207,9 +203,6 @@ case "$1" in
            fi
        fi

-        # Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
-        prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN
-
        if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
            # prosodyctl takes care for the permissions
            # echo for using all default values
@@ -252,6 +245,29 @@ case "$1" in
        if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
            invoke-rc.d prosody restart || true

+            # give it some time to warm up
+            sleep 10
+
+            if [ "$PROSODY_CREATE_JICOFO_USER" = "true" ]; then
+                # create 'focus@auth.domain' prosody user
+                echo -e "$JICOFO_AUTH_PASSWORD\n$JICOFO_AUTH_PASSWORD" | prosodyctl adduser $JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN > /dev/null || true
+
+                # trigger a restart
+                PROSODY_CONFIG_PRESENT="false"
+            fi
+
+            # creates the user if it does not exist
+            echo -e "$JVB_SECRET\n$JVB_SECRET" | prosodyctl adduser jvb@$JICOFO_AUTH_DOMAIN > /dev/null || true
+
+            # Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
+            prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN
+
+            # To make sure the roster command is loaded
+            # Once we have https://issues.prosody.im/1908 we can start using prosodyctl shell roster subscribe
+            # and drop the wait and the prosody restart
+            sleep 1
+            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
            if [ -d /run/systemd/system ] && [ "$CERT_ADDED_TO_TRUST" = "true" ]; then
                systemctl restart jitsi-videobridge2.service >/dev/null || true
--- a/debian/jitsi-meet-web-config.postinst
+++ b/debian/jitsi-meet-web-config.postinst
@@ -175,22 +175,6 @@ case "$1" in
            fi
        fi

-        # Fixes multi-stream flags to workaround problem with mobile joining a multi-stream call with multi-stream disabled
-        FIX_MSG="// Temporary backwards compatibility with old mobile clients."
-        if ! grep -q "^${FIX_MSG}" $JITSI_MEET_CONFIG; then
-            echo  $FIX_MSG >> $JITSI_MEET_CONFIG
-            echo "config.flags = config.flags || {};" >> $JITSI_MEET_CONFIG
-        fi
-        if ! grep -q "^config.flags.sourceNameSignaling*" $JITSI_MEET_CONFIG; then
-            echo "config.flags.sourceNameSignaling = true;" >> $JITSI_MEET_CONFIG
-        fi
-        if ! grep -q "^config.flags.sendMultipleVideoStreams*" $JITSI_MEET_CONFIG; then
-            echo "config.flags.sendMultipleVideoStreams = true;" >> $JITSI_MEET_CONFIG
-        fi
-        if ! grep -q "^config.flags.receiveMultipleVideoStreams*" $JITSI_MEET_CONFIG; then
-            echo "config.flags.receiveMultipleVideoStreams = true;" >> $JITSI_MEET_CONFIG
-        fi
-
        if [[ "$FORCE_OPENRESTY" = "true" ]]; then
            NGX_COMMON_CONF_PATH="/usr/local/openresty/nginx/conf/$JVB_HOSTNAME.conf"
            NGX_SVC_NAME=openresty
--- a/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
+++ b/doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
@@ -1,3 +1,6 @@
+-- We need this for prosody 13.0
+component_admins_as_room_owners = true
+
 plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }

 -- domain mapper options, must at least have domain base set to use the mapper
@@ -12,6 +15,7 @@ external_services = {

 cross_domain_bosh = false;
 consider_bosh_secure = true;
+consider_websocket_secure = true;
 -- https_ports = { }; -- Remove this line to prevent listening on port 5284

 -- by default prosody 0.12 sends cors headers, if you want to disable it uncomment the following (the config is available on 0.12.1)
@@ -35,6 +39,11 @@ unlimited_jids = {
    "jvb@auth.jitmeet.example.com"
 }

+-- https://prosody.im/doc/modules/mod_smacks
+smacks_max_unacked_stanzas = 5;
+smacks_hibernation_time = 60;
+smacks_max_old_sessions = 1;
+
 VirtualHost "jitmeet.example.com"
    authentication = "jitsi-anonymous" -- do not delete me
    -- Properties below are modified by jitsi-meet-tokens package config
@@ -49,26 +58,21 @@ VirtualHost "jitmeet.example.com"
        key = "/etc/prosody/certs/jitmeet.example.com.key";
        certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
    }
-    av_moderation_component = "avmoderation.jitmeet.example.com"
-    speakerstats_component = "speakerstats.jitmeet.example.com"
-    end_conference_component = "endconference.jitmeet.example.com"
    -- we need bosh
    modules_enabled = {
        "bosh";
+        "websocket";
+        "smacks";
        "ping"; -- Enable mod_ping
-        "speakerstats";
        "external_services";
+        "features_identity";
        "conference_duration";
-        "end_conference";
        "muc_lobby_rooms";
        "muc_breakout_rooms";
-        "av_moderation";
-        "room_metadata";
    }
    c2s_require_encryption = false
    lobby_muc = "lobby.jitmeet.example.com"
    breakout_rooms_muc = "breakout.jitmeet.example.com"
-    room_metadata_component = "metadata.jitmeet.example.com"
    main_muc = "conference.jitmeet.example.com"
    -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms

@@ -124,6 +128,13 @@ VirtualHost "auth.jitmeet.example.com"
    authentication = "internal_hashed"
    smacks_hibernation_time = 15;

+VirtualHost "recorder.jitmeet.example.com"
+    modules_enabled = {
+      "smacks";
+    }
+    authentication = "internal_hashed"
+    smacks_max_old_sessions = 2000;
+
 -- Proxy to jicofo's user JID, so that it doesn't have to register as a component.
 Component "focus.jitmeet.example.com" "client_proxy"
    target_address = "focusUser@auth.jitmeet.example.com"
@@ -137,6 +148,9 @@ Component "endconference.jitmeet.example.com" "end_conference"
 Component "avmoderation.jitmeet.example.com" "av_moderation_component"
    muc_component = "conference.jitmeet.example.com"

+Component "filesharing.jitmeet.example.com" "filesharing_component"
+    muc_component = "conference.jitmeet.example.com"
+
 Component "lobby.jitmeet.example.com" "muc"
    storage = "memory"
    restrict_room_creation = true
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@@ -150,6 +150,12 @@ server {
    #    alias /usr/share/jitsi-meet/load-test/libs/$1;
    #}

+    location = /_unlock {
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains';
+        add_header "Cache-Control" "no-cache, no-store";
+    }
+
    location ~ ^/conference-request/v1(\/.*)?$ {
        proxy_pass http://127.0.0.1:8888/conference-request/v1$1;
        add_header "Cache-Control" "no-cache, no-store";
--- a/giphy-analytics-stub.js
+++ b/giphy-analytics-stub.js
@@ -0,0 +1,16 @@
+// Stub replacement for @giphy/js-analytics to prevent beforeunload handlers
+// This completely disables all Giphy analytics functionality
+
+export const pingback = () => {
+    // Completely disabled - do nothing
+
+};
+
+export const mergeAttributes = (attributes, newAttributes) => {
+    // Return merged attributes without any analytics calls
+    return { ...attributes,
+        ...newAttributes };
+};
+
+// Ensure no beforeunload handlers are ever registered
+export default pingback;
--- a/globals.d.ts
+++ b/globals.d.ts
@@ -18,7 +18,6 @@ declare global {
        JITSI_MEET_LITE_SDK?: boolean;
        interfaceConfig?: any;
        JitsiMeetJS?: any;
-        JitsiMeetElectron?: any;
        PressureObserver?: any;
        PressureRecord?: any;
        ReactNativeWebView?: any;
--- a/images/google-play-badge.png
+++ b/images/google-play-badge.png
--- a/index.html
+++ b/index.html
@@ -36,7 +36,7 @@
                Component: JitsiMeetJS.app.entryPoints.APP
            })

-            const inIframe = () => {
+            const isEmbedded = () => {
                try {
                    return window.self !== window.top;
                } catch (e) {
@@ -45,7 +45,7 @@
            };

            const isElectron = navigator.userAgent.includes('Electron');
-            const shouldRegisterWorker = !isElectron && !inIframe() && 'serviceWorker' in navigator;
+            const shouldRegisterWorker = !isElectron && !isEmbedded() && 'serviceWorker' in navigator;

            if (shouldRegisterWorker) {
                navigator.serviceWorker
--- a/interface_config.js
+++ b/interface_config.js
@@ -41,14 +41,6 @@ var interfaceConfig = {
     */
    DISABLE_PRESENCE_STATUS: false,

-    /**
-     * Whether the ringing sound in the call/ring overlay is disabled. If
-     * {@code undefined}, defaults to {@code false}.
-     *
-     * @type {boolean}
-     */
-    DISABLE_RINGING: false,
-
    /**
     * Whether the speech to text transcription subtitles panel is disabled.
     * If {@code undefined}, defaults to {@code false}.
@@ -70,9 +62,6 @@ var interfaceConfig = {

    ENABLE_DIAL_OUT: true,

-    // DEPRECATED. Animation no longer supported.
-    // ENABLE_FEEDBACK_ANIMATION: false,
-
    FILM_STRIP_MAX_HEIGHT: 120,

    GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
@@ -203,17 +192,6 @@ var interfaceConfig = {

    // NATIVE_APP_NAME: 'Jitsi Meet',

-    /**
-     * Specify Firebase dynamic link properties for the mobile apps.
-     */
-    // MOBILE_DYNAMIC_LINK: {
-    //    APN: 'org.jitsi.meet',
-    //    APP_CODE: 'w2atb',
-    //    CUSTOM_DOMAIN: undefined,
-    //    IBI: 'com.atlassian.JitsiMeet.ios',
-    //    ISI: '1165103905'
-    // },
-
    /**
     * Hide the logo on the deep linking pages.
     */
@@ -227,7 +205,7 @@ var interfaceConfig = {
    /**
     * Specify custom URL for downloading f droid app.
     */
-    // MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/en/packages/org.jitsi.meet/',
+    // MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/packages/org.jitsi.meet/',

    // Connection indicators (
    // CONNECTION_INDICATOR_AUTO_HIDE_ENABLED,
--- a/ios/.xcode.env
+++ b/ios/.xcode.env
@@ -1,2 +1,6 @@
+THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+
+. ${THIS_DIR}/../node_modules/react-native/scripts/find-node-for-xcode.sh
+
 export NODE_BINARY=$(command -v node)
 export ENTRY_FILE="${PROJECT_DIR}/../../index.ios.js"
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -19,7 +19,6 @@ target 'JitsiMeet' do

  pod 'Firebase/Analytics', '~> 8.0'
  pod 'Firebase/Crashlytics', '~> 8.0'
-  pod 'Firebase/DynamicLinks', '~> 8.0'
 end

 target 'JitsiMeetSDK' do
@@ -34,6 +33,7 @@ target 'JitsiMeetSDK' do
    :path => config[:reactNativePath],
    :hermes_enabled => true,
    :fabric_enabled => false,
+    :new_arch_enabled => false,
    # An absolute path to your application root.
    :app_path => "#{Pod::Config.instance.installation_root}/.."
  )
@@ -67,6 +67,7 @@ target 'JitsiMeetSDKLite' do
      :path => config[:reactNativePath],
      :hermes_enabled => true,
      :fabric_enabled => false,
+      :new_arch_enabled => false,
      # An absolute path to your application root.
      :app_path => "#{Pod::Config.instance.installation_root}/.."
    )
@@ -79,11 +80,11 @@ end

 post_install do |installer|

-  PLIST_BUDDY_PATH = '/usr/libexec/PlistBuddy'
  react_native_post_install(
    installer,
    use_native_modules![:reactNativePath],
-    :mac_catalyst_enabled => false
+    :mac_catalyst_enabled => false,
+    # :ccache_enabled => true
  )
  installer.pods_project.targets.each do |target|
    # https://github.com/CocoaPods/CocoaPods/issues/11402
@@ -98,23 +99,9 @@ post_install do |installer|
      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.1'
      config.build_settings['OTHER_SWIFT_FLAGS'] = '$(inherited) -no-verify-emitted-module-interface'
    end
-
-    # Can be removed when updated to RN 0.76
-    # Issue https://github.com/facebook/react-native/issues/35863#issuecomment-1387465588
-    if target.name == "hermes-engine"
-     installer.pods_project.files.each do |fileref|
-      if fileref.path.end_with? "hermes.xcframework"
-        hermes_plist_file = "#{fileref.real_path}/Info.plist"
-        # Patch Hermes to remove the debug symbols entry from the Info.plist (as it's not shipped with it)
-        # This might be removed once Hermes starts to ship with Debug symbols or we remove our
-        # direct dependency from the Main iOS target on "hermes.xcframework"
-        Open3.capture3(PLIST_BUDDY_PATH, '-c', 'Delete :AvailableLibraries:0:DebugSymbolsPath', hermes_plist_file)
-        Open3.capture3(PLIST_BUDDY_PATH, '-c', 'Delete :AvailableLibraries:1:DebugSymbolsPath', hermes_plist_file)
-        Open3.capture3(PLIST_BUDDY_PATH, '-c', 'Delete :AvailableLibraries:2:DebugSymbolsPath', hermes_plist_file)
-        Open3.capture3(PLIST_BUDDY_PATH, '-c', 'Delete :AvailableLibraries:3:DebugSymbolsPath', hermes_plist_file)
-        Open3.capture3(PLIST_BUDDY_PATH, '-c', 'Delete :AvailableLibraries:4:DebugSymbolsPath', hermes_plist_file)
-      end
-    end
-   end
  end
+
+  # Patch SocketRocket to support TLS 1.3
+  %x(patch Pods/SocketRocket/SocketRocket/SRSecurityPolicy.m -N < patches/ws-tls13.diff)
+
 end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
--- a/ios/app/PrivacyInfo.xcprivacy
+++ b/ios/app/PrivacyInfo.xcprivacy
@@ -30,6 +30,14 @@
 				<string>35F9.1</string>
 			</array>
 		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>85F4.1</string>
+			</array>
+		</dict>
 	</array>
 	<key>NSPrivacyCollectedDataTypes</key>
 	<array/>
--- a/ios/app/app.xcodeproj/project.pbxproj
+++ b/ios/app/app.xcodeproj/project.pbxproj
@@ -7,8 +7,6 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		0B412F1F1EDEE6E800B1A0A6 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */; };
-		0B412F211EDEE95300B1A0A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0B412F201EDEE95300B1A0A6 /* Main.storyboard */; };
 		0B5418471F7C5D8C00A2DD86 /* MeetingRowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */; };
 		0B7001701F7C51CC005944F4 /* InCallController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B70016F1F7C51CC005944F4 /* InCallController.swift */; };
 		0BEA5C291F7B8F73000D0AB4 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */; };
@@ -19,10 +17,8 @@
 		0BEA5C3B1F7B8F73000D0AB4 /* ComplicationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */; };
 		0BEA5C3D1F7B8F73000D0AB4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */; };
 		0BEA5C411F7B8F73000D0AB4 /* JitsiMeetCompanion.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */; };
-		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
-		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
+		13B07FBD1A68108700A75B9A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
-		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */; };
 		361974E2A13624D7735D619D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 5C1BE20ECD5DEEB48FED90B5 /* PrivacyInfo.xcprivacy */; };
 		4341A9062CF0D63200940D93 /* hermes.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4341A9052CF0D63200940D93 /* hermes.xcframework */; };
@@ -34,7 +30,8 @@
 		4EB0603C260E09D000F524C5 /* SocketConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06039260E09D000F524C5 /* SocketConnection.swift */; };
 		4EB0603D260E09D000F524C5 /* DarwinNotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */; };
 		4EB0603E260E09D000F524C5 /* SampleUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603B260E09D000F524C5 /* SampleUploader.swift */; };
-		DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; };
+		DEA0B7122D7EF16E0062A9F6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA0B7112D7EF16E0062A9F6 /* ViewController.swift */; };
+		DEA0B7142D7EF7590062A9F6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA0B7132D7EF7590062A9F6 /* AppDelegate.swift */; };
 		DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; };
 		DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		DED016F128ECBC9D009D5E8D /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */; };
@@ -121,12 +118,8 @@

 /* Begin PBXFileReference section */
 		0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		0B412F1D1EDEE6E800B1A0A6 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		0B412F201EDEE95300B1A0A6 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingRowController.swift; sourceTree = "<group>"; };
 		0B70016F1F7C51CC005944F4 /* InCallController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InCallController.swift; sourceTree = "<group>"; };
-		0BBD021F212EB69D00CCB19F /* Types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Types.h; sourceTree = "<group>"; };
 		0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.framework"; sourceTree = "<group>"; };
 		0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JitsiMeetCompanion.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		0BEA5C281F7B8F73000D0AB4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = "<group>"; };
@@ -139,12 +132,9 @@
 		0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		0BEA5C3E1F7B8F73000D0AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* jitsi-meet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "jitsi-meet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
+		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = src/Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 		4341A9052CF0D63200940D93 /* hermes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermes.xcframework; path = "../Pods/hermes-engine/destroot/Library/Frameworks/universal/hermes.xcframework"; sourceTree = "<group>"; };
 		4E90F93F2632D1AB001102D4 /* Atomic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Atomic.swift; sourceTree = "<group>"; };
@@ -157,13 +147,12 @@
 		4EB0603B260E09D000F524C5 /* SampleUploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleUploader.swift; sourceTree = "<group>"; };
 		4EC49B8625BED71300E76218 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; };
 		5C1BE20ECD5DEEB48FED90B5 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
-		6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
 		B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = "<group>"; };
 		D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE050388256E904600DEE3A5 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/apple/WebRTC.xcframework"; sourceTree = "<group>"; };
-		DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = "<group>"; };
-		DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = "<group>"; };
+		DEA0B7112D7EF16E0062A9F6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		DEA0B7132D7EF7590062A9F6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = ../Pods/JitsiWebRTC/WebRTC.xcframework; sourceTree = "<group>"; };
 		DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.xcframework"; sourceTree = "<group>"; };
@@ -258,18 +247,10 @@
 		13B07FAE1A68108700A75B9A /* src */ = {
 			isa = PBXGroup;
 			children = (
-				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
-				13B07FB01A68108700A75B9A /* AppDelegate.m */,
-				DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */,
-				DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */,
+				DEA0B7132D7EF7590062A9F6 /* AppDelegate.swift */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
-				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
-				13B07FB71A68108700A75B9A /* main.m */,
-				0B412F201EDEE95300B1A0A6 /* Main.storyboard */,
-				0BBD021F212EB69D00CCB19F /* Types.h */,
-				0B412F1D1EDEE6E800B1A0A6 /* ViewController.h */,
-				0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */,
+				DEA0B7112D7EF16E0062A9F6 /* ViewController.swift */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -302,7 +283,6 @@
 				0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */,
 				4EB06025260E026600F524C5 /* JitsiMeetBroadcast Extension */,
 				CDD71F5E1157E9F283DF92A8 /* Pods */,
-				6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */,
 				5C1BE20ECD5DEEB48FED90B5 /* PrivacyInfo.xcprivacy */,
 			);
 			indentWidth = 2;
@@ -435,6 +415,7 @@
 						ProvisioningStyle = Automatic;
 					};
 					13B07F861A680F5B00A75B9A = {
+						LastSwiftMigration = 1620;
 						SystemCapabilities = {
 							com.apple.SafariKeychain = {
 								enabled = 1;
@@ -492,9 +473,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0B412F211EDEE95300B1A0A6 /* Main.storyboard in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
+				13B07FBD1A68108700A75B9A /* LaunchScreen.storyboard in Resources */,
 				361974E2A13624D7735D619D /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -558,7 +538,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if test \"$PRODUCT_BUNDLE_IDENTIFIER\" = \"com.atlassian.JitsiMeet.ios\"; then\n    ENTITLEMENTS_PLIST=\"$PROJECT_DIR/app.entitlements\"\n    \n    /usr/libexec/PlistBuddy -c \"Add :com.apple.developer.avfoundation.multitasking-camera-access bool 1\" $ENTITLEMENTS_PLIST\nfi\n";
+			shellScript = "#if test \"$PRODUCT_BUNDLE_IDENTIFIER\" = \"com.atlassian.JitsiMeet.ios\"; then\n#    ENTITLEMENTS_PLIST=\"$PROJECT_DIR/app.entitlements\"\n#    \n#    /usr/libexec/PlistBuddy -c \"Add :com.apple.developer.avfoundation.multitasking-camera-access bool 1\" $ENTITLEMENTS_PLIST\n#fi\n";
 		};
 		69BC5020DBE393B56BD76636 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -660,10 +640,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0B412F1F1EDEE6E800B1A0A6 /* ViewController.m in Sources */,
-				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
-				DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */,
-				13B07FC11A68108700A75B9A /* main.m in Sources */,
+				DEA0B7122D7EF16E0062A9F6 /* ViewController.swift in Sources */,
+				DEA0B7142D7EF7590062A9F6 /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -708,12 +686,12 @@
 			name = Interface.storyboard;
 			sourceTree = "<group>";
 		};
-		13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = {
+		13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
 				13B07FB21A68108700A75B9A /* Base */,
 			);
-			name = LaunchScreen.xib;
+			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
@@ -869,6 +847,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -893,6 +872,8 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -903,6 +884,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -926,6 +908,7 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
--- a/ios/app/src/AppDelegate.h
+++ b/ios/app/src/AppDelegate.h
@@ -1,23 +0,0 @@
-/*
- * Copyright @ 2017-present Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (nonatomic, strong) UIWindow *window;
-
-@end
--- a/ios/app/src/AppDelegate.m
+++ b/ios/app/src/AppDelegate.m
@@ -1,131 +0,0 @@
-/*
- * Copyright @ 2018-present 8x8, Inc.
- * Copyright @ 2017-2018 Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "AppDelegate.h"
-#import "FIRUtilities.h"
-#import "Types.h"
-#import "ViewController.h"
-
-@import Firebase;
-@import JitsiMeetSDK;
-
-@implementation AppDelegate
-
-             (BOOL)application:(UIApplication *)application
-  didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    JitsiMeet *jitsiMeet = [JitsiMeet sharedInstance];
-
-    jitsiMeet.conferenceActivityType = JitsiMeetConferenceActivityType;
-    jitsiMeet.customUrlScheme = @"org.jitsi.meet";
-    jitsiMeet.universalLinkDomains = @[@"meet.jit.si", @"alpha.jitsi.net", @"beta.meet.jit.si"];
-
-    jitsiMeet.defaultConferenceOptions = [JitsiMeetConferenceOptions fromBuilder:^(JitsiMeetConferenceOptionsBuilder *builder) {
-        [builder setFeatureFlag:@"welcomepage.enabled" withBoolean:YES];
-        [builder setFeatureFlag:@"ios.screensharing.enabled" withBoolean:YES];
-        [builder setFeatureFlag:@"ios.recording.enabled" withBoolean:YES];
-    }];
-
-  [jitsiMeet application:application didFinishLaunchingWithOptions:launchOptions];
-
-    // Initialize Crashlytics and Firebase if a valid GoogleService-Info.plist file was provided.
-  if ([FIRUtilities appContainsRealServiceInfoPlist]) {
-        NSLog(@"Enabling Firebase");
-        [FIRApp configure];
-        // Crashlytics defaults to disabled with the FirebaseCrashlyticsCollectionEnabled Info.plist key.
-        [[FIRCrashlytics crashlytics] setCrashlyticsCollectionEnabled:![jitsiMeet isCrashReportingDisabled]];
-    }
-
-    ViewController *rootController = (ViewController *)self.window.rootViewController;
-    [jitsiMeet showSplashScreen:rootController.view];
-
-    return YES;
-}
-
- (void) applicationWillTerminate:(UIApplication *)application {
-    NSLog(@"Application will terminate!");
-    // Try to leave the current meeting graceefully.
-    ViewController *rootController = (ViewController *)self.window.rootViewController;
-    [rootController terminate];
-}
-
-#pragma mark Linking delegate methods
-
-    (BOOL)application:(UIApplication *)application
-  continueUserActivity:(NSUserActivity *)userActivity
-    restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> *restorableObjects))restorationHandler {
-
-    if ([FIRUtilities appContainsRealServiceInfoPlist]) {
-        // 1. Attempt to handle Universal Links through Firebase in order to support
-        //    its Dynamic Links (which we utilize for the purposes of deferred deep
-        //    linking).
-        BOOL handled
-          = [[FIRDynamicLinks dynamicLinks]
-                handleUniversalLink:userActivity.webpageURL
-                         completion:^(FIRDynamicLink * _Nullable dynamicLink, NSError * _Nullable error) {
-           NSURL *firebaseUrl = [FIRUtilities extractURL:dynamicLink];
-           if (firebaseUrl != nil) {
-             userActivity.webpageURL = firebaseUrl;
-             [[JitsiMeet sharedInstance] application:application
-                                continueUserActivity:userActivity
-                                  restorationHandler:restorationHandler];
-           }
-        }];
-
-        if (handled) {
-          return handled;
-        }
-    }
-
-    // 2. Default to plain old, non-Firebase-assisted Universal Links.
-    return [[JitsiMeet sharedInstance] application:application
-                              continueUserActivity:userActivity
-                                restorationHandler:restorationHandler];
-}
-
- (BOOL)application:(UIApplication *)app
-            openURL:(NSURL *)url
-            options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
-
-    // This shows up during a reload in development, skip it.
-    // https://github.com/firebase/firebase-ios-sdk/issues/233
-    if ([[url absoluteString] containsString:@"google/link/?dismiss=1&is_weak_match=1"]) {
-        return NO;
-    }
-
-    NSURL *openUrl = url;
-
-    if ([FIRUtilities appContainsRealServiceInfoPlist]) {
-        // Process Firebase Dynamic Links
-        FIRDynamicLink *dynamicLink = [[FIRDynamicLinks dynamicLinks] dynamicLinkFromCustomSchemeURL:url];
-        NSURL *firebaseUrl = [FIRUtilities extractURL:dynamicLink];
-        if (firebaseUrl != nil) {
-            openUrl = firebaseUrl;
-        }
-    }
-
-    return [[JitsiMeet sharedInstance] application:app
-                                           openURL:openUrl
-                                           options:options];
-}
-
- (UIInterfaceOrientationMask)application:(UIApplication *)application
-  supportedInterfaceOrientationsForWindow:(UIWindow *)window {
-    return [[JitsiMeet sharedInstance] application:application
-           supportedInterfaceOrientationsForWindow:window];
-}
-
-@end
--- a/ios/app/src/AppDelegate.swift
+++ b/ios/app/src/AppDelegate.swift
@@ -0,0 +1,78 @@
+import UIKit
+import Firebase
+import JitsiMeetSDK
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+    var window: UIWindow?
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        self.window = UIWindow(frame: UIScreen.main.bounds)
+
+        let jitsiMeet = JitsiMeet.sharedInstance()
+
+        // jitsiMeet.webRtcLoggingSeverity = .verbose
+
+        jitsiMeet.conferenceActivityType = "org.jitsi.JitsiMeet.ios.conference" // Must match the one defined in Info.plist{}
+        jitsiMeet.customUrlScheme = "org.jitsi.meet"
+        jitsiMeet.universalLinkDomains = ["meet.jit.si", "alpha.jitsi.net", "beta.meet.jit.si"]
+
+        jitsiMeet.defaultConferenceOptions = JitsiMeetConferenceOptions.fromBuilder { builder in
+            // For testing configOverrides a room needs to be set
+            // builder.room = "https://meet.jit.si/test0988test"
+
+            builder.setFeatureFlag("welcomepage.enabled", withBoolean: true)
+            builder.setFeatureFlag("ios.screensharing.enabled", withBoolean: true)
+            builder.setFeatureFlag("ios.recording.enabled", withBoolean: true)
+        }
+
+        jitsiMeet.application(application, didFinishLaunchingWithOptions: launchOptions ?? [:])
+
+        if self.appContainsRealServiceInfoPlist() {
+            print("Enabling Firebase")
+            FirebaseApp.configure()
+            Crashlytics.crashlytics().setCrashlyticsCollectionEnabled(!jitsiMeet.isCrashReportingDisabled())
+        }
+
+        let vc = ViewController()
+        self.window?.rootViewController = vc
+        jitsiMeet.showSplashScreen()
+
+        self.window?.makeKeyAndVisible()
+
+        return true
+    }
+
+    func applicationWillTerminate(_ application: UIApplication) {
+        print("Application will terminate!")
+        if let rootController = self.window?.rootViewController as? ViewController {
+            rootController.terminate()
+        }
+    }
+
+    // MARK: Linking delegate methods
+
+    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        return JitsiMeet.sharedInstance().application(application, continue: userActivity, restorationHandler: restorationHandler)
+    }
+
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+        if url.absoluteString.contains("google/link/?dismiss=1&is_weak_match=1") {
+            return false
+        }
+
+        return JitsiMeet.sharedInstance().application(app, open: url, options: options)
+    }
+
+    func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
+        return JitsiMeet.sharedInstance().application(application, supportedInterfaceOrientationsFor: window)
+    }
+}
+
+// Firebase utilities
+extension AppDelegate {
+    func appContainsRealServiceInfoPlist() -> Bool {
+        return InfoPlistUtil.containsRealServiceInfoPlist(in: Bundle.main)
+    }
+}
--- a/ios/app/src/Base.lproj/LaunchScreen.storyboard
+++ b/ios/app/src/Base.lproj/LaunchScreen.storyboard
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="iN0-l3-epB">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView opaque="NO" userInteractionEnabled="NO" contentMode="center" image="LaunchScreen" translatesAutoresizingMaskIntoConstraints="NO" id="4B8-Xf-NDE">
+                                <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.090196078431372548" green="0.62745098039215685" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="4B8-Xf-NDE" secondAttribute="bottom" id="aFF-BR-glX"/>
+                            <constraint firstItem="4B8-Xf-NDE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="glR-YN-1GF"/>
+                            <constraint firstAttribute="trailing" secondItem="4B8-Xf-NDE" secondAttribute="trailing" id="tva-gl-jRX"/>
+                            <constraint firstItem="4B8-Xf-NDE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="yaV-1V-oEh"/>
+                        </constraints>
+                        <nil key="simulatedStatusBarMetrics"/>
+                        <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                        <point key="canvasLocation" x="548" y="455"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <resources>
+                <image name="LaunchScreen" width="480" height="480"/>
+            </resources>
+        </scene>
+    </scenes>
+</document>
--- a/ios/app/src/Base.lproj/LaunchScreen.xib
+++ b/ios/app/src/Base.lproj/LaunchScreen.xib
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <imageView opaque="NO" userInteractionEnabled="NO" contentMode="center" image="LaunchScreen" translatesAutoresizingMaskIntoConstraints="NO" id="4B8-Xf-NDE">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-                </imageView>
-            </subviews>
-            <color key="backgroundColor" red="0.090196078431372548" green="0.62745098039215685" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstAttribute="bottom" secondItem="4B8-Xf-NDE" secondAttribute="bottom" id="aFF-BR-glX"/>
-                <constraint firstItem="4B8-Xf-NDE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="glR-YN-1GF"/>
-                <constraint firstAttribute="trailing" secondItem="4B8-Xf-NDE" secondAttribute="trailing" id="tva-gl-jRX"/>
-                <constraint firstItem="4B8-Xf-NDE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="yaV-1V-oEh"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="LaunchScreen" width="480" height="480"/>
-    </resources>
-</document>
--- a/ios/app/src/Base.lproj/Main.storyboard
+++ b/ios/app/src/Base.lproj/Main.storyboard
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="u7g-vg-A8m">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="xSm-U5-Hdu">
-            <objects>
-                <viewController id="u7g-vg-A8m" customClass="ViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="d40-fc-Y8P"/>
-                        <viewControllerLayoutGuide type="bottom" id="1KD-Ho-g0H"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="QpR-jB-WOw" customClass="JitsiMeetView">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="ZIj-K3-jVH" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="28" y="138"/>
-        </scene>
-    </scenes>
-</document>
--- a/ios/app/src/FIRUtilities.h
+++ b/ios/app/src/FIRUtilities.h
@@ -1,27 +0,0 @@
-/*
- * Copyright 2017 Google
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <Foundation/Foundation.h>
-
-@import Firebase;
-
-
-@interface FIRUtilities : NSObject
-
-+ (BOOL)appContainsRealServiceInfoPlist;
-+ (NSURL *_Nullable)extractURL: (FIRDynamicLink* _Nullable)dynamicLink;
-
-@end
--- a/ios/app/src/FIRUtilities.m
+++ b/ios/app/src/FIRUtilities.m
@@ -1,48 +0,0 @@
-/*
- * Copyright 2017 Google
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import "FIRUtilities.h"
-
-@import JitsiMeetSDK;
-
-@implementation FIRUtilities
-
-+ (BOOL)appContainsRealServiceInfoPlist {
-  static BOOL containsRealServiceInfoPlist = NO;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    NSBundle *bundle = [NSBundle mainBundle];
-    containsRealServiceInfoPlist = [InfoPlistUtil containsRealServiceInfoPlistInBundle:bundle];
-  });
-  return containsRealServiceInfoPlist;
-}
-
-+ (NSURL *)extractURL: (FIRDynamicLink*)dynamicLink {
-  NSURL *url = nil;
-  if (dynamicLink != nil) {
-    NSURL *dynamicLinkURL = dynamicLink.url;
-    if (dynamicLinkURL != nil
-        && (dynamicLink.matchType == FIRDLMatchTypeUnique
-            || dynamicLink.matchType == FIRDLMatchTypeDefault)) {
-          // Strong match, process it.
-          url = dynamicLinkURL;
-        }
-  }
-
-  return url;
-}
-
-@end
--- a/Show More
+++ b/Show More